incyclist-devices 2.3.16 → 2.3.19

package/lib/antv2/cad/adapter.d.ts

@@ -1,7 +1,7 @@
 import { CadenceSensorState, Profile } from "incyclist-ant-plus";
 import AntAdapter from "../base/adapter";
 import { AntDeviceProperties, AntDeviceSettings, LegacyProfile } from "../types";
-export default class AntHrAdapter extends AntAdapter<CadenceSensorState> {
+export default class AntCadAdapter extends AntAdapter<CadenceSensorState> {
     protected static INCYCLIST_PROFILE_NAME: LegacyProfile;
     protected static ANT_PROFILE_NAME: Profile;
     constructor(settings: AntDeviceSettings, props?: AntDeviceProperties);

package/lib/antv2/cad/adapter.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const adapter_1 = __importDefault(require("../base/adapter"));
 const types_1 = require("../../types");
-class AntHrAdapter extends adapter_1.default {
+class AntCadAdapter extends adapter_1.default {
     constructor(settings, props) {
         super(settings, props);
         this.capabilities = [types_1.IncyclistCapability.Cadence];
@@ -20,6 +20,6 @@ class AntHrAdapter extends adapter_1.default {
         return this.deviceData.CalculatedCadence !== undefined && this.deviceData.CalculatedCadence !== null;
     }
 }
-AntHrAdapter.INCYCLIST_PROFILE_NAME = 'Cadence Sensor';
-AntHrAdapter.ANT_PROFILE_NAME = 'CAD';
-exports.default = AntHrAdapter;
+AntCadAdapter.INCYCLIST_PROFILE_NAME = 'Cadence Sensor';
+AntCadAdapter.ANT_PROFILE_NAME = 'CAD';
+exports.default = AntCadAdapter;

package/lib/antv2/sc/adapter.js

@@ -8,7 +8,7 @@ const types_1 = require("../../types");
 class AntSpdAdapter extends adapter_1.default {
     mapToAdapterData(deviceData) {
         if (deviceData.CalculatedSpeed !== undefined) {
-            this.data.speed = deviceData.CalculatedSpeed;
+            this.data.speed = deviceData.CalculatedSpeed * 3.6;
             this.data.timestamp = Date.now();
         }
         if (deviceData.CalculatedDistance !== undefined) {

package/lib/antv2/spd/adapter.js

@@ -8,7 +8,7 @@ const types_1 = require("../../types");
 class AntSpdAdapter extends adapter_1.default {
     mapToAdapterData(deviceData) {
         if (deviceData.CalculatedSpeed !== undefined) {
-            this.data.speed = deviceData.CalculatedSpeed;
+            this.data.speed = deviceData.CalculatedSpeed * 3.6;
             this.data.timestamp = Date.now();
         }
         if (deviceData.CalculatedDistance !== undefined) {

package/lib/ble/characteristics/csc/measurement.js

@@ -56,7 +56,8 @@ class CscMeasurement {
             }
             if (c.revolutions < p.revolutions)
                 revs += 0x10000;
-            rpm = 1024 * 60 * revs / time;
+            const seconds = time / 1024;
+            rpm = 60 * revs / seconds;
         }
         else if (p.cntUpdateMissing < 0 || p.cntUpdateMissing > 2) {
             rpm = 0;
@@ -85,7 +86,8 @@ class CscMeasurement {
                 time += 0x10000;
                 this.timeOffset += 0x10000;
             }
-            const rps = 1024 * revs / time;
+            const seconds = time / 1024;
+            const rps = revs / seconds;
             speed = rps * this.cw;
         }
         else if (p.cntUpdateMissing < 0 || p.cntUpdateMissing > 2) {

package/lib/ble/csc/adapter.js

@@ -58,7 +58,7 @@ class BleCSCAdapter extends adapter_1.default {
     }
     mapData(deviceData) {
         const { cadence, speed } = deviceData;
-        return { cadence, speed };
+        return { cadence, speed: speed * 3.6 };
     }
 }
 exports.BleCSCAdapter = BleCSCAdapter;

package/lib/ble/csc/sensor.js

@@ -31,7 +31,9 @@ class BleCyclingSpeedCadenceDevice extends sensor_1.TBleSensor {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const data = yield this.read(consts_1.CSC_FEATURE);
-                return this.featureParser.parse(data);
+                const features = this.featureParser.parse(data);
+                this.logEvent({ message: 'supported features', features, raw: data === null || data === void 0 ? void 0 : data.toString('hex') });
+                return features;
             }
             catch (err) {
                 this.logEvent({ message: 'read failed', characteristic: consts_1.CSC_FEATURE, reason: err.message });

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;
             }
@@ -68,7 +68,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.16",
+  "version": "2.3.19",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",