Michael Ling / ExoController

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependents:   Data-Management-Honka

Files at this revision

API Documentation at this revision

Revision 9:8024861fccac, committed 2015-03-02

Comitter:
mzling
Date:
Mon Mar 02 20:05:40 2015 +0000
Parent:
8:57d988783b45
Child:
11:56bd3affbbfc
Commit message:
Added 5 more variables

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	Wed Feb 25 21:59:38 2015 +0000
+++ b/BluetoothComm.cpp	Mon Mar 02 20:05:40 2015 +0000
@@ -12,7 +12,7 @@
 //18 = KD Stance, 19 = KD Swing, 20 = KD Standing, 21 = KD Sitting, 22 = KD Standing up, 23 = KD sitting down
 //24 = Standing angle, 25 = Sitting angle, 26 = Bent Forward Angle, 27 = Forward Angle, 28 = Rear Angle, 29 = IMU Angle
 //30 = Knee Full Retract, 31 = Knee Full Extend, 32 = Lock Time, 33 = Rate
-BluetoothComm::BluetoothComm(PinName tx, PinName rx): _rn42(tx, rx), _len(0), _counter(0), _inMsg(false), _numVars(22), _numReadOnlyParams(12), _escapesNeeded(8)
+BluetoothComm::BluetoothComm(PinName tx, PinName rx): _rn42(tx, rx), _len(0), _counter(0), _inMsg(false), _numVars(27), _numReadOnlyParams(12), _escapesNeeded(8)
 {
     
     /* Make sure baud rate is correct--rn42 cannot be read if code and MBED have different baud rates! */
@@ -28,9 +28,9 @@
   
     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", "TorsoAng", "LKneeAng", "RKneeAng", "LHipAng", "RHipAng", "LHipTorque",
-        "RHipTorque", "ExoAndKneeStates", "TorsoRefAngle",
-        "LHipRefAngle", "RHipRefAngle", "Charge"};
+        "IMUAngle", "KneeFullRetract", "KneeFullExtend", "LockTime", "Rate", "StandupAsst", "StandupTime", "SitdownAsst", "SitdownTime", "WalkAngle", 
+        "TorsoAng", "LKneeAng", "RKneeAng", "LHipAng", "RHipAng", "LHipTorque", "RHipTorque", "ExoAndKneeStates", "TorsoRefAngle", "LHipRefAngle",
+        "RHipRefAngle", "Charge"};
     //Populate the map of indices to param names
     for (int j = 0; j < (_numVars + _numReadOnlyParams); j += 1) {
         _indexMap[j] = temp2[j];

--- a/BluetoothComm.h	Wed Feb 25 21:59:38 2015 +0000
+++ b/BluetoothComm.h	Mon Mar 02 20:05:40 2015 +0000
@@ -88,6 +88,11 @@
     static const char EXTEND_IND = 0x13;
     static const char LOCK_IND = 0x14;
     static const char RATE_IND = 0x15;
+    static const char SUASST_IND = 0x16;
+    static const char SUTIME_IND = 0x17;
+    static const char SDASST_IND = 0x18;
+    static const char SDTIME_IND = 0x19;
+    static const char WALK_IND = 0x1a;
     
     //Indicates a readonly request
     static const char READONLY_IND = 0x1f;