FSG / Mbed 2 deprecated 7_21_17_FSG

Dependencies:   BCEmotor Battery_Linear_Actuator Controller_ IMU_code_ LTC1298_7_14 MODSERIAL PosVelFilter_7_14 System mbed

Fork of 7_20_17_FSG_ by FSG

Files at this revision

API Documentation at this revision

Comitter:
mdavis30
Date:
Wed Jul 26 14:11:08 2017 +0000
Parent:
8:9b9431404db7
Commit message:

Changed in this revision

Battery_Linear_Actuator.lib Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/Battery_Linear_Actuator.lib	Tue Jul 25 17:41:34 2017 +0000
+++ b/Battery_Linear_Actuator.lib	Wed Jul 26 14:11:08 2017 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/teams/FSG/code/Battery_Linear_Actuator/#346911ee5450
+https://developer.mbed.org/teams/FSG/code/Battery_Linear_Actuator/#51c955259df7
--- a/main.cpp	Tue Jul 25 17:41:34 2017 +0000
+++ b/main.cpp	Wed Jul 26 14:11:08 2017 +0000
@@ -185,6 +185,18 @@
                 wait(0.5);                      //500 milliseconds
                 mbed_reset(); //reset the mbed!
             }
+           /* else if(Key == '[')
+            {
+                BLA_object.velocity_only(-100); //send speed -100 command to linear actuator (retract)
+            }
+            else if(Key == ']')
+            {
+                BLA_object.velocity_only(100); //send speed +100 command to linear actuator (extend)
+            }  
+            else if(Key == 'u')
+            {
+                BLA_object.Keyboard_U(); //stop linear actuator
+            }  */
             else if(Key =='H')  //homing sequence
             {
                 PC.printf("### homing the device ###");
@@ -566,7 +578,7 @@
                 if (LA_auto == false)
                 {
                     PC.printf("N key pressed. \n");
-                    PC.printf("%s\n", BLA_object.Keyboard_DASH_KEY());
+                    PC.printf("%s\n", BLA_object.Keyboard_DASH_KEY().c_str());
                 }
                 
                 else
@@ -580,7 +592,7 @@
                 if (LA_auto == false)
                 {
                     PC.printf("M key pressed. \n");
-                    PC.printf("%s\n", BLA_object.Keyboard_EQUAL_KEY());
+                    PC.printf("%s\n", BLA_object.Keyboard_EQUAL_KEY().c_str());
                 }
                 
                 else
@@ -594,7 +606,7 @@
                 if (LA_auto == false)
                 {
                     PC.printf("J key pressed. \n");
-                    PC.printf("%s\n", BLA_object.Keyboard_A());
+                    PC.printf("%s\n", BLA_object.Keyboard_A().c_str());
                 }
                 
                 else
@@ -608,7 +620,7 @@
                 if (LA_auto == false)
                 {
                     PC.printf("K key pressed. \n");
-                    PC.printf("%s\n", BLA_object.Keyboard_D());
+                    PC.printf("%s\n", BLA_object.Keyboard_D().c_str());
                 }
                 
                 else