incyclist-devices 2.1.16 → 2.1.19

package/lib/ble/ble-interface.js

@@ -387,6 +387,8 @@ class BleInterface extends events_1.default {
             let opStr;
             opStr = 'search device';
             this.logEvent({ message: 'search device request', request });
+            const wasLoggingPaused = this.loggingPaused;
+            this.resumeLogging();
             if (this.scanState.isScanning) {
                 try {
                     this.logEvent({ message: `${opStr}: waiting for previous scan to finish` });
@@ -408,6 +410,8 @@ class BleInterface extends events_1.default {
                     this.logEvent({ message: `${opStr} result: timeout`, request });
                     ble.removeAllListeners('discover');
                     this.logEvent({ message: `${opStr}: stop scanning`, request });
+                    if (wasLoggingPaused)
+                        this.pauseLogging();
                     ble.stopScanning(() => {
                         this.scanState.isScanning = false;
                         try {
@@ -440,6 +444,8 @@ class BleInterface extends events_1.default {
                                     this.scanState.timeout = null;
                                 }
                                 this.logEvent({ message: `${opStr}: stop scanning`, request });
+                                if (wasLoggingPaused)
+                                    this.pauseLogging();
                                 ble.stopScanning(() => {
                                     ble.removeAllListeners('discover');
                                     this.scanState.isScanning = false;
@@ -464,8 +470,8 @@ class BleInterface extends events_1.default {
     }
     scan(props = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.resumeLogging();
             this.logEvent({ message: 'starting scan ..' });
+            this.resumeLogging();
             const { timeout, protocol, protocols } = props;
             const requestedProtocols = protocols || [];
             if (protocol && !requestedProtocols.find(p => p === protocol))

package/lib/ble/consts.d.ts

@@ -5,6 +5,9 @@ export declare const FTMS = "1826";
 export declare const FTMS_CP = "2ad9";
 export declare const FTMS_STATUS = "2ada";
 export declare const INDOOR_BIKE_DATA = "2ad2";
+export declare const FTMS_FEATURE = "2acc";
+export declare const RES_LEVEL_RANGE = "2ad6";
+export declare const POWER_RANGE = "2ad8";
 export declare const CSP = "1818";
 export declare const CSP_MEASUREMENT = "2a63";
 export declare const CSP_FEATURE = "2a65";

package/lib/ble/consts.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ELITE_TRAINER_SVC = exports.WAHOO_ADVANCED_TRAINER_CP_FULL = exports.WAHOO_ADVANCED_FTMS = exports.WAHOO_ADVANCED_TRAINER_CP = exports.CSC_MEASUREMENT = exports.CSC = exports.HR_MEASUREMENT = exports.CSP_FEATURE = exports.CSP_MEASUREMENT = exports.CSP = exports.INDOOR_BIKE_DATA = exports.FTMS_STATUS = exports.FTMS_CP = exports.FTMS = exports.TACX_FE_C_TX = exports.TACX_FE_C_RX = exports.TACX_FE_C_BLE = void 0;
+exports.ELITE_TRAINER_SVC = exports.WAHOO_ADVANCED_TRAINER_CP_FULL = exports.WAHOO_ADVANCED_FTMS = exports.WAHOO_ADVANCED_TRAINER_CP = exports.CSC_MEASUREMENT = exports.CSC = exports.HR_MEASUREMENT = exports.CSP_FEATURE = exports.CSP_MEASUREMENT = exports.CSP = exports.POWER_RANGE = exports.RES_LEVEL_RANGE = exports.FTMS_FEATURE = exports.INDOOR_BIKE_DATA = exports.FTMS_STATUS = exports.FTMS_CP = exports.FTMS = exports.TACX_FE_C_TX = exports.TACX_FE_C_RX = exports.TACX_FE_C_BLE = void 0;
 exports.TACX_FE_C_BLE = '6e40fec1';
 exports.TACX_FE_C_RX = '6e40fec2';
 exports.TACX_FE_C_TX = '6e40fec3';
@@ -8,6 +8,9 @@ exports.FTMS = '1826';
 exports.FTMS_CP = '2ad9';
 exports.FTMS_STATUS = '2ada';
 exports.INDOOR_BIKE_DATA = '2ad2';
+exports.FTMS_FEATURE = '2acc';
+exports.RES_LEVEL_RANGE = '2ad6';
+exports.POWER_RANGE = '2ad8';
 exports.CSP = '1818';
 exports.CSP_MEASUREMENT = '2a63';
 exports.CSP_FEATURE = '2a65';

package/lib/ble/wahoo/comms.js

@@ -394,6 +394,6 @@ class BleWahooDevice extends comms_1.default {
 }
 BleWahooDevice.protocol = 'wahoo';
 BleWahooDevice.services = [consts_2.CSP];
-BleWahooDevice.characteristics = ['2acc', '2ad2', '2ad6', '2ad8', '2ad9', '2ada', consts_2.WAHOO_ADVANCED_TRAINER_CP];
+BleWahooDevice.characteristics = [consts_2.FTMS_FEATURE, consts_2.INDOOR_BIKE_DATA, consts_2.RES_LEVEL_RANGE, consts_2.POWER_RANGE, consts_2.FTMS_CP, consts_2.FTMS_STATUS, consts_2.WAHOO_ADVANCED_TRAINER_CP];
 BleWahooDevice.detectionPriority = 5;
 exports.default = BleWahooDevice;

package/lib/serial/base/serial-interface.js

@@ -207,8 +207,7 @@ class SerialInterface extends events_1.default {
             do {
                 if (attemptNo === 0)
                     this.logEvent({ message: 'checking for ports', interface: this.ifaceName, port, excludes: this.inUse });
-                else
-                    attemptNo++;
+                attemptNo++;
                 try {
                     if (isTcpip) {
                         const _binding = binding;

package/lib/serial/daum/DaumAdapter.js

@@ -37,7 +37,7 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
             heartrate: 0
         };
         this.capabilities = [
-            types_1.IncyclistCapability.Power, types_1.IncyclistCapability.Speed, types_1.IncyclistCapability.Cadence, types_1.IncyclistCapability.Gear, types_1.IncyclistCapability.HeartRate,
+            types_1.IncyclistCapability.Power, types_1.IncyclistCapability.Speed, types_1.IncyclistCapability.Cadence, types_1.IncyclistCapability.HeartRate,
             types_1.IncyclistCapability.Control
         ];
     }

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

@@ -17,7 +17,7 @@ const comms_1 = __importDefault(require("../../base/comms"));
 const utils_2 = require("./utils");
 const types_1 = require("../types");
 const ByteLength = require('@serialport/parser-byte-length');
-const TIMEOUT_SEND = 5000;
+const TIMEOUT_SEND = 1000;
 class Daum8008 extends comms_1.default {
     constructor(props) {
         super(props);

package/lib/serial/kettler/ergo-racer/adapter.js

@@ -29,7 +29,7 @@ class KettlerRacerAdapter extends adapter_1.SerialIncyclistDevice {
         this.iv = null;
         this.comms = new comms_1.default({ interface: settings.interface, port: settings.port, logger: this.logger });
         this.capabilities = [
-            types_1.IncyclistCapability.Power, types_1.IncyclistCapability.Speed, types_1.IncyclistCapability.Cadence, types_1.IncyclistCapability.Gear, types_1.IncyclistCapability.HeartRate,
+            types_1.IncyclistCapability.Power, types_1.IncyclistCapability.Speed, types_1.IncyclistCapability.Cadence, types_1.IncyclistCapability.HeartRate,
             types_1.IncyclistCapability.Control
         ];
     }

package/lib/simulator/Simulator.js

@@ -35,7 +35,7 @@ class Simulator extends adpater_1.default {
         const modeSettings = this.isBot ? props.settings : this.getCyclingMode().getSettings();
         this.setCyclingMode(name, modeSettings);
         this.capabilities = [
-            types_1.IncyclistCapability.Power, types_1.IncyclistCapability.Speed, types_1.IncyclistCapability.Cadence, types_1.IncyclistCapability.Gear,
+            types_1.IncyclistCapability.Power, types_1.IncyclistCapability.Speed, types_1.IncyclistCapability.Cadence,
             types_1.IncyclistCapability.Control, types_1.IncyclistCapability.HeartRate
         ];
     }

package/lib/types/capabilities.d.ts

@@ -3,6 +3,5 @@ export declare enum IncyclistCapability {
     Speed = "speed",
     Cadence = "cadence",
     HeartRate = "heartrate",
-    Gear = "gear",
     Control = "control"
 }

package/lib/types/capabilities.js

@@ -7,6 +7,5 @@ var IncyclistCapability;
     IncyclistCapability["Speed"] = "speed";
     IncyclistCapability["Cadence"] = "cadence";
     IncyclistCapability["HeartRate"] = "heartrate";
-    IncyclistCapability["Gear"] = "gear";
     IncyclistCapability["Control"] = "control";
 })(IncyclistCapability || (exports.IncyclistCapability = IncyclistCapability = {}));

package/package.json

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