incyclist-devices 2.3.35 → 2.3.37

package/lib/ble/base/adapter.d.ts

@@ -13,6 +13,7 @@ export default class BleAdapter<TDeviceData extends BleDeviceData, TDevice exten
     protected lastDataTS: number;
     protected device: TDevice;
     protected onDeviceDataHandler: any;
+    protected onDeviceDisconnectHandler: any;
     protected startTask: InteruptableTask<TaskState, boolean>;
     constructor(settings: BleDeviceSettings, props?: DeviceProperties);
     getUniqueName(): string;

package/lib/ble/base/adapter.js

@@ -21,6 +21,7 @@ class BleAdapter extends adpater_1.default {
     constructor(settings, props) {
         super(settings, props);
         this.onDeviceDataHandler = this.onDeviceData.bind(this);
+        this.onDeviceDisconnectHandler = this.emit.bind(this);
         this.deviceData = {};
         this.data = {};
         this.dataMsgCount = 0;
@@ -346,7 +347,7 @@ class BleAdapter extends adpater_1.default {
             yield sensor.subscribe();
             if (connected) {
                 sensor.on('data', this.onDeviceDataHandler);
-                sensor.on('disconnected', this.emit.bind(this));
+                sensor.on('disconnected', this.onDeviceDisconnectHandler);
                 sensor.on('error', console.log);
                 connected = yield sensor.pair();
             }
@@ -386,6 +387,9 @@ class BleAdapter extends adpater_1.default {
                 return true;
             }
             const sensor = this.getSensor();
+            sensor.off('data', this.onDeviceDataHandler);
+            sensor.off('disconnected', this.onDeviceDisconnectHandler);
+            sensor.off('error', console.log);
             sensor.reset();
             this.resetData();
             this.stopped = true;

package/lib/ble/fm/adapter.js

@@ -269,6 +269,7 @@ class BleFmAdapter extends adapter_1.default {
                 const device = this.getSensor();
                 if (this.hasCapability(types_1.IncyclistCapability.Control)) {
                     const send = () => __awaiter(this, void 0, void 0, function* () {
+                        var _a;
                         const res = {};
                         if (update.slope !== undefined) {
                             yield device.setSlope(update.slope);
@@ -283,9 +284,12 @@ class BleFmAdapter extends adapter_1.default {
                             if (!this.zwiftPlay) {
                                 this.initVirtualShifting();
                             }
-                            if (this.zwiftPlay) {
+                            if (this.zwiftPlay && !isNaN(update.gearRatio)) {
+                                let slope = (_a = update.slope) !== null && _a !== void 0 ? _a : 0;
+                                if (slope === 0)
+                                    slope = 0.01;
+                                yield this.zwiftPlay.setSimulationData({ inclineX100: slope * 100 });
                                 const gearRatio = yield this.zwiftPlay.setGearRatio(update.gearRatio);
-                                yield this.zwiftPlay.setSimulationData({ inclineX100: update.slope * 100 });
                                 res.gearRatio = gearRatio;
                             }
                         }

package/lib/ble/zwift/play/sensor.d.ts

@@ -27,8 +27,9 @@ export declare class BleZwiftPlaySensor extends TBleSensor {
     protected isFM: boolean;
     protected tsLastRidingData: number;
     protected isHubServiceActive: boolean;
-    protected isPaired: boolean;
-    protected isSubscribed: boolean;
+    protected isHubServicePaired: boolean;
+    protected isHubServiceSubscribed: boolean;
+    protected initHubServicePromise: Promise<boolean>;
     constructor(peripheral: IBlePeripheral | TBleSensor, props?: any);
     reconnectSensor(): Promise<void>;
     stopSensor(): Promise<boolean>;

package/lib/ble/zwift/play/sensor.js

@@ -74,11 +74,14 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
             if (!this.isHubServiceActive) {
                 yield this.initHubService(false);
             }
-            const crrx100000 = Math.round((_a = data === null || data === void 0 ? void 0 : data.crrx100000) !== null && _a !== void 0 ? _a : 5100);
-            const cWax10000 = Math.round((_b = data === null || data === void 0 ? void 0 : data.cWax10000) !== null && _b !== void 0 ? _b : 400);
+            const crrx100000 = Math.round((_a = data === null || data === void 0 ? void 0 : data.crrx100000) !== null && _a !== void 0 ? _a : 400);
+            const cWax10000 = Math.round((_b = data === null || data === void 0 ? void 0 : data.cWax10000) !== null && _b !== void 0 ? _b : 5100);
             const windx100 = Math.round((_c = data === null || data === void 0 ? void 0 : data.windx100) !== null && _c !== void 0 ? _c : 0);
-            const inclineX100 = Math.round((_d = data === null || data === void 0 ? void 0 : data.inclineX100) !== null && _d !== void 0 ? _d : 0);
+            let inclineX100 = Math.round((_d = data === null || data === void 0 ? void 0 : data.inclineX100) !== null && _d !== void 0 ? _d : 1);
+            if (inclineX100 === 0 || Number.isNaN(inclineX100))
+                inclineX100 = 1;
             const simulation = { inclineX100, crrx100000, cWax10000, windx100 };
+            console.log('# set simulation data', simulation);
             yield this.sendHubCommand({ simulation });
             yield this.requestDataUpdate(512);
         });
@@ -142,17 +145,21 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
     }
     initHubService() {
         return __awaiter(this, arguments, void 0, function* (setSimulation = true) {
-            console.log('# init Hub Service');
+            if (!this.isHubServiceActive && this.initHubServicePromise !== undefined) {
+                yield this.initHubServicePromise;
+            }
             if (this.isHubServiceActive)
                 return true;
-            if (!this.isPaired) {
+            this.logEvent({ message: 'init hub service', paired: this.paired, subscribed: this.isHubServiceSubscribed });
+            console.log('# init Hub Service');
+            if (!this.isHubServicePaired) {
                 yield this.pair();
             }
-            if (!this.isSubscribed) {
+            if (!this.isHubServiceSubscribed) {
                 yield this.subscribe();
-                this.isSubscribed = true;
+                this.isHubServiceSubscribed = true;
             }
-            return new Promise((done) => {
+            this.initHubServicePromise = new Promise((done) => {
                 let timeout = setTimeout(() => {
                     done(false);
                 }, 2000);
@@ -163,7 +170,9 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
                     }
                     this.isHubServiceActive = true;
                     console.log('# init hub service completed');
+                    this.logEvent({ message: 'init hub service done', paired: this.paired, subscribed: this.isHubServiceSubscribed });
                     if (setSimulation) {
+                        this.logEvent({ message: 'hub: send initial simulation data' });
                         this.setSimulationData().then(() => {
                             done(true);
                         })
@@ -186,6 +195,7 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
                     this.logEvent({ message: 'could not init hub service', reason: err.message });
                 });
             });
+            return this.initHubServicePromise;
         });
     }
     sendHubRequest(request) {
@@ -344,7 +354,7 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
     pair() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            if (this.isPaired)
+            if (this.isHubServicePaired)
                 return true;
             let manufacturerData;
             try {
@@ -380,12 +390,12 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
                     message = Buffer.concat([Buffer.from('RideOn'), Buffer.from([0x01, 0x02]), this.publicKey]);
                 }
                 yield this.write((0, utils_1.fullUUID)('00000003-19ca-4651-86e5-fa29dcdd09d1'), message, { withoutResponse: true });
-                this.isPaired = true;
+                this.isHubServicePaired = true;
                 return true;
             }
             catch (err) {
                 this.logEvent({ message: 'error', fn: 'pair', error: err.message, stack: err.stack });
-                this.isPaired = false;
+                this.isHubServicePaired = false;
                 return false;
             }
         });
@@ -406,6 +416,10 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
         this.paired = false;
         this.encrypted = false;
         this.deviceKey = null;
+        this.isHubServicePaired = false;
+        this.isHubServiceSubscribed = false;
+        this.isHubServiceActive = false;
+        delete this.initHubServicePromise;
     }
     getManufacturerData() {
         const data = this.peripheral.getManufacturerData();

package/lib/direct-connect/base/peripheral.js

@@ -154,6 +154,7 @@ class DirectConnectPeripheral {
             if (this.subscribed.includes(uuid)) {
                 return true;
             }
+            console.log('# subscribe ', characteristicUUID);
             const seqNo = this.getNextSeqNo();
             const message = new messages_1.EnableCharacteristicNotificationsMessage();
             const request = message.createRequest(seqNo, { characteristicUUID: (0, utils_1.parseUUID)(characteristicUUID), enable: true });

package/lib/modes/antble-smarttrainer.js

@@ -83,7 +83,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             virtshift.default = 'SmartTrainer';
         }
         if (!startGear) {
-            startGear = { key: 'startGear', name: 'Initial Gear', description: 'Initial Gear', type: types_1.CyclingModeProperyType.Integer, default: 10, min: 1, max: 24, condition: (s) => (s === null || s === void 0 ? void 0 : s.virtshift) === 'Incyclist' || (s === null || s === void 0 ? void 0 : s.virtshift) === 'SmartTrainer' };
+            startGear = { key: 'startGear', name: 'Initial Gear', description: 'Initial Gear', type: types_1.CyclingModeProperyType.Integer, default: 12, min: 1, max: 24, condition: (s) => (s === null || s === void 0 ? void 0 : s.virtshift) === 'Incyclist' || (s === null || s === void 0 ? void 0 : s.virtshift) === 'SmartTrainer' };
             config.properties.push(startGear);
         }
         return config;
@@ -102,7 +102,10 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         }
     }
     checkSlopeWithAdapterShifting(request, newRequest = {}) {
-        return this.checkSlopeNoShiftig(request, newRequest);
+        var _a;
+        this.checkSlopeNoShiftig(request, newRequest);
+        const gear = (_a = this.gear) !== null && _a !== void 0 ? _a : this.getSetting('startGear');
+        newRequest.gearRatio = this.gearRatios[gear - 1];
     }
     getSlopeDelta() {
         return this.gearDelta * 0.5;
@@ -122,7 +125,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         }
     }
     checkSlopeWithSimulatedShifting(request, newRequest = {}) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         if (this.gear === undefined) {
             this.checkSlopeNoShiftig(request, newRequest);
             return;
@@ -138,15 +141,34 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                 if (slopeAdj !== undefined)
                     this.simSlope = this.simSlope * slopeAdj / 100;
             }
-            catch (_e) {
+            catch (_f) {
             }
-            if (this.data.slope !== prev) {
-                const virtualSpeed = (0, calculations_1.calculateVirtualSpeed)(this.data.pedalRpm, this.gearRatios[this.gear - 1]);
-                const m = (_c = (_b = this.adapter) === null || _b === void 0 ? void 0 : _b.getWeight()) !== null && _c !== void 0 ? _c : 85;
-                this.simPower = calculations_1.default.calculatePower(m, virtualSpeed, (_d = this.simSlope) !== null && _d !== void 0 ? _d : 0);
-                this.verifySimPower();
-                this.logger.logEvent({ message: 'set simulater power', power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope });
+            const virtualSpeed = (0, calculations_1.calculateVirtualSpeed)(this.data.pedalRpm, this.gearRatios[this.gear - 1]);
+            const m = (_c = (_b = this.adapter) === null || _b === void 0 ? void 0 : _b.getWeight()) !== null && _c !== void 0 ? _c : 85;
+            const vCurrent = this.data.speed * 1000 / 3600;
+            const eKinCurrent = m * vCurrent * vCurrent / 2;
+            const newPower = calculations_1.default.calculatePower(m, virtualSpeed, (_d = this.simSlope) !== null && _d !== void 0 ? _d : 0);
+            const prevPower = this.data.power;
+            if (this.data.speed < 10 && this.data.isPedalling && (this.data.slope < 1 || this.data.speed === 0)) {
+                this.simPower = Math.max(newPower, prevPower);
+                this.logger.logEvent({ message: 'set simulater power', power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevPower, newPower });
             }
+            else if (this.data.slope === prev && newPower < prevPower) {
+                this.simPower = prevPower;
+                this.logger.logEvent({ message: 'set simulater power', power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, prevPower, newPower });
+            }
+            else {
+                const powerDiff = newPower - prevPower;
+                const vTarget = virtualSpeed * 1000 / 3600;
+                const eKinTarget = m * vTarget * vTarget / 2;
+                const eKinPrev = eKinCurrent;
+                const delta = eKinTarget - eKinPrev;
+                const eKinAfter1sec = eKinPrev - powerDiff * 1;
+                const vAfter1sec = Math.sqrt(2 * eKinAfter1sec / m) * 3600 / 1000;
+                this.simPower = calculations_1.default.calculatePower(m, vAfter1sec / 3.6, (_e = this.simSlope) !== null && _e !== void 0 ? _e : 0);
+                this.logger.logEvent({ message: 'set simulater power', power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, eKinPrev, eKinTarget, delta, prevPower, newPower });
+            }
+            this.verifySimPower();
         }
         newRequest.targetPower = this.simPower;
     }
@@ -195,13 +217,17 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                         this.gear = this.gearRatios.length;
                     }
                     delete request.gearDelta;
-                    const virtualSpeed = (0, calculations_1.calculateVirtualSpeed)(this.data.pedalRpm, this.gearRatios[this.gear - 1]);
-                    const m = (_b = (_a = this.adapter) === null || _a === void 0 ? void 0 : _a.getWeight()) !== null && _b !== void 0 ? _b : 85;
-                    this.simPower = calculations_1.default.calculatePower(m, virtualSpeed, (_d = (_c = this.simSlope) !== null && _c !== void 0 ? _c : this.data.slope) !== null && _d !== void 0 ? _d : 0);
-                    this.verifySimPower();
-                    this.logger.logEvent({ message: 'set simulater power', power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope });
-                    this.adapter.sendUpdate({ targetPower: this.simPower }).then(() => {
-                    });
+                    if (this.data.pedalRpm > 0) {
+                        const virtualSpeed = (0, calculations_1.calculateVirtualSpeed)(this.data.pedalRpm, this.gearRatios[this.gear - 1]);
+                        const m = (_b = (_a = this.adapter) === null || _a === void 0 ? void 0 : _a.getWeight()) !== null && _b !== void 0 ? _b : 85;
+                        this.simPower = calculations_1.default.calculatePower(m, virtualSpeed, (_d = (_c = this.simSlope) !== null && _c !== void 0 ? _c : this.data.slope) !== null && _d !== void 0 ? _d : 0);
+                        this.verifySimPower();
+                        this.logger.logEvent({ message: 'set simulater power', power: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope });
+                        this.adapter.sendUpdate({ targetPower: this.simPower }).then(() => { });
+                    }
+                    else {
+                        delete this.simPower;
+                    }
                 }
                 break;
             case 'Adapter':
@@ -258,6 +284,9 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         if (this.data.pedalRpm > 0 && this.simPower < MIN_POWER) {
             this.simPower = MIN_POWER;
         }
+        if (!this.data.isPedalling) {
+            delete this.simPower;
+        }
     }
     checkEmptyRequest(newRequest) {
         if (Object.keys(newRequest).length === 0) {
@@ -339,14 +368,21 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         return newRequest;
     }
     getGearString() {
+        var _a, _b, _c, _d;
         const mode = this.getVirtualShiftMode();
         if (mode === "Disabled")
             return undefined;
-        if (mode === 'Simulated' && (this.gear === undefined || this.gear === null))
-            return '';
+        if (mode === 'Simulated') {
+            this.gear = (_b = (_a = this.gear) !== null && _a !== void 0 ? _a : this.getSetting('startGear')) !== null && _b !== void 0 ? _b : 0;
+            return this.gear.toString();
+        }
         if (mode === "SlopeDelta")
             return this.gearDelta > 0 ? `+${this.gearDelta}` : `${this.gearDelta}`;
-        return this.gear.toString();
+        if (mode === 'Adapter') {
+            this.gear = (_c = this.gear) !== null && _c !== void 0 ? _c : this.getSetting('startGear');
+            return this.gear.toString();
+        }
+        return (_d = this.gear) === null || _d === void 0 ? void 0 : _d.toString();
     }
 }
 SmartTrainerCyclingMode.config = {

package/lib/modes/power-base.js

@@ -179,6 +179,7 @@ class PowerBasedCyclingModeBase extends base_1.CyclingModeBase {
     }
     copyBikeData(data, bikeData) {
         var _a;
+        const prevCadence = data.pedalRpm;
         const keys = Object.keys(bikeData);
         keys.forEach(key => {
             if (bikeData[key] === null)
@@ -195,7 +196,10 @@ class PowerBasedCyclingModeBase extends base_1.CyclingModeBase {
         if (data.slope === undefined)
             data.slope = 0;
         if (bikeData.isPedalling === undefined)
-            data.isPedalling = data.pedalRpm > 0;
+            (data.isPedalling = data.pedalRpm > 0 || data.power > 0);
+        if (bikeData.pedalRpm === 0 && bikeData.power > 0 && prevCadence !== undefined) {
+            data.pedalRpm = prevCadence;
+        }
         if (((_a = this.prevRequest) === null || _a === void 0 ? void 0 : _a.slope) !== undefined) {
             data.slope = this.prevRequest.slope;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.3.35",
+  "version": "2.3.37",
   "dependencies": {
     "@protobuf-ts/runtime": "^2.11.1",
     "@serialport/bindings-interface": "^1.2.2",