feat(metrics): external GPS speed metric + tire pressure on the HUD

eried · claude · eried · commit e27dde6f8e78 · 2026-07-30T20:13:41.000+02:00
Overlay Studio (phone): - Add WheelData.externalGpsSpeedKmh, merged from ExternalGpsRepository in OverlayStudioViewModel like the ext-GPS battery / coords already are. - New "Ext GPS speed" Studio metric (SPEED-kind, honours km/h <-> mph). HUD (was missing tire pressure entirely; ext-GPS battery + coords already worked): - HudState gains tirePressureKpa (ext-GPS speed rides the existing gpsSpeedKmh + gpsSource=="EXTERNAL", no new wire field). - HudServer streams it; StudioElementData.from maps both into the HUD's WheelData; HUD Studio enum gains TIRE_PRESSURE (PRESSURE-kind, via a new HudUnits.pressure) and EXTERNAL_GPS_SPEED. Tire pressure already worked as a Studio graph/number on the phone. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01GHUZZ33sT9FYS6sXiMogJc
diff --git a/app/src/main/java/com/eried/eucplanet/data/model/WheelData.kt b/app/src/main/java/com/eried/eucplanet/data/model/WheelData.kt
@@ -24,6 +24,10 @@ data class WheelData(
      *  Studio (like latitude/longitude) so an overlay number can show it; not
      *  wheel telemetry, so it stays -1 on the plain wheel stream. */
     val externalGpsBatteryPercent: Int = -1,
+    /** Ground speed in km/h from the paired external GPS box (RaceBox / Dragy),
+     *  or -1 when none is paired / no fresh sample. Merged in like the battery /
+     *  lat / long above so an overlay or HUD element can show it. */
+    val externalGpsSpeedKmh: Float = -1f,
     /** Phone IMU acceleration magnitude in g, 0 for trips recorded before this. */
     val gForce: Float = 0f,
     /** Phone IMU lateral acceleration in g (+right). 0 for trips recorded before this. */
diff --git a/app/src/main/java/com/eried/eucplanet/service/hud/HudServer.kt b/app/src/main/java/com/eried/eucplanet/service/hud/HudServer.kt
@@ -921,6 +921,7 @@ class HudServer @Inject constructor(
             gpsAltitudeM = if (location?.hasAltitude() == true) location.altitude.toFloat()
                 else Float.NaN,
             externalGpsBatteryPercent = if (externalFresh) (external!!.batteryPercent ?: -1) else -1,
+            tirePressureKpa = wd.tirePressureKpa,
             wheelRollDeg = wd.rollAngle,
             wheelPitchDeg = wd.pitchAngle,
             customOverlayJson = s.hudCustomOverlayJson,
diff --git a/app/src/main/java/com/eried/eucplanet/ui/studio/OverlayStudioViewModel.kt b/app/src/main/java/com/eried/eucplanet/ui/studio/OverlayStudioViewModel.kt
@@ -161,10 +161,11 @@ class OverlayStudioViewModel @Inject constructor(
         tripRepository.currentLocation,
         externalGpsRepository.currentSample
     ) { data, loc, ext ->
-        val extBattery = ext?.batteryPercent
-            ?.takeIf { System.currentTimeMillis() - ext.timestamp < 5_000L } ?: -1
+        val extFresh = ext != null && System.currentTimeMillis() - ext.timestamp < 5_000L
+        val extBattery = if (extFresh) (ext!!.batteryPercent ?: -1) else -1
+        val extSpeed = if (extFresh) ext!!.speedKmh else -1f
         val withGps = if (loc != null) data.copy(latitude = loc.latitude, longitude = loc.longitude) else data
-        withGps.copy(externalGpsBatteryPercent = extBattery)
+        withGps.copy(externalGpsBatteryPercent = extBattery, externalGpsSpeedKmh = extSpeed)
     }.stateIn(viewModelScope, SharingStarted.Eagerly, WheelData())
 
     // Live (un-throttled) lateral / forward G in g. The G-Force overlay's dot
diff --git a/app/src/main/java/com/eried/eucplanet/ui/studio/StudioMetric.kt b/app/src/main/java/com/eried/eucplanet/ui/studio/StudioMetric.kt
@@ -46,6 +46,7 @@ enum class StudioMetric(
     ROLL("ROLL", "Roll", StudioMetricKind.PLAIN, "°", 1, 30f, { it.rollAngle }),
     G_FORCE("G-FORCE", "G-Force", StudioMetricKind.PLAIN, "g", 2, 2f, { it.gForce }),
     EXTERNAL_GPS_BATTERY("EXT_GPS_BATTERY", "Ext GPS battery", StudioMetricKind.PLAIN, "%", 0, 100f, { it.externalGpsBatteryPercent.toFloat() }),
+    EXTERNAL_GPS_SPEED("EXT_GPS_SPEED", "Ext GPS speed", StudioMetricKind.SPEED, "", 1, 60f, { it.externalGpsSpeedKmh.coerceAtLeast(0f) }),
     TIRE_PRESSURE("TIRE_PRESSURE", "Tire pressure", StudioMetricKind.PRESSURE, "", 1, 50f, { it.tirePressureKpa }),
     // A lat/lng pair shown as text (not a scalar), so it only makes sense on a
     // text value element. extract is a placeholder; formatted() renders the pair.
@@ -110,6 +111,7 @@ fun StudioMetric.displayName(): String = when (this) {
     StudioMetric.ROLL -> stringResource(R.string.studio_metric_roll)
     StudioMetric.G_FORCE -> stringResource(R.string.studio_metric_g_force)
     StudioMetric.EXTERNAL_GPS_BATTERY -> stringResource(R.string.studio_metric_external_gps_battery)
+    StudioMetric.EXTERNAL_GPS_SPEED -> stringResource(R.string.studio_metric_external_gps_speed)
     StudioMetric.TIRE_PRESSURE -> stringResource(R.string.studio_metric_tire_pressure)
     StudioMetric.GPS -> stringResource(R.string.studio_metric_gps)
 }
diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml
@@ -1382,6 +1382,7 @@
     <string name="studio_metric_roll">Alabeo</string>
     <string name="studio_metric_g_force">G-Force</string>
     <string name="studio_metric_external_gps_battery">Batería GPS ext.</string>
+    <string name="studio_metric_external_gps_speed">Vel. GPS ext.</string>
     <string name="studio_metric_gps">Coordenadas GPS</string>
 
     <!-- Studio misc -->
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
@@ -1369,6 +1369,7 @@
     <string name="studio_metric_roll">Krængning</string>
     <string name="studio_metric_g_force">G-Force</string>
     <string name="studio_metric_external_gps_battery">Ekst. GPS-batteri</string>
+    <string name="studio_metric_external_gps_speed">Ext. GPS-fart</string>
     <string name="studio_metric_gps">GPS-koordinater</string>
 
     <!-- Navigator -->
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -1380,6 +1380,7 @@
     <string name="studio_metric_roll">Querneigung</string>
     <string name="studio_metric_g_force">G-Force</string>
     <string name="studio_metric_external_gps_battery">Ext. GPS-Akku</string>
+    <string name="studio_metric_external_gps_speed">Ext. GPS-Tempo</string>
     <string name="studio_metric_gps">GPS-Koordinaten</string>
 
     <!-- Studio misc -->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -1368,6 +1368,7 @@
     <string name="studio_metric_roll">Alabeo</string>
     <string name="studio_metric_g_force">G-Force</string>
     <string name="studio_metric_external_gps_battery">Batería GPS ext.</string>
+    <string name="studio_metric_external_gps_speed">Vel. GPS ext.</string>
     <string name="studio_metric_gps">Coordenadas GPS</string>
 
     <!-- Navigator -->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -1407,6 +1407,7 @@
     <string name="studio_metric_roll">Roulis</string>
     <string name="studio_metric_g_force">G-Force</string>
     <string name="studio_metric_external_gps_battery">Batterie GPS ext.</string>
+    <string name="studio_metric_external_gps_speed">Vitesse GPS ext.</string>
     <string name="studio_metric_gps">Coordonnées GPS</string>
 
     <!-- Studio: overwrite preset -->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -924,6 +924,7 @@
     <string name="studio_metric_current">Corrente</string>
     <string name="studio_metric_g_force">G-Force</string>
     <string name="studio_metric_external_gps_battery">Batteria GPS est.</string>
+    <string name="studio_metric_external_gps_speed">Vel. GPS est.</string>
     <string name="studio_metric_gps">Coordinate GPS</string>
     <string name="studio_metric_odometer">Contachilometri</string>
     <string name="studio_metric_pitch">Beccheggio</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -1365,6 +1365,7 @@
     <string name="studio_metric_roll">ロール</string>
     <string name="studio_metric_g_force">G フォース</string>
     <string name="studio_metric_external_gps_battery">外部GPSバッテリー</string>
+    <string name="studio_metric_external_gps_speed">外部GPS速度</string>
     <string name="studio_metric_gps">GPS 座標</string>
 
     <!-- Navigator -->
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
@@ -1365,6 +1365,7 @@
     <string name="studio_metric_roll">롤</string>
     <string name="studio_metric_g_force">G-force</string>
     <string name="studio_metric_external_gps_battery">외장 GPS 배터리</string>
+    <string name="studio_metric_external_gps_speed">외부 GPS 속도</string>
     <string name="studio_metric_gps">GPS 좌표</string>
 
     <!-- Navigator -->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
@@ -1405,6 +1405,7 @@
     <string name="studio_metric_roll">Roll</string>
     <string name="studio_metric_g_force">G-Force</string>
     <string name="studio_metric_external_gps_battery">Ext. GPS-accu</string>
+    <string name="studio_metric_external_gps_speed">Ext. GPS-snelheid</string>
     <string name="studio_metric_gps">GPS-coördinaten</string>
 
     <!-- Studio: misc -->
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
@@ -905,6 +905,7 @@
     <string name="studio_metric_current">Strøm</string>
     <string name="studio_metric_g_force">G-Force</string>
     <string name="studio_metric_external_gps_battery">Eks. GPS-batteri</string>
+    <string name="studio_metric_external_gps_speed">Ekst. GPS-fart</string>
     <string name="studio_metric_gps">GPS-koordinater</string>
     <string name="studio_metric_odometer">Kilometerteller</string>
     <string name="studio_metric_pitch">Stigning</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
@@ -1381,6 +1381,7 @@
     <string name="studio_metric_roll">Przechył</string>
     <string name="studio_metric_g_force">G-Force</string>
     <string name="studio_metric_external_gps_battery">Bateria GPS zewn.</string>
+    <string name="studio_metric_external_gps_speed">Prędkość GPS zew.</string>
     <string name="studio_metric_gps">Współrzędne GPS</string>
 
     <!-- Navigator -->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1368,6 +1368,7 @@
     <string name="studio_metric_roll">Rolagem</string>
     <string name="studio_metric_g_force">G-Force</string>
     <string name="studio_metric_external_gps_battery">Bateria GPS ext.</string>
+    <string name="studio_metric_external_gps_speed">Vel. GPS ext.</string>
     <string name="studio_metric_gps">Coordenadas GPS</string>
 
     <!-- Navigator -->
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -1368,6 +1368,7 @@
     <string name="studio_metric_roll">Крен</string>
     <string name="studio_metric_g_force">G-Force</string>
     <string name="studio_metric_external_gps_battery">Заряд внеш. GPS</string>
+    <string name="studio_metric_external_gps_speed">Скорость внеш. GPS</string>
     <string name="studio_metric_gps">Координаты GPS</string>
 
     <!-- Navigator -->
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
@@ -1364,6 +1364,7 @@
     <string name="studio_metric_roll">Roll</string>
     <string name="studio_metric_g_force">G-Force</string>
     <string name="studio_metric_external_gps_battery">Ext. GPS-batteri</string>
+    <string name="studio_metric_external_gps_speed">Ext. GPS-fart</string>
     <string name="studio_metric_gps">GPS-koordinater</string>
 
     <!-- Navigator -->
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
@@ -1365,6 +1365,7 @@
     <string name="studio_metric_roll">Yalpa</string>
     <string name="studio_metric_g_force">G-Kuvveti</string>
     <string name="studio_metric_external_gps_battery">Harici GPS aküsü</string>
+    <string name="studio_metric_external_gps_speed">Harici GPS hızı</string>
     <string name="studio_metric_gps">GPS koordinatları</string>
 
     <!-- Navigator -->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
@@ -1392,6 +1392,7 @@
     <string name="studio_metric_roll">Крен</string>
     <string name="studio_metric_g_force">G-Force</string>
     <string name="studio_metric_external_gps_battery">Заряд зовн. GPS</string>
+    <string name="studio_metric_external_gps_speed">Швидкість зовн. GPS</string>
     <string name="studio_metric_gps">Координати GPS</string>
 
     <!-- Navigator -->
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1365,6 +1365,7 @@
     <string name="studio_metric_roll">滾轉角</string>
     <string name="studio_metric_g_force">G 力</string>
     <string name="studio_metric_external_gps_battery">外接 GPS 電池</string>
+    <string name="studio_metric_external_gps_speed">外部GPS速度</string>
     <string name="studio_metric_gps">GPS 座標</string>
 
     <!-- Navigator -->
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -888,6 +888,7 @@
     <string name="studio_metric_current">电流</string>
     <string name="studio_metric_g_force">G-Force</string>
     <string name="studio_metric_external_gps_battery">外接 GPS 电量</string>
+    <string name="studio_metric_external_gps_speed">外部GPS速度</string>
     <string name="studio_metric_gps">GPS 坐标</string>
     <string name="studio_metric_odometer">总里程</string>
     <string name="studio_metric_pitch">俯仰角</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1668,6 +1668,7 @@
     <string name="studio_metric_roll">Roll</string>
     <string name="studio_metric_g_force">G-Force</string>
     <string name="studio_metric_external_gps_battery">Ext GPS battery</string>
+    <string name="studio_metric_external_gps_speed">Ext GPS speed</string>
     <string name="studio_metric_tire_pressure">Tire pressure</string>
     <string name="studio_metric_gps">GPS coordinates</string>
 
diff --git a/hud-protocol/src/main/java/com/eried/eucplanet/hud/protocol/HudWire.kt b/hud-protocol/src/main/java/com/eried/eucplanet/hud/protocol/HudWire.kt
@@ -101,6 +101,11 @@ data class HudState(
      *  overlay show the box draining. Wired in protocol minor 11; older HUDs
      *  default it to -1 and just don't show the element. */
     val externalGpsBatteryPercent: Int = -1,
+    /** Tire pressure in kPa from a bound TPMS sensor the wheel relays (InMotion
+     *  P6). 0 when no sensor / not reported. Older HUDs default it to 0 and just
+     *  don't draw the element. (Ext-GPS speed rides the existing [gpsSpeedKmh] +
+     *  [gpsSource]=="EXTERNAL"; no new field needed for that.) */
+    val tirePressureKpa: Float = 0f,
 
     /** Wheel roll (lean) in degrees, +right. From wheel BLE telemetry
      *  (InMotion / Begode / KingSong all report it). 0 when the wheel
diff --git a/hud/src/main/java/com/eried/eucplanet/hud/overlay/StudioElementData.kt b/hud/src/main/java/com/eried/eucplanet/hud/overlay/StudioElementData.kt
@@ -59,6 +59,10 @@ data class StudioElementData(
                 latitude = hud.latitude,
                 longitude = hud.longitude,
                 externalGpsBatteryPercent = hud.externalGpsBatteryPercent,
+                // Ext-GPS speed rides the shared gpsSpeedKmh; expose it as the
+                // external metric only when the box is the source.
+                externalGpsSpeedKmh = if (hud.gpsSource == "EXTERNAL") hud.gpsSpeedKmh else -1f,
+                tirePressureKpa = hud.tirePressureKpa,
                 lightOn = hud.lightOn,
                 timestamp = hud.timestampMs.takeIf { it > 0L } ?: System.currentTimeMillis()
             )
diff --git a/hud/src/main/java/com/eried/eucplanet/hud/overlay/StudioMetric.kt b/hud/src/main/java/com/eried/eucplanet/hud/overlay/StudioMetric.kt
@@ -12,7 +12,7 @@ import kotlin.math.absoluteValue
  * in :hud), and metric display names are hard-coded English here -- adding
  * proper localisation later is one stringResource swap.
  */
-enum class StudioMetricKind { SPEED, DISTANCE, TEMPERATURE, PLAIN }
+enum class StudioMetricKind { SPEED, DISTANCE, TEMPERATURE, PRESSURE, PLAIN }
 
 enum class StudioMetric(
     val key: String,
@@ -38,6 +38,8 @@ enum class StudioMetric(
     ROLL("ROLL", "Roll", StudioMetricKind.PLAIN, "°", 1, 30f, { it.rollAngle }),
     G_FORCE("G-FORCE", "G-Force", StudioMetricKind.PLAIN, "g", 2, 2f, { it.gForce }),
     EXTERNAL_GPS_BATTERY("EXT_GPS_BATTERY", "Ext GPS battery", StudioMetricKind.PLAIN, "%", 0, 100f, { it.externalGpsBatteryPercent.toFloat() }),
+    EXTERNAL_GPS_SPEED("EXT_GPS_SPEED", "Ext GPS speed", StudioMetricKind.SPEED, "", 1, 60f, { it.externalGpsSpeedKmh.coerceAtLeast(0f) }),
+    TIRE_PRESSURE("TIRE_PRESSURE", "Tire pressure", StudioMetricKind.PRESSURE, "", 1, 50f, { it.tirePressureKpa }),
     GPS("GPS", "GPS coordinates", StudioMetricKind.PLAIN, "", 0, 1f, { 0f }, textOnly = true);
 
     /** True when this metric renders a unit beside its value. */
@@ -49,6 +51,7 @@ enum class StudioMetric(
             StudioMetricKind.SPEED -> HudUnits.speed(raw, speedUnit)
             StudioMetricKind.DISTANCE -> HudUnits.distance(raw, distUnit)
             StudioMetricKind.TEMPERATURE -> HudUnits.temperature(raw, tempUnit)
+            StudioMetricKind.PRESSURE -> HudUnits.pressure(raw, distUnit)
             StudioMetricKind.PLAIN -> raw
         }
     }
@@ -58,6 +61,7 @@ enum class StudioMetric(
             StudioMetricKind.SPEED -> HudUnits.speedSuffix(speedUnit)
             StudioMetricKind.DISTANCE -> HudUnits.distanceSuffix(distUnit)
             StudioMetricKind.TEMPERATURE -> HudUnits.temperatureSuffix(tempUnit)
+            StudioMetricKind.PRESSURE -> HudUnits.pressureSuffix(distUnit)
             StudioMetricKind.PLAIN -> plainUnit
         }
 
@@ -91,5 +95,7 @@ fun StudioMetric.displayName(): String = when (this) {
     StudioMetric.ROLL -> "Roll"
     StudioMetric.G_FORCE -> "G-Force"
     StudioMetric.EXTERNAL_GPS_BATTERY -> "Ext GPS bat"
+    StudioMetric.EXTERNAL_GPS_SPEED -> "Ext GPS spd"
+    StudioMetric.TIRE_PRESSURE -> "Tire"
     StudioMetric.GPS -> "GPS coord"
 }
diff --git a/hud/src/main/java/com/eried/eucplanet/hud/overlay/WheelData.kt b/hud/src/main/java/com/eried/eucplanet/hud/overlay/WheelData.kt
@@ -31,6 +31,10 @@ data class WheelData(
     /** Battery percent of the paired external GPS box, -1 when none / unknown.
      *  Mirrors the phone class; fed from HudState.externalGpsBatteryPercent. */
     val externalGpsBatteryPercent: Int = -1,
+    /** Ground speed in km/h from the paired external GPS box, -1 when none. */
+    val externalGpsSpeedKmh: Float = -1f,
+    /** Tire pressure in kPa from a bound TPMS sensor (InMotion P6), 0 when none. */
+    val tirePressureKpa: Float = 0f,
     /** Phone IMU acceleration magnitude in g, 0 for trips recorded before this. */
     val gForce: Float = 0f,
     /** Phone IMU lateral acceleration in g (+right). 0 for trips recorded before this. */
diff --git a/hud/src/main/java/com/eried/eucplanet/hud/ui/Units.kt b/hud/src/main/java/com/eried/eucplanet/hud/ui/Units.kt
@@ -60,6 +60,13 @@ object HudUnits {
         else -> "°C"
     }
 
+    /** Tire pressure: raw kPa -> the chosen unit. Follows the distance unit
+     *  (mi -> psi, else bar), mirroring the phone's Units.effectivePressureUnit. */
+    fun pressure(kpa: Float, distCode: String): Float =
+        if (distCode == "mi") kpa * 0.145038f else kpa / 100f
+
+    fun pressureSuffix(distCode: String): String = if (distCode == "mi") "psi" else "bar"
+
     /** Round to N decimals as a Float (rendering uses %.Nf, this is only for
      *  intermediate comparison / threshold checks). */
     fun round1(v: Float): Float = round(v * 10f) / 10f
