incyclist-devices 2.4.12 → 2.4.13

package/lib/ble/fm/adapter.js

@@ -294,18 +294,27 @@ 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);
+                            if (update.isHub) {
+                                if (!this.zwiftPlay) {
+                                    this.initVirtualShifting();
+                                }
+                                if (this.zwiftPlay) {
+                                    yield this.zwiftPlay.setIncline(update.slope);
+                                }
+                            }
+                            else {
+                                yield device.setSlope(update.slope);
+                            }
                             res.slope = update.slope;
                         }
-                        if (update.targetPower !== undefined) {
+                        if (update.targetPower !== undefined && !update.isHub) {
                             const tp = update.targetPower > 0 ? update.targetPower : 0;
                             yield device.setTargetPower(tp);
                             res.targetPower = tp;
                         }
-                        if (update.targetResistance !== undefined) {
+                        if (update.targetResistance !== undefined && !update.isHub) {
                             yield device.setTargetResistanceLevel(update.targetResistance);
                             res.targetResistance = update.targetResistance;
                         }
@@ -314,10 +323,6 @@ class BleFmAdapter extends adapter_1.default {
                                 this.initVirtualShifting();
                             }
                             if (this.zwiftPlay && !Number.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);
                                 res.gearRatio = gearRatio;
                             }

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

@@ -1,6 +1,6 @@
 import { EventLogger } from "gd-eventlog";
 import { LegacyProfile } from "../../../antv2/types";
-import { HubCommand, HubRequest, SimulationParam } from "../../../proto/zwift_hub";
+import { DeviceSettingsSubContent, HubCommand, HubRequest, SimulationParam } from "../../../proto/zwift_hub";
 import { TBleSensor } from "../../base/sensor";
 import { BleProtocol, IBlePeripheral } from "../../types";
 import { EventEmitter } from "events";
@@ -37,6 +37,8 @@ export declare class BleZwiftPlaySensor extends TBleSensor {
     protected initHubServicePromise: Promise<boolean>;
     protected pairPromise: Promise<boolean>;
     protected subscribePromise: Promise<boolean>;
+    protected prevHubSettings: DeviceSettingsSubContent | undefined;
+    protected prevcWax10000: number;
     constructor(peripheral: IBlePeripheral | TBleSensor, props?: BleZwiftPlaySensorProps);
     reconnectSensor(): Promise<void>;
     stopSensor(): Promise<boolean>;
@@ -44,6 +46,7 @@ export declare class BleZwiftPlaySensor extends TBleSensor {
     onData(characteristic: string, data: Buffer, isNotify?: boolean): boolean;
     requestDataUpdate(dataId: number): Promise<void>;
     setSimulationData(data?: SimulationParam): Promise<void>;
+    setIncline(incline: number): Promise<void>;
     setGearRatio(gearRatio: number): Promise<number>;
     protected sendPlayCommand(id: number, command: Buffer): Promise<Buffer<ArrayBufferLike>>;
     protected onMeasurement(d: Buffer): boolean;

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

@@ -74,7 +74,7 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
     }
     setSimulationData(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e, _f, _g;
             try {
                 if (!this.isHubServiceActive) {
                     yield this.initHubService(false);
@@ -87,7 +87,19 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
                 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 };
+                const simulation = {};
+                if (inclineX100 !== ((_e = this.prevHubSettings) === null || _e === void 0 ? void 0 : _e.inclineX100)) {
+                    simulation.inclineX100 = inclineX100;
+                }
+                if (crrx100000 !== ((_f = this.prevHubSettings) === null || _f === void 0 ? void 0 : _f.crrx100000))
+                    simulation.crrx100000 = crrx100000;
+                if (cWax10000 !== this.prevcWax10000) {
+                    simulation.cWax10000 = cWax10000;
+                    this.prevcWax10000 = cWax10000;
+                }
+                if (windx100 !== ((_g = this.prevHubSettings) === null || _g === void 0 ? void 0 : _g.windx100)) {
+                    simulation.windx100 = windx100;
+                }
                 yield this.sendHubCommand({ simulation });
                 yield this.requestDataUpdate(512);
             }
@@ -96,8 +108,15 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
             }
         });
     }
+    setIncline(incline) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const inclineX100 = Math.round(incline * 100);
+            yield this.setSimulationData({ inclineX100 });
+        });
+    }
     setGearRatio(gearRatio) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
             try {
                 if (!this.isHubServiceActive) {
                     yield this.initHubService();
@@ -107,10 +126,18 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
                 const gearRatioX10000 = Math.round(gearRatio * 10000);
                 const bikeWeightx100 = 10 * 100;
                 const riderWeightx100 = 75 * 100;
-                const command = {
-                    physical: { bikeWeightx100, gearRatioX10000, riderWeightx100 }
-                };
-                yield this.sendHubCommand(command);
+                const physical = {};
+                if (bikeWeightx100 !== ((_a = this.prevHubSettings) === null || _a === void 0 ? void 0 : _a.bikeWeightx100))
+                    physical.bikeWeightx100 = bikeWeightx100;
+                if (riderWeightx100 !== ((_b = this.prevHubSettings) === null || _b === void 0 ? void 0 : _b.riderWeightx100))
+                    physical.riderWeightx100 = riderWeightx100;
+                if (gearRatioX10000 !== ((_c = this.prevHubSettings) === null || _c === void 0 ? void 0 : _c.gearRatiox10000)) {
+                    physical.gearRatioX10000 = gearRatioX10000;
+                }
+                if (Object.keys(physical).length === 0) {
+                    return;
+                }
+                yield this.sendHubCommand({ physical });
                 yield this.requestDataUpdate(512);
             }
             catch (err) {
@@ -279,6 +306,7 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
                 const si = zwift_hub_1.DeviceSettings.fromBinary(payload);
                 this.emit('hub-settings', si === null || si === void 0 ? void 0 : si.subContent);
                 this.logEvent({ message: 'hub settings update', settings: si === null || si === void 0 ? void 0 : si.subContent });
+                this.prevHubSettings = si === null || si === void 0 ? void 0 : si.subContent;
             }
         }
         catch (err) {
@@ -485,6 +513,7 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
         this.isHubServiceSubscribed = false;
         this.isHubServiceActive = false;
         delete this.initHubServicePromise;
+        delete this.prevHubSettings;
     }
     getManufacturerData() {
         const data = this.peripheral.getManufacturerData();

package/lib/modes/antble-smarttrainer.d.ts

@@ -1,7 +1,7 @@
 import ICyclingMode, { CyclingModeConfig, CyclingModeProperyType, UpdateRequest } from "./types";
 import PowerBasedCyclingModeBase from "./power-base";
 import { IAdapter, IncyclistBikeData } from "../types";
-type VirtshiftMode = 'Disabled' | 'SlopeDelta' | 'Adapter' | 'Simulated';
+export type VirtshiftMode = 'Disabled' | 'SlopeDelta' | 'Adapter' | 'Simulated';
 export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase implements ICyclingMode {
     protected static config: {
         name: string;
@@ -61,4 +61,3 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase i
     protected getGearString(): string;
     protected getFeatureToogle(): import("../features").FeatureToggle;
 }
-export {};

package/lib/modes/antble-smarttrainer.js

@@ -57,7 +57,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         if (virtshiftMode === 'Adapter') {
             this.gear = (0, utils_1.intVal)(this.getSetting('startGear'));
             const gearRatio = this.gearRatios[this.gear - 1];
-            return { slope: 0, gearRatio };
+            return { slope: 0, gearRatio, isHub: true };
         }
         this.prevRequest = { slope: 0 };
         return { slope: 0 };
@@ -135,6 +135,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         this.checkSlopeNoShiftig(request, newRequest);
         const gear = (_a = this.gear) !== null && _a !== void 0 ? _a : this.getSetting('startGear');
         newRequest.gearRatio = this.gearRatios[gear - 1];
+        newRequest.isHub = true;
     }
     getSlopeDelta() {
         return this.gearDelta * 0.5;

package/lib/modes/types.d.ts

@@ -14,6 +14,7 @@ export type UpdateRequest = {
     gear?: number;
     gearRatio?: number;
     forced?: boolean;
+    isHub?: boolean;
 };
 export declare enum CyclingModeProperyType {
     Integer = "Integer",

package/package.json

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