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:
+18
-6
@@ -17,6 +17,9 @@ pub const RIDE_SNAPSHOT: &str = "ride://snapshot";
|
||||
pub const RIDE_STATE: &str = "ride://state";
|
||||
/// A lap marker was inserted (FR-3.19 / FR-8.7).
|
||||
pub const RIDE_LAP: &str = "ride://lap";
|
||||
/// The ride ended and its activity was written (FR-9.13). Carries a
|
||||
/// `crate::recording::RideSummary`.
|
||||
pub const RIDE_SUMMARY: &str = "ride://summary";
|
||||
/// The full device list changed (FR-9.1).
|
||||
pub const DEVICES_UPDATED: &str = "devices://updated";
|
||||
/// One device changed connection or control state (FR-1.7, FR-9.3).
|
||||
@@ -55,12 +58,12 @@ pub struct RideState {
|
||||
pub manual_gradient_pct: f32,
|
||||
pub resistance_level: i16,
|
||||
pub power_target_w: u16,
|
||||
/// Selected virtual gear, one-based, and how many there are (FR-4.1).
|
||||
pub gear: usize,
|
||||
pub gear_count: usize,
|
||||
pub lap: u32,
|
||||
pub laps: Vec<LapSummary>,
|
||||
pub profile: Option<ProfileView>,
|
||||
/// Which backend is driving the ride: `"ftms"` (the real trainer) or
|
||||
/// `"mock"` (the synthetic rider, only reachable via `BIKECONTROL_DEMO`).
|
||||
pub source: &'static str,
|
||||
/// Trainer link, so the ride screen can say when the numbers stopped being
|
||||
/// real rather than quietly showing zeros (FR-1.8, FR-9.3).
|
||||
pub trainer: TrainerStatus,
|
||||
@@ -102,13 +105,22 @@ pub struct Notice {
|
||||
|
||||
impl Notice {
|
||||
pub fn info(message: impl Into<String>) -> Self {
|
||||
Self { level: NoticeLevel::Info, message: message.into() }
|
||||
Self {
|
||||
level: NoticeLevel::Info,
|
||||
message: message.into(),
|
||||
}
|
||||
}
|
||||
pub fn warn(message: impl Into<String>) -> Self {
|
||||
Self { level: NoticeLevel::Warn, message: message.into() }
|
||||
Self {
|
||||
level: NoticeLevel::Warn,
|
||||
message: message.into(),
|
||||
}
|
||||
}
|
||||
pub fn error(message: impl Into<String>) -> Self {
|
||||
Self { level: NoticeLevel::Error, message: message.into() }
|
||||
Self {
|
||||
level: NoticeLevel::Error,
|
||||
message: message.into(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user