Diff: main.cpp

Revision:

6:adf2837c1e7f

Parent:

5:d9f8c2f63323

Child:

7:238c6fd5c209

--- a/main.cpp	Fri Dec 04 14:42:01 2015 +0000
+++ b/main.cpp	Mon Dec 21 11:36:29 2015 +0000
@@ -48,8 +48,6 @@
 
 DataSerial pc(USBTX, USBRX);
 
-
-
 //INTERRUPT HANDLERS
 
 void sw2Down(){ flags |= SW2_DOWN; }
@@ -73,7 +71,7 @@
 void fireDown(){ flags |= FIRE_DOWN; }
 void fireUp()  { flags |= FIRE_UP; }
 
-//PRETTY WAITING LEDS (Modified from Fred Barnes)
+//PRETTY WAITING LEDS
 
 Ticker waitTicker;
 int ctr;
@@ -104,8 +102,8 @@
 void read_digital() {
     bool val;
     switch(pc.readChar()) {
-        case '2': val=sw2; break;
-        case '3': val=sw3; break;
+        case '2': val=!sw2; break;
+        case '3': val=!sw3; break;
         case 'u': val=up; break;
         case 'd': val=down; break;
         case 'l': val=left; break;
@@ -113,8 +111,7 @@
         case 'f': val=fire; break;
         default: return;
     }
-    char c = val?'t':'f';
-    pc.sendChar(c);
+    pc.sendBool(val);
 }
 
 /*
@@ -211,6 +208,7 @@
     buff[len]=0;
     lcd.printf(buff);
     lcd.copy_to_lcd();
+    pc.sendBool(true);
 }
 
 void set_lcd_pixel() { //set lcd pixel
@@ -229,6 +227,7 @@
 
 void clear_lcd() { //clear lcd
     lcd.cls();
+    pc.sendBool(true);
 }
 
 void cleanup() {