Tie a radar's refine/fire channel to its own plot's freshness (#140)
build / mod (push) Failing after 28s
build / mod (push) Failing after 28s
A station counted any own plot, however old, as a busy refine/fire channel: a network heartbeat kept a stale contact's track fresh, so two long-expired own fire plots still held both channels of the engagement radar and a new contact nearby got only a coarse search plot, even with the search radar running. Channel occupancy now follows the station's own tracking. Track::holds_channel requires an own (never relayed) refine/fire plot no older than the station's track_ttl — three missed turns, the same value that already bounds a contact without a fresh measurement. The planner counts channels with the same Sam::own_channels_used(now) the panel, monitor, map and "why" views read, so the UI and the allocation cannot disagree about a stale channel. A stale channel frees for a new contact without the network's survey track being removed; the hard per-profile limit and the own measurement's provenance are unchanged, and a relayed plot still never holds a channel. Test: two contacts take both channels at the station, then leave its reach while the search radar beside them keeps relaying them; a third contact arrives nearby and gets its own fire channel (the test fails on the old counting), and the relayed survey tracks of the old contacts stay. Co-Authored-By: Kimi Code <noreply@moonshot.ai>
This commit is contained in:
@@ -2732,7 +2732,7 @@ impl AirDef {
|
||||
lines.push((format!("Профиль РЛС: {} [{}]", profile.name, profile.id), WHITE));
|
||||
lines.push((crate::battery_view::radar_profile_line(profile), GREY));
|
||||
lines.push((format!("Ограничение: {}", profile.limit), GREY));
|
||||
lines.push((format!("Каналы: {}/{} · профиль задан при размещении", sam.own_channels_used(), profile.channels), GREY));
|
||||
lines.push((format!("Каналы: {}/{} · профиль задан при размещении", sam.own_channels_used(now), profile.channels), GREY));
|
||||
} else if sam.mode == sim::battery::SamMode::LauncherOnly {
|
||||
lines.push(("Отдельная пусковая: внешняя РЛС сопровождения".into(), WHITE));
|
||||
}
|
||||
@@ -2740,7 +2740,7 @@ impl AirDef {
|
||||
lines.push((format!("Излучение РЛС: {}", if sam.radar_on { "вкл" } else { "выкл" }), WHITE));
|
||||
btns.push((if sam.radar_on { "Выключить РЛС" } else { "Включить РЛС" }.into(), Act::RadarEmission, sam.radar_on));
|
||||
}
|
||||
lines.push((crate::battery_view::sam_status(sam), WHITE));
|
||||
lines.push((crate::battery_view::sam_status(sam, now), WHITE));
|
||||
if k == SamKind::Optical
|
||||
&& let Some(r) = self.sim.optical_report(sam.id)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user