incyclist-devices 1.4.3 → 1.4.4

package/lib/daum/premium/DaumClassicCyclingMode.js

@@ -64,6 +64,7 @@ class DaumClassicCyclingMode extends PowerMeterCyclingMode_1.default {
                 power = 0;
             }
             if (distanceBike < distancePrev) {
+                this.logger.logEvent({ message: '~~~ distance overflow', distanceBike, distancePrev });
                 let v = speed / 3.6;
                 let duration = this.prevUpdateTS === 0 ? 0 : ((ts - this.prevUpdateTS) / 1000);
                 distanceInternal = distancePrev + Math.round(v * duration);

package/lib/daum/premium/DaumPremiumAdapter.js

@@ -111,8 +111,11 @@ class DaumPremiumDevice extends DaumAdapter_1.default {
                     else {
                         info.person = true;
                     }
-                    const gear = yield this.bike.setGear(this.data.gear || (opts.gear || 10));
-                    return gear;
+                    if (!this.getCyclingMode().getModeProperty('eppSupport')) {
+                        const gear = yield this.bike.setGear(this.data.gear || (opts.gear || 10));
+                        return gear;
+                    }
+                    return;
                 }
                 catch (err) {
                     console.error(err);

package/lib/daum/premium/bike.js

@@ -710,17 +710,27 @@ class Daum8i {
         });
     }
     setPerson(person) {
+        this.logger.logEvent({ message: 'setPerson() request' });
         return this.sendReservedDaum8iCommand(utils_1.ReservedCommands.PERSON_SET, 'BF', (0, utils_1.getPersonData)(person))
             .then((res) => {
             const buffer = Buffer.from(res);
-            return buffer.readInt16LE(0) === utils_1.ReservedCommands.PERSON_SET;
+            const success = buffer.readInt16LE(0) === utils_1.ReservedCommands.PERSON_SET;
+            this.logger.logEvent({ message: 'setPerson() response', success, buffer });
+            if (!success)
+                throw new Error('Illegal Response');
+            return true;
         });
     }
     programUploadInit() {
+        this.logger.logEvent({ message: 'programUploadInit() request' });
         return this.sendReservedDaum8iCommand(utils_1.ReservedCommands.PROGRAM_LIST_BEGIN, 'BF')
             .then((res) => {
             const buffer = Buffer.from(res);
-            return buffer.readInt16LE(0) === utils_1.ReservedCommands.PROGRAM_LIST_BEGIN;
+            const success = buffer.readInt16LE(0) === utils_1.ReservedCommands.PROGRAM_LIST_BEGIN;
+            this.logger.logEvent({ message: 'programUploadInit() response', success, buffer });
+            if (!success)
+                throw new Error('Illegal Response');
+            return true;
         });
     }
     programUploadStart(bikeType, route) {
@@ -740,12 +750,15 @@ class Daum8i {
         payload.writeInt16LE(0, 30);
         payload.writeInt32LE(7, 32);
         payload.writeInt32LE(epp.length, 36);
+        this.logger.logEvent({ message: 'programUploadStart() request' });
         return this.sendReservedDaum8iCommand(utils_1.ReservedCommands.PROGRAM_LIST_NEW_PROGRAM, 'BF', payload)
             .then((res) => {
             const buffer = Buffer.from(res);
             if (buffer.readInt16LE(0) === utils_1.ReservedCommands.PROGRAM_LIST_NEW_PROGRAM) {
+                this.logger.logEvent({ message: 'programUploadStart() response', success: true });
                 return epp;
             }
+            this.logger.logEvent({ message: 'programUploadStart() response', success: false });
             throw new Error('Illegal Response');
         });
     }
@@ -759,22 +772,31 @@ class Daum8i {
         payload.writeInt32LE(offset, 4);
         const chunk = Buffer.from(epp.slice(offset, offset + size));
         chunk.copy(payload, 8);
+        this.logger.logEvent({ message: 'programUploadSendBlock() request', offset, size });
         return this.sendReservedDaum8iCommand(utils_1.ReservedCommands.PROGRAM_LIST_CONTINUE_PROGRAM, 'BF', payload)
             .then((res) => {
             const buffer = Buffer.from(res);
             let success = buffer.readInt16LE(0) === utils_1.ReservedCommands.PROGRAM_LIST_CONTINUE_PROGRAM;
             success = success && (buffer.readInt16LE(2) === 1);
             success = success && (buffer.readInt8(4) === 1);
+            this.logger.logEvent({ message: 'programUploadSendBlock() response' });
             if (!success)
                 throw new Error('Illegal Response');
-            return success;
+            return true;
+            ;
         });
     }
     programUploadDone() {
+        this.logger.logEvent({ message: 'programUploadDone() request' });
         return this.sendReservedDaum8iCommand(utils_1.ReservedCommands.PROGRAM_LIST_END, 'BF')
             .then((res) => {
             const buffer = Buffer.from(res);
-            return buffer.readInt16LE(0) === utils_1.ReservedCommands.PROGRAM_LIST_END;
+            const success = buffer.readInt16LE(0) === utils_1.ReservedCommands.PROGRAM_LIST_END;
+            this.logger.logEvent({ message: 'programUploadDone() response', success });
+            if (!success)
+                throw new Error('Illegal Response');
+            return true;
+            ;
         });
     }
     programUpload(bikeType, route) {
@@ -798,10 +820,16 @@ class Daum8i {
     startProgram(programId = 1) {
         const payload = Buffer.alloc(2);
         payload.writeInt16LE(programId, 0);
+        this.logger.logEvent({ message: 'startProgram() request', programId });
         return this.sendReservedDaum8iCommand(utils_1.ReservedCommands.PROGRAM_LIST_START, 'BF', payload)
             .then((res) => {
             const buffer = Buffer.from(res);
-            return buffer.readInt16LE(0) === utils_1.ReservedCommands.PROGRAM_LIST_START;
+            const success = buffer.readInt16LE(0) === utils_1.ReservedCommands.PROGRAM_LIST_START;
+            this.logger.logEvent({ message: 'startProgram() request', programId, success });
+            if (!success)
+                throw new Error('Illegal Response');
+            return true;
+            ;
         });
     }
     setGear(gear) {

package/package.json

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