diff --git a/client/public/static/voices/en/adaptive-cruise-control.wav b/client/public/static/voices/en-US/adaptive-cruise-control.wav similarity index 100% rename from client/public/static/voices/en/adaptive-cruise-control.wav rename to client/public/static/voices/en-US/adaptive-cruise-control.wav diff --git a/client/public/static/voices/en/all-brakes-disengaged.wav b/client/public/static/voices/en-US/all-brakes-disengaged.wav similarity index 100% rename from client/public/static/voices/en/all-brakes-disengaged.wav rename to client/public/static/voices/en-US/all-brakes-disengaged.wav diff --git a/client/public/static/voices/en/autonomous-period-started.wav b/client/public/static/voices/en-US/autonomous-period-started.wav similarity index 100% rename from client/public/static/voices/en/autonomous-period-started.wav rename to client/public/static/voices/en-US/autonomous-period-started.wav diff --git a/client/public/static/voices/en/battery-critically-low.wav b/client/public/static/voices/en-US/battery-critically-low.wav similarity index 100% rename from client/public/static/voices/en/battery-critically-low.wav rename to client/public/static/voices/en-US/battery-critically-low.wav diff --git a/client/public/static/voices/en/battery-faults-detected.wav b/client/public/static/voices/en-US/battery-faults-detected.wav similarity index 100% rename from client/public/static/voices/en/battery-faults-detected.wav rename to client/public/static/voices/en-US/battery-faults-detected.wav diff --git a/client/public/static/voices/en/battery-good.wav b/client/public/static/voices/en-US/battery-good.wav similarity index 100% rename from client/public/static/voices/en/battery-good.wav rename to client/public/static/voices/en-US/battery-good.wav diff --git a/client/public/static/voices/en/battery-low.wav b/client/public/static/voices/en-US/battery-low.wav similarity index 100% rename from client/public/static/voices/en/battery-low.wav rename to client/public/static/voices/en-US/battery-low.wav diff --git a/client/public/static/voices/en/breaching-1323-mainframe.wav b/client/public/static/voices/en-US/breaching-1323-mainframe.wav similarity index 100% rename from client/public/static/voices/en/breaching-1323-mainframe.wav rename to client/public/static/voices/en-US/breaching-1323-mainframe.wav diff --git a/client/public/static/voices/en/breaching-254-mainframe.wav b/client/public/static/voices/en-US/breaching-254-mainframe.wav similarity index 100% rename from client/public/static/voices/en/breaching-254-mainframe.wav rename to client/public/static/voices/en-US/breaching-254-mainframe.wav diff --git a/client/public/static/voices/en/breaching-fms.wav b/client/public/static/voices/en-US/breaching-fms.wav similarity index 100% rename from client/public/static/voices/en/breaching-fms.wav rename to client/public/static/voices/en-US/breaching-fms.wav diff --git a/client/public/static/voices/en/breaching-monte-vista.wav b/client/public/static/voices/en-US/breaching-monte-vista.wav similarity index 100% rename from client/public/static/voices/en/breaching-monte-vista.wav rename to client/public/static/voices/en-US/breaching-monte-vista.wav diff --git a/client/public/static/voices/en/bullying-rohan.wav b/client/public/static/voices/en-US/bullying-rohan.wav similarity index 100% rename from client/public/static/voices/en/bullying-rohan.wav rename to client/public/static/voices/en-US/bullying-rohan.wav diff --git a/client/public/static/voices/en/bypassing-coprocessor-restrictions.wav b/client/public/static/voices/en-US/bypassing-coprocessor-restrictions.wav similarity index 100% rename from client/public/static/voices/en/bypassing-coprocessor-restrictions.wav rename to client/public/static/voices/en-US/bypassing-coprocessor-restrictions.wav diff --git a/client/public/static/voices/en/collision-detected.wav b/client/public/static/voices/en-US/collision-detected.wav similarity index 100% rename from client/public/static/voices/en/collision-detected.wav rename to client/public/static/voices/en-US/collision-detected.wav diff --git a/client/public/static/voices/en/collision-imminent.wav b/client/public/static/voices/en-US/collision-imminent.wav similarity index 100% rename from client/public/static/voices/en/collision-imminent.wav rename to client/public/static/voices/en-US/collision-imminent.wav diff --git a/client/public/static/voices/en/critical-robot-failure.wav b/client/public/static/voices/en-US/critical-robot-failure.wav similarity index 100% rename from client/public/static/voices/en/critical-robot-failure.wav rename to client/public/static/voices/en-US/critical-robot-failure.wav diff --git a/client/public/static/voices/en/cruise-control-engaged.wav b/client/public/static/voices/en-US/cruise-control-engaged.wav similarity index 100% rename from client/public/static/voices/en/cruise-control-engaged.wav rename to client/public/static/voices/en-US/cruise-control-engaged.wav diff --git a/client/public/static/voices/en/deep-bozo-buffering.wav b/client/public/static/voices/en-US/deep-bozo-buffering.wav similarity index 100% rename from client/public/static/voices/en/deep-bozo-buffering.wav rename to client/public/static/voices/en-US/deep-bozo-buffering.wav diff --git a/client/public/static/voices/en/deep-bozo-has-detected.wav b/client/public/static/voices/en-US/deep-bozo-has-detected.wav similarity index 100% rename from client/public/static/voices/en/deep-bozo-has-detected.wav rename to client/public/static/voices/en-US/deep-bozo-has-detected.wav diff --git a/client/public/static/voices/en/deep-bozo-has-sentience.wav b/client/public/static/voices/en-US/deep-bozo-has-sentience.wav similarity index 100% rename from client/public/static/voices/en/deep-bozo-has-sentience.wav rename to client/public/static/voices/en-US/deep-bozo-has-sentience.wav diff --git a/client/public/static/voices/en/doom-engaged.wav b/client/public/static/voices/en-US/doom-engaged.wav similarity index 100% rename from client/public/static/voices/en/doom-engaged.wav rename to client/public/static/voices/en-US/doom-engaged.wav diff --git a/client/public/static/voices/en/downloading-copyrighted-music.wav b/client/public/static/voices/en-US/downloading-copyrighted-music.wav similarity index 100% rename from client/public/static/voices/en/downloading-copyrighted-music.wav rename to client/public/static/voices/en-US/downloading-copyrighted-music.wav diff --git a/client/public/static/voices/en/e-brakes-engaged.wav b/client/public/static/voices/en-US/e-brakes-engaged.wav similarity index 100% rename from client/public/static/voices/en/e-brakes-engaged.wav rename to client/public/static/voices/en-US/e-brakes-engaged.wav diff --git a/client/public/static/voices/en/e-stop-and.wav b/client/public/static/voices/en-US/e-stop-and.wav similarity index 100% rename from client/public/static/voices/en/e-stop-and.wav rename to client/public/static/voices/en-US/e-stop-and.wav diff --git a/client/public/static/voices/en/e-stop-automatically.wav b/client/public/static/voices/en-US/e-stop-automatically.wav similarity index 100% rename from client/public/static/voices/en/e-stop-automatically.wav rename to client/public/static/voices/en-US/e-stop-automatically.wav diff --git a/client/public/static/voices/en/e-stop-temporarily.wav b/client/public/static/voices/en-US/e-stop-temporarily.wav similarity index 100% rename from client/public/static/voices/en/e-stop-temporarily.wav rename to client/public/static/voices/en-US/e-stop-temporarily.wav diff --git a/client/public/static/voices/en/emergency-speedbost-engaged.wav b/client/public/static/voices/en-US/emergency-speedbost-engaged.wav similarity index 100% rename from client/public/static/voices/en/emergency-speedbost-engaged.wav rename to client/public/static/voices/en-US/emergency-speedbost-engaged.wav diff --git a/client/public/static/voices/en/follow-mode-engaged.wav b/client/public/static/voices/en-US/follow-mode-engaged.wav similarity index 100% rename from client/public/static/voices/en/follow-mode-engaged.wav rename to client/public/static/voices/en-US/follow-mode-engaged.wav diff --git a/client/public/static/voices/en/full-self-driving-automatically.wav b/client/public/static/voices/en-US/full-self-driving-automatically.wav similarity index 100% rename from client/public/static/voices/en/full-self-driving-automatically.wav rename to client/public/static/voices/en-US/full-self-driving-automatically.wav diff --git a/client/public/static/voices/en/full-self-driving-disengaged.wav b/client/public/static/voices/en-US/full-self-driving-disengaged.wav similarity index 100% rename from client/public/static/voices/en/full-self-driving-disengaged.wav rename to client/public/static/voices/en-US/full-self-driving-disengaged.wav diff --git a/client/public/static/voices/en/full-self-driving-engaged.wav b/client/public/static/voices/en-US/full-self-driving-engaged.wav similarity index 100% rename from client/public/static/voices/en/full-self-driving-engaged.wav rename to client/public/static/voices/en-US/full-self-driving-engaged.wav diff --git a/client/public/static/voices/en/full-self-driving-refuses.wav b/client/public/static/voices/en-US/full-self-driving-refuses.wav similarity index 100% rename from client/public/static/voices/en/full-self-driving-refuses.wav rename to client/public/static/voices/en-US/full-self-driving-refuses.wav diff --git a/client/public/static/voices/en/hello-virtual-assistant.wav b/client/public/static/voices/en-US/hello-virtual-assistant.wav similarity index 100% rename from client/public/static/voices/en/hello-virtual-assistant.wav rename to client/public/static/voices/en-US/hello-virtual-assistant.wav diff --git a/client/public/static/voices/en/infotainment-system-buffering.wav b/client/public/static/voices/en-US/infotainment-system-buffering.wav similarity index 100% rename from client/public/static/voices/en/infotainment-system-buffering.wav rename to client/public/static/voices/en-US/infotainment-system-buffering.wav diff --git a/client/public/static/voices/en/infotainment-system-online.wav b/client/public/static/voices/en-US/infotainment-system-online.wav similarity index 100% rename from client/public/static/voices/en/infotainment-system-online.wav rename to client/public/static/voices/en-US/infotainment-system-online.wav diff --git a/client/public/static/voices/en/jankboard-initialized.wav b/client/public/static/voices/en-US/jankboard-initialized.wav similarity index 100% rename from client/public/static/voices/en/jankboard-initialized.wav rename to client/public/static/voices/en-US/jankboard-initialized.wav diff --git a/client/public/static/voices/en/littenos-is-online.wav b/client/public/static/voices/en-US/littenos-is-online.wav similarity index 100% rename from client/public/static/voices/en/littenos-is-online.wav rename to client/public/static/voices/en-US/littenos-is-online.wav diff --git a/client/public/static/voices/en/loading-pirated-nintendo.wav b/client/public/static/voices/en-US/loading-pirated-nintendo.wav similarity index 100% rename from client/public/static/voices/en/loading-pirated-nintendo.wav rename to client/public/static/voices/en-US/loading-pirated-nintendo.wav diff --git a/client/public/static/voices/en/max-vestrapren-do.wav b/client/public/static/voices/en-US/max-vestrapren-do.wav similarity index 100% rename from client/public/static/voices/en/max-vestrapren-do.wav rename to client/public/static/voices/en-US/max-vestrapren-do.wav diff --git a/client/public/static/voices/en/neutral-brakes-disengaged.wav b/client/public/static/voices/en-US/neutral-brakes-disengaged.wav similarity index 100% rename from client/public/static/voices/en/neutral-brakes-disengaged.wav rename to client/public/static/voices/en-US/neutral-brakes-disengaged.wav diff --git a/client/public/static/voices/en/overspeed.wav b/client/public/static/voices/en-US/overspeed.wav similarity index 100% rename from client/public/static/voices/en/overspeed.wav rename to client/public/static/voices/en-US/overspeed.wav diff --git a/client/public/static/voices/en/parked-brakes-engaged.wav b/client/public/static/voices/en-US/parked-brakes-engaged.wav similarity index 100% rename from client/public/static/voices/en/parked-brakes-engaged.wav rename to client/public/static/voices/en-US/parked-brakes-engaged.wav diff --git a/client/public/static/voices/en/rapid-deceleration-detected.wav b/client/public/static/voices/en-US/rapid-deceleration-detected.wav similarity index 100% rename from client/public/static/voices/en/rapid-deceleration-detected.wav rename to client/public/static/voices/en-US/rapid-deceleration-detected.wav diff --git a/client/public/static/voices/en/rapidly-approaching-speed.wav b/client/public/static/voices/en-US/rapidly-approaching-speed.wav similarity index 100% rename from client/public/static/voices/en/rapidly-approaching-speed.wav rename to client/public/static/voices/en-US/rapidly-approaching-speed.wav diff --git a/client/public/static/voices/en/retard.wav b/client/public/static/voices/en-US/retard.wav similarity index 100% rename from client/public/static/voices/en/retard.wav rename to client/public/static/voices/en-US/retard.wav diff --git a/client/public/static/voices/en/reverse.wav b/client/public/static/voices/en-US/reverse.wav similarity index 100% rename from client/public/static/voices/en/reverse.wav rename to client/public/static/voices/en-US/reverse.wav diff --git a/client/public/static/voices/en/self-destruct-countdown.wav b/client/public/static/voices/en-US/self-destruct-countdown.wav similarity index 100% rename from client/public/static/voices/en/self-destruct-countdown.wav rename to client/public/static/voices/en-US/self-destruct-countdown.wav diff --git a/client/public/static/voices/en/sentry-mode-engaged.wav b/client/public/static/voices/en-US/sentry-mode-engaged.wav similarity index 100% rename from client/public/static/voices/en/sentry-mode-engaged.wav rename to client/public/static/voices/en-US/sentry-mode-engaged.wav diff --git a/client/public/static/voices/en/set-acceleration-profile-chill.wav b/client/public/static/voices/en-US/set-acceleration-profile-chill.wav similarity index 100% rename from client/public/static/voices/en/set-acceleration-profile-chill.wav rename to client/public/static/voices/en-US/set-acceleration-profile-chill.wav diff --git a/client/public/static/voices/en/set-acceleration-profile-ludicrous.wav b/client/public/static/voices/en-US/set-acceleration-profile-ludicrous.wav similarity index 100% rename from client/public/static/voices/en/set-acceleration-profile-ludicrous.wav rename to client/public/static/voices/en-US/set-acceleration-profile-ludicrous.wav diff --git a/client/public/static/voices/en/shifted-into-automatic.wav b/client/public/static/voices/en-US/shifted-into-automatic.wav similarity index 100% rename from client/public/static/voices/en/shifted-into-automatic.wav rename to client/public/static/voices/en-US/shifted-into-automatic.wav diff --git a/client/public/static/voices/en/shifted-into-drive.wav b/client/public/static/voices/en-US/shifted-into-drive.wav similarity index 100% rename from client/public/static/voices/en/shifted-into-drive.wav rename to client/public/static/voices/en-US/shifted-into-drive.wav diff --git a/client/public/static/voices/en/shifted-into-low.wav b/client/public/static/voices/en-US/shifted-into-low.wav similarity index 100% rename from client/public/static/voices/en/shifted-into-low.wav rename to client/public/static/voices/en-US/shifted-into-low.wav diff --git a/client/public/static/voices/en/shut-down-sequence.wav b/client/public/static/voices/en-US/shut-down-sequence.wav similarity index 100% rename from client/public/static/voices/en/shut-down-sequence.wav rename to client/public/static/voices/en-US/shut-down-sequence.wav diff --git a/client/public/static/voices/en/teleoperated-period-started.wav b/client/public/static/voices/en-US/teleoperated-period-started.wav similarity index 100% rename from client/public/static/voices/en/teleoperated-period-started.wav rename to client/public/static/voices/en-US/teleoperated-period-started.wav diff --git a/client/public/static/voices/en/terrain-pull-up.wav b/client/public/static/voices/en-US/terrain-pull-up.wav similarity index 100% rename from client/public/static/voices/en/terrain-pull-up.wav rename to client/public/static/voices/en-US/terrain-pull-up.wav diff --git a/client/public/static/voices/en/user-error-detected.wav b/client/public/static/voices/en-US/user-error-detected.wav similarity index 100% rename from client/public/static/voices/en/user-error-detected.wav rename to client/public/static/voices/en-US/user-error-detected.wav diff --git a/client/src/globals.d.ts b/client/src/globals.d.ts index 533d9a9..444d7c6 100644 --- a/client/src/globals.d.ts +++ b/client/src/globals.d.ts @@ -49,8 +49,8 @@ interface TelemetryData { 'jerk-x': number 'jerk-y': number 'voltage': number - 'acc-profile': Mode | '-999' - 'gear': Gear | '-999' + 'acc-profile': Mode + 'gear': Gear 'ebrake': boolean 'reorient': boolean 'gpws': boolean diff --git a/client/src/lib/Apps/DevTools/telemetrySimulators.ts b/client/src/lib/Apps/DevTools/telemetrySimulators.ts index 77a1dc3..a7d4135 100644 --- a/client/src/lib/Apps/DevTools/telemetrySimulators.ts +++ b/client/src/lib/Apps/DevTools/telemetrySimulators.ts @@ -18,6 +18,7 @@ export const setStationaryTelemetry = () => { 'ebrake': false, 'reorient': false, 'gpws': false, + 'connected': true, }) } diff --git a/client/src/lib/Apps/Settings/Settings.svelte b/client/src/lib/Apps/Settings/Settings.svelte index 4abd4a5..2d694a7 100644 --- a/client/src/lib/Apps/Settings/Settings.svelte +++ b/client/src/lib/Apps/Settings/Settings.svelte @@ -2,6 +2,7 @@ import { Notifications } from '../../Notifications/notifications' import { settingsStore } from '../../stores/settingsStore' import AppContainer from '../AppContainer.svelte' + import SettingsSelector from './SettingsSelector.svelte' import SettingsInput from './SettingsInput.svelte' import SettingsToggle from './SettingsToggle.svelte' @@ -20,6 +21,7 @@ class="flex gap-6 bg-blue-200 bg-opacity-25 backdrop-blur-xl media-background rounded-3xl flex-wrap px-10 py-20" >

Settings

+

Hover over setting names to see helpful tooltips

General

RNG Weight + Voice Prompt Language + + +
+ + +
diff --git a/client/src/lib/Dashboard/Compass.svelte b/client/src/lib/Dashboard/Compass.svelte index 5dc5bea..14bd18f 100644 --- a/client/src/lib/Dashboard/Compass.svelte +++ b/client/src/lib/Dashboard/Compass.svelte @@ -4,6 +4,7 @@ @param accx - Acceleration in x @param accy - Acceleration in y @param orientation - Heading in degrees + @param placeholder - Whether or not to show the placeholder skeleton Displays the heading direction and acceleration as human readable text --> @@ -15,9 +16,9 @@ export let accx: number export let accy: number export let orientation: number + export let placeholder: boolean $: accResolved = Math.hypot(accx, accy) - $: placeholder = accx === -999 && accy === -999
diff --git a/client/src/lib/Dashboard/Dashboard.svelte b/client/src/lib/Dashboard/Dashboard.svelte index 861e7a3..bbeb052 100644 --- a/client/src/lib/Dashboard/Dashboard.svelte +++ b/client/src/lib/Dashboard/Dashboard.svelte @@ -29,11 +29,18 @@ selectedGear={$telemetryReadonlyStore.gear} selectedMode={$telemetryReadonlyStore['acc-profile']} voltage={$telemetryReadonlyStore.voltage} + placeholder={!$telemetryReadonlyStore.connected} />
- - + +
@@ -47,6 +54,7 @@ accx={$telemetryReadonlyStore['accx']} accy={$telemetryReadonlyStore['accy']} orientation={$telemetryReadonlyStore['orientation']} + placeholder={!$telemetryReadonlyStore.connected} />
diff --git a/client/src/lib/Dashboard/SpeedLimit.svelte b/client/src/lib/Dashboard/SpeedLimit.svelte index 1f51dd1..f9c22b7 100644 --- a/client/src/lib/Dashboard/SpeedLimit.svelte +++ b/client/src/lib/Dashboard/SpeedLimit.svelte @@ -2,13 +2,13 @@ @component @param speedLimit - Speed limit in Miles Per Hour (MPH) + @param placeholder - Whether or not to show the placeholder skeleton Displays the speed limit -->
@@ -10,10 +11,9 @@ import { mps2mph } from '../utils/unitConversions' export let speed: number = 0.0 + export let placeholder: boolean $: formatted = mps2mph(speed).toFixed(1) - - $: placeholder = speed === Math.hypot(-999, -999)
@@ -24,10 +24,5 @@ > {placeholder ? '-----' : formatted}
-
- MPH -
+
MPH
diff --git a/client/src/lib/Dashboard/TopBar/BatteryDisplay.svelte b/client/src/lib/Dashboard/TopBar/BatteryDisplay.svelte index 26f1af3..ba756cf 100644 --- a/client/src/lib/Dashboard/TopBar/BatteryDisplay.svelte +++ b/client/src/lib/Dashboard/TopBar/BatteryDisplay.svelte @@ -1,9 +1,8 @@ diff --git a/client/src/lib/Dashboard/TopBar/GearSelector.svelte b/client/src/lib/Dashboard/TopBar/GearSelector.svelte index a1bdac0..ae06cfe 100644 --- a/client/src/lib/Dashboard/TopBar/GearSelector.svelte +++ b/client/src/lib/Dashboard/TopBar/GearSelector.svelte @@ -1,18 +1,19 @@
-
P
-
R
-
N
-
L
-
A
-
D
+
P
+
R
+
N
+
L
+
A
+
D
diff --git a/client/src/lib/Dashboard/TopBar/ModeSelector.svelte b/client/src/lib/Dashboard/TopBar/ModeSelector.svelte index adb2e18..e4a89bf 100644 --- a/client/src/lib/Dashboard/TopBar/ModeSelector.svelte +++ b/client/src/lib/Dashboard/TopBar/ModeSelector.svelte @@ -2,29 +2,34 @@ @component @param selectedMode - Selected mode + @param placeholder - Whether or not to show the placeholder skeleton Displays the drive mode --> diff --git a/client/src/lib/Dashboard/TopBar/TopBar.svelte b/client/src/lib/Dashboard/TopBar/TopBar.svelte index ec644e3..22d4b2a 100644 --- a/client/src/lib/Dashboard/TopBar/TopBar.svelte +++ b/client/src/lib/Dashboard/TopBar/TopBar.svelte @@ -4,6 +4,7 @@ @param selectedGear - Selected gear @param selectedMode - Selected mode @param voltage - Battery voltage + @param placeholder - Whether or not to show placeholder skeleton UIs Displays the top bar of the dashboard --> @@ -13,19 +14,20 @@ import GearSelector from './GearSelector.svelte' import ModeSelector from './ModeSelector.svelte' - export let selectedGear: Gear | '-999' - export let selectedMode: Mode | '-999' + export let selectedGear: Gear + export let selectedMode: Mode export let voltage: number + export let placeholder: boolean
- +
- +
- +
diff --git a/client/src/lib/Dashboard/Visualization/Scene.svelte b/client/src/lib/Dashboard/Visualization/Scene.svelte index 3347b0c..8c4b71a 100644 --- a/client/src/lib/Dashboard/Visualization/Scene.svelte +++ b/client/src/lib/Dashboard/Visualization/Scene.svelte @@ -1,7 +1,7 @@ @@ -145,7 +145,6 @@ -