FW 3.40 support, added VESC ID to mc_values

vedderb · Jul 23, 2018 · 9e3de2a · 9e3de2a
1 parent 48e97be
commit 9e3de2a
Show file tree

Hide file tree

Showing 28 changed files with 12 additions and 0 deletions.
diff --git a/commands.cpp b/commands.cpp
@@ -149,6 +149,12 @@ void Commands::processPacket(QByteArray data)
             values.position = -1.0;
         }
 
+        if (vb.size() >= 1) {
+            values.vesc_id = vb.vbPopFrontUint8();
+        } else {
+            values.vesc_id = 255;
+        }
+
         emit valuesReceived(values);
     } break;
 

diff --git a/datatypes.h b/datatypes.h
@@ -94,6 +94,7 @@ struct MC_VALUES {
     Q_PROPERTY(int tachometer_abs MEMBER tachometer_abs)
     Q_PROPERTY(double position MEMBER position)
     Q_PROPERTY(mc_fault_code fault_code MEMBER fault_code)
+    Q_PROPERTY(uint8_t vesc_id MEMBER vesc_id)
     Q_PROPERTY(QString fault_str MEMBER fault_str)
 
 public:
@@ -114,6 +115,7 @@ struct MC_VALUES {
     int tachometer_abs;
     double position;
     mc_fault_code fault_code;
+    uint8_t vesc_id;
     QString fault_str;
 };
 

diff --git a/res/firmwares/410_o_411_o_412/VESC_0005ohm.bin b/res/firmwares/410_o_411_o_412/VESC_0005ohm.bin
diff --git a/res/firmwares/410_o_411_o_412/VESC_default.bin b/res/firmwares/410_o_411_o_412/VESC_default.bin
diff --git a/res/firmwares/410_o_411_o_412/VESC_default_no_hw_limits.bin b/res/firmwares/410_o_411_o_412/VESC_default_no_hw_limits.bin
diff --git a/res/firmwares/410_o_411_o_412/VESC_servoout.bin b/res/firmwares/410_o_411_o_412/VESC_servoout.bin
diff --git a/res/firmwares/410_o_411_o_412/VESC_ws2811.bin b/res/firmwares/410_o_411_o_412/VESC_ws2811.bin
diff --git a/res/firmwares/46_o_47/VESC_0005ohm.bin b/res/firmwares/46_o_47/VESC_0005ohm.bin
diff --git a/res/firmwares/46_o_47/VESC_33k.bin b/res/firmwares/46_o_47/VESC_33k.bin
diff --git a/res/firmwares/46_o_47/VESC_default.bin b/res/firmwares/46_o_47/VESC_default.bin
diff --git a/res/firmwares/46_o_47/VESC_servoout.bin b/res/firmwares/46_o_47/VESC_servoout.bin
diff --git a/res/firmwares/46_o_47/VESC_ws2811.bin b/res/firmwares/46_o_47/VESC_ws2811.bin
diff --git a/res/firmwares/46_o_47/VESC_ws2811_33k.bin b/res/firmwares/46_o_47/VESC_ws2811_33k.bin
diff --git a/res/firmwares/48/VESC_0005ohm.bin b/res/firmwares/48/VESC_0005ohm.bin
diff --git a/res/firmwares/48/VESC_default.bin b/res/firmwares/48/VESC_default.bin
diff --git a/res/firmwares/48/VESC_servoout.bin b/res/firmwares/48/VESC_servoout.bin
diff --git a/res/firmwares/48/VESC_ws2811.bin b/res/firmwares/48/VESC_ws2811.bin
diff --git a/res/firmwares/60/VESC_default.bin b/res/firmwares/60/VESC_default.bin
diff --git a/res/firmwares/60/VESC_default_no_hw_limits.bin b/res/firmwares/60/VESC_default_no_hw_limits.bin
diff --git a/res/firmwares/60/VESC_servoout.bin b/res/firmwares/60/VESC_servoout.bin
diff --git a/res/firmwares/60/VESC_ws2811.bin b/res/firmwares/60/VESC_ws2811.bin
diff --git a/res/firmwares/75_300/VESC_default.bin b/res/firmwares/75_300/VESC_default.bin
diff --git a/res/firmwares/75_300/VESC_default_no_hw_limits.bin b/res/firmwares/75_300/VESC_default_no_hw_limits.bin
diff --git a/res/firmwares/75_300/VESC_servoout.bin b/res/firmwares/75_300/VESC_servoout.bin
diff --git a/res/firmwares/75_300/VESC_ws2811.bin b/res/firmwares/75_300/VESC_ws2811.bin
diff --git a/res/firmwares/CHANGELOG b/res/firmwares/CHANGELOG
@@ -1,3 +1,6 @@
+=== FW 3.40 ===
+* Added motor controller ID to COMM_GET_VALUES.
+
 === FW 3.39 ===
 * Updated HW75_300.
 * Added AUX output support.

diff --git a/res/firmwares/DAS_RS/VESC_default.bin b/res/firmwares/DAS_RS/VESC_default.bin
diff --git a/res/info.xml b/res/info.xml
@@ -13,6 +13,7 @@ p, li { white-space: pre-wrap; }
             <cDefine></cDefine>
             <valInt>0</valInt>
             <enumNames>3.39</enumNames>
+            <enumNames>3.40</enumNames>
         </fw_version>
         <help_battery_cutoff>
             <longName>Soft Battery Cutoff Calculator</longName>