1.4.7 Fix stroke distance value (for ble)

tijmenvangulik · Mar 2, 2024 · 89676a0 · 89676a0
1 parent 02b6146
commit 89676a0
Show file tree

Hide file tree

Showing 27 changed files with 1,825 additions and 1,335 deletions.
diff --git a/api/lib/ergometer.d.ts b/api/lib/ergometer.d.ts
diff --git a/api/lib/ergometer.js b/api/lib/ergometer.js
diff --git a/api/lib/ergometer.js.map b/api/lib/ergometer.js.map
diff --git a/api/lib/ergometer.min.js b/api/lib/ergometer.min.js
diff --git a/api/typescript/ergometer/performancemonitorBle.ts b/api/typescript/ergometer/performancemonitorBle.ts
@@ -1188,7 +1188,7 @@
                     driveLength: data.getUint8(ble.PM_Stroke_Data_BLE_Payload.DRIVE_LENGTH) / 100, //meters
                     driveTime: data.getUint8(ble.PM_Stroke_Data_BLE_Payload.DRIVE_TIME) * 10, //ms
                     strokeRecoveryTime: (data.getUint8(ble.PM_Stroke_Data_BLE_Payload.STROKE_RECOVERY_TIME_LO) + data.getUint8(ble.PM_Stroke_Data_BLE_Payload.STROKE_RECOVERY_TIME_HI)*256) * 10, //ms
-                    strokeDistance: data.getUint16(ble.PM_Stroke_Data_BLE_Payload.STROKE_DISTANCE_LO) / 100,//meter
+                    strokeDistance: (data.getUint8(ble.PM_Mux_Stroke_Data_BLE_Payload.STROKE_DISTANCE_LO)+data.getUint8(ble.PM_Mux_Stroke_Data_BLE_Payload.STROKE_DISTANCE_HI)*256) / 100,//meter
                     peakDriveForce: data.getUint16(ble.PM_Stroke_Data_BLE_Payload.PEAK_DRIVE_FORCE_LO) / 10, //lbs
                     averageDriveForce: data.getUint16(ble.PM_Stroke_Data_BLE_Payload.AVG_DRIVE_FORCE_LO) / 10, //lbs
                     workPerStroke: data.getUint16(ble.PM_Stroke_Data_BLE_Payload.WORK_PER_STROKE_LO) / 10, //jouls
@@ -1202,7 +1202,7 @@
                     driveLength: data.getUint8(ble.PM_Mux_Stroke_Data_BLE_Payload.DRIVE_LENGTH) / 100, //meters
                     driveTime: data.getUint8(ble.PM_Mux_Stroke_Data_BLE_Payload.DRIVE_TIME) * 10, //ms
                     strokeRecoveryTime: data.getUint16(ble.PM_Mux_Stroke_Data_BLE_Payload.STROKE_RECOVERY_TIME_LO) * 10, //ms
-                    strokeDistance: data.getUint16(ble.PM_Mux_Stroke_Data_BLE_Payload.STROKE_DISTANCE_LO) / 100,//meter
+                    strokeDistance: (data.getUint8(ble.PM_Mux_Stroke_Data_BLE_Payload.STROKE_DISTANCE_LO)+data.getUint8(ble.PM_Mux_Stroke_Data_BLE_Payload.STROKE_DISTANCE_HI)*256) / 100,//meter
                     peakDriveForce: data.getUint16(ble.PM_Mux_Stroke_Data_BLE_Payload.PEAK_DRIVE_FORCE_LO) / 10, //lbs
                     averageDriveForce: data.getUint16(ble.PM_Mux_Stroke_Data_BLE_Payload.AVG_DRIVE_FORCE_LO) / 10, //lbs
                     workPerStroke: null,