feat(#674): Add eccentric load option for Old School mode

shared/build.gradle.kts

@@ -37,7 +37,7 @@ kotlin {
         withHostTest {}
     }
 
-    // iOS target (iosArm64 only - physical devices for distribution)
+    // iOS targets
     val xcf = XCFramework()
     iosArm64 {
         binaries.framework {
@@ -52,6 +52,19 @@ kotlin {
             freeCompilerArgs += listOf("-Xadd-light-debug=enable")
         }
     }
+    iosSimulatorArm64 {
+        binaries.framework {
+            baseName = "shared"
+            isStatic = true
+            xcf.add(this)
+            // Link system frameworks required by shared module
+            linkerOpts("-framework", "HealthKit")
+            linkerOpts("-framework", "Speech")
+        }
+        binaries.all {
+            freeCompilerArgs += listOf("-Xadd-light-debug=enable")
+        }
+    }
 
     sourceSets {
         val commonMain by getting {
@@ -179,11 +192,14 @@ kotlin {
 
         val iosArm64Main by getting
         val iosArm64Test by getting
+        val iosSimulatorArm64Main by getting
+        val iosSimulatorArm64Test by getting
 
         @Suppress("UNUSED_VARIABLE")
         val iosMain by creating {
             dependsOn(commonMain)
             iosArm64Main.dependsOn(this)
+            iosSimulatorArm64Main.dependsOn(this)
 
             dependencies {
                 // SQLDelight Native Driver
@@ -198,6 +214,7 @@ kotlin {
         val iosTest by creating {
             dependsOn(commonTest)
             iosArm64Test.dependsOn(this)
+            iosSimulatorArm64Test.dependsOn(this)
 
             dependencies {
                 implementation(libs.sqldelight.native.driver)

shared/src/commonMain/kotlin/com/devil/phoenixproject/data/sync/PortalSyncAdapter.kt

@@ -580,7 +580,8 @@ object PortalSyncAdapter {
                 repCountTiming = ex.repCountTiming.name,
                 stopAtPosition = if (ex.stopAtTop) "TOP" else null,
                 stallDetection = ex.stallDetectionEnabled,
-                eccentricLoad = if (ex.programMode == ProgramMode.Echo) {
+                eccentricLoad = if (ex.programMode == ProgramMode.Echo ||
+                    (ex.programMode == ProgramMode.OldSchool && ex.eccentricLoad.percentage > 100)) {
                     ex.eccentricLoad.name
                 } else {
                     null

shared/src/commonMain/kotlin/com/devil/phoenixproject/domain/model/Models.kt

@@ -370,6 +370,11 @@ data class WorkoutParameters(
 ) {
     /** True if this is an Echo workout */
     val isEchoMode: Boolean get() = programMode == ProgramMode.Echo
+
+    /** True if Old School mode has eccentric load > 100% (triggers 0x4E Echo packet dispatch).
+     *  Gated on ProgramMode.OldSchool so switching to Pump/TUT/TUTBeast/EccentricOnly
+     *  doesn't accidentally dispatch the 0x4E packet from a stale eccentric value. */
+    val hasEccentricOverload: Boolean get() = programMode == ProgramMode.OldSchool && eccentricLoad.percentage > 100
 }
 
 /**

shared/src/commonMain/kotlin/com/devil/phoenixproject/presentation/manager/ActiveSessionEngine.kt

@@ -31,6 +31,7 @@ import com.devil.phoenixproject.domain.model.BiomechanicsSetSummary
 import com.devil.phoenixproject.domain.model.BodyweightVariantOption
 import com.devil.phoenixproject.domain.model.CompletedSet
 import com.devil.phoenixproject.domain.model.ConnectionStatus
+import com.devil.phoenixproject.domain.model.EchoLevel
 import com.devil.phoenixproject.domain.model.FiveThreeOneRoutineDetector
 import com.devil.phoenixproject.domain.model.HapticEvent
 import com.devil.phoenixproject.domain.model.IntegrationProvider
@@ -430,8 +431,8 @@ class ActiveSessionEngine(
                         // deload after 1.25s below 40 mm/s — Issue #553), so DELOAD_OCCURRED fires
                         // routinely mid-set as the athlete fatigues. It is NOT a cable-release
                         // signal in Echo mode and must never arm the auto-stop stall timer.
-                        if (params.isEchoMode) {
-                            Logger.d("DELOAD_OCCURRED ignored - Echo mode (deload windows define Echo levels)")
+                        if (params.isEchoMode || params.hasEccentricOverload) {
+                            Logger.d("DELOAD_OCCURRED ignored - eccentric overload active (Echo or Old School+ecc)")
                             return@collect
                         }
                         if (!isWarmupGateOpenForAutoStop()) {
@@ -1843,8 +1844,8 @@ class ActiveSessionEngine(
         val params = coordinator._workoutParameters.value
         if (!params.isJustLift) return
 
-        val eccentricLoadPct = if (params.isEchoMode) params.eccentricLoad.percentage else 100
-        val echoLevelVal = if (params.isEchoMode) params.echoLevel.levelValue else 0
+        val eccentricLoadPct = params.eccentricLoad.percentage
+        val echoLevelVal = params.echoLevel.levelValue
 
         try {
             val defaults = JustLiftDefaultsDocument(
@@ -1883,8 +1884,8 @@ class ActiveSessionEngine(
         val exerciseId = currentExercise.exercise.id ?: return
 
         val isEchoExercise = currentExercise.programMode == ProgramMode.Echo
-        val eccentricLoadPct = if (isEchoExercise) currentExercise.eccentricLoad.percentage else 100
-        val echoLevelVal = if (isEchoExercise) currentExercise.echoLevel.levelValue else 0
+        val eccentricLoadPct = currentExercise.eccentricLoad.percentage
+        val echoLevelVal = currentExercise.echoLevel.levelValue
 
         try {
             val setReps = currentExercise.setReps.ifEmpty { listOf(10) }
@@ -2831,10 +2832,11 @@ class ActiveSessionEngine(
                     }
                 }
 
-                val commandValidation = if (bleParams.isEchoMode) {
+                val hasEccentricOverload = bleParams.hasEccentricOverload
+                val commandValidation = if (bleParams.isEchoMode || hasEccentricOverload) {
                     WorkoutCommandValidator.validateEchoControl(
-                        level = bleParams.echoLevel,
-                        warmupReps = bleParams.warmupReps,
+                        level = if (bleParams.isEchoMode) bleParams.echoLevel else EchoLevel.HARDER,
+                        warmupReps = if (bleParams.isEchoMode) bleParams.warmupReps else Constants.DEFAULT_WARMUP_REPS,
                         targetReps = bleParams.reps,
                         isJustLift = isJustLiftMode || bleParams.isJustLift,
                         isAMRAP = bleParams.isAMRAP,
@@ -2849,10 +2851,10 @@ class ActiveSessionEngine(
                     return@launch
                 }
 
-                val command = if (bleParams.isEchoMode) {
+                val command = if (bleParams.isEchoMode || hasEccentricOverload) {
                     BlePacketFactory.createEchoControl(
-                        level = bleParams.echoLevel,
-                        warmupReps = bleParams.warmupReps,
+                        level = if (bleParams.isEchoMode) bleParams.echoLevel else EchoLevel.HARDER,
+                        warmupReps = if (bleParams.isEchoMode) bleParams.warmupReps else Constants.DEFAULT_WARMUP_REPS,
                         targetReps = bleParams.reps,
                         isJustLift = isJustLiftMode || bleParams.isJustLift,
                         isAMRAP = bleParams.isAMRAP,

shared/src/commonMain/kotlin/com/devil/phoenixproject/presentation/manager/RoutineFlowManager.kt

@@ -1064,7 +1064,7 @@ class RoutineFlowManager(
             adjustedReps = setReps,
             adjustedProgressionKg = progressionKg,
             echoLevel = if (exercise.programMode is ProgramMode.Echo) exercise.echoLevel else null,
-            eccentricLoadPercent = if (exercise.programMode is ProgramMode.Echo) exercise.eccentricLoad.percentage else null,
+            eccentricLoadPercent = if (exercise.programMode is ProgramMode.Echo || exercise.programMode is ProgramMode.OldSchool) exercise.eccentricLoad.percentage else null,
         )
 
         // Issue #129: Determine if this specific set is AMRAP (null reps = AMRAP)
@@ -1145,7 +1145,7 @@ class RoutineFlowManager(
             adjustedReps = adjustedReps,
             adjustedProgressionKg = progressionKg,
             echoLevel = if (exercise.programMode is ProgramMode.Echo) exercise.echoLevel else null,
-            eccentricLoadPercent = if (exercise.programMode is ProgramMode.Echo) exercise.eccentricLoad.percentage else null,
+            eccentricLoadPercent = if (exercise.programMode is ProgramMode.Echo || exercise.programMode is ProgramMode.OldSchool) exercise.eccentricLoad.percentage else null,
         )
 
         // Issue #129: Check raw value for AMRAP - null reps in setReps list = AMRAP

shared/src/commonMain/kotlin/com/devil/phoenixproject/presentation/screen/ExerciseEditBottomSheet.kt

@@ -234,6 +234,7 @@ fun ExerciseEditBottomSheet(
     val isTutMode = showCableOnlyExerciseControls &&
         (selectedMode is WorkoutMode.TUT || selectedMode is WorkoutMode.TUTBeast)
     val isEchoMode = showCableOnlyExerciseControls && selectedMode is WorkoutMode.Echo
+    val isOldSchool = showCableOnlyExerciseControls && selectedMode is WorkoutMode.OldSchool
 
     LaunchedEffect(rackItems, defaultRackItemIds) {
         val enabledRackIds = rackItems.filter { it.enabled }.map { it.id }.toSet()
@@ -414,12 +415,14 @@ fun ExerciseEditBottomSheet(
                     }
                 }
 
-                // Echo Mode options
-                if (isEchoMode) {
+                // Echo Mode options — EccentricLoad visible for Echo + Old School; EchoLevel Echo-only
+                if (isEchoMode || isOldSchool) {
                     EccentricLoadSelector(
                         eccentricLoad = eccentricLoad,
                         onLoadChange = viewModel::onEccentricLoadChange,
                     )
+                }
+                if (isEchoMode) {
                     EchoLevelSelector(
                         level = echoLevel,
                         onLevelChange = viewModel::onEchoLevelChange,

shared/src/commonMain/kotlin/com/devil/phoenixproject/presentation/screen/JustLiftScreen.kt

@@ -211,10 +211,8 @@ fun JustLiftScreen(navController: NavController, viewModel: MainViewModel, theme
     }
 
     LaunchedEffect(workoutParameters.programMode) {
-        if (workoutParameters.isEchoMode) {
-            eccentricLoad = workoutParameters.eccentricLoad
-            echoLevel = workoutParameters.echoLevel
-        }
+        eccentricLoad = workoutParameters.eccentricLoad
+        echoLevel = workoutParameters.echoLevel
     }
 
     // Navigate to ActiveWorkout when workout becomes active
@@ -582,7 +580,10 @@ fun JustLiftScreen(navController: NavController, viewModel: MainViewModel, theme
             }
 
             val isEchoMode = selectedMode is WorkoutMode.Echo
-            if (isEchoMode) {
+            val isOldSchool = selectedMode is WorkoutMode.OldSchool
+            val showEccentricLoad = isEchoMode || isOldSchool
+
+            if (showEccentricLoad) {
                 Card(
                     modifier = flexibleBodyModifier,
                     colors = CardDefaults.cardColors(
@@ -645,48 +646,51 @@ fun JustLiftScreen(navController: NavController, viewModel: MainViewModel, theme
                             overflow = TextOverflow.Ellipsis,
                         )
 
-                        HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.35f))
+                        // EchoLevel selector — only for Echo mode
+                        if (isEchoMode) {
+                            HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.35f))
 
-                        Text(
-                            stringResource(Res.string.echo_level),
-                            style = MaterialTheme.typography.labelLarge,
-                            fontWeight = FontWeight.Bold,
-                            color = MaterialTheme.colorScheme.onSurface,
-                        )
+                            Text(
+                                stringResource(Res.string.echo_level),
+                                style = MaterialTheme.typography.labelLarge,
+                                fontWeight = FontWeight.Bold,
+                                color = MaterialTheme.colorScheme.onSurface,
+                            )
 
-                        if (useCompactAccessibility) {
-                            FlowRow(
-                                modifier = Modifier.fillMaxWidth(),
-                                horizontalArrangement = Arrangement.spacedBy(8.dp),
-                                verticalArrangement = Arrangement.spacedBy(4.dp),
-                            ) {
-                                EchoLevel.entries.forEach { level ->
-                                    FilterChip(
-                                        selected = echoLevel == level,
-                                        onClick = {
-                                            echoLevel = level
-                                            selectedMode = WorkoutMode.Echo(level)
-                                        },
-                                        label = { Text(echoLevelLabel(level)) },
-                                    )
+                            if (useCompactAccessibility) {
+                                FlowRow(
+                                    modifier = Modifier.fillMaxWidth(),
+                                    horizontalArrangement = Arrangement.spacedBy(8.dp),
+                                    verticalArrangement = Arrangement.spacedBy(4.dp),
+                                ) {
+                                    EchoLevel.entries.forEach { level ->
+                                        FilterChip(
+                                            selected = echoLevel == level,
+                                            onClick = {
+                                                echoLevel = level
+                                                selectedMode = WorkoutMode.Echo(level)
+                                            },
+                                            label = { Text(echoLevelLabel(level)) },
+                                        )
+                                    }
                                 }
-                            }
-                        } else {
-                            SingleChoiceSegmentedButtonRow(
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .padding(horizontal = 4.dp),
-                            ) {
-                                EchoLevel.entries.forEachIndexed { index, level ->
-                                    SegmentedButton(
-                                        shape = SegmentedButtonDefaults.itemShape(index = index, count = EchoLevel.entries.size),
-                                        onClick = {
-                                            echoLevel = level
-                                            selectedMode = WorkoutMode.Echo(level)
-                                        },
-                                        selected = echoLevel == level,
-                                    ) {
-                                        Text(echoLevelLabel(level), maxLines = 1)
+                            } else {
+                                SingleChoiceSegmentedButtonRow(
+                                    modifier = Modifier
+                                        .fillMaxWidth()
+                                        .padding(horizontal = 4.dp),
+                                ) {
+                                    EchoLevel.entries.forEachIndexed { index, level ->
+                                        SegmentedButton(
+                                            shape = SegmentedButtonDefaults.itemShape(index = index, count = EchoLevel.entries.size),
+                                            onClick = {
+                                                echoLevel = level
+                                                selectedMode = WorkoutMode.Echo(level)
+                                            },
+                                            selected = echoLevel == level,
+                                        ) {
+                                            Text(echoLevelLabel(level), maxLines = 1)
+                                        }
                                     }
                                 }
                             }

shared/src/commonMain/kotlin/com/devil/phoenixproject/presentation/screen/RoutineOverviewScreen.kt

@@ -333,6 +333,7 @@ fun RoutineOverviewScreen(navController: NavController, viewModel: MainViewModel
                     adjustedReps = adjustments.reps,
                     isAMRAP = exercise.isAMRAP,
                     isEchoMode = exercise.programMode is ProgramMode.Echo,
+                    isOldSchool = exercise.programMode is ProgramMode.OldSchool,
                     echoLevel = adjustments.echoLevel,
                     eccentricLoadPercent = adjustments.eccentricLoadPercent,
                     sizing = overviewSizing,
@@ -552,6 +553,7 @@ private fun ExerciseOverviewCard(
     adjustedReps: Int,
     isAMRAP: Boolean,
     isEchoMode: Boolean,
+    isOldSchool: Boolean = false,
     echoLevel: EchoLevel,
     eccentricLoadPercent: Int,
     sizing: RoutineOverviewSizing,
@@ -667,18 +669,22 @@ private fun ExerciseOverviewCard(
                             )
 
                             if (isEchoMode) {
-                                // Echo mode: Show Echo Level + Eccentric Load + Reps
                                 EchoLevelPillSelector(
                                     selectedLevel = echoLevel,
                                     onLevelChange = onEchoLevelChange,
                                 )
+                            }
 
+                            // Eccentric Load slider — visible for Echo and Old School modes
+                            if (isEchoMode || isOldSchool) {
                                 OverviewEccentricLoadSlider(
                                     percent = eccentricLoadPercent,
                                     onPercentChange = onEccentricLoadChange,
                                 )
+                            }
 
-                                // Reps for Echo mode
+                            // Reps adjuster for Echo mode only
+                            if (isEchoMode) {
                                 if (!isAMRAP) {
                                     SliderWithButtons(
                                         value = adjustedReps.toFloat(),

shared/src/commonMain/kotlin/com/devil/phoenixproject/presentation/screen/SetReadyScreen.kt

@@ -156,6 +156,7 @@ fun SetReadyScreen(navController: NavController, viewModel: MainViewModel, exerc
     var pendingOverridesToSave by remember { mutableStateOf<Map<String, RackItemBehavior>>(emptyMap()) }
 
     val isEchoMode = currentExercise.programMode is ProgramMode.Echo
+    val isOldSchool = currentExercise.programMode is ProgramMode.OldSchool
     val isAMRAP = currentExercise.isAMRAP
 
     // #635: explicit stored flag with equipment-derivation fallback
@@ -626,7 +627,7 @@ fun SetReadyScreen(navController: NavController, viewModel: MainViewModel, exerc
                         verticalArrangement = Arrangement.spacedBy(Spacing.medium),
                     ) {
                         Text(
-                            if (isEchoMode) "ECHO SETTINGS" else "SET CONFIGURATION",
+                            if (isEchoMode) "ECHO SETTINGS" else if (isOldSchool) "OLD SCHOOL SETTINGS" else "SET CONFIGURATION",
                             style = labelAllCaps.copy(fontWeight = FontWeight.Bold),
                             color = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
@@ -637,14 +638,18 @@ fun SetReadyScreen(navController: NavController, viewModel: MainViewModel, exerc
                                 selectedLevel = setReadyState.echoLevel ?: EchoLevel.HARDER,
                                 onLevelChange = { viewModel.updateSetReadyEchoLevel(it) },
                             )
+                        }
 
-                            // Eccentric Load slider - matching RestTimerCard style
+                        // Eccentric Load slider — visible for Echo and Old School modes
+                        if (isEchoMode || isOldSchool) {
                             SetReadyEccentricLoadSlider(
                                 percent = setReadyState.eccentricLoadPercent ?: 100,
                                 onPercentChange = { viewModel.updateSetReadyEccentricLoad(it) },
                             )
+                        }
 
-                            // Reps adjuster for Echo mode too
+                        // Reps adjuster for Echo mode only
+                        if (isEchoMode) {
                             if (!isAMRAP) {
                                 SliderWithButtons(
                                     value = setReadyState.adjustedReps.toFloat(),