feat(dashboard): show consumption readings

Author: malys

CHANGELOG.md

@@ -6,6 +6,12 @@ All notable changes follow [Keep a Changelog](https://keepachangelog.com/en/1.1.
 
 ### Added
 
+- **The dashboard now separates immediate and trip consumption without competing with SOC.**
+  Instant kWh/100 km uses EVHardware's five-second smoothing and stays unavailable below
+  5 km/h; regeneration remains negative. The adjacent trip average keeps the accumulator's
+  integrated consumed-energy/distance definition, and both numbers are labelled as arithmetic
+  derived from vehicle readings rather than measurements or predictions.
+
 - **Completed trips can now leave the head unit without granting broad storage access.** The
   ledger exports either one trip or all retained trips as a documented CSV summary or a
   schema-versioned JSON document with sample tracks. Files are bounded, written atomically to

EVHardware

@@ -22,6 +22,7 @@ data class DashboardReadings(
     val power: Provenanced<Float>,
     val outsideTemp: Provenanced<Float>,
     val batteryTemp: Provenanced<Float>,
+    val instantConsumption: Provenanced<Double>,
     val tripDuration: Provenanced<Long>,
     val tripDistance: Provenanced<Double>,
     val tripEnergy: Provenanced<Double>,
@@ -34,13 +35,17 @@ data class DashboardReadings(
             fun <T : Any> gap() = Provenanced.unavailable<T>(UnavailableReason.SIGNAL_ABSENT)
             return DashboardReadings(
                 soc = gap(), range = gap(), speed = gap(), power = gap(),
-                outsideTemp = gap(), batteryTemp = gap(),
+                outsideTemp = gap(), batteryTemp = gap(), instantConsumption = gap(),
                 tripDuration = gap(), tripDistance = gap(), tripEnergy = gap(),
                 tripRegen = gap(), tripConsumption = gap(),
             )
         }
 
-        fun of(snapshot: EnergySnapshot, trip: EnergyTripSummary?): DashboardReadings {
+        fun of(
+            snapshot: EnergySnapshot,
+            trip: EnergyTripSummary?,
+            instantConsumption: Provenanced<Double>,
+        ): DashboardReadings {
             // An unrecognised generation is not a car that stopped publishing: it is a car
             // this build was never taught to read. The screen says which.
             val absent = if (snapshot.firmware == FirmwareInfo.Gen.UNKNOWN) {
@@ -55,11 +60,12 @@ data class DashboardReadings(
                 power = Provenanced.measured(snapshot.batteryPowerKw, absent),
                 outsideTemp = Provenanced.measured(snapshot.outsideTempCelsius, absent),
                 batteryTemp = Provenanced.measured(snapshot.batteryTempCelsius, absent),
+                instantConsumption = instantConsumption,
                 // The trip figures are arithmetic over those readings, so they are derived,
                 // and they are missing for a different reason: no trip is being recorded, or
                 // no usable interval has accumulated yet.
                 tripDuration = Provenanced.derived(trip?.durationMs),
-                tripDistance = Provenanced.derived(trip?.distanceKm),
+                tripDistance = Provenanced.derived(trip?.recordedDistanceKm),
                 tripEnergy = Provenanced.derived(trip?.consumedKwh),
                 tripRegen = Provenanced.derived(trip?.regeneratedKwh),
                 tripConsumption = Provenanced.derived(trip?.averageConsumptionKwhPer100Km),

app/src/main/java/com/evsuite/chargepilot/DashboardReadings.kt

@@ -14,16 +14,19 @@ import com.evsuite.hardware.AppLogger
 import com.evsuite.hardware.EVHardware
 import com.evsuite.hardware.FirmwareInfo
 import com.evsuite.hardware.diag.CrashLogger
+import com.evsuite.hardware.telemetry.ConsumptionCalculator
 import com.evsuite.hardware.telemetry.EnergySnapshot
 import com.evsuite.hardware.telemetry.EnergyTripSession
 import com.evsuite.hardware.telemetry.Provenanced
+import com.evsuite.hardware.telemetry.UnavailableReason
 import java.util.Locale
 import java.util.concurrent.Executors
 
 class MainActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityMainBinding
     private lateinit var provenance: ProvenanceText
+    private val consumption = ConsumptionCalculator()
     /** Ten binder reads and a disk read for the diagnostics report; not the main thread's work. */
     private val background = Executors.newSingleThreadExecutor { runnable ->
         Thread(runnable, "chargepilot-diagnostics")
@@ -105,7 +108,17 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun render(value: EnergySnapshot) {
-        val readings = DashboardReadings.of(value, EnergyTripSession.current(value.timestampMs))
+        val missingReason = if (value.firmware == FirmwareInfo.Gen.UNKNOWN) {
+            UnavailableReason.UNSUPPORTED_FIRMWARE
+        } else {
+            UnavailableReason.SIGNAL_ABSENT
+        }
+        val consumptionReading = consumption.add(value, missingReason)
+        val readings = DashboardReadings.of(
+            value,
+            EnergyTripSession.current(value.timestampMs),
+            consumptionReading.smoothedInstantaneous,
+        )
         latestReadings = readings
         renderReadings(readings)
         binding.climateValue.text = climate(value)
@@ -138,11 +151,17 @@ class MainActivity : AppCompatActivity() {
         bind(binding.powerValue, R.string.label_power, readings.power, PATTERN_POWER, POWER_UNAVAILABLE)
         bind(binding.outsideTempValue, R.string.label_outside_temp, readings.outsideTemp, PATTERN_TEMP)
         bind(binding.batteryTempValue, R.string.label_battery_temp, readings.batteryTemp, PATTERN_TEMP)
+        bind(
+            binding.instantConsumptionValue,
+            R.string.label_instant_consumption,
+            readings.instantConsumption,
+            PATTERN_CONSUMPTION,
+        )
         bind(binding.tripDistanceValue, R.string.label_distance, readings.tripDistance, PATTERN_DISTANCE)
         bind(binding.tripEnergyValue, R.string.label_energy_used, readings.tripEnergy, PATTERN_ENERGY)
         bind(binding.tripRegenValue, R.string.label_regenerated, readings.tripRegen, PATTERN_ENERGY)
         bind(
-            binding.tripConsumptionValue, R.string.label_consumption,
+            binding.tripConsumptionValue, R.string.label_trip_average_consumption,
             readings.tripConsumption, PATTERN_CONSUMPTION,
         )
         val recorded = provenance.renderWith(readings.tripDuration, transform = ::duration)
@@ -171,6 +190,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun renderUnavailable() {
         latestReadings = DashboardReadings.empty()
+        consumption.reset()
         renderReadings(latestReadings)
         binding.climateValue.text = DASH
         binding.dataStatus.text = getString(R.string.status_waiting_for_vehicle)
@@ -235,10 +255,19 @@ class MainActivity : AppCompatActivity() {
         Triple(R.string.label_power, readings.power, PATTERN_POWER),
         Triple(R.string.label_outside_temp, readings.outsideTemp, PATTERN_TEMP),
         Triple(R.string.label_battery_temp, readings.batteryTemp, PATTERN_TEMP),
+        Triple(
+            R.string.label_instant_consumption,
+            readings.instantConsumption,
+            PATTERN_CONSUMPTION,
+        ),
         Triple(R.string.label_distance, readings.tripDistance, PATTERN_DISTANCE),
         Triple(R.string.label_energy_used, readings.tripEnergy, PATTERN_ENERGY),
         Triple(R.string.label_regenerated, readings.tripRegen, PATTERN_ENERGY),
-        Triple(R.string.label_consumption, readings.tripConsumption, PATTERN_CONSUMPTION),
+        Triple(
+            R.string.label_trip_average_consumption,
+            readings.tripConsumption,
+            PATTERN_CONSUMPTION,
+        ),
     ).map { (label, value, pattern) ->
         provenance.describe(getString(label), value, provenance.render(value, pattern))
     }

app/src/main/java/com/evsuite/chargepilot/MainActivity.kt

@@ -65,6 +65,7 @@ class ProvenanceText(private val context: Context) {
         UnavailableReason.UNVALIDATED_FIRMWARE -> R.string.reason_unvalidated_firmware
         UnavailableReason.SIGNAL_ABSENT -> R.string.reason_signal_absent
         UnavailableReason.INSUFFICIENT_SAMPLES -> R.string.reason_insufficient_samples
+        UnavailableReason.SPEED_TOO_LOW -> R.string.reason_speed_too_low
         UnavailableReason.MODEL_NOT_TRAINED -> R.string.reason_model_not_trained
     }
 

app/src/main/java/com/evsuite/chargepilot/ProvenanceText.kt

@@ -228,9 +228,27 @@
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
-                        android:layout_marginStart="@dimen/spacing_sm">
-                        <TextView style="@style/Text.EV.ReadoutLabel" android:text="@string/label_consumption" />
-                        <TextView android:id="@+id/tripConsumptionValue" style="@style/Text.EV.ReadoutValue" />
+                        android:layout_marginStart="@dimen/spacing_sm"
+                        android:baselineAligned="false"
+                        android:orientation="horizontal">
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:orientation="vertical">
+                            <TextView style="@style/Text.EV.ReadoutLabel" android:text="@string/label_instant_consumption" />
+                            <TextView android:id="@+id/instantConsumptionValue" style="@style/Text.EV.TripValue" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:orientation="vertical">
+                            <TextView style="@style/Text.EV.ReadoutLabel" android:text="@string/label_trip_average_consumption" />
+                            <TextView android:id="@+id/tripConsumptionValue" style="@style/Text.EV.TripValue" />
+                        </LinearLayout>
                     </LinearLayout>
                 </LinearLayout>
             </LinearLayout>

app/src/main/res/layout/activity_main.xml

@@ -13,6 +13,8 @@
     <string name="label_outside_temp">EXTÉRIEUR</string>
     <string name="label_battery_temp">TEMP. BATTERIE</string>
     <string name="label_consumption">MOYENNE</string>
+    <string name="label_instant_consumption">INSTANTANÉE</string>
+    <string name="label_trip_average_consumption">MOYENNE TRAJET</string>
     <string name="label_current_trip">Trajet en cours</string>
     <string name="label_duration">ENREGISTRÉ</string>
     <string name="label_distance">DISTANCE</string>
@@ -59,6 +61,7 @@
     <string name="reason_unvalidated_firmware">le signal n\'est pas encore validé sur ce firmware</string>
     <string name="reason_signal_absent">le véhicule ne publie pas ce signal actuellement</string>
     <string name="reason_insufficient_samples">pas encore assez d\'échantillons</string>
+    <string name="reason_speed_too_low">la vitesse est trop faible pour une consommation stable rapportée à la distance</string>
     <string name="reason_model_not_trained">le modèle n\'a aucun ajustement pour prédire</string>
     <string name="diagnostics_provenance">Ce que vaut chaque valeur, et pourquoi elle manque</string>
     <string name="label_soc">État de charge</string>

app/src/main/res/values-fr/strings.xml

@@ -16,6 +16,8 @@
     <string name="label_outside_temp">OUTSIDE</string>
     <string name="label_battery_temp">BATTERY TEMP.</string>
     <string name="label_consumption">AVERAGE</string>
+    <string name="label_instant_consumption">INSTANT</string>
+    <string name="label_trip_average_consumption">TRIP AVERAGE</string>
     <string name="label_current_trip">Current trip</string>
     <string name="label_duration">RECORDED</string>
     <string name="label_distance">DISTANCE</string>
@@ -63,6 +65,7 @@
     <string name="reason_unvalidated_firmware">the signal is not yet validated on this firmware</string>
     <string name="reason_signal_absent">the vehicle is not publishing the signal right now</string>
     <string name="reason_insufficient_samples">not enough samples yet</string>
+    <string name="reason_speed_too_low">vehicle speed is too low for stable distance-normalized consumption</string>
     <string name="reason_model_not_trained">the model has no fit to predict from</string>
     <string name="diagnostics_provenance">What each reading is, and why it is missing</string>
     <string name="label_soc">State of charge</string>