incyclist-devices 2.3.17 → 2.3.22

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/ble/tacx/sensor.d.ts

@@ -3,7 +3,7 @@ import { CrankData } from "../cp";
 import { IndoorBikeData } from "../fm";
 import BleFitnessMachineDevice from "../fm/sensor";
 import { BleProtocol } from "../types";
-import { BleFeBikeData } from "./types";
+import { BleFeBikeData, FECState } from "./types";
 export default class TacxAdvancedFitnessMachineDevice extends BleFitnessMachineDevice {
     static readonly profile: LegacyProfile;
     static readonly protocol: BleProtocol;
@@ -17,6 +17,7 @@ export default class TacxAdvancedFitnessMachineDevice extends BleFitnessMachineD
     protected data: BleFeBikeData;
     protected hasFECData: boolean;
     protected messageCnt: number;
+    protected currentState: FECState;
     protected tacxRx: string;
     protected tacxTx: string;
     protected prevMessages: Record<string, {

package/lib/ble/tacx/sensor.js

@@ -221,7 +221,8 @@ class TacxAdvancedFitnessMachineDevice extends sensor_1.default {
                 break;
             case 2:
                 this.data.State = 'READY';
-                this.resetState();
+                if (this.currentState !== 'READY')
+                    this.resetState();
                 break;
             case 3:
                 this.data.State = 'IN_USE';
@@ -235,6 +236,7 @@ class TacxAdvancedFitnessMachineDevice extends sensor_1.default {
         }
         if (capStateBF & 0x80) {
         }
+        this.currentState = this.data.State;
     }
     parseGeneralFE(data) {
         const equipmentTypeBF = data.readUInt8(1);

package/lib/ble/tacx/types.d.ts

@@ -1,10 +1,11 @@
 import { IndoorBikeData } from "../fm";
+export type FECState = 'OFF' | 'READY' | 'IN_USE' | 'FINISHED';
 export interface BleFeBikeData extends IndoorBikeData {
     EquipmentType?: 'Treadmill' | 'Elliptical' | 'StationaryBike' | 'Rower' | 'Climber' | 'NordicSkier' | 'Trainer' | 'General';
     RealSpeed?: number;
     VirtualSpeed?: number;
     HeartRateSource?: 'HandContact' | 'EM' | 'ANT+';
-    State?: 'OFF' | 'READY' | 'IN_USE' | 'FINISHED';
+    State?: FECState;
     EventCount?: number;
     AccumulatedPower?: number;
     TrainerStatus?: number;

package/lib/modes/antble-smarttrainer.js

@@ -59,7 +59,6 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         catch (err) {
             this.logger.logEvent({ message: "error", fn: 'sendBikeUpdate()', error: err.message, stack: err.stack });
         }
-        console.log('#sendBikeUpdate', newRequest);
         return newRequest;
     }
 }

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

@@ -47,5 +47,5 @@ export declare const FileTimeSupport: {
 };
 export declare function routeToEpp(route: Route, date?: Date): Uint8Array;
 export declare function parseTrainingData(payload: string): IncyclistBikeData;
-export declare function getPersonData(user: User): Buffer;
+export declare function getPersonData(user: User): Buffer<ArrayBuffer>;
 export declare function parsePersonData(buffer: Buffer): User;

package/lib/serial/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "incyclist-devices",
-  "version": "2.3.17",
+  "version": "2.3.22",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",
     "@serialport/parser-readline": "^10.5.0",
     "@serialport/stream": "^10.5.0",
-    "incyclist-ant-plus": "^0.3.3",
+    "incyclist-ant-plus": "^0.3.5",
     "win32filetime": "^1.0.2"
   },
   "peerDependencies": {
@@ -17,14 +17,14 @@
     "@serialport/binding-mock": "^10.2.2",
     "@serialport/bindings-cpp": "^10.8.0",
     "@stoprocent/noble": "^1.15.2",
-    "@types/jest": "^29.5.12",
-    "@types/node": "^22.5.0",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^22.15.18",
     "bonjour-service": "^1.3.0",
-    "eslint": "^8.47.0",
+    "eslint": "^8.57.1",
     "eslint-config-react-app": "^7.0.1",
     "jest": "^29.7.0",
-    "ts-jest": "^29.2.4",
-    "typescript": "^5.5.4"
+    "ts-jest": "^29.3.4",
+    "typescript": "^5.8.3"
   },
   "scripts": {
     "lint": "eslint . --ext .ts",