group14 - k9 / Mbed 2 deprecated robot_2

2nd draft

Dependencies:   HIDScope MODSERIAL QEI biquadFilter mbed Servo

Fork of robot_mockup by Martijn Kern

Files at this revision

API Documentation at this revision

Revision 19:0a3ee31dcdb4, committed 2015-10-12

Comitter:
Vigilance88
Date:
Mon Oct 12 13:47:21 2015 +0000
Parent:
18:44905b008f44
Child:
20:0ede3818e08e
Commit message:
calibrate split to arm and emg

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/main.cpp	Mon Oct 12 13:44:29 2015 +0000
+++ b/main.cpp	Mon Oct 12 13:47:21 2015 +0000
@@ -71,7 +71,12 @@
 }
 
 //Send arm to mechanical limits, and set encoder to 0. Then send arm to starting position.
-void calibrate(void)
+void calibrate_arm(void)
+{
+}
+
+//EMG MVC measurement
+void calibrate_emg(void)
 {
 }
 
@@ -119,7 +124,8 @@
 {
     // make a menu, user has to initiated next step
     
-    calibrate();            //Start Calibration
+    calibrate_arm();        //Start Calibration
+    calibrate_emg();        
     start_sampling();       //500 Hz EMG 
     start_control();        //100 Hz control