Diff: main.cpp

Revision:

26:91d48c0b722d

Parent:

25:1a71424b05ff

Child:

27:1ff7fa636f1c

--- a/main.cpp	Thu Oct 20 10:31:45 2016 +0000
+++ b/main.cpp	Thu Oct 20 13:24:39 2016 +0000
@@ -25,7 +25,8 @@
 double emg02;
 double emg12;
 double emg22;
-
+//double ref_x=0.000;
+//double ref_y=0.000;
 typedef enum { STATE_CALIBRATION, STATE_PAUZE, STATE_X, STATE_X_NEG, STATE_Y, STATE_Y_NEG, STATE_XY, STATE_XY_NEG } states;
 
 BiQuadChain bqc11;
@@ -82,7 +83,7 @@
     states myoldstate=mystate;
     char key=pc.getc();
 
-   // pc.printf("%c/n",key);
+    // pc.printf("%c/n",key);
 
     switch (key) {
         case 'p' : // run
@@ -150,9 +151,10 @@
             mystate = STATE_PAUZE;
         }
     }
-
+    
     if (buttonflag==true) {
         mystate = STATE_CALIBRATION;
+        newcase=true;
     }
 
     if (myoldstate==mystate) {
@@ -217,6 +219,7 @@
     sampletimer = false;
 }
 
+
 int main()
 {
     pc.baud(115200);
@@ -244,20 +247,20 @@
             sample_button(mystate);
         }
         // switch, case
-
         switch (mystate) {
-            case STATE_CALIBRATION : // calibration
-                pc.printf("calibration");
+            case STATE_CALIBRATION : { // calibration
+                pc.printf("calibration\n");
                 while (button_calibrate==0) {}
+                newcase=false;
                 buttonflag=false;
                 break;
+            }
             case STATE_X : // run
-                for (int n=0; n<1; n++) {
-                    if (newcase==true) {
-                        pc.printf("X\n");
-                        newcase=false;
-                    }
+                if (newcase==true) {
+                    pc.printf("X\n");
+                    newcase=false;
                 }
+
                 break;
             case STATE_X_NEG : // run
                 if (newcase==true) {
@@ -293,7 +296,8 @@
                 if (newcase==true) {
                     pc.printf("PAUZE\n");
                     newcase=false;
-                }                break;
+                }
+                break;
         }
 
     }