diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21990d1..0059bb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ The application version is maintained in `package.json` and displayed in the adm
No changes recorded yet.
+## 1.89.11
+
+### Added
+
+- Sound: "Heat call and staggered start" chooses how drivers are called: Auto (car numbers in finals, names otherwise), Names, Car numbers, or Car number + name ("car 5 Anders"). In Settings and the Race Day sound panel.
+
+### Fixed
+
+- A staggered start called each car by its transponder number ("Car 7654321"); it now calls the grid slot ("Car 1"), 3 s apart.
+
## 1.89.10
### Added
diff --git a/README.md b/README.md
index 45e32c3..023c616 100644
--- a/README.md
+++ b/README.md
@@ -268,6 +268,7 @@ Settings → Audio:
- **Times in announcements** (personal best, fastest lap, track record) are said as a speaker does: seconds and hundredths, "18 sixty-three" / "18 sextiotre", and "18 flat" on .00.
- **Race leader calls:** on a confirmed change of leader and now and then (both, change only, or off).
- **Calls during a race:** "Passing tone only" (default, like timing systems) or "Speaker" with names, personal bests and new leaders. Practice always gets the full calls; only **New leader in practice** can be turned off (in Settings and the Race Day sound panel), since nobody races anyone there.
+- **Heat call and staggered start:** Auto (default) calls car numbers in finals ("Car 1, 2, 3") and names elsewhere; or choose Names, Car numbers, or Car number + name ("car 5 Anders"). The car number is the grid slot. A staggered start calls each car 3 s apart.
- **Local neural voice (Piper):** free and works offline. Install from Settings → Audio → Voice engine, or with `npm run tts:install`.
- Standard voices: Swedish NST (male) and Lisa (female), English Ryan (male) and Lessac (female).
- Under **More voices**, one at a time (about 63 MB each): Swedish Alma; British Alan, Northern English, Cori and Alba (Scottish); American Joe, John and Norman.
diff --git a/README.sv.md b/README.sv.md
index d9c33ca..47673fa 100644
--- a/README.sv.md
+++ b/README.sv.md
@@ -281,6 +281,7 @@ Inställningar → Ljud:
- **Tider i utropen** (personbästa, snabbaste varv, banrekord) sägs som en speaker: sekunder och hundradelar, "18 sextiotre" / "18 sixty-three", och "18 jämnt" på ,00.
- **Ledarutrop i race:** vid bekräftat ledarbyte och då och då (båda, bara byte eller av).
- **Utrop under race:** "Bara passeringsljud" (standard, som tidtagningssystem) eller "Speaker" med namn, personbästa och ny ledare. Träning får alltid alla utrop; bara **Ny ledare i träning** kan slås av (under Inställningar och i ljudpanelen på Race Day), eftersom ingen kör mot någon där.
+- **Upprop och förskjuten start:** Auto (standard) ropar bilnummer i finaler ("Bil 1, 2, 3") och namn annars; eller välj Namn, Bilnummer eller Bilnummer + namn ("bil 5 Anders"). Bilnumret är startplatsen. Förskjuten start ropar ut varje bil med 3 s mellanrum.
- **Lokal neural röst (Piper):** gratis och fungerar offline. Installera under Inställningar → Ljud → Röstmotor, eller med `npm run tts:install`.
- Standardröster: svenska NST (man) och Lisa (kvinna), engelska Ryan (man) och Lessac (kvinna).
- Under **Fler röster**, en i taget (ca 63 MB var): svenska Alma; brittiska Alan, Northern English, Cori och Alba (skotsk); amerikanska Joe, John och Norman.
diff --git a/package-lock.json b/package-lock.json
index 357c176..b47ca18 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "rc-racecore",
- "version": "1.89.10",
+ "version": "1.89.11",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "rc-racecore",
- "version": "1.89.10",
+ "version": "1.89.11",
"hasInstallScript": true,
"dependencies": {
"better-sqlite3": "^12.11.1",
diff --git a/package.json b/package.json
index 5458161..6e5f8b2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "rc-racecore",
- "version": "1.89.10",
+ "version": "1.89.11",
"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 8fc06ff..04bf5e3 100644
--- a/rc-race-sound-pack/sound_manifest.json
+++ b/rc-race-sound-pack/sound_manifest.json
@@ -48,7 +48,7 @@
"grid_open": "The starting grid is open.", "grid_closed": "The starting grid is closed.",
"race_1_minute": "Race starts in one minute.", "race_30_seconds": "Thirty seconds to start.", "race_10_seconds": "Ten seconds to start.",
"drivers_ready": "Drivers, stand by.", "start_sequence": "Starting to the sound of the tone.", "false_start": "False start.", "restart_race": "Prepare to restart the race.",
- "staggered_release": "Car {tp}.",
+ "staggered_release": "{car}.",
"heat_call": "{heat} starts in {minutes} minutes. {drivers}Get ready.",
"prologue_start": "{heat} starts in {time}. The track is open.",
"prologue_minutes": "{minutes} minutes to the start.",
@@ -88,7 +88,7 @@
"grid_open": "Startfältet är öppet.", "grid_closed": "Startfältet är stängt.",
"race_1_minute": "Start om en minut.", "race_30_seconds": "Trettio sekunder till start.", "race_10_seconds": "Tio sekunder till start.",
"drivers_ready": "Förare, gör er redo.", "start_sequence": "Start på tonen.", "false_start": "Felaktig start.", "restart_race": "Förbered omstart.",
- "staggered_release": "Bil {tp}.",
+ "staggered_release": "{car}.",
"heat_call": "{heat} startar om {minutes} minuter. {drivers}Gör er redo.",
"prologue_start": "{heat} startar om {time}. Banan är öppen.",
"prologue_minutes": "{minutes} minuter till start.",
diff --git a/src/app.js b/src/app.js
index 004c08f..e209f56 100644
--- a/src/app.js
+++ b/src/app.js
@@ -20,7 +20,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 { RACE_AUDIO_EVENT_DEFINITIONS, createRaceAudioEngine, normalizeRaceAudioSettings, isSilencedDuringRace, formatSpokenLapTime } from "./race_audio.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";
@@ -274,8 +274,14 @@ const startSessionWithAudio = (session, callbacks) => {
// qualifying/finals, and already ranked like a real timed session, not rolling) and
// gets the same countdown/lights/start-tone ceremony as qualifying/heat/final.
const skipCeremony = ["open_practice", "free_practice"].includes(String(session?.type || ""));
+ const audio = normalizeRaceAudioSettings(state.settings.raceAudio);
+ const callStyle = resolveDriverCallStyle(audio.driverCallStyle, session?.type);
+ // Grid slot = car number: "Bil 1", "Bil 2 Roy" - never the transponder number.
const staggerOrder = getSessionGridOrder(session)
- .map((driverId) => state.drivers.find((driver) => driver.id === driverId)?.transponder)
+ .map((driverId, index) => {
+ const driver = state.drivers.find((item) => item.id === driverId);
+ return driver?.transponder ? { transponder: driver.transponder, call: formatCarCall(index, driver.speechName || driver.name, callStyle, audio.language) } : null;
+ })
.filter(Boolean);
return raceAudioEngine.runStartSequence(session, { ...callbacks, skipAudio: skipCeremony, staggerOrder });
};
@@ -513,14 +519,13 @@ function callHeat(sessionId) {
}
// "Drivers: Roy, Eddie. " in the announcer's language (not the page's), with each driver's
// spoken name; drivers that can't be found are left out rather than read as "unknown driver".
+// Grid order, so "Bil 3" is the third grid slot even when a driver can't be found.
function buildHeatCallDrivers(session) {
const names = getSessionGridOrder(session)
.map((driverId) => state.drivers.find((item) => item.id === driverId))
- .filter(Boolean)
- .map((driver) => String(driver.speechName || driver.name || "").trim())
- .filter(Boolean);
- if (!names.length) return "";
- return `${state.settings.raceAudio?.language === "en" ? "Drivers" : "Förare"}: ${names.join(", ")}. `;
+ .map((driver) => String(driver?.speechName || driver?.name || "").trim());
+ const audio = normalizeRaceAudioSettings(state.settings.raceAudio);
+ return formatHeatCallDrivers(names, resolveDriverCallStyle(audio.driverCallStyle, session?.type), audio.language);
}
function getDueCallFor(date) {
return getDueCall(buildDayRows(date), { day: getDayPlan(date), snoozedUntil: (id) => callSnoozes.get(id) || 0 });
@@ -2894,6 +2899,11 @@ const TRANSLATIONS = {
"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",
"audio.practice_leader_calls": "Ny ledare i träning",
+ "audio.driver_call_style": "Upprop och förskjuten start",
+ "audio.driver_call_auto": "Auto (bilnummer i finaler, annars namn)",
+ "audio.driver_call_names": "Namn",
+ "audio.driver_call_numbers": "Bilnummer (bil 1, 2, 3)",
+ "audio.driver_call_both": "Bilnummer + namn (bil 5 Anders)",
"audio.practice_leader_on": "På",
"audio.practice_leader_off": "Av (ingen kör mot någon)",
"audio.race_leader_both": "Vid byte och var 2:a minut",
@@ -5164,6 +5174,11 @@ const TRANSLATIONS = {
"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",
"audio.practice_leader_calls": "New leader in practice",
+ "audio.driver_call_style": "Heat call and staggered start",
+ "audio.driver_call_auto": "Auto (car numbers in finals, names otherwise)",
+ "audio.driver_call_names": "Names",
+ "audio.driver_call_numbers": "Car numbers (car 1, 2, 3)",
+ "audio.driver_call_both": "Car number + name (car 5 Anders)",
"audio.practice_leader_on": "On",
"audio.practice_leader_off": "Off (nobody races anyone)",
"audio.race_leader_both": "On change and every 2 minutes",
diff --git a/src/race_audio.js b/src/race_audio.js
index 0dd5788..36b8d28 100644
--- a/src/race_audio.js
+++ b/src/race_audio.js
@@ -96,6 +96,8 @@ export function normalizeRaceAudioSettings(value = {}) {
minStartDelay,
maxStartDelay,
perCompetitorPassingTone: source.perCompetitorPassingTone === true,
+ // How the heat call and a staggered start name the drivers (see resolveDriverCallStyle).
+ driverCallStyle: ["auto", "names", "numbers", "both"].includes(source.driverCallStyle) ? source.driverCallStyle : "auto",
startSound: Object.hasOwn(START_SOUNDS, source.startSound) ? source.startSound : "tone",
finishSound: Object.hasOwn(FINISH_SOUNDS, source.finishSound) ? source.finishSound : "stop",
raceCallouts: source.raceCallouts === "full" ? "full" : "passing",
@@ -141,6 +143,32 @@ export function isSilencedDuringRace(eventKey, settings, session) {
return RACE_PASSING_CALLOUT_EVENTS.includes(eventKey);
}
+// Heat call / staggered start: "names" (Roy), "numbers" (car 1 - the grid slot) or "both"
+// (car 1 Roy). "auto" = numbers in finals, where drivers go by their grid slot, names otherwise.
+export function resolveDriverCallStyle(style, sessionType) {
+ if (["names", "numbers", "both"].includes(style)) return style;
+ return String(sessionType || "") === "final" ? "numbers" : "names";
+}
+const CAR_WORD = { sv: "Bil", en: "Car" };
+// One car at a staggered start: "Bil 1", "Bil 1 Roy" or "Roy" (index = grid slot - 1).
+export function formatCarCall(index, name, style, language = "sv") {
+ const car = `${CAR_WORD[language] || CAR_WORD.sv} ${index + 1}`;
+ const spoken = String(name || "").trim();
+ if (style === "names") return spoken || car;
+ return style === "both" && spoken ? `${car} ${spoken}` : car;
+}
+// The drivers in a heat call, in grid order: "Förare: Roy, Eddie. ", "Bil 1, 2, 3. " or
+// "Bil 1 Roy, bil 2 Eddie. " - empty when the heat has no drivers.
+export function formatHeatCallDrivers(names, style, language = "sv") {
+ const list = (names || []).map((name) => String(name || "").trim());
+ if (!list.length) return "";
+ const word = CAR_WORD[language] || CAR_WORD.sv;
+ if (style === "numbers") return `${word} ${list.map((_name, index) => index + 1).join(", ")}. `;
+ if (style === "both") return `${list.map((name, index) => `${index ? word.toLowerCase() : word} ${index + 1}${name ? ` ${name}` : ""}`).join(", ")}. `;
+ const named = list.filter(Boolean);
+ return named.length ? `${language === "en" ? "Drivers" : "Förare"}: ${named.join(", ")}. ` : "";
+}
+
// The quick passing call used at race tracks: seconds and tenths, "17 six", "18 flat"
// ("17 sex", "18 jämnt"). Over a minute: "1 05 two".
const TENTHS = { en: ["flat", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine"], sv: ["jämnt", "ett", "två", "tre", "fyra", "fem", "sex", "sju", "åtta", "nio"] };
@@ -430,7 +458,11 @@ export function createRaceAudioEngine(options = {}) {
if (session?.startMode === "staggered" && Array.isArray(callbacks.staggerOrder) && callbacks.staggerOrder.length) {
for (let index = 0; index < callbacks.staggerOrder.length; index += 1) {
if (cancelled()) return false;
- await trigger("staggered_release", { variables: { tp: callbacks.staggerOrder[index] }, scope: callbacks.staggerOrder[index], logData: { sessionId: session?.id, transponder: callbacks.staggerOrder[index] } }).voiceDone;
+ // Each item: { transponder, call } ("Bil 1"); a bare transponder string is read as before.
+ const item = callbacks.staggerOrder[index];
+ const transponder = typeof item === "object" ? item?.transponder : item;
+ const car = typeof item === "object" ? item?.call : `${CAR_WORD[settings.language] || CAR_WORD.sv} ${transponder}`;
+ await trigger("staggered_release", { variables: { car, tp: index + 1 }, scope: transponder || car, logData: { sessionId: session?.id, transponder } }).voiceDone;
if (cancelled()) return false;
if (index < callbacks.staggerOrder.length - 1) { await wait(3000); if (cancelled()) return false; }
}
diff --git a/src/settings.js b/src/settings.js
index 2269457..b638843 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -257,6 +257,7 @@ export function renderSettings(deps) {
+
@@ -674,6 +675,7 @@ Erik Eriksson;654321;4WD;Associated;;
lapTimeCallName: form.get("raceAudioLapTimeCallName") === "on",
raceLeaderCalls: String(form.get("raceAudioLeaderCalls") || "both"),
practiceLeaderCalls: String(form.get("raceAudioPracticeLeaderCalls") || "on"),
+ driverCallStyle: String(form.get("raceAudioDriverCallStyle") || "auto"),
startSound: String(form.get("raceAudioStartSound") || "tone"),
finishSound: String(form.get("raceAudioFinishSound") || "stop"),
practicePbWarmupLaps: Number(form.get("raceAudioPbWarmup")),
diff --git a/src/speaker_panel_view.js b/src/speaker_panel_view.js
index 2065658..58c4cac 100644
--- a/src/speaker_panel_view.js
+++ b/src/speaker_panel_view.js
@@ -36,6 +36,7 @@ export function renderSpeakerPanel({ state, t, escapeHtml }) {
${select("lapTimeCalls", ["practice", "always", "off"], "audio.lap_time_calls", "audio.lap_time_calls_")}
${select("raceLeaderCalls", ["both", "change", "off"], "audio.race_leader_calls", "audio.race_leader_")}
+ ${select("driverCallStyle", ["auto", "names", "numbers", "both"], "audio.driver_call_style", "audio.driver_call_")}
${select("practiceLeaderCalls", ["on", "off"], "audio.practice_leader_calls", "audio.practice_leader_")}
diff --git a/tests/race_audio.test.js b/tests/race_audio.test.js
index 5eaeb14..b7418c6 100644
--- a/tests/race_audio.test.js
+++ b/tests/race_audio.test.js
@@ -1,6 +1,6 @@
import test from "node:test";
import assert from "node:assert/strict";
-import { RACE_AUDIO_EVENT_DEFINITIONS, createRaceAudioEngine, normalizeRaceAudioSettings, isSilencedDuringRace, formatSpokenLapTime, formatSpokenGap, formatShortLapCall } from "../src/race_audio.js";
+import { RACE_AUDIO_EVENT_DEFINITIONS, createRaceAudioEngine, normalizeRaceAudioSettings, isSilencedDuringRace, formatSpokenLapTime, formatSpokenGap, formatShortLapCall, resolveDriverCallStyle, formatCarCall, formatHeatCallDrivers } from "../src/race_audio.js";
const manifest = {
events: { transponder_pass: { effect: "effects/transponder_pass.wav" }, start_tone: { effect: "effects/start_beep.wav" } },
@@ -66,10 +66,10 @@ test("start lights, random delay and tone precede the official start callback",
assert.deepEqual(calls.slice(-3), [["wait", 2500], ["effect", "/race-sounds/sounds/effects/start_tone.wav"], ["timing-start"]]);
});
-test("staggered start mode calls out each car in grid order, 3s apart, after the official start", async () => {
+test("staggered start calls each car by its grid slot (\"Bil 1\"), never its transponder, 3s apart, after the official start", async () => {
const calls = [];
const engine = createRaceAudioEngine({
- fetchImpl: async () => ({ ok: true, json: async () => ({ ...manifest, voice_events: { sv: { ...manifest.voice_events.sv, staggered_release: "Bil {tp}." } } }) }),
+ fetchImpl: async () => ({ ok: true, json: async () => ({ ...manifest, voice_events: { sv: { ...manifest.voice_events.sv, staggered_release: "{car}." } } }) }),
audioFactory: (src) => ({ play: () => { calls.push(["effect", src]); return Promise.resolve(); }, volume: 1 }),
speak: async (text) => { calls.push(["voice", text]); return true; },
wait: async (ms) => calls.push(["wait", ms]),
@@ -77,13 +77,13 @@ test("staggered start mode calls out each car in grid order, 3s apart, after the
});
await engine.runStartSequence(
{ id: "q1h1", type: "qualification", startMode: "staggered" },
- { onTone: () => calls.push(["timing-start"]), staggerOrder: ["111", "222", "333"] }
+ { onTone: () => calls.push(["timing-start"]), staggerOrder: [{ transponder: "111", call: "Bil 1" }, { transponder: "222", call: "Bil 2 Roy" }, { transponder: "333", call: "Bil 3" }] }
);
const afterStart = calls.slice(calls.findIndex((call) => call[0] === "timing-start") + 1);
assert.deepEqual(afterStart, [
- ["voice", "Bil 111."], ["wait", 3000],
- ["voice", "Bil 222."], ["wait", 3000],
- ["voice", "Bil 333."],
+ ["voice", "Bil 1."], ["wait", 3000],
+ ["voice", "Bil 2 Roy."], ["wait", 3000],
+ ["voice", "Bil 3."],
]);
});
@@ -406,3 +406,17 @@ test("practice: the new-leader call is on by default and can be turned off; race
assert.equal(isSilencedDuringRace("personal_best", { practiceLeaderCalls: "off" }, { type: "open_practice" }), false, "other practice calls stay");
assert.equal(isSilencedDuringRace("new_leader", { practiceLeaderCalls: "off" }, { type: "final" }), false, "races follow their own leader setting");
});
+
+test("heat call and staggered start: car numbers in finals by default, names otherwise, or as chosen", () => {
+ assert.equal(resolveDriverCallStyle("auto", "final"), "numbers");
+ assert.equal(resolveDriverCallStyle(undefined, "qualification"), "names");
+ assert.equal(resolveDriverCallStyle("both", "final"), "both");
+ assert.equal(formatHeatCallDrivers(["Roy", "Eddie", "Anders"], "numbers", "sv"), "Bil 1, 2, 3. ");
+ assert.equal(formatHeatCallDrivers(["Roy", "Eddie"], "both", "sv"), "Bil 1 Roy, bil 2 Eddie. ");
+ assert.equal(formatHeatCallDrivers(["Roy", "", "Anders"], "names", "en"), "Drivers: Roy, Anders. ");
+ assert.equal(formatHeatCallDrivers([], "numbers"), "");
+ assert.equal(formatCarCall(4, "Anders", "both", "sv"), "Bil 5 Anders");
+ assert.equal(formatCarCall(0, "Anders", "numbers", "en"), "Car 1");
+ assert.equal(formatCarCall(1, "Roy", "names"), "Roy");
+});
+