Diff: main.cpp

Revision:

66:17be4d8e2c26

Parent:

65:a01cf17a2bce

Child:

67:edc3c644d316

--- a/main.cpp	Fri Nov 01 09:12:00 2019 +0000
+++ b/main.cpp	Fri Nov 01 09:36:14 2019 +0000
@@ -1017,7 +1017,7 @@
     }
 
     Vx = 5.0;
-    Vy = 5.0;
+    Vy = -5.0;
 
     PID_controller();
     motorControl();
@@ -1268,6 +1268,9 @@
     // Entry function
     if ( global_state_changed == true ) {
         global_state_changed = false;
+        
+        button1.fall( &button1Press );
+        button2.fall( &button2Press );
 
         emg_sampleNow = true; // Enable signal sampling in sampleSignals()
         emg_calibrateNow = false; // Disable calibration functionality in sampleSignals()
@@ -1290,6 +1293,10 @@
         global_curr_state = global_wait;
         global_state_changed = true;
         set_led_color('o'); // Disable operation led
+        emg_sampleNow = false; // Enable signal sampling in sampleSignals()
+        emg_calibrateNow = false; // Disable calibration functionality in sampleSignals()
+        emg_cal_done = false;
+        motor_cal_done = false;
     }
 }
 /*