Revision 5:18043a697451, committed 2015-01-14

Comitter:

perr1940

Date:

Wed Jan 14 23:20:26 2015 +0000

Parent:

4:46d4917f2464

Child:

6:784990d5180a

Commit message:

Databed code before attempting mbed communication interrupt

Changed in this revision

--- a/UI/UI.cpp	Fri Dec 12 23:14:40 2014 +0000
+++ b/UI/UI.cpp	Wed Jan 14 23:20:26 2015 +0000
@@ -51,50 +51,57 @@
             for(int i=3; i<=22; i++) {
                 sum+=*(idx+i);
             }
-            pc.printf("Checksum: %x\r\n", sum);
+            //pc.printf("Checksum: %x\r\n", sum);
             dataCnt=0;
         }
-        if(sum==0x79c) {
-            if (buttonA == 0 && buttonA_prev==1) {//buton was just pressed
-                time_pressA.reset();
-                time_pressA.start();
-                time_sinceA=0;
-            }
+        //if(sum==0x79c) {
+        if (buttonA == 0 && buttonA_prev==1) {//buton was just pressed
+            time_pressA.reset();
+            time_pressA.start();
+            time_sinceA=0;
+        }
 
-            else if(buttonA==0) {
-                time_sinceA=time_pressA; //button is still pressed
-            }
-
-            if (buttonB == 0 && buttonB_prev==1) {//button was just pressed
-                time_pressB.reset();
-                time_pressB.start();
-                time_sinceB=0;
-            } else if(buttonB==0) {
-                time_sinceB=time_pressB; //button is still pressed
-            }
+        else if(buttonA==0) {
+            time_sinceA=time_pressA; //button is still pressed
         }
 
-        if((time_pressA-time_sinceA)>=tRelease) { //button was released
-            if(time_pressA-tRelease>=tHold) { //if the button was held before released
-                UI=3; //UI command is a held A button
-            } else {
-                UI=1; //UI command is a pressed A button
-            }
-            buttonA=1; //button A is released
-            time_pressA.stop(); //reset the button A timer
-            time_pressA.reset();
-        }
-        if(time_pressB-time_sinceB>=tRelease) { //button was released
-            if(time_pressB-tRelease>=tHold) { //if the button was held before released
-                UI=4; //UI command is a held B button
-            } else {
-                UI=2; //UI command is a pressed B button
-            }
-            buttonB=1; //button B is released
-            time_pressB.stop(); //reset the button B timer
+        if (buttonB == 0 && buttonB_prev==1) {//button was just pressed
             time_pressB.reset();
+            time_pressB.start();
+            time_sinceB=0;
+        } else if(buttonB==0) {
+            time_sinceB=time_pressB; //button is still pressed
         }
     }
+
+    if((time_pressA-time_sinceA)>=tRelease && (time_pressB-time_sinceB)>=tRelease) {
+        UI=0;
+        buttonA=1; //button A is released
+        time_pressA.stop(); //reset the button A timer
+        time_pressA.reset();
+        buttonB=1; //button B is released
+        time_pressB.stop(); //reset the button B timer
+        time_pressB.reset();
+    } else if((time_pressA-time_sinceA)>=tRelease) { //button was released
+        if(time_pressA-tRelease>=tHold) { //if the button was held before released
+            UI=3; //UI command is a held A button
+        } else {
+            UI=1; //UI command is a pressed A button
+        }
+        buttonA=1; //button A is released
+        time_pressA.stop(); //reset the button A timer
+        time_pressA.reset();
+    } else if(time_pressB-time_sinceB>=tRelease) { //button was released
+        if(time_pressB-tRelease>=tHold) { //if the button was held before released
+            UI=4; //UI command is a held B button
+        } else {
+            UI=2; //UI command is a pressed B button
+        }
+        buttonB=1; //button B is released
+        time_pressB.stop(); //reset the button B timer
+        time_pressB.reset();
+    }
+    //}
     memset(xbeeBuffer,0xFF,250);
     dataCnt=0;
 }