incyclist-services 1.7.111 → 1.7.113

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

@@ -276,6 +276,18 @@ let WorkoutRide = (() => {
                 ? this.currentLimits?.targetPower < this.currentLimits?.maxPower
                 : this.currentLimits?.targetPower > this.currentLimits?.minPower;
         }
+        isPowerLocked(power) {
+            return power?.locked ?? this.workout?.lockedPowerTargets ?? false;
+        }
+        isWattFallbackAdjustment() {
+            const power = this.currentStep?.power;
+            return power?.type === 'watt' && !this.isPowerLocked(power);
+        }
+        trackTargetToBoundary(increase) {
+            if (this.currentLimits?.maxPower === undefined)
+                return;
+            this.currentLimits.targetPower = increase ? this.currentLimits.maxPower : this.currentLimits.minPower;
+        }
         getPowerRangeDeltaVal(magnitude) {
             if (!this.settings?.ftp)
                 return magnitude;
@@ -305,9 +317,11 @@ let WorkoutRide = (() => {
             const label = (magnitude, increase) => {
                 const sign = increase ? '+' : '-';
                 const delta = increase ? magnitude : -magnitude;
-                return this.isPowerRangeAdjustable(delta)
-                    ? `${sign}${this.getPowerRangeAdjustmentWatts(magnitude, increase)}W`
-                    : `${sign}${magnitude}%`;
+                if (this.isPowerRangeAdjustable(delta))
+                    return `${sign}${this.getPowerRangeAdjustmentWatts(magnitude, increase)}W`;
+                if (this.isWattFallbackAdjustment())
+                    return `${sign}${magnitude}W`;
+                return `${sign}${magnitude}%`;
             };
             return {
                 inc5: label(5, true),
@@ -336,17 +350,22 @@ let WorkoutRide = (() => {
                     this.emit('update', this.getDashboardDisplayProperties());
                     return { type: 'targetPower', value: this.currentLimits.targetPower };
                 }
-                let adjustedFtp;
-                if (this.settings?.ftp) {
-                    this.settings.ftp = this.settings.ftp * (1 + delta / 100);
+                const wattFallback = this.isWattFallbackAdjustment();
+                if (wattFallback)
+                    this.manualPowerOffset += delta;
+                else {
+                    this.settings.ftp = (this.settings.ftp ?? DEFAULT_FTP) * (1 + delta / 100);
                     this.workoutList.setStartSettings(this.settings);
                     this.logEvent({ message: 'workout FTP adjusted', ftp: this.settings.ftp });
-                    adjustedFtp = Math.round(this.settings.ftp);
                 }
-                this.manualPowerOffset += delta;
                 this.setCurrentLimits();
+                this.trackTargetToBoundary(true);
                 this.emit('update', this.getDashboardDisplayProperties());
-                return adjustedFtp !== undefined ? { type: 'ftp', value: adjustedFtp } : undefined;
+                if (wattFallback) {
+                    this.logEvent({ message: 'workout target power adjusted', targetPower: this.currentLimits.targetPower });
+                    return { type: 'targetPower', value: this.currentLimits.targetPower };
+                }
+                return { type: 'ftp', value: Math.round(this.settings.ftp) };
             }
             catch (err) {
                 this.logError(err, 'powerUp');
@@ -371,17 +390,22 @@ let WorkoutRide = (() => {
                     this.emit('update', this.getDashboardDisplayProperties());
                     return { type: 'targetPower', value: this.currentLimits.targetPower };
                 }
-                let adjustedFtp;
-                if (this.settings?.ftp) {
-                    this.settings.ftp = this.settings.ftp / (1 + delta / 100);
+                const wattFallback = this.isWattFallbackAdjustment();
+                if (wattFallback)
+                    this.manualPowerOffset -= delta;
+                else {
+                    this.settings.ftp = (this.settings.ftp ?? DEFAULT_FTP) / (1 + delta / 100);
                     this.workoutList.setStartSettings(this.settings);
                     this.logEvent({ message: 'workout FTP adjusted', ftp: this.settings.ftp });
-                    adjustedFtp = Math.round(this.settings.ftp);
                 }
-                this.manualPowerOffset -= delta;
                 this.setCurrentLimits();
+                this.trackTargetToBoundary(false);
                 this.emit('update', this.getDashboardDisplayProperties());
-                return adjustedFtp !== undefined ? { type: 'ftp', value: adjustedFtp } : undefined;
+                if (wattFallback) {
+                    this.logEvent({ message: 'workout target power adjusted', targetPower: this.currentLimits.targetPower });
+                    return { type: 'targetPower', value: this.currentLimits.targetPower };
+                }
+                return { type: 'ftp', value: Math.round(this.settings.ftp) };
             }
             catch (err) {
                 this.logError(err, 'powerDown');
@@ -630,9 +654,10 @@ let WorkoutRide = (() => {
             if (power.type === 'pct of FTP') {
                 const pct = val;
                 const ftp = this.settings.ftp ?? DEFAULT_FTP;
-                const ftpVal = this.settings.ftp ?? ftp + this.manualPowerOffset;
-                return Math.round(pct * ftpVal / 100);
+                return Math.round(pct * ftp / 100);
             }
+            if (this.isPowerLocked(power))
+                return Math.round(val);
             return Math.round(val + this.manualPowerOffset);
         }
         getFtpFromUserSettings() {

package/lib/types/appstate/types.d.ts

@@ -1,4 +1,4 @@
-export type FeatureToggle = 'NEW_SEARCH_UI' | 'CONTROLLERS' | 'WEBBLE_WINDOWS' | 'MOBILE_NEXT_VIDEO';
+export type FeatureToggle = 'NEW_SEARCH_UI' | 'WEBBLE_WINDOWS' | 'MOBILE_NEXT_VIDEO' | 'VIDEO_ROUTE';
 export type Interfaces = 'ant' | 'ble' | 'serial' | 'wifi' | 'tcpip';
 export type BLEFeatures = {
     services: Array<string>;

package/lib/types/autoupdate/api.d.ts

@@ -12,7 +12,7 @@ export declare class IncyclistUpdatesApi extends IncyclistService {
     getLatestAppVersion(platform: string): Promise<VersionInfo>;
     protected getApi(): AxiosInstance;
     protected getBaseUrl(): string;
-    protected _get(url: string, config?: Record<string, any>): Promise<import("axios").AxiosResponse<any, any, {}>>;
+    protected _get(url: string, config?: Record<string, any>): Promise<import("axios").AxiosResponse<any, any, {}, any>>;
     protected isExpectedError(err: Error): boolean;
     protected getLatestMacAppVersion(): Promise<VersionInfo>;
     protected getSetting(key: string, def: any): any;

package/lib/types/devices/configuration/service.d.ts

@@ -74,7 +74,6 @@ export declare class DeviceConfigurationService extends IncyclistService {
     protected verifyCapabilitySettings(): void;
     protected initCapabilties(): void;
     protected initInterfaces(): void;
-    protected hasFTControllers(): boolean;
     protected doesAppSupportsWifi(): boolean;
     protected getAppVersion(): string;
     protected getAppChannel(): string;