Michael Ling / ExoController

Dependents:   Data-Management-Honka

Files at this revision

API Documentation at this revision

Comitter:
mzling
Date:
Mon Apr 27 21:58:27 2015 +0000
Parent:
18:34ccf02fdbe7
Child:
20:be8dcc2344bc
Commit message:
trivial prints

Changed in this revision

BluetoothComm.cpp Show annotated file Show diff for this revision Revisions of this file
BluetoothComm.h Show annotated file Show diff for this revision Revisions of this file
--- a/BluetoothComm.cpp	Fri Apr 24 19:32:36 2015 +0000
+++ b/BluetoothComm.cpp	Mon Apr 27 21:58:27 2015 +0000
@@ -22,7 +22,7 @@
     std::string temp2[] = {"KPStance", "KPSwing", "KPStanding", "KPSitting", "KPStandUp", "KPSitdown", "KDStance", "KDSwing",
         "KDStanding", "KDSitting", "KDStandUp", "KDSitDown", "StandingAngle", "SittingAngle", "BentForwardAngle", "ForwardAngle", "RearAngle",
         "IMUAngle", "KneeFullRetract", "KneeFullExtend", "LockTime", "Rate", "StandupAsst", "StandupTime", "SitdownAsst", "SitdownTime", "WalkAngle",
-        "StepLength", "StepTime", "PeakFlexion", "PhaseShift", "WalkSpeed", 
+        "StepLength", "StepTime", "MaxAmplitude", "StanceStart", "StanceEnd", 
         "TorsoAng", "LKneeAng", "RKneeAng", "LHipAng", "RHipAng", "LHipTorque", "RHipTorque", "ExoAndKneeStates", "TorsoRefAngle", "LHipRefAngle",
         "RHipRefAngle", "Charge"};
     //Populate the map of indices to param names
@@ -567,7 +567,7 @@
 
 //Warning: do not put print statements in the function attachment(); it will interfere with receiving messages
 /**
-* Scans for data received through Bluetooth, and passes it on if it detects a message-like chunk. Should be run via an interuupt.
+* Scans for data received through Bluetooth, and passes it on if it detects a message-like chunk. Should be run via an interuppt.
 * @param dataOut    Buffer for sending to Ctrlbed
 * @author Michael Ling
 * @date 2/4/2015
--- a/BluetoothComm.h	Fri Apr 24 19:32:36 2015 +0000
+++ b/BluetoothComm.h	Mon Apr 27 21:58:27 2015 +0000
@@ -99,9 +99,9 @@
     static const char WALK_IND = 0x1a;
     static const char STEPLEN_IND = 0x1b;
     static const char STEPTIME_IND = 0x1c;
-    static const char FLEXION_IND = 0x1d;
-    static const char SHIFT_IND = 0x1e;
-    static const char WALKSPEED_IND = 0x1f;
+    static const char MAXAMP_IND = 0x1d;
+    static const char STANCESTART_IND = 0x1e;
+    static const char STANCEEND_IND = 0x1f;
     
     //Indicates a readonly request
     static const char READONLY_IND = 0x3f;