feat(decoder): alarm banner and warning sound when the decoder drops or goes silent during a heat (1.89.25)
This commit is contained in:
1 parent
259945799d
commit
239cac8033
18 files changed
+225
-5
No files matched your search
+57
@@ -21,6 +21,7 @@ import { renderDaySchedulePanel, bindDaySchedulePanel, buildDaySchedulePrintHtml
|
||||
import { beginSession as beginSessionControl, finishSession as finishSessionControl, pauseSession as pauseSessionControl, resumeSession as resumeSessionControl } from "./session_control.js";
|
||||
import { normalizeSeries, buildSeriesStandings, getSeriesRoundStatus, getSeriesRoundNextStep, getSeriesDayResult } from "./series_logic.js";
|
||||
import { renderSeriesView } from "./series_view.js";
|
||||
import { decoderAlarm } from "./decoder_watch.js";
|
||||
import { RACE_AUDIO_EVENT_DEFINITIONS, createRaceAudioEngine, normalizeRaceAudioSettings, isSilencedDuringRace, formatSpokenLapTime, resolveDriverCallStyle, formatCarCall, formatHeatCallDrivers } from "./race_audio.js";
|
||||
|
||||
import { renderRaceFormatField, renderRaceFormatContextCard, getRaceSummaryItems, getRaceSummaryWarnings, renderManageStatusBadge, renderRaceWizardSteps, renderRaceWizardContent, renderRaceStandingsTable } from "./race_setup_ui.js";
|
||||
@@ -2978,6 +2979,13 @@ const TRANSLATIONS = {
|
||||
"audio.lap_time_calls_always": "Träning och race",
|
||||
"audio.lap_time_calls_off": "Av",
|
||||
"audio.lap_time_call_name": "Säg namnet före varvtiden",
|
||||
"audio.decoder_alarm": "Decoderlarm under heat",
|
||||
"audio.decoder_alarm_hint": "Röd banner och varningsljud om decodern tappar anslutningen eller blir tyst medan ett heat pågår.",
|
||||
"decoder_alarm.lost": "⚠ Decodern tappade anslutningen {time} – varv registreras inte",
|
||||
"decoder_alarm.silent": "⚠ Inga passeringar på {seconds} s – kolla decodern och slingan",
|
||||
"decoder_alarm.back": "✓ Decodern fungerar igen – {seconds} s utan tidtagning. Kontrollera varven i Domarvyn.",
|
||||
"decoder_alarm.reconnect": "Anslut igen",
|
||||
"decoder_alarm.silence": "Tysta",
|
||||
"audio.practice_hype": "Peppande träningsutrop",
|
||||
"audio.practice_hype_hint": "Bara i träning, aldrig i kval eller final: varvjubileum, nära bästa varvet, snittet går ner, snabbare varv i rad, snabbare än förra gången, placering i klassen och dueller. Varje utrop kan också stängas av i listan nedan.",
|
||||
"audio.race_leader_calls": "Ledare i kval och final",
|
||||
@@ -5284,6 +5292,13 @@ const TRANSLATIONS = {
|
||||
"audio.lap_time_calls_always": "Practice and races",
|
||||
"audio.lap_time_calls_off": "Off",
|
||||
"audio.lap_time_call_name": "Say the name before the lap time",
|
||||
"audio.decoder_alarm": "Decoder alarm during heats",
|
||||
"audio.decoder_alarm_hint": "Red banner and a warning sound when the decoder disconnects or goes silent while a heat is running.",
|
||||
"decoder_alarm.lost": "⚠ Decoder disconnected at {time} – laps are not being recorded",
|
||||
"decoder_alarm.silent": "⚠ No passings for {seconds} s – check the decoder and the loop",
|
||||
"decoder_alarm.back": "✓ Decoder working again – {seconds} s without timing. Check the laps in Judging.",
|
||||
"decoder_alarm.reconnect": "Reconnect",
|
||||
"decoder_alarm.silence": "Silence",
|
||||
"audio.practice_hype": "Practice hype calls",
|
||||
"audio.practice_hype_hint": "Practice only, never in qualifying or finals: lap milestones, close to best, average going down, faster laps in a row, faster than last time, class rank and duels. Each call can also be turned off in the list below.",
|
||||
"audio.race_leader_calls": "Leader in qualifying and finals",
|
||||
@@ -7717,6 +7732,48 @@ function updateConnectionBadge() {
|
||||
dom.connectionBadge.className = `badge ${isOnline ? "badge-online" : "badge-offline"}`;
|
||||
}
|
||||
|
||||
// Decoder alarm (decoder_watch.js): checked every second on the race master. Red banner, warning
|
||||
// sound repeated every 30 s until fixed or silenced, then 10 s of "working again, X s without timing".
|
||||
const decoderAlarmRuntime = { kind: "ok", since: 0, silenced: false, lastSoundAt: 0, backUntil: 0, backSeconds: 0 };
|
||||
function checkDecoderAlarm(now = Date.now()) {
|
||||
const el = document.getElementById("decoderAlarm");
|
||||
if (!el) return;
|
||||
const session = getActiveSession();
|
||||
const competitors = Object.values(state.resultsBySession?.[session?.id]?.competitors || {});
|
||||
const bestLapMs = Math.min(...competitors.map((item) => Number(item.bestLapMs) || Infinity));
|
||||
// Only the race master with a decoder configured (no decoder at all is a normal setup, not an alarm).
|
||||
const enabled = state.settings.raceAudio?.decoderAlarm !== false && Boolean(state.settings.wsUrl) && isRaceMaster();
|
||||
const alarm = enabled ? decoderAlarm(state.decoder, session, { startPending: Boolean(pendingStartSessionId), bestLapMs: Number.isFinite(bestLapMs) ? bestLapMs : 0, now }) : { kind: "ok", sinceMs: 0 };
|
||||
const run = decoderAlarmRuntime;
|
||||
if (alarm.kind !== run.kind) {
|
||||
if (run.kind !== "ok" && alarm.kind === "ok" && enabled) Object.assign(run, { backUntil: now + 10000, backSeconds: Math.round((now - run.since) / 1000) });
|
||||
Object.assign(run, { kind: alarm.kind, since: now - alarm.sinceMs, silenced: false, lastSoundAt: 0 });
|
||||
}
|
||||
if (run.kind !== "ok" && !run.silenced && now - run.lastSoundAt >= 30000) {
|
||||
run.lastSoundAt = now;
|
||||
const played = triggerRaceAudio("timing_disconnected", { interrupt: true, force: true });
|
||||
if (played?.skipped || !state.settings.raceAudio?.enabled || state.settings.raceAudio?.muted) playFinishSiren();
|
||||
}
|
||||
const html = run.kind === "lost" ? t("decoder_alarm.lost", { time: new Date(run.since).toLocaleTimeString() })
|
||||
: run.kind === "silent" ? t("decoder_alarm.silent", { seconds: Math.round((now - run.since) / 1000) })
|
||||
: now < run.backUntil ? t("decoder_alarm.back", { seconds: run.backSeconds }) : "";
|
||||
el.hidden = !html;
|
||||
el.classList.toggle("is-back", run.kind === "ok");
|
||||
const key = `${run.kind}|${html}|${run.silenced}`;
|
||||
if (el.dataset.key === key) return;
|
||||
el.dataset.key = key;
|
||||
el.dataset.kind = html ? run.kind : "";
|
||||
el.innerHTML = html ? `<strong>${escapeHtml(html)}</strong>${run.kind === "lost" ? `<button type="button" class="btn btn-small" data-decoder-alarm="reconnect">${escapeHtml(t("decoder_alarm.reconnect"))}</button>` : ""}${run.kind !== "ok" && !run.silenced ? `<button type="button" class="btn btn-small" data-decoder-alarm="silence">${escapeHtml(t("decoder_alarm.silence"))}</button>` : ""}` : "";
|
||||
}
|
||||
if (!overlayMode) {
|
||||
document.addEventListener("click", (event) => {
|
||||
const action = event.target instanceof Element ? event.target.closest("[data-decoder-alarm]")?.dataset.decoderAlarm : "";
|
||||
if (action === "silence") { decoderAlarmRuntime.silenced = true; checkDecoderAlarm(); }
|
||||
if (action === "reconnect") connectDecoder();
|
||||
});
|
||||
setInterval(() => checkDecoderAlarm(), 1000);
|
||||
}
|
||||
|
||||
function renderEvents() {
|
||||
renderEventWorkspace("track");
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user