incyclist-devices 1.4.6 → 1.4.9

package/lib/Device.d.ts

@@ -61,6 +61,7 @@ export default class DeviceAdapterBase implements DeviceAdapter {
     getPort(): string;
     getProtocol(): DeviceProtocol;
     getProtocolName(): string | undefined;
+    setCyclingMode(mode: CyclingMode | string, settings?: any): void;
     setIgnoreHrm(ignore: any): void;
     setIgnorePower(ignore: any): void;
     setIgnoreBike(ignore: any): void;

package/lib/Device.js

@@ -18,6 +18,7 @@ class DeviceAdapterBase {
     getProtocolName() {
         return this.protocol ? this.protocol.getName() : undefined;
     }
+    setCyclingMode(mode, settings) { }
     setIgnoreHrm(ignore) { }
     setIgnorePower(ignore) { }
     setIgnoreBike(ignore) { }

package/lib/daum/DaumAdapter.js

@@ -147,13 +147,17 @@ class DaumAdapterBase extends Device_1.default {
             return;
         if (this.ignoreBike && this.ignoreHrm && this.ignorePower)
             return;
-        this.iv = setInterval(() => {
+        const ivSync = setInterval(() => {
             this.bikeSync();
         }, 1000);
-        this.iv = setInterval(() => {
+        const ivUpdate = setInterval(() => {
             this.sendData();
             this.refreshRequests();
         }, 1000);
+        this.iv = {
+            sync: ivSync,
+            update: ivUpdate
+        };
     }
     connect() {
         if (!this.bike.isConnected())
@@ -173,7 +177,10 @@ class DaumAdapterBase extends Device_1.default {
         return new Promise((resolve, reject) => {
             try {
                 if (this.iv) {
-                    clearInterval(this.iv);
+                    if (this.iv.sync)
+                        clearInterval(this.iv.sync);
+                    if (this.iv.update)
+                        clearInterval(this.iv.update);
                     this.iv = undefined;
                 }
                 this.logEvent({ message: 'stop request completed' });

package/lib/daum/ERGCyclingMode.js

@@ -131,7 +131,8 @@ class ERGCyclingMode extends CyclingMode_1.CyclingModeBase {
         const prevSpeed = prevData.speed;
         const prevRequest = this.prevRequest || {};
         const data = this.data || {};
-        const bikeType = this.getSetting('bikeType');
+        const bikeType = this.getSetting('bikeType').toLowerCase();
+        console.log('~~~ bikeType', bikeType);
         delete this.event.gearUpdated;
         delete this.event.rpmUpdated;
         if (prevData === {} || prevData.speed === undefined || prevData.speed === 0) {

package/lib/daum/classic/DaumClassicAdapter.js

@@ -99,6 +99,11 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
                         yield this.getBike().setPerson(user);
                         startState.setPerson = true;
                     }
+                    if (!startState.setBikeType) {
+                        const bikeType = this.getCyclingMode().getSetting('bikeType') || 'race';
+                        yield this.getBike().setBikeType(bikeType.toLowerCase());
+                        startState.setBikeType = true;
+                    }
                     if (!startState.startProg) {
                         yield this.getBike().startProg();
                         startState.startProg = true;

package/lib/daum/premium/DaumPremiumAdapter.js

@@ -89,8 +89,10 @@ class DaumPremiumDevice extends DaumAdapter_1.default {
                         const bikeType = this.getCyclingMode().getSetting('bikeType');
                         if (!info.upload)
                             info.upload = yield this.bike.programUpload(bikeType, route, props.onStatusUpdate);
-                        if (!info.started)
-                            info.started = yield this.bike.startProgram(route.programId);
+                        if (!info.started) {
+                            const programId = route ? route.programId : 0;
+                            info.started = yield this.bike.startProgram(programId);
+                        }
                     }
                     if (!info.person && this.getCyclingMode().getModeProperty('setPersonSupport')) {
                         info.person = yield this.bike.setPerson(user);

package/lib/daum/premium/bike.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { ReservedCommands, BikeType } from './utils';
+import { ReservedCommands } from './utils';
 import { Queue } from '../../utils';
 import { EventLogger } from 'gd-eventlog';
 import { User } from "../../types/user";
@@ -96,10 +96,10 @@ declare class Daum8i {
     getPower(power: any): Promise<number>;
     setPerson(person: User): Promise<boolean>;
     programUploadInit(): Promise<boolean>;
-    programUploadStart(bikeType: BikeType, route: Route): Promise<Uint8Array>;
+    programUploadStart(bikeType: string, route?: Route): Promise<Uint8Array>;
     programUploadSendBlock(epp: Uint8Array, offset: number): Promise<boolean>;
     programUploadDone(): Promise<boolean>;
-    programUpload(bikeType: BikeType, route: Route, onStatusUpdate?: OnDeviceStartCallback): Promise<boolean>;
+    programUpload(bikeType: string, route: Route, onStatusUpdate?: OnDeviceStartCallback): Promise<boolean>;
     startProgram(programId?: number): Promise<boolean>;
     setGear(gear: any): Promise<number>;
     getGear(): Promise<number>;

package/lib/daum/premium/bike.js

@@ -26,6 +26,8 @@ const OPEN_TIMEOUT = 1000;
 const DAUM_PREMIUM_DEFAULT_PORT = 51955;
 const DAUM_PREMIUM_DEFAULT_HOST = '127.0.0.1';
 const MAX_DATA_BLOCK_SIZE = 512;
+const DS_BITS_OFF = 0;
+const DS_BITS_ENDLESS_RACE = 2;
 var __SerialPort = undefined;
 var net = undefined;
 const DEBUG_LOGGER = {
@@ -710,7 +712,8 @@ class Daum8i {
         });
     }
     setPerson(person) {
-        this.logger.logEvent({ message: 'setPerson() request' });
+        const { sex, age, length, weight } = person;
+        this.logger.logEvent({ message: 'setPerson() request', sex, age, length, weight });
         return this.sendReservedDaum8iCommand(utils_1.ReservedCommands.PERSON_SET, 'BF', (0, utils_1.getPersonData)(person))
             .then((res) => {
             const buffer = Buffer.from(res);
@@ -735,10 +738,13 @@ class Daum8i {
     }
     programUploadStart(bikeType, route) {
         const payload = Buffer.alloc(40);
-        const epp = (0, utils_1.routeToEpp)(route);
+        const epp = route ? (0, utils_1.routeToEpp)(route) : undefined;
+        const eppLength = epp ? epp.length : 0;
+        const bikeTypeVal = (0, utils_1.getBikeType)(bikeType);
+        const wBits = route.lapMode ? DS_BITS_ENDLESS_RACE : DS_BITS_OFF;
         payload.writeInt32LE(0, 0);
-        payload.writeInt8(bikeType, 4);
-        payload.writeInt8(bikeType, 5);
+        payload.writeInt8(bikeTypeVal, 4);
+        payload.writeInt8(0, 5);
         payload.writeInt16LE(0, 6);
         payload.writeInt32LE(0, 8);
         payload.writeInt32LE(0, 12);
@@ -747,10 +753,10 @@ class Daum8i {
         payload.writeInt16LE(0, 24);
         payload.writeInt16LE(0, 26);
         payload.writeInt16LE(0, 28);
-        payload.writeInt16LE(0, 30);
+        payload.writeInt16LE(wBits, 30);
         payload.writeInt32LE(7, 32);
-        payload.writeInt32LE(epp.length, 36);
-        this.logger.logEvent({ message: 'programUploadStart() request' });
+        payload.writeInt32LE(eppLength, 36);
+        this.logger.logEvent({ message: 'programUploadStart() request', bikeType, length: eppLength });
         return this.sendReservedDaum8iCommand(utils_1.ReservedCommands.PROGRAM_LIST_NEW_PROGRAM, 'BF', payload)
             .then((res) => {
             const buffer = Buffer.from(res);
@@ -801,22 +807,32 @@ class Daum8i {
     }
     programUpload(bikeType, route, onStatusUpdate) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.programUploadInit();
-            const epp = yield this.programUploadStart(bikeType, route);
-            let success = true;
-            let done = false;
-            let offset = 0;
-            if (onStatusUpdate)
-                onStatusUpdate(0, epp.length);
-            while (success && !done) {
-                success = yield this.programUploadSendBlock(epp, offset);
-                offset += MAX_DATA_BLOCK_SIZE;
-                done = offset >= epp.length;
-                if (onStatusUpdate)
-                    onStatusUpdate(done ? epp.length : offset, epp.length);
+            try {
+                yield this.programUploadInit();
+                const epp = yield this.programUploadStart(bikeType, route);
+                if (epp) {
+                    let success = true;
+                    let done = false;
+                    let offset = 0;
+                    if (onStatusUpdate)
+                        onStatusUpdate(0, epp.length);
+                    while (success && !done) {
+                        success = yield this.programUploadSendBlock(epp, offset);
+                        offset += MAX_DATA_BLOCK_SIZE;
+                        done = offset >= epp.length;
+                        if (onStatusUpdate)
+                            onStatusUpdate(done ? epp.length : offset, epp.length);
+                    }
+                    if (done) {
+                        return yield this.programUploadDone();
+                    }
+                }
+                else {
+                    return yield this.programUploadDone();
+                }
             }
-            if (done) {
-                return yield this.programUploadDone();
+            catch (err) {
+                console.log('~~~ err', err);
             }
             return false;
         });

package/lib/daum/premium/utils.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPersonData = exports.parseTrainingData = exports.routeToEpp = exports.getBikeType = exports.BikeType = exports.ReservedCommands = exports.Int32ToIntArray = exports.Int16ToIntArray = exports.Float32ToIntArray = exports.Float32ToHex = exports.getAsciiArrayFromStr = exports.asciiArrayToString = exports.charArrayToString = exports.ascii = exports.append = exports.getHex = exports.hexstr = exports.getMessageData = exports.buildMessage = exports.checkSum = exports.esc2bin = exports.bin2esc = void 0;
-const user_1 = require("../../types/user");
 const win32filetime_1 = __importDefault(require("win32filetime"));
 const sum = (arr) => arr.reduce((a, b) => a + b, 0);
 function bin2esc(arr) {
@@ -14,29 +13,29 @@ function bin2esc(arr) {
     const res = [];
     arr.forEach(v => {
         switch (v) {
-            case 18:
-                res.push(34);
-                res.push(18);
+            case 0x12:
+                res.push(0x22);
+                res.push(0x12);
                 break;
-            case 34:
-                res.push(34);
-                res.push(34);
+            case 0x22:
+                res.push(0x22);
+                res.push(0x22);
                 break;
-            case 1:
-                res.push(34);
-                res.push(17);
+            case 0x01:
+                res.push(0x22);
+                res.push(0x11);
                 break;
-            case 23:
-                res.push(34);
-                res.push(39);
+            case 0x17:
+                res.push(0x22);
+                res.push(0x27);
                 break;
-            case 6:
-                res.push(34);
-                res.push(32);
+            case 0x06:
+                res.push(0x22);
+                res.push(0x16);
                 break;
-            case 21:
-                res.push(34);
-                res.push(37);
+            case 0x15:
+                res.push(0x22);
+                res.push(0x25);
                 break;
             default:
                 res.push(v);
@@ -55,26 +54,29 @@ function esc2bin(arr) {
         if (escaped) {
             escaped = false;
             switch (v) {
-                case 17:
-                    res.push(1);
+                case 0x11:
+                    res.push(0x1);
                     return;
-                case 39:
-                    res.push(23);
+                case 0x27:
+                    res.push(0x17);
                     return;
-                case 22:
-                    res.push(6);
+                case 0x16:
+                    res.push(0x6);
                     return;
-                case 37:
-                    res.push(21);
+                case 0x25:
+                    res.push(0x15);
                     return;
-                case 18:
-                    res.push(18);
+                case 0x12:
+                    res.push(0x12);
+                    return;
+                case 0x22:
+                    res.push(0x22);
                     return;
                 default: res.push(v);
             }
             return;
         }
-        if (v === 34) {
+        if (v === 0x22) {
             escaped = true;
         }
         else {
@@ -357,13 +359,13 @@ function getPersonData(user) {
         buffer.writeUInt8(0, offset);
         offset += 1;
     }
-    buffer.writeInt32LE(user.sex === user_1.Gender.FEMALE ? 2 : 1, offset);
+    buffer.writeInt32LE(1, offset);
     offset += 4;
-    buffer.writeInt32LE(user.age !== undefined ? user.age : 1, offset);
+    buffer.writeInt32LE(1, offset);
     offset += 4;
-    buffer.writeInt32LE(user.length !== undefined ? user.length : 175, offset);
+    buffer.writeInt32LE(175, offset);
     offset += 4;
-    buffer.writeFloatLE(user.weight !== undefined ? user.weight : 70, offset);
+    buffer.writeFloatLE(70, offset);
     offset += 4;
     buffer.writeFloatLE(0, offset);
     offset += 4;

package/package.json

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