incyclist-services 1.7.94 → 1.7.95

package/lib/cjs/activities/upload/index.js

@@ -14,7 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./velohero"), exports);
 __exportStar(require("./strava"), exports);
 __exportStar(require("./intervals"), exports);
 __exportStar(require("./types"), exports);

package/lib/cjs/apps/index.js

@@ -18,4 +18,3 @@ __exportStar(require("./base"), exports);
 __exportStar(require("./googleMaps"), exports);
 __exportStar(require("./service"), exports);
 __exportStar(require("./strava"), exports);
-__exportStar(require("./velohero"), exports);

package/lib/cjs/apps/service.js

@@ -43,7 +43,6 @@ const settings_1 = require("../settings");
 const base_1 = require("./base");
 const IntervalsAppConnection_1 = require("./intervals/IntervalsAppConnection");
 const komoot_1 = require("./komoot");
-const VeloHeroAppConnection_1 = require("./velohero/VeloHeroAppConnection");
 let AppsService = (() => {
     let _classDecorators = [types_1.Singleton];
     let _classDescriptor;
@@ -67,7 +66,7 @@ let AppsService = (() => {
             __runInitializers(_classThis, _classExtraInitializers);
         }
         services = (__runInitializers(this, _instanceExtraInitializers), {
-            ActivityUpload: ['strava', 'velohero', 'intervals'],
+            ActivityUpload: ['strava', 'intervals'],
             WorkoutUpload: [],
             WorkoutDownload: ['intervals'],
             ActivityDownload: [],
@@ -75,7 +74,6 @@ let AppsService = (() => {
         });
         serviceMap = [
             { name: 'Strava', key: 'strava', iconUrl: 'https://static.cdnlogo.com/logos/s/42/strava-wordmark.svg', connection: new base_1.StravaAppConnection() },
-            { name: 'VeloHero', key: 'velohero', iconUrl: 'images/velo-white.png', connection: new VeloHeroAppConnection_1.VeloHeroAppConnection() },
             { name: 'Komoot', key: 'komoot', iconUrl: 'https://www.komoot.com/assets/4d8ae313eec53e6e.svg', connection: new komoot_1.KomootAppConnection() },
             { name: 'Intervals.icu', key: 'intervals', iconUrl: 'images/intervals.png', connection: new IntervalsAppConnection_1.IntervalsAppConnection() },
         ];

package/lib/cjs/devices/page/service.js

@@ -95,9 +95,15 @@ let DevicesPageService = (() => {
                 if (this.promiseOpen !== undefined) {
                     return this.getPageObserver();
                 }
-                this.stateMachine.start(() => {
+                const onStateMachineUpdate = () => {
                     this.getPageObserver().emit('page-update');
-                });
+                };
+                this.stateMachine.start(onStateMachineUpdate);
+                if (this.stateMachine.state !== 'Idle') {
+                    this.logEvent({ message: 'state machine was not in expected state on open, resetting', page: 'Pairing', state: this.stateMachine.state });
+                    this.stateMachine.stop();
+                    this.stateMachine.start(onStateMachineUpdate);
+                }
                 this.promiseOpen = new Promise((done) => {
                     this.start()
                         .catch((err) => { this.logError(err, 'openPage'); })
@@ -321,7 +327,7 @@ let DevicesPageService = (() => {
             this.updatePage();
         }
         async closeDeviceSelection(enabled) {
-            this.logEvent({ message: 'capability closed', capability: this.openedCapability });
+            this.logEvent({ message: 'capability closed', capability: this.openedCapability, enabled, caller: new Error().stack });
             if (!enabled) {
                 const all = this.state.capabilities ?? [];
                 const requested = all.find(c => c.capability === this.openedCapability);

package/lib/cjs/devices/page/statemachine.js

@@ -68,6 +68,8 @@ let PairingPageStateMachine = (() => {
         selectStateChangeCallback;
         retryTimeout;
         selectionTimeout;
+        pairingPromise;
+        scanningPromise;
         constructor() {
             this.logger = new gd_eventlog_1.EventLogger('PairingPageState');
         }
@@ -99,6 +101,8 @@ let PairingPageStateMachine = (() => {
                 this.unregisterServiceEventHandlers();
                 delete this.stateChangeCallback;
                 this.resetTimeouts();
+                delete this.pairingPromise;
+                delete this.scanningPromise;
                 this.setState('Closed');
                 this.logIncomingEvent('stop', prev, 'Closed');
             }
@@ -199,14 +203,20 @@ let PairingPageStateMachine = (() => {
                         this.resetTimeouts();
                         this.setState('Done');
                     }
-                    else {
+                    else if (!this.pairingPromise) {
                         this.setState('Pairing');
-                        service.startPairing(adapters, {});
+                        this.pairingPromise = Promise.resolve(service.startPairing(adapters, {}))
+                            .catch(err => { this.logError(err, 'startPairing'); })
+                            .finally(() => { delete this.pairingPromise; });
                     }
                 }
                 else if (this.selectState === 'Closed' || this.selectState === 'Active') {
-                    this.setState('Scanning');
-                    service.startScanning(adapters, {});
+                    if (!this.scanningPromise) {
+                        this.setState('Scanning');
+                        this.scanningPromise = Promise.resolve(service.startScanning(adapters, {}))
+                            .catch(err => { this.logError(err, 'startScanning'); })
+                            .finally(() => { delete this.scanningPromise; });
+                    }
                 }
                 if (this.state !== oldState)
                     this.logger.logEvent({ message: 'state changed', stateTransition: { from: oldState, to: this.state } });

package/lib/cjs/devices/ride/cyclingMode.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVirtualShiftingEnabled = isVirtualShiftingEnabled;
+exports.getLoadButtonMode = getLoadButtonMode;
+function isVirtualShiftingEnabled(mode) {
+    try {
+        if (!mode)
+            return false;
+        if (mode.isSIM()) {
+            const virtshiftMode = mode.getSetting('virtshift');
+            return (virtshiftMode === 'Mixed' || virtshiftMode === 'Incyclist' || virtshiftMode === 'SmartTrainer' || virtshiftMode === 'Enabled');
+        }
+        if (mode.isResistance()) {
+            return true;
+        }
+        return false;
+    }
+    catch {
+        return false;
+    }
+}
+function getLoadButtonMode(mode) {
+    if (!mode)
+        return 'power';
+    if (mode.isSIM() || mode.isResistance()) {
+        return isVirtualShiftingEnabled(mode) ? 'gear' : 'hidden';
+    }
+    return 'power';
+}

package/lib/cjs/devices/ride/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./service"), exports);
+__exportStar(require("./cyclingMode"), exports);

package/lib/cjs/ride/display/service.js

@@ -432,8 +432,11 @@ let RideDisplayService = (() => {
                 this.observer?.stop({ immediately: props.noStateUpdates });
                 if (props.noStateUpdates)
                     delete this.observer;
-                else
-                    (0, utils_1.waitNextTick)().then(() => delete this.observer);
+                else {
+                    const observerToClear = this.observer;
+                    (0, utils_1.waitNextTick)().then(() => { if (this.observer === observerToClear)
+                        delete this.observer; });
+                }
                 if (prevState === 'Finished' || prevState === 'Idle' || prevState === 'Closing') {
                     this.state = 'Idle';
                     return;
@@ -553,7 +556,7 @@ let RideDisplayService = (() => {
                 const { time, speed, routeDistance, distance } = currentValues;
                 const data = { time, speed, routeDistance, distance };
                 this.getRideModeService().onActivityUpdate(data, currentValues);
-                this.observer.emit('data-update', data, currentValues);
+                this.observer?.emit('data-update', data, currentValues);
             }
         }
         onWorkoutStopped() {
@@ -1085,16 +1088,7 @@ let RideDisplayService = (() => {
         isVirtualShiftingEnabled() {
             try {
                 const mode = this.getDeviceRide().getCyclingMode();
-                if (!mode)
-                    return false;
-                if (mode.isSIM()) {
-                    const virtshiftMode = mode.getSetting('virtshift');
-                    return (virtshiftMode === 'Mixed' || virtshiftMode === 'Incyclist' || virtshiftMode === 'SmartTrainer' || virtshiftMode === 'Enabled');
-                }
-                if (mode.isResistance()) {
-                    return true;
-                }
-                return false;
+                return (0, devices_1.isVirtualShiftingEnabled)(mode);
             }
             catch (err) {
                 this.logError(err, 'isVirtualShiftingEnabled');

package/lib/cjs/ride/workout/WorkoutDisplayService.js

@@ -35,6 +35,7 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkoutDisplayService = void 0;
+const devices_1 = require("../../devices");
 const workouts_1 = require("../../workouts");
 const base_1 = require("../base/base");
 const decorators_1 = require("../../base/decorators");
@@ -56,6 +57,9 @@ let WorkoutDisplayService = (() => {
         prevPowerTs = __runInitializers(this, _instanceExtraInitializers);
         buildRequest(props = {}) {
             if (props?.limits) {
+                const mode = this.getDeviceRide().getCyclingMode();
+                if ((0, devices_1.getLoadButtonMode)(mode) !== 'power')
+                    return {};
                 return props.limits;
             }
             else
@@ -76,12 +80,12 @@ let WorkoutDisplayService = (() => {
             }
         }
         getLogProps() {
-            const workout = this.getWorkoutList().getSelected();
+            const workout = this.getWorkoutList().getSelected() ?? this.getWorkoutRide().getWorkout();
             const settings = this.getWorkoutList().getStartSettings() ?? {};
             const bikeProps = this.getBikeLogProps();
             return {
                 mode: 'workout',
-                workout: workout.name,
+                workout: workout?.name,
                 ...settings,
                 ...bikeProps
             };

package/lib/cjs/workouts/ride/page/service.js

@@ -172,7 +172,8 @@ let WorkoutRidePageService = (() => {
                     steps: this.buildUpcomingSteps(current, wo.ftp),
                     dashboard: this.buildDashboardLine(wo),
                     gestureHint: this.buildGestureHint(base.startOverlayProps === null),
-                    loadIncrement: this.getLoadIncrement()
+                    loadIncrement: this.getLoadIncrement(),
+                    loadButtonMode: wo.loadButtonMode ?? 'power'
                 };
             }
             catch (err) {
@@ -334,6 +335,15 @@ let WorkoutRidePageService = (() => {
                 return undefined;
             }
         }
+        getLoadButtonMode() {
+            try {
+                return this.getWorkoutRide().getLoadButtonMode();
+            }
+            catch (err) {
+                this.logError(err, 'getLoadButtonMode');
+                return 'power';
+            }
+        }
         onRideStateUpdate(state) {
             this.subscribeToWorkoutObserver();
             switch (state) {
@@ -512,7 +522,8 @@ let WorkoutRidePageService = (() => {
                 steps: { previous: null, current: null, upcoming: [], hasMore: false },
                 dashboard: { text: '', mode: null },
                 gestureHint: null,
-                loadIncrement: DEFAULT_LOAD_INCREMENT
+                loadIncrement: DEFAULT_LOAD_INCREMENT,
+                loadButtonMode: 'power'
             };
         }
         updatePageDisplay() {

package/lib/cjs/workouts/ride/service.js

@@ -57,14 +57,17 @@ let WorkoutRide = (() => {
     let _instanceExtraInitializers = [];
     let _getUserSettings_decorators;
     let _getWorkoutList_decorators;
+    let _getDeviceRide_decorators;
     var WorkoutRide = class extends _classSuper {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _getUserSettings_decorators = [decorators_1.Injectable];
             _getWorkoutList_decorators = [decorators_1.Injectable];
+            _getDeviceRide_decorators = [decorators_1.Injectable];
             __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getWorkoutList_decorators, { kind: "method", name: "getWorkoutList", static: false, private: false, access: { has: obj => "getWorkoutList" in obj, get: obj => obj.getWorkoutList }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getDeviceRide_decorators, { kind: "method", name: "getDeviceRide", static: false, private: false, access: { has: obj => "getDeviceRide" in obj, get: obj => obj.getDeviceRide }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             WorkoutRide = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -269,16 +272,68 @@ let WorkoutRide = (() => {
                 this.logError(err, 'backward', { ts, limits });
             }
         }
+        isPowerRangeAdjustable(delta) {
+            if (this.currentLimits?.minPower === this.currentLimits?.maxPower)
+                return false;
+            return delta >= 0
+                ? this.currentLimits?.targetPower < this.currentLimits?.maxPower
+                : this.currentLimits?.targetPower > this.currentLimits?.minPower;
+        }
+        getPowerRangeDeltaVal(magnitude) {
+            if (!this.settings?.ftp)
+                return magnitude;
+            return magnitude === 1 ? 5 : 50;
+        }
+        getPowerRangeAdjustmentWatts(magnitude, increase) {
+            const nominal = this.getPowerRangeDeltaVal(magnitude);
+            const headroom = increase
+                ? this.currentLimits.maxPower - this.currentLimits.targetPower
+                : this.currentLimits.targetPower - this.currentLimits.minPower;
+            return Math.min(nominal, headroom);
+        }
+        getLoadButtonMode() {
+            try {
+                const mode = this.getDeviceRide().getCyclingMode();
+                return (0, devices_1.getLoadButtonMode)(mode);
+            }
+            catch (err) {
+                this.logError(err, 'getLoadButtonMode');
+                return 'power';
+            }
+        }
+        getGearButtonLabels() {
+            return { inc5: '+5', inc1: '+1', dec1: '-1', dec5: '-5' };
+        }
+        getLoadButtonLabels() {
+            const label = (magnitude, increase) => {
+                const sign = increase ? '+' : '-';
+                const delta = increase ? magnitude : -magnitude;
+                return this.isPowerRangeAdjustable(delta)
+                    ? `${sign}${this.getPowerRangeAdjustmentWatts(magnitude, increase)}W`
+                    : `${sign}${magnitude}%`;
+            };
+            return {
+                inc5: label(5, true),
+                inc1: label(1, true),
+                dec1: label(1, false),
+                dec5: label(5, false),
+            };
+        }
         powerUp(delta) {
             if (delta < 0)
                 return this.powerDown(-delta);
             this.logEvent({ message: 'workout power up', delta });
             try {
-                if (this.currentLimits?.minPower !== this.currentLimits?.maxPower && this.currentLimits?.targetPower < this.currentLimits?.maxPower) {
-                    let deltaVal = delta;
-                    if (this.settings?.ftp) {
-                        deltaVal = delta === 1 ? 5 : 50;
-                    }
+                const loadButtonMode = this.getLoadButtonMode();
+                if (loadButtonMode === 'hidden')
+                    return undefined;
+                if (loadButtonMode === 'gear') {
+                    this.gearChange(delta);
+                    this.logEvent({ message: 'workout gear shift', gearDelta: delta });
+                    return { type: 'gear', value: delta };
+                }
+                if (this.isPowerRangeAdjustable(delta)) {
+                    const deltaVal = this.getPowerRangeDeltaVal(delta);
                     this.currentLimits.targetPower = Math.min(this.currentLimits.targetPower + deltaVal, this.currentLimits.maxPower);
                     this.logEvent({ message: 'workout target power adjusted', targetPower: this.currentLimits.targetPower });
                     this.emit('update', this.getDashboardDisplayProperties());
@@ -304,11 +359,16 @@ let WorkoutRide = (() => {
         powerDown(delta) {
             this.logEvent({ message: 'workout power down', delta });
             try {
-                if (this.currentLimits?.minPower !== this.currentLimits?.maxPower && this.currentLimits?.targetPower > this.currentLimits?.minPower) {
-                    let deltaVal = delta;
-                    if (this.settings?.ftp) {
-                        deltaVal = delta === 1 ? 5 : 50;
-                    }
+                const loadButtonMode = this.getLoadButtonMode();
+                if (loadButtonMode === 'hidden')
+                    return undefined;
+                if (loadButtonMode === 'gear') {
+                    this.gearChange(-delta);
+                    this.logEvent({ message: 'workout gear shift', gearDelta: -delta });
+                    return { type: 'gear', value: -delta };
+                }
+                if (this.isPowerRangeAdjustable(-delta)) {
+                    const deltaVal = this.getPowerRangeDeltaVal(delta);
                     this.currentLimits.targetPower = Math.max(this.currentLimits.targetPower - deltaVal, this.currentLimits.minPower);
                     this.logEvent({ message: 'workout target power adjusted', targetPower: this.currentLimits.targetPower });
                     this.emit('update', this.getDashboardDisplayProperties());
@@ -331,6 +391,9 @@ let WorkoutRide = (() => {
                 return undefined;
             }
         }
+        gearChange(gearDelta) {
+            this.getDeviceRide().sendUpdate({ gearDelta });
+        }
         toggleCyclingMode() {
             const deviceRide = (0, devices_1.useDeviceRide)();
             deviceRide.toggleCyclingMode();
@@ -344,6 +407,7 @@ let WorkoutRide = (() => {
                 const { start, stop } = this.getZoomParameters(this.trainingTime);
                 const title = this.getStepTitle(this.trainingTime);
                 const canShowBackward = Math.round((this.trainingTime ?? 0)) > 0;
+                const loadButtonMode = this.getLoadButtonMode();
                 const props = {
                     workout: this.workout, title,
                     ftp: this.settings.ftp,
@@ -351,7 +415,9 @@ let WorkoutRide = (() => {
                     start, stop,
                     mode: this.getCyclingModeText(),
                     canShowBackward,
-                    canShowForward: true
+                    canShowForward: true,
+                    loadButtonMode,
+                    loadButtons: loadButtonMode === 'power' ? this.getLoadButtonLabels() : this.getGearButtonLabels()
                 };
                 return props;
             }
@@ -618,6 +684,9 @@ let WorkoutRide = (() => {
         getWorkoutList() {
             return (0, list_1.useWorkoutList)();
         }
+        getDeviceRide() {
+            return (0, devices_1.useDeviceRide)();
+        }
     };
     return WorkoutRide = _classThis;
 })();

package/lib/esm/activities/upload/index.js

@@ -1,4 +1,3 @@
-export * from './velohero';
 export * from './strava';
 export * from './intervals';
 export * from './types';

package/lib/esm/apps/index.js

@@ -2,4 +2,3 @@ export * from './base';
 export * from './googleMaps';
 export * from './service';
 export * from './strava';
-export * from './velohero';

package/lib/esm/apps/service.js

@@ -40,7 +40,6 @@ import { useUserSettings } from "../settings";
 import { StravaAppConnection } from "./base";
 import { IntervalsAppConnection } from "./intervals/IntervalsAppConnection";
 import { KomootAppConnection } from "./komoot";
-import { VeloHeroAppConnection } from "./velohero/VeloHeroAppConnection";
 let AppsService = (() => {
     let _classDecorators = [Singleton];
     let _classDescriptor;
@@ -64,7 +63,7 @@ let AppsService = (() => {
             __runInitializers(_classThis, _classExtraInitializers);
         }
         services = (__runInitializers(this, _instanceExtraInitializers), {
-            ActivityUpload: ['strava', 'velohero', 'intervals'],
+            ActivityUpload: ['strava', 'intervals'],
             WorkoutUpload: [],
             WorkoutDownload: ['intervals'],
             ActivityDownload: [],
@@ -72,7 +71,6 @@ let AppsService = (() => {
         });
         serviceMap = [
             { name: 'Strava', key: 'strava', iconUrl: 'https://static.cdnlogo.com/logos/s/42/strava-wordmark.svg', connection: new StravaAppConnection() },
-            { name: 'VeloHero', key: 'velohero', iconUrl: 'images/velo-white.png', connection: new VeloHeroAppConnection() },
             { name: 'Komoot', key: 'komoot', iconUrl: 'https://www.komoot.com/assets/4d8ae313eec53e6e.svg', connection: new KomootAppConnection() },
             { name: 'Intervals.icu', key: 'intervals', iconUrl: 'images/intervals.png', connection: new IntervalsAppConnection() },
         ];

package/lib/esm/devices/page/service.js

@@ -92,9 +92,15 @@ let DevicesPageService = (() => {
                 if (this.promiseOpen !== undefined) {
                     return this.getPageObserver();
                 }
-                this.stateMachine.start(() => {
+                const onStateMachineUpdate = () => {
                     this.getPageObserver().emit('page-update');
-                });
+                };
+                this.stateMachine.start(onStateMachineUpdate);
+                if (this.stateMachine.state !== 'Idle') {
+                    this.logEvent({ message: 'state machine was not in expected state on open, resetting', page: 'Pairing', state: this.stateMachine.state });
+                    this.stateMachine.stop();
+                    this.stateMachine.start(onStateMachineUpdate);
+                }
                 this.promiseOpen = new Promise((done) => {
                     this.start()
                         .catch((err) => { this.logError(err, 'openPage'); })
@@ -318,7 +324,7 @@ let DevicesPageService = (() => {
             this.updatePage();
         }
         async closeDeviceSelection(enabled) {
-            this.logEvent({ message: 'capability closed', capability: this.openedCapability });
+            this.logEvent({ message: 'capability closed', capability: this.openedCapability, enabled, caller: new Error().stack });
             if (!enabled) {
                 const all = this.state.capabilities ?? [];
                 const requested = all.find(c => c.capability === this.openedCapability);

package/lib/esm/devices/page/statemachine.js

@@ -65,6 +65,8 @@ let PairingPageStateMachine = (() => {
         selectStateChangeCallback;
         retryTimeout;
         selectionTimeout;
+        pairingPromise;
+        scanningPromise;
         constructor() {
             this.logger = new EventLogger('PairingPageState');
         }
@@ -96,6 +98,8 @@ let PairingPageStateMachine = (() => {
                 this.unregisterServiceEventHandlers();
                 delete this.stateChangeCallback;
                 this.resetTimeouts();
+                delete this.pairingPromise;
+                delete this.scanningPromise;
                 this.setState('Closed');
                 this.logIncomingEvent('stop', prev, 'Closed');
             }
@@ -196,14 +200,20 @@ let PairingPageStateMachine = (() => {
                         this.resetTimeouts();
                         this.setState('Done');
                     }
-                    else {
+                    else if (!this.pairingPromise) {
                         this.setState('Pairing');
-                        service.startPairing(adapters, {});
+                        this.pairingPromise = Promise.resolve(service.startPairing(adapters, {}))
+                            .catch(err => { this.logError(err, 'startPairing'); })
+                            .finally(() => { delete this.pairingPromise; });
                     }
                 }
                 else if (this.selectState === 'Closed' || this.selectState === 'Active') {
-                    this.setState('Scanning');
-                    service.startScanning(adapters, {});
+                    if (!this.scanningPromise) {
+                        this.setState('Scanning');
+                        this.scanningPromise = Promise.resolve(service.startScanning(adapters, {}))
+                            .catch(err => { this.logError(err, 'startScanning'); })
+                            .finally(() => { delete this.scanningPromise; });
+                    }
                 }
                 if (this.state !== oldState)
                     this.logger.logEvent({ message: 'state changed', stateTransition: { from: oldState, to: this.state } });

package/lib/esm/devices/ride/cyclingMode.js

@@ -0,0 +1,25 @@
+export function isVirtualShiftingEnabled(mode) {
+    try {
+        if (!mode)
+            return false;
+        if (mode.isSIM()) {
+            const virtshiftMode = mode.getSetting('virtshift');
+            return (virtshiftMode === 'Mixed' || virtshiftMode === 'Incyclist' || virtshiftMode === 'SmartTrainer' || virtshiftMode === 'Enabled');
+        }
+        if (mode.isResistance()) {
+            return true;
+        }
+        return false;
+    }
+    catch {
+        return false;
+    }
+}
+export function getLoadButtonMode(mode) {
+    if (!mode)
+        return 'power';
+    if (mode.isSIM() || mode.isResistance()) {
+        return isVirtualShiftingEnabled(mode) ? 'gear' : 'hidden';
+    }
+    return 'power';
+}

package/lib/esm/devices/ride/index.js

@@ -1 +1,2 @@
 export * from './service';
+export * from './cyclingMode';

package/lib/esm/ride/display/service.js

@@ -38,7 +38,7 @@ import { Observer, Singleton } from "../../base/types";
 import { Injectable } from "../../base/decorators";
 import { Step, useWorkoutList, useWorkoutRide, Workout } from "../../workouts";
 import { useRouteList } from "../../routes";
-import { useDeviceConfiguration, useDeviceRide } from "../../devices";
+import { isVirtualShiftingEnabled as checkVirtualShiftingEnabled, useDeviceConfiguration, useDeviceRide } from "../../devices";
 import { useUserSettings } from "../../settings";
 import { IncyclistCapability } from "incyclist-devices";
 import { formatDateTime, getLegacyInterface, waitNextTick } from "../../utils";
@@ -429,8 +429,11 @@ let RideDisplayService = (() => {
                 this.observer?.stop({ immediately: props.noStateUpdates });
                 if (props.noStateUpdates)
                     delete this.observer;
-                else
-                    waitNextTick().then(() => delete this.observer);
+                else {
+                    const observerToClear = this.observer;
+                    waitNextTick().then(() => { if (this.observer === observerToClear)
+                        delete this.observer; });
+                }
                 if (prevState === 'Finished' || prevState === 'Idle' || prevState === 'Closing') {
                     this.state = 'Idle';
                     return;
@@ -550,7 +553,7 @@ let RideDisplayService = (() => {
                 const { time, speed, routeDistance, distance } = currentValues;
                 const data = { time, speed, routeDistance, distance };
                 this.getRideModeService().onActivityUpdate(data, currentValues);
-                this.observer.emit('data-update', data, currentValues);
+                this.observer?.emit('data-update', data, currentValues);
             }
         }
         onWorkoutStopped() {
@@ -1082,16 +1085,7 @@ let RideDisplayService = (() => {
         isVirtualShiftingEnabled() {
             try {
                 const mode = this.getDeviceRide().getCyclingMode();
-                if (!mode)
-                    return false;
-                if (mode.isSIM()) {
-                    const virtshiftMode = mode.getSetting('virtshift');
-                    return (virtshiftMode === 'Mixed' || virtshiftMode === 'Incyclist' || virtshiftMode === 'SmartTrainer' || virtshiftMode === 'Enabled');
-                }
-                if (mode.isResistance()) {
-                    return true;
-                }
-                return false;
+                return checkVirtualShiftingEnabled(mode);
             }
             catch (err) {
                 this.logError(err, 'isVirtualShiftingEnabled');

package/lib/esm/ride/workout/WorkoutDisplayService.js

@@ -32,6 +32,7 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
+import { getLoadButtonMode } from "../../devices";
 import { useWorkoutList, useWorkoutRide } from "../../workouts";
 import { RideModeService } from "../base/base";
 import { Injectable } from "../../base/decorators";
@@ -53,6 +54,9 @@ let WorkoutDisplayService = (() => {
         prevPowerTs = __runInitializers(this, _instanceExtraInitializers);
         buildRequest(props = {}) {
             if (props?.limits) {
+                const mode = this.getDeviceRide().getCyclingMode();
+                if (getLoadButtonMode(mode) !== 'power')
+                    return {};
                 return props.limits;
             }
             else
@@ -73,12 +77,12 @@ let WorkoutDisplayService = (() => {
             }
         }
         getLogProps() {
-            const workout = this.getWorkoutList().getSelected();
+            const workout = this.getWorkoutList().getSelected() ?? this.getWorkoutRide().getWorkout();
             const settings = this.getWorkoutList().getStartSettings() ?? {};
             const bikeProps = this.getBikeLogProps();
             return {
                 mode: 'workout',
-                workout: workout.name,
+                workout: workout?.name,
                 ...settings,
                 ...bikeProps
             };

package/lib/esm/workouts/ride/page/service.js

@@ -169,7 +169,8 @@ let WorkoutRidePageService = (() => {
                     steps: this.buildUpcomingSteps(current, wo.ftp),
                     dashboard: this.buildDashboardLine(wo),
                     gestureHint: this.buildGestureHint(base.startOverlayProps === null),
-                    loadIncrement: this.getLoadIncrement()
+                    loadIncrement: this.getLoadIncrement(),
+                    loadButtonMode: wo.loadButtonMode ?? 'power'
                 };
             }
             catch (err) {
@@ -331,6 +332,15 @@ let WorkoutRidePageService = (() => {
                 return undefined;
             }
         }
+        getLoadButtonMode() {
+            try {
+                return this.getWorkoutRide().getLoadButtonMode();
+            }
+            catch (err) {
+                this.logError(err, 'getLoadButtonMode');
+                return 'power';
+            }
+        }
         onRideStateUpdate(state) {
             this.subscribeToWorkoutObserver();
             switch (state) {
@@ -509,7 +519,8 @@ let WorkoutRidePageService = (() => {
                 steps: { previous: null, current: null, upcoming: [], hasMore: false },
                 dashboard: { text: '', mode: null },
                 gestureHint: null,
-                loadIncrement: DEFAULT_LOAD_INCREMENT
+                loadIncrement: DEFAULT_LOAD_INCREMENT,
+                loadButtonMode: 'power'
             };
         }
         updatePageDisplay() {

package/lib/esm/workouts/ride/service.js

@@ -36,7 +36,7 @@ import { getBindings } from "../../api";
 import { IncyclistService } from "../../base/service";
 import { Singleton } from "../../base/types";
 import { Observer } from "../../base/types/observer";
-import { useDeviceRide } from "../../devices";
+import { getLoadButtonMode, useDeviceRide } from "../../devices";
 import { useUserSettings } from "../../settings";
 import { waitNextTick } from "../../utils";
 import { valid } from "../../utils/valid";
@@ -54,14 +54,17 @@ let WorkoutRide = (() => {
     let _instanceExtraInitializers = [];
     let _getUserSettings_decorators;
     let _getWorkoutList_decorators;
+    let _getDeviceRide_decorators;
     var WorkoutRide = class extends _classSuper {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _getUserSettings_decorators = [Injectable];
             _getWorkoutList_decorators = [Injectable];
+            _getDeviceRide_decorators = [Injectable];
             __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getWorkoutList_decorators, { kind: "method", name: "getWorkoutList", static: false, private: false, access: { has: obj => "getWorkoutList" in obj, get: obj => obj.getWorkoutList }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getDeviceRide_decorators, { kind: "method", name: "getDeviceRide", static: false, private: false, access: { has: obj => "getDeviceRide" in obj, get: obj => obj.getDeviceRide }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             WorkoutRide = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -266,16 +269,68 @@ let WorkoutRide = (() => {
                 this.logError(err, 'backward', { ts, limits });
             }
         }
+        isPowerRangeAdjustable(delta) {
+            if (this.currentLimits?.minPower === this.currentLimits?.maxPower)
+                return false;
+            return delta >= 0
+                ? this.currentLimits?.targetPower < this.currentLimits?.maxPower
+                : this.currentLimits?.targetPower > this.currentLimits?.minPower;
+        }
+        getPowerRangeDeltaVal(magnitude) {
+            if (!this.settings?.ftp)
+                return magnitude;
+            return magnitude === 1 ? 5 : 50;
+        }
+        getPowerRangeAdjustmentWatts(magnitude, increase) {
+            const nominal = this.getPowerRangeDeltaVal(magnitude);
+            const headroom = increase
+                ? this.currentLimits.maxPower - this.currentLimits.targetPower
+                : this.currentLimits.targetPower - this.currentLimits.minPower;
+            return Math.min(nominal, headroom);
+        }
+        getLoadButtonMode() {
+            try {
+                const mode = this.getDeviceRide().getCyclingMode();
+                return getLoadButtonMode(mode);
+            }
+            catch (err) {
+                this.logError(err, 'getLoadButtonMode');
+                return 'power';
+            }
+        }
+        getGearButtonLabels() {
+            return { inc5: '+5', inc1: '+1', dec1: '-1', dec5: '-5' };
+        }
+        getLoadButtonLabels() {
+            const label = (magnitude, increase) => {
+                const sign = increase ? '+' : '-';
+                const delta = increase ? magnitude : -magnitude;
+                return this.isPowerRangeAdjustable(delta)
+                    ? `${sign}${this.getPowerRangeAdjustmentWatts(magnitude, increase)}W`
+                    : `${sign}${magnitude}%`;
+            };
+            return {
+                inc5: label(5, true),
+                inc1: label(1, true),
+                dec1: label(1, false),
+                dec5: label(5, false),
+            };
+        }
         powerUp(delta) {
             if (delta < 0)
                 return this.powerDown(-delta);
             this.logEvent({ message: 'workout power up', delta });
             try {
-                if (this.currentLimits?.minPower !== this.currentLimits?.maxPower && this.currentLimits?.targetPower < this.currentLimits?.maxPower) {
-                    let deltaVal = delta;
-                    if (this.settings?.ftp) {
-                        deltaVal = delta === 1 ? 5 : 50;
-                    }
+                const loadButtonMode = this.getLoadButtonMode();
+                if (loadButtonMode === 'hidden')
+                    return undefined;
+                if (loadButtonMode === 'gear') {
+                    this.gearChange(delta);
+                    this.logEvent({ message: 'workout gear shift', gearDelta: delta });
+                    return { type: 'gear', value: delta };
+                }
+                if (this.isPowerRangeAdjustable(delta)) {
+                    const deltaVal = this.getPowerRangeDeltaVal(delta);
                     this.currentLimits.targetPower = Math.min(this.currentLimits.targetPower + deltaVal, this.currentLimits.maxPower);
                     this.logEvent({ message: 'workout target power adjusted', targetPower: this.currentLimits.targetPower });
                     this.emit('update', this.getDashboardDisplayProperties());
@@ -301,11 +356,16 @@ let WorkoutRide = (() => {
         powerDown(delta) {
             this.logEvent({ message: 'workout power down', delta });
             try {
-                if (this.currentLimits?.minPower !== this.currentLimits?.maxPower && this.currentLimits?.targetPower > this.currentLimits?.minPower) {
-                    let deltaVal = delta;
-                    if (this.settings?.ftp) {
-                        deltaVal = delta === 1 ? 5 : 50;
-                    }
+                const loadButtonMode = this.getLoadButtonMode();
+                if (loadButtonMode === 'hidden')
+                    return undefined;
+                if (loadButtonMode === 'gear') {
+                    this.gearChange(-delta);
+                    this.logEvent({ message: 'workout gear shift', gearDelta: -delta });
+                    return { type: 'gear', value: -delta };
+                }
+                if (this.isPowerRangeAdjustable(-delta)) {
+                    const deltaVal = this.getPowerRangeDeltaVal(delta);
                     this.currentLimits.targetPower = Math.max(this.currentLimits.targetPower - deltaVal, this.currentLimits.minPower);
                     this.logEvent({ message: 'workout target power adjusted', targetPower: this.currentLimits.targetPower });
                     this.emit('update', this.getDashboardDisplayProperties());
@@ -328,6 +388,9 @@ let WorkoutRide = (() => {
                 return undefined;
             }
         }
+        gearChange(gearDelta) {
+            this.getDeviceRide().sendUpdate({ gearDelta });
+        }
         toggleCyclingMode() {
             const deviceRide = useDeviceRide();
             deviceRide.toggleCyclingMode();
@@ -341,6 +404,7 @@ let WorkoutRide = (() => {
                 const { start, stop } = this.getZoomParameters(this.trainingTime);
                 const title = this.getStepTitle(this.trainingTime);
                 const canShowBackward = Math.round((this.trainingTime ?? 0)) > 0;
+                const loadButtonMode = this.getLoadButtonMode();
                 const props = {
                     workout: this.workout, title,
                     ftp: this.settings.ftp,
@@ -348,7 +412,9 @@ let WorkoutRide = (() => {
                     start, stop,
                     mode: this.getCyclingModeText(),
                     canShowBackward,
-                    canShowForward: true
+                    canShowForward: true,
+                    loadButtonMode,
+                    loadButtons: loadButtonMode === 'power' ? this.getLoadButtonLabels() : this.getGearButtonLabels()
                 };
                 return props;
             }
@@ -615,6 +681,9 @@ let WorkoutRide = (() => {
         getWorkoutList() {
             return useWorkoutList();
         }
+        getDeviceRide() {
+            return useDeviceRide();
+        }
     };
     return WorkoutRide = _classThis;
 })();

package/lib/types/activities/upload/index.d.ts

@@ -1,4 +1,3 @@
-export * from './velohero';
 export * from './strava';
 export * from './intervals';
 export * from './types';

package/lib/types/apps/index.d.ts

@@ -2,4 +2,3 @@ export * from './base';
 export * from './googleMaps';
 export * from './service';
 export * from './strava';
-export * from './velohero';

package/lib/types/devices/page/statemachine.d.ts

@@ -11,6 +11,8 @@ export declare class PairingPageStateMachine {
     protected selectStateChangeCallback: () => void;
     protected retryTimeout: NodeJS.Timeout | undefined;
     protected selectionTimeout: NodeJS.Timeout | undefined;
+    protected pairingPromise: Promise<void> | undefined;
+    protected scanningPromise: Promise<void> | undefined;
     constructor();
     get state(): PageState;
     get selectState(): SelectState;

package/lib/types/devices/ride/cyclingMode.d.ts

@@ -0,0 +1,4 @@
+import { CyclingMode } from "incyclist-devices";
+export declare function isVirtualShiftingEnabled(mode: CyclingMode): boolean;
+export type LoadButtonMode = 'power' | 'gear' | 'hidden';
+export declare function getLoadButtonMode(mode: CyclingMode): LoadButtonMode;

package/lib/types/devices/ride/index.d.ts

@@ -1,2 +1,3 @@
 export * from './service';
 export type * from './types';
+export * from './cyclingMode';

package/lib/types/workouts/ride/page/service.d.ts

@@ -1,7 +1,7 @@
 import { IncyclistPageService } from "../../../base/pages";
 import type { IObserver } from "../../../base/typedefs";
 import type { CurrentRideState, RideType } from "../../../types";
-import type { PowerAdjustmentResult, WorkoutDisplayProperties } from "../types";
+import type { LoadButtonMode, PowerAdjustmentResult, WorkoutDisplayProperties } from "../types";
 import type { Workout } from "../../base/model";
 import type { StepDefinition } from "../../base/model/types";
 import type { IWorkoutRidePageService, WorkoutDashboardLine, WorkoutGestureHint, WorkoutGraphActuals, WorkoutGraphPlan, WorkoutRideMenuProps, WorkoutRidePageDisplayProps, WorkoutUpcomingSteps } from "./types";
@@ -38,6 +38,7 @@ export declare class WorkoutRidePageService extends IncyclistPageService impleme
     }): void;
     onCancelStart(): void;
     adjustLoad(deltaPct: number): PowerAdjustmentResult | undefined;
+    getLoadButtonMode(): LoadButtonMode;
     protected onRideStateUpdate(state: CurrentRideState): void;
     protected onWorkoutUpdate(): void;
     protected onFinished(): void;

package/lib/types/workouts/ride/page/types.d.ts

@@ -2,6 +2,7 @@ import type { IObserver } from "../../../base/typedefs";
 import type { IPageService } from "../../../base/pages";
 import type { RideMenuProps, RidePageDisplayProps } from "../../../ride/page/types";
 import type { WorkoutGraphPlanBar } from "../../base/graph/types";
+import type { LoadButtonMode } from "../types";
 export interface WorkoutGraphPoint {
     x: number;
     y: number;
@@ -52,6 +53,7 @@ export interface WorkoutRidePageDisplayProps extends RidePageDisplayProps {
     title: string;
     gestureHint: WorkoutGestureHint | null;
     loadIncrement: number;
+    loadButtonMode: LoadButtonMode;
 }
 export interface WorkoutRidePageCallbacks {
     onMenuOpen(): void;
@@ -76,4 +78,5 @@ export interface IWorkoutRidePageService extends WorkoutRidePageCallbacks, IPage
     getPageDisplayProps(): WorkoutRidePageDisplayProps;
     getGraphActuals(): WorkoutGraphActuals;
     adjustLoad(deltaPct: number): void;
+    getLoadButtonMode(): LoadButtonMode;
 }

package/lib/types/workouts/ride/service.d.ts

@@ -1,10 +1,11 @@
 import { IncyclistService } from "../../base/service";
 import { Observer } from "../../base/types/observer";
+import { DeviceRideService } from "../../devices";
 import { Workout } from "../base/model";
 import { CurrentStep, PowerLimit, StepDefinition } from "../base/model/types";
 import { WorkoutListService } from "../list";
 import { WorkoutSettings } from "../list/cards/types";
-import { ActiveWorkoutLimit, PowerAdjustmentResult, WorkoutDisplayProperties } from "./types";
+import { ActiveWorkoutLimit, LoadButtonMode, PowerAdjustmentResult, WorkoutDisplayProperties } from "./types";
 export declare class WorkoutRide extends IncyclistService {
     protected manualTimeOffset: number;
     protected manualPowerOffset: number;
@@ -33,8 +34,15 @@ export declare class WorkoutRide extends IncyclistService {
     }): void;
     forward(): void;
     backward(): void;
+    private isPowerRangeAdjustable;
+    private getPowerRangeDeltaVal;
+    private getPowerRangeAdjustmentWatts;
+    getLoadButtonMode(): LoadButtonMode;
+    private getGearButtonLabels;
+    private getLoadButtonLabels;
     powerUp(delta: number): PowerAdjustmentResult | undefined;
     powerDown(delta: number): PowerAdjustmentResult | undefined;
+    private gearChange;
     toggleCyclingMode(): void;
     getDashboardDisplayProperties(): WorkoutDisplayProperties;
     getCurrentLimits(): ActiveWorkoutLimit;
@@ -66,6 +74,7 @@ export declare class WorkoutRide extends IncyclistService {
     protected getCyclingModeText(): string;
     protected getUserSettings(): import("../../settings").UserSettingsService;
     protected getWorkoutList(): WorkoutListService;
+    protected getDeviceRide(): DeviceRideService;
 }
 export declare const useWorkoutRide: () => WorkoutRide;
 export declare const getWorkoutRide: () => WorkoutRide;

package/lib/types/workouts/ride/types.d.ts

@@ -1,5 +1,7 @@
 import { Workout } from "../base/model";
 import { StepDefinition } from "../base/model/types";
+import { LoadButtonMode } from "../../devices";
+export type { LoadButtonMode };
 export interface WorkoutRequest {
     time: number;
     minPower?: number;
@@ -16,7 +18,7 @@ export interface ActiveWorkoutLimit extends WorkoutRequest {
     step?: StepDefinition;
 }
 export interface PowerAdjustmentResult {
-    type: 'ftp' | 'targetPower';
+    type: 'ftp' | 'targetPower' | 'gear';
     value: number;
 }
 export interface WorkoutDisplayProperties {
@@ -29,4 +31,11 @@ export interface WorkoutDisplayProperties {
     mode?: string;
     canShowBackward?: boolean;
     canShowForward?: boolean;
+    loadButtonMode?: LoadButtonMode;
+    loadButtons?: {
+        inc5: string;
+        inc1: string;
+        dec1: string;
+        dec5: string;
+    };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.94",
+  "version": "1.7.95",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },