incyclist-devices 1.4.100 → 1.4.102

package/lib/ble/ble-device.js

@@ -54,7 +54,9 @@ class BleDevice extends ble_1.BleDeviceClass {
         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;
@@ -336,9 +338,9 @@ class BleDevice extends ble_1.BleDeviceClass {
     }
     write(characteristicUuid, data, props) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.isConnected())
+                throw new Error('not connected');
             try {
-                if (!this.isConnected())
-                    throw new Error('not connected');
                 const { withoutResponse, timeout } = props || {};
                 const connector = this.ble.getConnector(this.peripheral);
                 const isAlreadySubscribed = connector.isSubscribed(characteristicUuid);
@@ -392,7 +394,7 @@ class BleDevice extends ble_1.BleDeviceClass {
                 });
             }
             catch (err) {
-                this.logEvent({ message: 'error', fn: '', error: err.message || err, stack: err.stack });
+                this.logEvent({ message: 'error', fn: 'write', error: err.message || err, stack: err.stack });
             }
         });
     }

package/lib/ble/ble-erg-mode.js

@@ -34,7 +34,7 @@ class BleERGCyclingMode extends power_base_1.default {
     }
     getBikeInitRequest() {
         const startPower = this.getSetting('startPower');
-        return { slope: 0, targetPower: startPower };
+        return { targetPower: startPower };
     }
     sendBikeUpdate(request) {
         const getData = () => {

package/lib/ble/ble-interface.js

@@ -56,7 +56,9 @@ class BleInterface extends ble_1.BleInterfaceClass {
         if (this.logger) {
             this.logger.logEvent(event);
         }
-        console.log('~~BLE:', event);
+        if (process.env.BLE_DEBUG) {
+            console.log('~~BLE:', event);
+        }
     }
     onStateChange(state) {
         if (state !== ble_1.BleState.POWERED_ON) {

package/lib/ble/ble-st-mode.js

@@ -41,14 +41,7 @@ class FtmsCyclingMode extends power_base_1.default {
             const { gear, pedalRpm, slope, power, speed } = this.data;
             return { gear, pedalRpm, slope, power, speed };
         };
-        const event = {};
-        if (this.data === undefined)
-            event.noData = true;
-        if (request.slope !== undefined && (event.noData || Math.abs(request.slope - this.data.slope) >= 0.1))
-            event.slopeUpdate = true;
-        if (this.prevRequest === undefined)
-            event.initialCall = true;
-        this.logger.logEvent({ message: "processing update request", request, prev: this.prevRequest, data: getData(), event });
+        this.logger.logEvent({ message: "processing update request", request, prev: this.prevRequest, data: getData() });
         let newRequest = {};
         if (request.slope === undefined && request.refresh && this.prevRequest) {
             return this.prevRequest;

package/lib/ble/fm.js

@@ -663,13 +663,19 @@ class FmAdapter extends Device_1.default {
     start(props) {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.logEvent({ message: 'ftms: start requested', profile: this.getProfile(), props });
-            if (this.ble.isScanning())
+            const { restart } = props || {};
+            if (!restart && this.ble.isScanning())
                 yield this.ble.stopScan();
             try {
-                const bleDevice = yield this.ble.connectDevice(this.device);
-                bleDevice.setLogger(this.logger);
-                if (bleDevice) {
+                let bleDevice;
+                if (!this.device || !restart) {
+                    bleDevice = (yield this.ble.connectDevice(this.device));
                     this.device = bleDevice;
+                }
+                else
+                    bleDevice = this.device;
+                if (bleDevice) {
+                    bleDevice.setLogger(this.logger);
                     const mode = this.getCyclingMode();
                     if (mode && mode.getSetting('bikeType')) {
                         const bikeType = mode.getSetting('bikeType').toLowerCase();

package/package.json

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