Ride the drivetrain, command the load in watts
Speed now comes from the drivetrain and the load from the road, which is the way round a bike actually works. Speed is cadence x development, filtered lightly. Power, not cadence, decides whether the rider is driving it: on a direct-drive trainer the flywheel keeps the cranks turning after they stop, so cadence alone reads a healthy 80 rpm for someone doing nothing. Below 15 W the speed runs down to whatever the gradient sustains on no power - zero uphill, a real freewheeling speed on a descent. Stopping on a 3.5% climb used to settle at 22 km/h and stay there, because the model wanted to decelerate and a blend toward the flywheel speed outvoted it; that blend is gone. The D100 sends no cadence over FTMS - it is a rebadged Magene T110 with cadence disabled in firmware (qdomyos-zwift#3282) - so it is inferred from wheel speed, which one sprocket and no freewheel make exact. Its Zwift channel does carry cadence, and is now greeted with RideOn and subscribed on every notifying characteristic, so a measured value is used where one arrives. The load is commanded as power, not gradient. The trainer declares 50-600 W in 1 W steps against 0-6% inclination in 0.1% steps refusing negatives, and whether it acts on 0x11 at all is still unconfirmed. Its power target is a ceiling rather than a setpoint, which is very nearly what a road is: exceed it and the surplus becomes speed. Gravity travels on the same channel as watts, so nothing is lost by leaving 0x11 alone. LoadChannel keeps the gradient path selectable and tested. Virtual shifting reaches the trainer for the first time. The physics load model was written but never called, and a paddle press both shifted a gear in Rust and nudged the gradient in the webview - the shift silently, the tilt visibly, so the paddles looked like a gradient trim. Also: a fixed 12 W drivetrain loss, held as a power because that is how it presents; crank length, so a gear can be reported as the force it puts under the foot; gear and pedal force on the ride screen; a drag-race profile for testing gearing on the flat. Two readout bugs fixed on the way. The rolling windows were trimmed by timestamp but fed on a fixed timer, so every second spent on the ride screen before starting pushed samples at t=0 that could never expire - speed read a fraction of the truth for the first 45 s. And the headline speed was a 45 s mean, which took most of a minute to show a gear change. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -52,6 +52,8 @@ pub struct FitSummary {
|
||||
pub avg_power_w: Option<u16>,
|
||||
/// Peak power. `None` if no sample reported power.
|
||||
pub max_power_w: Option<u16>,
|
||||
/// Mean cadence over samples that reported one. `None` if none did.
|
||||
pub avg_cadence_rpm: Option<u8>,
|
||||
/// Estimated rider energy expenditure in kilocalories, derived from
|
||||
/// measured mechanical work — see [`Aggregates::calories`].
|
||||
pub total_calories: Option<u16>,
|
||||
@@ -216,6 +218,7 @@ pub fn encode_activity(log: &RawLog) -> Result<(Vec<u8>, FitSummary), FitError>
|
||||
total_ascent_m: clamp_u16(session_agg.ascent_m),
|
||||
avg_power_w: session_agg.avg_power(),
|
||||
max_power_w: session_agg.max_power,
|
||||
avg_cadence_rpm: session_agg.avg_cadence(),
|
||||
total_calories: session_agg.calories(log.start.rider_kg),
|
||||
gaps: log.gaps(end_ms).len(),
|
||||
recovered_from_crash: !log.clean_shutdown,
|
||||
|
||||
@@ -602,6 +602,12 @@ mod tests {
|
||||
resistance_level: Some(7),
|
||||
..Default::default()
|
||||
},
|
||||
gear: 6,
|
||||
gear_count: 12,
|
||||
development_m: 5.7,
|
||||
target_cadence_rpm: 92.0,
|
||||
speed_source: bikecontrol_core::types::SpeedSource::Drivetrain,
|
||||
pedal_force_n: 120.0,
|
||||
virtual_speed_kph: 31.5,
|
||||
virtual_distance_m: 105.0,
|
||||
gradient_pct: 3.5,
|
||||
|
||||
@@ -387,6 +387,12 @@ mod tests {
|
||||
virtual_distance_m: elapsed_ms as f64 * 0.009,
|
||||
gradient_pct: 1.5,
|
||||
elevation_gain_m: elapsed_ms as f32 * 0.000_135,
|
||||
gear: 6,
|
||||
gear_count: 12,
|
||||
development_m: 5.7,
|
||||
target_cadence_rpm: 94.7,
|
||||
speed_source: bikecontrol_core::types::SpeedSource::Drivetrain,
|
||||
pedal_force_n: 120.0,
|
||||
mode: ControlMode::ManualGrade,
|
||||
target: None,
|
||||
profile_progress: None,
|
||||
|
||||
Reference in New Issue
Block a user