incyclist-services 1.7.112 → 1.7.113

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

@@ -850,15 +850,20 @@ let RideDisplayService = (() => {
             delete this.startDeviceHandlers;
         }
         devicePowerUp(inc, gearFallback = true) {
+            this.adjustDevicePower(inc, gearFallback);
+        }
+        adjustDevicePower(inc, gearFallback = true) {
             const device = this.getDeviceRide().getControlAdapter();
             if (!device)
-                return;
+                return undefined;
             const mode = this.getDeviceRide().getCyclingMode(device.udid);
             if (mode.getName() === 'Simulator') {
                 this.simulatorPowerUp(mode, inc);
+                return { type: 'targetPower', value: Number.NaN };
             }
             else if (mode.isERG()) {
                 this.getRideModeService().sendUpdate({ targetPowerDelta: inc });
+                return { type: 'targetPower', value: Number.NaN };
             }
             else if (mode.isSIM() || mode.isResistance()) {
                 let gearDelta = inc / 5;
@@ -866,7 +871,9 @@ let RideDisplayService = (() => {
                     gearDelta = Math.sign(gearDelta) * 5;
                 }
                 this.gearChange(gearDelta);
+                return { type: 'gear', value: gearDelta };
             }
+            return undefined;
         }
         gearChange(gearDelta) {
             this.getRideModeService().sendUpdate({ gearDelta });

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

@@ -341,7 +341,7 @@ let RidePageService = (() => {
             const base = this.buildBaseDisplayProps();
             const displayProps = {
                 ...base,
-                ...this.buildWorkoutOverlayProps(props, base.startOverlayProps === null),
+                ...this.buildWorkoutOverlayProps(props),
                 video: props.video,
                 videos: props.videos,
                 route: props.route
@@ -353,7 +353,7 @@ let RidePageService = (() => {
             const base = this.buildBaseDisplayProps();
             const displayProps = {
                 ...base,
-                ...this.buildWorkoutOverlayProps(props, base.startOverlayProps === null),
+                ...this.buildWorkoutOverlayProps(props),
                 rideView: props.rideView,
                 route: props.route,
                 displayObserver: props.displayObserver,
@@ -362,7 +362,7 @@ let RidePageService = (() => {
             };
             return displayProps;
         }
-        buildWorkoutOverlayProps(props, startOverlayCleared) {
+        buildWorkoutOverlayProps(props) {
             const cornerWidget = this.getCornerWidget();
             if (!this.isWorkoutAttached() || !props?.showWorkout)
                 return { workoutAttached: false, cornerWidget };
@@ -374,10 +374,7 @@ let RidePageService = (() => {
                     title: wo.title ?? '',
                     graph: this.buildGraphPlan(props.workout, wo.ftp),
                     steps: this.buildUpcomingSteps(props.workout, wo.ftp),
-                    dashboard: this.buildDashboardLine(wo),
-                    gestureHint: this.buildGestureHint(startOverlayCleared),
-                    loadIncrement: this.getLoadIncrement(),
-                    loadButtonMode: wo.loadButtonMode ?? 'power'
+                    dashboard: this.buildDashboardLine(wo)
                 };
             }
             catch (err) {
@@ -540,10 +537,15 @@ let RidePageService = (() => {
         }
         adjustLoad(deltaPct) {
             try {
-                if (deltaPct >= 0)
-                    return this.getWorkoutRide().powerUp(deltaPct);
-                else
-                    return this.getWorkoutRide().powerDown(-deltaPct);
+                const plainErgAdjustment = !this.getWorkoutRide().inUse() && this.getLoadButtonMode() === 'power';
+                if (plainErgAdjustment) {
+                    const sign = deltaPct >= 0 ? 1 : -1;
+                    const nominal = Math.abs(deltaPct) === 1 ? 5 : 50;
+                    return this.getRideDisplay().adjustDevicePower(sign * nominal);
+                }
+                return deltaPct >= 0
+                    ? this.getWorkoutRide().powerUp(deltaPct)
+                    : this.getWorkoutRide().powerDown(-deltaPct);
             }
             catch (err) {
                 this.logError(err, 'adjustLoad');
@@ -576,10 +578,7 @@ let RidePageService = (() => {
                     title: wo.title ?? '',
                     graph: this.buildGraphPlan(current, wo.ftp),
                     steps: this.buildUpcomingSteps(current, wo.ftp),
-                    dashboard: this.buildDashboardLine(wo),
-                    gestureHint: this.buildGestureHint(base.startOverlayProps === null),
-                    loadIncrement: this.getLoadIncrement(),
-                    loadButtonMode: wo.loadButtonMode ?? 'power'
+                    dashboard: this.buildDashboardLine(wo)
                 };
             }
             catch (err) {
@@ -783,12 +782,16 @@ let RidePageService = (() => {
         buildBaseDisplayProps() {
             const state = this.getRideDisplay().getState();
             const isStarting = state === 'Idle' || state === 'Starting' || state === 'Error';
+            const startOverlayProps = isStarting ? this.getRideDisplay().getStartOverlayProps() : null;
             return {
                 rideState: state,
                 rideType: this.getRideDisplay().getRideType(),
-                startOverlayProps: isStarting ? this.getRideDisplay().getStartOverlayProps() : null,
+                startOverlayProps,
                 menuProps: this.menuProps,
-                startGateProps: this.startGateProps
+                startGateProps: this.startGateProps,
+                gestureHint: this.buildGestureHint(startOverlayProps === null),
+                loadIncrement: this.getLoadIncrement(),
+                loadButtonMode: this.getLoadButtonMode()
             };
         }
         onDisplayStateUpdate(state) {