incyclist-devices 1.4.5 → 1.4.6

package/lib/Device.d.ts

@@ -12,6 +12,7 @@ export declare type DeviceData = {
     deviceDistanceCounter?: number;
 };
 export declare type OnDeviceDataCallback = (data: DeviceData) => void;
+export declare type OnDeviceStartCallback = (completed: number, total: number) => void;
 export interface Bike {
     setCyclingMode(mode: CyclingMode | string, settings?: any): void;
     getSupportedCyclingModes(): Array<any>;

package/lib/daum/ERGCyclingMode.js

@@ -159,11 +159,11 @@ class ERGCyclingMode extends CyclingMode_1.CyclingModeBase {
             }
             data.speed = parseFloat(speed.toFixed(1));
             data.power = Math.round(power);
-            data.distanceInternal = Math.round(distanceInternal);
+            data.distanceInternal = distanceInternal;
             data.slope = slope;
             data.pedalRpm = rpm;
             data.gear = gear;
-            if (data.time)
+            if (data.time !== undefined)
                 data.time += duration;
             else
                 data.time = 0;

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

@@ -1,4 +1,3 @@
-import { Route } from '../../types/route';
 import DaumAdapter from '../DaumAdapter';
 export default class DaumPremiumDevice extends DaumAdapter {
     static NAME: string;
@@ -8,7 +7,6 @@ export default class DaumPremiumDevice extends DaumAdapter {
     getInterface(): any;
     getSupportedCyclingModes(): Array<any>;
     check(): Promise<unknown>;
-    initClassic(route: Route): Promise<boolean>;
     start(props: any): Promise<unknown>;
     getCurrentBikeData(): Promise<any>;
 }

package/lib/daum/premium/DaumPremiumAdapter.js

@@ -62,20 +62,6 @@ class DaumPremiumDevice extends DaumAdapter_1.default {
             }
         }));
     }
-    initClassic(route) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!route)
-                return true;
-            let res;
-            const bikeType = this.getCyclingMode().getSetting('bikeType');
-            res = yield this.bike.programUpload(bikeType, route);
-            if (!res)
-                return false;
-            res = yield this.bike.startProgram(route.programId);
-            if (!res)
-                return false;
-        });
-    }
     start(props) {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.logEvent({ message: 'start()' });
@@ -99,18 +85,16 @@ class DaumPremiumDevice extends DaumAdapter_1.default {
                     if (!info.version) {
                         info.version = yield this.bike.getProtocolVersion();
                     }
-                    if (!info.init && this.getCyclingMode().getModeProperty('setPersonSupport')) {
-                        info.init = yield this.initClassic(route);
+                    if (this.getCyclingMode().getModeProperty('eppSupport')) {
+                        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);
                     }
-                    else {
-                        info.init = true;
-                    }
-                    if (!info.person && this.getCyclingMode().getModeProperty('eppSupport')) {
+                    if (!info.person && this.getCyclingMode().getModeProperty('setPersonSupport')) {
                         info.person = yield this.bike.setPerson(user);
                     }
-                    else {
-                        info.person = true;
-                    }
                     if (!this.getCyclingMode().getModeProperty('eppSupport')) {
                         const gear = yield this.bike.setGear(this.daumRunData.gear || (opts.gear || 10));
                         return gear;
@@ -121,7 +105,7 @@ class DaumPremiumDevice extends DaumAdapter_1.default {
                     console.error(err);
                     throw (new Error(`could not start device, reason:${err.message}`));
                 }
-            }), 5, 1000)
+            }), 5, 1500)
                 .then(data => {
                 this.startUpdatePull();
                 return data;

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

@@ -4,6 +4,7 @@ import { Queue } from '../../utils';
 import { EventLogger } from 'gd-eventlog';
 import { User } from "../../types/user";
 import { Route } from "../../types/route";
+import { OnDeviceStartCallback } from "../../Device";
 declare class Daum8i {
     portName: string;
     logger: EventLogger;
@@ -98,7 +99,7 @@ declare class Daum8i {
     programUploadStart(bikeType: BikeType, route: Route): Promise<Uint8Array>;
     programUploadSendBlock(epp: Uint8Array, offset: number): Promise<boolean>;
     programUploadDone(): Promise<boolean>;
-    programUpload(bikeType: BikeType, route: Route): Promise<boolean>;
+    programUpload(bikeType: BikeType, 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

@@ -799,17 +799,21 @@ class Daum8i {
             ;
         });
     }
-    programUpload(bikeType, route) {
+    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);
             }
             if (done) {
                 return yield this.programUploadDone();

package/lib/daum/premium/utils.js

@@ -5,7 +5,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 utils_1 = require("../classic/utils");
 const win32filetime_1 = __importDefault(require("win32filetime"));
 const sum = (arr) => arr.reduce((a, b) => a + b, 0);
 function bin2esc(arr) {
@@ -360,15 +359,15 @@ function getPersonData(user) {
     }
     buffer.writeInt32LE(user.sex === user_1.Gender.FEMALE ? 2 : 1, offset);
     offset += 4;
-    buffer.writeInt32LE(user.age !== undefined ? user.age : utils_1.DEFAULT_AGE, offset);
+    buffer.writeInt32LE(user.age !== undefined ? user.age : 1, offset);
     offset += 4;
-    buffer.writeInt32LE(user.length !== undefined ? user.length : 180, offset);
+    buffer.writeInt32LE(user.length !== undefined ? user.length : 175, offset);
     offset += 4;
-    buffer.writeFloatLE(user.weight !== undefined ? user.weight : utils_1.DEFAULT_USER_WEIGHT, offset);
+    buffer.writeFloatLE(user.weight !== undefined ? user.weight : 70, offset);
     offset += 4;
     buffer.writeFloatLE(0, offset);
     offset += 4;
-    buffer.writeUInt32LE(0, offset);
+    buffer.writeUInt32LE(1, offset);
     offset += 4;
     return buffer;
 }

package/package.json

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