incyclist-devices 2.0.5 → 2.0.6

package/lib/antv2/fe/adapter.js

@@ -194,8 +194,8 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
             const opts = props || {};
             const { args = {}, user = {} } = opts;
             return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                const { timeout = 20000 } = props || {};
-                const totalTimeout = timeout + 10000;
+                const { startupTimeout = 20000, reconnectTimeout = 2000 } = props || {};
+                const totalTimeout = Math.min(startupTimeout + 10000, startupTimeout * 2);
                 let to;
                 const stopTimeoutCheck = () => {
                     if (to) {
@@ -224,7 +224,7 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
                     }
                     if (this.sensorConnected && !hasData) {
                         try {
-                            yield this.waitForData(timeout);
+                            yield this.waitForData(startupTimeout);
                             hasData = true;
                         }
                         catch (err) {
@@ -235,12 +235,12 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
                             }
                             catch (_a) { }
                             this.started = false;
-                            return reject(new Error('could not start device, reason: no data received'));
+                            return reject(new Error('could not start device, reason:no data received'));
                         }
                     }
                     status = { userSent: false, slopeSent: false };
                     if (!hasData) {
-                        yield (0, utils_2.sleep)(2000);
+                        yield (0, utils_2.sleep)(reconnectTimeout);
                         continue;
                     }
                     if (!this.isReconnecting) {

package/lib/base/adpater.js

@@ -65,8 +65,10 @@ class IncyclistDevice extends events_1.default {
         if (!this.logger || this.paused)
             return;
         this.logger.logEvent(event);
-        const logText = '~~~' + this.getInterface().toUpperCase();
-        console.log(logText, event);
+        if (process.env.BLE_DEBUG || process.env.ANT_DEBUG) {
+            const logText = '~~~' + this.getInterface().toUpperCase();
+            console.log(logText, event);
+        }
     }
     getMaxUpdateFrequency() {
         return this.updateFrequency;

package/lib/ble/base/comms.js

@@ -88,7 +88,9 @@ class BleComms extends events_1.default {
         if (this.logger) {
             this.logger.logEvent(event);
         }
-        console.log('~~~BLE:', event);
+        if (process.env.BLE_DEBUG) {
+            console.log('~~~BLE:', event);
+        }
     }
     setLogger(logger) {
         this.logger = logger;

package/lib/ble/ble-interface.js

@@ -80,7 +80,9 @@ class BleInterface extends events_1.default {
         if (this.logger) {
             this.logger.logEvent(event);
         }
-        console.log('~~BLE:', event);
+        if (process.env.BLE_DEBUG) {
+            console.log('~~BLE:', event);
+        }
     }
     onStateChange(state) {
         if (state !== 'poweredOn') {

package/lib/ble/ble-peripheral.js

@@ -32,7 +32,9 @@ class BlePeripheralConnector {
         if (this.logger) {
             this.logger.logEvent(event);
         }
-        console.log('~~~BLE:', event);
+        if (process.env.BLE_DEBUG) {
+            console.log('~~~BLE:', event);
+        }
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {

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

@@ -68,7 +68,7 @@ export declare class DaumClassicSimulator {
     simulateTimeout(ms: number): void;
     simulateNoResponse(cnt?: number): void;
     simulateIllegalResponse(cnt?: number): void;
-    isPedalling(): 1 | 0;
+    isPedalling(): 0 | 1;
 }
 export declare class DaumClassicMockBinding extends MockPortBinding {
     prevCommand: Buffer;

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

@@ -2,7 +2,7 @@ export declare const DEFAULT_AGE = 30;
 export declare const DEFAULT_USER_WEIGHT = 75;
 export declare const DEFAULT_BIKE_WEIGHT = 10;
 export declare function getCockpit(c: any): "Cardio" | "Fitness" | "Vita De Luxe" | "8008" | "8008 TRS" | "8080" | "Therapie" | "8008 TRS Pro" | "8008 TRS3" | "ergo_lyps Cardio Pro" | "Unknown";
-export declare function getBikeType(type: any): 1 | 0;
+export declare function getBikeType(type: any): 0 | 1;
 export declare function getGender(sex: any): 1 | 2;
 export declare function getLength(length: any): number;
 export declare function getWeight(weight?: any): number;

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

@@ -185,7 +185,6 @@ class DaumPremiumAdapter extends DaumAdapter_1.default {
                     if (!info.version) {
                         info.version = yield this.bike.getProtocolVersion();
                     }
-                    console.log('~~~~ starting Daum8i', this.getCyclingMode().getName(), this.getCyclingMode().getModeProperty('eppSupport'));
                     if (this.getCyclingMode().getModeProperty('eppSupport')) {
                         const bikeType = this.getCyclingMode().getSetting('bikeType');
                         if (!info.upload) {

package/package.json

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