Michael Ling / ExoController

Dependents:   Data-Management-Honka

Revision:
19:f3eece6c024f
Parent:
18:34ccf02fdbe7
Child:
20:be8dcc2344bc
diff -r 34ccf02fdbe7 -r f3eece6c024f BluetoothComm.cpp
--- 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