incyclist-devices 1.4.69 → 1.4.72

package/lib/ble/fm.js

@@ -426,8 +426,8 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
         return __awaiter(this, void 0, void 0, function* () {
             const hasControl = yield this.requestControl();
             if (!hasControl) {
-                this.logEvent({ message: 'setTargetInclination failed', reason: 'control is disabled' });
-                return;
+                this.logEvent({ message: 'setIndoorBikeSimulation failed', reason: 'control is disabled' });
+                return false;
             }
             const data = Buffer.alloc(7);
             data.writeUInt8(17, 0);

package/lib/ble/wahoo-kickr.d.ts

@@ -34,6 +34,7 @@ export default class WahooAdvancedFitnessMachineDevice extends BleFitnessMachine
     currentCrankData: CrankData;
     timeOffset: number;
     tsPrevWrite: any;
+    prevSlope: any;
     constructor(props?: any);
     isMatching(characteristics: string[]): boolean;
     init(): Promise<boolean>;

package/lib/ble/wahoo-kickr.js

@@ -37,7 +37,7 @@ const Device_1 = require("../Device");
 const gd_eventlog_1 = require("gd-eventlog");
 const fm_1 = __importStar(require("./fm"));
 const WAHOO_ADVANCED_FTMS = 'a026e00b';
-const WAHOO_ADVANCED_TRAINER_CP = 'a026e037';
+const WAHOO_ADVANCED_TRAINER_CP = 'a026e005';
 const cwABike = {
     race: 0.35,
     triathlon: 0.29,
@@ -52,6 +52,7 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
         this.currentCrankData = undefined;
         this.timeOffset = 0;
         this.tsPrevWrite = undefined;
+        this.prevSlope = undefined;
         this.data = {};
     }
     isMatching(characteristics) {
@@ -196,6 +197,8 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
             if (this.hasControl)
                 return true;
             this.logEvent({ message: 'requestControl' });
+            this.hasControl = true;
+            return;
             const data = Buffer.alloc(2);
             data.writeUInt8(0xEE, 0);
             data.writeUInt8(0xFC, 1);
@@ -264,8 +267,9 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
     setSimGrade(slope) {
         return __awaiter(this, void 0, void 0, function* () {
             const value = (Math.min(1, Math.max(-1, slope)) + 1.0) * 65535 / 2.0;
+            const slopeVal = Math.floor(value);
             const data = Buffer.alloc(2);
-            data.writeInt16LE(Math.round(value), 0);
+            data.writeInt16LE(slopeVal, 0);
             const res = yield this.writeWahooFtmsMessage(70, data);
             return res;
         });
@@ -295,8 +299,23 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
     setSlope(slope) {
         return __awaiter(this, void 0, void 0, function* () {
             this.logEvent({ message: 'setSlope', slope });
-            const { windSpeed, crr, cw } = this;
-            return yield this.setIndoorBikeSimulation(windSpeed, slope, crr, cw);
+            if (this.prevSlope !== undefined && slope === this.prevSlope)
+                return;
+            try {
+                const hasControl = yield this.requestControl();
+                if (!hasControl) {
+                    this.logEvent({ message: 'setTargetPower failed', reason: 'control is disabled' });
+                    return false;
+                }
+                const res = yield this.setSimGrade(slope);
+                this.logEvent({ message: 'setSlope result', res });
+                this.prevSlope = slope;
+                return res;
+            }
+            catch (err) {
+                this.logEvent({ message: 'setSlope failed', reason: err.message || err });
+                this.prevSlope = undefined;
+            }
         });
     }
     reset() {
@@ -304,7 +323,7 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
     }
 }
 exports.default = WahooAdvancedFitnessMachineDevice;
-WahooAdvancedFitnessMachineDevice.services = ['a026ee0b'];
+WahooAdvancedFitnessMachineDevice.services = ['1818'];
 WahooAdvancedFitnessMachineDevice.characteristics = ['2acc', '2ad2', '2ad6', '2ad8', '2ad9', '2ada', WAHOO_ADVANCED_TRAINER_CP];
 ble_interface_1.default.register('WahooAdvancedFitnessMachineDevice', 'wahoo-fm', WahooAdvancedFitnessMachineDevice, WahooAdvancedFitnessMachineDevice.services);
 class WahooAdvancedFmAdapter extends fm_1.FmAdapter {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "1.4.69",
+  "version": "1.4.72",
   "dependencies": {
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",