incyclist-devices 2.1.38 → 2.1.40

package/lib/factories/interfaces.d.ts

@@ -3,5 +3,5 @@ import { SerialInterface } from "../serial";
 import AntInterface from "../antv2/base/interface";
 import { BleInterface } from "../ble";
 export default class InterfaceFactory {
-    static create(ifaceName: string, props?: InterfaceProps): AntInterface | BleInterface | SerialInterface;
+    static create(ifaceName: string, props?: InterfaceProps): BleInterface | AntInterface | SerialInterface;
 }

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

@@ -5,14 +5,25 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase i
     protected static config: {
         name: string;
         description: string;
-        properties: {
+        properties: ({
             key: string;
             name: string;
             description: string;
             type: CyclingModeProperyType;
             options: string[];
             default: string;
-        }[];
+            min?: undefined;
+            max?: undefined;
+        } | {
+            key: string;
+            name: string;
+            description: string;
+            type: CyclingModeProperyType;
+            default: number;
+            min: number;
+            max: number;
+            options?: undefined;
+        })[];
     };
     constructor(adapter: IAdapter, props?: any);
     getBikeInitRequest(): UpdateRequest;

package/lib/modes/antble-smarttrainer.js

@@ -27,6 +27,13 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         if (request.slope !== undefined) {
             newRequest.slope = parseFloat(request.slope.toFixed(1));
             this.data.slope = newRequest.slope;
+            try {
+                const slopeAdj = this.getSetting('slopeAdj');
+                if (slopeAdj !== undefined)
+                    newRequest.slope = newRequest.slope * slopeAdj / 100;
+            }
+            catch (_a) {
+            }
         }
     }
     checkEmptyRequest(newRequest) {
@@ -59,7 +66,8 @@ SmartTrainerCyclingMode.config = {
     name: "Smart Trainer",
     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: '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 }
     ]
 };
 exports.default = SmartTrainerCyclingMode;

package/lib/modes/daum-erg.d.ts

@@ -46,4 +46,5 @@ export default class ERGCyclingMode extends PowerBasedCyclingModeBase implements
     private cleanupPrevEvents;
     private checkIsStarting;
     calculateTargetPower(request: any, updateMode?: boolean): any;
+    protected checkForTempPowerAdjustments(request: UpdateRequest): void;
 }

package/lib/modes/daum-erg.js

@@ -39,7 +39,8 @@ class ERGCyclingMode extends power_base_1.default {
                     this.data = {};
                 this.data.slope = request.slope;
             }
-            if (request.targetPower !== undefined) {
+            this.checkForTempPowerAdjustments(request);
+            if (request.targetPower !== undefined || request.gear !== undefined) {
                 delete request.slope;
                 delete request.refresh;
             }
@@ -77,11 +78,15 @@ class ERGCyclingMode extends power_base_1.default {
                 if (request.maxPower !== undefined && request.minPower !== undefined && request.maxPower === request.minPower) {
                     request.targetPower = request.maxPower;
                 }
-                if (request.targetPower === undefined) {
+                if (request.targetPower === undefined && request.gear === undefined) {
                     newRequest.targetPower = this.calculateTargetPower(request);
                 }
                 else {
-                    newRequest.targetPower = request.targetPower;
+                    if (!request.gear || request.targetPower !== undefined)
+                        newRequest.targetPower = request.targetPower;
+                }
+                if (request.gear) {
+                    newRequest.gear = request.gear;
                 }
                 delete request.slope;
                 if (request.maxPower !== undefined) {
@@ -169,6 +174,16 @@ class ERGCyclingMode extends power_base_1.default {
         }
         return target;
     }
+    checkForTempPowerAdjustments(request) {
+        const data = this.getData();
+        if (request.targetPowerDelta && (data === null || data === void 0 ? void 0 : data.gear)) {
+            if (Math.abs(request.targetPowerDelta) === 5)
+                request.gear = data.gear + Math.sign(request.targetPowerDelta);
+            if (Math.abs(request.targetPowerDelta) === 50)
+                request.gear = data.gear + Math.sign(request.targetPowerDelta) * 5;
+            delete request.targetPowerDelta;
+        }
+    }
 }
 ERGCyclingMode.config = {
     isERG: true,

package/lib/modes/power-base.js

@@ -148,6 +148,8 @@ class PowerBasedCyclingModeBase extends base_1.CyclingModeBase {
             data.speed = speed;
             data.distanceInternal = distanceInternal + distance;
         }
+        if (data.speed < 0.1)
+            data.speed = 0;
         return t;
     }
     getCalcBasics(bikeData) {

package/lib/modes/simulator.js

@@ -26,7 +26,7 @@ class SimulatorCyclingMode extends power_base_1.default {
         delete this.event.gearUpdated;
         delete this.event.rpmUpdated;
         try {
-            let rpm = 90;
+            let rpm = bikeData.pedalRpm === undefined ? 90 : bikeData.pedalRpm;
             let power = (!mode || mode.toLowerCase() === 'power') ? Number(this.getSetting('power')) : bikeData.power || 0;
             let slope = (prevData.slope !== undefined ? prevData.slope : prevRequest.slope || 0);
             let speed = mode.toLowerCase() === 'speed' ? Number(this.getSetting('speed')) : bikeData.speed || 0;
@@ -37,11 +37,15 @@ class SimulatorCyclingMode extends power_base_1.default {
             const t = this.getTimeSinceLastUpdate();
             let distance = 0;
             if (!mode || mode.toLowerCase() === 'power') {
+                if (rpm === 0)
+                    power = 0;
                 const res = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });
                 speed = res.speed;
                 distance = res.distance;
             }
             else if (mode.toLowerCase() === 'speed') {
+                if (rpm === 0)
+                    speed = 0;
                 const res = this.calculatePowerAndDistance(speed, slope, m, t, { bikeType });
                 power = res.power;
                 distance = res.distance;
@@ -72,7 +76,8 @@ class SimulatorCyclingMode extends power_base_1.default {
                 data.speed = speed;
                 data.distanceInternal = distanceInternal + distance;
             }
-            data.speed = speed;
+            if (data.speed < 0.1)
+                data.speed = 0;
             data.power = Math.round(power);
             data.distanceInternal = distanceInternal + distance;
             data.slope = slope;

package/lib/modes/types.d.ts

@@ -8,6 +8,7 @@ export type UpdateRequest = {
     reset?: boolean;
     refresh?: boolean;
     init?: boolean;
+    gear?: number;
 };
 export declare enum CyclingModeProperyType {
     Integer = "Integer",

package/lib/serial/daum/DaumAdapter.js

@@ -490,6 +490,9 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
                 if (request.targetPower !== undefined) {
                     yield bike.setTargetPower(request.targetPower);
                 }
+                if (request.gear !== undefined) {
+                    yield bike.setTargetGear(request.gear);
+                }
                 this.requestBusy = false;
                 return request;
             }

package/lib/serial/daum/classic/comms.d.ts

@@ -39,4 +39,5 @@ export default class Daum8008 extends SerialPortComms<DaumClassicCommsState, Dau
     setSlope(slope: number, bike?: number): Promise<SetSlopeRepsonse>;
     setTargetSlope(slope: number): Promise<void>;
     setTargetPower(power: number): Promise<void>;
+    setTargetGear(gear: number): Promise<void>;
 }

package/lib/serial/daum/classic/comms.js

@@ -249,5 +249,15 @@ class Daum8008 extends comms_1.default {
             yield this.setPower(power);
         });
     }
+    setTargetGear(gear) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let target = gear;
+            if (target < 2)
+                target = 1;
+            if (target > 28)
+                target = 28;
+            yield this.setGear(target);
+        });
+    }
 }
 exports.default = Daum8008;

package/lib/serial/daum/premium/comms.d.ts

@@ -24,6 +24,7 @@ export default class Daum8i extends SerialPortComms<DaumPremiumCommsState, DaumP
     sendNAK(logPayload: any): Promise<void>;
     setTargetPower(power: number): Promise<void>;
     setTargetSlope(_slope: number): Promise<void>;
+    setTargetGear(gear: number): Promise<void>;
     getProtocolVersion(): Promise<string>;
     getDashboardVersion(): Promise<string>;
     getDeviceType(): Promise<string>;

package/lib/serial/daum/premium/comms.js

@@ -293,6 +293,16 @@ class Daum8i extends comms_1.default {
     setTargetSlope(_slope) {
         return;
     }
+    setTargetGear(gear) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let target = gear;
+            if (target < 2)
+                target = 1;
+            if (target > 28)
+                target = 28;
+            yield this.setGear(target);
+        });
+    }
     getProtocolVersion() {
         return __awaiter(this, void 0, void 0, function* () {
             const data = yield this.sendStrCommand('getProtocolVersion', 'V00');

package/lib/serial/daum/types.d.ts

@@ -8,6 +8,7 @@ export declare abstract class DaumSerialComms {
     abstract close(): Promise<boolean>;
     abstract setTargetSlope(slope: number): Promise<void>;
     abstract setTargetPower(power: number): Promise<void>;
+    abstract setTargetGear(gear: number): Promise<void>;
 }
 export declare class ResponseTimeout extends Error {
     constructor();

package/lib/simulator/Simulator.d.ts

@@ -41,6 +41,7 @@ export declare class Simulator extends IncyclistDevice<SimulatorProperties> {
     pause(): Promise<boolean>;
     resume(): Promise<boolean>;
     toggle(): Promise<boolean>;
+    adjustCadence(delta: any): void;
     faster(): void;
     slower(): void;
     update(): void;

package/lib/simulator/Simulator.js

@@ -121,6 +121,12 @@ class Simulator extends adpater_1.default {
             }
         });
     }
+    adjustCadence(delta) {
+        this.cadence += delta;
+        if (this.cadence < 0)
+            this.cadence = 0;
+        this.logger.logEvent({ message: 'cadence adjusted', device: this.getName(), cadence: this.cadence });
+    }
     faster() {
         if (this.speed < 15)
             this.speed += 5;
@@ -154,12 +160,13 @@ class Simulator extends adpater_1.default {
         const prevDist = this.data.distanceInternal;
         const d = this.data;
         const prevTime = d.deviceTime;
+        this.data.pedalRpm = this.cadence;
         this.data = this.getCyclingMode().updateData(this.data);
         let data = {
             speed: this.data.speed,
             slope: this.data.slope,
-            power: this.data.power,
-            cadence: this.data.pedalRpm,
+            power: this.cadence === 0 ? 0 : this.data.power,
+            cadence: this.cadence,
             distance: this.data.distanceInternal - prevDist,
             heartrate: Math.round(this.data.power - 10 + Math.random() * 20),
             timestamp: Date.now(),

package/package.json

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