incyclist-devices 2.3.15 → 2.3.17

package/lib/ble/fm/sensor.js

@@ -217,10 +217,16 @@ class BleFitnessMachineDevice extends sensor_1.TBleSensor {
             const OpCode = data.readUInt8(0);
             switch (OpCode) {
                 case 8:
-                    this.data.targetPower = data.readInt16LE(1);
+                    if (data.length >= 3)
+                        this.data.targetPower = data.readInt16LE(1);
+                    else
+                        this.logEvent({ message: 'warning', fn: 'parseFitnessMachineStatus()', warning: 'invalid message - message too short', data: data.toString('hex') });
                     break;
                 case 6:
-                    this.data.targetInclination = data.readInt16LE(1) / 10;
+                    if (data.length >= 3)
+                        this.data.targetInclination = data.readInt16LE(1) / 10;
+                    else
+                        this.logEvent({ message: 'warning', fn: 'parseFitnessMachineStatus()', warning: 'invalid message - message too short', data: data.toString('hex') });
                     break;
                 case 4:
                     this.data.status = "STARTED";
@@ -230,7 +236,7 @@ class BleFitnessMachineDevice extends sensor_1.TBleSensor {
                     this.data.status = "STOPPED";
                     break;
                 case 20:
-                    {
+                    if (data.length >= 2) {
                         const spinDownStatus = data.readUInt8(1);
                         switch (spinDownStatus) {
                             case 1:
@@ -248,10 +254,14 @@ class BleFitnessMachineDevice extends sensor_1.TBleSensor {
                             default: break;
                         }
                     }
+                    else {
+                        this.logEvent({ message: 'warning', fn: 'parseFitnessMachineStatus()', warning: 'invalid message - message too short', data: data.toString('hex') });
+                    }
+                    break;
             }
         }
         catch (err) {
-            this.logEvent({ message: 'error', fn: 'parseFitnessMachineStatus()', error: err.message | err, stack: err.stack });
+            this.logEvent({ message: 'error', fn: 'parseFitnessMachineStatus()', error: err.message, data: data.toString('hex'), stack: err.stack });
         }
         return Object.assign(Object.assign({}, this.data), { raw: `2ada:${data.toString('hex')}` });
     }

package/lib/factories/adapters.d.ts

@@ -1,7 +1,7 @@
 import { IncyclistDeviceAdapter } from "../base/adpater";
 import { DeviceProperties, DeviceSettings } from "../types/device";
 export default class AdapterFactory {
-    static adapters: IncyclistDeviceAdapter[];
+    protected static adapters: IncyclistDeviceAdapter[];
     static reset(): void;
     static create(settings: DeviceSettings, props?: DeviceProperties): any;
 }

package/lib/factories/adapters.js

@@ -40,10 +40,7 @@ class AdapterFactory {
                 adapter = ble_1.BleAdapterFactory.getInstance('ble').createInstance(settings, props);
                 break;
             case device_1.INTERFACE.DC:
-                {
-                    const factory = ble_1.BleAdapterFactory.getInstance('wifi');
-                    adapter = ble_1.BleAdapterFactory.getInstance('wifi').createInstance(settings, props);
-                }
+                adapter = ble_1.BleAdapterFactory.getInstance('wifi').createInstance(settings, props);
                 break;
             case device_1.INTERFACE.SIMULATOR:
                 adapter = new Simulator_1.Simulator(settings, props);

package/lib/modes/antble-smarttrainer.js

@@ -25,10 +25,10 @@ class SmartTrainerCyclingMode extends power_base_1.default {
     }
     checkSlope(request, newRequest = {}) {
         if (request.slope !== undefined) {
-            newRequest.slope = parseFloat(request.slope.toFixed(1));
+            const targetSlope = newRequest.slope = parseFloat(request.slope.toFixed(1));
             this.data.slope = newRequest.slope;
             try {
-                const slopeAdj = this.getSetting('slopeAdj');
+                const slopeAdj = targetSlope >= 0 ? this.getSetting('slopeAdj') : this.getSetting('slopeAdjDown');
                 if (slopeAdj !== undefined)
                     newRequest.slope = newRequest.slope * slopeAdj / 100;
             }
@@ -59,6 +59,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         catch (err) {
             this.logger.logEvent({ message: "error", fn: 'sendBikeUpdate()', error: err.message, stack: err.stack });
         }
+        console.log('#sendBikeUpdate', newRequest);
         return newRequest;
     }
 }
@@ -68,7 +69,8 @@ SmartTrainerCyclingMode.config = {
     description: "Calculates speed based on power and slope. Slope is set to the device",
     properties: [
         { key: 'bikeType', name: 'Bike Type', description: '', type: types_1.CyclingModeProperyType.SingleSelect, options: ['Race', 'Mountain', 'Triathlon'], default: 'Race' },
-        { key: 'slopeAdj', name: 'Slope Adjustment', description: 'Percentage of slope that should be sent to the SmartTrainer. Should be used in case the slopes are feeling too hard', type: types_1.CyclingModeProperyType.Integer, default: 100, min: 0, max: 200 }
+        { key: 'slopeAdj', name: 'Bike Reality Factor', description: 'Percentage of slope that should be sent to the SmartTrainer. Should be used in case the slopes are feeling too hard', type: types_1.CyclingModeProperyType.Integer, default: 100, min: 0, max: 200 },
+        { key: 'slopeAdjDown', name: 'Bike Reality Factor downhill', description: 'Percentage of slope that should be sent during downhill sections. Should be used to avoid spinning out', type: types_1.CyclingModeProperyType.Integer, default: 50, min: 0, max: 100 }
     ]
 };
 exports.default = SmartTrainerCyclingMode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.3.15",
+  "version": "2.3.17",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",