thx @arghgra. defined variable != declared variable
authorcpresser@rika
Thu, 07 Feb 2008 00:18:02 +0000
changeset 109798f65f2f35
parent 9 63442d0b7eca
child 13 0f89efb582a1
child 14 ccaf76b245ec
thx @arghgra. defined variable != declared variable
graphlcd-base/glcddrivers/Makefile
graphlcd-base/glcddrivers/avrctl.c
graphlcd-base/glcddrivers/picctl.c
     1.1 --- a/graphlcd-base/glcddrivers/Makefile	Wed Feb 06 22:54:10 2008 +0000
     1.2 +++ b/graphlcd-base/glcddrivers/Makefile	Thu Feb 07 00:18:02 2008 +0000
     1.3 @@ -14,7 +14,7 @@
     1.4  
     1.5  LIBNAME = $(BASENAME).$(VERMAJOR).$(VERMINOR).$(VERMICRO)
     1.6  
     1.7 -OBJS = common.o config.o driver.o drivers.o port.o simlcd.o framebuffer.o gu140x32f.o gu256x64-372.o gu256x64-3900.o hd61830.o ks0108.o image.o sed1330.o sed1520.o t6963c.o noritake800.o serdisp.o g15daemon.o network.o gu126x64D-K610A4.o picctl.o
     1.8 +OBJS = common.o config.o driver.o drivers.o port.o simlcd.o framebuffer.o gu140x32f.o gu256x64-372.o gu256x64-3900.o hd61830.o ks0108.o image.o sed1330.o sed1520.o t6963c.o noritake800.o serdisp.o g15daemon.o network.o gu126x64D-K610A4.o picctl.o avrctl.o
     1.9  
    1.10  HEADERS = config.h driver.h drivers.h
    1.11  
     2.1 --- a/graphlcd-base/glcddrivers/avrctl.c	Wed Feb 06 22:54:10 2008 +0000
     2.2 +++ b/graphlcd-base/glcddrivers/avrctl.c	Thu Feb 07 00:18:02 2008 +0000
     2.3 @@ -109,7 +109,7 @@
     2.4      {
     2.5          return -1;
     2.6      }
     2.7 -    if (port->Open(config->device.c_str()) != 0)
     2.8 +//    if (port->Open(config->device.c_str()) != 0)
     2.9          return -1;
    2.10  
    2.11      *oldConfig = *config;
     3.1 --- a/graphlcd-base/glcddrivers/picctl.c	Wed Feb 06 22:54:10 2008 +0000
     3.2 +++ b/graphlcd-base/glcddrivers/picctl.c	Thu Feb 07 00:18:02 2008 +0000
     3.3 @@ -60,6 +60,12 @@
     3.4  const unsigned char CMD_BOOT =			0x80;
     3.5  
     3.6  
     3.7 +// globals...
     3.8 +uint8_t cDriverPICCtl::buf[255];
     3.9 +uint8_t cDriverPICCtl::buf_pos;
    3.10 +uint8_t cDriverPICCtl::buf_cmd_start;
    3.11 +bool cDriverPICCtl::buf_flag_escape;
    3.12 +
    3.13  // singleton
    3.14  cDriverPICCtl* cDriverPICCtl::instance = 0;
    3.15  
    3.16 @@ -84,6 +90,10 @@
    3.17      //height = config->height;
    3.18      refreshCounter = 0;
    3.19      ack_flag = false;
    3.20 +    
    3.21 +    buf_pos = 1;
    3.22 +    buf_cmd_start = 255;
    3.23 +    buf_flag_escape = false;
    3.24  }
    3.25  
    3.26  cDriverPICCtl::~cDriverPICCtl()
    3.27 @@ -97,7 +107,7 @@
    3.28      // read all available data
    3.29      while (instance->port->ReadData(&buf[buf_pos]))
    3.30      {
    3.31 -        // serarch for SYNC byte
    3.32 +        // search for SYNC byte
    3.33          if ((buf[buf_pos] == CMD_SYNC_RECV) && (!buf_flag_escape))
    3.34  	{
    3.35  	    if (buf_cmd_start != 255)
    3.36 @@ -202,10 +212,6 @@
    3.37  
    3.38      *oldConfig = *config;
    3.39  
    3.40 -    buf_pos = 1;
    3.41 -    buf_cmd_start = 255;
    3.42 -    buf_flag_escape = false;
    3.43 -
    3.44      // clear display
    3.45      Clear();
    3.46      CmdDispClearScreen();