From f602778895381d52acf1b7034ddba3142809c8e6 Mon Sep 17 00:00:00 2001 From: larssand Date: Thu, 5 Nov 2026 08:08:16 +0100 Subject: [PATCH] feat(audio): good pace call says the average of the steady laps (1.60.0) --- CHANGELOG.md | 6 ++++++ package-lock.json | 4 ++-- package.json | 2 +- rc-race-sound-pack/sound_manifest.json | 4 ++-- src/decoder_runtime.js | 8 ++++++-- src/settings.js | 2 +- tests/decoder_runtime.test.js | 7 +++++-- 7 files changed, 23 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1caa221..a797294 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,12 @@ The application version is maintained in `package.json` and displayed in the adm No changes recorded yet. +## 1.60.0 - 2026-11-05 + +### Added + +- The practice "good pace" call now ends with the average of the steady laps: "Good pace and consistent driving. Average 18.17." / "Bra tempo och stabil körning. Snitt 18,17." Custom texts can use `{avgLap}`. + ## 1.59.1 - 2026-11-05 ### Fixed diff --git a/package-lock.json b/package-lock.json index 1fe888a..2860cf5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.59.1", + "version": "1.60.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.59.1", + "version": "1.60.0", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index fec53ee..4a1cd5f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.59.1", + "version": "1.60.0", "private": true, "description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence", "engines": { diff --git a/rc-race-sound-pack/sound_manifest.json b/rc-race-sound-pack/sound_manifest.json index 69d934a..a9e5eee 100644 --- a/rc-race-sound-pack/sound_manifest.json +++ b/rc-race-sound-pack/sound_manifest.json @@ -57,7 +57,7 @@ "prologue_cancelled": "Start cancelled.", "clock_running": "Clock is running.", "personal_best": "Personal best. {driverName}. {lapTime}.", "fastest_lap": "Fastest lap. {driverName}. {lapTime}.", - "training_stable_pace": "{driverName}, good pace and consistent driving.", + "training_stable_pace": "{driverName}, good pace and consistent driving. Average {avgLap}.", "track_record": "New track record. {driverName}. {lapTime}.", "new_leader": "New race leader. {driverName}.", "final_lap": "Final lap.", "one_minute_remaining": "One minute remaining.", "thirty_seconds_remaining": "Thirty seconds remaining.", "ten_seconds_remaining": "Ten seconds remaining.", "time_expired": "Time has expired. Finish the lap you are on.", "race_finished": "Race is finished.", @@ -88,7 +88,7 @@ "prologue_cancelled": "Starten är avbruten.", "clock_running": "Klockan går.", "personal_best": "Personbästa. {driverName}. {lapTime}.", "fastest_lap": "Snabbaste varv. {driverName}. {lapTime}.", - "training_stable_pace": "{driverName}, bra tempo och stabil körning.", + "training_stable_pace": "{driverName}, bra tempo och stabil körning. Snitt {avgLap}.", "track_record": "Nytt banrekord. {driverName}. {lapTime}.", "new_leader": "Ny ledare. {driverName}.", "final_lap": "Sista varvet.", "one_minute_remaining": "En minut kvar.", "thirty_seconds_remaining": "Trettio sekunder kvar.", "ten_seconds_remaining": "Tio sekunder kvar.", "time_expired": "Tiden är slut. Slutför pågående varv.", "race_finished": "Racet är avslutat.", diff --git a/src/decoder_runtime.js b/src/decoder_runtime.js index 637f357..351adcb 100644 --- a/src/decoder_runtime.js +++ b/src/decoder_runtime.js @@ -578,10 +578,14 @@ export function processDecoderMessageHelper(msg, deps, decoderRole = "main") { const audioVariables = { driverName: entry.speechName || entry.displayName || entry.driverName, lapTime: formatSpokenLapTime(lapMs, normalizeRaceAudioSettings(state.settings?.raceAudio).language) }; if (entry.driverId && PRACTICE_SESSION_TYPES.has(String(session.type || "").toLowerCase()) && !validationWarning) { const controlTargetMs = entry.bestLapMs ? Math.round(entry.bestLapMs * 1.08) : 0; - const controlledLapStreak = getControlledLapStreak(getCurrentPracticePaceLaps(result, key), controlTargetMs); + const paceLaps = getCurrentPracticePaceLaps(result, key); + const controlledLapStreak = getControlledLapStreak(paceLaps, controlTargetMs); if (controlledLapStreak >= 5 && controlledLapStreak % 5 === 0) { + // Average of the steady laps just called, e.g. "Average 18.17". + const streakLaps = paceLaps.slice(-controlledLapStreak); + const avgLapMs = streakLaps.reduce((sum, ms) => sum + ms, 0) / streakLaps.length; triggerRaceAudio("training_stable_pace", { - variables: { ...audioVariables, laps: controlledLapStreak }, + variables: { ...audioVariables, laps: controlledLapStreak, avgLap: formatSpokenLapTime(avgLapMs, normalizeRaceAudioSettings(state.settings?.raceAudio).language) }, driverId: entry.driverId, competitorKey: key, scope: entry.driverId, diff --git a/src/settings.js b/src/settings.js index 3401fd1..29f6870 100644 --- a/src/settings.js +++ b/src/settings.js @@ -738,7 +738,7 @@ Erik Eriksson;654321;4WD;Associated;; // matches what you're about to hear - but a test playback is not itself a reason to // write those still-unsaved changes to the database. Use the explicit Save button for that. applyRaceAudioFormValuesFromDom(); - triggerRaceAudio(eventKey, { force: true, interrupt: true, variables: { driverName: state.drivers[0]?.name || "Driver", lapTime: formatSpokenLapTime(16000, state.settings.raceAudio?.language), marshalPost: "1", transponder: "123", podium: "P1, P2, P3" } }); + triggerRaceAudio(eventKey, { force: true, interrupt: true, variables: { driverName: state.drivers[0]?.name || "Driver", lapTime: formatSpokenLapTime(16000, state.settings.raceAudio?.language), avgLap: formatSpokenLapTime(16420, state.settings.raceAudio?.language), laps: 5, marshalPost: "1", transponder: "123", podium: "P1, P2, P3" } }); }; document.getElementById("settingsRaceAudioTest")?.addEventListener("click", () => testRaceAudio("audio_test")); document.querySelectorAll("[data-test-race-audio]").forEach((button) => button.addEventListener("click", () => testRaceAudio(button.dataset.testRaceAudio))); diff --git a/tests/decoder_runtime.test.js b/tests/decoder_runtime.test.js index 8c6bb98..f6c3e7e 100644 --- a/tests/decoder_runtime.test.js +++ b/tests/decoder_runtime.test.js @@ -32,6 +32,7 @@ function createHarness(options = {}) { let saveCount = 0; const overlayEvents = []; const audioEvents = []; + const audioCalls = []; const deps = { state, t: (key) => key, @@ -48,7 +49,7 @@ function createHarness(options = {}) { buildLeaderboard: () => [], formatLap: (ms) => `${ms}ms`, announcePassing: () => {}, - triggerRaceAudio: (key) => audioEvents.push(key), + triggerRaceAudio: (key, opts) => { audioEvents.push(key); audioCalls.push({ key, variables: opts?.variables || {} }); }, saveState: () => { saveCount += 1; }, lastOverlayLeaderKeyBySession: {}, lastOverlayTop3BySession: {}, @@ -59,13 +60,15 @@ function createHarness(options = {}) { transponder, rtc_time: new Date(timestamp).toISOString(), }, deps, role); - return { state, session, passing, overlayEvents, audioEvents, getSaveCount: () => saveCount }; + return { state, session, passing, overlayEvents, audioEvents, audioCalls, getSaveCount: () => saveCount }; } test("five controlled practice laps trigger one stable-pace voice cue", () => { const harness = createHarness({ sessionType: "open_practice" }); for (let lap = 1; lap <= 5; lap += 1) harness.passing(1_000 + lap * 20_000, "main"); assert.equal(harness.audioEvents.filter((event) => event === "training_stable_pace").length, 1); + const call = harness.audioCalls.find((item) => item.key === "training_stable_pace"); + assert.equal(call.variables.avgLap, "20,00"); }); test("stable-pace training cue is never emitted during a race", () => {