Main Program

Dependencies:   mbed AQM1602 HMC6352 PID

Revision:
21:d69a8f3c76e1
Parent:
19:342da3a5a474
Child:
22:a95f7c63af3c
--- a/main_processing/setup_command_active/command.cpp	Thu Jan 21 16:54:54 2016 +0000
+++ b/main_processing/setup_command_active/command.cpp	Sat Jan 30 09:02:03 2016 +0000
@@ -55,6 +55,7 @@
         if(SwState == RIGHT){
                if(lcdstr[y][1][0]==0) x=0;
                else x++;
+               if(x==STATE_NUM_X) x=0;
                if(lcdstr[y][x][0]==0) x=0;
                else x %= STATE_NUM_X;
         }
@@ -72,13 +73,6 @@
         Lcd.print(">");
         Lcd.locate(9, 0);
         if(x!=0) Lcd.print(lcdstr[y][x]);
-        
-        if(x==0){
-            LineSignalHolder=0x0;
-        }
-        else{
-            LineSignalHolder=0x7;
-        }
     }
 }
 uint8_t LoopFunction0(uint8_t x){
@@ -105,9 +99,6 @@
     if(x==1){
         linedata = RawLineSignal;
     }
-    if(x==2){
-        linedata = HeldLineSignal;
-    }
     line[2] = (0x4 & linedata)>>2;
     line[1] = (0x2 & linedata)>>1;
     line[0] = (0x1 & linedata)>>0;