From 864ac612dad89c1db035ed014aa2281b5e9378a9 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 11:38:00 +0200
Subject: [PATCH 01/79] Translate app UI from Turkish to English

Translates string resources, hardcoded layout text and user-facing
strings in Java sources (toasts, dialogs, status labels, upload log).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../com/evsuite/abrp/AbrpUploadService.java   |  4 +-
 .../com/evsuite/abrp/ChargingGraphView.java   |  4 +-
 .../evsuite/abrp/ConsumptionCloudClient.java  | 32 +++----
 .../java/com/evsuite/abrp/MainActivity.java   | 62 ++++++-------
 .../com/evsuite/abrp/WifiAutoConnect.java     | 12 +--
 app/src/main/res/layout/pane_charging.xml     | 28 +++---
 app/src/main/res/layout/pane_consumption.xml  | 40 ++++----
 app/src/main/res/values/strings.xml           | 92 +++++++++----------
 app/src/main/res/values/strings_design.xml    | 44 ++++-----
 .../java/com/evsuite/abrp/UpdateHook.java     |  2 +-
 .../java/com/evsuite/abrp/OtaUpdater.java     |  2 +-
 .../java/com/evsuite/abrp/UpdateHook.java     | 18 ++--
 12 files changed, 170 insertions(+), 170 deletions(-)

diff --git a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
index f8eb323..b4aa351 100644
--- a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
+++ b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
@@ -100,7 +100,7 @@ public class AbrpUploadService extends Service {
                 FIRST_UPLOAD_DELAY_SEC, UPLOAD_INTERVAL_SEC, TimeUnit.SECONDS);
 
         uploadLog.record(new UploadLog.Entry(System.currentTimeMillis(), 0, true,
-                "Tüketim servisi başlatıldı"));
+                "Consumption service started"));
         Log.i(TAG, "Service started, consumption tracking armed");
     }
 
@@ -159,7 +159,7 @@ public class AbrpUploadService extends Service {
             wifi.ensureConnected(false);
         }
 
-        updateNotification("Tüketim takibi aktif");
+        updateNotification("Consumption tracking active");
     }
 
     // ---------- Notification ----------
diff --git a/app/src/main/java/com/evsuite/abrp/ChargingGraphView.java b/app/src/main/java/com/evsuite/abrp/ChargingGraphView.java
index 9db5b47..acd99da 100644
--- a/app/src/main/java/com/evsuite/abrp/ChargingGraphView.java
+++ b/app/src/main/java/com/evsuite/abrp/ChargingGraphView.java
@@ -33,13 +33,13 @@ public final class ChargingGraphView extends View {
         invalidate();
     }
     synchronized String tableText() {
-        StringBuilder out = new StringBuilder("SOC       Şarj gücü\n");
+        StringBuilder out = new StringBuilder("SOC       Charge power\n");
         boolean found = false;
         for (int soc=0; soc<=100; soc++) if (!Float.isNaN(socPower[soc])) {
             found = true;
             out.append(String.format(Locale.getDefault(), "%3d %%      %6.1f kW\n", soc, socPower[soc]));
         }
-        return found ? out.toString().trim() : "Henüz şarj ölçümü yok";
+        return found ? out.toString().trim() : "No charging measurements yet";
     }
     @Override protected synchronized void onDraw(Canvas c) {
         super.onDraw(c); float left=58, right=getWidth()-12, top=12, bottom=getHeight()-38;
diff --git a/app/src/main/java/com/evsuite/abrp/ConsumptionCloudClient.java b/app/src/main/java/com/evsuite/abrp/ConsumptionCloudClient.java
index 118d938..4e855e2 100644
--- a/app/src/main/java/com/evsuite/abrp/ConsumptionCloudClient.java
+++ b/app/src/main/java/com/evsuite/abrp/ConsumptionCloudClient.java
@@ -79,7 +79,7 @@ final class ConsumptionCloudClient {
      * Every 30 minutes, takes a delta chunk from the tracker and sends it. Chunks that fail
      * to send (offline, server error) accumulate in a local cache and are retried on the
      * next cycle — so a drive through a dead-signal area still reaches the cloud once the
-     * head unit is back on the hotspot. Every attempt is logged to the in-app "Kayıtlar" tab.
+     * head unit is back on the hotspot. Every attempt is logged to the in-app "Logs" tab.
      *
      * @param nowMs wall clock, recorded with the payload — the throttle below runs on a
      *              monotonic clock instead, so a backwards NTP correction cannot stall
@@ -96,7 +96,7 @@ final class ConsumptionCloudClient {
         // Drain any cached chunks first — a backlog from an offline period has priority.
         int cached = drainChunkCache();
         if (cached > 0) {
-            logEvent(true, 200, "Cache boşaltıldı: " + cached + " chunk gönderildi");
+            logEvent(true, 200, "Cache drained: " + cached + " chunk(s) sent");
             invalidateHistory();
         }
 
@@ -115,14 +115,14 @@ final class ConsumptionCloudClient {
         try {
             JSONObject body = consumptionBody(chunk, nowMs);
             if (send("/v1/consumption/daily", "PUT", body)) {
-                logEvent(true, 200, "Chunk " + chunk.date + " gönderildi (+"
+                logEvent(true, 200, "Chunk " + chunk.date + " sent (+"
                         + String.format("%.1f", chunk.day.km) + "km, +"
                         + String.format("%.2f", chunk.day.kwh) + "kWh)");
                 invalidateHistory();
             } else {
                 cacheChunk(body);
                 int pending = pendingChunkCount();
-                logEvent(false, 0, "Chunk gönderilemedi — cache'de bekliyor (" + pending + " chunk)");
+                logEvent(false, 0, "Chunk not sent — waiting in cache (" + pending + " chunk(s))");
             }
         } catch (Exception e) {
             // Network failure: cache the chunk for the next cycle.
@@ -131,7 +131,7 @@ final class ConsumptionCloudClient {
                 cacheChunk(body);
             } catch (Exception ignored) { }
             int pending = pendingChunkCount();
-            logEvent(false, 0, "Çevrimdışı — cache'de bekliyor (" + pending + " chunk): " + e.getMessage());
+            logEvent(false, 0, "Offline — waiting in cache (" + pending + " chunk(s)): " + e.getMessage());
             Log.w(TAG, "Chunk sync failed, cached: " + e.getMessage());
         }
     }
@@ -190,7 +190,7 @@ final class ConsumptionCloudClient {
         return loadChunkCache().length();
     }
 
-    /** Records a cloud-sync attempt to the in-app log (the "Kayıtlar" tab). */
+    /** Records a cloud-sync attempt to the in-app log (the "Logs" tab). */
     private void logEvent(boolean success, int httpStatus, String detail) {
         UploadLog log = AbrpUploadService.log();
         if (log == null) return;
@@ -220,7 +220,7 @@ final class ConsumptionCloudClient {
         try {
             syncPendingCharges(charges, pending);
         } catch (Exception e) {
-            logEvent(false, 0, "Şarj session sync hatası: " + e.getMessage());
+            logEvent(false, 0, "Charging session sync error: " + e.getMessage());
             Log.w(TAG, "Charging-session sync unavailable: " + e.getMessage());
         }
     }
@@ -235,10 +235,10 @@ final class ConsumptionCloudClient {
             Log.i(TAG, "Uploading charge session: " + id);
             if (send("/v1/charging-sessions/" + id, "PUT", body)) {
                 charges.markUploaded(id);
-                logEvent(true, 200, "Şarj session gönderildi: " + id);
+                logEvent(true, 200, "Charging session sent: " + id);
                 Log.i(TAG, "Successfully uploaded charge session: " + id);
             } else {
-                logEvent(false, 0, "Şarj session gönderilemedi: " + id);
+                logEvent(false, 0, "Charging session not sent: " + id);
                 Log.w(TAG, "Failed to upload charge session: " + id);
                 return;
             }
@@ -310,11 +310,11 @@ final class ConsumptionCloudClient {
             List<DayRecord> fresh = fetchHistory();
             if (!fresh.isEmpty()) cachedHistory = fresh;
             Log.i(TAG, "Fetched " + fresh.size() + " history records from cloud");
-            logEvent(true, 200, "History çekildi: " + fresh.size() + " gün");
+            logEvent(true, 200, "History fetched: " + fresh.size() + " day(s)");
         } catch (Exception e) {
             String msg = e.getMessage() == null ? e.getClass().getSimpleName() : e.getMessage();
             Log.w(TAG, "History fetch unavailable: " + msg);
-            logEvent(false, 0, "History fetch hatası: " + msg);
+            logEvent(false, 0, "History fetch error: " + msg);
         }
     }
 
@@ -325,11 +325,11 @@ final class ConsumptionCloudClient {
 
     /**
      * Immediately attempts to send every cached chunk and take a fresh one, ignoring the
-     * 2-minute throttle. Called from the UI "Şimdi yükle" button. Returns a one-line
+     * 2-minute throttle. Called from the UI "Upload now" button. Returns a one-line
      * status for the log.
      */
     String flushNow(ConsumptionTracker tracker, long nowMs) {
-        if (endpoint.isEmpty() || token.isEmpty()) return "API yapılandırılmamış";
+        if (endpoint.isEmpty() || token.isEmpty()) return "API not configured";
         int cached = drainChunkCache();
         ConsumptionTracker.CloudSnapshot chunk = tracker.takeChunkDelta();
         int total = cached;
@@ -348,9 +348,9 @@ final class ConsumptionCloudClient {
         }
         int pending = pendingChunkCount();
         String msg = total > 0
-                ? total + " chunk yüklendi" + (pending > 0 ? ", " + pending + " hâlâ bekliyor" : "")
-                : (pending > 0 ? pending + " chunk yüklenemedi (internet?)" : "Yüklenecek yeni veri yok");
-        logEvent(total > 0, total > 0 ? 200 : 0, "Manuel sync: " + msg);
+                ? total + " chunk(s) uploaded" + (pending > 0 ? ", " + pending + " still pending" : "")
+                : (pending > 0 ? pending + " chunk(s) could not be uploaded (internet?)" : "No new data to upload");
+        logEvent(total > 0, total > 0 ? 200 : 0, "Manual sync: " + msg);
         return msg;
     }
 
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 530b3ed..475686c 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -363,9 +363,9 @@ public class MainActivity extends AppCompatActivity {
         String ssid = wifi.currentSsid();
         wifiSsid.setText(ssid == null ? getString(R.string.wifi_not_connected) : ssid);
         if (ssid != null) {
-            wifiState.setText("Bağlı ♥");
+            wifiState.setText("Connected ♥");
         } else if (!wifi.isWifiEnabled()) {
-            wifiState.setText("Wi-Fi kapalı");
+            wifiState.setText("Wi-Fi off");
         }
         // Left alone otherwise: a message the button just set says more about what is
         // happening than "not connected" would.
@@ -458,10 +458,10 @@ public class MainActivity extends AppCompatActivity {
         consumptionReset.setOnClickListener(v -> {
             if (consumptionPeriod != ConsumptionTracker.Period.TRIP_A && consumptionPeriod != ConsumptionTracker.Period.TRIP_B) return;
             String name = consumptionPeriod == ConsumptionTracker.Period.TRIP_A ? "Trip A" : "Trip B";
-            new MaterialAlertDialogBuilder(this).setTitle(name + " sıfırlansın mı?")
-                    .setMessage("Bu sayacın kayıtlı tüketim geçmişi kalıcı olarak silinir.")
-                    .setNegativeButton("Vazgeç", null)
-                    .setPositiveButton("Sıfırla", (d, w) -> {
+            new MaterialAlertDialogBuilder(this).setTitle("Reset " + name + "?")
+                    .setMessage("This counter's recorded consumption history will be permanently deleted.")
+                    .setNegativeButton("Cancel", null)
+                    .setPositiveButton("Reset", (d, w) -> {
                         consumptionTracker.reset(consumptionPeriod);
                         refreshConsumption();
                     }).show();
@@ -475,9 +475,9 @@ public class MainActivity extends AppCompatActivity {
             if (!consumptionTracker.setSohPercent(value)) throw new NumberFormatException();
             consumptionSohLayout.setError(null);
             consumptionSohInput.setText(String.format(java.util.Locale.US, "%.1f", value));
-            Toast.makeText(this, "SoH kaydedildi", Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, "SoH saved", Toast.LENGTH_SHORT).show();
         } catch (NumberFormatException e) {
-            consumptionSohLayout.setError("1 ile 100 arasında bir değer girin");
+            consumptionSohLayout.setError("Enter a value between 1 and 100");
         }
     }
 
@@ -533,9 +533,9 @@ public class MainActivity extends AppCompatActivity {
             if (!chargeSessionTracker.setPricePerKwh(value)) throw new NumberFormatException();
             chargePriceLayout.setError(null);
             chargePriceInput.setText(String.format(java.util.Locale.US, "%.2f", value));
-            Toast.makeText(this, "Şarj fiyatı kaydedildi", Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, "Charging price saved", Toast.LENGTH_SHORT).show();
         } catch (NumberFormatException e) {
-            chargePriceLayout.setError("Geçerli bir ₺/kWh değeri girin");
+            chargePriceLayout.setError("Enter a valid ₺/kWh value");
         }
     }
 
@@ -550,9 +550,9 @@ public class MainActivity extends AppCompatActivity {
         // below — which then describe the previous DC session — be read as this charge.
         boolean dc = ChargingState.isDcCharging(
                 code, s.getChargePortConnected(), s.getBatteryPowerKw(), s.getSpeedKmh());
-        chargeStatus.setText(dc ? "DC hızlı şarj"
-                : charging ? "AC şarj (ölçülmüyor)"
-                : (session.startedAtMs > 0 ? "Son şarj" : "Şarj yok"));
+        chargeStatus.setText(dc ? "DC fast charging"
+                : charging ? "AC charging (not metered)"
+                : (session.startedAtMs > 0 ? "Last charge" : "Not charging"));
         chargeSoc.setText(fmt(s.getSocPercent(), "%.1f %%"));
         chargeStartSoc.setText(fmt(session.startSocPercent, "%.1f %%"));
         chargeVoltage.setText(fmt(s.getBatteryVoltageV(), "%.1f V"));
@@ -586,20 +586,20 @@ public class MainActivity extends AppCompatActivity {
         consumptionSpeed.setText(t.hours <= 0 ? "—" : String.format(java.util.Locale.getDefault(),
                 "%.1f km/h", t.km / t.hours));
         long minutes = Math.round(t.hours * 60d);
-        consumptionTime.setText(String.format(java.util.Locale.getDefault(), "%d sa %02d dk",
+        consumptionTime.setText(String.format(java.util.Locale.getDefault(), "%d h %02d min",
                 minutes / 60, minutes % 60));
         consumptionSoc.setText(String.format(java.util.Locale.getDefault(), "%.1f %%", t.soc));
         // Daily history: cloud first, local fallback for today (not yet uploaded).
         ConsumptionTracker.Totals day = cloudDay(selectedConsumptionDate);
         if (day == null) day = consumptionTracker.totalsForDay(selectedConsumptionDate);
         if (day.km == 0 && day.kwh == 0 && day.hours == 0 && day.soc == 0) {
-            consumptionDailyHistory.setText("Bu tarih için kayıt yok");
+            consumptionDailyHistory.setText("No records for this date");
         } else {
             String average = day.km < 0.1 ? "—" : String.format(java.util.Locale.getDefault(),
                     "%.1f kWh/100 km", day.kwh * 100d / day.km);
             long dayMinutes = Math.round(day.hours * 60d);
             consumptionDailyHistory.setText(String.format(java.util.Locale.getDefault(),
-                    "Mesafe       %.1f km\nEnerji       %.2f kWh\nOrtalama     %s\nSüre         %d sa %02d dk\nSOC farkı    %.1f %%",
+                    "Distance     %.1f km\nEnergy       %.2f kWh\nAverage      %s\nDuration     %d h %02d min\nSOC change   %.1f %%",
                     day.km, day.kwh, average, dayMinutes / 60, dayMinutes % 60, day.soc));
         }
     }
@@ -666,17 +666,17 @@ public class MainActivity extends AppCompatActivity {
         Integer status = s.getChargingStatus();
         if (status != null) {
             switch (status) {
-                case 1:  return "AC şarj ♥";
-                case 10: return "DC hızlı şarj ♥";
-                case 5:  return "Bağlanıyor…";
-                case 7:  return "Kabloda, şarj yok";
-                case 8:  return "Durduruldu";
-                case 0:  return "Şarj yok";
-                default: return "Durum " + status;
+                case 1:  return "AC charging ♥";
+                case 10: return "DC fast charging ♥";
+                case 5:  return "Connecting…";
+                case 7:  return "Plugged in, not charging";
+                case 8:  return "Stopped";
+                case 0:  return "Not charging";
+                default: return "Status " + status;
             }
         }
         Boolean plugged = s.getChargePortConnected();
-        if (plugged != null) return plugged ? "Bağlı ♥" : "Bağlı değil";
+        if (plugged != null) return plugged ? "Connected ♥" : "Not connected";
         return "—";
     }
 
@@ -689,13 +689,13 @@ public class MainActivity extends AppCompatActivity {
     // ---------- Call log ----------
 
     /**
-     * "Şimdi yükle" button — forces a cache drain + fresh chunk on a background thread,
-     * ignoring the 2-minute throttle. The result lands in the upload log (Kayıtlar tab).
+     * "Upload now" button — forces a cache drain + fresh chunk on a background thread,
+     * ignoring the 2-minute throttle. The result lands in the upload log (Logs tab).
      */
     private void manualFlush() {
         if (consumptionCloudClient == null || consumptionTracker == null) return;
         AbrpUploadService.log().record(new UploadLog.Entry(
-                System.currentTimeMillis(), 0, true, "Manuel sync başlatıldı…"));
+                System.currentTimeMillis(), 0, true, "Manual sync started…"));
         new Thread(() -> {
             String result = consumptionCloudClient.flushNow(
                     consumptionTracker, System.currentTimeMillis());
@@ -704,19 +704,19 @@ public class MainActivity extends AppCompatActivity {
     }
 
     /**
-     * Tüketim sekmesi "Yenile" button — sends cached chunks + fresh delta, invalidates the
+     * Consumption tab "Refresh" button — sends cached chunks + fresh delta, invalidates the
      * history cache so the next poll fetches fresh data from the cloud, then refreshes the UI.
      */
     private void refreshFromCloud() {
         if (consumptionCloudClient == null || consumptionTracker == null) return;
         AbrpUploadService.log().record(new UploadLog.Entry(
-                System.currentTimeMillis(), 0, true, "Tüketim yenileniyor…"));
+                System.currentTimeMillis(), 0, true, "Refreshing consumption…"));
         new Thread(() -> {
             consumptionCloudClient.flushNow(consumptionTracker, System.currentTimeMillis());
             consumptionCloudClient.invalidateHistory();
             runOnUiThread(() -> {
                 refreshConsumption();
-                Toast.makeText(this, "Tüketim yenilendi", Toast.LENGTH_SHORT).show();
+                Toast.makeText(this, "Consumption refreshed", Toast.LENGTH_SHORT).show();
             });
         }, "cloud-refresh").start();
     }
@@ -764,7 +764,7 @@ public class MainActivity extends AppCompatActivity {
                 break;
             case RUNNING:
             case STARTING:
-                statusText.setText("Tüketim takibi aktif");
+                statusText.setText("Consumption tracking active");
                 statusText.setTextColor(COLOR_OK);
                 break;
             case STOPPED:
diff --git a/app/src/main/java/com/evsuite/abrp/WifiAutoConnect.java b/app/src/main/java/com/evsuite/abrp/WifiAutoConnect.java
index 5e89f8b..9228a75 100644
--- a/app/src/main/java/com/evsuite/abrp/WifiAutoConnect.java
+++ b/app/src/main/java/com/evsuite/abrp/WifiAutoConnect.java
@@ -150,14 +150,14 @@ final class WifiAutoConnect {
             this.message = message;
         }
 
-        static Result alreadyOn(String ssid) { return new Result(true, ssid, "Bağlı: " + ssid); }
-        static Result attempting(String ssid) { return new Result(false, ssid, "Bağlanılıyor: " + ssid); }
+        static Result alreadyOn(String ssid) { return new Result(true, ssid, "Connected: " + ssid); }
+        static Result attempting(String ssid) { return new Result(false, ssid, "Connecting: " + ssid); }
 
-        static final Result UNSUPPORTED = new Result(false, null, "Wi-Fi yönetilemiyor");
+        static final Result UNSUPPORTED = new Result(false, null, "Wi-Fi cannot be managed");
         static final Result WAITING = new Result(false, null, "Bekleniyor…");
-        static final Result ENABLING = new Result(false, null, "Wi-Fi açılıyor…");
-        static final Result CANNOT_ENABLE = new Result(false, null, "Wi-Fi açılamadı");
-        static final Result NO_SAVED_NETWORKS = new Result(false, null, "Kayıtlı ağ yok");
+        static final Result ENABLING = new Result(false, null, "Turning Wi-Fi on…");
+        static final Result CANNOT_ENABLE = new Result(false, null, "Could not turn Wi-Fi on");
+        static final Result NO_SAVED_NETWORKS = new Result(false, null, "No saved networks");
         static final Result REFUSED = new Result(false, null, "Sistem izin vermedi");
     }
 }
diff --git a/app/src/main/res/layout/pane_charging.xml b/app/src/main/res/layout/pane_charging.xml
index 4d561aa..ce2c3f0 100644
--- a/app/src/main/res/layout/pane_charging.xml
+++ b/app/src/main/res/layout/pane_charging.xml
@@ -2,30 +2,30 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true">
  <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp">
   <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:background="@drawable/bg_glass">
-   <TextView android:id="@+id/charge_status" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="Şarj yok" android:textAppearance="@style/Text.EV.Title" android:textColor="@color/ev_cyan"/>
+   <TextView android:id="@+id/charge_status" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="Not charging" android:textAppearance="@style/Text.EV.Title" android:textColor="@color/ev_cyan"/>
    <GridLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:columnCount="2" android:layout_marginTop="12dp">
     <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="SOC" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_soc" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
-    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Başlangıç SOC" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_start_soc" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
-    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Batarya voltajı" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_voltage" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
-    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Batarya akımı" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_current" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
-    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Şarj gücü" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_power" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
-    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Bataryaya giren net enerji" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_energy" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
-    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Şebekeden alınan (+%10)" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_grid_energy" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
-    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Şarj süresi" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_duration" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
-    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Toplam ücret" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_total_cost" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
+    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Start SOC" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_start_soc" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
+    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Battery voltage" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_voltage" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
+    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Battery current" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_current" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
+    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Charging power" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_power" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
+    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Net energy into battery" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_energy" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
+    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Drawn from grid (+10%)" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_grid_energy" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
+    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Charging time" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_duration" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
+    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Total cost" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_total_cost" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
    </GridLayout>
   </LinearLayout>
   <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:layout_marginTop="16dp" android:background="@drawable/bg_glass">
-   <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="ŞARJ FİYATI" android:textAppearance="@style/Text.EV.Eyebrow"/>
-   <com.google.android.material.textfield.TextInputLayout android:id="@+id/charge_price_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="Birim fiyat" app:suffixText="₺/kWh">
+   <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="CHARGING PRICE" android:textAppearance="@style/Text.EV.Eyebrow"/>
+   <com.google.android.material.textfield.TextInputLayout android:id="@+id/charge_price_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="Unit price" app:suffixText="₺/kWh">
     <com.google.android.material.textfield.TextInputEditText android:id="@+id/charge_price_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="10" android:minHeight="72dp"/>
    </com.google.android.material.textfield.TextInputLayout>
-   <com.google.android.material.button.MaterialButton android:id="@+id/charge_price_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="Fiyatı kaydet"/>
+   <com.google.android.material.button.MaterialButton android:id="@+id/charge_price_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="Save price"/>
   </LinearLayout>
   <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:layout_marginTop="16dp" android:background="@drawable/bg_glass">
-   <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="ŞARJ EĞRİSİ" android:textAppearance="@style/Text.EV.Eyebrow"/>
+   <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="CHARGING CURVE" android:textAppearance="@style/Text.EV.Eyebrow"/>
    <com.evsuite.abrp.ChargingGraphView android:id="@+id/charge_graph" android:layout_width="match_parent" android:layout_height="280dp" android:layout_marginTop="12dp"/>
-   <TextView android:id="@+id/charge_curve_table" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:fontFamily="monospace" android:text="Henüz şarj ölçümü yok" android:textAppearance="@style/Text.EV.Body" android:textColor="@color/ev_cyan"/>
+   <TextView android:id="@+id/charge_curve_table" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:fontFamily="monospace" android:text="No charging measurements yet" android:textAppearance="@style/Text.EV.Body" android:textColor="@color/ev_cyan"/>
   </LinearLayout>
  </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/pane_consumption.xml b/app/src/main/res/layout/pane_consumption.xml
index bb614af..da37318 100644
--- a/app/src/main/res/layout/pane_consumption.xml
+++ b/app/src/main/res/layout/pane_consumption.xml
@@ -3,41 +3,41 @@
   <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp">
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:background="@drawable/bg_glass">
       <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical">
-        <TextView android:layout_width="0dp" android:layout_weight="1" android:layout_height="wrap_content" android:text="TÜKETİM DÖNEMİ" android:textAppearance="@style/Text.EV.Eyebrow"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_refresh" style="@style/Widget.EV.Button.Outlined" android:layout_width="48dp" android:layout_height="48dp" android:minWidth="0dp" android:padding="0dp" android:contentDescription="Yenile" app:icon="@drawable/ic_refresh" app:iconGravity="textStart" app:iconPadding="0dp" app:iconTint="@color/ev_accent"/>
+        <TextView android:layout_width="0dp" android:layout_weight="1" android:layout_height="wrap_content" android:text="CONSUMPTION PERIOD" android:textAppearance="@style/Text.EV.Eyebrow"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_refresh" style="@style/Widget.EV.Button.Outlined" android:layout_width="48dp" android:layout_height="48dp" android:minWidth="0dp" android:padding="0dp" android:contentDescription="Refresh" app:icon="@drawable/ic_refresh" app:iconGravity="textStart" app:iconPadding="0dp" app:iconTint="@color/ev_accent"/>
       </LinearLayout>
       <HorizontalScrollView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:scrollbars="none">
        <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal">
-        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_lifetime" style="@style/Widget.EV.Button.Outlined" android:layout_width="wrap_content" android:layout_height="56dp" android:text="Tüm zamanlar"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_week" style="@style/Widget.EV.Button.Outlined" android:layout_width="wrap_content" android:layout_height="56dp" android:layout_marginStart="8dp" android:text="Son 7 gün"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_month" style="@style/Widget.EV.Button.Outlined" android:layout_width="wrap_content" android:layout_height="56dp" android:layout_marginStart="8dp" android:text="Son 30 gün"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_lifetime" style="@style/Widget.EV.Button.Outlined" android:layout_width="wrap_content" android:layout_height="56dp" android:text="Lifetime"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_week" style="@style/Widget.EV.Button.Outlined" android:layout_width="wrap_content" android:layout_height="56dp" android:layout_marginStart="8dp" android:text="Last 7 days"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_month" style="@style/Widget.EV.Button.Outlined" android:layout_width="wrap_content" android:layout_height="56dp" android:layout_marginStart="8dp" android:text="Last 30 days"/>
         <com.google.android.material.button.MaterialButton android:id="@+id/consumption_trip_a" style="@style/Widget.EV.Button.Outlined" android:layout_width="wrap_content" android:layout_height="56dp" android:layout_marginStart="8dp" android:text="Trip A"/>
         <com.google.android.material.button.MaterialButton android:id="@+id/consumption_trip_b" style="@style/Widget.EV.Button.Outlined" android:layout_width="wrap_content" android:layout_height="56dp" android:layout_marginStart="8dp" android:text="Trip B"/>
        </LinearLayout>
       </HorizontalScrollView>
       <GridLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:columnCount="2">
-        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="Mesafe" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_distance" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="—" android:textAppearance="@style/DataValue"/>
-        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="Net enerji" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_energy" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="—" android:textAppearance="@style/DataValue"/>
-        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="Ortalama tüketim" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_average" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="—" android:textAppearance="@style/DataValue"/>
-        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="Ortalama hız" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_speed" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="—" android:textAppearance="@style/DataValue"/>
-        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="Süre" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_time" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="—" android:textAppearance="@style/DataValue"/>
-        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="SOC farkı" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_soc" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="—" android:textAppearance="@style/DataValue"/>
+        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="Distance" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_distance" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="—" android:textAppearance="@style/DataValue"/>
+        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="Net energy" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_energy" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="—" android:textAppearance="@style/DataValue"/>
+        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="Average consumption" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_average" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="—" android:textAppearance="@style/DataValue"/>
+        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="Average speed" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_speed" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="—" android:textAppearance="@style/DataValue"/>
+        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="Duration" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_time" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="—" android:textAppearance="@style/DataValue"/>
+        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="SOC change" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_soc" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="—" android:textAppearance="@style/DataValue"/>
       </GridLayout>
-      <com.google.android.material.button.MaterialButton android:id="@+id/consumption_reset" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginTop="12dp" android:text="Seçili tripi sıfırla" android:visibility="gone"/>
+      <com.google.android.material.button.MaterialButton android:id="@+id/consumption_reset" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginTop="12dp" android:text="Reset selected trip" android:visibility="gone"/>
     </LinearLayout>
-    <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:text="Son 7/30 gün, tüm zamanlar ve Trip A/B cihazda kalıcı saklanır; uygulama ve OTA güncellemeleriyle silinmez." android:textAppearance="@style/Text.EV.Secondary"/>
+    <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:text="Last 7/30 days, lifetime and Trip A/B are stored permanently on the device; app and OTA updates do not erase them." android:textAppearance="@style/Text.EV.Secondary"/>
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:layout_marginTop="16dp" android:background="@drawable/bg_glass">
-      <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="BATARYA SAĞLIĞI (SOH)" android:textAppearance="@style/Text.EV.Eyebrow"/>
-      <com.google.android.material.textfield.TextInputLayout android:id="@+id/consumption_soh_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="Manuel SoH (%)" app:suffixText="%">
+      <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="BATTERY HEALTH (SOH)" android:textAppearance="@style/Text.EV.Eyebrow"/>
+      <com.google.android.material.textfield.TextInputLayout android:id="@+id/consumption_soh_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="Manual SoH (%)" app:suffixText="%">
         <com.google.android.material.textfield.TextInputEditText android:id="@+id/consumption_soh_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="5" android:minHeight="72dp"/>
       </com.google.android.material.textfield.TextInputLayout>
-      <com.google.android.material.button.MaterialButton android:id="@+id/consumption_soh_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="SoH değerini kaydet"/>
-      <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="Bu manuel değer cihazda saklanır ve MongoDB'deki tüm zamanlar kaydına eklenir." android:textAppearance="@style/Text.EV.Secondary"/>
+      <com.google.android.material.button.MaterialButton android:id="@+id/consumption_soh_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="Save SoH value"/>
+      <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="This manual value is stored on the device and added to the lifetime record in MongoDB." android:textAppearance="@style/Text.EV.Secondary"/>
     </LinearLayout>
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:layout_marginTop="16dp" android:background="@drawable/bg_glass">
-      <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="GÜNLÜK KAYIT · SON 4 AY" android:textAppearance="@style/Text.EV.Eyebrow"/>
-      <com.google.android.material.button.MaterialButton android:id="@+id/consumption_date_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="56dp" android:layout_marginTop="12dp" android:text="Tarih seç"/>
-      <TextView android:id="@+id/consumption_daily_history" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:fontFamily="monospace" android:text="Henüz günlük veri yok" android:textAppearance="@style/Text.EV.Body" android:textColor="@color/ev_cyan"/>
+      <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="DAILY LOG · LAST 4 MONTHS" android:textAppearance="@style/Text.EV.Eyebrow"/>
+      <com.google.android.material.button.MaterialButton android:id="@+id/consumption_date_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="56dp" android:layout_marginTop="12dp" android:text="Pick a date"/>
+      <TextView android:id="@+id/consumption_daily_history" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:fontFamily="monospace" android:text="No daily data yet" android:textAppearance="@style/Text.EV.Body" android:textColor="@color/ev_cyan"/>
     </LinearLayout>
   </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 194577a..be15a7f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,45 +3,45 @@
 
     <!-- Main screen -->
     <string name="tab_abrp">ABRP</string>
-    <string name="tab_service">Aktarım</string>
-    <string name="tab_vehicle">Genel</string>
-    <string name="tab_consumption">Tüketim</string>
-    <string name="tab_charging">Şarj</string>
-    <string name="consumption_title">Tüketim</string>
-    <string name="consumption_subtitle">Başlangıç, motor, tüm zamanlar ve trip sayaçları</string>
-    <string name="charging_title">Şarj</string>
-    <string name="charging_subtitle">Canlı batarya değerleri ve SOC/güç eğrisi</string>
+    <string name="tab_service">Upload</string>
+    <string name="tab_vehicle">Overview</string>
+    <string name="tab_consumption">Consumption</string>
+    <string name="tab_charging">Charging</string>
+    <string name="consumption_title">Consumption</string>
+    <string name="consumption_subtitle">Since start, motor, lifetime and trip counters</string>
+    <string name="charging_title">Charging</string>
+    <string name="charging_subtitle">Live battery values and SOC/power curve</string>
     <string name="tab_wifi">Wi-Fi</string>
-    <string name="tab_log">Kayıtlar</string>
+    <string name="tab_log">Logs</string>
 
     <!-- Wi-Fi page -->
-    <string name="wifi_card_title">Wi-Fi Bağlantısı</string>
-    <string name="wifi_current">Bağlı ağ</string>
-    <string name="wifi_state">Durum</string>
-    <string name="wifi_connect_now">Şimdi Bağlan</string>
-    <string name="wifi_auto_label">Arka planda otomatik bağlan</string>
-    <string name="wifi_auto_hint">Yükleme servisi çalışırken bağlantı koptuğunda kayıtlı ağlara kendi kendine bağlanmayı dener.</string>
-    <string name="wifi_saved_title">Kayıtlı Ağlar</string>
-    <string name="wifi_saved_empty">Kayıtlı ağ okunamadı</string>
-    <string name="wifi_not_connected">Bağlı değil</string>
+    <string name="wifi_card_title">Wi-Fi Connection</string>
+    <string name="wifi_current">Connected network</string>
+    <string name="wifi_state">Status</string>
+    <string name="wifi_connect_now">Connect Now</string>
+    <string name="wifi_auto_label">Auto-connect in the background</string>
+    <string name="wifi_auto_hint">While the upload service is running, it tries to reconnect to saved networks on its own when the connection drops.</string>
+    <string name="wifi_saved_title">Saved Networks</string>
+    <string name="wifi_saved_empty">Could not read saved networks</string>
+    <string name="wifi_not_connected">Not connected</string>
 
     <!-- Vehicle page -->
-    <string name="vehicle_live_data">Canlı Araç Verileri</string>
-    <string name="vehicle_tires">Lastik Basınçları</string>
-    <string name="vehicle_row_soc">Şarj (SOC)</string>
-    <string name="vehicle_row_range">Menzil</string>
-    <string name="vehicle_row_power">Güç</string>
-    <string name="vehicle_row_speed">Hız</string>
-    <string name="vehicle_row_odometer">Kilometre</string>
-    <string name="vehicle_row_batt_temp">Batarya Sıcaklığı</string>
-    <string name="vehicle_row_cabin_temp">Kabin Sıcaklığı</string>
-    <string name="vehicle_row_hvac">Klima Ayarı</string>
-    <string name="vehicle_row_capacity">Batarya Kapasitesi</string>
-    <string name="vehicle_row_charging">Şarj Durumu</string>
-    <string name="vehicle_tire_fl">Ön Sol</string>
-    <string name="vehicle_tire_fr">Ön Sağ</string>
-    <string name="vehicle_tire_rl">Arka Sol</string>
-    <string name="vehicle_tire_rr">Arka Sağ</string>
+    <string name="vehicle_live_data">Live Vehicle Data</string>
+    <string name="vehicle_tires">Tire Pressures</string>
+    <string name="vehicle_row_soc">Charge (SOC)</string>
+    <string name="vehicle_row_range">Range</string>
+    <string name="vehicle_row_power">Power</string>
+    <string name="vehicle_row_speed">Speed</string>
+    <string name="vehicle_row_odometer">Odometer</string>
+    <string name="vehicle_row_batt_temp">Battery Temperature</string>
+    <string name="vehicle_row_cabin_temp">Cabin Temperature</string>
+    <string name="vehicle_row_hvac">Climate Setpoint</string>
+    <string name="vehicle_row_capacity">Battery Capacity</string>
+    <string name="vehicle_row_charging">Charging Status</string>
+    <string name="vehicle_tire_fl">Front Left</string>
+    <string name="vehicle_tire_fr">Front Right</string>
+    <string name="vehicle_tire_rl">Rear Left</string>
+    <string name="vehicle_tire_rr">Rear Right</string>
     <string name="card_config">Configuration</string>
     <string name="hint_api_key">ABRP API Key</string>
     <string name="default_abrp_api_key" translatable="false">8cfc314b-03cd-4efe-ab7d-4431cd8f2e2d</string>
@@ -51,9 +51,9 @@
     <string name="helper_token">Find your token in the ABRP app: Settings → Connections → Generic (Manual Entry)</string>
     <string name="desc_toggle_api_key">Show or hide API key</string>
     <string name="desc_toggle_token">Show or hide user token</string>
-    <string name="btn_save">Kaydet</string>
-    <string name="btn_test">Bağlantıyı test et</string>
-    <string name="btn_import">Dosyadan al</string>
+    <string name="btn_save">Save</string>
+    <string name="btn_test">Test connection</string>
+    <string name="btn_import">Import from file</string>
 
     <!-- Config file import -->
     <string name="import_ok">Config imported — press Test to verify</string>
@@ -107,7 +107,7 @@
     <!-- Call log -->
     <string name="label_call_log">Recent uploads</string>
     <string name="call_log_empty">No upload attempted yet.</string>
-    <string name="btn_flush_now">Şimdi yükle</string>
+    <string name="btn_flush_now">Upload now</string>
     <string name="status_starting">Starting…</string>
     <string name="status_running_no_upload">Running — waiting for first upload</string>
     <string name="status_last_upload">Last upload: %1$s (%2$s)</string>
@@ -118,15 +118,15 @@
     <string name="notif_channel_desc">Shows vehicle telemetry upload status</string>
     <string name="notif_title">ABRP Uploader</string>
     <string name="notif_action_stop">Stop</string>
-    <string name="ota_install_success">Güncelleme kuruldu — uygulamayı yeniden başlatın</string>
-    <string name="ota_install_failed">Kurulum başarısız: %1$s</string>
-    <string name="update_check">Güncelleme kontrol et</string>
-    <string name="update_checking">Yeni OTA sürümü kontrol ediliyor…</string>
-    <string name="update_dialog_title">Yazılım güncellemesi</string>
-    <string name="update_downloading">İndiriliyor ve doğrulanıyor…</string>
-    <string name="update_downloading_percent">İndiriliyor… %1$d%%</string>
+    <string name="ota_install_success">Update installed — restart the app</string>
+    <string name="ota_install_failed">Installation failed: %1$s</string>
+    <string name="update_check">Check for updates</string>
+    <string name="update_checking">Checking for a new OTA version…</string>
+    <string name="update_dialog_title">Software update</string>
+    <string name="update_downloading">Downloading and verifying…</string>
+    <string name="update_downloading_percent">Downloading… %1$d%%</string>
     <string name="about_action">About</string>
-    <string name="about_title">Fatih\'sMG4 Hakkında</string>
+    <string name="about_title">About Fatih\'sMG4</string>
     <string name="about_version">Version %1$s</string>
     <string name="about_attribution">Fork of malys / EVABRPUploader\nand Leon Kernan / ABRP_Uploader</string>
     <string name="about_repository">github.com/fatihdonmezdev/FatihsMG4</string>
diff --git a/app/src/main/res/values/strings_design.xml b/app/src/main/res/values/strings_design.xml
index 8564ab9..161df82 100644
--- a/app/src/main/res/values/strings_design.xml
+++ b/app/src/main/res/values/strings_design.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0"?>
 <resources>
-  <string name="design_battery_short">Batarya</string>
+  <string name="design_battery_short">Battery</string>
   <string name="design_probe">VHAL Probe</string>
   <string name="design_brand">MG&#x2074;</string>
   <string name="design_brand_caption">Fatih&#x2019;s MG4</string>
-  <string name="design_brand_footer">ELEKTR&#x130;KLE YOLDA</string>
-  <string name="design_overview_title">S&#xFC;r&#xFC;&#x15F;e bir bak&#x131;&#x15F;.</string>
-  <string name="design_overview_subtitle">Arac&#x131;ndan gelen veriler, tek bir yerde.</string>
-  <string name="design_abrp_title">Rotana ba&#x11F;lan.</string>
-  <string name="design_abrp_subtitle">ABRP hesab&#x131;nla arac&#x131;n&#x131; bulu&#x15F;tur.</string>
-  <string name="design_service_title">Sen yola odaklan.</string>
-  <string name="design_service_subtitle">Verilerin arka planda g&#xFC;ncel kals&#x131;n.</string>
-  <string name="design_wifi_title">Ba&#x11F;lant&#x131;da kal.</string>
-  <string name="design_wifi_subtitle">Yolculu&#x11F;unun internet ba&#x11F;lant&#x131;s&#x131;.</string>
-  <string name="design_log_title">Her aktar&#x131;m, burada.</string>
-  <string name="design_log_subtitle">Son g&#xF6;nderimlerin durumu ve ayr&#x131;nt&#x131;lar&#x131;.</string>
-  <string name="design_battery">BATARYA</string>
-  <string name="design_energy">ENERJ&#x130; VE SICAKLIK</string>
-  <string name="design_tires">LAST&#x130;K BASIN&#xC7;LARI</string>
-  <string name="design_account">HESAP BA&#x11E;LANTISI</string>
-  <string name="design_private_title">Sana &#xF6;zel ba&#x11F;lant&#x131;.</string>
-  <string name="design_private_body">Token, arac&#x131;n&#x131; ABRP hesab&#x131;na ba&#x11F;lar. Bilgilerin bu cihazda &#x15F;ifreli saklan&#x131;r.</string>
-  <string name="design_no_data">Okunamayan veriler &#x2014; olarak g&#xF6;sterilir.</string>
-  <string name="design_service_controls">AKTARIM KONTROL&#xDC;</string>
-  <string name="design_service_timing">G&#xDC;NCELLEME SIKLI&#x11E;I</string>
-  <string name="design_car_desc">Lastik bas&#x131;n&#xE7;lar&#x131;n&#x131;n ara&#xE7; &#xFC;zerindeki konumlar&#x131;</string>
+  <string name="design_brand_footer">ON THE ROAD, ELECTRIC</string>
+  <string name="design_overview_title">Your drive at a glance.</string>
+  <string name="design_overview_subtitle">Data from your car, all in one place.</string>
+  <string name="design_abrp_title">Connect to your route.</string>
+  <string name="design_abrp_subtitle">Link your car with your ABRP account.</string>
+  <string name="design_service_title">You focus on the road.</string>
+  <string name="design_service_subtitle">Your data stays up to date in the background.</string>
+  <string name="design_wifi_title">Stay connected.</string>
+  <string name="design_wifi_subtitle">The internet connection for your journey.</string>
+  <string name="design_log_title">Every upload, right here.</string>
+  <string name="design_log_subtitle">Status and details of recent uploads.</string>
+  <string name="design_battery">BATTERY</string>
+  <string name="design_energy">ENERGY AND TEMPERATURE</string>
+  <string name="design_tires">TIRE PRESSURES</string>
+  <string name="design_account">ACCOUNT LINK</string>
+  <string name="design_private_title">Your private connection.</string>
+  <string name="design_private_body">The token links your car to your ABRP account. Your credentials are stored encrypted on this device.</string>
+  <string name="design_no_data">Values that cannot be read are shown as &#x2014;.</string>
+  <string name="design_service_controls">UPLOAD CONTROL</string>
+  <string name="design_service_timing">UPDATE FREQUENCY</string>
+  <string name="design_car_desc">Tire pressure positions on the vehicle</string>
 </resources>
diff --git a/app/src/stable/java/com/evsuite/abrp/UpdateHook.java b/app/src/stable/java/com/evsuite/abrp/UpdateHook.java
index ed29e05..c6745a2 100644
--- a/app/src/stable/java/com/evsuite/abrp/UpdateHook.java
+++ b/app/src/stable/java/com/evsuite/abrp/UpdateHook.java
@@ -27,7 +27,7 @@ final class UpdateHook {
 
     /** Answers immediately that this channel does not self-update. */
     static void checkInBackground(Context context, Listener listener) {
-        if (listener != null) listener.onResult("Bu sürümde otomatik güncelleme yok");
+        if (listener != null) listener.onResult("This build has no automatic updates");
     }
 
     static boolean isSupported() { return false; }
diff --git a/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java b/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java
index b180804..9d09aa7 100644
--- a/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java
+++ b/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java
@@ -359,7 +359,7 @@ final class OtaUpdater {
         try {
             DownloadManager.Request request = new DownloadManager.Request(Uri.parse(update.apkUrl))
                     .setTitle("FatihsMG4 " + update.versionName)
-                    .setDescription("Güncelleme indiriliyor")
+                    .setDescription("Downloading update")
                     .setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
                     .setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, publicName)
                     .setAllowedOverMetered(true)
diff --git a/app/src/unstable/java/com/evsuite/abrp/UpdateHook.java b/app/src/unstable/java/com/evsuite/abrp/UpdateHook.java
index 8629c21..a335a1e 100644
--- a/app/src/unstable/java/com/evsuite/abrp/UpdateHook.java
+++ b/app/src/unstable/java/com/evsuite/abrp/UpdateHook.java
@@ -50,7 +50,7 @@ final class UpdateHook {
                 if (update != null && update.hashUrl != null)
                     new android.os.Handler(android.os.Looper.getMainLooper())
                             .post(() -> android.widget.Toast.makeText(app,
-                                "Güncelleme hazır: " + update.versionName,
+                                "Update available: " + update.versionName,
                                 android.widget.Toast.LENGTH_LONG).show());
             } catch (Throwable t) {
                 Log.w(TAG, "Startup update check failed", t);
@@ -69,7 +69,7 @@ final class UpdateHook {
         Context app = context.getApplicationContext();
         android.os.Handler main = new android.os.Handler(android.os.Looper.getMainLooper());
         if (!checking.compareAndSet(false, true)) {
-            if (listener != null) main.post(() -> listener.onResult("Güncelleme kontrolü zaten sürüyor"));
+            if (listener != null) main.post(() -> listener.onResult("Update check already in progress"));
             return;
         }
         new Thread(() -> {
@@ -78,7 +78,7 @@ final class UpdateHook {
                 message = runCheck(app, listener, main);
             } catch (Throwable t) {
                 Log.w(TAG, "Update check threw", t);
-                message = "Güncelleme kontrolü başarısız";
+                message = "Update check failed";
             } finally {
                 checking.set(false);
             }
@@ -97,11 +97,11 @@ final class UpdateHook {
             current = app.getPackageManager()
                     .getPackageInfo(app.getPackageName(), 0).versionName;
         } catch (Exception e) {
-            return "Sürüm okunamadı";
+            return "Could not read version";
         }
 
         OtaUpdater.Update update = OtaUpdater.check(current);
-        if (update == null) return "Güncel (" + current + ")";
+        if (update == null) return "Up to date (" + current + ")";
 
         Log.i(TAG, "Update available: " + update.versionName);
         String expectedHash;
@@ -109,16 +109,16 @@ final class UpdateHook {
             expectedHash = OtaUpdater.fetchExpectedSha256(update);
         } catch (IOException e) {
             Log.w(TAG, "OTA hash unavailable", e);
-            return "Güncelleme reddedildi: SHA-256 doğrulaması yok";
+            return "Update refused: no SHA-256 verification";
         }
         File apk = OtaUpdater.download(app, update, expectedHash, percent -> {
             if (listener != null) main.post(() -> listener.onProgress(percent));
         });
-        if (apk == null) return "İndirme veya SHA-256 doğrulaması başarısız ("
+        if (apk == null) return "Download or SHA-256 verification failed ("
                 + update.versionName + ")";
 
         if (!OtaUpdater.openDownloads(app))
-            return "APK Downloads'a indirildi; dosya yöneticisi açılamadı";
-        return update.versionName + ".apk Downloads'a indirildi — dosyaya dokunup kurun";
+            return "APK downloaded to Downloads; could not open the file manager";
+        return update.versionName + ".apk downloaded to Downloads — tap the file to install";
     }
 }

From bac887bfa689e386c8f91d79be7270c16dc72f0e Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 11:46:37 +0200
Subject: [PATCH 02/79] Add Nix flake dev shell for building on NixOS

Provides JDK 21 and an Android SDK (platforms 36/36.1, build-tools
36.0.0) via `nix develop`. Points AGP at the SDK's aapt2 and Gradle at
the Nix JDK, since the binaries they would otherwise download do not
run on NixOS.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 flake.lock | 27 +++++++++++++++++++++++
 flake.nix  | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 flake.lock
 create mode 100644 flake.nix

diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..bb38431
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1791956154,
+        "narHash": "sha256-jBYGPi4udQ9uo4KQp9m2J0546nJVQitG15gvZSaVVAs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "55bfb4d7437bd4e09ab7cba58a43bd68eb310044",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..9544b6c
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,64 @@
+{
+  description = "FatihsMG4 — Android Automotive build environment";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  };
+
+  outputs = { self, nixpkgs }:
+    let
+      systems = [ "x86_64-linux" "aarch64-linux" ];
+      forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f (import nixpkgs {
+        inherit system;
+        config = {
+          allowUnfree = true;
+          android_sdk.accept_license = true;
+        };
+      }));
+
+      # Must match app/build.gradle (compileSdk 36.1) and EVHardware/lib (compileSdk 36).
+      buildToolsVersion = "36.0.0";
+    in
+    {
+      devShells = forAllSystems (pkgs:
+        let
+          android = pkgs.androidenv.composeAndroidPackages {
+            platformVersions = [ "36" "36.1" ];
+            buildToolsVersions = [ buildToolsVersion ];
+            includeEmulator = false;
+            includeNDK = false;
+            includeSources = false;
+            includeSystemImages = false;
+          };
+          sdk = "${android.androidsdk}/libexec/android-sdk";
+          # gradle/gradle-daemon-jvm.properties pins the daemon to JDK 21.
+          jdk = pkgs.jdk21;
+        in
+        {
+          default = pkgs.mkShell {
+            packages = [ jdk android.androidsdk ];
+
+            ANDROID_HOME = sdk;
+            ANDROID_SDK_ROOT = sdk;
+            JAVA_HOME = jdk.home;
+
+            # AGP otherwise downloads an aapt2 binary from Maven, which is dynamically linked
+            # against a generic FHS and does not run on NixOS. Use the SDK's patched one.
+            # Gradle is also pointed at the Nix JDK so the daemon toolchain criteria are met
+            # locally instead of downloading a (non-NixOS) JDK through foojay.
+            GRADLE_OPTS = builtins.concatStringsSep " " [
+              "-Dorg.gradle.project.android.aapt2FromMavenOverride=${sdk}/build-tools/${buildToolsVersion}/aapt2"
+              "-Dorg.gradle.java.installations.paths=${jdk.home}"
+              "-Dorg.gradle.java.installations.auto-download=false"
+            ];
+
+            shellHook = ''
+              echo "sdk.dir=$ANDROID_HOME" > local.properties
+              echo "FatihsMG4 dev shell — JDK $(java -version 2>&1 | head -1 | cut -d'"' -f2), SDK at $ANDROID_HOME"
+              echo "  ./gradlew assembleStableDebug    build a debug APK"
+              echo "  ./gradlew testStableDebugUnitTest  run unit tests"
+            '';
+          };
+        });
+    };
+}

From 9d647f2ce1894600b7aea9ad3409e79104e3820a Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 11:49:17 +0200
Subject: [PATCH 03/79] Match dev shell hint to the documented build commands

Drops the unit-test hint, since the test sources do not compile upstream.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 flake.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index 9544b6c..948455b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -55,8 +55,8 @@
             shellHook = ''
               echo "sdk.dir=$ANDROID_HOME" > local.properties
               echo "FatihsMG4 dev shell — JDK $(java -version 2>&1 | head -1 | cut -d'"' -f2), SDK at $ANDROID_HOME"
-              echo "  ./gradlew assembleStableDebug    build a debug APK"
-              echo "  ./gradlew testStableDebugUnitTest  run unit tests"
+              echo "  ./gradlew assembleStableDebug     # debug APK"
+              echo "  ./gradlew assembleUnstableDebug   # build that can update itself (OTA)"
             '';
           };
         });

From 8e7d8b862715aa3b6d09893763916a2160aaa79a Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 12:51:58 +0200
Subject: [PATCH 04/79] Add build-car: unstable APK signed with the AOSP
 platform key
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The MG4 head unit's platform certificate (c8a2e9bc…192ab8, per
tools/README.md) is the public AOSP test key. build-car fetches that key
into the gitignored tools/ directory from a pinned android-9.0.0_r1 tag,
builds assembleUnstableDebug, zipaligns and signs it, and refuses to
finish unless both the key's certificate and the resulting signer match
the expected SHA-256. Output lands in build/car/ with a .sha256 sidecar.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 flake.nix | 89 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 79 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index 948455b..70fead2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,30 +33,99 @@
           sdk = "${android.androidsdk}/libexec/android-sdk";
           # gradle/gradle-daemon-jvm.properties pins the daemon to JDK 21.
           jdk = pkgs.jdk21;
+          buildTools = "${sdk}/build-tools/${buildToolsVersion}";
+
+          # AGP otherwise downloads an aapt2 binary from Maven, which is dynamically linked
+          # against a generic FHS and does not run on NixOS. Use the SDK's patched one.
+          # Gradle is also pointed at the Nix JDK so the daemon toolchain criteria are met
+          # locally instead of downloading a (non-NixOS) JDK through foojay.
+          gradleOpts = builtins.concatStringsSep " " [
+            "-Dorg.gradle.project.android.aapt2FromMavenOverride=${buildTools}/aapt2"
+            "-Dorg.gradle.java.installations.paths=${jdk.home}"
+            "-Dorg.gradle.java.installations.auto-download=false"
+          ];
+
+          # The MG4 head unit is signed with the public AOSP test platform key, so that is
+          # the key a system-UID (unstable) build must carry. See tools/README.md and OTA.md.
+          aospKeys = "https://raw.githubusercontent.com/aosp-mirror/platform_build/android-9.0.0_r1/target/product/security";
+          platformCertSha256 = "c8a2e9bccf597c2fb6dc66bee293fc13f2fc47ec77bc6b2b0d52c11f51192ab8";
+
+          buildCar = pkgs.writeShellApplication {
+            name = "build-car";
+            runtimeInputs = [ jdk pkgs.curl pkgs.openssl pkgs.coreutils pkgs.gnugrep pkgs.gawk ];
+            text = ''
+              root=$(git rev-parse --show-toplevel 2>/dev/null || pwd)
+              cd "$root"
+              if [ ! -f app/build.gradle ]; then
+                echo "build-car: run this from the FatihsMG4 checkout" >&2
+                exit 1
+              fi
+
+              export ANDROID_HOME=${sdk} ANDROID_SDK_ROOT=${sdk} JAVA_HOME=${jdk.home}
+              export GRADLE_OPTS="${gradleOpts}"
+              echo "sdk.dir=$ANDROID_HOME" > local.properties
+
+              # Keys live in tools/, which .gitignore keeps out of the repository.
+              for f in platform.pk8 platform.x509.pem; do
+                if [ ! -f "tools/$f" ]; then
+                  echo "Fetching AOSP test key tools/$f"
+                  curl -sSfL -o "tools/$f" "${aospKeys}/$f"
+                fi
+              done
+              cert=$(openssl x509 -in tools/platform.x509.pem -outform der | sha256sum | cut -d' ' -f1)
+              if [ "$cert" != "${platformCertSha256}" ]; then
+                echo "build-car: tools/platform.x509.pem has SHA-256 $cert, expected ${platformCertSha256}" >&2
+                exit 1
+              fi
+
+              ./gradlew assembleUnstableDebug "$@"
+              version=$(./gradlew -q printUnstableVersion "$@" | tail -1)
+
+              in=app/build/outputs/apk/unstable/debug/app-unstable-debug.apk
+              mkdir -p build/car
+              aligned=build/car/aligned.apk
+              out="build/car/FatihsMG4-unstable-$version.apk"
+
+              "${buildTools}/zipalign" -f -p 4 "$in" "$aligned"
+              # Options come before the input APK; apksigner rejects the other order.
+              "${buildTools}/apksigner" sign \
+                --key tools/platform.pk8 --cert tools/platform.x509.pem \
+                --out "$out" "$aligned"
+              rm -f "$aligned" "$out.idsig"
+
+              signer=$("${buildTools}/apksigner" verify --print-certs "$out" \
+                | awk -F': ' '/Signer #1 certificate SHA-256 digest/ { print $2 }')
+              if [ "$signer" != "${platformCertSha256}" ]; then
+                echo "build-car: $out is signed with $signer, expected ${platformCertSha256}" >&2
+                rm -f "$out"
+                exit 1
+              fi
+              sha256sum "$out" | cut -d' ' -f1 > "$out.sha256"
+
+              echo
+              echo "Signed with the AOSP platform key: $out"
+              echo "Install on the head unit:"
+              echo "  adb push $out /data/local/tmp/update.apk"
+              echo "  adb shell \"pm install -r -f -d -t /data/local/tmp/update.apk\""
+            '';
+          };
         in
         {
           default = pkgs.mkShell {
-            packages = [ jdk android.androidsdk ];
+            packages = [ jdk android.androidsdk buildCar ];
 
             ANDROID_HOME = sdk;
             ANDROID_SDK_ROOT = sdk;
             JAVA_HOME = jdk.home;
 
-            # AGP otherwise downloads an aapt2 binary from Maven, which is dynamically linked
-            # against a generic FHS and does not run on NixOS. Use the SDK's patched one.
-            # Gradle is also pointed at the Nix JDK so the daemon toolchain criteria are met
-            # locally instead of downloading a (non-NixOS) JDK through foojay.
-            GRADLE_OPTS = builtins.concatStringsSep " " [
-              "-Dorg.gradle.project.android.aapt2FromMavenOverride=${sdk}/build-tools/${buildToolsVersion}/aapt2"
-              "-Dorg.gradle.java.installations.paths=${jdk.home}"
-              "-Dorg.gradle.java.installations.auto-download=false"
-            ];
+            GRADLE_OPTS = gradleOpts;
 
             shellHook = ''
               echo "sdk.dir=$ANDROID_HOME" > local.properties
               echo "FatihsMG4 dev shell — JDK $(java -version 2>&1 | head -1 | cut -d'"' -f2), SDK at $ANDROID_HOME"
               echo "  ./gradlew assembleStableDebug     # debug APK"
               echo "  ./gradlew assembleUnstableDebug   # build that can update itself (OTA)"
+              echo "  build-car                         # unstable build signed for the car"
             '';
           };
         });

From 3af337ca89cc87424bcf1edad17911c3dba0ea5b Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 12:59:52 +0200
Subject: [PATCH 05/79] Disable OTA update checks by pointing at an
 unresolvable host

The updater stays in place, but its releases URL now uses the .invalid
TLD (RFC 2606), so checks fail instead of offering upstream's Turkish
builds over this one. Swap in a fork's releases API to re-enable it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java b/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java
index 9d09aa7..f77c44d 100644
--- a/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java
+++ b/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java
@@ -62,9 +62,14 @@ final class OtaUpdater {
      * signed with a different key, and Android refuses to install over a platform-signed
      * build with anything but the same signature. Pointing here means the check finds
      * nothing until this repository publishes a release, which is the intended quiet.
+     *
+     * Disabled for now: the .invalid TLD (RFC 2606) never resolves, so every check fails
+     * with "Update check failed" instead of offering upstream's builds over this one. To
+     * re-enable, point this at a fork's releases API, e.g.
+     * "https://api.github.com/repos/<owner>/<repo>/releases".
      */
     private static final String RELEASES_API =
-            "https://api.github.com/repos/fatihdonmezdev/FatihsMG4/releases";
+            "https://updates.invalid/repos/fatihdonmezdev/FatihsMG4/releases";
 
     /**
      * Hosts an update may come from. The githubusercontent entries are the CDNs GitHub

From 3da3fa9f49e960afe25bf9783fbdbe56810acbf0 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 13:02:18 +0200
Subject: [PATCH 06/79] Rename app to "Nils' MG4"

Changes the launcher label, header brand caption, About title, logo
description and OTA download labels. Package ID, APK file names, log
tags and the repository link are unchanged.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 app/src/main/res/values/strings.xml                    | 6 +++---
 app/src/main/res/values/strings_design.xml             | 2 +-
 app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index be15a7f..4f9a0ce 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">FatihsMG4</string>
+    <string name="app_name">Nils\' MG4</string>
 
     <!-- Main screen -->
     <string name="tab_abrp">ABRP</string>
@@ -126,12 +126,12 @@
     <string name="update_downloading">Downloading and verifying…</string>
     <string name="update_downloading_percent">Downloading… %1$d%%</string>
     <string name="about_action">About</string>
-    <string name="about_title">About Fatih\'sMG4</string>
+    <string name="about_title">About Nils\' MG4</string>
     <string name="about_version">Version %1$s</string>
     <string name="about_attribution">Fork of malys / EVABRPUploader\nand Leon Kernan / ABRP_Uploader</string>
     <string name="about_repository">github.com/fatihdonmezdev/FatihsMG4</string>
     <string name="about_made_with_love">MG4 EH32 · SWI69</string>
-    <string name="about_logo_description">FatihsMG4 logo</string>
+    <string name="about_logo_description">Nils\' MG4 logo</string>
     <string name="about_qr_description">QR code for the project repository</string>
     <string name="about_version_unknown">unknown</string>
     <string name="about_close">Close</string>
diff --git a/app/src/main/res/values/strings_design.xml b/app/src/main/res/values/strings_design.xml
index 161df82..8cce1d3 100644
--- a/app/src/main/res/values/strings_design.xml
+++ b/app/src/main/res/values/strings_design.xml
@@ -3,7 +3,7 @@
   <string name="design_battery_short">Battery</string>
   <string name="design_probe">VHAL Probe</string>
   <string name="design_brand">MG&#x2074;</string>
-  <string name="design_brand_caption">Fatih&#x2019;s MG4</string>
+  <string name="design_brand_caption">Nils&#x2019; MG4</string>
   <string name="design_brand_footer">ON THE ROAD, ELECTRIC</string>
   <string name="design_overview_title">Your drive at a glance.</string>
   <string name="design_overview_subtitle">Data from your car, all in one place.</string>
diff --git a/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java b/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java
index f77c44d..67838a4 100644
--- a/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java
+++ b/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java
@@ -363,7 +363,7 @@ final class OtaUpdater {
         long downloadId = -1L;
         try {
             DownloadManager.Request request = new DownloadManager.Request(Uri.parse(update.apkUrl))
-                    .setTitle("FatihsMG4 " + update.versionName)
+                    .setTitle("Nils' MG4 " + update.versionName)
                     .setDescription("Downloading update")
                     .setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
                     .setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, publicName)
@@ -569,7 +569,7 @@ final class OtaUpdater {
         Intent install = new Intent(Intent.ACTION_VIEW)
                 .setDataAndType(contentUri, "application/vnd.android.package-archive")
                 .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        install.setClipData(ClipData.newRawUri("FatihsMG4 update", contentUri));
+        install.setClipData(ClipData.newRawUri("Nils' MG4 update", contentUri));
         grantToInstallers(context, contentUri);
         if (install.resolveActivity(context.getPackageManager()) == null) {
             throw new IllegalStateException("No package installer activity");

From a707b590f7d9935a08714bc355bb2840c530b75f Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 13:08:09 +0200
Subject: [PATCH 07/79] Rename package and APKs to NilsMG4, credit Fatih, add
 SPECS.md

- applicationId com.evsuite.abrp -> com.stinnesbeck.nilsmg4 (the car
  build is .unstable); the Java namespace is unchanged. Installs next to
  upstream's app rather than over it.
- APK names NilsMG4-*.apk, debug builds included; build-car follows.
- OTA install-result action, cache/download names, User-Agent and log
  tags follow the new name.
- About credits fatihdonmezdev / FatihsMG4.
- SPECS.md journals what changed and what is still to do, starting
  with pointing the About link and QR code at git.stinnesbeck.com/nils/mg4.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 SPECS.md                                      | 55 +++++++++++++++++++
 app/build.gradle                              | 11 ++--
 .../evsuite/abrp/ConsumptionCloudClient.java  |  2 +-
 .../com/evsuite/abrp/ConsumptionTracker.java  |  2 +-
 app/src/main/res/values/strings.xml           |  2 +-
 .../java/com/evsuite/abrp/OtaUpdaterTest.java | 24 ++++----
 app/src/unstable/AndroidManifest.xml          |  2 +-
 .../abrp/OtaInstallResultReceiver.java        |  2 +-
 .../java/com/evsuite/abrp/OtaUpdater.java     | 10 ++--
 flake.nix                                     | 10 ++--
 settings.gradle                               |  2 +-
 11 files changed, 90 insertions(+), 32 deletions(-)
 create mode 100644 SPECS.md

diff --git a/SPECS.md b/SPECS.md
new file mode 100644
index 0000000..aa56f6f
--- /dev/null
+++ b/SPECS.md
@@ -0,0 +1,55 @@
+# SPECS — Nils' MG4
+
+Journal for this fork of [fatihdonmezdev/FatihsMG4](https://github.com/fatihdonmezdev/FatihsMG4):
+what has been changed, and what is still to do.
+
+- Our repository: https://git.stinnesbeck.com/nils/mg4
+- Upstream: https://github.com/fatihdonmezdev/FatihsMG4 (itself a fork of malys / EVABRPUploader
+  and Leon Kernan / ABRP_Uploader). Credited in the app's About dialog.
+
+## To do
+
+- [ ] **About dialog link and QR code → https://git.stinnesbeck.com/nils/mg4.**
+      Both come from `REPOSITORY_URL` in `app/src/main/java/com/evsuite/abrp/MainActivity.java`
+      and `about_repository` in `app/src/main/res/values/strings.xml`. They still point to Fatih's
+      GitHub repository.
+- [ ] **Re-enable OTA updates against our own releases.** `RELEASES_API` in
+      `app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java` points at `updates.invalid` on purpose,
+      so checks fail. The updater speaks the GitHub releases API and only allows GitHub hosts
+      (`ALLOWED_HOSTS`). For git.stinnesbeck.com it needs the host on the allowlist, and the
+      response parsing checked against that server's releases API. Release assets must be named
+      `NilsMG4-unstable-<version>.apk` with a `.sha256` sidecar (`build-car` writes both).
+- [ ] **Fix the unit tests.** They don't compile upstream: `AbrpApiTest`, `TelemetryPayloadTest`
+      and others still use `AbrpApi`/`TelemetryPayload`, which upstream commit `ea8032a` deleted.
+- [ ] **Charging currency.** Prices and costs are shown in Turkish lira (`₺/kWh`, `₺`) in
+      `pane_charging.xml` and `MainActivity.java`.
+- [ ] **Cloud consumption sync.** `CONSUMPTION_INSTALLATION_ID` in `app/build.gradle` is a fixed
+      UUID inherited from upstream. Set our own before configuring `CONSUMPTION_API_URL` /
+      `CONSUMPTION_API_TOKEN`, so our data cannot land under upstream's id.
+- [ ] **Translate the rest.** The `web/` dashboard (Next.js) and docs (`CHANGELOG.md`, `OTA.md`'s
+      message table, comments in `mise.toml`/`app/build.gradle`) are still Turkish or French.
+- [ ] **Docs still use the old package ID.** `README.md`, `OTA.md`, `CHANGELOG.md`, `mise.toml` and
+      `docs/MG4_PLATFORM_INSTALL.md` refer to `com.evsuite.abrp(.unstable)` and `FatihsMG4-*.apk`.
+- [ ] **Move hardcoded UI strings into `strings.xml`.** Many are inline in Java and layouts.
+
+## Done
+
+- 2026-10-17 — Translated the app UI from Turkish to English.
+- 2026-10-17 — Nix flake: `nix develop` provides JDK 21 and the Android SDK. `build-car` builds the
+  unstable APK and signs it with the AOSP test platform key, which the MG4 head unit uses
+  (cert SHA-256 `c8a2e9bc…192ab8`).
+- 2026-10-17 — OTA update checks disabled by pointing at an unresolvable host (see To do).
+- 2026-10-17 — Renamed to "Nils' MG4": package ID `com.stinnesbeck.nilsmg4` (`.unstable` for the car
+  build), APK names `NilsMG4-*.apk`. It installs next to the old FatihsMG4 app instead of replacing
+  it, and starts with empty settings and history.
+
+## Installing on the car
+
+```
+nix develop
+build-car
+adb push build/car/NilsMG4-unstable-<version>.apk /data/local/tmp/update.apk
+adb shell "pm install -r -f -d -t /data/local/tmp/update.apk"
+```
+
+To remove the old upstream app: `adb uninstall com.evsuite.abrp.unstable`.
diff --git a/app/build.gradle b/app/build.gradle
index 8a597c2..a82f37f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,7 +31,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "com.evsuite.abrp"
+        applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
         versionCode 56
@@ -113,7 +113,7 @@ android {
 }
 
 // Version publiée par la CI pour composer le nom de l'asset APK : ce nom DOIT être
-// comparable par l'updater ("FatihsMG4-unstable-1.0.42.apk"). Le tag de la
+// comparable par l'updater ("NilsMG4-unstable-1.0.42.apk"). Le tag de la
 // pré-release est la constante "unstable", écrasée à chaque build.
 tasks.register('printUnstableVersion') {
     doLast {
@@ -129,8 +129,11 @@ androidComponents {
                 // Le canal unstable garde un nom de fichier stable : l'updater identifie
                 // la version par le tag de la pré-release, jamais par le nom d'APK.
                 output.outputFileName.set(variant.flavorName == "unstable"
-                        ? "FatihsMG4-unstable.apk"
-                        : "FatihsMG4-${variant.flavorName}-${output.versionName.get()}.apk")
+                        ? "NilsMG4-unstable.apk"
+                        : "NilsMG4-${variant.flavorName}-${output.versionName.get()}.apk")
+            } else {
+                // Debug builds: NilsMG4-stable-debug.apk, NilsMG4-unstable-debug.apk.
+                output.outputFileName.set("NilsMG4-${variant.flavorName}-${variant.buildType}.apk")
             }
         }
     }
diff --git a/app/src/main/java/com/evsuite/abrp/ConsumptionCloudClient.java b/app/src/main/java/com/evsuite/abrp/ConsumptionCloudClient.java
index 4e855e2..aec491d 100644
--- a/app/src/main/java/com/evsuite/abrp/ConsumptionCloudClient.java
+++ b/app/src/main/java/com/evsuite/abrp/ConsumptionCloudClient.java
@@ -28,7 +28,7 @@ import java.util.List;
  * picks up right where the old one left off instead of showing zeroes.
  */
 final class ConsumptionCloudClient {
-    private static final String TAG = "FatihsMG4.Mongo";
+    private static final String TAG = "NilsMG4.Mongo";
     private static final long CONSUMPTION_SYNC_INTERVAL_MS = 2 * 60_000L;
     private static final long CHARGE_RETRY_INTERVAL_MS = 5 * 60_000L;
     private static final long HISTORY_FETCH_INTERVAL_MS = 5 * 60_000L;
diff --git a/app/src/main/java/com/evsuite/abrp/ConsumptionTracker.java b/app/src/main/java/com/evsuite/abrp/ConsumptionTracker.java
index 2f9395a..c00ddcc 100644
--- a/app/src/main/java/com/evsuite/abrp/ConsumptionTracker.java
+++ b/app/src/main/java/com/evsuite/abrp/ConsumptionTracker.java
@@ -216,7 +216,7 @@ final class ConsumptionTracker {
         if (cloudLifetime.km > local.km) {
             lifetime.set(cloudLifetime.km, cloudLifetime.kwh, cloudLifetime.hours, cloudLifetime.soc);
             persist();
-            Log.i("FatihsMG4.Consumption", "Lifetime baseline synced from cloud: "
+            Log.i("NilsMG4.Consumption", "Lifetime baseline synced from cloud: "
                     + cloudLifetime.km + " km (was " + local.km + " km)");
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4f9a0ce..341259d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -128,7 +128,7 @@
     <string name="about_action">About</string>
     <string name="about_title">About Nils\' MG4</string>
     <string name="about_version">Version %1$s</string>
-    <string name="about_attribution">Fork of malys / EVABRPUploader\nand Leon Kernan / ABRP_Uploader</string>
+    <string name="about_attribution">Fork of fatihdonmezdev / FatihsMG4,\nmalys / EVABRPUploader\nand Leon Kernan / ABRP_Uploader</string>
     <string name="about_repository">github.com/fatihdonmezdev/FatihsMG4</string>
     <string name="about_made_with_love">MG4 EH32 · SWI69</string>
     <string name="about_logo_description">Nils\' MG4 logo</string>
diff --git a/app/src/testUnstable/java/com/evsuite/abrp/OtaUpdaterTest.java b/app/src/testUnstable/java/com/evsuite/abrp/OtaUpdaterTest.java
index 4211434..e318cfd 100644
--- a/app/src/testUnstable/java/com/evsuite/abrp/OtaUpdaterTest.java
+++ b/app/src/testUnstable/java/com/evsuite/abrp/OtaUpdaterTest.java
@@ -102,13 +102,13 @@ public class OtaUpdaterTest {
     @Test
     public void versionIsReadFromTheAssetName() {
         // The release tag is the constant "unstable", so the asset name carries the build.
-        assertEquals("1.0.42", OtaUpdater.versionFromAssetName("FatihsMG4-unstable-1.0.42.apk"));
-        assertEquals("1.0.100", OtaUpdater.versionFromAssetName("FatihsMG4-unstable-1.0.100.APK"));
+        assertEquals("1.0.42", OtaUpdater.versionFromAssetName("NilsMG4-unstable-1.0.42.apk"));
+        assertEquals("1.0.100", OtaUpdater.versionFromAssetName("NilsMG4-unstable-1.0.100.APK"));
     }
 
     @Test
     public void assetNameWithoutAVersionIsIgnored() {
-        assertNull(OtaUpdater.versionFromAssetName("FatihsMG4-unstable.apk"));
+        assertNull(OtaUpdater.versionFromAssetName("NilsMG4-unstable.apk"));
         assertNull(OtaUpdater.versionFromAssetName("unstable"));
     }
 
@@ -125,14 +125,14 @@ public class OtaUpdaterTest {
     public void sha256SidecarFormatsAreParsed() {
         String hash = "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef";
         assertEquals(hash, OtaUpdater.parseExpectedSha256(hash,
-                "FatihsMG4-unstable-2.2.7.apk"));
+                "NilsMG4-unstable-2.2.7.apk"));
         assertEquals(hash, OtaUpdater.parseExpectedSha256(
-                hash + "  *FatihsMG4-unstable-2.2.7.apk\n",
-                "FatihsMG4-unstable-2.2.7.apk"));
+                hash + "  *NilsMG4-unstable-2.2.7.apk\n",
+                "NilsMG4-unstable-2.2.7.apk"));
         assertNull(OtaUpdater.parseExpectedSha256(hash + "  another.apk",
-                "FatihsMG4-unstable-2.2.7.apk"));
+                "NilsMG4-unstable-2.2.7.apk"));
         assertNull(OtaUpdater.parseExpectedSha256("not-a-hash",
-                "FatihsMG4-unstable-2.2.7.apk"));
+                "NilsMG4-unstable-2.2.7.apk"));
     }
 
     @Test
@@ -150,14 +150,14 @@ public class OtaUpdaterTest {
                 .put(release(true, asset("2.2.5")));
         OtaUpdater.Update update = OtaUpdater.selectUpdate(releases, "2.2.2.0-unstable");
         assertEquals("2.2.6", update.versionName);
-        assertTrue(update.apkUrl.endsWith("FatihsMG4-unstable-2.2.6.apk"));
+        assertTrue(update.apkUrl.endsWith("NilsMG4-unstable-2.2.6.apk"));
     }
 
     @Test
     public void stableDraftForeignAndUnversionedAssetsCannotWin() throws Exception {
         JSONObject foreign = asset("9.0.0").put("browser_download_url", "https://example.com/app.apk");
-        JSONObject unversioned = asset("9.0.0").put("name", "FatihsMG4-unstable.apk");
-        JSONObject stableName = asset("9.0.0").put("name", "FatihsMG4-stable-9.0.0.apk");
+        JSONObject unversioned = asset("9.0.0").put("name", "NilsMG4-unstable.apk");
+        JSONObject stableName = asset("9.0.0").put("name", "NilsMG4-stable-9.0.0.apk");
         JSONArray releases = new JSONArray()
                 .put(release(false, asset("9.0.0")))
                 .put(release(true, asset("9.0.0")).put("draft", true))
@@ -216,7 +216,7 @@ public class OtaUpdaterTest {
     }
 
     private static JSONObject asset(String version) throws Exception {
-        String name = "FatihsMG4-unstable-" + version + ".apk";
+        String name = "NilsMG4-unstable-" + version + ".apk";
         return new JSONObject().put("name", name).put("browser_download_url",
                 "https://github.com/fatihdonmezdev/FatihsMG4/releases/download/unstable/" + name);
     }
diff --git a/app/src/unstable/AndroidManifest.xml b/app/src/unstable/AndroidManifest.xml
index 1e4f316..54d3c67 100644
--- a/app/src/unstable/AndroidManifest.xml
+++ b/app/src/unstable/AndroidManifest.xml
@@ -27,7 +27,7 @@
             android:name=".OtaInstallResultReceiver"
             android:exported="false">
             <intent-filter>
-                <action android:name="com.evsuite.abrp.OTA_INSTALL_RESULT" />
+                <action android:name="com.stinnesbeck.nilsmg4.OTA_INSTALL_RESULT" />
             </intent-filter>
         </receiver>
     </application>
diff --git a/app/src/unstable/java/com/evsuite/abrp/OtaInstallResultReceiver.java b/app/src/unstable/java/com/evsuite/abrp/OtaInstallResultReceiver.java
index 3a4611a..2aabac1 100644
--- a/app/src/unstable/java/com/evsuite/abrp/OtaInstallResultReceiver.java
+++ b/app/src/unstable/java/com/evsuite/abrp/OtaInstallResultReceiver.java
@@ -19,7 +19,7 @@ import android.widget.Toast;
  */
 public final class OtaInstallResultReceiver extends BroadcastReceiver {
 
-    static final String ACTION_INSTALL_RESULT = "com.evsuite.abrp.OTA_INSTALL_RESULT";
+    static final String ACTION_INSTALL_RESULT = "com.stinnesbeck.nilsmg4.OTA_INSTALL_RESULT";
 
     private static final String TAG = "EVABRP.Update";
 
diff --git a/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java b/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java
index 67838a4..276f60f 100644
--- a/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java
+++ b/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java
@@ -53,7 +53,7 @@ import java.security.MessageDigest;
 final class OtaUpdater {
 
     private static final String TAG = "OtaUpdater";
-    private static final String CACHE_PREFIX = "FatihsMG4-ota-";
+    private static final String CACHE_PREFIX = "NilsMG4-ota-";
 
     /**
      * Pre-releases live here; the unstable channel tracks them.
@@ -167,7 +167,7 @@ final class OtaUpdater {
 
     /**
      * Version carried by an unstable asset name:
-     * "FatihsMG4-unstable-1.0.42.apk" -> "1.0.42".
+     * "NilsMG4-unstable-1.0.42.apk" -> "1.0.42".
      *
      * The release tag is the fixed string "unstable" (one rolling pre-release), so the asset
      * name is what identifies a build. Returns null when the name carries no version.
@@ -203,7 +203,7 @@ final class OtaUpdater {
         try {
             conn.setInstanceFollowRedirects(false);
             conn.setRequestProperty("Accept", "application/vnd.github.v3+json");
-            conn.setRequestProperty("User-Agent", "FatihsMG4-Android");
+            conn.setRequestProperty("User-Agent", "NilsMG4-Android");
             conn.setConnectTimeout(TIMEOUT_MS);
             conn.setReadTimeout(TIMEOUT_MS);
             int status = conn.getResponseCode();
@@ -302,7 +302,7 @@ final class OtaUpdater {
             connection.setInstanceFollowRedirects(false);
             connection.setConnectTimeout(TIMEOUT_MS);
             connection.setReadTimeout(TIMEOUT_MS);
-            connection.setRequestProperty("User-Agent", "FatihsMG4-Android");
+            connection.setRequestProperty("User-Agent", "NilsMG4-Android");
             try {
                 int status = connection.getResponseCode();
                 if (status >= 300 && status <= 399) {
@@ -584,7 +584,7 @@ final class OtaUpdater {
         if (downloads == null || (!downloads.isDirectory() && !downloads.mkdirs())) {
             throw new IllegalStateException("Downloads directory unavailable");
         }
-        File destination = new File(downloads, "FatihsMG4-OTA-update.apk");
+        File destination = new File(downloads, "NilsMG4-OTA-update.apk");
         try (FileInputStream input = new FileInputStream(source);
              FileOutputStream output = new FileOutputStream(destination, false)) {
             byte[] buffer = new byte[64 * 1024];
diff --git a/flake.nix b/flake.nix
index 70fead2..b0b4a1f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "FatihsMG4 — Android Automotive build environment";
+  description = "NilsMG4 — Android Automotive build environment";
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
@@ -57,7 +57,7 @@
               root=$(git rev-parse --show-toplevel 2>/dev/null || pwd)
               cd "$root"
               if [ ! -f app/build.gradle ]; then
-                echo "build-car: run this from the FatihsMG4 checkout" >&2
+                echo "build-car: run this from the NilsMG4 checkout" >&2
                 exit 1
               fi
 
@@ -81,10 +81,10 @@
               ./gradlew assembleUnstableDebug "$@"
               version=$(./gradlew -q printUnstableVersion "$@" | tail -1)
 
-              in=app/build/outputs/apk/unstable/debug/app-unstable-debug.apk
+              in=app/build/outputs/apk/unstable/debug/NilsMG4-unstable-debug.apk
               mkdir -p build/car
               aligned=build/car/aligned.apk
-              out="build/car/FatihsMG4-unstable-$version.apk"
+              out="build/car/NilsMG4-unstable-$version.apk"
 
               "${buildTools}/zipalign" -f -p 4 "$in" "$aligned"
               # Options come before the input APK; apksigner rejects the other order.
@@ -122,7 +122,7 @@
 
             shellHook = ''
               echo "sdk.dir=$ANDROID_HOME" > local.properties
-              echo "FatihsMG4 dev shell — JDK $(java -version 2>&1 | head -1 | cut -d'"' -f2), SDK at $ANDROID_HOME"
+              echo "NilsMG4 dev shell — JDK $(java -version 2>&1 | head -1 | cut -d'"' -f2), SDK at $ANDROID_HOME"
               echo "  ./gradlew assembleStableDebug     # debug APK"
               echo "  ./gradlew assembleUnstableDebug   # build that can update itself (OTA)"
               echo "  build-car                         # unstable build signed for the car"
diff --git a/settings.gradle b/settings.gradle
index 98c922f..c8d83b5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,7 +22,7 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "FatihsMG4"
+rootProject.name = "NilsMG4"
 include ':app'
 include ':evhardware'
 project(':evhardware').projectDir = file('EVHardware/lib')

From b2a5b32b08a14fcf7c6de6e58c1d139fd06c52cf Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 13:26:32 +0200
Subject: [PATCH 08/79] Add on-screen diagnostics to the Logs tab

Without adb there was no way to see why vehicle values stay blank:
refreshVehicle() swallowed every exception. The Logs tab now shows the
package, version, UID (and whether it is the system UID), signer
SHA-256, firmware, car permission grants, the last snapshot and read
error, and the newest 200 entries of the vehicle library's AppLogger.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 SPECS.md                                      |   2 +
 .../java/com/evsuite/abrp/MainActivity.java   | 102 +++++++++++++++++-
 app/src/main/res/layout/pane_log.xml          |   3 +
 app/src/main/res/values/strings.xml           |   2 +
 4 files changed, 107 insertions(+), 2 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index aa56f6f..b067264 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -42,6 +42,8 @@ what has been changed, and what is still to do.
 - 2026-10-17 — Renamed to "Nils' MG4": package ID `com.stinnesbeck.nilsmg4` (`.unstable` for the car
   build), APK names `NilsMG4-*.apk`. It installs next to the old FatihsMG4 app instead of replacing
   it, and starts with empty settings and history.
+- 2026-10-17 — Diagnostics section on the Logs tab: UID, signer, car permissions, last vehicle
+  read and its error, and the vehicle library's in-app log. For debugging without adb.
 
 ## Installing on the car
 
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 475686c..8d96209 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -102,6 +102,16 @@ public class MainActivity extends AppCompatActivity {
     private ChargeSessionTracker chargeSessionTracker;
     private ChargingGraphView chargeGraph;
 
+    /**
+     * What the vehicle reads last did, for the diagnostics section of the Logs page. A failed
+     * read leaves the cells showing a dash, which looks the same as a signal the car does not
+     * publish; this is the only on-screen trace of why.
+     */
+    private TextView diagnosticsText;
+    private volatile EnergySnapshot lastVehicleSnapshot;
+    private volatile long lastVehicleReadOkMs;
+    private volatile String lastVehicleReadError;
+
     /**
      * Inflates a page with no parent, then gives it the MATCH_PARENT/MATCH_PARENT layout
      * params ViewPager2 requires of its items — inflating detached leaves them null, and
@@ -168,6 +178,7 @@ public class MainActivity extends AppCompatActivity {
         }
         ((TextView) findViewById(R.id.header_title)).setText(PAGE_TITLES[position]);
         ((TextView) findViewById(R.id.header_subtitle)).setText(PAGE_SUBTITLES[position]);
+        if (panes[position] == logPane) refreshDiagnostics();
     }
 
     /** Refreshes state + call log while the screen is visible. */
@@ -216,6 +227,9 @@ public class MainActivity extends AppCompatActivity {
         statusText          = servicePane.findViewById(R.id.status_text);
         callLogText = logPane.findViewById(R.id.call_log_text);
         logPane.findViewById(R.id.flush_now_button).setOnClickListener(v -> manualFlush());
+        diagnosticsText = logPane.findViewById(R.id.diagnostics_text);
+        logPane.findViewById(R.id.diagnostics_refresh_button)
+                .setOnClickListener(v -> refreshDiagnostics());
 
         setUpPager();
         findViewById(R.id.about_button).setOnClickListener(v -> showAbout());
@@ -407,6 +421,8 @@ public class MainActivity extends AppCompatActivity {
             }
             // The timestamp is passed explicitly: its Kotlin default is not visible from Java.
             EnergySnapshot s = vehicleReader.read(System.currentTimeMillis());
+            lastVehicleSnapshot = s;
+            lastVehicleReadOkMs = System.currentTimeMillis();
             ConsumptionTracker.get(this).sample(s);
             refreshCharging(s);
 
@@ -423,8 +439,12 @@ public class MainActivity extends AppCompatActivity {
             vehTireFr.setText(fmt(s.getTirePressures().getFrontRightKpa(), "%.0f kPa"));
             vehTireRl.setText(fmt(s.getTirePressures().getRearLeftKpa(), "%.0f kPa"));
             vehTireRr.setText(fmt(s.getTirePressures().getRearRightKpa(), "%.0f kPa"));
-        } catch (Throwable ignored) {
-            // Leave the last good reading on screen.
+        } catch (Throwable t) {
+            // Leave the last good reading on screen, but keep the reason for the diagnostics.
+            String trace = android.util.Log.getStackTraceString(t);
+            lastVehicleReadError = new java.text.SimpleDateFormat("HH:mm:ss", java.util.Locale.US)
+                    .format(new java.util.Date()) + "  "
+                    + (trace.length() > 2000 ? trace.substring(0, 2000) + "…" : trace);
         }
     }
 
@@ -749,6 +769,84 @@ public class MainActivity extends AppCompatActivity {
         callLogText.setText(sb.toString());
     }
 
+    // ---------- Diagnostics ----------
+
+    /**
+     * Fills the diagnostics section: who the app runs as, how it is signed, which car
+     * permissions it holds, what the last vehicle read returned, and the in-app log of the
+     * vehicle library. On the head unit there is no adb, so this is what can be photographed.
+     */
+    private void refreshDiagnostics() {
+        if (diagnosticsText == null) return;
+        java.text.SimpleDateFormat time = new java.text.SimpleDateFormat("HH:mm:ss", java.util.Locale.US);
+        StringBuilder sb = new StringBuilder();
+        int uid = android.os.Process.myUid();
+        sb.append("Package      ").append(getPackageName()).append('\n');
+        sb.append("Version      ").append(BuildConfig.VERSION_NAME).append('\n');
+        sb.append("UID          ").append(uid)
+          .append(uid == android.os.Process.SYSTEM_UID ? "  (system — OK)" : "  (NOT system)").append('\n');
+        sb.append("Firmware     ").append(safe(() -> com.evsuite.hardware.FirmwareInfo.INSTANCE.getDetectedString()))
+          .append('\n');
+        PackageManager pm = getPackageManager();
+        try {
+            @SuppressWarnings("deprecation")
+            android.content.pm.PackageInfo info = pm.getPackageInfo(getPackageName(),
+                    PackageManager.GET_SIGNATURES | PackageManager.GET_PERMISSIONS);
+            if (info.signatures != null && info.signatures.length > 0) {
+                byte[] digest = java.security.MessageDigest.getInstance("SHA-256")
+                        .digest(info.signatures[0].toByteArray());
+                StringBuilder hex = new StringBuilder();
+                for (byte b : digest) hex.append(String.format(java.util.Locale.US, "%02x", b));
+                sb.append("Signer       ").append(hex).append('\n');
+            }
+            if (info.requestedPermissions != null) {
+                sb.append("Permissions\n");
+                for (String p : info.requestedPermissions) {
+                    if (!p.startsWith("android.car.")) continue;
+                    boolean granted = checkSelfPermission(p) == PackageManager.PERMISSION_GRANTED;
+                    sb.append("  ").append(granted ? "granted  " : "DENIED   ")
+                      .append(p.substring(p.lastIndexOf('.') + 1)).append('\n');
+                }
+            }
+        } catch (Exception e) {
+            sb.append("Package info unavailable: ").append(e).append('\n');
+        }
+
+        sb.append('\n').append("Last vehicle read  ")
+          .append(lastVehicleReadOkMs > 0 ? time.format(new java.util.Date(lastVehicleReadOkMs)) : "never")
+          .append('\n');
+        EnergySnapshot s = lastVehicleSnapshot;
+        if (s != null) {
+            sb.append("  SOC ").append(s.getSocPercent())
+              .append("  range ").append(s.getRangeKm())
+              .append("  speed ").append(s.getSpeedKmh())
+              .append("  power ").append(s.getBatteryPowerKw()).append('\n')
+              .append("  odometer ").append(s.getOdometerKm())
+              .append("  charge status ").append(s.getChargingStatus())
+              .append("  port ").append(s.getChargePortConnected()).append('\n');
+        }
+        String error = lastVehicleReadError;
+        if (error != null) sb.append("Last read error  ").append(error).append('\n');
+
+        java.util.List<com.evsuite.hardware.AppLogger.Entry> entries =
+                com.evsuite.hardware.AppLogger.INSTANCE.getEntries();
+        int shown = Math.min(entries.size(), 200);
+        sb.append('\n').append("Vehicle library log (newest first, ").append(shown)
+          .append(" of ").append(entries.size()).append(")\n");
+        for (int i = entries.size() - 1; i >= entries.size() - shown; i--) {
+            com.evsuite.hardware.AppLogger.Entry e = entries.get(i);
+            sb.append(e.getTime()).append(' ').append(e.getLevel().name().charAt(0)).append('/')
+              .append(e.getTag()).append(": ").append(e.getMsg()).append('\n');
+        }
+        diagnosticsText.setText(sb.toString());
+    }
+
+    private interface StringSupplier { String get() throws Exception; }
+
+    private static String safe(StringSupplier supplier) {
+        try { return supplier.get(); } catch (Throwable t) { return "unavailable (" + t + ")"; }
+    }
+
     // ---------- Service status ----------
 
     private void refreshStatus() {
diff --git a/app/src/main/res/layout/pane_log.xml b/app/src/main/res/layout/pane_log.xml
index 31ea5d8..7049563 100644
--- a/app/src/main/res/layout/pane_log.xml
+++ b/app/src/main/res/layout/pane_log.xml
@@ -4,5 +4,8 @@
         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_call_log" android:textAppearance="@style/Text.EV.Eyebrow" />
         <com.google.android.material.button.MaterialButton android:id="@+id/flush_now_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/btn_flush_now" app:icon="@drawable/ic_refresh" app:iconGravity="textStart" style="@style/Widget.EV.Button.Outlined" xmlns:app="http://schemas.android.com/apk/res-auto" />
         <TextView android:id="@+id/call_log_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:minHeight="180dp" android:text="@string/call_log_empty" android:textAppearance="@style/Text.EV.Body" android:fontFamily="monospace" android:textSize="17sp" android:lineSpacingExtra="12dp" android:textIsSelectable="true" />
+        <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/label_diagnostics" android:textAppearance="@style/Text.EV.Eyebrow" />
+        <com.google.android.material.button.MaterialButton android:id="@+id/diagnostics_refresh_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/btn_refresh_diagnostics" app:icon="@drawable/ic_refresh" app:iconGravity="textStart" style="@style/Widget.EV.Button.Outlined" xmlns:app="http://schemas.android.com/apk/res-auto" />
+        <TextView android:id="@+id/diagnostics_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:textAppearance="@style/Text.EV.Body" android:fontFamily="monospace" android:textSize="14sp" android:lineSpacingExtra="4dp" android:textIsSelectable="true" />
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 341259d..11039fa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -107,6 +107,8 @@
     <!-- Call log -->
     <string name="label_call_log">Recent uploads</string>
     <string name="call_log_empty">No upload attempted yet.</string>
+    <string name="label_diagnostics">Diagnostics</string>
+    <string name="btn_refresh_diagnostics">Refresh diagnostics</string>
     <string name="btn_flush_now">Upload now</string>
     <string name="status_starting">Starting…</string>
     <string name="status_running_no_upload">Running — waiting for first upload</string>

From 10029623e318215dbaf6fbfed7d538ada670812d Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 13:38:36 +0200
Subject: [PATCH 09/79] Remove on-screen diagnostics from the Logs tab

They served their purpose: vehicle values show on the car. This reverts
commit b2a5b32.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 SPECS.md                                      |   2 -
 .../java/com/evsuite/abrp/MainActivity.java   | 102 +-----------------
 app/src/main/res/layout/pane_log.xml          |   3 -
 app/src/main/res/values/strings.xml           |   2 -
 4 files changed, 2 insertions(+), 107 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index b067264..aa56f6f 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -42,8 +42,6 @@ what has been changed, and what is still to do.
 - 2026-10-17 — Renamed to "Nils' MG4": package ID `com.stinnesbeck.nilsmg4` (`.unstable` for the car
   build), APK names `NilsMG4-*.apk`. It installs next to the old FatihsMG4 app instead of replacing
   it, and starts with empty settings and history.
-- 2026-10-17 — Diagnostics section on the Logs tab: UID, signer, car permissions, last vehicle
-  read and its error, and the vehicle library's in-app log. For debugging without adb.
 
 ## Installing on the car
 
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 8d96209..475686c 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -102,16 +102,6 @@ public class MainActivity extends AppCompatActivity {
     private ChargeSessionTracker chargeSessionTracker;
     private ChargingGraphView chargeGraph;
 
-    /**
-     * What the vehicle reads last did, for the diagnostics section of the Logs page. A failed
-     * read leaves the cells showing a dash, which looks the same as a signal the car does not
-     * publish; this is the only on-screen trace of why.
-     */
-    private TextView diagnosticsText;
-    private volatile EnergySnapshot lastVehicleSnapshot;
-    private volatile long lastVehicleReadOkMs;
-    private volatile String lastVehicleReadError;
-
     /**
      * Inflates a page with no parent, then gives it the MATCH_PARENT/MATCH_PARENT layout
      * params ViewPager2 requires of its items — inflating detached leaves them null, and
@@ -178,7 +168,6 @@ public class MainActivity extends AppCompatActivity {
         }
         ((TextView) findViewById(R.id.header_title)).setText(PAGE_TITLES[position]);
         ((TextView) findViewById(R.id.header_subtitle)).setText(PAGE_SUBTITLES[position]);
-        if (panes[position] == logPane) refreshDiagnostics();
     }
 
     /** Refreshes state + call log while the screen is visible. */
@@ -227,9 +216,6 @@ public class MainActivity extends AppCompatActivity {
         statusText          = servicePane.findViewById(R.id.status_text);
         callLogText = logPane.findViewById(R.id.call_log_text);
         logPane.findViewById(R.id.flush_now_button).setOnClickListener(v -> manualFlush());
-        diagnosticsText = logPane.findViewById(R.id.diagnostics_text);
-        logPane.findViewById(R.id.diagnostics_refresh_button)
-                .setOnClickListener(v -> refreshDiagnostics());
 
         setUpPager();
         findViewById(R.id.about_button).setOnClickListener(v -> showAbout());
@@ -421,8 +407,6 @@ public class MainActivity extends AppCompatActivity {
             }
             // The timestamp is passed explicitly: its Kotlin default is not visible from Java.
             EnergySnapshot s = vehicleReader.read(System.currentTimeMillis());
-            lastVehicleSnapshot = s;
-            lastVehicleReadOkMs = System.currentTimeMillis();
             ConsumptionTracker.get(this).sample(s);
             refreshCharging(s);
 
@@ -439,12 +423,8 @@ public class MainActivity extends AppCompatActivity {
             vehTireFr.setText(fmt(s.getTirePressures().getFrontRightKpa(), "%.0f kPa"));
             vehTireRl.setText(fmt(s.getTirePressures().getRearLeftKpa(), "%.0f kPa"));
             vehTireRr.setText(fmt(s.getTirePressures().getRearRightKpa(), "%.0f kPa"));
-        } catch (Throwable t) {
-            // Leave the last good reading on screen, but keep the reason for the diagnostics.
-            String trace = android.util.Log.getStackTraceString(t);
-            lastVehicleReadError = new java.text.SimpleDateFormat("HH:mm:ss", java.util.Locale.US)
-                    .format(new java.util.Date()) + "  "
-                    + (trace.length() > 2000 ? trace.substring(0, 2000) + "…" : trace);
+        } catch (Throwable ignored) {
+            // Leave the last good reading on screen.
         }
     }
 
@@ -769,84 +749,6 @@ public class MainActivity extends AppCompatActivity {
         callLogText.setText(sb.toString());
     }
 
-    // ---------- Diagnostics ----------
-
-    /**
-     * Fills the diagnostics section: who the app runs as, how it is signed, which car
-     * permissions it holds, what the last vehicle read returned, and the in-app log of the
-     * vehicle library. On the head unit there is no adb, so this is what can be photographed.
-     */
-    private void refreshDiagnostics() {
-        if (diagnosticsText == null) return;
-        java.text.SimpleDateFormat time = new java.text.SimpleDateFormat("HH:mm:ss", java.util.Locale.US);
-        StringBuilder sb = new StringBuilder();
-        int uid = android.os.Process.myUid();
-        sb.append("Package      ").append(getPackageName()).append('\n');
-        sb.append("Version      ").append(BuildConfig.VERSION_NAME).append('\n');
-        sb.append("UID          ").append(uid)
-          .append(uid == android.os.Process.SYSTEM_UID ? "  (system — OK)" : "  (NOT system)").append('\n');
-        sb.append("Firmware     ").append(safe(() -> com.evsuite.hardware.FirmwareInfo.INSTANCE.getDetectedString()))
-          .append('\n');
-        PackageManager pm = getPackageManager();
-        try {
-            @SuppressWarnings("deprecation")
-            android.content.pm.PackageInfo info = pm.getPackageInfo(getPackageName(),
-                    PackageManager.GET_SIGNATURES | PackageManager.GET_PERMISSIONS);
-            if (info.signatures != null && info.signatures.length > 0) {
-                byte[] digest = java.security.MessageDigest.getInstance("SHA-256")
-                        .digest(info.signatures[0].toByteArray());
-                StringBuilder hex = new StringBuilder();
-                for (byte b : digest) hex.append(String.format(java.util.Locale.US, "%02x", b));
-                sb.append("Signer       ").append(hex).append('\n');
-            }
-            if (info.requestedPermissions != null) {
-                sb.append("Permissions\n");
-                for (String p : info.requestedPermissions) {
-                    if (!p.startsWith("android.car.")) continue;
-                    boolean granted = checkSelfPermission(p) == PackageManager.PERMISSION_GRANTED;
-                    sb.append("  ").append(granted ? "granted  " : "DENIED   ")
-                      .append(p.substring(p.lastIndexOf('.') + 1)).append('\n');
-                }
-            }
-        } catch (Exception e) {
-            sb.append("Package info unavailable: ").append(e).append('\n');
-        }
-
-        sb.append('\n').append("Last vehicle read  ")
-          .append(lastVehicleReadOkMs > 0 ? time.format(new java.util.Date(lastVehicleReadOkMs)) : "never")
-          .append('\n');
-        EnergySnapshot s = lastVehicleSnapshot;
-        if (s != null) {
-            sb.append("  SOC ").append(s.getSocPercent())
-              .append("  range ").append(s.getRangeKm())
-              .append("  speed ").append(s.getSpeedKmh())
-              .append("  power ").append(s.getBatteryPowerKw()).append('\n')
-              .append("  odometer ").append(s.getOdometerKm())
-              .append("  charge status ").append(s.getChargingStatus())
-              .append("  port ").append(s.getChargePortConnected()).append('\n');
-        }
-        String error = lastVehicleReadError;
-        if (error != null) sb.append("Last read error  ").append(error).append('\n');
-
-        java.util.List<com.evsuite.hardware.AppLogger.Entry> entries =
-                com.evsuite.hardware.AppLogger.INSTANCE.getEntries();
-        int shown = Math.min(entries.size(), 200);
-        sb.append('\n').append("Vehicle library log (newest first, ").append(shown)
-          .append(" of ").append(entries.size()).append(")\n");
-        for (int i = entries.size() - 1; i >= entries.size() - shown; i--) {
-            com.evsuite.hardware.AppLogger.Entry e = entries.get(i);
-            sb.append(e.getTime()).append(' ').append(e.getLevel().name().charAt(0)).append('/')
-              .append(e.getTag()).append(": ").append(e.getMsg()).append('\n');
-        }
-        diagnosticsText.setText(sb.toString());
-    }
-
-    private interface StringSupplier { String get() throws Exception; }
-
-    private static String safe(StringSupplier supplier) {
-        try { return supplier.get(); } catch (Throwable t) { return "unavailable (" + t + ")"; }
-    }
-
     // ---------- Service status ----------
 
     private void refreshStatus() {
diff --git a/app/src/main/res/layout/pane_log.xml b/app/src/main/res/layout/pane_log.xml
index 7049563..31ea5d8 100644
--- a/app/src/main/res/layout/pane_log.xml
+++ b/app/src/main/res/layout/pane_log.xml
@@ -4,8 +4,5 @@
         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_call_log" android:textAppearance="@style/Text.EV.Eyebrow" />
         <com.google.android.material.button.MaterialButton android:id="@+id/flush_now_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/btn_flush_now" app:icon="@drawable/ic_refresh" app:iconGravity="textStart" style="@style/Widget.EV.Button.Outlined" xmlns:app="http://schemas.android.com/apk/res-auto" />
         <TextView android:id="@+id/call_log_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:minHeight="180dp" android:text="@string/call_log_empty" android:textAppearance="@style/Text.EV.Body" android:fontFamily="monospace" android:textSize="17sp" android:lineSpacingExtra="12dp" android:textIsSelectable="true" />
-        <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/label_diagnostics" android:textAppearance="@style/Text.EV.Eyebrow" />
-        <com.google.android.material.button.MaterialButton android:id="@+id/diagnostics_refresh_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/btn_refresh_diagnostics" app:icon="@drawable/ic_refresh" app:iconGravity="textStart" style="@style/Widget.EV.Button.Outlined" xmlns:app="http://schemas.android.com/apk/res-auto" />
-        <TextView android:id="@+id/diagnostics_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:textAppearance="@style/Text.EV.Body" android:fontFamily="monospace" android:textSize="14sp" android:lineSpacingExtra="4dp" android:textIsSelectable="true" />
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 11039fa..341259d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -107,8 +107,6 @@
     <!-- Call log -->
     <string name="label_call_log">Recent uploads</string>
     <string name="call_log_empty">No upload attempted yet.</string>
-    <string name="label_diagnostics">Diagnostics</string>
-    <string name="btn_refresh_diagnostics">Refresh diagnostics</string>
     <string name="btn_flush_now">Upload now</string>
     <string name="status_starting">Starting…</string>
     <string name="status_running_no_upload">Running — waiting for first upload</string>

From de2428786aa844ed6ff7b29b2f4cbac81716046c Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 13:38:47 +0200
Subject: [PATCH 10/79] Journal diagnostics and upstream ABRP removal in
 SPECS.md

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 SPECS.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/SPECS.md b/SPECS.md
index aa56f6f..c06b748 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -19,6 +19,11 @@ what has been changed, and what is still to do.
       (`ALLOWED_HOSTS`). For git.stinnesbeck.com it needs the host on the allowlist, and the
       response parsing checked against that server's releases API. Release assets must be named
       `NilsMG4-unstable-<version>.apk` with a `.sha256` sidecar (`build-car` writes both).
+- [ ] **ABRP upload is gone upstream.** Upstream commit `ea8032a` ("chore", 2026-10-09) removed the
+      ABRP tab, the config-file import (`ConfigImport`), the upload (`AbrpApi`, `TelemetryPayload`,
+      `UploadCadence`), `SecurePrefs` and `HeadUnitWeather`. The app now only tracks consumption
+      and syncs it to the MongoDB API. Leftover `strings.xml` entries (`btn_import`, `import_*`,
+      `hint_api_key`, …) belong to it. Decide whether to restore it.
 - [ ] **Fix the unit tests.** They don't compile upstream: `AbrpApiTest`, `TelemetryPayloadTest`
       and others still use `AbrpApi`/`TelemetryPayload`, which upstream commit `ea8032a` deleted.
 - [ ] **Charging currency.** Prices and costs are shown in Turkish lira (`₺/kWh`, `₺`) in
@@ -42,6 +47,8 @@ what has been changed, and what is still to do.
 - 2026-10-17 — Renamed to "Nils' MG4": package ID `com.stinnesbeck.nilsmg4` (`.unstable` for the car
   build), APK names `NilsMG4-*.apk`. It installs next to the old FatihsMG4 app instead of replacing
   it, and starts with empty settings and history.
+- 2026-10-17 — Temporary on-screen diagnostics (b2a5b32) to debug blank values without adb;
+  removed again (1002962) once values showed on the car. Revert 1002962 to bring them back.
 
 ## Installing on the car
 

From d4fb4ba3af01855dd1aa658caf6845e1d72a6701 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 13:51:01 +0200
Subject: [PATCH 11/79] Plan the car server (InfluxDB 2, ABRP forwarder, k8s
 manifests) in SPECS.md

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 SPECS.md | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/SPECS.md b/SPECS.md
index c06b748..a315240 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -7,6 +7,68 @@ what has been changed, and what is still to do.
 - Upstream: https://github.com/fatihdonmezdev/FatihsMG4 (itself a fork of malys / EVABRPUploader
   and Leon Kernan / ABRP_Uploader). Credited in the app's About dialog.
 
+## Plan: car server at car.stinnesbeck.com
+
+The car sends everything to our own server. The server stores it and forwards live telemetry to
+ABRP, so the ABRP token lives only on the server, never in the APK.
+
+```
+car ──live telemetry───▶ car.stinnesbeck.com ──▶ ABRP  api.iternio.com/1/tlm/send
+    ──daily totals─────▶          │
+    ──charging sessions▶          ▼
+                              InfluxDB 2
+```
+
+### Server — extend `web/` (Next.js)
+
+- **Storage: MongoDB → InfluxDB 2.** Rewrite `web/src/lib/mongo.ts` / `data.ts` against one bucket
+  (tag `installationId` on every point):
+
+  | Measurement | Timestamp | Tags | Fields |
+  |---|---|---|---|
+  | `telemetry` | sample time | — | soc, power, speed, lat, lon, heading, elevation, is_charging, is_dcfc, is_parked, capacity, soe, odometer, est_battery_range, batt_temp, cabin_temp, ext_temp, hvac_setpoint, voltage, current, tire_pressure_fl/fr/rl/rr |
+  | `consumption_daily` | the day, 00:00 UTC | — | km, kwh, hours, socDrop, sohPercent |
+  | `charging_session` | startedAt | sessionId | endedAt, durationSeconds, energyKwh, gridEnergyKwh, pricePerKwh, totalCost, start/endSocPercent |
+  | `charging_curve` | point time | sessionId | powerKw, socPercent |
+
+  Same measurement + tags + timestamp overwrites, so the car's retries stay idempotent
+  (MongoDB used unique indexes for that).
+- **New endpoint `POST /v1/telemetry`:** a batch of live samples, ingest-token auth, validated
+  and bounded like the existing endpoints.
+- **ABRP forwarder:** after storing, forward the newest sample to `tlm/send` with `ABRP_API_KEY` and
+  `ABRP_USER_TOKEN` from the environment. Rate-limited; a failed forward is logged but not
+  retried, since stale live data is useless to ABRP. Off when the token is unset.
+- **Existing endpoints stay:** `PUT /v1/consumption/daily`, `PUT /v1/charging-sessions/:id`,
+  `GET /v1/consumption/history/:id`, the dashboard and `/v1/health`.
+- **Self-hosting:** drop the Vercel assumptions, `output: "standalone"`, a `Dockerfile`, and
+  `ensureIndexes()` replaced by bucket checks at startup.
+
+### Car app
+
+- Restore the live telemetry payload and upload cadence from before `ea8032a` (`TelemetryPayload`,
+  `UploadCadence`, location access), sending to the server instead of ABRP.
+- Server URL and ingest token: open question, see below.
+- Generate our own `CONSUMPTION_INSTALLATION_ID`.
+
+### Image and deployment
+
+- Image: `git.stinnesbeck.com/nils/mg4-server:<version>`, pushed to the forge's registry
+  (needs a registry login on the build machine).
+- `k8s/` with plain manifests: Namespace, InfluxDB StatefulSet + PVC + Service (cluster-internal),
+  server Deployment + Service + Ingress for `car.stinnesbeck.com` (TLS), and Secret *templates*
+  with placeholder values only.
+- **Nothing is ever applied to the cluster by us.** Nils applies the manifests.
+
+### Open questions
+
+- [ ] Run InfluxDB inside the cluster from our manifests (assumed), or use an existing instance?
+- [ ] Ingress class and TLS setup (e.g. cert-manager `ClusterIssuer` name), or an existing wildcard
+      certificate Secret?
+- [ ] Car config: bake the server URL and ingest token into the APK at build time (as upstream
+      does), or enter them in the app, which restores the settings tab with the config-file import?
+      In the app keeps the token out of the APK.
+- [ ] ABRP API key: the open-source default key from upstream, or our own?
+
 ## To do
 
 - [ ] **About dialog link and QR code → https://git.stinnesbeck.com/nils/mg4.**

From 4ea66cf42407596483a3a93f175cd6be8215610e Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 14:09:29 +0200
Subject: [PATCH 12/79] Server: InfluxDB 2 storage, live telemetry endpoint,
 ABRP forwarder

- MongoDB replaced by InfluxDB 2 (one bucket, installationId tag).
  Consumption is stored per chunk at its recordedAt and summed on read,
  so a chunk the car re-sends from its cache overwrites itself instead
  of being counted twice ($inc did count it twice). Lifetime is a
  running total derived on read.
- POST /v1/telemetry takes batches of samples in ABRP's tlm fields; every
  field is bounded, unknown fields are dropped, unread signals stay absent.
- After a successful write the newest fresh sample is forwarded to ABRP
  with ABRP_API_KEY / ABRP_USER_TOKEN from the server environment; rate
  limited, never queued. The car no longer needs ABRP credentials.
- Self-hosting: standalone output, Dockerfile (tests run in the build,
  runs as UID 10001), .env.example and README for the new setup.
- Dev shell gains Node 22 and InfluxDB 2.

Verified locally against InfluxDB 2.7.12: all endpoints, retry
idempotency, and the dashboard pages. Unit tests: 17 pass.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 flake.nix                                     |   2 +-
 web/.dockerignore                             |   7 +
 web/.env.example                              |  17 +-
 web/Dockerfile                                |  27 +++
 web/README.md                                 |  84 ++++---
 web/next.config.mjs                           |   2 +
 web/package-lock.json                         | 155 +-----------
 web/package.json                              |   4 +-
 .../v1/charging-sessions/[sessionId]/route.ts |  12 +-
 web/src/app/v1/consumption/daily/route.ts     |  37 +--
 .../history/[installationId]/route.ts         |  23 +-
 .../[installationId]/charging/route.ts        |   9 +-
 .../[installationId]/consumption/route.ts     |   9 +-
 web/src/app/v1/telemetry/route.ts             |  24 ++
 web/src/lib/abrp.ts                           |  88 +++++++
 web/src/lib/api.ts                            |   2 +-
 web/src/lib/data.ts                           |  45 ++--
 web/src/lib/days.ts                           |  43 ++++
 web/src/lib/influx.ts                         |  40 ++++
 web/src/lib/mongo.ts                          | 100 --------
 web/src/lib/store.ts                          | 225 ++++++++++++++++++
 web/src/lib/types.ts                          |  96 ++++++++
 web/src/lib/validate.ts                       |  71 +++++-
 web/test/days.test.ts                         |  37 +++
 web/test/telemetry.test.ts                    |  56 +++++
 web/tsconfig.json                             |   1 +
 26 files changed, 821 insertions(+), 395 deletions(-)
 create mode 100644 web/.dockerignore
 create mode 100644 web/Dockerfile
 create mode 100644 web/src/app/v1/telemetry/route.ts
 create mode 100644 web/src/lib/abrp.ts
 create mode 100644 web/src/lib/days.ts
 create mode 100644 web/src/lib/influx.ts
 delete mode 100644 web/src/lib/mongo.ts
 create mode 100644 web/src/lib/store.ts
 create mode 100644 web/src/lib/types.ts
 create mode 100644 web/test/days.test.ts
 create mode 100644 web/test/telemetry.test.ts

diff --git a/flake.nix b/flake.nix
index b0b4a1f..88d38f0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -112,7 +112,7 @@
         in
         {
           default = pkgs.mkShell {
-            packages = [ jdk android.androidsdk buildCar ];
+            packages = [ jdk android.androidsdk buildCar pkgs.nodejs_22 pkgs.influxdb2-server pkgs.influxdb2-cli ];
 
             ANDROID_HOME = sdk;
             ANDROID_SDK_ROOT = sdk;
diff --git a/web/.dockerignore b/web/.dockerignore
new file mode 100644
index 0000000..6614541
--- /dev/null
+++ b/web/.dockerignore
@@ -0,0 +1,7 @@
+node_modules
+.next
+.env*
+!.env.example
+*.tsbuildinfo
+Dockerfile
+.dockerignore
diff --git a/web/.env.example b/web/.env.example
index 5cd72df..1a81b62 100644
--- a/web/.env.example
+++ b/web/.env.example
@@ -1,5 +1,18 @@
-MONGODB_URI=mongodb+srv://username:password@cluster.example.mongodb.net/
-MONGODB_DATABASE=fatihsmg4
+# InfluxDB 2 — a token with read/write on the bucket.
+INFLUX_URL=http://influxdb:8086
+INFLUX_TOKEN=replace-with-an-influxdb-token
+INFLUX_ORG=mg4
+INFLUX_BUCKET=mg4
+
+# The car's write token (at least 24 characters): openssl rand -hex 32
 INGEST_TOKEN=replace-with-a-long-random-write-token
+# Signs dashboard sessions; rotating it signs every browser out: openssl rand -hex 32
 SESSION_SECRET=replace-with-a-long-random-session-secret
+# Dashboard login, at least 8 characters.
 DASHBOARD_PASSWORD=replace-with-a-strong-dashboard-password
+
+# ABRP forwarding; off when either is empty.
+ABRP_API_KEY=
+ABRP_USER_TOKEN=
+# Minimum seconds between two samples forwarded to ABRP.
+ABRP_MIN_INTERVAL_SECONDS=5
diff --git a/web/Dockerfile b/web/Dockerfile
new file mode 100644
index 0000000..22663d7
--- /dev/null
+++ b/web/Dockerfile
@@ -0,0 +1,27 @@
+# Self-hosted image of the car server: Next.js standalone output on Node 22.
+# Configuration comes entirely from the environment at runtime (see .env.example);
+# nothing secret is baked in.
+
+FROM node:22-alpine AS deps
+WORKDIR /app
+COPY package.json package-lock.json ./
+RUN npm ci --no-audit --no-fund
+
+FROM node:22-alpine AS build
+WORKDIR /app
+ENV NEXT_TELEMETRY_DISABLED=1
+COPY --from=deps /app/node_modules ./node_modules
+COPY . .
+RUN npm test && npm run build
+
+FROM node:22-alpine
+WORKDIR /app
+ENV NODE_ENV=production \
+    NEXT_TELEMETRY_DISABLED=1 \
+    PORT=3000 \
+    HOSTNAME=0.0.0.0
+COPY --from=build --chown=10001:10001 /app/.next/standalone ./
+COPY --from=build --chown=10001:10001 /app/.next/static ./.next/static
+USER 10001:10001
+EXPOSE 3000
+CMD ["node", "server.js"]
diff --git a/web/README.md b/web/README.md
index 9715a88..0b2d722 100644
--- a/web/README.md
+++ b/web/README.md
@@ -1,68 +1,88 @@
-# FatihsMG4 web
+# Nils' MG4 — car server
 
-Next.js app on Vercel: the ingest API the car writes to, and a phone-shaped dashboard for
-reading the history back. Replaces the standalone Express service that used to live in
-`server/`.
+Next.js app, self-hosted at car.stinnesbeck.com: the ingest API the car writes to, the ABRP
+forwarder, and a phone-shaped dashboard for reading the history back. Data lives in
+InfluxDB 2. Based on upstream's Vercel/MongoDB app in FatihsMG4.
 
-**The car never connects to MongoDB and never holds a MongoDB URI.** The URI is a Vercel
-environment variable and is only ever read by a server-side route.
+```
+car ──live telemetry───▶ server ──▶ ABRP  api.iternio.com/1/tlm/send
+    ──daily chunks─────▶   │
+    ──charging sessions▶   ▼
+                       InfluxDB 2
+```
 
-## Two credentials, on purpose
+## Credentials
 
 | | Who holds it | What it opens |
 |---|---|---|
-| `INGEST_TOKEN` | the car, in the APK | the `PUT` endpoints — write only |
-| `DASHBOARD_PASSWORD` | you, in a browser | the dashboard and the `GET` history |
+| `INGEST_TOKEN` | the car, entered in the app | the write endpoints, and the car's own history read |
+| `DASHBOARD_PASSWORD` | you, in a browser | the dashboard and the `GET /v1/history` reads |
+| `ABRP_API_KEY`, `ABRP_USER_TOKEN` | only the server | forwarding live telemetry to ABRP |
 
-The APK is published, so its token must be assumed extractable: anyone can `unzip` an APK
-and read its strings. That is survivable here because the write token cannot read anything
-back. The password is never compiled into anything.
+The ABRP credentials never reach the car. A missing or empty one switches forwarding off.
 
 ## Environment variables
 
-Set all five in Vercel → Settings → Environment Variables, for Production and Preview.
+See `.env.example`. In Kubernetes they come from the Secret in `../k8s/`.
 
 | Name | Notes |
 |---|---|
-| `MONGODB_URI` | Atlas connection string |
-| `MONGODB_DATABASE` | defaults to `fatihsmg4` |
-| `INGEST_TOKEN` | `openssl rand -hex 32` |
+| `INFLUX_URL`, `INFLUX_TOKEN`, `INFLUX_ORG`, `INFLUX_BUCKET` | bucket defaults to `mg4`; the token needs read/write on it |
+| `INGEST_TOKEN` | at least 24 characters, or every write is refused: `openssl rand -hex 32` |
 | `DASHBOARD_PASSWORD` | at least 8 characters, or login is refused outright |
 | `SESSION_SECRET` | `openssl rand -hex 32`; rotating it signs every browser out |
-
-Atlas network access must allow Vercel's egress, which is not a fixed address on the Hobby
-plan — either allow `0.0.0.0/0` and rely on the database user's credentials, or use Atlas
-private networking on a paid plan.
+| `ABRP_API_KEY`, `ABRP_USER_TOKEN` | optional; both needed to forward |
+| `ABRP_MIN_INTERVAL_SECONDS` | default 5 |
 
 ## Endpoints
 
 Write, `Authorization: Bearer <INGEST_TOKEN>`:
 
-- `PUT /v1/consumption/daily`
+- `POST /v1/telemetry` — `{ installationId, samples: [...] }`, up to 500 samples in ABRP's `tlm`
+  field names and units (`utc` in epoch seconds; flags as 0/1 or booleans). Stored, then the
+  newest sample is forwarded to ABRP if it is under 5 minutes old.
+- `PUT /v1/consumption/daily` — one delta chunk of a day's consumption.
 - `PUT /v1/charging-sessions/:sessionId`
 
-Read, session cookie or `Authorization: Bearer <DASHBOARD_PASSWORD>`:
+Read:
 
-- `GET /v1/history/:installationId/consumption`
-- `GET /v1/history/:installationId/charging`
+- `GET /v1/consumption/history/:installationId` — ingest token; the car reads its own totals back.
+- `GET /v1/history/:installationId/consumption`, `.../charging` — session cookie or
+  `Authorization: Bearer <DASHBOARD_PASSWORD>`.
 
 `GET /v1/health` is unauthenticated and returns `{"status":"ok"}`.
 
-The car builds its URLs as `CONSUMPTION_API_URL + /v1/...`, so the Android build variable
-is the bare origin — `https://your-app.vercel.app`, no trailing path.
+## Storage
 
-## Indexes
+One bucket, `installationId` tag on every point:
 
-There is no boot step on Vercel, so `ensureIndexes()` runs on the first write of each warm
-lambda and is skipped afterwards. The unique indexes on `(installationId, date)` and
-`(installationId, sessionId)` are what make the upserts idempotent when the car retries a
-record it could not confirm.
+| Measurement | Timestamp | Tags | Fields |
+|---|---|---|---|
+| `telemetry` | sample `utc` | — | the ABRP fields that were sent |
+| `consumption_chunk` | `recordedAt` | `date` | km, kwh, hours, socDrop, sohPercent |
+| `charging_session` | `startedAt` | `sessionId` | endedAtMs, duration, energy, cost, start/end SOC |
+| `charging_curve` | point time | `sessionId` | powerKw, socPercent |
+
+A point with the same measurement, tags and timestamp replaces the earlier one, so the car's
+retries are idempotent: a cached chunk is re-sent with its original `recordedAt`. Days and the
+lifetime total are summed from the chunks when read. All numbers are written as floats, because
+InfluxDB fixes a field's type on first write.
 
 ## Local development
 
 ```sh
+nix develop                  # from the repository root: Node 22 and InfluxDB 2
 cp .env.example .env.local   # Next loads .env.local automatically
 npm install
 npm run dev
-npm test                     # pure validation and session-signing tests, no database
+npm test                     # validation, aggregation and forwarding rules; no database
 ```
+
+## Container image
+
+```sh
+podman build -t git.stinnesbeck.com/nils/mg4-server:<version> .
+podman push git.stinnesbeck.com/nils/mg4-server:<version>
+```
+
+The build runs the unit tests. The image runs as UID 10001 and listens on port 3000.
diff --git a/web/next.config.mjs b/web/next.config.mjs
index 1f0ce49..7bd72cb 100644
--- a/web/next.config.mjs
+++ b/web/next.config.mjs
@@ -1,5 +1,7 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
+  // A self-contained server in .next/standalone, for the container image.
+  output: "standalone",
   // Every page reads live telemetry; a cached shell would show yesterday's drive.
   experimental: { serverActions: { bodySizeLimit: "1mb" } },
 };
diff --git a/web/package-lock.json b/web/package-lock.json
index d4aa3dd..8ad8c25 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -8,7 +8,7 @@
       "name": "fatihsmg4-web",
       "version": "1.0.0",
       "dependencies": {
-        "mongodb": "^6.20.0",
+        "@influxdata/influxdb-client": "^1.35.0",
         "next": "^15.5.4",
         "react": "^19.1.0",
         "react-dom": "^19.1.0"
@@ -533,14 +533,11 @@
         "url": "https://opencollective.com/libvips"
       }
     },
-    "node_modules/@mongodb-js/saslprep": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.6.0.tgz",
-      "integrity": "sha512-19jGXfpctLDJUELLUZGJ5BllcLT7rHdF+gTTaN2jzqu0bGkUhpdcYtgK2Vux+g3zuBAa0TM/W666QMIjYhYujw==",
-      "license": "MIT",
-      "dependencies": {
-        "sparse-bitfield": "^3.0.3"
-      }
+    "node_modules/@influxdata/influxdb-client": {
+      "version": "1.35.0",
+      "resolved": "https://registry.npmjs.org/@influxdata/influxdb-client/-/influxdb-client-1.35.0.tgz",
+      "integrity": "sha512-woWMi8PDpPQpvTsRaUw4Ig+nOGS/CWwAwS66Fa1Vr/EkW+NEwxI8YfPBsdBMn33jK2Y86/qMiiuX/ROHIkJLTw==",
+      "license": "MIT"
     },
     "node_modules/@next/env": {
       "version": "15.5.27",
@@ -705,30 +702,6 @@
         "csstype": "^3.2.2"
       }
     },
-    "node_modules/@types/webidl-conversions": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz",
-      "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==",
-      "license": "MIT"
-    },
-    "node_modules/@types/whatwg-url": {
-      "version": "11.0.5",
-      "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.5.tgz",
-      "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/webidl-conversions": "*"
-      }
-    },
-    "node_modules/bson": {
-      "version": "6.10.4",
-      "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.4.tgz",
-      "integrity": "sha512-WIsKqkSC0ABoBJuT1LEX+2HEvNmNKKgnTAyd0fL8qzK4SH2i9NXg+t08YtdZp/V9IZ33cxe3iV4yM0qg8lMQng==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=16.20.1"
-      }
-    },
     "node_modules/caniuse-lite": {
       "version": "1.0.30001815",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001815.tgz",
@@ -772,68 +745,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/memory-pager": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz",
-      "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==",
-      "license": "MIT"
-    },
-    "node_modules/mongodb": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.21.0.tgz",
-      "integrity": "sha512-URyb/VXMjJ4da46OeSXg+puO39XH9DeQpWCslifrRn9JWugy0D+DvvBvkm2WxmHe61O/H19JM66p1z7RHVkZ6A==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@mongodb-js/saslprep": "^1.3.0",
-        "bson": "^6.10.4",
-        "mongodb-connection-string-url": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=16.20.1"
-      },
-      "peerDependencies": {
-        "@aws-sdk/credential-providers": "^3.188.0",
-        "@mongodb-js/zstd": "^1.1.0 || ^2.0.0",
-        "gcp-metadata": "^5.2.0",
-        "kerberos": "^2.0.1",
-        "mongodb-client-encryption": ">=6.0.0 <7",
-        "snappy": "^7.3.2",
-        "socks": "^2.7.1"
-      },
-      "peerDependenciesMeta": {
-        "@aws-sdk/credential-providers": {
-          "optional": true
-        },
-        "@mongodb-js/zstd": {
-          "optional": true
-        },
-        "gcp-metadata": {
-          "optional": true
-        },
-        "kerberos": {
-          "optional": true
-        },
-        "mongodb-client-encryption": {
-          "optional": true
-        },
-        "snappy": {
-          "optional": true
-        },
-        "socks": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/mongodb-connection-string-url": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz",
-      "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@types/whatwg-url": "^11.0.2",
-        "whatwg-url": "^14.1.0 || ^13.0.0"
-      }
-    },
     "node_modules/nanoid": {
       "version": "3.3.20",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.20.tgz",
@@ -938,21 +849,11 @@
         "node": "^10 || ^12 || >=14"
       }
     },
-    "node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/react": {
       "version": "19.3.0",
       "resolved": "https://registry.npmjs.org/react/-/react-19.3.0.tgz",
       "integrity": "sha512-E8LUcbtBWt20bbl2YoHfx4ZDBdxVTfOKtCZn9cDSJ4l6/nuoApcpIBcj47t2wZoVX8g2ZHuMHbiShgCR1T5Sog==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -962,7 +863,6 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.3.0.tgz",
       "integrity": "sha512-JDk8dgif51OjFoDE70+OT9ICyYr+69HlmihNwp1+Nsfbna3t5sIiCa9ZJktDmQ4/1b/rn26hIAR2uYXDMr5r0Q==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "scheduler": "^0.28.0"
       },
@@ -1048,15 +948,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/sparse-bitfield": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
-      "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==",
-      "license": "MIT",
-      "dependencies": {
-        "memory-pager": "^1.0.2"
-      }
-    },
     "node_modules/styled-jsx": {
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.6.tgz",
@@ -1080,18 +971,6 @@
         }
       }
     },
-    "node_modules/tr46": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz",
-      "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==",
-      "license": "MIT",
-      "dependencies": {
-        "punycode": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/tslib": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
@@ -1118,28 +997,6 @@
       "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
       "dev": true,
       "license": "MIT"
-    },
-    "node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/whatwg-url": {
-      "version": "14.2.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",
-      "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==",
-      "license": "MIT",
-      "dependencies": {
-        "tr46": "^5.1.0",
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
     }
   }
 }
diff --git a/web/package.json b/web/package.json
index 0cf8888..8854c8f 100644
--- a/web/package.json
+++ b/web/package.json
@@ -13,7 +13,7 @@
     "node": ">=22"
   },
   "dependencies": {
-    "mongodb": "^6.20.0",
+    "@influxdata/influxdb-client": "^1.35.0",
     "next": "^15.5.4",
     "react": "^19.1.0",
     "react-dom": "^19.1.0"
@@ -24,4 +24,4 @@
     "typescript": "^5.8.3"
   },
   "type": "module"
-}
\ No newline at end of file
+}
diff --git a/web/src/app/v1/charging-sessions/[sessionId]/route.ts b/web/src/app/v1/charging-sessions/[sessionId]/route.ts
index d36ff88..55ee73a 100644
--- a/web/src/app/v1/charging-sessions/[sessionId]/route.ts
+++ b/web/src/app/v1/charging-sessions/[sessionId]/route.ts
@@ -1,6 +1,6 @@
 import { NextResponse } from "next/server";
 import { handle, parseJson, requireIngest } from "@/lib/api";
-import { chargingCollection, ensureIndexes } from "@/lib/mongo";
+import { writeChargingSession } from "@/lib/store";
 import { validateChargingSession } from "@/lib/validate";
 
 export const runtime = "nodejs";
@@ -11,15 +11,7 @@ export async function PUT(request: Request, context: { params: Promise<{ session
   if (denied) return denied;
   return handle(async () => {
     const { sessionId } = await context.params;
-    const record = validateChargingSession(await parseJson(request), sessionId);
-    await ensureIndexes();
-    const collection = await chargingCollection();
-    const updatedAt = new Date();
-    await collection.updateOne(
-      { installationId: record.installationId, sessionId: record.sessionId },
-      { $set: { ...record, updatedAt }, $setOnInsert: { createdAt: updatedAt } },
-      { upsert: true },
-    );
+    await writeChargingSession(validateChargingSession(await parseJson(request), sessionId));
     return new NextResponse(null, { status: 204 });
   });
 }
diff --git a/web/src/app/v1/consumption/daily/route.ts b/web/src/app/v1/consumption/daily/route.ts
index 7397ba6..691fab5 100644
--- a/web/src/app/v1/consumption/daily/route.ts
+++ b/web/src/app/v1/consumption/daily/route.ts
@@ -1,48 +1,21 @@
 import { NextResponse } from "next/server";
 import { handle, parseJson, requireIngest } from "@/lib/api";
-import { consumptionCollection, ensureIndexes } from "@/lib/mongo";
+import { writeConsumptionChunk } from "@/lib/store";
 import { validateConsumption } from "@/lib/validate";
 
 export const runtime = "nodejs";
 export const dynamic = "force-dynamic";
 
 /**
- * Upsert on (installationId, date), incrementally. The car sends a 2-minute delta chunk
- * (not a cumulative total), so each PUT adds to the day's running totals rather than
- * overwriting them. The app does NOT send lifetime — the backend derives it as the sum of
- * all days' totals when history is read, so an APK wipe that zeroes the local counter can
- * never corrupt the cloud's lifetime.
- *
- * $setOnInsert must not touch `day` at all: $inc on `day.km` and $setOnInsert on `day`
- * conflict in MongoDB. On an insert, $inc treats a missing field as 0 and adds to it.
+ * One delta chunk (not a cumulative total) of a day's consumption. Stored as its own point
+ * at its recordedAt; reads add a day's chunks up. A chunk the car re-sends from its offline
+ * cache carries the same recordedAt and replaces itself, so a retry is never counted twice.
  */
 export async function PUT(request: Request) {
   const denied = requireIngest(request);
   if (denied) return denied;
   return handle(async () => {
-    const record = validateConsumption(await parseJson(request));
-    await ensureIndexes();
-    const collection = await consumptionCollection();
-    const updatedAt = new Date();
-    const $set: Record<string, unknown> = { updatedAt };
-    if (record.sohPercent !== undefined) $set.sohPercent = record.sohPercent;
-    await collection.updateOne(
-      { installationId: record.installationId, date: record.date },
-      {
-        $inc: {
-          "day.km": record.day.km,
-          "day.kwh": record.day.kwh,
-          "day.hours": record.day.hours,
-          "day.socDrop": record.day.socDrop,
-        },
-        $set,
-        $setOnInsert: {
-          createdAt: updatedAt,
-        },
-      },
-      { upsert: true },
-    );
+    await writeConsumptionChunk(validateConsumption(await parseJson(request)));
     return new NextResponse(null, { status: 204 });
   });
 }
-
diff --git a/web/src/app/v1/consumption/history/[installationId]/route.ts b/web/src/app/v1/consumption/history/[installationId]/route.ts
index e44811f..ffd2bc3 100644
--- a/web/src/app/v1/consumption/history/[installationId]/route.ts
+++ b/web/src/app/v1/consumption/history/[installationId]/route.ts
@@ -1,6 +1,6 @@
 import { NextResponse } from "next/server";
 import { handle, requireIngest } from "@/lib/api";
-import { consumptionCollection } from "@/lib/mongo";
+import { readDays } from "@/lib/store";
 import { validateUuid } from "@/lib/validate";
 
 export const runtime = "nodejs";
@@ -21,23 +21,10 @@ export async function GET(request: Request, context: { params: Promise<{ install
   if (denied) return denied;
   return handle(async () => {
     const { installationId } = await context.params;
-    const collection = await consumptionCollection();
-    const records = await collection
-      .find({ installationId: validateUuid(installationId, "installationId") }, { projection: { _id: 0 } })
-      .sort({ date: -1 })
-      .limit(400)
-      .toArray();
-    // Lifetime = sum of every day's totals. Derived, never stored, so a corrupted or
-    // stale lifetime field in any single document cannot poison the total.
-    const lifetime = records.reduce(
-      (sum, r) => ({
-        km: sum.km + (r.day?.km ?? 0),
-        kwh: sum.kwh + (r.day?.kwh ?? 0),
-        hours: sum.hours + (r.day?.hours ?? 0),
-        socDrop: sum.socDrop + (r.day?.socDrop ?? 0),
-      }),
-      { km: 0, kwh: 0, hours: 0, socDrop: 0 },
-    );
+    const days = await readDays(validateUuid(installationId, "installationId"));
+    // Lifetime = sum of every day's totals, which is the newest day's running total.
+    const lifetime = days[0]?.lifetime ?? { km: 0, kwh: 0, hours: 0, socDrop: 0 };
+    const records = days.slice(0, 400).map(({ lifetime: _lifetime, ...day }) => day);
     return NextResponse.json({ records, lifetime });
   });
 }
diff --git a/web/src/app/v1/history/[installationId]/charging/route.ts b/web/src/app/v1/history/[installationId]/charging/route.ts
index 73dd795..434bf4d 100644
--- a/web/src/app/v1/history/[installationId]/charging/route.ts
+++ b/web/src/app/v1/history/[installationId]/charging/route.ts
@@ -1,6 +1,6 @@
 import { NextResponse } from "next/server";
 import { handle, requireReader } from "@/lib/api";
-import { chargingCollection } from "@/lib/mongo";
+import { readChargingSessions } from "@/lib/store";
 import { validateUuid } from "@/lib/validate";
 
 export const runtime = "nodejs";
@@ -11,12 +11,7 @@ export async function GET(request: Request, context: { params: Promise<{ install
   if (denied) return denied;
   return handle(async () => {
     const { installationId } = await context.params;
-    const collection = await chargingCollection();
-    const records = await collection
-      .find({ installationId: validateUuid(installationId, "installationId") }, { projection: { _id: 0 } })
-      .sort({ startedAt: -1 })
-      .limit(200)
-      .toArray();
+    const records = await readChargingSessions(validateUuid(installationId, "installationId"), 200);
     return NextResponse.json({ records });
   });
 }
diff --git a/web/src/app/v1/history/[installationId]/consumption/route.ts b/web/src/app/v1/history/[installationId]/consumption/route.ts
index 19d108c..158b0a8 100644
--- a/web/src/app/v1/history/[installationId]/consumption/route.ts
+++ b/web/src/app/v1/history/[installationId]/consumption/route.ts
@@ -1,6 +1,6 @@
 import { NextResponse } from "next/server";
 import { handle, requireReader } from "@/lib/api";
-import { consumptionCollection } from "@/lib/mongo";
+import { readDays } from "@/lib/store";
 import { validateUuid } from "@/lib/validate";
 
 export const runtime = "nodejs";
@@ -11,12 +11,7 @@ export async function GET(request: Request, context: { params: Promise<{ install
   if (denied) return denied;
   return handle(async () => {
     const { installationId } = await context.params;
-    const collection = await consumptionCollection();
-    const records = await collection
-      .find({ installationId: validateUuid(installationId, "installationId") }, { projection: { _id: 0 } })
-      .sort({ date: -1 })
-      .limit(400)
-      .toArray();
+    const records = (await readDays(validateUuid(installationId, "installationId"))).slice(0, 400);
     return NextResponse.json({ records });
   });
 }
diff --git a/web/src/app/v1/telemetry/route.ts b/web/src/app/v1/telemetry/route.ts
new file mode 100644
index 0000000..ffbf8fb
--- /dev/null
+++ b/web/src/app/v1/telemetry/route.ts
@@ -0,0 +1,24 @@
+import { NextResponse } from "next/server";
+import { forwardToAbrp } from "@/lib/abrp";
+import { handle, parseJson, requireIngest } from "@/lib/api";
+import { writeTelemetry } from "@/lib/store";
+import { validateTelemetryBatch } from "@/lib/validate";
+
+export const runtime = "nodejs";
+export const dynamic = "force-dynamic";
+
+/**
+ * A batch of live samples from the car. Stored first; only once the write succeeded is the
+ * newest sample handed to ABRP, so the car's retry of a failed request cannot leave ABRP
+ * with data the database never got.
+ */
+export async function POST(request: Request) {
+  const denied = requireIngest(request);
+  if (denied) return denied;
+  return handle(async () => {
+    const batch = validateTelemetryBatch(await parseJson(request));
+    await writeTelemetry(batch.installationId, batch.samples);
+    forwardToAbrp(batch.samples);
+    return new NextResponse(null, { status: 204 });
+  });
+}
diff --git a/web/src/lib/abrp.ts b/web/src/lib/abrp.ts
new file mode 100644
index 0000000..87a7756
--- /dev/null
+++ b/web/src/lib/abrp.ts
@@ -0,0 +1,88 @@
+import { TELEMETRY_FLAGS, type TelemetrySample } from "./types.ts";
+
+/**
+ * Forwards live telemetry to A Better Route Planner.
+ *
+ * The ABRP credentials exist only here, as ABRP_API_KEY and ABRP_USER_TOKEN in the server's
+ * environment; the car never holds them. Forwarding is off when either is unset.
+ *
+ * Only the newest sample of a batch is sent, and at most one every ABRP_MIN_INTERVAL_SECONDS
+ * (default 5). A failed forward is logged and dropped, never queued: ABRP plans from the
+ * car's state now, and a backlog replayed later would describe a car that has moved on.
+ * The stored copy in InfluxDB is unaffected either way.
+ */
+
+const API_URL = "https://api.iternio.com/1/tlm/send";
+const TIMEOUT_MS = 8_000;
+/** Older than this, a sample is history rather than live state, and ABRP gets nothing. */
+const MAX_AGE_SECONDS = 300;
+
+const state = globalThis as unknown as { abrpLastUtc?: number; abrpLastSentMs?: number };
+
+export function abrpConfigured(): boolean {
+  return Boolean(process.env.ABRP_API_KEY && process.env.ABRP_USER_TOKEN);
+}
+
+function minIntervalMs(): number {
+  const seconds = Number(process.env.ABRP_MIN_INTERVAL_SECONDS ?? "5");
+  return Number.isFinite(seconds) && seconds >= 0 ? seconds * 1000 : 5000;
+}
+
+/** The tlm object ABRP expects: the same field names, flags as 0/1. */
+export function toTlm(sample: TelemetrySample): Record<string, number> {
+  const tlm: Record<string, number> = {};
+  for (const [field, value] of Object.entries(sample)) {
+    if (typeof value === "number") tlm[field] = value;
+  }
+  for (const field of TELEMETRY_FLAGS) {
+    const value = sample[field];
+    if (value !== undefined) tlm[field] = value ? 1 : 0;
+  }
+  return tlm;
+}
+
+/** Picks the sample to forward, or null when there is nothing new or it is too soon. */
+export function pickForForward(samples: TelemetrySample[], nowMs: number): TelemetrySample | null {
+  if (samples.length === 0) return null;
+  const newest = samples.reduce((a, b) => (b.utc > a.utc ? b : a));
+  if (nowMs / 1000 - newest.utc > MAX_AGE_SECONDS) return null;
+  if (state.abrpLastUtc !== undefined && newest.utc <= state.abrpLastUtc) return null;
+  if (state.abrpLastSentMs !== undefined && nowMs - state.abrpLastSentMs < minIntervalMs()) return null;
+  return newest;
+}
+
+/** Fire-and-forget: the car's request is answered without waiting for ABRP. */
+export function forwardToAbrp(samples: TelemetrySample[]): void {
+  if (!abrpConfigured()) return;
+  const nowMs = Date.now();
+  const sample = pickForForward(samples, nowMs);
+  if (!sample) return;
+  state.abrpLastUtc = sample.utc;
+  state.abrpLastSentMs = nowMs;
+  void send(sample).catch((error) => console.warn("ABRP forward failed:", error instanceof Error ? error.message : error));
+}
+
+async function send(sample: TelemetrySample): Promise<void> {
+  // Credentials go in the form body, never the URL, which ends up in access logs.
+  const body = new URLSearchParams({
+    api_key: process.env.ABRP_API_KEY ?? "",
+    token: process.env.ABRP_USER_TOKEN ?? "",
+    tlm: JSON.stringify(toTlm(sample)),
+  });
+  const response = await fetch(API_URL, {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body,
+    signal: AbortSignal.timeout(TIMEOUT_MS),
+  });
+  if (!response.ok) {
+    // The response body can echo the request; only the status is logged.
+    console.warn(`ABRP forward rejected: HTTP ${response.status}`);
+  }
+}
+
+/** For tests: forget what was forwarded. */
+export function resetAbrpState(): void {
+  state.abrpLastUtc = undefined;
+  state.abrpLastSentMs = undefined;
+}
diff --git a/web/src/lib/api.ts b/web/src/lib/api.ts
index 327e63b..a266559 100644
--- a/web/src/lib/api.ts
+++ b/web/src/lib/api.ts
@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";
 import { hasIngestToken, hasSession, checkDashboardPassword } from "./auth";
 import { ValidationError } from "./validate";
 
-/** Every endpoint touches MongoDB, which rules out the edge runtime. */
+/** Every endpoint touches InfluxDB, which rules out the edge runtime. */
 export const runtime = "nodejs";
 export const dynamic = "force-dynamic";
 
diff --git a/web/src/lib/data.ts b/web/src/lib/data.ts
index b23bf5b..50c1d07 100644
--- a/web/src/lib/data.ts
+++ b/web/src/lib/data.ts
@@ -1,11 +1,12 @@
-import { chargingCollection, consumptionCollection, type ChargingSession, type DailyConsumption } from "./mongo";
+import { installationIds, readChargingSessions, readDays, readLatestTelemetry } from "./store";
+import type { ChargingSession, DailyConsumption, TelemetrySample } from "./types";
 
 /**
  * Reads for the dashboard.
  *
- * Every query is scoped to one installation id. There is one car today, but the id is in
- * the schema and in the unique indexes, so scoping now costs nothing and means a second
- * head unit does not silently merge its history into the first one's charts.
+ * Every query is scoped to one installation id. There is one car today, but the id is on
+ * every point, so scoping now costs nothing and means a second head unit does not
+ * silently merge its history into the first one's charts.
  */
 
 export interface Overview {
@@ -13,36 +14,32 @@ export interface Overview {
   installationCount: number;
   days: DailyConsumption[];
   sessions: ChargingSession[];
+  latest: (TelemetrySample & { at: Date }) | null;
 }
 
 /** The installation that reported most recently — the car in use, if there are ever two. */
 export async function latestInstallationId(): Promise<{ id: string | null; count: number }> {
-  const collection = await consumptionCollection();
-  const ids = await collection.distinct("installationId");
-  if (ids.length === 0) {
-    const charging = await chargingCollection();
-    const chargingIds = await charging.distinct("installationId");
-    return { id: chargingIds[0] ?? null, count: chargingIds.length };
-  }
-  if (ids.length === 1) return { id: ids[0], count: 1 };
-  const newest = await collection.find({}, { projection: { installationId: 1 } })
-    .sort({ date: -1 }).limit(1).next();
-  return { id: newest?.installationId ?? ids[0], count: ids.length };
+  const ids = await installationIds();
+  return { id: ids[0] ?? null, count: ids.length };
 }
 
 export async function loadOverview(dayLimit = 60, sessionLimit = 60): Promise<Overview> {
   const { id, count } = await latestInstallationId();
-  if (!id) return { installationId: null, installationCount: 0, days: [], sessions: [] };
-  const [consumption, charging] = await Promise.all([consumptionCollection(), chargingCollection()]);
-  const [days, sessions] = await Promise.all([
-    consumption.find({ installationId: id }, { projection: { _id: 0 } })
-      .sort({ date: -1 }).limit(dayLimit).toArray(),
-    charging.find({ installationId: id }, { projection: { _id: 0 } })
-      .sort({ startedAt: -1 }).limit(sessionLimit).toArray(),
+  if (!id) return { installationId: null, installationCount: 0, days: [], sessions: [], latest: null };
+  const [days, sessions, latest] = await Promise.all([
+    readDays(id),
+    readChargingSessions(id, sessionLimit),
+    readLatestTelemetry(id),
   ]);
-  // Charts read left-to-right in time; the queries sort newest-first so the limit keeps
+  // Charts read left-to-right in time; the reads come newest-first so the limit keeps
   // the recent end rather than the beginning of history.
-  return { installationId: id, installationCount: count, days: days.reverse(), sessions };
+  return {
+    installationId: id,
+    installationCount: count,
+    days: days.slice(0, dayLimit).reverse(),
+    sessions,
+    latest,
+  };
 }
 
 export interface ChargeTotals {
diff --git a/web/src/lib/days.ts b/web/src/lib/days.ts
new file mode 100644
index 0000000..e5a36fd
--- /dev/null
+++ b/web/src/lib/days.ts
@@ -0,0 +1,43 @@
+import type { ConsumptionChunk, DailyConsumption, Totals } from "./types.ts";
+
+/**
+ * Folds chunks into days, newest day first, each with its running lifetime total.
+ * Pure, so the arithmetic is tested without a database.
+ */
+export function aggregateDays(chunks: ConsumptionChunk[]): DailyConsumption[] {
+  const byDate = new Map<string, DailyConsumption & { sohAt: number }>();
+  for (const chunk of chunks) {
+    let day = byDate.get(chunk.date);
+    if (!day) {
+      day = {
+        installationId: chunk.installationId,
+        date: chunk.date,
+        recordedAt: chunk.recordedAt,
+        day: { km: 0, kwh: 0, hours: 0, socDrop: 0 },
+        sohAt: -Infinity,
+      };
+      byDate.set(chunk.date, day);
+    }
+    day.day.km += chunk.day.km;
+    day.day.kwh += chunk.day.kwh;
+    day.day.hours += chunk.day.hours;
+    day.day.socDrop += chunk.day.socDrop;
+    const at = chunk.recordedAt.getTime();
+    if (at > day.recordedAt.getTime()) day.recordedAt = chunk.recordedAt;
+    // The newest manual SoH of the day wins.
+    if (chunk.sohPercent !== undefined && at > day.sohAt) {
+      day.sohPercent = chunk.sohPercent;
+      day.sohAt = at;
+    }
+  }
+  const ascending = [...byDate.values()].sort((a, b) => a.date.localeCompare(b.date));
+  const running: Totals = { km: 0, kwh: 0, hours: 0, socDrop: 0 };
+  const days = ascending.map(({ sohAt: _sohAt, ...day }) => {
+    running.km += day.day.km;
+    running.kwh += day.day.kwh;
+    running.hours += day.day.hours;
+    running.socDrop += day.day.socDrop;
+    return { ...day, lifetime: { ...running } };
+  });
+  return days.reverse();
+}
diff --git a/web/src/lib/influx.ts b/web/src/lib/influx.ts
new file mode 100644
index 0000000..4bb8c7d
--- /dev/null
+++ b/web/src/lib/influx.ts
@@ -0,0 +1,40 @@
+import { InfluxDB, type QueryApi, type WriteApi } from "@influxdata/influxdb-client";
+
+/**
+ * One InfluxDB client per server process.
+ *
+ * Configured entirely from the environment so the image carries no credentials:
+ * INFLUX_URL, INFLUX_TOKEN, INFLUX_ORG and INFLUX_BUCKET (default "mg4"). The global
+ * survives module reloads in dev, where Next re-evaluates modules on every edit.
+ */
+const globalForInflux = globalThis as unknown as { influx?: InfluxDB };
+
+function env(name: string): string {
+  const value = process.env[name];
+  if (!value) throw new Error(`${name} is not configured`);
+  return value;
+}
+
+function client(): InfluxDB {
+  if (!globalForInflux.influx) {
+    globalForInflux.influx = new InfluxDB({ url: env("INFLUX_URL"), token: env("INFLUX_TOKEN"), timeout: 10_000 });
+  }
+  return globalForInflux.influx;
+}
+
+export function bucket(): string {
+  return process.env.INFLUX_BUCKET || "mg4";
+}
+
+/** A write API with millisecond precision; the caller must close() it to flush. */
+export function writeApi(): WriteApi {
+  return client().getWriteApi(env("INFLUX_ORG"), bucket(), "ms", {
+    // The caller waits for close(); a failed write must reach it rather than be retried
+    // in the background after the car has already been told it succeeded.
+    maxRetries: 0,
+  });
+}
+
+export function queryApi(): QueryApi {
+  return client().getQueryApi(env("INFLUX_ORG"));
+}
diff --git a/web/src/lib/mongo.ts b/web/src/lib/mongo.ts
deleted file mode 100644
index 508dcc6..0000000
--- a/web/src/lib/mongo.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import { MongoClient, type Collection, type Db } from "mongodb";
-
-/**
- * One MongoClient per warm lambda, cached on globalThis.
- *
- * A serverless function is re-entered far more often than it is cold-started, and a fresh
- * MongoClient per request opens a fresh pool per request — Atlas starts refusing
- * connections long before the traffic justifies it. The global survives module reloads in
- * dev, where Next re-evaluates modules on every edit.
- */
-const globalForMongo = globalThis as unknown as { mongoClient?: Promise<MongoClient> };
-
-export interface Totals {
-  km: number;
-  kwh: number;
-  hours: number;
-  socDrop: number;
-}
-
-export interface DailyConsumption {
-  installationId: string;
-  date: string;
-  recordedAt: Date;
-  day: Totals;
-  /** Optional — the backend derives lifetime as the sum of all days' totals. */
-  lifetime?: Totals;
-  sohPercent?: number;
-  createdAt: Date;
-  updatedAt: Date;
-}
-
-export interface CurvePoint {
-  timestamp: Date;
-  powerKw: number;
-  socPercent?: number;
-}
-
-export interface ChargingSession {
-  installationId: string;
-  sessionId: string;
-  startedAt: Date;
-  endedAt: Date;
-  durationSeconds: number;
-  energyKwh: number;
-  chargingLossPercent: number;
-  gridEnergyKwh: number;
-  pricePerKwh: number;
-  totalCost: number;
-  isDemo?: boolean;
-  startSocPercent?: number;
-  endSocPercent?: number;
-  curve: CurvePoint[];
-  createdAt: Date;
-  updatedAt: Date;
-}
-
-function clientPromise(): Promise<MongoClient> {
-  const uri = process.env.MONGODB_URI;
-  if (!uri) throw new Error("MONGODB_URI is not configured");
-  if (!globalForMongo.mongoClient) {
-    globalForMongo.mongoClient = new MongoClient(uri, {
-      serverSelectionTimeoutMS: 10_000,
-      maxPoolSize: 10,
-    }).connect();
-  }
-  return globalForMongo.mongoClient;
-}
-
-async function db(): Promise<Db> {
-  const client = await clientPromise();
-  return client.db(process.env.MONGODB_DATABASE || "fatihsmg4");
-}
-
-export async function consumptionCollection(): Promise<Collection<DailyConsumption>> {
-  return (await db()).collection<DailyConsumption>("daily_consumption");
-}
-
-export async function chargingCollection(): Promise<Collection<ChargingSession>> {
-  return (await db()).collection<ChargingSession>("charging_sessions");
-}
-
-/**
- * Creates the indexes the Express service used to create at boot.
- *
- * There is no boot here — a lambda starts on a request — so this runs on the first write
- * of each warm instance and is skipped afterwards. `createIndex` is idempotent, but it is
- * still a round trip, and the uniqueness constraints are what make the upserts safe.
- */
-let indexesEnsured = false;
-export async function ensureIndexes(): Promise<void> {
-  if (indexesEnsured) return;
-  const [consumption, charging] = await Promise.all([consumptionCollection(), chargingCollection()]);
-  await Promise.all([
-    consumption.createIndex({ installationId: 1, date: 1 }, { unique: true }),
-    consumption.createIndex({ installationId: 1, date: -1 }),
-    charging.createIndex({ installationId: 1, sessionId: 1 }, { unique: true }),
-    charging.createIndex({ installationId: 1, startedAt: -1 }),
-  ]);
-  indexesEnsured = true;
-}
diff --git a/web/src/lib/store.ts b/web/src/lib/store.ts
new file mode 100644
index 0000000..7836506
--- /dev/null
+++ b/web/src/lib/store.ts
@@ -0,0 +1,225 @@
+import { Point, flux } from "@influxdata/influxdb-client";
+import { aggregateDays } from "./days.ts";
+import { bucket, queryApi, writeApi } from "./influx.ts";
+import {
+  TELEMETRY_FLAGS,
+  TELEMETRY_NUMBERS,
+  type ChargingSession,
+  type ConsumptionChunk,
+  type CurvePoint,
+  type DailyConsumption,
+  type TelemetrySample,
+} from "./types.ts";
+
+/**
+ * Storage on InfluxDB 2. One bucket; every point carries an `installationId` tag.
+ *
+ *   consumption_chunk  time = recordedAt   tags: date               km, kwh, hours, socDrop, sohPercent
+ *   charging_session   time = startedAt    tags: sessionId          summary fields
+ *   charging_curve     time = point time   tags: sessionId          powerKw, socPercent
+ *   telemetry          time = sample utc                            ABRP tlm fields
+ *
+ * Idempotency comes from InfluxDB itself: a point with the same measurement, tags and
+ * timestamp replaces the earlier one. The car re-sends a cached chunk with its original
+ * recordedAt and a session under its own id, so a retry overwrites instead of adding.
+ *
+ * Every numeric field is written as a float. InfluxDB fixes a field's type on first
+ * write, so a 0 sent as an integer would make every later 0.5 a rejected write.
+ */
+
+const TAG = "installationId";
+
+async function write(points: Point[]): Promise<void> {
+  const api = writeApi();
+  api.writePoints(points);
+  await api.close();
+}
+
+export async function writeConsumptionChunk(chunk: ConsumptionChunk): Promise<void> {
+  const point = new Point("consumption_chunk")
+    .tag(TAG, chunk.installationId)
+    .tag("date", chunk.date)
+    .floatField("km", chunk.day.km)
+    .floatField("kwh", chunk.day.kwh)
+    .floatField("hours", chunk.day.hours)
+    .floatField("socDrop", chunk.day.socDrop)
+    .timestamp(chunk.recordedAt);
+  if (chunk.sohPercent !== undefined) point.floatField("sohPercent", chunk.sohPercent);
+  await write([point]);
+}
+
+export async function writeChargingSession(session: ChargingSession): Promise<void> {
+  const summary = new Point("charging_session")
+    .tag(TAG, session.installationId)
+    .tag("sessionId", session.sessionId)
+    .intField("endedAtMs", session.endedAt.getTime())
+    .floatField("durationSeconds", session.durationSeconds)
+    .floatField("energyKwh", session.energyKwh)
+    .floatField("chargingLossPercent", session.chargingLossPercent)
+    .floatField("gridEnergyKwh", session.gridEnergyKwh)
+    .floatField("pricePerKwh", session.pricePerKwh)
+    .floatField("totalCost", session.totalCost)
+    .booleanField("isDemo", session.isDemo === true)
+    .timestamp(session.startedAt);
+  if (session.startSocPercent !== undefined) summary.floatField("startSocPercent", session.startSocPercent);
+  if (session.endSocPercent !== undefined) summary.floatField("endSocPercent", session.endSocPercent);
+  const curve = session.curve.map((p) => {
+    const point = new Point("charging_curve")
+      .tag(TAG, session.installationId)
+      .tag("sessionId", session.sessionId)
+      .floatField("powerKw", p.powerKw)
+      .timestamp(p.timestamp);
+    if (p.socPercent !== undefined) point.floatField("socPercent", p.socPercent);
+    return point;
+  });
+  await write([summary, ...curve]);
+}
+
+export async function writeTelemetry(installationId: string, samples: TelemetrySample[]): Promise<void> {
+  const points = samples.map((sample) => {
+    const point = new Point("telemetry").tag(TAG, installationId).timestamp(new Date(sample.utc * 1000));
+    for (const field of Object.keys(TELEMETRY_NUMBERS) as (keyof typeof TELEMETRY_NUMBERS)[]) {
+      const value = sample[field];
+      if (value !== undefined) point.floatField(field, value);
+    }
+    for (const field of TELEMETRY_FLAGS) {
+      const value = sample[field];
+      if (value !== undefined) point.booleanField(field, value);
+    }
+    return point;
+  });
+  await write(points);
+}
+
+// ---------- Reads ----------
+
+type Row = Record<string, unknown> & { _time: string };
+
+async function rows(query: ReturnType<typeof flux>): Promise<Row[]> {
+  return queryApi().collectRows<Row>(query);
+}
+
+function num(row: Row, field: string): number | undefined {
+  const value = row[field];
+  return typeof value === "number" && Number.isFinite(value) ? value : undefined;
+}
+
+export async function readConsumptionChunks(installationId: string): Promise<ConsumptionChunk[]> {
+  const result = await rows(flux`
+    from(bucket: ${bucket()})
+      |> range(start: 0)
+      |> filter(fn: (r) => r._measurement == "consumption_chunk" and r.installationId == ${installationId})
+      |> pivot(rowKey: ["_time"], columnKey: ["_field"], valueColumn: "_value")`);
+  return result.map((row) => {
+    const sohPercent = num(row, "sohPercent");
+    return {
+      installationId,
+      date: String(row.date),
+      recordedAt: new Date(row._time),
+      day: {
+        km: num(row, "km") ?? 0,
+        kwh: num(row, "kwh") ?? 0,
+        hours: num(row, "hours") ?? 0,
+        socDrop: num(row, "socDrop") ?? 0,
+      },
+      ...(sohPercent === undefined ? {} : { sohPercent }),
+    };
+  });
+}
+
+export async function readDays(installationId: string): Promise<DailyConsumption[]> {
+  return aggregateDays(await readConsumptionChunks(installationId));
+}
+
+export async function readChargingSessions(installationId: string, limit: number): Promise<ChargingSession[]> {
+  const summaries = await rows(flux`
+    from(bucket: ${bucket()})
+      |> range(start: 0)
+      |> filter(fn: (r) => r._measurement == "charging_session" and r.installationId == ${installationId})
+      |> pivot(rowKey: ["_time"], columnKey: ["_field"], valueColumn: "_value")
+      |> group()
+      |> sort(columns: ["_time"], desc: true)
+      |> limit(n: ${limit})`);
+  if (summaries.length === 0) return [];
+
+  const sessions: ChargingSession[] = summaries.map((row) => {
+    const startSocPercent = num(row, "startSocPercent");
+    const endSocPercent = num(row, "endSocPercent");
+    return {
+      installationId,
+      sessionId: String(row.sessionId),
+      startedAt: new Date(row._time),
+      endedAt: new Date(num(row, "endedAtMs") ?? Date.parse(row._time)),
+      durationSeconds: num(row, "durationSeconds") ?? 0,
+      energyKwh: num(row, "energyKwh") ?? 0,
+      chargingLossPercent: num(row, "chargingLossPercent") ?? 10,
+      gridEnergyKwh: num(row, "gridEnergyKwh") ?? 0,
+      pricePerKwh: num(row, "pricePerKwh") ?? 0,
+      totalCost: num(row, "totalCost") ?? 0,
+      ...(row.isDemo === true ? { isDemo: true } : {}),
+      ...(startSocPercent === undefined ? {} : { startSocPercent }),
+      ...(endSocPercent === undefined ? {} : { endSocPercent }),
+      curve: [],
+    };
+  });
+
+  // Curves for exactly these sessions: bounded by the oldest start and the newest end.
+  const start = new Date(Math.min(...sessions.map((s) => s.startedAt.getTime())));
+  const stop = new Date(Math.max(...sessions.map((s) => s.endedAt.getTime())) + 1000);
+  const curveRows = await rows(flux`
+    from(bucket: ${bucket()})
+      |> range(start: ${start}, stop: ${stop})
+      |> filter(fn: (r) => r._measurement == "charging_curve" and r.installationId == ${installationId})
+      |> pivot(rowKey: ["_time"], columnKey: ["_field"], valueColumn: "_value")`);
+  const bySession = new Map(sessions.map((s) => [s.sessionId, s]));
+  for (const row of curveRows) {
+    const session = bySession.get(String(row.sessionId));
+    const powerKw = num(row, "powerKw");
+    if (!session || powerKw === undefined) continue;
+    const socPercent = num(row, "socPercent");
+    const point: CurvePoint = { timestamp: new Date(row._time), powerKw };
+    if (socPercent !== undefined) point.socPercent = socPercent;
+    session.curve.push(point);
+  }
+  for (const session of sessions) session.curve.sort((a, b) => a.timestamp.getTime() - b.timestamp.getTime());
+  return sessions;
+}
+
+/** Installations that reported in the last 400 days, the most recent first. */
+export async function installationIds(): Promise<string[]> {
+  const result = await rows(flux`
+    from(bucket: ${bucket()})
+      |> range(start: -400d)
+      |> filter(fn: (r) => r._measurement == "consumption_chunk" or r._measurement == "charging_session" or r._measurement == "telemetry")
+      |> keep(columns: ["_time", "installationId"])
+      |> group(columns: ["installationId"])
+      |> max(column: "_time")
+      |> group()
+      |> sort(columns: ["_time"], desc: true)`);
+  return result.map((row) => String(row.installationId));
+}
+
+/**
+ * The latest known value of every live field over the last 30 days, for the dashboard.
+ * Per field rather than per sample: the newest sample may lack a GPS fix that the one
+ * before it had. `at` is when the newest of them arrived. Null when nothing was sent.
+ */
+export async function readLatestTelemetry(installationId: string): Promise<(TelemetrySample & { at: Date }) | null> {
+  const result = await rows(flux`
+    from(bucket: ${bucket()})
+      |> range(start: -30d)
+      |> filter(fn: (r) => r._measurement == "telemetry" and r.installationId == ${installationId})
+      |> last()`);
+  if (result.length === 0) return null;
+  const newest = Math.max(...result.map((row) => Date.parse(row._time)));
+  const sample: TelemetrySample & { at: Date } = { utc: Math.floor(newest / 1000), at: new Date(newest) };
+  const numbers = TELEMETRY_NUMBERS as Record<string, unknown>;
+  const flags = TELEMETRY_FLAGS as readonly string[];
+  for (const row of result) {
+    const field = String(row._field);
+    const value = row._value;
+    if (field in numbers && typeof value === "number") (sample as Record<string, unknown>)[field] = value;
+    if (flags.includes(field) && typeof value === "boolean") (sample as Record<string, unknown>)[field] = value;
+  }
+  return sample;
+}
diff --git a/web/src/lib/types.ts b/web/src/lib/types.ts
new file mode 100644
index 0000000..c523a46
--- /dev/null
+++ b/web/src/lib/types.ts
@@ -0,0 +1,96 @@
+/** Record shapes shared by validation, storage and the dashboard. */
+
+export interface Totals {
+  km: number;
+  kwh: number;
+  hours: number;
+  socDrop: number;
+}
+
+/** One day's consumption: the sum of every chunk the car sent for that date. */
+export interface DailyConsumption {
+  installationId: string;
+  /** The car's local date, YYYY-MM-DD. */
+  date: string;
+  /** When the newest chunk of the day was recorded. */
+  recordedAt: Date;
+  day: Totals;
+  /** Running total up to and including this day, derived when history is read. */
+  lifetime?: Totals;
+  sohPercent?: number;
+}
+
+/** One 2-minute delta chunk as the car sends it; days are built from these. */
+export interface ConsumptionChunk {
+  installationId: string;
+  date: string;
+  recordedAt: Date;
+  day: Totals;
+  sohPercent?: number;
+}
+
+export interface CurvePoint {
+  timestamp: Date;
+  powerKw: number;
+  socPercent?: number;
+}
+
+export interface ChargingSession {
+  installationId: string;
+  sessionId: string;
+  startedAt: Date;
+  endedAt: Date;
+  durationSeconds: number;
+  energyKwh: number;
+  chargingLossPercent: number;
+  gridEnergyKwh: number;
+  pricePerKwh: number;
+  totalCost: number;
+  isDemo?: boolean;
+  startSocPercent?: number;
+  endSocPercent?: number;
+  curve: CurvePoint[];
+}
+
+/** Numeric live-telemetry fields, named and unit-ed as ABRP's tlm/send expects them. */
+export const TELEMETRY_NUMBERS = {
+  soc: [0, 100], // %
+  speed: [0, 400], // km/h
+  power: [-1000, 1000], // kW, positive leaving the battery
+  est_battery_range: [0, 2000], // km
+  capacity: [0, 500], // kWh
+  soe: [0, 500], // kWh
+  soh: [0, 100], // %
+  kwh_charged: [0, 1000], // kWh, this charge session
+  odometer: [0, 10_000_000], // km
+  lat: [-90, 90],
+  lon: [-180, 180],
+  elevation: [-1000, 10_000], // m
+  heading: [0, 360], // °
+  batt_temp: [-60, 100], // °C
+  cabin_temp: [-60, 100], // °C
+  ext_temp: [-60, 70], // °C
+  hvac_setpoint: [0, 40], // °C
+  hvac_power: [0, 50], // kW
+  voltage: [0, 1500], // V
+  current: [-2000, 2000], // A
+  tire_pressure_fl: [0, 1000], // kPa
+  tire_pressure_fr: [0, 1000],
+  tire_pressure_rl: [0, 1000],
+  tire_pressure_rr: [0, 1000],
+} as const satisfies Record<string, readonly [number, number]>;
+
+/** Boolean live-telemetry fields; ABRP takes them as 0/1. */
+export const TELEMETRY_FLAGS = ["is_charging", "is_dcfc", "is_parked"] as const;
+
+export type TelemetryNumber = keyof typeof TELEMETRY_NUMBERS;
+export type TelemetryFlag = (typeof TELEMETRY_FLAGS)[number];
+
+/** One live sample. Only `utc` is always present; an unread signal is absent, never 0. */
+export type TelemetrySample = { utc: number } & Partial<Record<TelemetryNumber, number>> &
+  Partial<Record<TelemetryFlag, boolean>>;
+
+export interface TelemetryBatch {
+  installationId: string;
+  samples: TelemetrySample[];
+}
diff --git a/web/src/lib/validate.ts b/web/src/lib/validate.ts
index 1184fc0..945657e 100644
--- a/web/src/lib/validate.ts
+++ b/web/src/lib/validate.ts
@@ -6,35 +6,40 @@
  * read forever. Every number is bounded; an out-of-range value is rejected rather than
  * stored and quietly plotted.
  */
-import type { ChargingSession, CurvePoint, DailyConsumption, Totals } from "./mongo";
+import {
+  TELEMETRY_FLAGS,
+  TELEMETRY_NUMBERS,
+  type ChargingSession,
+  type ConsumptionChunk,
+  type CurvePoint,
+  type TelemetryBatch,
+  type TelemetrySample,
+  type Totals,
+} from "./types.ts";
 
 export class ValidationError extends Error {}
 
 const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 const ISO_DATE = /^\d{4}-\d{2}-\d{2}$/;
 
-export type ConsumptionInput = Omit<DailyConsumption, "createdAt" | "updatedAt">;
-export type ChargingInput = Omit<ChargingSession, "createdAt" | "updatedAt">;
-
-export function validateConsumption(body: unknown): ConsumptionInput {
+export function validateConsumption(body: unknown): ConsumptionChunk {
   const record = asObject(body);
   const date = record.date;
   if (typeof date !== "string" || !ISO_DATE.test(date)) throw new ValidationError("date is invalid");
   const sohPercent = record.sohPercent;
-  const lifetime = record.lifetime;
+  // A lifetime from an older app is still validated, so a malformed one is still a 400,
+  // but it is not stored: the backend derives lifetime from the day totals.
+  if (record.lifetime !== undefined) validateTotals(record.lifetime, "lifetime");
   return {
     installationId: validateUuid(record.installationId, "installationId"),
     date,
     recordedAt: validateDate(record.recordedAt, "recordedAt"),
     day: validateTotals(record.day, "day"),
-    // Lifetime is optional — the backend derives it from day totals, and the app no longer
-    // sends it. Legacy documents may still carry one; new chunks do not.
-    ...(lifetime === undefined ? {} : { lifetime: validateTotals(lifetime, "lifetime") }),
     ...(sohPercent === undefined ? {} : { sohPercent: bounded(sohPercent, 0, 100, "sohPercent") }),
   };
 }
 
-export function validateChargingSession(body: unknown, pathSessionId: string): ChargingInput {
+export function validateChargingSession(body: unknown, pathSessionId: string): ChargingSession {
   const record = asObject(body);
   const sessionId = validateUuid(record.sessionId, "sessionId");
   if (sessionId !== pathSessionId) throw new ValidationError("sessionId does not match path");
@@ -75,6 +80,52 @@ export function validateChargingSession(body: unknown, pathSessionId: string): C
   };
 }
 
+const MAX_SAMPLES = 500;
+/** Epoch seconds: 2001 to 2286. Milliseconds would be far above the upper bound. */
+const UTC_MIN = 1_000_000_000;
+const UTC_MAX = 9_999_999_999;
+
+/**
+ * A batch of live samples in ABRP's tlm field names and units. Fields the server does not
+ * know are dropped rather than rejected, so a newer app can add one without a server
+ * release; every known field is bounded, and a flag may be sent as 0/1 or a boolean.
+ */
+export function validateTelemetryBatch(body: unknown): TelemetryBatch {
+  const record = asObject(body);
+  const installationId = validateUuid(record.installationId, "installationId");
+  const samples = record.samples;
+  if (!Array.isArray(samples) || samples.length === 0 || samples.length > MAX_SAMPLES) {
+    throw new ValidationError("samples is invalid");
+  }
+  return { installationId, samples: samples.map((entry, i) => validateSample(entry, `samples[${i}]`)) };
+}
+
+function validateSample(entry: unknown, name: string): TelemetrySample {
+  const raw = asObject(entry);
+  const utc = raw.utc;
+  if (typeof utc !== "number" || !Number.isSafeInteger(utc) || utc < UTC_MIN || utc > UTC_MAX) {
+    throw new ValidationError(`${name}.utc is invalid`);
+  }
+  const sample: TelemetrySample = { utc };
+  for (const [field, [min, max]] of Object.entries(TELEMETRY_NUMBERS)) {
+    const value = raw[field];
+    if (value === undefined || value === null) continue;
+    (sample as Record<string, unknown>)[field] = bounded(value, min, max, `${name}.${field}`);
+  }
+  for (const field of TELEMETRY_FLAGS) {
+    const value = raw[field];
+    if (value === undefined || value === null) continue;
+    if (value === true || value === 1) sample[field] = true;
+    else if (value === false || value === 0) sample[field] = false;
+    else throw new ValidationError(`${name}.${field} is invalid`);
+  }
+  // A position is only a position as a pair.
+  if ((sample.lat === undefined) !== (sample.lon === undefined)) {
+    throw new ValidationError(`${name}.lat and lon must be sent together`);
+  }
+  return sample;
+}
+
 export function validateUuid(value: unknown, name: string): string {
   if (typeof value !== "string" || !UUID.test(value)) throw new ValidationError(`${name} is invalid`);
   return value;
diff --git a/web/test/days.test.ts b/web/test/days.test.ts
new file mode 100644
index 0000000..6fb6486
--- /dev/null
+++ b/web/test/days.test.ts
@@ -0,0 +1,37 @@
+import assert from "node:assert/strict";
+import { test } from "node:test";
+import { aggregateDays } from "../src/lib/days.ts";
+
+const ID = "6f1a2b3c-4d5e-4f60-8a9b-0c1d2e3f4a5b";
+const chunk = (date: string, at: number, km: number, kwh: number, sohPercent?: number) => ({
+  installationId: ID,
+  date,
+  recordedAt: new Date(at),
+  day: { km, kwh, hours: km / 50, socDrop: kwh / 0.6 },
+  ...(sohPercent === undefined ? {} : { sohPercent }),
+});
+
+test("adds chunks up per day, newest day first, with a running lifetime", () => {
+  const days = aggregateDays([
+    chunk("2026-10-16", 1_000, 10, 2),
+    chunk("2026-10-17", 3_000, 5, 1),
+    chunk("2026-10-16", 2_000, 20, 3),
+  ]);
+  assert.deepEqual(days.map((d) => d.date), ["2026-10-17", "2026-10-16"]);
+  assert.equal(days[1].day.km, 30);
+  assert.equal(days[1].day.kwh, 5);
+  assert.equal(days[1].recordedAt.getTime(), 2_000);
+  assert.equal(days[1].lifetime?.km, 30);
+  assert.equal(days[0].lifetime?.km, 35);
+  assert.equal(days[0].lifetime?.kwh, 6);
+});
+
+test("the newest manual SoH of a day wins, and a day without one has none", () => {
+  const days = aggregateDays([
+    chunk("2026-10-16", 2_000, 1, 1, 96),
+    chunk("2026-10-16", 1_000, 1, 1, 98),
+    chunk("2026-10-17", 3_000, 1, 1),
+  ]);
+  assert.equal(days[1].sohPercent, 96);
+  assert.equal("sohPercent" in days[0], false);
+});
diff --git a/web/test/telemetry.test.ts b/web/test/telemetry.test.ts
new file mode 100644
index 0000000..7adea8a
--- /dev/null
+++ b/web/test/telemetry.test.ts
@@ -0,0 +1,56 @@
+import assert from "node:assert/strict";
+import { test } from "node:test";
+import { pickForForward, resetAbrpState, toTlm } from "../src/lib/abrp.ts";
+import { ValidationError, validateTelemetryBatch } from "../src/lib/validate.ts";
+
+const INSTALLATION = "6f1a2b3c-4d5e-4f60-8a9b-0c1d2e3f4a5b";
+const NOW_S = 1_790_000_000;
+
+test("accepts a sample in ABRP's field names and keeps only what was sent", () => {
+  const batch = validateTelemetryBatch({
+    installationId: INSTALLATION,
+    samples: [{ utc: NOW_S, soc: 81, power: -12.5, speed: 0, lat: 52.1, lon: 7.6, is_charging: 1, is_dcfc: false }],
+  });
+  assert.deepEqual(batch.samples[0], {
+    utc: NOW_S, soc: 81, power: -12.5, speed: 0, lat: 52.1, lon: 7.6, is_charging: true, is_dcfc: false,
+  });
+  // An unread signal stays absent: a missing SOC must never become 0.
+  assert.equal("est_battery_range" in batch.samples[0], false);
+});
+
+test("drops unknown fields instead of rejecting the batch", () => {
+  const batch = validateTelemetryBatch({ installationId: INSTALLATION, samples: [{ utc: NOW_S, future_field: 3 }] });
+  assert.deepEqual(batch.samples[0], { utc: NOW_S });
+});
+
+test("rejects bad timestamps, out-of-range values, bad flags and half positions", () => {
+  const send = (sample: object) => validateTelemetryBatch({ installationId: INSTALLATION, samples: [sample] });
+  assert.throws(() => send({ utc: NOW_S * 1000 }), ValidationError); // milliseconds, not seconds
+  assert.throws(() => send({ utc: 1.5 }), ValidationError);
+  assert.throws(() => send({ utc: NOW_S, soc: 101 }), ValidationError);
+  assert.throws(() => send({ utc: NOW_S, speed: "fast" }), ValidationError);
+  assert.throws(() => send({ utc: NOW_S, is_parked: 2 }), ValidationError);
+  assert.throws(() => send({ utc: NOW_S, lat: 52.1 }), ValidationError);
+});
+
+test("rejects empty and oversized batches and bad installation ids", () => {
+  assert.throws(() => validateTelemetryBatch({ installationId: INSTALLATION, samples: [] }), ValidationError);
+  const many = Array.from({ length: 501 }, (_, i) => ({ utc: NOW_S + i }));
+  assert.throws(() => validateTelemetryBatch({ installationId: INSTALLATION, samples: many }), ValidationError);
+  assert.throws(() => validateTelemetryBatch({ installationId: "nope", samples: [{ utc: NOW_S }] }), ValidationError);
+});
+
+test("ABRP gets flags as 0/1", () => {
+  assert.deepEqual(toTlm({ utc: NOW_S, soc: 50, is_charging: true, is_parked: false }), {
+    utc: NOW_S, soc: 50, is_charging: 1, is_parked: 0,
+  });
+});
+
+test("forwards only the newest fresh sample, at most once per interval", () => {
+  resetAbrpState();
+  const nowMs = NOW_S * 1000;
+  const picked = pickForForward([{ utc: NOW_S - 10 }, { utc: NOW_S - 2 }, { utc: NOW_S - 5 }], nowMs);
+  assert.equal(picked?.utc, NOW_S - 2);
+  // A sample from ten minutes ago describes a car that has moved on.
+  assert.equal(pickForForward([{ utc: NOW_S - 600 }], nowMs), null);
+});
diff --git a/web/tsconfig.json b/web/tsconfig.json
index 90069c0..deb57ab 100644
--- a/web/tsconfig.json
+++ b/web/tsconfig.json
@@ -6,6 +6,7 @@
     "skipLibCheck": true,
     "strict": true,
     "noEmit": true,
+    "allowImportingTsExtensions": true,
     "esModuleInterop": true,
     "module": "esnext",
     "moduleResolution": "bundler",

From c253876ed2707cb7abd2e8a435cfa2fd26755a3e Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 14:11:58 +0200
Subject: [PATCH 13/79] Add Kubernetes manifests for car.stinnesbeck.com

Namespace, InfluxDB 2.7.12 StatefulSet with PVC and a NetworkPolicy
that admits only the server, the server Deployment (non-root, read-only
root filesystem), a cert-manager Certificate from letsencrypt-prod and a
Traefik IngressRoute. Secrets are a template only. Nothing is applied;
k8s/README.md has the steps. Server version bumped to 1.1.0.

Validated offline with kustomize and kubeconform (including the
cert-manager and Traefik CRD schemas). The InfluxDB container was tested
locally as UID 1000 with no capabilities.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 k8s/README.md            |  44 +++++++++++++
 k8s/influxdb.yaml        | 130 +++++++++++++++++++++++++++++++++++++++
 k8s/ingress.yaml         |  37 +++++++++++
 k8s/kustomization.yaml   |  12 ++++
 k8s/namespace.yaml       |   4 ++
 k8s/secrets.example.yaml |  34 ++++++++++
 k8s/server.yaml          | 103 +++++++++++++++++++++++++++++++
 web/package-lock.json    |   4 +-
 web/package.json         |   2 +-
 9 files changed, 367 insertions(+), 3 deletions(-)
 create mode 100644 k8s/README.md
 create mode 100644 k8s/influxdb.yaml
 create mode 100644 k8s/ingress.yaml
 create mode 100644 k8s/kustomization.yaml
 create mode 100644 k8s/namespace.yaml
 create mode 100644 k8s/secrets.example.yaml
 create mode 100644 k8s/server.yaml

diff --git a/k8s/README.md b/k8s/README.md
new file mode 100644
index 0000000..ecbb682
--- /dev/null
+++ b/k8s/README.md
@@ -0,0 +1,44 @@
+# Kubernetes manifests — car.stinnesbeck.com
+
+Plain manifests for the car server and its InfluxDB 2. They are only files: nothing here is
+applied automatically. Apply them yourself.
+
+| File | What |
+|---|---|
+| `namespace.yaml` | Namespace `mg4` |
+| `influxdb.yaml` | InfluxDB 2.7.12 StatefulSet (10Gi PVC, default storage class), cluster-internal Service, NetworkPolicy allowing only the server |
+| `server.yaml` | Server Deployment (1 replica, non-root, read-only root filesystem) and Service |
+| `ingress.yaml` | cert-manager `Certificate` from `letsencrypt-prod`, Traefik `IngressRoute` on `websecure` |
+| `secrets.example.yaml` | **Template** for the two Secrets; not in `kustomization.yaml` |
+| `kustomization.yaml` | Everything except the Secrets; pins the server image tag |
+
+## Before the first apply
+
+1. **Check the ingress class** in `ingress.yaml`. It is set to `traefik-external` as a
+   placeholder; use the class of your public-facing Traefik.
+2. **Create the Secrets.** Copy `secrets.example.yaml` outside the repository, replace every
+   `CHANGE-ME` (`openssl rand -hex 32` for tokens), then apply the copy:
+   `influxdb-auth` (InfluxDB admin password and token) and `mg4-server` (ingest token,
+   session secret, dashboard password, your ABRP API key and user token).
+3. **Registry access.** If the `mg4-server` package on git.stinnesbeck.com is private, create
+   the `git-stinnesbeck-registry` pull secret (command in `secrets.example.yaml`); if it is
+   public, delete `imagePullSecrets` from `server.yaml`.
+
+## Apply
+
+```sh
+kubectl apply -f k8s/namespace.yaml
+kubectl apply -f <your filled-in secrets file>
+kubectl apply -k k8s/
+```
+
+The Let's Encrypt HTTP-01 challenge needs car.stinnesbeck.com to resolve to the public
+Traefik before the certificate can be issued; check with `kubectl -n mg4 get certificate`.
+
+## Notes
+
+- InfluxDB's setup mode runs only on an empty volume. Changing `admin-token` in the Secret
+  later does not change the token inside InfluxDB.
+- The server uses the InfluxDB admin token. A token scoped to the `mg4` bucket can replace it
+  later (`influx auth create --read-bucket … --write-bucket …`).
+- To upgrade the server, push a new image tag and change `newTag` in `kustomization.yaml`.
diff --git a/k8s/influxdb.yaml b/k8s/influxdb.yaml
new file mode 100644
index 0000000..72c2555
--- /dev/null
+++ b/k8s/influxdb.yaml
@@ -0,0 +1,130 @@
+# InfluxDB 2, cluster-internal only. On first start (empty volume) the image's setup mode
+# creates the org, the bucket and the admin token from the influxdb-auth Secret; on later
+# starts those variables are ignored and the data on the volume wins.
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: influxdb
+  namespace: mg4
+  labels:
+    app.kubernetes.io/name: influxdb
+    app.kubernetes.io/part-of: mg4
+spec:
+  serviceName: influxdb
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: influxdb
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: influxdb
+        app.kubernetes.io/part-of: mg4
+    spec:
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 1000
+        runAsGroup: 1000
+        fsGroup: 1000
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+        - name: influxdb
+          image: docker.io/library/influxdb:2.7.12-alpine
+          ports:
+            - name: http
+              containerPort: 8086
+          env:
+            - name: INFLUXD_REPORTING_DISABLED
+              value: "true"
+            - name: DOCKER_INFLUXDB_INIT_MODE
+              value: setup
+            - name: DOCKER_INFLUXDB_INIT_ORG
+              value: mg4
+            - name: DOCKER_INFLUXDB_INIT_BUCKET
+              value: mg4
+            - name: DOCKER_INFLUXDB_INIT_USERNAME
+              value: admin
+            - name: DOCKER_INFLUXDB_INIT_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: influxdb-auth
+                  key: admin-password
+            - name: DOCKER_INFLUXDB_INIT_ADMIN_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: influxdb-auth
+                  key: admin-token
+          volumeMounts:
+            - name: data
+              mountPath: /var/lib/influxdb2
+            - name: config
+              mountPath: /etc/influxdb2
+          readinessProbe:
+            httpGet:
+              path: /health
+              port: http
+            periodSeconds: 10
+          livenessProbe:
+            httpGet:
+              path: /health
+              port: http
+            initialDelaySeconds: 30
+            periodSeconds: 30
+          resources:
+            requests:
+              cpu: 100m
+              memory: 256Mi
+            limits:
+              memory: 1Gi
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+      volumes:
+        - name: config
+          emptyDir: {}
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+      spec:
+        accessModes: ["ReadWriteOnce"]
+        # No storageClassName: the cluster's default class is used.
+        resources:
+          requests:
+            storage: 10Gi
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: influxdb
+  namespace: mg4
+  labels:
+    app.kubernetes.io/name: influxdb
+    app.kubernetes.io/part-of: mg4
+spec:
+  selector:
+    app.kubernetes.io/name: influxdb
+  ports:
+    - name: http
+      port: 8086
+      targetPort: http
+---
+# Only the server may reach InfluxDB. Has no effect on a CNI without NetworkPolicy support.
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: influxdb-from-server-only
+  namespace: mg4
+spec:
+  podSelector:
+    matchLabels:
+      app.kubernetes.io/name: influxdb
+  policyTypes: ["Ingress"]
+  ingress:
+    - from:
+        - podSelector:
+            matchLabels:
+              app.kubernetes.io/name: mg4-server
+      ports:
+        - port: 8086
diff --git a/k8s/ingress.yaml b/k8s/ingress.yaml
new file mode 100644
index 0000000..ff60931
--- /dev/null
+++ b/k8s/ingress.yaml
@@ -0,0 +1,37 @@
+# TLS certificate from cert-manager. cert-manager does not watch Traefik IngressRoutes, so the
+# certificate is requested explicitly and the IngressRoute references its Secret.
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: car-stinnesbeck-com
+  namespace: mg4
+spec:
+  secretName: car-stinnesbeck-com-tls
+  dnsNames:
+    - car.stinnesbeck.com
+  issuerRef:
+    kind: ClusterIssuer
+    name: letsencrypt-prod
+---
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: mg4-server
+  namespace: mg4
+  annotations:
+    # CHECK: the class of your public-facing Traefik. Your internal example uses
+    # "traefik-internal"; this host must be served by the external one.
+    kubernetes.io/ingress.class: traefik-external
+spec:
+  entryPoints:
+    - websecure
+  routes:
+    - kind: Rule
+      match: Host(`car.stinnesbeck.com`)
+      services:
+        - kind: Service
+          name: mg4-server
+          namespace: mg4
+          port: 80
+  tls:
+    secretName: car-stinnesbeck-com-tls
diff --git a/k8s/kustomization.yaml b/k8s/kustomization.yaml
new file mode 100644
index 0000000..7a45bf6
--- /dev/null
+++ b/k8s/kustomization.yaml
@@ -0,0 +1,12 @@
+# Render with `kustomize build k8s/` (or `kubectl kustomize k8s/`) and apply it yourself.
+# The Secrets are not included: create them from secrets.example.yaml first.
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - namespace.yaml
+  - influxdb.yaml
+  - server.yaml
+  - ingress.yaml
+images:
+  - name: git.stinnesbeck.com/nils/mg4-server
+    newTag: "1.1.0"
diff --git a/k8s/namespace.yaml b/k8s/namespace.yaml
new file mode 100644
index 0000000..dc634fe
--- /dev/null
+++ b/k8s/namespace.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: mg4
diff --git a/k8s/secrets.example.yaml b/k8s/secrets.example.yaml
new file mode 100644
index 0000000..9b7dd47
--- /dev/null
+++ b/k8s/secrets.example.yaml
@@ -0,0 +1,34 @@
+# TEMPLATE ONLY — not part of kustomization.yaml. Copy it outside the repository, fill in
+# real values, and apply that copy yourself. Never commit the filled-in file.
+#
+#   openssl rand -hex 32     for every token and secret below
+apiVersion: v1
+kind: Secret
+metadata:
+  name: influxdb-auth
+  namespace: mg4
+type: Opaque
+stringData:
+  admin-password: CHANGE-ME-at-least-8-characters
+  admin-token: CHANGE-ME-openssl-rand-hex-32
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: mg4-server
+  namespace: mg4
+type: Opaque
+stringData:
+  # The car's write token, entered in the app. At least 24 characters.
+  INGEST_TOKEN: CHANGE-ME-openssl-rand-hex-32
+  SESSION_SECRET: CHANGE-ME-openssl-rand-hex-32
+  DASHBOARD_PASSWORD: CHANGE-ME-at-least-8-characters
+  # Your ABRP credentials. Leave either empty to switch forwarding off.
+  ABRP_API_KEY: CHANGE-ME
+  ABRP_USER_TOKEN: CHANGE-ME
+  ABRP_MIN_INTERVAL_SECONDS: "5"
+---
+# Pull secret for a private image on git.stinnesbeck.com. Easier to create with:
+#   kubectl -n mg4 create secret docker-registry git-stinnesbeck-registry \
+#     --docker-server=git.stinnesbeck.com --docker-username=<user> --docker-password=<token>
+# If the package is public, remove imagePullSecrets from server.yaml instead.
diff --git a/k8s/server.yaml b/k8s/server.yaml
new file mode 100644
index 0000000..01c7039
--- /dev/null
+++ b/k8s/server.yaml
@@ -0,0 +1,103 @@
+# The car server. One replica on purpose: the ABRP rate limit is kept in memory, and two
+# replicas would each forward to ABRP at the full rate.
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: mg4-server
+  namespace: mg4
+  labels:
+    app.kubernetes.io/name: mg4-server
+    app.kubernetes.io/part-of: mg4
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: mg4-server
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: mg4-server
+        app.kubernetes.io/part-of: mg4
+    spec:
+      # Needed only if the image is private on git.stinnesbeck.com; see secrets.example.yaml.
+      imagePullSecrets:
+        - name: git-stinnesbeck-registry
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 10001
+        runAsGroup: 10001
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+        - name: server
+          image: git.stinnesbeck.com/nils/mg4-server:latest # pinned by kustomization.yaml
+          ports:
+            - name: http
+              containerPort: 3000
+          env:
+            - name: INFLUX_URL
+              value: http://influxdb.mg4.svc:8086
+            - name: INFLUX_ORG
+              value: mg4
+            - name: INFLUX_BUCKET
+              value: mg4
+            - name: INFLUX_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: influxdb-auth
+                  key: admin-token
+          # INGEST_TOKEN, SESSION_SECRET, DASHBOARD_PASSWORD, ABRP_API_KEY, ABRP_USER_TOKEN.
+          envFrom:
+            - secretRef:
+                name: mg4-server
+          readinessProbe:
+            httpGet:
+              path: /v1/health
+              port: http
+            periodSeconds: 10
+          livenessProbe:
+            httpGet:
+              path: /v1/health
+              port: http
+            initialDelaySeconds: 10
+            periodSeconds: 30
+          resources:
+            requests:
+              cpu: 50m
+              memory: 128Mi
+            limits:
+              memory: 512Mi
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop: ["ALL"]
+          volumeMounts:
+            # Next.js writes its fetch/image cache here; the rest of the filesystem is read-only.
+            - name: next-cache
+              mountPath: /app/.next/cache
+            - name: tmp
+              mountPath: /tmp
+      volumes:
+        - name: next-cache
+          emptyDir: {}
+        - name: tmp
+          emptyDir: {}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: mg4-server
+  namespace: mg4
+  labels:
+    app.kubernetes.io/name: mg4-server
+    app.kubernetes.io/part-of: mg4
+spec:
+  selector:
+    app.kubernetes.io/name: mg4-server
+  ports:
+    - name: http
+      port: 80
+      targetPort: http
diff --git a/web/package-lock.json b/web/package-lock.json
index 8ad8c25..1dcb4ec 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "fatihsmg4-web",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "fatihsmg4-web",
-      "version": "1.0.0",
+      "version": "1.1.0",
       "dependencies": {
         "@influxdata/influxdb-client": "^1.35.0",
         "next": "^15.5.4",
diff --git a/web/package.json b/web/package.json
index 8854c8f..a061eb4 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fatihsmg4-web",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "private": true,
   "scripts": {
     "dev": "next dev",

From 6145736c9766f8ef4d269fa113421bca1333c43e Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 14:23:04 +0200
Subject: [PATCH 14/79] App 2.3.0: Server tab, live telemetry to the car server

- New Server tab: server URL, ingest token and installation id, with
  Save, Test connection (health, then a read-only token check) and the
  config-file import that upstream removed (app folder / USB stick first,
  document picker as fallback). Settings are kept encrypted and read on
  every use, so the service picks up a change without a restart. Each
  installation generates its own id; the inherited upstream UUID and
  the baked-in CONSUMPTION_API_* build fields are gone.
- Live telemetry restored from before ea8032a (TelemetryPayload,
  UploadCadence, UploadSettings, GPS) and sent in batches to
  POST /v1/telemetry instead of ABRP; the server forwards to ABRP. Adds
  ext_temp, voltage and current. Unsent samples queue in memory (about
  8 h) while offline.
- Upload tab: the live-telemetry switch and cadence controls work again;
  the dead service and autostart switches are removed.
- Manifest: location permissions and foreground service types.
- Unit tests compile again: 114 (stable) / 136 (unstable) pass. Tests
  for the deleted AbrpApi and HeadUnitWeather removed; new tests for
  ServerConfig and TelemetryQueue. Lint passes.

Not yet tried on the car.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 SPECS.md                                      |  56 +--
 app/build.gradle                              |  14 +-
 app/src/main/AndroidManifest.xml              |   8 +-
 .../com/evsuite/abrp/AbrpUploadService.java   |  31 +-
 .../java/com/evsuite/abrp/ConfigImport.java   | 127 ++++++
 .../evsuite/abrp/ConsumptionCloudClient.java  |  45 +--
 .../java/com/evsuite/abrp/MainActivity.java   | 379 +++++++++++++++++-
 .../java/com/evsuite/abrp/SecurePrefs.java    |  48 +++
 .../java/com/evsuite/abrp/ServerConfig.java   | 100 +++++
 .../com/evsuite/abrp/TelemetryPayload.java    | 213 ++++++++++
 .../java/com/evsuite/abrp/TelemetryQueue.java |  59 +++
 .../com/evsuite/abrp/TelemetryUploader.java   | 264 ++++++++++++
 .../java/com/evsuite/abrp/UploadCadence.java  |  66 +++
 .../java/com/evsuite/abrp/UploadSettings.java |  77 +++-
 app/src/main/res/drawable/ic_tab_server.xml   |  23 ++
 .../main/res/layout-w1000dp/activity_main.xml |   1 +
 .../main/res/layout-w1000dp/pane_service.xml  |   5 +-
 app/src/main/res/layout/activity_main.xml     |   1 +
 app/src/main/res/layout/pane_server.xml       |  30 ++
 app/src/main/res/layout/pane_service.xml      |   5 +-
 app/src/main/res/values/strings.xml           |  48 +--
 app/src/main/res/values/strings_design.xml    |   8 +-
 .../java/com/evsuite/abrp/AbrpApiTest.java    |  50 ---
 .../com/evsuite/abrp/ConfigImportTest.java    |  23 +-
 .../com/evsuite/abrp/HeadUnitWeatherTest.java | 109 -----
 .../com/evsuite/abrp/ServerConfigTest.java    |  47 +++
 .../com/evsuite/abrp/TelemetryQueueTest.java  |  40 ++
 27 files changed, 1590 insertions(+), 287 deletions(-)
 create mode 100644 app/src/main/java/com/evsuite/abrp/ConfigImport.java
 create mode 100644 app/src/main/java/com/evsuite/abrp/SecurePrefs.java
 create mode 100644 app/src/main/java/com/evsuite/abrp/ServerConfig.java
 create mode 100644 app/src/main/java/com/evsuite/abrp/TelemetryPayload.java
 create mode 100644 app/src/main/java/com/evsuite/abrp/TelemetryQueue.java
 create mode 100644 app/src/main/java/com/evsuite/abrp/TelemetryUploader.java
 create mode 100644 app/src/main/java/com/evsuite/abrp/UploadCadence.java
 create mode 100644 app/src/main/res/drawable/ic_tab_server.xml
 create mode 100644 app/src/main/res/layout/pane_server.xml
 delete mode 100644 app/src/test/java/com/evsuite/abrp/AbrpApiTest.java
 delete mode 100644 app/src/test/java/com/evsuite/abrp/HeadUnitWeatherTest.java
 create mode 100644 app/src/test/java/com/evsuite/abrp/ServerConfigTest.java
 create mode 100644 app/src/test/java/com/evsuite/abrp/TelemetryQueueTest.java

diff --git a/SPECS.md b/SPECS.md
index a315240..3991e21 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -27,7 +27,7 @@ car ──live telemetry───▶ car.stinnesbeck.com ──▶ ABRP  api.ite
   | Measurement | Timestamp | Tags | Fields |
   |---|---|---|---|
   | `telemetry` | sample time | — | soc, power, speed, lat, lon, heading, elevation, is_charging, is_dcfc, is_parked, capacity, soe, odometer, est_battery_range, batt_temp, cabin_temp, ext_temp, hvac_setpoint, voltage, current, tire_pressure_fl/fr/rl/rr |
-  | `consumption_daily` | the day, 00:00 UTC | — | km, kwh, hours, socDrop, sohPercent |
+  | `consumption_chunk` | recordedAt | date | km, kwh, hours, socDrop, sohPercent (days summed on read) |
   | `charging_session` | startedAt | sessionId | endedAt, durationSeconds, energyKwh, gridEnergyKwh, pricePerKwh, totalCost, start/endSocPercent |
   | `charging_curve` | point time | sessionId | powerKw, socPercent |
 
@@ -40,15 +40,16 @@ car ──live telemetry───▶ car.stinnesbeck.com ──▶ ABRP  api.ite
   retried, since stale live data is useless to ABRP. Off when the token is unset.
 - **Existing endpoints stay:** `PUT /v1/consumption/daily`, `PUT /v1/charging-sessions/:id`,
   `GET /v1/consumption/history/:id`, the dashboard and `/v1/health`.
-- **Self-hosting:** drop the Vercel assumptions, `output: "standalone"`, a `Dockerfile`, and
-  `ensureIndexes()` replaced by bucket checks at startup.
+- **Self-hosting:** `output: "standalone"`, a `Dockerfile`, and InfluxDB's own overwrite semantics
+  instead of `ensureIndexes()`.
 
 ### Car app
 
 - Restore the live telemetry payload and upload cadence from before `ea8032a` (`TelemetryPayload`,
   `UploadCadence`, location access), sending to the server instead of ABRP.
-- Server URL and ingest token: open question, see below.
-- Generate our own `CONSUMPTION_INSTALLATION_ID`.
+- Server URL, ingest token and installation id are entered in a new **Server** tab or imported from
+  a config file; nothing about the server is compiled into the APK. Each installation generates
+  its own id.
 
 ### Image and deployment
 
@@ -59,15 +60,23 @@ car ──live telemetry───▶ car.stinnesbeck.com ──▶ ABRP  api.ite
   with placeholder values only.
 - **Nothing is ever applied to the cluster by us.** Nils applies the manifests.
 
-### Open questions
+### Decisions (2026-10-17)
 
-- [ ] Run InfluxDB inside the cluster from our manifests (assumed), or use an existing instance?
-- [ ] Ingress class and TLS setup (e.g. cert-manager `ClusterIssuer` name), or an existing wildcard
-      certificate Secret?
-- [ ] Car config: bake the server URL and ingest token into the APK at build time (as upstream
-      does), or enter them in the app, which restores the settings tab with the config-file import?
-      In the app keeps the token out of the APK.
-- [ ] ABRP API key: the open-source default key from upstream, or our own?
+- InfluxDB 2 runs in the cluster from our manifests.
+- TLS: cert-manager `ClusterIssuer` `letsencrypt-prod`; Traefik `IngressRoute` on `websecure`.
+- Car config is entered in the app (Server tab / config file), not baked into the APK.
+- The ABRP API key and user token are set by Nils in the `mg4-server` Secret.
+
+### Status
+
+- [x] Server on InfluxDB 2 with `/v1/telemetry` and the ABRP forwarder (`web/`), tested locally
+      against InfluxDB 2.7.12. Image builds.
+- [x] Manifests in `k8s/`, validated offline. **Not applied** — that is Nils' step (`k8s/README.md`).
+- [x] Car app 2.3.0: Server tab with config import, live telemetry upload, cadence controls.
+      Unit tests and lint pass; **not yet tried on the car**.
+- [ ] Push the image to git.stinnesbeck.com (needs a registry login on the build machine).
+- [ ] Check the Traefik ingress class in `k8s/ingress.yaml` (placeholder `traefik-external`).
+- [ ] First drive with 2.3.0: telemetry arrives in InfluxDB and at ABRP.
 
 ## To do
 
@@ -81,19 +90,12 @@ car ──live telemetry───▶ car.stinnesbeck.com ──▶ ABRP  api.ite
       (`ALLOWED_HOSTS`). For git.stinnesbeck.com it needs the host on the allowlist, and the
       response parsing checked against that server's releases API. Release assets must be named
       `NilsMG4-unstable-<version>.apk` with a `.sha256` sidecar (`build-car` writes both).
-- [ ] **ABRP upload is gone upstream.** Upstream commit `ea8032a` ("chore", 2026-10-09) removed the
-      ABRP tab, the config-file import (`ConfigImport`), the upload (`AbrpApi`, `TelemetryPayload`,
-      `UploadCadence`), `SecurePrefs` and `HeadUnitWeather`. The app now only tracks consumption
-      and syncs it to the MongoDB API. Leftover `strings.xml` entries (`btn_import`, `import_*`,
-      `hint_api_key`, …) belong to it. Decide whether to restore it.
-- [ ] **Fix the unit tests.** They don't compile upstream: `AbrpApiTest`, `TelemetryPayloadTest`
-      and others still use `AbrpApi`/`TelemetryPayload`, which upstream commit `ea8032a` deleted.
 - [ ] **Charging currency.** Prices and costs are shown in Turkish lira (`₺/kWh`, `₺`) in
       `pane_charging.xml` and `MainActivity.java`.
-- [ ] **Cloud consumption sync.** `CONSUMPTION_INSTALLATION_ID` in `app/build.gradle` is a fixed
-      UUID inherited from upstream. Set our own before configuring `CONSUMPTION_API_URL` /
-      `CONSUMPTION_API_TOKEN`, so our data cannot land under upstream's id.
-- [ ] **Translate the rest.** The `web/` dashboard (Next.js) and docs (`CHANGELOG.md`, `OTA.md`'s
+- [ ] **Dashboard language and branding.** The `web/` pages are still Turkish, say "FatihsMG4" and
+      show prices in lira.
+- [ ] **Telemetry queue survives restarts.** Unsent live samples are kept in memory only.
+- [ ] **Translate the rest.** The docs (`CHANGELOG.md`, `OTA.md`'s
       message table, comments in `mise.toml`/`app/build.gradle`) are still Turkish or French.
 - [ ] **Docs still use the old package ID.** `README.md`, `OTA.md`, `CHANGELOG.md`, `mise.toml` and
       `docs/MG4_PLATFORM_INSTALL.md` refer to `com.evsuite.abrp(.unstable)` and `FatihsMG4-*.apk`.
@@ -109,6 +111,12 @@ car ──live telemetry───▶ car.stinnesbeck.com ──▶ ABRP  api.ite
 - 2026-10-17 — Renamed to "Nils' MG4": package ID `com.stinnesbeck.nilsmg4` (`.unstable` for the car
   build), APK names `NilsMG4-*.apk`. It installs next to the old FatihsMG4 app instead of replacing
   it, and starts with empty settings and history.
+- 2026-10-17 — Server rewritten for InfluxDB 2 with live telemetry and ABRP forwarding; Dockerfile;
+  Kubernetes manifests (not applied).
+- 2026-10-17 — App 2.3.0: Server tab (URL, ingest token, installation id, config import), live
+  telemetry restored from before `ea8032a` and sent to the server, Upload-tab cadence controls
+  reconnected, dead switches removed. The removed ABRP classes' unit tests compile and pass again
+  (AbrpApi and HeadUnitWeather tests deleted with their classes).
 - 2026-10-17 — Temporary on-screen diagnostics (b2a5b32) to debug blank values without adb;
   removed again (1002962) once values showed on the car. Revert 1002962 to bring them back.
 
diff --git a/app/build.gradle b/app/build.gradle
index a82f37f..0c0fc65 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,17 +34,11 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 56
-        versionName "2.2.39"
+        versionCode 57
+        versionName "2.3.0"
 
-        // MongoDB credentials never ship in the APK. The app only talks to the small
-        // authenticated API in server/, which owns the database connection.
-        buildConfigField "String", "CONSUMPTION_API_URL", "\"${System.getenv('CONSUMPTION_API_URL') ?: ''}\""
-        buildConfigField "String", "CONSUMPTION_API_TOKEN", "\"${System.getenv('CONSUMPTION_API_TOKEN') ?: ''}\""
-        // Fixed installation identity: baked into every build so an APK wipe cannot orphan
-        // the cloud history under a new random UUID. The car's own consumption history lives
-        // under this id in the daily_consumption collection.
-        buildConfigField "String", "CONSUMPTION_INSTALLATION_ID", "\"226b1614-4d18-48f0-8938-3609cfa3db93\""
+        // Nothing about the server ships in the APK: its URL and ingest token are entered in
+        // the app's Server tab (ServerConfig), and the database is only reachable by the server.
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 608eaba..36b8413 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,6 +8,11 @@
     <!-- Required from API 33 to post the foreground-service notification, which is the
          only status UI the service has. Without it the notification is silently dropped. -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <!-- GPS for the position in live telemetry. -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 
     <!-- Wi-Fi auto-join. CHANGE_WIFI_STATE covers enabling the radio and asking the
          supplicant to join a network the unit already has saved; ACCESS_WIFI_STATE covers
@@ -52,7 +57,8 @@
 
         <service
             android:name=".AbrpUploadService"
-            android:exported="false" />
+            android:exported="false"
+            android:foregroundServiceType="dataSync|location" />
 
         <!-- The head unit resumes far more often than it cold-boots, and announces the
              resume with QUICKBOOT_POWERON. Listening only for BOOT_COMPLETED is why
diff --git a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
index b4aa351..74e1a33 100644
--- a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
+++ b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
@@ -24,11 +24,13 @@ import java.util.concurrent.TimeUnit;
 
 /**
  * Foreground service that polls vehicle telemetry every 15 s, integrates consumption locally,
- * and syncs it to the cloud (MongoDB) in 30-minute delta chunks. Never sends anything to ABRP.
+ * syncs it to the car server in 2-minute delta chunks, and sends live telemetry samples that
+ * the server stores and forwards to ABRP ({@link TelemetryUploader}). The car itself never
+ * talks to ABRP and holds no ABRP credentials.
  *
  * Always-on by design: started at boot (BootReceiver) and on app open, never gated on
- * credentials or a toggle. The only thing it needs is a network for the cloud sync, and a
- * missing one is handled by caching chunks locally until the connection returns.
+ * credentials or a toggle. The only thing it needs is a network, and a missing one is
+ * handled by queueing locally until the connection returns.
  */
 public class AbrpUploadService extends Service {
 
@@ -64,6 +66,7 @@ public class AbrpUploadService extends Service {
     private ConsumptionTracker consumptionTracker;
     private ConsumptionCloudClient consumptionCloudClient;
     private ChargeSessionTracker chargeSessionTracker;
+    private TelemetryUploader telemetryUploader;
     private WifiAutoConnect wifi;
     private ScheduledExecutorService scheduler;
     private SharedPreferences prefs;
@@ -94,6 +97,7 @@ public class AbrpUploadService extends Service {
         consumptionCloudClient = new ConsumptionCloudClient(getApplicationContext());
         chargeSessionTracker = ChargeSessionTracker.get(getApplicationContext());
         wifi = new WifiAutoConnect(getApplicationContext());
+        telemetryUploader = new TelemetryUploader(getApplicationContext());
 
         scheduler.scheduleWithFixedDelay(
                 this::safeUploadCycle,
@@ -111,15 +115,16 @@ public class AbrpUploadService extends Service {
     }
 
     /**
-     * Enters the foreground. No location type — this service no longer reads GPS. Foreground
-     * service types do not exist before API 29, so on this API-28 head unit a plain
-     * startForeground is the only correct call.
+     * Enters the foreground. Foreground service types do not exist before API 29, so on this
+     * API-28 head unit a plain startForeground is the only correct call; from API 29 the
+     * location type is what lets the GPS subscription run in the background.
      */
     private void startInForeground() {
         Notification notification = buildNotification(lastStatus);
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
             ServiceCompat.startForeground(
-                    this, NOTIF_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC);
+                    this, NOTIF_ID, notification,
+                    ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC | ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION);
         } else {
             startForeground(NOTIF_ID, notification);
         }
@@ -133,6 +138,7 @@ public class AbrpUploadService extends Service {
         running = false;
         prefs.edit().putBoolean("service_running", false).apply();
         if (scheduler != null) scheduler.shutdownNow();
+        if (telemetryUploader != null) telemetryUploader.stop();
         Log.i(TAG, "Service stopped");
     }
 
@@ -159,7 +165,16 @@ public class AbrpUploadService extends Service {
             wifi.ensureConnected(false);
         }
 
-        updateNotification("Consumption tracking active");
+        UploadSettings settings = UploadSettings.from(prefs);
+        if (!ServerConfig.get(this).isConfigured()) {
+            updateNotification(getString(R.string.server_not_configured));
+        } else if (!settings.abrpUploadEnabled) {
+            updateNotification(getString(R.string.notif_tracking_locally));
+        } else {
+            telemetryUploader.tick(vehicle, chargeSessionTracker.snapshot(), settings);
+            int queued = telemetryUploader.queued();
+            updateNotification(queued > 0 ? "Sending telemetry — " + queued + " queued" : "Sending telemetry");
+        }
     }
 
     // ---------- Notification ----------
diff --git a/app/src/main/java/com/evsuite/abrp/ConfigImport.java b/app/src/main/java/com/evsuite/abrp/ConfigImport.java
new file mode 100644
index 0000000..0495edd
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/ConfigImport.java
@@ -0,0 +1,127 @@
+package com.evsuite.abrp;
+
+/**
+ * Parses a configuration text file so the app can be set up without typing on the car's
+ * on-screen keyboard — the ingest token in particular is long and error-prone to enter by
+ * hand. The file is a plain {@code key = value} list, one entry per line:
+ *
+ * <pre>
+ *   # Nils' MG4 config
+ *   server_url      = https://car.stinnesbeck.com
+ *   token           = 0123abcd...            (the server's INGEST_TOKEN)
+ *   installation_id = 6f1a2b3c-4d5e-4f60-8a9b-0c1d2e3f4a5b
+ *   interval_sec    = 60
+ *   boost_low_soc   = true
+ *   low_soc_percent = 20
+ * </pre>
+ *
+ * Usually only server_url and token are needed. installation_id is for a reinstall: it puts
+ * the car back under the id its history is stored with. The cadence keys are optional. Blank lines and
+ * lines starting with {@code #} are ignored, keys are case-insensitive, and surrounding
+ * whitespace is trimmed. Every field is nullable: the caller applies only what the file set,
+ * leaving anything absent untouched.
+ */
+final class ConfigImport {
+
+    final String serverUrl;
+    final String token;
+    final String installationId;
+    final Integer intervalSec;
+    final Boolean boostLowSoc;
+    final Integer lowSocPercent;
+
+    private ConfigImport(String serverUrl, String token, String installationId, Integer intervalSec,
+                         Boolean boostLowSoc, Integer lowSocPercent) {
+        this.serverUrl = serverUrl;
+        this.token = token;
+        this.installationId = installationId;
+        this.intervalSec = intervalSec;
+        this.boostLowSoc = boostLowSoc;
+        this.lowSocPercent = lowSocPercent;
+    }
+
+    /** True when the file yielded nothing usable — an empty or malformed file, not a config. */
+    boolean isEmpty() {
+        return serverUrl == null && token == null && installationId == null && intervalSec == null
+                && boostLowSoc == null && lowSocPercent == null;
+    }
+
+    static ConfigImport parse(String text) {
+        String serverUrl = null, token = null, installationId = null;
+        Integer intervalSec = null, lowSocPercent = null;
+        Boolean boostLowSoc = null;
+
+        for (String line : text.split("\n", -1)) {
+            line = line.trim();
+            if (line.isEmpty() || line.charAt(0) == '#') continue;
+
+            int sep = line.indexOf('=');
+            if (sep <= 0) continue;
+
+            String key = line.substring(0, sep).trim().toLowerCase(java.util.Locale.US);
+            String value = line.substring(sep + 1).trim();
+            if (value.isEmpty()) continue;
+
+            switch (key) {
+                case "server_url":
+                case "server":
+                case "url":
+                    serverUrl = value;
+                    break;
+                case "token":
+                case "ingest_token":
+                    token = value;
+                    break;
+                case "installation_id":
+                    installationId = value;
+                    break;
+                case "interval_sec":
+                case "upload_interval_sec":
+                    intervalSec = nearestInterval(value);
+                    break;
+                case "boost_low_soc":
+                    boostLowSoc = parseBool(value);
+                    break;
+                case "low_soc_percent":
+                    lowSocPercent = clampPercent(value);
+                    break;
+                default:
+                    // Unknown keys are ignored rather than rejected, so a file can carry
+                    // comments or future keys without breaking an older build.
+                    break;
+            }
+        }
+        return new ConfigImport(serverUrl, token, installationId, intervalSec, boostLowSoc, lowSocPercent);
+    }
+
+    /** Snaps to the nearest offered choice: the UI spinner has no free-form interval. */
+    private static Integer nearestInterval(String value) {
+        int requested;
+        try {
+            requested = Integer.parseInt(value);
+        } catch (NumberFormatException e) {
+            return null;
+        }
+        int best = UploadSettings.INTERVAL_CHOICES_SEC[0];
+        for (int choice : UploadSettings.INTERVAL_CHOICES_SEC) {
+            if (Math.abs(choice - requested) < Math.abs(best - requested)) best = choice;
+        }
+        return best;
+    }
+
+    /** Same 1–99 clamp the manual field enforces, so an import cannot set an unusable value. */
+    private static Integer clampPercent(String value) {
+        try {
+            return Math.max(1, Math.min(99, Integer.parseInt(value)));
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+
+    private static Boolean parseBool(String value) {
+        value = value.toLowerCase(java.util.Locale.US);
+        if (value.equals("true") || value.equals("on") || value.equals("1")) return Boolean.TRUE;
+        if (value.equals("false") || value.equals("off") || value.equals("0")) return Boolean.FALSE;
+        return null;
+    }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/ConsumptionCloudClient.java b/app/src/main/java/com/evsuite/abrp/ConsumptionCloudClient.java
index aec491d..0ac0a0e 100644
--- a/app/src/main/java/com/evsuite/abrp/ConsumptionCloudClient.java
+++ b/app/src/main/java/com/evsuite/abrp/ConsumptionCloudClient.java
@@ -20,12 +20,13 @@ import java.util.Collections;
 import java.util.List;
 
 /**
- * Best-effort MongoDB sync through the web API. Never blocks local persistence.
+ * Best-effort sync to the car server. Never blocks local persistence.
  *
- * The installationId is a fixed value baked into BuildConfig — never a random UUID — so an
- * APK wipe cannot orphan the cloud history under a new identity. The consumption UI reads
- * back its own uploaded totals via {@link #fetchHistoryIfDue}, which means an APK reinstall
- * picks up right where the old one left off instead of showing zeroes.
+ * Server URL, token and installation id come from {@link ServerConfig}, read on every use so
+ * a change in the Server tab applies at once. The installation id is kept across updates; a
+ * reinstall gets it back through the config file, so the history is not orphaned under a new
+ * identity. The consumption UI reads back its own uploaded totals via
+ * {@link #fetchHistoryIfDue}, so a reinstall picks up where the old one left off.
  */
 final class ConsumptionCloudClient {
     private static final String TAG = "NilsMG4.Mongo";
@@ -37,9 +38,7 @@ final class ConsumptionCloudClient {
     private static final String CHUNK_CACHE = "chunk_cache";   // JSON array of pending chunks
     private static final int MAX_CHARGES_PER_SYNC = 10;
 
-    private final String endpoint;
-    private final String token;
-    private final String installationId;
+    private final Context context;
     private final SharedPreferences prefs;
     private long lastConsumptionAttemptMs;
     private long lastChargeAttemptMs;
@@ -65,14 +64,12 @@ final class ConsumptionCloudClient {
     }
 
     ConsumptionCloudClient(Context context) {
-        endpoint = BuildConfig.CONSUMPTION_API_URL.trim();
-        token = BuildConfig.CONSUMPTION_API_TOKEN.trim();
+        this.context = context.getApplicationContext();
         prefs = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE);
-        installationId = BuildConfig.CONSUMPTION_INSTALLATION_ID.trim();
-        if (endpoint.isEmpty() || token.isEmpty()) {
-            Log.w(TAG, "Consumption API not configured: endpoint=" + (endpoint.isEmpty() ? "empty" : "ok")
-                    + ", token=" + (token.isEmpty() ? "empty" : "ok"));
-        }
+    }
+
+    private ServerConfig config() {
+        return ServerConfig.get(context);
     }
 
     /**
@@ -87,7 +84,7 @@ final class ConsumptionCloudClient {
      */
     void syncIfDue(ConsumptionTracker tracker, ChargeSessionTracker charges, long nowMs) {
         long elapsed = android.os.SystemClock.elapsedRealtime();
-        if (endpoint.isEmpty() || token.isEmpty()) {
+        if (!config().isConfigured()) {
             Log.i(TAG, "Sync skipped: API not configured");
             return;
         }
@@ -200,7 +197,7 @@ final class ConsumptionCloudClient {
     private JSONObject consumptionBody(ConsumptionTracker.CloudSnapshot snapshot, long nowMs)
             throws Exception {
         JSONObject body = new JSONObject()
-                .put("installationId", installationId)
+                .put("installationId", config().installationId)
                 .put("recordedAt", nowMs)
                 .put("date", snapshot.date)
                 .put("day", totals(snapshot.day));
@@ -230,7 +227,7 @@ final class ConsumptionCloudClient {
         Log.i(TAG, "Found " + pending.size() + " pending charge sessions");
         int sent = 0;
         for (JSONObject session : pending) {
-            JSONObject body = new JSONObject(session.toString()).put("installationId", installationId);
+            JSONObject body = new JSONObject(session.toString()).put("installationId", config().installationId);
             String id = session.getString("sessionId");
             Log.i(TAG, "Uploading charge session: " + id);
             if (send("/v1/charging-sessions/" + id, "PUT", body)) {
@@ -250,7 +247,7 @@ final class ConsumptionCloudClient {
         HttpURLConnection connection = null;
         try {
             byte[] bytes = body.toString().getBytes(StandardCharsets.UTF_8);
-            String url = trimSlash(endpoint) + path;
+            String url = trimSlash(config().url) + path;
             Log.i(TAG, "Sending " + method + " request to " + url + " (" + bytes.length + " bytes)");
             Log.i(TAG, "Body: " + body.toString());
             connection = (HttpURLConnection) new URL(url).openConnection();
@@ -260,7 +257,7 @@ final class ConsumptionCloudClient {
             connection.setDoOutput(true);
             connection.setFixedLengthStreamingMode(bytes.length);
             connection.setRequestProperty("Content-Type", "application/json");
-            connection.setRequestProperty("Authorization", "Bearer " + token);
+            connection.setRequestProperty("Authorization", "Bearer " + config().token);
             try (OutputStream out = connection.getOutputStream()) { out.write(bytes); }
             int status = connection.getResponseCode();
             Log.i(TAG, "Response: HTTP " + status);
@@ -295,7 +292,7 @@ final class ConsumptionCloudClient {
      * Returns the current cache immediately; the fresh copy lands on the next poll.
      */
     synchronized List<DayRecord> fetchHistoryIfDue() {
-        if (endpoint.isEmpty() || token.isEmpty()) return cachedHistory;
+        if (!config().isConfigured()) return cachedHistory;
         long elapsed = android.os.SystemClock.elapsedRealtime();
         if (lastHistoryFetchMs != 0L && elapsed - lastHistoryFetchMs < HISTORY_FETCH_INTERVAL_MS) {
             return cachedHistory;
@@ -329,7 +326,7 @@ final class ConsumptionCloudClient {
      * status for the log.
      */
     String flushNow(ConsumptionTracker tracker, long nowMs) {
-        if (endpoint.isEmpty() || token.isEmpty()) return "API not configured";
+        if (!config().isConfigured()) return "API not configured";
         int cached = drainChunkCache();
         ConsumptionTracker.CloudSnapshot chunk = tracker.takeChunkDelta();
         int total = cached;
@@ -357,12 +354,12 @@ final class ConsumptionCloudClient {
     private List<DayRecord> fetchHistory() throws Exception {
         HttpURLConnection connection = null;
         try {
-            String url = trimSlash(endpoint) + "/v1/consumption/history/" + installationId;
+            String url = trimSlash(config().url) + "/v1/consumption/history/" + config().installationId;
             connection = (HttpURLConnection) new URL(url).openConnection();
             connection.setRequestMethod("GET");
             connection.setConnectTimeout(TIMEOUT_MS);
             connection.setReadTimeout(TIMEOUT_MS);
-            connection.setRequestProperty("Authorization", "Bearer " + token);
+            connection.setRequestProperty("Authorization", "Bearer " + config().token);
             int status = connection.getResponseCode();
             Log.i(TAG, "History GET response: HTTP " + status);
             if (status < 200 || status >= 300) {
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 475686c..75608b6 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -16,6 +16,8 @@ import android.widget.TextView;
 import java.time.LocalDate;
 import java.util.List;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
@@ -39,16 +41,18 @@ public class MainActivity extends AppCompatActivity {
 
     /** Navigation destinations in page order. Parallel to {@link #panes}. */
     private static final int[] TAB_IDS =
-            { R.id.tabVehicle, R.id.tabConsumption, R.id.tabCharging, R.id.tabService, R.id.tabWifi,
-              R.id.tabLog };
+            { R.id.tabVehicle, R.id.tabConsumption, R.id.tabCharging, R.id.tabService, R.id.tabServer,
+              R.id.tabWifi, R.id.tabLog };
 
     private static final int[] PAGE_TITLES = {
             R.string.design_overview_title, R.string.consumption_title, R.string.charging_title,
-            R.string.design_service_title, R.string.design_wifi_title, R.string.design_log_title
+            R.string.design_service_title, R.string.design_server_title, R.string.design_wifi_title,
+            R.string.design_log_title
     };
     private static final int[] PAGE_SUBTITLES = {
             R.string.design_overview_subtitle, R.string.consumption_subtitle, R.string.charging_subtitle,
-            R.string.design_service_subtitle, R.string.design_wifi_subtitle, R.string.design_log_subtitle
+            R.string.design_service_subtitle, R.string.design_server_subtitle, R.string.design_wifi_subtitle,
+            R.string.design_log_subtitle
     };
 
     // Status colours come from the palette, not from the Material swatches: #4CAF50 and
@@ -61,13 +65,14 @@ public class MainActivity extends AppCompatActivity {
     private TextView          statusText;
     private TextView callLogText;
     private View servicePane;
+    private View serverPane;
     private View logPane;
     private View vehiclePane;
     private View consumptionPane;
     private View chargingPane;
     private View wifiPane;
 
-    /** The six pages in navigation order. Parallel to {@link #TAB_IDS}. */
+    /** The pages in navigation order. Parallel to {@link #TAB_IDS}. */
     private View[] panes;
 
     /** Wi-Fi page. The helper is the same one the upload service uses on its own tick. */
@@ -102,6 +107,28 @@ public class MainActivity extends AppCompatActivity {
     private ChargeSessionTracker chargeSessionTracker;
     private ChargingGraphView chargeGraph;
 
+    /** Server page. */
+    private TextInputLayout serverUrlLayout, serverTokenLayout, installationIdLayout;
+    private TextInputEditText serverUrlInput, serverTokenInput, installationIdInput;
+    private View connectionStatusRow, connectionIndicator;
+    private TextView connectionStatusText;
+
+    /** Upload page: live telemetry switch and cadence. */
+    private SwitchMaterial liveTelemetrySwitch, boostSwitch;
+    private android.widget.Spinner intervalSpinner;
+    private TextInputLayout lowSocLayout;
+    private TextInputEditText lowSocInput;
+
+    /**
+     * Picks a config text file. Only reachable on devices that ship a document picker — the
+     * MG4 head unit does not, which is why {@link #startConfigImport()} scans the app's own
+     * folders first and only falls back to this.
+     */
+    private final ActivityResultLauncher<String[]> configPicker =
+            registerForActivityResult(new ActivityResultContracts.OpenDocument(), uri -> {
+                if (uri != null) importConfig(uri);
+            });
+
     /**
      * Inflates a page with no parent, then gives it the MATCH_PARENT/MATCH_PARENT layout
      * params ViewPager2 requires of its items — inflating detached leaves them null, and
@@ -201,17 +228,22 @@ public class MainActivity extends AppCompatActivity {
         // in activity_main.xml — a recycled page would invalidate these references as
         // soon as the user swiped away from it.
         servicePane = inflatePane(R.layout.pane_service);
+        serverPane  = inflatePane(R.layout.pane_server);
         vehiclePane   = inflatePane(R.layout.pane_vehicle);
         consumptionPane = inflatePane(R.layout.pane_consumption);
         chargingPane = inflatePane(R.layout.pane_charging);
         wifiPane    = inflatePane(R.layout.pane_wifi);
         logPane     = inflatePane(R.layout.pane_log);
-        panes = new View[] { vehiclePane, consumptionPane, chargingPane, servicePane, wifiPane, logPane };
+        panes = new View[] { vehiclePane, consumptionPane, chargingPane, servicePane, serverPane,
+                wifiPane, logPane };
 
         bindVehiclePane();
         bindConsumptionPane();
         bindChargingPane();
         bindWifiPane();
+        bindServerPane();
+        bindServicePane();
+        requestLocationPermissionIfNeeded();
 
         statusText          = servicePane.findViewById(R.id.status_text);
         callLogText = logPane.findViewById(R.id.call_log_text);
@@ -225,7 +257,7 @@ public class MainActivity extends AppCompatActivity {
         // a no-op and does not even contain the updater.
         UpdateHook.checkInBackground(this);
 
-        // The service is always-on: it tracks consumption and syncs to MongoDB cloud.
+        // The service is always-on: it tracks consumption and sends everything to the server.
         // startForegroundService is idempotent — if the service is already up this
         // is a no-op aside from delivering a new intent.
         startForegroundService(new Intent(this, AbrpUploadService.class));
@@ -337,6 +369,327 @@ public class MainActivity extends AppCompatActivity {
         });
     }
 
+    // ---------- Server page ----------
+
+    private void bindServerPane() {
+        serverUrlLayout      = serverPane.findViewById(R.id.server_url_layout);
+        serverTokenLayout    = serverPane.findViewById(R.id.server_token_layout);
+        installationIdLayout = serverPane.findViewById(R.id.installation_id_layout);
+        serverUrlInput       = serverPane.findViewById(R.id.server_url_input);
+        serverTokenInput     = serverPane.findViewById(R.id.server_token_input);
+        installationIdInput  = serverPane.findViewById(R.id.installation_id_input);
+        connectionStatusRow  = serverPane.findViewById(R.id.connection_status_row);
+        connectionIndicator  = serverPane.findViewById(R.id.connection_indicator);
+        connectionStatusText = serverPane.findViewById(R.id.connection_status_text);
+        showServerConfig();
+        ((TextView) serverPane.findViewById(R.id.import_hint))
+                .setText(getString(R.string.import_hint, configDirHint()));
+
+        serverPane.findViewById(R.id.server_save_button).setOnClickListener(v -> {
+            if (saveServerConfig(textOf(serverUrlInput), textOf(serverTokenInput), textOf(installationIdInput))) {
+                setConnectionStatus(COLOR_OK, getString(R.string.server_saved));
+            }
+        });
+        serverPane.findViewById(R.id.server_test_button).setOnClickListener(v -> testConnection());
+        serverPane.findViewById(R.id.import_button).setOnClickListener(v -> startConfigImport());
+    }
+
+    private void showServerConfig() {
+        ServerConfig config = ServerConfig.get(this);
+        serverUrlInput.setText(config.url);
+        serverTokenInput.setText(config.token);
+        installationIdInput.setText(config.installationId);
+    }
+
+    /** Validates, marks the bad fields, and saves only when all three are good. */
+    private boolean saveServerConfig(String rawUrl, String rawToken, String rawId) {
+        String url = ServerConfig.normalizeUrl(rawUrl);
+        String token = rawToken == null ? "" : rawToken.trim();
+        String id = rawId == null ? "" : rawId.trim().toLowerCase(java.util.Locale.US);
+        serverUrlLayout.setError(url == null ? getString(R.string.server_err_url) : null);
+        serverTokenLayout.setError(ServerConfig.isValidToken(token) ? null : getString(R.string.server_err_token));
+        installationIdLayout.setError(ServerConfig.isValidInstallationId(id)
+                ? null : getString(R.string.server_err_installation_id));
+        if (url == null || !ServerConfig.isValidToken(token) || !ServerConfig.isValidInstallationId(id)) return false;
+        ServerConfig.save(this, url, token, id);
+        if (consumptionCloudClient != null) consumptionCloudClient.invalidateHistory();
+        showServerConfig();
+        refreshStatus();
+        return true;
+    }
+
+    /**
+     * Checks reachability, then the token, without writing anything: the health endpoint
+     * first, then the car's own history read, which needs the ingest token. Uses what is in
+     * the fields, saved or not, so a typo can be caught before it is stored.
+     */
+    private void testConnection() {
+        String url = ServerConfig.normalizeUrl(textOf(serverUrlInput));
+        String token = textOf(serverTokenInput);
+        String id = textOf(installationIdInput).toLowerCase(java.util.Locale.US);
+        if (url == null) {
+            serverUrlLayout.setError(getString(R.string.server_err_url));
+            return;
+        }
+        if (!ServerConfig.isValidInstallationId(id)) {
+            installationIdLayout.setError(getString(R.string.server_err_installation_id));
+            return;
+        }
+        setConnectionStatus(COLOR_PENDING, getString(R.string.conn_testing));
+        new Thread(() -> {
+            String message;
+            int color;
+            try {
+                int health = httpGet(url + "/v1/health", null);
+                if (health != 200) {
+                    message = getString(R.string.conn_err_http, health);
+                    color = COLOR_ERROR;
+                } else {
+                    int auth = httpGet(url + "/v1/consumption/history/" + id, token);
+                    if (auth == 200) { message = getString(R.string.conn_ok); color = COLOR_OK; }
+                    else if (auth == 401) { message = getString(R.string.conn_err_auth); color = COLOR_ERROR; }
+                    else { message = getString(R.string.conn_err_http, auth); color = COLOR_ERROR; }
+                }
+            } catch (java.net.SocketTimeoutException e) {
+                message = getString(R.string.conn_err_timeout);
+                color = COLOR_ERROR;
+            } catch (Exception e) {
+                message = getString(R.string.conn_err_no_internet);
+                color = COLOR_ERROR;
+            }
+            final String m = message;
+            final int c = color;
+            runOnUiThread(() -> setConnectionStatus(c, m));
+        }, "server-test").start();
+    }
+
+    private static int httpGet(String url, String token) throws java.io.IOException {
+        java.net.HttpURLConnection connection = (java.net.HttpURLConnection) new java.net.URL(url).openConnection();
+        try {
+            connection.setConnectTimeout(8_000);
+            connection.setReadTimeout(8_000);
+            if (token != null) connection.setRequestProperty("Authorization", "Bearer " + token);
+            return connection.getResponseCode();
+        } finally {
+            connection.disconnect();
+        }
+    }
+
+    private void setConnectionStatus(int color, String message) {
+        connectionStatusRow.setVisibility(View.VISIBLE);
+        connectionIndicator.getBackground().mutate().setTint(color);
+        connectionStatusText.setText(message);
+        connectionStatusText.setTextColor(color);
+    }
+
+    // ---------- Config import ----------
+
+    /**
+     * The MG4 head unit ships no document picker — SAF answers "FileManagement is no supported
+     * on this device" — so the file is found by scanning instead. getExternalFilesDirs() returns
+     * this app's own folder on internal storage and on every mounted volume including a USB
+     * stick, and those need no storage permission at any API level. The picker stays as the
+     * fallback for phones and tablets, where the user may keep the file anywhere.
+     */
+    private void startConfigImport() {
+        java.io.File found = findConfigFile();
+        if (found != null) {
+            importConfig(found);
+            return;
+        }
+        try {
+            // Any MIME: the MG4 Files app tags .txt inconsistently, so filtering by type hides
+            // the very file the user is trying to pick. They select it by name instead.
+            configPicker.launch(new String[]{"*/*"});
+        } catch (android.content.ActivityNotFoundException e) {
+            setConnectionStatus(COLOR_ERROR, getString(R.string.import_err_not_found, configDirHint()));
+        }
+    }
+
+    /**
+     * First readable file in an app-specific folder that parses as a config. Names are not
+     * filtered: the user copies one file to the folder, whatever they called it.
+     */
+    private java.io.File findConfigFile() {
+        for (java.io.File dir : getExternalFilesDirs(null)) {
+            if (dir == null) continue;
+            java.io.File[] files = dir.listFiles();
+            if (files == null) continue;
+            for (java.io.File f : files) {
+                if (f.isFile() && f.canRead() && f.length() > 0 && f.length() <= 64 * 1024
+                        && !ConfigImport.parse(readText(f)).isEmpty()) {
+                    return f;
+                }
+            }
+        }
+        return null;
+    }
+
+    /** File text, or "" when unreadable — callers treat that as "not a config". */
+    private String readText(java.io.File file) {
+        try (java.io.InputStream in = new java.io.FileInputStream(file)) {
+            return readCapped(in);
+        } catch (Exception e) {
+            return "";
+        }
+    }
+
+    /** Capped so a wrong file picked by mistake is not slurped whole into memory. */
+    private String readCapped(java.io.InputStream in) throws java.io.IOException {
+        java.io.ByteArrayOutputStream buf = new java.io.ByteArrayOutputStream();
+        byte[] chunk = new byte[4096];
+        int n;
+        while ((n = in.read(chunk)) != -1 && buf.size() < 64 * 1024) buf.write(chunk, 0, n);
+        return buf.toString(java.nio.charset.StandardCharsets.UTF_8.name());
+    }
+
+    /** Where the user should drop the file. */
+    private String configDirHint() {
+        java.io.File[] dirs = getExternalFilesDirs(null);
+        return dirs.length > 0 && dirs[0] != null ? dirs[0].getAbsolutePath() : "";
+    }
+
+    private void importConfig(java.io.File file) {
+        String text = readText(file);
+        if (text.isEmpty()) {
+            setConnectionStatus(COLOR_ERROR, getString(R.string.import_err_read));
+            return;
+        }
+        applyConfig(text);
+    }
+
+    private void importConfig(Uri uri) {
+        String text;
+        try (java.io.InputStream in = getContentResolver().openInputStream(uri)) {
+            if (in == null) throw new java.io.IOException("no stream");
+            text = readCapped(in);
+        } catch (Exception e) {
+            setConnectionStatus(COLOR_ERROR, getString(R.string.import_err_read));
+            return;
+        }
+        applyConfig(text);
+    }
+
+    /**
+     * Applies whatever the file sets; absent keys keep their current value, so a file with
+     * only the token does not wipe the URL. Server settings are validated and saved together;
+     * cadence keys go to the plain prefs the same way the Upload page writes them.
+     */
+    private void applyConfig(String text) {
+        ConfigImport config = ConfigImport.parse(text);
+        if (config.isEmpty()) {
+            setConnectionStatus(COLOR_ERROR, getString(R.string.import_err_empty));
+            return;
+        }
+        ServerConfig current = ServerConfig.get(this);
+        if (config.serverUrl != null || config.token != null || config.installationId != null) {
+            boolean saved = saveServerConfig(
+                    config.serverUrl != null ? config.serverUrl : current.url,
+                    config.token != null ? config.token : current.token,
+                    config.installationId != null ? config.installationId : current.installationId);
+            if (!saved) {
+                // Show what the file said, so the marked field is the one to fix in the file.
+                if (config.serverUrl != null) serverUrlInput.setText(config.serverUrl);
+                if (config.token != null) serverTokenInput.setText(config.token);
+                if (config.installationId != null) installationIdInput.setText(config.installationId);
+                return;
+            }
+        }
+        SharedPreferences.Editor edit = prefs.edit();
+        if (config.intervalSec != null) edit.putInt(UploadSettings.KEY_INTERVAL_SEC, config.intervalSec);
+        if (config.boostLowSoc != null) edit.putBoolean(UploadSettings.KEY_BOOST_LOW_SOC, config.boostLowSoc);
+        if (config.lowSocPercent != null) edit.putInt(UploadSettings.KEY_LOW_SOC_PERCENT, config.lowSocPercent);
+        edit.apply();
+        bindCadenceControls();
+        setConnectionStatus(COLOR_OK, getString(R.string.import_ok));
+        refreshStatus();
+    }
+
+    // ---------- Upload page ----------
+
+    private void bindServicePane() {
+        liveTelemetrySwitch = servicePane.findViewById(R.id.abrp_upload_switch);
+        intervalSpinner = servicePane.findViewById(R.id.interval_spinner);
+        boostSwitch = servicePane.findViewById(R.id.boost_switch);
+        lowSocInput = servicePane.findViewById(R.id.low_soc_input);
+        lowSocLayout = servicePane.findViewById(R.id.low_soc_layout);
+        liveTelemetrySwitch.setChecked(UploadSettings.from(prefs).abrpUploadEnabled);
+        liveTelemetrySwitch.setOnCheckedChangeListener((btn, checked) -> {
+            prefs.edit().putBoolean(UploadSettings.KEY_ABRP_UPLOAD_ENABLED, checked).apply();
+            refreshStatus();
+        });
+        bindCadenceControls();
+    }
+
+    /** The service reads these settings on every tick, so a change applies without a restart. */
+    private void bindCadenceControls() {
+        UploadSettings current = UploadSettings.from(prefs);
+
+        String[] labels = new String[UploadSettings.INTERVAL_CHOICES_SEC.length];
+        int selected = 0;
+        for (int i = 0; i < UploadSettings.INTERVAL_CHOICES_SEC.length; i++) {
+            int sec = UploadSettings.INTERVAL_CHOICES_SEC[i];
+            labels[i] = sec >= 60
+                    ? getResources().getQuantityString(R.plurals.interval_minutes, sec / 60, sec / 60)
+                    : getResources().getQuantityString(R.plurals.interval_seconds, sec, sec);
+            if (sec == current.intervalSec) selected = i;
+        }
+        android.widget.ArrayAdapter<String> adapter = new android.widget.ArrayAdapter<>(
+                this, R.layout.spinner_value, labels);
+        adapter.setDropDownViewResource(R.layout.spinner_dropdown);
+        intervalSpinner.setAdapter(adapter);
+        intervalSpinner.setSelection(selected);
+        intervalSpinner.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(android.widget.AdapterView<?> parent, View view, int position, long id) {
+                prefs.edit().putInt(UploadSettings.KEY_INTERVAL_SEC,
+                        UploadSettings.INTERVAL_CHOICES_SEC[position]).apply();
+            }
+            @Override public void onNothingSelected(android.widget.AdapterView<?> parent) { }
+        });
+
+        boostSwitch.setOnCheckedChangeListener(null);
+        boostSwitch.setChecked(current.boostLowSoc);
+        lowSocLayout.setEnabled(current.boostLowSoc);
+        lowSocInput.setEnabled(current.boostLowSoc);
+        boostSwitch.setOnCheckedChangeListener((button, checked) -> {
+            prefs.edit().putBoolean(UploadSettings.KEY_BOOST_LOW_SOC, checked).apply();
+            lowSocLayout.setEnabled(checked);
+            lowSocInput.setEnabled(checked);
+        });
+
+        lowSocInput.setText(String.valueOf(current.lowSocPercent));
+        lowSocInput.setOnFocusChangeListener((view, hasFocus) -> {
+            if (!hasFocus) saveLowSocThreshold();
+        });
+    }
+
+    /** Clamped to 1-99: 0 would never trigger and 100 would boost permanently. */
+    private void saveLowSocThreshold() {
+        CharSequence raw = lowSocInput.getText();
+        int value;
+        try {
+            value = Integer.parseInt(raw == null ? "" : raw.toString().trim());
+        } catch (NumberFormatException e) {
+            value = UploadSettings.DEFAULT_LOW_SOC_PERCENT;
+        }
+        value = Math.max(1, Math.min(99, value));
+        lowSocInput.setText(String.valueOf(value));
+        prefs.edit().putInt(UploadSettings.KEY_LOW_SOC_PERCENT, value).apply();
+    }
+
+    /**
+     * GPS for the telemetry position. On the car the app runs as the system user and holds
+     * it already; this only asks where it does not, such as a phone running the stable build.
+     */
+    private void requestLocationPermissionIfNeeded() {
+        if (checkSelfPermission(android.Manifest.permission.ACCESS_FINE_LOCATION)
+                != PackageManager.PERMISSION_GRANTED) {
+            requestPermissions(new String[]{android.Manifest.permission.ACCESS_FINE_LOCATION,
+                    android.Manifest.permission.ACCESS_COARSE_LOCATION}, 1);
+        }
+    }
+
     // ---------- Wi-Fi page ----------
 
     private void bindWifiPane() {
@@ -764,8 +1117,16 @@ public class MainActivity extends AppCompatActivity {
                 break;
             case RUNNING:
             case STARTING:
-                statusText.setText("Consumption tracking active");
-                statusText.setTextColor(COLOR_OK);
+                if (!ServerConfig.get(this).isConfigured()) {
+                    statusText.setText(R.string.server_not_configured);
+                    statusText.setTextColor(COLOR_ERROR);
+                } else if (!UploadSettings.from(prefs).abrpUploadEnabled) {
+                    statusText.setText(R.string.state_tracking_locally);
+                    statusText.setTextColor(COLOR_PENDING);
+                } else {
+                    statusText.setText(R.string.state_running);
+                    statusText.setTextColor(COLOR_OK);
+                }
                 break;
             case STOPPED:
             default:
diff --git a/app/src/main/java/com/evsuite/abrp/SecurePrefs.java b/app/src/main/java/com/evsuite/abrp/SecurePrefs.java
new file mode 100644
index 0000000..3d51282
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/SecurePrefs.java
@@ -0,0 +1,48 @@
+package com.evsuite.abrp;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.util.Log;
+
+import androidx.security.crypto.EncryptedSharedPreferences;
+import androidx.security.crypto.MasterKey;
+
+/**
+ * Encrypted storage for the server settings — above all the ingest token, which `adb backup`
+ * would otherwise hand out with the regular SharedPreferences file. Backed by an
+ * AndroidKeyStore master key.
+ */
+final class SecurePrefs {
+
+    private static final String TAG        = "SecurePrefs";
+    private static final String FILE_NAME  = "server_secure_prefs";
+    private static final String PLAIN_NAME = "server_prefs";
+
+    private static SharedPreferences instance;
+
+    private SecurePrefs() { }
+
+    /**
+     * Encrypted preferences, or a plaintext file if the crypto stack is unavailable. Falling
+     * back keeps the app usable on a head unit with a broken keystore instead of crashing it.
+     */
+    static synchronized SharedPreferences get(Context context) {
+        if (instance != null) return instance;
+        Context app = context.getApplicationContext();
+        try {
+            MasterKey masterKey = new MasterKey.Builder(app)
+                    .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
+                    .build();
+            instance = EncryptedSharedPreferences.create(
+                    app,
+                    FILE_NAME,
+                    masterKey,
+                    EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+                    EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM);
+        } catch (Exception e) {
+            Log.e(TAG, "Encrypted preferences unavailable, falling back to plaintext", e);
+            instance = app.getSharedPreferences(PLAIN_NAME, Context.MODE_PRIVATE);
+        }
+        return instance;
+    }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/ServerConfig.java b/app/src/main/java/com/evsuite/abrp/ServerConfig.java
new file mode 100644
index 0000000..af36f73
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/ServerConfig.java
@@ -0,0 +1,100 @@
+package com.evsuite.abrp;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import java.util.Locale;
+import java.util.UUID;
+import java.util.regex.Pattern;
+
+/**
+ * Where the car's data goes: the server URL, its ingest token, and the installation id the
+ * data is stored under. Entered in the Server tab or imported from a config file, kept in
+ * {@link SecurePrefs}.
+ *
+ * Read through {@link #get}, which caches one immutable snapshot for the process and is
+ * replaced on {@link #save}: the service and the activity both see a change at once, without
+ * a restart.
+ */
+final class ServerConfig {
+
+    static final String KEY_URL             = "server_url";
+    static final String KEY_TOKEN           = "ingest_token";
+    static final String KEY_INSTALLATION_ID = "installation_id";
+
+    /** Same rule as the server: a version 1–5 UUID with the RFC 4122 variant. */
+    private static final Pattern UUID_PATTERN = Pattern.compile(
+            "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$",
+            Pattern.CASE_INSENSITIVE);
+
+    /** The server refuses shorter ingest tokens outright. */
+    static final int MIN_TOKEN_LENGTH = 24;
+
+    final String url;
+    final String token;
+    final String installationId;
+
+    private static volatile ServerConfig current;
+
+    ServerConfig(String url, String token, String installationId) {
+        this.url = url;
+        this.token = token;
+        this.installationId = installationId;
+    }
+
+    boolean isConfigured() {
+        return !url.isEmpty() && !token.isEmpty();
+    }
+
+    static ServerConfig get(Context context) {
+        ServerConfig config = current;
+        if (config != null) return config;
+        synchronized (ServerConfig.class) {
+            if (current != null) return current;
+            SharedPreferences prefs = SecurePrefs.get(context);
+            String id = prefs.getString(KEY_INSTALLATION_ID, "");
+            if (!isValidInstallationId(id)) {
+                // First start: this installation gets its own identity, kept from now on.
+                id = UUID.randomUUID().toString();
+                prefs.edit().putString(KEY_INSTALLATION_ID, id).apply();
+            }
+            current = new ServerConfig(prefs.getString(KEY_URL, ""), prefs.getString(KEY_TOKEN, ""), id);
+            return current;
+        }
+    }
+
+    /** Stores already-validated values; see {@link #validate}. */
+    static synchronized void save(Context context, String url, String token, String installationId) {
+        SecurePrefs.get(context).edit()
+                .putString(KEY_URL, url)
+                .putString(KEY_TOKEN, token)
+                .putString(KEY_INSTALLATION_ID, installationId)
+                .apply();
+        current = new ServerConfig(url, token, installationId);
+    }
+
+    // ---------- Validation (pure, unit-tested) ----------
+
+    /**
+     * The URL as it will be used: trimmed, without a trailing slash. Null when it is not an
+     * https URL with a host — the token travels in a header, so plain http is refused.
+     */
+    static String normalizeUrl(String raw) {
+        if (raw == null) return null;
+        String url = raw.trim();
+        while (url.endsWith("/")) url = url.substring(0, url.length() - 1);
+        if (!url.toLowerCase(Locale.US).startsWith("https://")) return null;
+        String rest = url.substring("https://".length());
+        if (rest.isEmpty() || rest.startsWith("/") || rest.contains(" ") || rest.contains("?")
+                || rest.contains("#") || rest.contains("@")) return null;
+        return url;
+    }
+
+    static boolean isValidToken(String token) {
+        return token != null && token.trim().length() >= MIN_TOKEN_LENGTH && !token.trim().contains(" ");
+    }
+
+    static boolean isValidInstallationId(String id) {
+        return id != null && UUID_PATTERN.matcher(id.trim()).matches();
+    }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/TelemetryPayload.java b/app/src/main/java/com/evsuite/abrp/TelemetryPayload.java
new file mode 100644
index 0000000..2d80635
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/TelemetryPayload.java
@@ -0,0 +1,213 @@
+package com.evsuite.abrp;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Builds one live telemetry sample in ABRP's tlm format. The car server stores it and forwards
+ * the newest one to ABRP, so the field names and units are exactly ABRP's.
+ *
+ * Kept free of Android types so it can be unit-tested on the JVM: the caller
+ * pulls the values out of the car adapter and the Location, this class only
+ * decides what ends up in the payload.
+ *
+ * Every vehicle field is nullable and a null field is OMITTED. A property that
+ * cannot be read is not a zero: sending soc:0 because a getter threw tells ABRP
+ * the battery is empty and wrecks the user's route plan.
+ *
+ * Fields are set by name rather than passed positionally. The payload now carries
+ * 24 optional values and a positional build(...) call had become a wall of nulls
+ * that no reader could check against the ABRP field list.
+ */
+final class TelemetryPayload {
+
+    /** Only value that is always present. Epoch SECONDS, not milliseconds. */
+    private final long utc;
+
+    // --- High priority (ABRP: "many features will only be usable with enough data") ---
+    Integer soc;             // %
+    Float   speedKmh;        // km/h
+    Float   powerKw;         // kW, ABRP sign: positive leaving the battery
+    Boolean charging;
+    Boolean dcfc;
+    Boolean parked;
+    Double  lat;             // °
+    Double  lon;             // °
+
+    // --- Lower priority ---
+    Integer rangeKm;         // km, vehicle's own estimate
+    Float   cabinTemp;       // °C
+    Float   battTempC;       // °C, traction battery
+    Float   capacityKwh;     // kWh, usable pack capacity
+    Float   soeKwh;          // kWh, energy currently in the pack
+    Double  kwhCharged;      // kWh, taken by the pack during the current charge session
+    Float   extTempC;        // °C, outside
+    Float   voltageV;        // V, traction battery
+    Float   currentA;        // A, traction battery
+    Float   odometerKm;      // km
+    Float   hvacSetpointC;   // °C, climate setpoint
+    Float   tirePressureFlKpa;
+    Float   tirePressureFrKpa;
+    Float   tirePressureRlKpa;
+    Float   tirePressureRrKpa;
+    Double  elevation;       // m
+    Float   heading;         // °
+
+    TelemetryPayload(long utc) {
+        this.utc = utc;
+    }
+
+    /** Build the {@code tlm} JSON object. Only utc is always present. */
+    String build() {
+        JSONObject tlm = new JSONObject();
+        try {
+            tlm.put("utc", utc);
+
+            putIfPresent(tlm, "soc", soc);
+            putIfPresent(tlm, "speed", speedKmh == null ? null : Math.round(speedKmh));
+            putIfPresent(tlm, "est_battery_range", rangeKm);
+            if (powerKw != null) tlm.put("power", round2(powerKw));
+            putIfPresent(tlm, "is_charging", boolToInt(charging));
+            putIfPresent(tlm, "is_dcfc", boolToInt(dcfc));
+            putIfPresent(tlm, "is_parked", boolToInt(parked));
+
+            // Only send cabin_temp if we got a plausible reading — 0.0 likely
+            // means the property isn't supported on this VHAL.
+            if (isPlausibleTemp(cabinTemp)) {
+                tlm.put("cabin_temp", Math.round(cabinTemp));
+            }
+            // Same guard for the pack: a VHAL that does not implement the property
+            // answers 0.0, and "battery at 0 °C" is a reading ABRP acts on.
+            if (isPlausibleTemp(battTempC)) {
+                tlm.put("batt_temp", Math.round(battTempC));
+            }
+            // hvac_setpoint is a user setting, so 0 °C is not a real value either —
+            // no cabin climate control is ever set to freezing.
+            if (isPlausibleTemp(hvacSetpointC)) {
+                tlm.put("hvac_setpoint", Math.round(hvacSetpointC));
+            }
+
+            // A pack cannot hold 0 kWh and a car cannot have driven 0 km by the time
+            // it runs this app: both zeros mean "property not implemented".
+            if (capacityKwh != null && capacityKwh > 0f) {
+                tlm.put("capacity", round2(capacityKwh));
+            }
+            if (odometerKm != null && odometerKm > 0f) {
+                tlm.put("odometer", Math.round(odometerKm));
+            }
+            // Same reasoning as capacity: a car that is running this app has some energy
+            // in its pack, so 0 kWh is the VHAL saying it does not implement the property.
+            if (soeKwh != null && soeKwh > 0f) {
+                tlm.put("soe", round2(soeKwh));
+            }
+            // 0.0 IS meaningful here — it is a charge session that has just begun — so
+            // This one is guarded on null only. EVHardware's charging-session meter sends
+            // null between sessions.
+            if (kwhCharged != null) {
+                tlm.put("kwh_charged", kwhCharged.doubleValue());
+            }
+            if (isPlausibleTemp(extTempC)) {
+                tlm.put("ext_temp", Math.round(extTempC));
+            }
+            // A pack under load is never at 0 V; 0 is the property not being implemented.
+            if (voltageV != null && voltageV > 0f && voltageV < 1500f) {
+                tlm.put("voltage", round2(voltageV));
+            }
+            // 0 A is a real reading (idle), so this one is guarded on range only.
+            if (currentA != null && currentA > -2000f && currentA < 2000f) {
+                tlm.put("current", round2(currentA));
+            }
+
+            putIfPresent(tlm, "tire_pressure_fl", kpa(tirePressureFlKpa));
+            putIfPresent(tlm, "tire_pressure_fr", kpa(tirePressureFrKpa));
+            putIfPresent(tlm, "tire_pressure_rl", kpa(tirePressureRlKpa));
+            putIfPresent(tlm, "tire_pressure_rr", kpa(tirePressureRrKpa));
+
+            if (lat != null && lon != null) {
+                tlm.put("lat", lat.doubleValue());
+                tlm.put("lon", lon.doubleValue());
+                putIfPresent(tlm, "elevation", elevation == null ? null : Math.round(elevation));
+                putIfPresent(tlm, "heading", heading == null ? null : Math.round(heading));
+            }
+        } catch (JSONException e) {
+            // JSONObject.put only throws on NaN/Infinity values, which the guards above
+            // already exclude. Returning just the timestamp keeps the upload alive.
+            return "{\"utc\":" + utc + "}";
+        }
+        return tlm.toString();
+    }
+
+    /**
+     * True for a temperature that a sensor could actually have measured. Excludes exactly
+     * 0.0, which is what an unimplemented VHAL property returns — see cabin_temp above.
+     *
+     * Package-private because the service asks the same question before deciding whether to
+     * look for an outside temperature somewhere other than the car.
+     */
+    static boolean isPlausibleTemp(Float celsius) {
+        return celsius != null && celsius > -50f && celsius < 80f && celsius != 0f;
+    }
+
+    /**
+     * Rounded kPa, or null when the reading is outside anything a road tyre reports.
+     * A flat tyre still reads well above zero, so 0 means the wheel has no sensor.
+     */
+    private static Integer kpa(Float pressure) {
+        if (pressure == null || pressure < 50f || pressure > 500f) return null;
+        return Math.round(pressure);
+    }
+
+    private static void putIfPresent(JSONObject json, String key, Object value)
+            throws JSONException {
+        if (value != null) json.put(key, value);
+    }
+
+    private static Integer boolToInt(Boolean value) {
+        return value == null ? null : (value ? 1 : 0);
+    }
+
+    /** ABRP expects kW with 2 decimals; avoids a locale-dependent String.format. */
+    private static double round2(float value) {
+        return Math.round(value * 100.0) / 100.0;
+    }
+
+    /**
+     * Every field {@link #build()} can emit, in the order the summary lists them.
+     * Used only to work out what was left out — see {@link #summarize(String)}.
+     */
+    private static final String[] ALL_FIELDS = {
+            "utc", "soc", "speed", "power", "est_battery_range", "cabin_temp",
+            "batt_temp", "hvac_setpoint", "capacity", "soe", "kwh_charged", "odometer",
+            "is_charging", "is_dcfc", "is_parked", "lat", "lon", "elevation", "heading",
+            "tire_pressure_fl", "tire_pressure_fr", "tire_pressure_rl", "tire_pressure_rr",
+            "ext_temp", "voltage", "current",
+    };
+
+    /**
+     * One-line, human-readable digest of an upload: what was sent, and what was left out.
+     *
+     * Derived from the JSON that actually goes on the wire rather than from the fields
+     * above, so it cannot drift away from the payload it claims to describe — which is
+     * the whole point of having it when a value on the ABRP side looks wrong.
+     */
+    static String summarize(String tlmJson) {
+        JSONObject tlm;
+        try {
+            tlm = new JSONObject(tlmJson);
+        } catch (JSONException e) {
+            return "unparseable payload: " + tlmJson;
+        }
+        StringBuilder sent = new StringBuilder();
+        StringBuilder omitted = new StringBuilder();
+        for (String field : ALL_FIELDS) {
+            if (tlm.has(field)) {
+                if (sent.length() > 0) sent.append(' ');
+                sent.append(field).append('=').append(tlm.opt(field));
+            } else {
+                if (omitted.length() > 0) omitted.append(',');
+                omitted.append(field);
+            }
+        }
+        return sent + (omitted.length() == 0 ? "" : " | omitted: " + omitted);
+    }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/TelemetryQueue.java b/app/src/main/java/com/evsuite/abrp/TelemetryQueue.java
new file mode 100644
index 0000000..3ce0bf9
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/TelemetryQueue.java
@@ -0,0 +1,59 @@
+package com.evsuite.abrp;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Live samples waiting to reach the server, oldest first.
+ *
+ * Bounded: while the car is offline the oldest samples are dropped once {@link #capacity}
+ * is reached, so a long dead spot costs the start of the gap, never the head unit's memory.
+ * Held in memory only — a process restart loses what is queued, which is the price of not
+ * writing to flash every 15 seconds.
+ *
+ * Free of Android types so the policy is unit-tested on the JVM.
+ */
+final class TelemetryQueue {
+
+    /** About eight hours at one sample per 15-second tick. */
+    static final int DEFAULT_CAPACITY = 2000;
+    /** The server takes at most 500 samples per request. */
+    static final int MAX_BATCH = 500;
+
+    private final int capacity;
+    private final ArrayDeque<String> samples = new ArrayDeque<>();
+    private int dropped;
+
+    TelemetryQueue() { this(DEFAULT_CAPACITY); }
+
+    TelemetryQueue(int capacity) { this.capacity = capacity; }
+
+    synchronized void add(String sampleJson) {
+        if (samples.size() >= capacity) {
+            samples.removeFirst();
+            dropped++;
+        }
+        samples.addLast(sampleJson);
+    }
+
+    /** Up to {@link #MAX_BATCH} of the oldest samples, still queued until {@link #remove}. */
+    synchronized List<String> peekBatch() {
+        List<String> batch = new ArrayList<>(Math.min(samples.size(), MAX_BATCH));
+        for (String sample : samples) {
+            if (batch.size() >= MAX_BATCH) break;
+            batch.add(sample);
+        }
+        return batch;
+    }
+
+    /** Drops the oldest {@code count} samples once the server has confirmed them. */
+    synchronized void remove(int count) {
+        for (int i = 0; i < count && !samples.isEmpty(); i++) samples.removeFirst();
+    }
+
+    synchronized int size() { return samples.size(); }
+
+    /** Samples lost to the capacity limit since the queue was created. */
+    synchronized int dropped() { return dropped; }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/TelemetryUploader.java b/app/src/main/java/com/evsuite/abrp/TelemetryUploader.java
new file mode 100644
index 0000000..ce2b0a7
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/TelemetryUploader.java
@@ -0,0 +1,264 @@
+package com.evsuite.abrp;
+
+import android.content.Context;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.os.Bundle;
+import android.os.Looper;
+import android.os.SystemClock;
+import android.util.Log;
+
+import com.evsuite.hardware.telemetry.EnergySnapshot;
+import com.evsuite.hardware.telemetry.TirePressureSnapshot;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Live telemetry to the car server, which stores it and forwards the newest sample to ABRP.
+ *
+ * Called on every service tick. While the car is in use every tick becomes a sample; the
+ * queue is sent when {@link UploadCadence} says so — every tick on a state change, otherwise
+ * at the configured interval. Parked and not charging, a sample is only taken when one is
+ * sent, every 15 minutes: nothing changes, and a sample every 15 s overnight is waste.
+ *
+ * Runs on the service's scheduler thread; the HTTP calls block it, with short timeouts.
+ * Location updates arrive on the main looper and are only read here.
+ */
+final class TelemetryUploader {
+
+    private static final String TAG = "NilsMG4.Telemetry";
+    private static final int TIMEOUT_MS = 8_000;
+    /** Batches per tick: a backlog drains over a few ticks instead of stalling one. */
+    private static final int MAX_BATCHES_PER_TICK = 2;
+    /** A fix older than this no longer says where the car is; position is omitted. */
+    private static final long MIN_LOCATION_MAX_AGE_MS = 5 * 60_000L;
+    private static final long LOCATION_RETRY_MS = 30_000L;
+
+    private final Context context;
+    private final TelemetryQueue queue = new TelemetryQueue();
+    private final ChargingSignal chargingSignal = new ChargingSignal();
+
+    private volatile Location lastLocation;
+    private volatile boolean locationActive;
+    private volatile long lastLocationRequestMs;
+    private LocationManager locationManager;
+
+    private long lastUploadAttemptMs;
+    private Boolean lastParked;
+    private Boolean lastCharging;
+
+    TelemetryUploader(Context context) {
+        this.context = context.getApplicationContext();
+    }
+
+    // ---------- Tick ----------
+
+    void tick(EnergySnapshot vehicle, ChargeSessionTracker.Snapshot session, UploadSettings settings) {
+        long nowMs = System.currentTimeMillis();
+        ensureLocationUpdates(settings);
+
+        Integer soc = vehicle.getSocPercent() == null ? null : Math.round(vehicle.getSocPercent());
+        Float powerKw = vehicle.getBatteryPowerKw();
+        Boolean parked = vehicle.getParked();
+        // The charge port property need not be implemented; ChargingSignal falls back to the
+        // charge rate and the park state, exactly as the removed ABRP uploader did.
+        Boolean charging = chargingSignal.evaluate(
+                nowMs, vehicle.getChargePortConnected(), powerKw == null ? null : -powerKw, parked, soc);
+        Boolean dcfc = charging == null || powerKw == null ? null
+                : charging && ChargingState.isDcCharging(vehicle.getChargingStatus(),
+                        vehicle.getChargePortConnected(), powerKw, vehicle.getSpeedKmh());
+
+        boolean stateChanged = !Objects.equals(parked, lastParked) || !Objects.equals(charging, lastCharging);
+        lastParked = parked;
+        lastCharging = charging;
+
+        boolean idle = Boolean.TRUE.equals(parked) && Boolean.FALSE.equals(charging);
+        boolean uploadDue = UploadCadence.shouldUpload(
+                nowMs, lastUploadAttemptMs, parked, charging, soc, stateChanged, settings);
+        if (!idle || uploadDue) {
+            queue.add(buildSample(nowMs, vehicle, session, settings, soc, charging, dcfc, parked));
+        }
+        if (!uploadDue) return;
+        // Cadence counts attempts, not successes: retrying every tick while offline would
+        // spend power exactly when it buys nothing.
+        lastUploadAttemptMs = nowMs;
+        flush();
+    }
+
+    int queued() { return queue.size(); }
+
+    // ---------- Sample ----------
+
+    private String buildSample(long nowMs, EnergySnapshot vehicle, ChargeSessionTracker.Snapshot session,
+                               UploadSettings settings, Integer soc, Boolean charging, Boolean dcfc, Boolean parked) {
+        TelemetryPayload tlm = new TelemetryPayload(nowMs / 1000);
+        tlm.soc = soc;
+        tlm.speedKmh = vehicle.getSpeedKmh();
+        tlm.rangeKm = vehicle.getRangeKm() == null ? null : Math.round(vehicle.getRangeKm());
+        tlm.powerKw = vehicle.getBatteryPowerKw();
+        tlm.charging = charging;
+        tlm.dcfc = dcfc;
+        tlm.parked = parked;
+        tlm.cabinTemp = vehicle.getCabinTempCelsius();
+        tlm.battTempC = vehicle.getBatteryTempCelsius();
+        tlm.extTempC = vehicle.getOutsideTempCelsius();
+        tlm.capacityKwh = vehicle.getBatteryCapacityKwh();
+        tlm.soeKwh = vehicle.getBatteryEnergyKwh();
+        tlm.odometerKm = vehicle.getOdometerKm();
+        tlm.hvacSetpointC = vehicle.getClimate().getDriverTargetCelsius();
+        tlm.voltageV = vehicle.getBatteryVoltageV();
+        tlm.currentA = vehicle.getBatteryCurrentA();
+        // Only DC charges are metered, so only those carry an energy figure.
+        if (Boolean.TRUE.equals(dcfc) && session != null && session.charging) tlm.kwhCharged = session.energyKwh;
+        TirePressureSnapshot tires = vehicle.getTirePressures();
+        tlm.tirePressureFlKpa = tires.getFrontLeftKpa();
+        tlm.tirePressureFrKpa = tires.getFrontRightKpa();
+        tlm.tirePressureRlKpa = tires.getRearLeftKpa();
+        tlm.tirePressureRrKpa = tires.getRearRightKpa();
+        Location loc = freshLocation(settings);
+        if (loc != null) {
+            tlm.lat = loc.getLatitude();
+            tlm.lon = loc.getLongitude();
+            tlm.elevation = loc.hasAltitude() ? loc.getAltitude() : null;
+            tlm.heading = loc.hasBearing() ? loc.getBearing() : null;
+        }
+        return tlm.build();
+    }
+
+    // ---------- Upload ----------
+
+    private void flush() {
+        ServerConfig config = ServerConfig.get(context);
+        if (!config.isConfigured()) {
+            Log.i(TAG, "Telemetry not sent: server not configured (" + queue.size() + " queued)");
+            return;
+        }
+        for (int i = 0; i < MAX_BATCHES_PER_TICK && queue.size() > 0; i++) {
+            List<String> batch = queue.peekBatch();
+            String summary = TelemetryPayload.summarize(batch.get(batch.size() - 1));
+            try {
+                int status = post(config, batch);
+                boolean ok = status >= 200 && status < 300;
+                AbrpUploadService.log().record(new UploadLog.Entry(System.currentTimeMillis(), status, ok,
+                        ok ? "Telemetry: " + batch.size() + " sample(s) sent"
+                           : "Telemetry rejected (" + batch.size() + " queued)", summary));
+                if (!ok) {
+                    // A 400 will never succeed on retry: drop the batch rather than block the
+                    // queue behind it forever. Anything else (401, 5xx) is kept for later.
+                    if (status == 400) queue.remove(batch.size());
+                    return;
+                }
+                queue.remove(batch.size());
+            } catch (Exception e) {
+                AbrpUploadService.log().record(new UploadLog.Entry(System.currentTimeMillis(), 0, false,
+                        "Telemetry offline — " + queue.size() + " queued: " + e.getClass().getSimpleName(),
+                        summary));
+                return;
+            }
+        }
+    }
+
+    private int post(ServerConfig config, List<String> batch) throws Exception {
+        JSONArray samples = new JSONArray();
+        for (String sample : batch) samples.put(new JSONObject(sample));
+        byte[] body = new JSONObject()
+                .put("installationId", config.installationId)
+                .put("samples", samples)
+                .toString().getBytes(StandardCharsets.UTF_8);
+        HttpURLConnection connection = null;
+        try {
+            connection = (HttpURLConnection) new URL(config.url + "/v1/telemetry").openConnection();
+            connection.setRequestMethod("POST");
+            connection.setConnectTimeout(TIMEOUT_MS);
+            connection.setReadTimeout(TIMEOUT_MS);
+            connection.setDoOutput(true);
+            connection.setFixedLengthStreamingMode(body.length);
+            connection.setRequestProperty("Content-Type", "application/json");
+            // The token goes in a header, never the URL, and is never logged.
+            connection.setRequestProperty("Authorization", "Bearer " + config.token);
+            try (OutputStream out = connection.getOutputStream()) { out.write(body); }
+            return connection.getResponseCode();
+        } finally {
+            if (connection != null) connection.disconnect();
+        }
+    }
+
+    // ---------- Location ----------
+
+    private final LocationListener locationListener = new LocationListener() {
+        @Override public void onLocationChanged(Location location) { lastLocation = location; }
+        @Override public void onStatusChanged(String provider, int status, Bundle extras) { }
+        @Override public void onProviderEnabled(String provider) { locationActive = false; }
+        @Override public void onProviderDisabled(String provider) {
+            // A stale fix is worse than none: it would put the car back where it was.
+            lastLocation = null;
+            locationActive = false;
+        }
+    };
+
+    /** Subscribes to GPS once, and again after a failure or a provider change. */
+    private void ensureLocationUpdates(UploadSettings settings) {
+        if (locationActive) return;
+        long now = SystemClock.elapsedRealtime();
+        if (lastLocationRequestMs != 0L && now - lastLocationRequestMs < LOCATION_RETRY_MS) return;
+        lastLocationRequestMs = now;
+        new android.os.Handler(Looper.getMainLooper()).post(() -> requestLocationUpdates(settings));
+    }
+
+    private void requestLocationUpdates(UploadSettings settings) {
+        try {
+            if (locationManager == null) {
+                locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+            }
+            try { locationManager.removeUpdates(locationListener); } catch (Exception ignored) { }
+            if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+                Log.w(TAG, "GPS provider disabled — position omitted, will retry");
+                return;
+            }
+            // Matched to the upload interval: fixes between uploads would only be thrown away.
+            locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
+                    Math.min(settings.intervalMs(), 15_000L), 0f, locationListener, Looper.getMainLooper());
+            locationActive = true;
+            Location last = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
+            if (last != null && locationAgeMs(last) <= MIN_LOCATION_MAX_AGE_MS) lastLocation = last;
+        } catch (SecurityException e) {
+            Log.w(TAG, "Location permission not granted: " + e.getMessage());
+        } catch (Exception e) {
+            Log.w(TAG, "Location unavailable: " + e.getMessage());
+        }
+    }
+
+    void stop() {
+        try {
+            if (locationManager != null) locationManager.removeUpdates(locationListener);
+        } catch (Exception ignored) { }
+        locationActive = false;
+    }
+
+    private Location freshLocation(UploadSettings settings) {
+        Location loc = lastLocation;
+        if (loc == null) return null;
+        long maxAge = Math.max(MIN_LOCATION_MAX_AGE_MS, 3 * settings.intervalMs());
+        return locationAgeMs(loc) <= maxAge ? loc : null;
+    }
+
+    /**
+     * Age on the monotonic clock: the head unit sets its wall clock from GPS, so a fix's
+     * wall-clock time can jump. A provider that does not stamp the monotonic clock leaves 0;
+     * such a fix counts as fresh rather than blanking the position for good.
+     */
+    private static long locationAgeMs(Location loc) {
+        long fixNanos = loc.getElapsedRealtimeNanos();
+        if (fixNanos <= 0L) return 0L;
+        return Math.max(0L, (SystemClock.elapsedRealtimeNanos() - fixNanos) / 1_000_000L);
+    }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/UploadCadence.java b/app/src/main/java/com/evsuite/abrp/UploadCadence.java
new file mode 100644
index 0000000..4cf5737
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/UploadCadence.java
@@ -0,0 +1,66 @@
+package com.evsuite.abrp;
+
+/**
+ * Decides whether a given scheduler tick should actually upload.
+ *
+ * The service ticks at a fixed short rate; this class thins the uploads out. A car parked
+ * overnight and not charging does not need a sample every minute — that is wasted data and
+ * power — but nothing may be lost while driving or charging, where ABRP needs the
+ * resolution to keep a route plan accurate.
+ *
+ * Free of Android types so the policy can be unit-tested directly.
+ */
+final class UploadCadence {
+
+    /**
+     * Parked and not charging: one keep-alive sample every 15 minutes. The car is not
+     * moving and its SOC is not changing, so anything more is spent for nothing.
+     */
+    static final long PARKED_INTERVAL_MS = 900_000L;
+
+    private UploadCadence() { }
+
+    /**
+     * @param nowMs         current time
+     * @param lastUploadMs  when the last upload was attempted, 0 if never
+     * @param parked        null when the gear could not be read
+     * @param charging      null when the charge port state could not be read
+     * @param socPercent    null when the battery level could not be read
+     * @param stateChanged  true if parked/charging differ from the previous tick
+     * @param settings      user-configured cadence
+     */
+    static boolean shouldUpload(long nowMs, long lastUploadMs,
+                                Boolean parked, Boolean charging, Integer socPercent,
+                                boolean stateChanged, UploadSettings settings) {
+        // Never uploaded yet: send immediately so ABRP sees the car come online.
+        if (lastUploadMs <= 0L) return true;
+
+        // A transition (just parked, plugged in, unplugged) is exactly what ABRP must
+        // learn straight away — never make it wait for the slow interval.
+        if (stateChanged) return true;
+
+        return nowMs - lastUploadMs >= intervalFor(parked, charging, socPercent, settings);
+    }
+
+    /**
+     * Interval that applies in the given state.
+     *
+     * Unknown state counts as active: if the gear or charge port could not be read we do
+     * not know the car is idle, and under-reporting a moving car is worse than a few
+     * extra requests from a stationary one.
+     */
+    static long intervalFor(Boolean parked, Boolean charging, Integer socPercent,
+                            UploadSettings settings) {
+        boolean idle = Boolean.TRUE.equals(parked) && Boolean.FALSE.equals(charging);
+        if (idle) return PARKED_INTERVAL_MS;
+
+        // Low battery: the driver is picking a charge stop and ABRP needs a tighter SOC
+        // curve to get the arrival estimate right. Only while actually in use — a car
+        // parked at 5 % is still parked and gains nothing from fast polling.
+        if (settings.boostLowSoc && socPercent != null
+                && socPercent <= settings.lowSocPercent) {
+            return Math.min(settings.intervalMs(), UploadSettings.BOOSTED_INTERVAL_SEC * 1000L);
+        }
+        return settings.intervalMs();
+    }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/UploadSettings.java b/app/src/main/java/com/evsuite/abrp/UploadSettings.java
index a6f7607..a30ec5a 100644
--- a/app/src/main/java/com/evsuite/abrp/UploadSettings.java
+++ b/app/src/main/java/com/evsuite/abrp/UploadSettings.java
@@ -1,14 +1,79 @@
 package com.evsuite.abrp;
 
+import android.content.SharedPreferences;
+
 /**
- * Placeholder — the service is always-on and samples on a fixed 15-second scheduler, so
- * there is no user-configurable upload policy left. Kept as an empty shell so any stray
- * references compile during the ABRP removal; will be deleted once all callers are gone.
+ * User-configurable upload policy.
+ *
+ * Defaults are deliberately conservative. The head unit is awake whenever the car is on,
+ * and both the upload tick and the GPS subscription cost power the whole time, so the
+ * default cadence is the slowest one that still keeps an ABRP route plan usable.
  */
 final class UploadSettings {
 
-    static final String KEY_AUTOSTART = "autostart";
-    static final boolean DEFAULT_AUTOSTART = true;
+    static final String KEY_INTERVAL_SEC    = "upload_interval_sec";
+    static final String KEY_BOOST_LOW_SOC   = "boost_low_soc";
+    static final String KEY_LOW_SOC_PERCENT = "low_soc_percent";
+    static final String KEY_AUTOSTART       = "autostart";
+    static final String KEY_ABRP_UPLOAD_ENABLED = "abrp_upload_enabled";
 
-    private UploadSettings() { }
+    /**
+     * On by default: an ABRP plan is only useful if it is fed from the moment the drive
+     * starts, and nobody opens this app before setting off. Kept as a switch because a
+     * service that starts itself must also be switchable off.
+     */
+    static final boolean DEFAULT_AUTOSTART = true;
+    static final boolean DEFAULT_ABRP_UPLOAD_ENABLED = true;
+
+    /**
+     * Default cadence while driving. 60 s is roughly 1.5 km between points at motorway
+     * speed, which ABRP can still track; going much slower makes the live plan lag
+     * reality. Parked and idle backs off far further on its own — see UploadCadence.
+     */
+    static final int DEFAULT_INTERVAL_SEC = 60;
+
+    /** Offered in the UI. Kept short so the list stays a single glance on a car screen. */
+    static final int[] INTERVAL_CHOICES_SEC = { 15, 30, 60, 120, 300 };
+
+    static final boolean DEFAULT_BOOST_LOW_SOC = true;
+
+    /** Below this, range planning gets tight and ABRP needs a finer SOC curve. */
+    static final int DEFAULT_LOW_SOC_PERCENT = 20;
+
+    /** Cadence used while SOC is low and the boost is enabled. */
+    static final int BOOSTED_INTERVAL_SEC = 15;
+
+    final int intervalSec;
+    final boolean boostLowSoc;
+    final int lowSocPercent;
+    final boolean abrpUploadEnabled;
+
+    UploadSettings(int intervalSec, boolean boostLowSoc, int lowSocPercent) {
+        this(intervalSec, boostLowSoc, lowSocPercent, DEFAULT_ABRP_UPLOAD_ENABLED);
+    }
+
+    UploadSettings(int intervalSec, boolean boostLowSoc, int lowSocPercent,
+                   boolean abrpUploadEnabled) {
+        this.intervalSec = intervalSec;
+        this.boostLowSoc = boostLowSoc;
+        this.lowSocPercent = lowSocPercent;
+        this.abrpUploadEnabled = abrpUploadEnabled;
+    }
+
+    static UploadSettings from(SharedPreferences prefs) {
+        return new UploadSettings(
+                prefs.getInt(KEY_INTERVAL_SEC, DEFAULT_INTERVAL_SEC),
+                prefs.getBoolean(KEY_BOOST_LOW_SOC, DEFAULT_BOOST_LOW_SOC),
+                prefs.getInt(KEY_LOW_SOC_PERCENT, DEFAULT_LOW_SOC_PERCENT),
+                prefs.getBoolean(KEY_ABRP_UPLOAD_ENABLED, DEFAULT_ABRP_UPLOAD_ENABLED));
+    }
+
+    static UploadSettings defaults() {
+        return new UploadSettings(
+                DEFAULT_INTERVAL_SEC, DEFAULT_BOOST_LOW_SOC, DEFAULT_LOW_SOC_PERCENT);
+    }
+
+    long intervalMs() {
+        return intervalSec * 1000L;
+    }
 }
diff --git a/app/src/main/res/drawable/ic_tab_server.xml b/app/src/main/res/drawable/ic_tab_server.xml
new file mode 100644
index 0000000..3f45ef0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tab_server.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Arrow into a tray: the Server tab (where the telemetry goes). Tinted by
+     @color/nav_tab_foreground. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:fillColor="#00000000"
+        android:pathData="M4,14V19H20V14" />
+    <path
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:fillColor="#00000000"
+        android:pathData="M12,3V13M8,7L12,3L16,7" />
+</vector>
diff --git a/app/src/main/res/layout-w1000dp/activity_main.xml b/app/src/main/res/layout-w1000dp/activity_main.xml
index c1cae25..bd06d3b 100644
--- a/app/src/main/res/layout-w1000dp/activity_main.xml
+++ b/app/src/main/res/layout-w1000dp/activity_main.xml
@@ -10,6 +10,7 @@
                 <com.google.android.material.button.MaterialButton android:id="@+id/tabConsumption" style="@style/Widget.EV.NavTab" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginBottom="6dp" android:text="@string/tab_consumption" app:icon="@drawable/ic_tab_vehicle" />
                 <com.google.android.material.button.MaterialButton android:id="@+id/tabCharging" style="@style/Widget.EV.NavTab" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginBottom="6dp" android:text="@string/tab_charging" app:icon="@drawable/ic_tab_service" />
                 <com.google.android.material.button.MaterialButton android:id="@+id/tabService" style="@style/Widget.EV.NavTab" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginBottom="6dp" android:text="@string/tab_service" app:icon="@drawable/ic_tab_service" />
+                <com.google.android.material.button.MaterialButton android:id="@+id/tabServer" style="@style/Widget.EV.NavTab" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginBottom="6dp" android:text="@string/tab_server" app:icon="@drawable/ic_tab_server" />
                 <com.google.android.material.button.MaterialButton android:id="@+id/tabWifi" style="@style/Widget.EV.NavTab" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginBottom="6dp" android:text="@string/tab_wifi" app:icon="@drawable/ic_tab_wifi" />
                 <com.google.android.material.button.MaterialButton android:id="@+id/tabLog" style="@style/Widget.EV.NavTab" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginBottom="6dp" android:text="@string/tab_log" app:icon="@drawable/ic_tab_log" />
             </LinearLayout>
diff --git a/app/src/main/res/layout-w1000dp/pane_service.xml b/app/src/main/res/layout-w1000dp/pane_service.xml
index 9eced4d..0d904ea 100644
--- a/app/src/main/res/layout-w1000dp/pane_service.xml
+++ b/app/src/main/res/layout-w1000dp/pane_service.xml
@@ -3,12 +3,9 @@
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:padding="24dp" android:baselineAligned="false">
         <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:layout_marginEnd="16dp" android:padding="24dp" android:background="@drawable/bg_glass">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_service_controls" android:textAppearance="@style/Text.EV.Eyebrow" />
-            <TextView android:id="@+id/status_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_input_panel" android:padding="16dp" android:layout_marginTop="20dp" android:layout_marginBottom="12dp" android:text="@string/status_stopped" android:textAppearance="@style/Text.EV.Body" />
-            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/service_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_upload_enabled" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
+            <TextView android:id="@+id/status_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_input_panel" android:padding="16dp" android:layout_marginTop="20dp" android:layout_marginBottom="12dp" android:text="@string/state_stopped" android:textAppearance="@style/Text.EV.Body" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/abrp_upload_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Secondary" />
-            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/autostart_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_autostart" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_autostart" android:textAppearance="@style/Text.EV.Secondary" />
         </LinearLayout>
         <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_service_timing" android:textAppearance="@style/Text.EV.Eyebrow" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4a92f4f..a0ea4c8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -17,6 +17,7 @@
       <com.google.android.material.button.MaterialButton android:id="@+id/tabConsumption" style="@style/Widget.EV.NavTab.Compact" android:layout_width="0dp" android:layout_height="76dp" android:layout_weight="1" android:text="@string/tab_consumption" app:icon="@drawable/ic_tab_vehicle"/>
       <com.google.android.material.button.MaterialButton android:id="@+id/tabCharging" style="@style/Widget.EV.NavTab.Compact" android:layout_width="0dp" android:layout_height="76dp" android:layout_weight="1" android:text="@string/tab_charging" app:icon="@drawable/ic_tab_service"/>
       <com.google.android.material.button.MaterialButton android:id="@+id/tabService" style="@style/Widget.EV.NavTab.Compact" android:layout_width="0dp" android:layout_height="76dp" android:layout_weight="1" android:text="@string/tab_service" app:icon="@drawable/ic_tab_service"/>
+      <com.google.android.material.button.MaterialButton android:id="@+id/tabServer" style="@style/Widget.EV.NavTab.Compact" android:layout_width="0dp" android:layout_height="76dp" android:layout_weight="1" android:text="@string/tab_server" app:icon="@drawable/ic_tab_server"/>
       <com.google.android.material.button.MaterialButton android:id="@+id/tabWifi" style="@style/Widget.EV.NavTab.Compact" android:layout_width="0dp" android:layout_height="76dp" android:layout_weight="1" android:text="@string/tab_wifi" app:icon="@drawable/ic_tab_wifi"/>
       <com.google.android.material.button.MaterialButton android:id="@+id/tabLog" style="@style/Widget.EV.NavTab.Compact" android:layout_width="0dp" android:layout_height="76dp" android:layout_weight="1" android:text="@string/tab_log" app:icon="@drawable/ic_tab_log"/>
     </LinearLayout>
diff --git a/app/src/main/res/layout/pane_server.xml b/app/src/main/res/layout/pane_server.xml
new file mode 100644
index 0000000..455efa2
--- /dev/null
+++ b/app/src/main/res/layout/pane_server.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
+    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp">
+        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/server_card_title" android:textAppearance="@style/Text.EV.Eyebrow" />
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/server_url_layout" style="@style/Widget.EV.Input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="18dp" android:hint="@string/hint_server_url" app:helperText="@string/helper_server_url">
+                <com.google.android.material.textfield.TextInputEditText android:id="@+id/server_url_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="textUri" android:singleLine="true" android:textSize="20sp" />
+            </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/server_token_layout" style="@style/Widget.EV.Input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="18dp" android:hint="@string/hint_server_token" app:endIconMode="password_toggle" app:endIconMinSize="72dp" app:helperText="@string/helper_server_token">
+                <com.google.android.material.textfield.TextInputEditText android:id="@+id/server_token_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="textPassword" android:singleLine="true" android:textSize="20sp" />
+            </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/installation_id_layout" style="@style/Widget.EV.Input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="18dp" android:hint="@string/hint_installation_id" app:helperText="@string/helper_installation_id">
+                <com.google.android.material.textfield.TextInputEditText android:id="@+id/installation_id_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="text" android:singleLine="true" android:textSize="18sp" android:fontFamily="monospace" />
+            </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.button.MaterialButton android:id="@+id/server_save_button" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_save" android:layout_marginTop="20dp" />
+            <com.google.android.material.button.MaterialButton android:id="@+id/server_test_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_test" android:layout_marginTop="8dp" />
+            <LinearLayout android:id="@+id/connection_status_row" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:gravity="center_vertical" android:orientation="horizontal" android:visibility="gone">
+                <View android:id="@+id/connection_indicator" android:layout_width="10dp" android:layout_height="10dp" android:layout_marginEnd="12dp" android:background="@drawable/circle_indicator" />
+                <TextView android:id="@+id/connection_status_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="@style/Text.EV.Body" />
+            </LinearLayout>
+        </LinearLayout>
+        <Space android:layout_width="1dp" android:layout_height="20dp" />
+        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_private_title" android:textAppearance="@style/Text.EV.Title" />
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_private_body" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="16dp" android:lineSpacingMultiplier="1.3" />
+            <com.google.android.material.button.MaterialButton android:id="@+id/import_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_import" android:layout_marginTop="24dp" />
+            <TextView android:id="@+id/import_hint" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:textAppearance="@style/Text.EV.Secondary" android:textIsSelectable="true" />
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/pane_service.xml b/app/src/main/res/layout/pane_service.xml
index 9d8557f..cfdda55 100644
--- a/app/src/main/res/layout/pane_service.xml
+++ b/app/src/main/res/layout/pane_service.xml
@@ -3,12 +3,9 @@
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp">
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_service_controls" android:textAppearance="@style/Text.EV.Eyebrow" />
-            <TextView android:id="@+id/status_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_input_panel" android:padding="16dp" android:layout_marginTop="20dp" android:layout_marginBottom="12dp" android:text="@string/status_stopped" android:textAppearance="@style/Text.EV.Body" />
-            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/service_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_upload_enabled" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
+            <TextView android:id="@+id/status_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_input_panel" android:padding="16dp" android:layout_marginTop="20dp" android:layout_marginBottom="12dp" android:text="@string/state_stopped" android:textAppearance="@style/Text.EV.Body" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/abrp_upload_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Secondary" />
-            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/autostart_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_autostart" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_autostart" android:textAppearance="@style/Text.EV.Secondary" />
         </LinearLayout>
         <Space android:layout_width="1dp" android:layout_height="20dp" />
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 341259d..ef89248 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,7 +2,6 @@
     <string name="app_name">Nils\' MG4</string>
 
     <!-- Main screen -->
-    <string name="tab_abrp">ABRP</string>
     <string name="tab_service">Upload</string>
     <string name="tab_vehicle">Overview</string>
     <string name="tab_consumption">Consumption</string>
@@ -11,6 +10,7 @@
     <string name="consumption_subtitle">Since start, motor, lifetime and trip counters</string>
     <string name="charging_title">Charging</string>
     <string name="charging_subtitle">Live battery values and SOC/power curve</string>
+    <string name="tab_server">Server</string>
     <string name="tab_wifi">Wi-Fi</string>
     <string name="tab_log">Logs</string>
 
@@ -42,45 +42,45 @@
     <string name="vehicle_tire_fr">Front Right</string>
     <string name="vehicle_tire_rl">Rear Left</string>
     <string name="vehicle_tire_rr">Rear Right</string>
-    <string name="card_config">Configuration</string>
-    <string name="hint_api_key">ABRP API Key</string>
-    <string name="default_abrp_api_key" translatable="false">8cfc314b-03cd-4efe-ab7d-4431cd8f2e2d</string>
-    <string name="helper_api_key">Default: open-source ABRP telemetry key. You may replace it with your own.</string>
-    <string name="api_key_required">Enter your ABRP API key first</string>
-    <string name="hint_token">ABRP User Token</string>
-    <string name="helper_token">Find your token in the ABRP app: Settings → Connections → Generic (Manual Entry)</string>
-    <string name="desc_toggle_api_key">Show or hide API key</string>
-    <string name="desc_toggle_token">Show or hide user token</string>
     <string name="btn_save">Save</string>
     <string name="btn_test">Test connection</string>
     <string name="btn_import">Import from file</string>
 
+    <!-- Server page -->
+    <string name="server_card_title">Car server</string>
+    <string name="hint_server_url">Server URL</string>
+    <string name="helper_server_url">For example https://car.stinnesbeck.com</string>
+    <string name="hint_server_token">Ingest token</string>
+    <string name="helper_server_token">The server\'s INGEST_TOKEN, at least 24 characters</string>
+    <string name="hint_installation_id">Installation ID</string>
+    <string name="helper_installation_id">Your data is stored under this ID. Keep it when reinstalling.</string>
+    <string name="server_err_url">Enter an https:// URL</string>
+    <string name="server_err_token">The token must be at least 24 characters, without spaces</string>
+    <string name="server_err_installation_id">Not a valid ID (UUID)</string>
+    <string name="server_saved">Server settings saved</string>
+    <string name="server_not_configured">Server not configured — open the Server tab</string>
+    <string name="import_hint">Put a text file with server_url and token in %1$s (on the head unit or a USB stick in the same folder), then press Import.</string>
+
     <!-- Config file import -->
-    <string name="import_ok">Config imported — press Test to verify</string>
+    <string name="import_ok">Config imported and saved — press Test to verify</string>
     <string name="import_err_read">Could not read that file</string>
-    <string name="import_err_empty">No ABRP settings found in that file</string>
+    <string name="import_err_empty">No settings found in that file</string>
     <string name="import_err_not_found">No config file found. Copy it to %1$s</string>
 
     <!-- Connection test -->
     <string name="conn_testing">Testing…</string>
-    <string name="conn_ok">Connected — API responding OK</string>
-    <string name="conn_err_auth">Auth failed — check your API key and token</string>
+    <string name="conn_ok">Connected — server accepts the token</string>
+    <string name="conn_err_auth">Token rejected — check it against the server\'s INGEST_TOKEN</string>
     <string name="perm_denied_location">Location denied — telemetry will have no position. Grant it in Settings to send GPS to ABRP.</string>
     <string name="perm_denied_car">Vehicle data denied — no battery %%, speed or range will be sent. Grant it in Settings.</string>
     <string name="perm_denied_all">Location and vehicle data denied — only a timestamp will be sent. Grant both in Settings.</string>
     <string name="conn_err_no_internet">No internet connection</string>
     <string name="conn_err_timeout">Connection timed out</string>
     <string name="conn_err_http">Server error (HTTP %1$d)</string>
-    <string name="token_required">Enter your ABRP token first</string>
 
-    <string name="card_service">Upload Service</string>
-    <string name="label_upload_enabled">Enable background telemetry</string>
-    <string name="label_abrp_upload_enabled">Upload telemetry to ABRP</string>
-    <string name="hint_abrp_upload_enabled">Turn this off when DiPlay sends ABRP data. Local consumption tracking and background telemetry keep running.</string>
-    <string name="label_autostart">Start automatically with the car</string>
-    <string name="hint_autostart">Uploading resumes on its own when the head unit powers up. Turn this off to start it by hand from this screen.</string>
+    <string name="label_abrp_upload_enabled">Send live telemetry to the server</string>
+    <string name="hint_abrp_upload_enabled">The server stores it and forwards it to ABRP. Turn this off when another app feeds ABRP; consumption and charging tracking keep running.</string>
 
-    <string name="status_stopped">Service not running</string>
 
     <!-- Cadence configuration -->
     <string name="label_frequency">Upload frequency</string>
@@ -100,8 +100,8 @@
     <string name="state_stopped">Stopped</string>
     <string name="state_starting">Starting…</string>
     <string name="state_running">Running</string>
-    <string name="state_tracking_locally">Tracking locally — ABRP upload off</string>
-    <string name="notif_tracking_locally">Tracking locally — ABRP upload off</string>
+    <string name="state_tracking_locally">Tracking locally — live telemetry off</string>
+    <string name="notif_tracking_locally">Tracking locally — live telemetry off</string>
     <string name="state_error">In error — last %1$d uploads failed</string>
 
     <!-- Call log -->
diff --git a/app/src/main/res/values/strings_design.xml b/app/src/main/res/values/strings_design.xml
index 8cce1d3..dbadaea 100644
--- a/app/src/main/res/values/strings_design.xml
+++ b/app/src/main/res/values/strings_design.xml
@@ -7,8 +7,8 @@
   <string name="design_brand_footer">ON THE ROAD, ELECTRIC</string>
   <string name="design_overview_title">Your drive at a glance.</string>
   <string name="design_overview_subtitle">Data from your car, all in one place.</string>
-  <string name="design_abrp_title">Connect to your route.</string>
-  <string name="design_abrp_subtitle">Link your car with your ABRP account.</string>
+  <string name="design_server_title">Where your data goes.</string>
+  <string name="design_server_subtitle">Your own server stores it and passes it on to ABRP.</string>
   <string name="design_service_title">You focus on the road.</string>
   <string name="design_service_subtitle">Your data stays up to date in the background.</string>
   <string name="design_wifi_title">Stay connected.</string>
@@ -18,9 +18,9 @@
   <string name="design_battery">BATTERY</string>
   <string name="design_energy">ENERGY AND TEMPERATURE</string>
   <string name="design_tires">TIRE PRESSURES</string>
-  <string name="design_account">ACCOUNT LINK</string>
+  <string name="design_account">SERVER LINK</string>
   <string name="design_private_title">Your private connection.</string>
-  <string name="design_private_body">The token links your car to your ABRP account. Your credentials are stored encrypted on this device.</string>
+  <string name="design_private_body">The token lets the car write to your server. It is stored encrypted on this device; your ABRP credentials stay on the server.</string>
   <string name="design_no_data">Values that cannot be read are shown as &#x2014;.</string>
   <string name="design_service_controls">UPLOAD CONTROL</string>
   <string name="design_service_timing">UPDATE FREQUENCY</string>
diff --git a/app/src/test/java/com/evsuite/abrp/AbrpApiTest.java b/app/src/test/java/com/evsuite/abrp/AbrpApiTest.java
deleted file mode 100644
index 6852511..0000000
--- a/app/src/test/java/com/evsuite/abrp/AbrpApiTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.evsuite.abrp;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-/**
- * [T-912] Credentials must reach ABRP in the request body. A URL is logged by
- * proxies, CDNs and crash reporters; a body is not.
- */
-public class AbrpApiTest {
-
-    @Test
-    public void endpointUrlCarriesNoCredentials() {
-        assertFalse(AbrpApi.API_URL.contains("?"));
-        assertFalse(AbrpApi.API_URL.contains("api_key"));
-        assertFalse(AbrpApi.API_URL.contains("token"));
-    }
-
-    @Test
-    public void endpointIsHttps() {
-        assertTrue(AbrpApi.API_URL.startsWith("https://"));
-        assertTrue(AbrpApi.VERIFY_URL.startsWith("https://"));
-    }
-
-    /** [T-913] The Test button must not be able to write telemetry. */
-    @Test
-    public void credentialCheckDoesNotTargetTheTelemetryWriteEndpoint() {
-        assertFalse("le test de connexion ne doit jamais viser /tlm/send",
-                AbrpApi.VERIFY_URL.contains("/tlm/send"));
-        assertTrue(AbrpApi.VERIFY_URL.contains("get_next_charge"));
-    }
-
-    @Test
-    public void bodyCarriesAllThreeParameters() throws Exception {
-        String body = AbrpApi.formBody("KEY", "TOK", "{\"utc\":1}");
-        assertTrue(body.contains("api_key=KEY"));
-        assertTrue(body.contains("token=TOK"));
-        assertTrue(body.contains("tlm="));
-    }
-
-    @Test
-    public void bodyIsFormEncoded() throws Exception {
-        // A token with URL-significant characters must not break the body layout.
-        String body = AbrpApi.formBody("a+b/c", "d&e=f", "{\"utc\":1}");
-        assertEquals("api_key=a%2Bb%2Fc&token=d%26e%3Df&tlm=%7B%22utc%22%3A1%7D", body);
-    }
-}
diff --git a/app/src/test/java/com/evsuite/abrp/ConfigImportTest.java b/app/src/test/java/com/evsuite/abrp/ConfigImportTest.java
index 61dff8f..bde9e65 100644
--- a/app/src/test/java/com/evsuite/abrp/ConfigImportTest.java
+++ b/app/src/test/java/com/evsuite/abrp/ConfigImportTest.java
@@ -8,34 +8,37 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
 /**
- * ABRP config file parsing — pure JVM, no Android needed.
+ * Config file parsing — pure JVM, no Android needed.
  *
- * The file exists so a user does not have to type a long api_key and token on the car's
+ * The file exists so a user does not have to type a long server URL and token on the car's
  * on-screen keyboard, so the parser must be forgiving about whitespace, case and comments
  * while never inventing a value the file did not set.
  */
 public class ConfigImportTest {
 
     @Test
-    public void parsesCredentials() {
-        ConfigImport c = ConfigImport.parse("api_key = abc123\ntoken = def456\n");
-        assertEquals("abc123", c.apiKey);
+    public void parsesServerSettings() {
+        ConfigImport c = ConfigImport.parse("server_url = https://car.example.com\ntoken = def456\n"
+                + "installation_id = 6f1a2b3c-4d5e-4f60-8a9b-0c1d2e3f4a5b\n");
+        assertEquals("https://car.example.com", c.serverUrl);
         assertEquals("def456", c.token);
+        assertEquals("6f1a2b3c-4d5e-4f60-8a9b-0c1d2e3f4a5b", c.installationId);
         assertFalse(c.isEmpty());
     }
 
     @Test
     public void ignoresCommentsBlankLinesAndCase() {
         ConfigImport c = ConfigImport.parse(
-                "# my config\n\n  API_KEY =  key  \n# token below\nTOKEN=tok\n");
-        assertEquals("key", c.apiKey);
+                "# my config\n\n  SERVER_URL =  https://x.example  \n# token below\nTOKEN=tok\n");
+        assertEquals("https://x.example", c.serverUrl);
         assertEquals("tok", c.token);
     }
 
     @Test
     public void absentKeysStayNullSoNothingIsWiped() {
         ConfigImport c = ConfigImport.parse("token = only-token\n");
-        assertNull(c.apiKey);
+        assertNull(c.serverUrl);
+        assertNull(c.installationId);
         assertEquals("only-token", c.token);
         assertNull(c.intervalSec);
         assertNull(c.boostLowSoc);
@@ -80,8 +83,8 @@ public class ConfigImportTest {
 
     @Test
     public void aliasKeysAreAccepted() {
-        ConfigImport c = ConfigImport.parse("apikey = k\nuser_token = t\n");
-        assertEquals("k", c.apiKey);
+        ConfigImport c = ConfigImport.parse("url = https://k.example\ningest_token = t\n");
+        assertEquals("https://k.example", c.serverUrl);
         assertEquals("t", c.token);
     }
 }
diff --git a/app/src/test/java/com/evsuite/abrp/HeadUnitWeatherTest.java b/app/src/test/java/com/evsuite/abrp/HeadUnitWeatherTest.java
deleted file mode 100644
index 2f8f45e..0000000
--- a/app/src/test/java/com/evsuite/abrp/HeadUnitWeatherTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.evsuite.abrp;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-/**
- * The broadcast parser, on the JVM.
- *
- * What is under test is not the vendor's payload — that shape is unverified and may well be
- * something else on the car. It is that the parser finds a temperature wherever the payload
- * puts it, refuses to invent one, and says what it was given when it fails, because the
- * diagnostic is the only thing that reaches a driver with no adb.
- */
-public class HeadUnitWeatherTest {
-
-    @Test
-    public void readsATemperatureAndThePlaceItIsFor() {
-        HeadUnitWeather weather = new HeadUnitWeather();
-        weather.acceptPayload((
-                "{\"code\":0,\"weather\":{\"temperature\":27,\"unit\":\"C\","
-                        + "\"address\":\"Toulouse\",\"conditionType\":1}}"));
-        assertEquals(27f, weather.temperatureC(), 0.01f);
-        assertEquals("Toulouse", weather.place());
-        // The diagnostic carries the reading's age: a broadcast arrives when the weather app
-        // refreshes, so "where from" without "how long ago" does not say whether to trust it.
-        assertEquals("Toulouse/0min", weather.diagnostic());
-    }
-
-    @Test
-    public void findsTheValueWhereverThePayloadNests_it() {
-        HeadUnitWeather weather = new HeadUnitWeather();
-        weather.acceptPayload((
-                "{\"data\":{\"current\":[{\"tempValue\":\"18.5\",\"tempUnit\":\"C\"}]}}"));
-        assertEquals(18.5f, weather.temperatureC(), 0.01f);
-    }
-
-    @Test
-    public void convertsAFahrenheitPayload() {
-        HeadUnitWeather weather = new HeadUnitWeather();
-        weather.acceptPayload(("{\"temperature\":81,\"temperatureUnit\":\"F\"}"));
-        assertEquals(27.2f, weather.temperatureC(), 0.1f);
-    }
-
-    @Test
-    public void anUnnamedUnitIsTakenAsCelsius() {
-        HeadUnitWeather weather = new HeadUnitWeather();
-        weather.acceptPayload(("{\"temp\":21}"));
-        assertEquals(21f, weather.temperatureC(), 0.01f);
-    }
-
-    @Test
-    public void aPayloadWithoutATemperatureReportsWhatItWasGiven() {
-        HeadUnitWeather weather = new HeadUnitWeather();
-        weather.acceptPayload(("{\"conditionType\":3,\"address\":\"Toulouse\"}"));
-        assertNull(weather.temperatureC());
-        assertTrue(weather.diagnostic(), weather.diagnostic().startsWith("no temperature in {"));
-        assertTrue(weather.diagnostic(), weather.diagnostic().contains("conditionType"));
-    }
-
-    @Test
-    public void readsThePlaceFromACityKeyToo() {
-        HeadUnitWeather weather = new HeadUnitWeather();
-        weather.acceptPayload("{\"temp\":14,\"city\":\"Auzeville\"}");
-        assertEquals(14f, weather.temperatureC(), 0.01f);
-        assertEquals("Auzeville", weather.place());
-    }
-
-    @Test
-    public void aBroadcastWithNothingReadableIsReportedNotGuessed() {
-        HeadUnitWeather weather = new HeadUnitWeather();
-        weather.acceptPayload(null);
-        assertNull(weather.temperatureC());
-        assertEquals("broadcast carried no JSON", weather.diagnostic());
-    }
-
-    @Test
-    public void beforeAnyBroadcastTheDiagnosticSaysSo() {
-        HeadUnitWeather weather = new HeadUnitWeather();
-        assertNull(weather.temperatureC());
-        assertEquals("no broadcast yet", weather.diagnostic());
-    }
-
-    @Test
-    public void malformedJsonDoesNotEscapeTheReceiver() {
-        HeadUnitWeather weather = new HeadUnitWeather();
-        weather.acceptPayload(("{not json at all"));
-        assertNull(weather.temperatureC());
-        assertTrue(weather.diagnostic(), weather.diagnostic().contains("reading broadcast"));
-    }
-
-    @Test
-    public void aRestoredReadingIsReportedWithItsAge() {
-        HeadUnitWeather weather = new HeadUnitWeather();
-        weather.restore(19.5f, "Toulouse", System.currentTimeMillis() - 45 * 60 * 1000L);
-        assertEquals(19.5f, weather.temperatureC(), 0.01f);
-        assertEquals("Toulouse/45min", weather.diagnostic());
-    }
-
-    @Test
-    public void anAbsentStickyBroadcastIsNotMistakenForAFailedParse() {
-        HeadUnitWeather weather = new HeadUnitWeather();
-        weather.accept(null);
-        assertNull(weather.temperatureC());
-        assertEquals("none held, none sent yet", weather.diagnostic());
-    }
-}
diff --git a/app/src/test/java/com/evsuite/abrp/ServerConfigTest.java b/app/src/test/java/com/evsuite/abrp/ServerConfigTest.java
new file mode 100644
index 0000000..f5bf0c8
--- /dev/null
+++ b/app/src/test/java/com/evsuite/abrp/ServerConfigTest.java
@@ -0,0 +1,47 @@
+package com.evsuite.abrp;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/** What the Server tab and the config import accept — pure JVM. */
+public class ServerConfigTest {
+
+    @Test
+    public void urlIsTrimmedAndLosesTrailingSlashes() {
+        assertEquals("https://car.example.com", ServerConfig.normalizeUrl("  https://car.example.com//  "));
+        assertEquals("https://car.example.com/base", ServerConfig.normalizeUrl("https://car.example.com/base/"));
+    }
+
+    @Test
+    public void plainHttpAndJunkAreRefused() {
+        // The token travels in a header; over plain http anyone on the hotspot could read it.
+        assertNull(ServerConfig.normalizeUrl("http://car.example.com"));
+        assertNull(ServerConfig.normalizeUrl("car.example.com"));
+        assertNull(ServerConfig.normalizeUrl("https://"));
+        assertNull(ServerConfig.normalizeUrl("https:///path"));
+        assertNull(ServerConfig.normalizeUrl("https://user@car.example.com"));
+        assertNull(ServerConfig.normalizeUrl("https://car.example.com/?x=1"));
+        assertNull(ServerConfig.normalizeUrl(null));
+    }
+
+    @Test
+    public void tokenMustMeetTheServersMinimum() {
+        assertTrue(ServerConfig.isValidToken("0123456789abcdef01234567"));
+        assertFalse(ServerConfig.isValidToken("too-short"));
+        assertFalse(ServerConfig.isValidToken("0123456789abcdef 01234567"));
+        assertFalse(ServerConfig.isValidToken(null));
+    }
+
+    @Test
+    public void installationIdMustBeAUuidTheServerAccepts() {
+        assertTrue(ServerConfig.isValidInstallationId("6f1a2b3c-4d5e-4f60-8a9b-0c1d2e3f4a5b"));
+        assertTrue(ServerConfig.isValidInstallationId(java.util.UUID.randomUUID().toString()));
+        assertFalse(ServerConfig.isValidInstallationId("6f1a2b3c-4d5e-0f60-8a9b-0c1d2e3f4a5b")); // version 0
+        assertFalse(ServerConfig.isValidInstallationId("not-a-uuid"));
+        assertFalse(ServerConfig.isValidInstallationId(""));
+    }
+}
diff --git a/app/src/test/java/com/evsuite/abrp/TelemetryQueueTest.java b/app/src/test/java/com/evsuite/abrp/TelemetryQueueTest.java
new file mode 100644
index 0000000..823a491
--- /dev/null
+++ b/app/src/test/java/com/evsuite/abrp/TelemetryQueueTest.java
@@ -0,0 +1,40 @@
+package com.evsuite.abrp;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.junit.Test;
+
+/** The offline buffer for live samples — pure JVM. */
+public class TelemetryQueueTest {
+
+    @Test
+    public void batchesOldestFirstAndKeepsThemUntilConfirmed() {
+        TelemetryQueue queue = new TelemetryQueue();
+        queue.add("a");
+        queue.add("b");
+        assertEquals(List.of("a", "b"), queue.peekBatch());
+        // Not confirmed yet: a failed request must not lose them.
+        assertEquals(2, queue.size());
+        queue.remove(2);
+        assertEquals(0, queue.size());
+    }
+
+    @Test
+    public void aBatchNeverExceedsWhatTheServerAccepts() {
+        TelemetryQueue queue = new TelemetryQueue();
+        for (int i = 0; i < 1200; i++) queue.add(String.valueOf(i));
+        List<String> batch = queue.peekBatch();
+        assertEquals(TelemetryQueue.MAX_BATCH, batch.size());
+        assertEquals("0", batch.get(0));
+    }
+
+    @Test
+    public void whenFullTheOldestSamplesAreDropped() {
+        TelemetryQueue queue = new TelemetryQueue(3);
+        for (String s : new String[]{"a", "b", "c", "d", "e"}) queue.add(s);
+        assertEquals(List.of("c", "d", "e"), queue.peekBatch());
+        assertEquals(2, queue.dropped());
+    }
+}

From e39d9cdcf986fb6528a247a0e124b7f970e915a5 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 14:29:01 +0200
Subject: [PATCH 15/79] Replace the muted gold accent with MG red

ev_accent is now #E0424C, the red of the launcher icon (about 4.6:1 on
the black background, enough for accent-coloured text; the darker MG
brand red is about 3:1). ev_on_accent and ev_gold_surface follow with a
dark red tint; the gold hardcoded in two drawables and the consumption
period buttons is replaced too. AGENTS.md's visual direction updated.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 AGENTS.md                                            |  2 +-
 app/src/main/java/com/evsuite/abrp/MainActivity.java |  4 ++--
 app/src/main/res/drawable/ic_info.xml                |  2 +-
 app/src/main/res/drawable/ic_vehicle_outline.xml     |  2 +-
 app/src/main/res/values/colors.xml                   | 10 ++++++----
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index fe6a381..1f9ce97 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -8,7 +8,7 @@ workspace `DESIGN.md` apply; this file contains only telemetry-specific addition
 ## App-specific visual direction (2.2.6)
 
 The user explicitly requested a permanent OLED-black theme, charcoal glass-like cards,
-muted gold and cyan accents. These app resources intentionally override the shared
+MG red (#E0424C, replacing the earlier muted gold) and cyan accents. These app resources intentionally override the shared
 DESIGN.md palette, DayNight preference and flat-surface rules. Do not overwrite them
 with the shared token generator. Use static gradients rather than continuous effects;
 keep large touch targets, readable text and null telemetry shown as a dash.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 75608b6..76c4e64 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -852,9 +852,9 @@ public class MainActivity extends AppCompatActivity {
             MaterialButton button = consumptionPane.findViewById(id);
             boolean selected = id == selectedId;
             button.setSelected(selected);
-            button.setTextColor(selected ? 0xFFD8C39A : COLOR_PENDING);
+            button.setTextColor(selected ? 0xFFE0424C : COLOR_PENDING);
             button.setStrokeColor(android.content.res.ColorStateList.valueOf(
-                    selected ? 0xFFD8C39A : 0xFF3A4143));
+                    selected ? 0xFFE0424C : 0xFF3A4143));
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
index 91a111e..78f93a3 100644
--- a/app/src/main/res/drawable/ic_info.xml
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -1 +1 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:pathData="M12,3 A9,9 0,1 0,12 21 A9,9 0,1 0,12 3 M12,10 L12,17 M12,7 L12,7.2" android:fillColor="#00000000" android:strokeColor="#D8C39A" android:strokeWidth="1.6" android:strokeLineCap="round"/></vector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:pathData="M12,3 A9,9 0,1 0,12 21 A9,9 0,1 0,12 3 M12,10 L12,17 M12,7 L12,7.2" android:fillColor="#00000000" android:strokeColor="#E0424C" android:strokeWidth="1.6" android:strokeLineCap="round"/></vector>
diff --git a/app/src/main/res/drawable/ic_vehicle_outline.xml b/app/src/main/res/drawable/ic_vehicle_outline.xml
index f1e7624..e6178ec 100644
--- a/app/src/main/res/drawable/ic_vehicle_outline.xml
+++ b/app/src/main/res/drawable/ic_vehicle_outline.xml
@@ -1,5 +1,5 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="92dp" android:height="180dp" android:viewportWidth="92" android:viewportHeight="180">
 <path android:pathData="M27,12 Q46,5 65,12 Q74,18 74,38 L78,130 Q79,157 64,164 L28,164 Q13,157 14,130 L18,38 Q18,18 27,12Z" android:fillColor="#151D1E" android:strokeColor="#85BDBF" android:strokeWidth="1.4"/>
 <path android:pathData="M24,45 Q46,37 68,45 L63,65 Q46,61 29,65Z M28,129 Q46,135 64,129 L66,148 Q46,155 26,148Z M28,72 L28,122 M64,72 L64,122 M23,28 L35,25 M57,25 L69,28 M23,157 L35,159 M57,159 L69,157" android:fillColor="#102D30" android:strokeColor="#527B7C" android:strokeWidth="1.3"/>
-<path android:pathData="M10,43 L10,67 M82,43 L82,67 M10,120 L10,144 M82,120 L82,144" android:fillColor="#00000000" android:strokeColor="#D8C39A" android:strokeWidth="5" android:strokeLineCap="round"/>
+<path android:pathData="M10,43 L10,67 M82,43 L82,67 M10,120 L10,144 M82,120 L82,144" android:fillColor="#00000000" android:strokeColor="#E0424C" android:strokeWidth="5" android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 35475b4..db6aef8 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- User-requested app-specific OLED palette. -->
+<!-- User-requested app-specific OLED palette. The accent is MG red (#E0424C, the red of the
+     launcher icon); it replaced upstream's muted gold on 2026-10-17. ev_gold_surface keeps its
+     name but is now the dark red tint that goes with it. -->
 <resources>
   <color name="ev_background">#000000</color>
   <color name="ev_surface">#121212</color>
@@ -7,11 +9,11 @@
   <color name="ev_outline">#363B3D</color>
   <color name="ev_text_primary">#F4F3EF</color>
   <color name="ev_text_secondary">#BDC4C6</color>
-  <color name="ev_accent">#D8C39A</color>
-  <color name="ev_on_accent">#17140E</color>
+  <color name="ev_accent">#E0424C</color>
+  <color name="ev_on_accent">#1A0B0C</color>
   <color name="ev_cyan">#A0E2E0</color>
   <color name="ev_cyan_deep">#103436</color>
-  <color name="ev_gold_surface">#28241B</color>
+  <color name="ev_gold_surface">#2A1416</color>
   <color name="ev_ok">#A4DCC1</color>
   <color name="ev_warn">#E9CA96</color>
   <color name="ev_error">#FFB4AB</color>

From 818442db08fda639e8b4d3cbed174478439adc9f Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 14:34:16 +0200
Subject: [PATCH 16/79] Rename the web app from FatihsMG4 to Nils' MG4

Browser title, login heading, hidden password-manager username, session
cookie (nilsmg4_session) and package name. The README keeps the credit
to fatihdonmezdev/FatihsMG4. Server version 1.1.1; the manifests pin it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                   | 5 ++---
 k8s/kustomization.yaml     | 2 +-
 web/README.md              | 2 +-
 web/package-lock.json      | 8 ++++----
 web/package.json           | 4 ++--
 web/src/app/layout.tsx     | 2 +-
 web/src/app/login/page.tsx | 4 ++--
 web/src/lib/session.ts     | 2 +-
 8 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index 3991e21..5d8f158 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -74,7 +74,7 @@ car ──live telemetry───▶ car.stinnesbeck.com ──▶ ABRP  api.ite
 - [x] Manifests in `k8s/`, validated offline. **Not applied** — that is Nils' step (`k8s/README.md`).
 - [x] Car app 2.3.0: Server tab with config import, live telemetry upload, cadence controls.
       Unit tests and lint pass; **not yet tried on the car**.
-- [ ] Push the image to git.stinnesbeck.com (needs a registry login on the build machine).
+- [ ] Push the image (`mg4-server:1.1.1`) to git.stinnesbeck.com (needs a registry login on the build machine).
 - [ ] Check the Traefik ingress class in `k8s/ingress.yaml` (placeholder `traefik-external`).
 - [ ] First drive with 2.3.0: telemetry arrives in InfluxDB and at ABRP.
 
@@ -92,8 +92,7 @@ car ──live telemetry───▶ car.stinnesbeck.com ──▶ ABRP  api.ite
       `NilsMG4-unstable-<version>.apk` with a `.sha256` sidecar (`build-car` writes both).
 - [ ] **Charging currency.** Prices and costs are shown in Turkish lira (`₺/kWh`, `₺`) in
       `pane_charging.xml` and `MainActivity.java`.
-- [ ] **Dashboard language and branding.** The `web/` pages are still Turkish, say "FatihsMG4" and
-      show prices in lira.
+- [ ] **Dashboard language.** The `web/` pages are still Turkish and show prices in lira.
 - [ ] **Telemetry queue survives restarts.** Unsent live samples are kept in memory only.
 - [ ] **Translate the rest.** The docs (`CHANGELOG.md`, `OTA.md`'s
       message table, comments in `mise.toml`/`app/build.gradle`) are still Turkish or French.
diff --git a/k8s/kustomization.yaml b/k8s/kustomization.yaml
index 7a45bf6..c549b56 100644
--- a/k8s/kustomization.yaml
+++ b/k8s/kustomization.yaml
@@ -9,4 +9,4 @@ resources:
   - ingress.yaml
 images:
   - name: git.stinnesbeck.com/nils/mg4-server
-    newTag: "1.1.0"
+    newTag: "1.1.1"
diff --git a/web/README.md b/web/README.md
index 0b2d722..71ce266 100644
--- a/web/README.md
+++ b/web/README.md
@@ -2,7 +2,7 @@
 
 Next.js app, self-hosted at car.stinnesbeck.com: the ingest API the car writes to, the ABRP
 forwarder, and a phone-shaped dashboard for reading the history back. Data lives in
-InfluxDB 2. Based on upstream's Vercel/MongoDB app in FatihsMG4.
+InfluxDB 2. Based on upstream's Vercel/MongoDB app in fatihdonmezdev/FatihsMG4.
 
 ```
 car ──live telemetry───▶ server ──▶ ABRP  api.iternio.com/1/tlm/send
diff --git a/web/package-lock.json b/web/package-lock.json
index 1dcb4ec..6f9ca13 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,12 +1,12 @@
 {
-  "name": "fatihsmg4-web",
-  "version": "1.1.0",
+  "name": "nilsmg4-web",
+  "version": "1.1.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "fatihsmg4-web",
-      "version": "1.1.0",
+      "name": "nilsmg4-web",
+      "version": "1.1.1",
       "dependencies": {
         "@influxdata/influxdb-client": "^1.35.0",
         "next": "^15.5.4",
diff --git a/web/package.json b/web/package.json
index a061eb4..0c9abcf 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "fatihsmg4-web",
-  "version": "1.1.0",
+  "name": "nilsmg4-web",
+  "version": "1.1.1",
   "private": true,
   "scripts": {
     "dev": "next dev",
diff --git a/web/src/app/layout.tsx b/web/src/app/layout.tsx
index a3a2aeb..a39b78a 100644
--- a/web/src/app/layout.tsx
+++ b/web/src/app/layout.tsx
@@ -2,7 +2,7 @@ import type { Metadata, Viewport } from "next";
 import "./globals.css";
 
 export const metadata: Metadata = {
-  title: "FatihsMG4",
+  title: "Nils' MG4",
   description: "MG4 tüketim ve şarj geçmişi",
 };
 
diff --git a/web/src/app/login/page.tsx b/web/src/app/login/page.tsx
index 459543d..8c67603 100644
--- a/web/src/app/login/page.tsx
+++ b/web/src/app/login/page.tsx
@@ -13,7 +13,7 @@ export default async function LoginPage({
   return (
     <div className="login">
       <form className="login-card" action="/api/session" method="post">
-        <h1 className="title">FatihsMG4</h1>
+        <h1 className="title">Nils&apos; MG4</h1>
         <p className="subtitle">Tüketim ve şarj geçmişi</p>
         {/*
           A hidden username so password managers will offer to save this.
@@ -24,7 +24,7 @@ export default async function LoginPage({
         <input
           type="text"
           name="username"
-          value="fatih"
+          value="nils"
           autoComplete="username"
           readOnly
           hidden
diff --git a/web/src/lib/session.ts b/web/src/lib/session.ts
index db335e2..07fbf8a 100644
--- a/web/src/lib/session.ts
+++ b/web/src/lib/session.ts
@@ -11,7 +11,7 @@ import crypto from "node:crypto";
  * Reading the history needs the dashboard password, which never leaves the browser's
  * cookie jar and is never compiled into anything.
  */
-export const SESSION_COOKIE = "fatihsmg4_session";
+export const SESSION_COOKIE = "nilsmg4_session";
 const SESSION_TTL_SECONDS = 60 * 60 * 24 * 30;
 
 /** Constant-time compare that does not leak length through an early return. */

From 538d03361df51f12ffa0c4de17b5ff1b69a10892 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 14:39:59 +0200
Subject: [PATCH 17/79] Translate the dashboard to English; euro instead of
 lira
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Dashboard: every label, empty state, chart legend and the login page
are English; numbers and dates use en-GB (24-hour clock, day-month
dates), money is EUR, percentages read 80% instead of %80, durations
"2 h 05 min". html lang is en. Server version 1.1.2; manifests pin it.

Car app: the charging tab's price suffix, validation message and total
cost use € instead of ₺.

Checked by rendering all three pages from the 1.1.2 image against
InfluxDB 2.7.12 in podman.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                      |  8 +--
 .../java/com/evsuite/abrp/MainActivity.java   |  4 +-
 app/src/main/res/layout/pane_charging.xml     |  2 +-
 k8s/kustomization.yaml                        |  2 +-
 web/package-lock.json                         |  4 +-
 web/package.json                              |  2 +-
 web/src/app/charging/page.tsx                 | 42 ++++++-------
 web/src/app/consumption/page.tsx              | 62 +++++++++----------
 web/src/app/layout.tsx                        |  4 +-
 web/src/app/login/page.tsx                    |  8 +--
 web/src/app/page.tsx                          | 50 +++++++--------
 web/src/components/charts.tsx                 | 24 +++----
 web/src/components/shell.tsx                  |  8 +--
 web/src/lib/format.ts                         | 18 +++---
 14 files changed, 119 insertions(+), 119 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index 5d8f158..dff6558 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -74,7 +74,7 @@ car ──live telemetry───▶ car.stinnesbeck.com ──▶ ABRP  api.ite
 - [x] Manifests in `k8s/`, validated offline. **Not applied** — that is Nils' step (`k8s/README.md`).
 - [x] Car app 2.3.0: Server tab with config import, live telemetry upload, cadence controls.
       Unit tests and lint pass; **not yet tried on the car**.
-- [ ] Push the image (`mg4-server:1.1.1`) to git.stinnesbeck.com (needs a registry login on the build machine).
+- [ ] Push the image (`mg4-server:1.1.2`) to git.stinnesbeck.com (needs a registry login on the build machine).
 - [ ] Check the Traefik ingress class in `k8s/ingress.yaml` (placeholder `traefik-external`).
 - [ ] First drive with 2.3.0: telemetry arrives in InfluxDB and at ABRP.
 
@@ -90,9 +90,6 @@ car ──live telemetry───▶ car.stinnesbeck.com ──▶ ABRP  api.ite
       (`ALLOWED_HOSTS`). For git.stinnesbeck.com it needs the host on the allowlist, and the
       response parsing checked against that server's releases API. Release assets must be named
       `NilsMG4-unstable-<version>.apk` with a `.sha256` sidecar (`build-car` writes both).
-- [ ] **Charging currency.** Prices and costs are shown in Turkish lira (`₺/kWh`, `₺`) in
-      `pane_charging.xml` and `MainActivity.java`.
-- [ ] **Dashboard language.** The `web/` pages are still Turkish and show prices in lira.
 - [ ] **Telemetry queue survives restarts.** Unsent live samples are kept in memory only.
 - [ ] **Translate the rest.** The docs (`CHANGELOG.md`, `OTA.md`'s
       message table, comments in `mise.toml`/`app/build.gradle`) are still Turkish or French.
@@ -116,6 +113,9 @@ car ──live telemetry───▶ car.stinnesbeck.com ──▶ ABRP  api.ite
   telemetry restored from before `ea8032a` and sent to the server, Upload-tab cadence controls
   reconnected, dead switches removed. The removed ABRP classes' unit tests compile and pass again
   (AbrpApi and HeadUnitWeather tests deleted with their classes).
+- 2026-10-17 — Accent colour: MG red instead of muted gold. Web app renamed to Nils' MG4.
+- 2026-10-17 — Dashboard translated to English (en-GB formatting); euro instead of lira in the
+  dashboard and the car app's charging tab.
 - 2026-10-17 — Temporary on-screen diagnostics (b2a5b32) to debug blank values without adb;
   removed again (1002962) once values showed on the car. Revert 1002962 to bring them back.
 
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 76c4e64..7df5cbb 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -888,7 +888,7 @@ public class MainActivity extends AppCompatActivity {
             chargePriceInput.setText(String.format(java.util.Locale.US, "%.2f", value));
             Toast.makeText(this, "Charging price saved", Toast.LENGTH_SHORT).show();
         } catch (NumberFormatException e) {
-            chargePriceLayout.setError("Enter a valid ₺/kWh value");
+            chargePriceLayout.setError("Enter a valid €/kWh value");
         }
     }
 
@@ -916,7 +916,7 @@ public class MainActivity extends AppCompatActivity {
                 java.util.Locale.getDefault(), "%.2f kWh", session.gridEnergyKwh) : "—");
         long sec = session.durationSeconds;
         chargeDuration.setText(session.startedAtMs > 0 ? String.format(java.util.Locale.getDefault(), "%02d:%02d:%02d", sec/3600,(sec%3600)/60,sec%60) : "—");
-        chargeTotalCost.setText(session.startedAtMs > 0 ? String.format(java.util.Locale.getDefault(), "%.2f ₺", session.totalCost) : "—");
+        chargeTotalCost.setText(session.startedAtMs > 0 ? String.format(java.util.Locale.getDefault(), "€%.2f", session.totalCost) : "—");
         chargeGraph.setPoints(session.points);
         chargeCurveTable.setText(chargeGraph.tableText());
     }
diff --git a/app/src/main/res/layout/pane_charging.xml b/app/src/main/res/layout/pane_charging.xml
index ce2c3f0..2a3f810 100644
--- a/app/src/main/res/layout/pane_charging.xml
+++ b/app/src/main/res/layout/pane_charging.xml
@@ -17,7 +17,7 @@
   </LinearLayout>
   <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:layout_marginTop="16dp" android:background="@drawable/bg_glass">
    <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="CHARGING PRICE" android:textAppearance="@style/Text.EV.Eyebrow"/>
-   <com.google.android.material.textfield.TextInputLayout android:id="@+id/charge_price_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="Unit price" app:suffixText="₺/kWh">
+   <com.google.android.material.textfield.TextInputLayout android:id="@+id/charge_price_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="Unit price" app:suffixText="€/kWh">
     <com.google.android.material.textfield.TextInputEditText android:id="@+id/charge_price_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="10" android:minHeight="72dp"/>
    </com.google.android.material.textfield.TextInputLayout>
    <com.google.android.material.button.MaterialButton android:id="@+id/charge_price_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="Save price"/>
diff --git a/k8s/kustomization.yaml b/k8s/kustomization.yaml
index c549b56..1acf22d 100644
--- a/k8s/kustomization.yaml
+++ b/k8s/kustomization.yaml
@@ -9,4 +9,4 @@ resources:
   - ingress.yaml
 images:
   - name: git.stinnesbeck.com/nils/mg4-server
-    newTag: "1.1.1"
+    newTag: "1.1.2"
diff --git a/web/package-lock.json b/web/package-lock.json
index 6f9ca13..88db69d 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "nilsmg4-web",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "nilsmg4-web",
-      "version": "1.1.1",
+      "version": "1.1.2",
       "dependencies": {
         "@influxdata/influxdb-client": "^1.35.0",
         "next": "^15.5.4",
diff --git a/web/package.json b/web/package.json
index 0c9abcf..c1a59a3 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nilsmg4-web",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "private": true,
   "scripts": {
     "dev": "next dev",
diff --git a/web/src/app/charging/page.tsx b/web/src/app/charging/page.tsx
index 16f8279..6cf9e42 100644
--- a/web/src/app/charging/page.tsx
+++ b/web/src/app/charging/page.tsx
@@ -12,10 +12,10 @@ export default async function ChargingPage() {
 
   if (!installationId || sessions.length === 0) {
     return (
-      <Shell active="/charging" title="Şarj">
+      <Shell active="/charging" title="Charging">
         <div className="card">
           <p className="empty">
-            Şarj kaydı yok. Yalnızca 10 kW üstü DC şarjlar ölçülür; AC şarj kaydedilmez.
+            No charging sessions yet. Only DC charges above 10 kW are metered; AC charging is not recorded.
           </p>
         </div>
       </Shell>
@@ -25,22 +25,22 @@ export default async function ChargingPage() {
   const total = sumCharging(sessions);
 
   return (
-    <Shell active="/charging" title="Şarj" subtitle={`${sessions.length} DC seans`}>
+    <Shell active="/charging" title="Charging" subtitle={`${sessions.length} DC session${sessions.length === 1 ? "" : "s"}`}>
       <div className="tiles">
-        <Tile label="Bataryaya giren net" value={precise(total.energyKwh)} unit="kWh" tone="gold" />
-        <Tile label="Şebekeden alınan (+%10)" value={precise(total.gridEnergyKwh)} unit="kWh" tone="gold" />
-        <Tile label="Toplam ödenen" value={money(total.cost)} tone="gold" />
+        <Tile label="Net into battery" value={precise(total.energyKwh)} unit="kWh" tone="gold" />
+        <Tile label="Drawn from grid (+10%)" value={precise(total.gridEnergyKwh)} unit="kWh" tone="gold" />
+        <Tile label="Total paid" value={money(total.cost)} tone="gold" />
         <Tile
-          label="Ortalama birim"
+          label="Average price"
           value={total.gridEnergyKwh > 0 ? money(total.cost / total.gridEnergyKwh) : "—"}
-          note="kWh başına"
+          note="per kWh"
           tone="teal"
         />
-        <Tile label="En yüksek güç" value={num(total.peakKw)} unit="kW" tone="teal" />
+        <Tile label="Peak power" value={num(total.peakKw)} unit="kW" tone="teal" />
       </div>
 
       <section className="card">
-        <h2 className="card-title">Seanslar</h2>
+        <h2 className="card-title">Sessions</h2>
         <ul className="list">
           {sessions.map((session) => {
             const gained =
@@ -59,7 +59,7 @@ export default async function ChargingPage() {
                       <div className="session-meta">
                         {session.isDemo && "Demo · "}
                         {duration(session.durationSeconds)}
-                        {gained !== null && ` · %${num(session.startSocPercent as number)} → %${num(session.endSocPercent as number)}`}
+                        {gained !== null && ` · ${num(session.startSocPercent as number)}% → ${num(session.endSocPercent as number)}%`}
                       </div>
                     </div>
                     <div className="session-energy">
@@ -77,16 +77,16 @@ export default async function ChargingPage() {
                       }))}
                     />
                     <div className="rows" style={{ marginTop: 14 }}>
-                      <Row label="Başlangıç" value={dateTime(session.startedAt)} />
-                      <Row label="Bitiş" value={dateTime(session.endedAt)} />
-                      <Row label="Ölçülen süre" value={duration(session.durationSeconds)} />
-                      <Row label="Bataryaya giren net" value={`${precise(session.energyKwh)} kWh`} />
-                      <Row label="Şebekeden alınan (+%10)" value={`${precise(session.gridEnergyKwh ?? session.energyKwh * 1.1)} kWh`} />
-                      <Row label="Kazanılan doluluk" value={gained === null ? "—" : `%${num(gained)}`} />
-                      <Row label="Tepe güç" value={peak > 0 ? `${num(peak)} kW` : "—"} />
-                      <Row label="Ortalama güç" value={average > 0 ? `${num(average)} kW` : "—"} />
-                      <Row label="Birim fiyat" value={`${money(session.pricePerKwh)}/kWh`} />
-                      <Row label="Tutar" value={money(session.totalCost)} />
+                      <Row label="Start" value={dateTime(session.startedAt)} />
+                      <Row label="End" value={dateTime(session.endedAt)} />
+                      <Row label="Metered duration" value={duration(session.durationSeconds)} />
+                      <Row label="Net into battery" value={`${precise(session.energyKwh)} kWh`} />
+                      <Row label="Drawn from grid (+10%)" value={`${precise(session.gridEnergyKwh ?? session.energyKwh * 1.1)} kWh`} />
+                      <Row label="Charge added" value={gained === null ? "—" : `${num(gained)}%`} />
+                      <Row label="Peak power" value={peak > 0 ? `${num(peak)} kW` : "—"} />
+                      <Row label="Average power" value={average > 0 ? `${num(average)} kW` : "—"} />
+                      <Row label="Unit price" value={`${money(session.pricePerKwh)}/kWh`} />
+                      <Row label="Amount" value={money(session.totalCost)} />
                     </div>
                   </div>
                 </details>
diff --git a/web/src/app/consumption/page.tsx b/web/src/app/consumption/page.tsx
index 163546a..d87b07a 100644
--- a/web/src/app/consumption/page.tsx
+++ b/web/src/app/consumption/page.tsx
@@ -18,9 +18,9 @@ export default async function ConsumptionPage({
 
   if (!installationId || days.length === 0) {
     return (
-      <Shell active="/consumption" title="Tüketim">
+      <Shell active="/consumption" title="Consumption">
         <div className="card">
-          <p className="empty">Günlük tüketim kaydı yok. Araç günü kapattığında yüklenir.</p>
+          <p className="empty">No daily consumption records yet. The car uploads them as it drives.</p>
         </div>
       </Shell>
     );
@@ -46,14 +46,14 @@ export default async function ConsumptionPage({
   return (
     <Shell
       active="/consumption"
-      title="Tüketim"
-      subtitle={hasFilter ? (validFilter ? isoDate(selectedDate!) : "Seçili gün kaydı yok") : `${days.length} günlük kayıt`}
+      title="Consumption"
+      subtitle={hasFilter ? (validFilter ? isoDate(selectedDate!) : "No record for the selected day") : `${days.length} day${days.length === 1 ? "" : "s"} recorded`}
     >
       {/* Date filter */}
       <section className="card">
         <form className="filter-form" method="get" action="/consumption">
           <label className="filter-label" htmlFor="date-picker">
-            Tarihe göre filtrele
+            Filter by date
           </label>
           <div className="filter-row">
             <input
@@ -65,9 +65,9 @@ export default async function ConsumptionPage({
               max={maxDate}
               className="field date-input"
             />
-            <button className="button filter-button" type="submit">Filtrele</button>
+            <button className="button filter-button" type="submit">Filter</button>
             {hasFilter && (
-              <Link className="filter-clear" href="/consumption">Temizle</Link>
+              <Link className="filter-clear" href="/consumption">Clear</Link>
             )}
           </div>
         </form>
@@ -80,60 +80,60 @@ export default async function ConsumptionPage({
           {validFilter && selected ? (
             <>
               <div className="tiles">
-                <Tile label="Mesafe" value={num(selected.day.km)} unit="km" tone="teal" />
-                <Tile label="Enerji" value={precise(selected.day.kwh)} unit="kWh" tone="gold" />
-                <Tile label="Ortalama" value={efficiency(selected.day.kwh, selected.day.km)} tone="teal" />
+                <Tile label="Distance" value={num(selected.day.km)} unit="km" tone="teal" />
+                <Tile label="Energy" value={precise(selected.day.kwh)} unit="kWh" tone="gold" />
+                <Tile label="Average" value={efficiency(selected.day.kwh, selected.day.km)} tone="teal" />
                 <Tile
-                  label="Ortalama hız"
+                  label="Average speed"
                   value={selected.day.hours > 0 ? num(selected.day.km / selected.day.hours) : "—"}
                   unit={selected.day.hours > 0 ? "km/h" : undefined}
                 />
               </div>
               <div className="rows">
-                <Row label="Sürüş süresi" value={duration(selected.day.hours * 3600)} />
-                <Row label="Doluluk düşüşü" value={`%${num(selected.day.socDrop)}`} />
-                <Row label="O gün sonu ömür boyu" value={selected.lifetime ? `${num(selected.lifetime.km)} km` : "—"} />
+                <Row label="Driving time" value={duration(selected.day.hours * 3600)} />
+                <Row label="SoC used" value={`${num(selected.day.socDrop)}%`} />
+                <Row label="Lifetime at end of day" value={selected.lifetime ? `${num(selected.lifetime.km)} km` : "—"} />
               </div>
             </>
           ) : (
-            <p className="empty">Bu tarih için tüketim kaydı yok.</p>
+            <p className="empty">No consumption recorded for this date.</p>
           )}
         </section>
       )}
 
       <div className="tiles">
-        <Tile label="Toplam mesafe" value={num(total.km)} unit="km" tone="teal" />
-        <Tile label="Toplam enerji" value={precise(total.kwh)} unit="kWh" tone="gold" />
-        <Tile label="Ortalama" value={efficiency(total.kwh, total.km)} tone="teal" />
+        <Tile label="Total distance" value={num(total.km)} unit="km" tone="teal" />
+        <Tile label="Total energy" value={precise(total.kwh)} unit="kWh" tone="gold" />
+        <Tile label="Average" value={efficiency(total.kwh, total.km)} tone="teal" />
         <Tile
-          label="Ortalama hız"
+          label="Average speed"
           value={total.hours > 0 ? num(total.km / total.hours) : "—"}
           unit={total.hours > 0 ? "km/h" : undefined}
         />
       </div>
 
       <section className="card">
-        <h2 className="card-title">Günlük enerji</h2>
+        <h2 className="card-title">Daily energy</h2>
         <DailyEnergyChart days={chartDays} />
       </section>
 
       <section className="card">
-        <h2 className="card-title">Verimlilik eğilimi</h2>
+        <h2 className="card-title">Efficiency trend</h2>
         <EfficiencyChart days={chartDays} />
       </section>
 
       <section className="card">
-        <h2 className="card-title">Ömür boyu</h2>
+        <h2 className="card-title">Lifetime</h2>
         <div className="rows">
-          <Row label="Mesafe" value={`${num(lifetime.km)} km`} />
-          <Row label="Enerji" value={`${precise(lifetime.kwh)} kWh`} />
-          <Row label="Ortalama" value={efficiency(lifetime.kwh, lifetime.km)} />
-          <Row label="Sürüş süresi" value={duration(lifetime.hours * 3600)} />
+          <Row label="Distance" value={`${num(lifetime.km)} km`} />
+          <Row label="Energy" value={`${precise(lifetime.kwh)} kWh`} />
+          <Row label="Average" value={efficiency(lifetime.kwh, lifetime.km)} />
+          <Row label="Driving time" value={duration(lifetime.hours * 3600)} />
         </div>
       </section>
 
       <section className="card">
-        <h2 className="card-title">Gün gün</h2>
+        <h2 className="card-title">Day by day</h2>
         <ul className="list">
           {table.map((day) => {
             const isSelected = hasFilter && day.date === selectedDate;
@@ -158,13 +158,13 @@ export default async function ConsumptionPage({
                   </summary>
                   <div className="session-body">
                     <div className="rows">
-                      <Row label="Sürüş süresi" value={duration(day.day.hours * 3600)} />
+                      <Row label="Driving time" value={duration(day.day.hours * 3600)} />
                       <Row
-                        label="Ortalama hız"
+                        label="Average speed"
                         value={day.day.hours > 0 ? `${num(day.day.km / day.day.hours)} km/h` : "—"}
                       />
-                      <Row label="Doluluk düşüşü" value={`%${num(day.day.socDrop)}`} />
-                      <Row label="O gün sonu ömür boyu" value={day.lifetime ? `${num(day.lifetime.km)} km` : "—"} />
+                      <Row label="SoC used" value={`${num(day.day.socDrop)}%`} />
+                      <Row label="Lifetime at end of day" value={day.lifetime ? `${num(day.lifetime.km)} km` : "—"} />
                     </div>
                   </div>
                 </details>
diff --git a/web/src/app/layout.tsx b/web/src/app/layout.tsx
index a39b78a..d4242ec 100644
--- a/web/src/app/layout.tsx
+++ b/web/src/app/layout.tsx
@@ -3,7 +3,7 @@ import "./globals.css";
 
 export const metadata: Metadata = {
   title: "Nils' MG4",
-  description: "MG4 tüketim ve şarj geçmişi",
+  description: "MG4 consumption and charging history",
 };
 
 export const viewport: Viewport = {
@@ -16,7 +16,7 @@ export const viewport: Viewport = {
 
 export default function RootLayout({ children }: { children: React.ReactNode }) {
   return (
-    <html lang="tr">
+    <html lang="en">
       <body>{children}</body>
     </html>
   );
diff --git a/web/src/app/login/page.tsx b/web/src/app/login/page.tsx
index 8c67603..88cabd7 100644
--- a/web/src/app/login/page.tsx
+++ b/web/src/app/login/page.tsx
@@ -14,7 +14,7 @@ export default async function LoginPage({
     <div className="login">
       <form className="login-card" action="/api/session" method="post">
         <h1 className="title">Nils&apos; MG4</h1>
-        <p className="subtitle">Tüketim ve şarj geçmişi</p>
+        <p className="subtitle">Consumption and charging history</p>
         {/*
           A hidden username so password managers will offer to save this.
           Most of them ignore a lone password field — they key a saved entry on
@@ -33,15 +33,15 @@ export default async function LoginPage({
           className="field"
           type="password"
           name="password"
-          placeholder="Parola"
+          placeholder="Password"
           autoComplete="current-password"
           autoFocus
           required
         />
         <button className="button" type="submit">
-          Giriş
+          Sign in
         </button>
-        {error && <p className="error">Parola hatalı.</p>}
+        {error && <p className="error">Wrong password.</p>}
       </form>
     </div>
   );
diff --git a/web/src/app/page.tsx b/web/src/app/page.tsx
index a6cae0f..6b1dc26 100644
--- a/web/src/app/page.tsx
+++ b/web/src/app/page.tsx
@@ -12,10 +12,10 @@ export default async function OverviewPage() {
 
   if (!installationId) {
     return (
-      <Shell active="/" title="Özet">
+      <Shell active="/" title="Overview">
         <div className="card">
           <p className="empty">
-            Henüz veri yok. Araç ilk günlük kaydı gönderdiğinde burada görünecek.
+            No data yet. It appears here once the car sends its first daily record.
           </p>
         </div>
       </Shell>
@@ -31,26 +31,26 @@ export default async function OverviewPage() {
   return (
     <Shell
       active="/"
-      title="Özet"
-      subtitle={installationCount > 1 ? `${installationCount} araçtan en günceli` : "MG4"}
+      title="Overview"
+      subtitle={installationCount > 1 ? `Most recent of ${installationCount} cars` : "MG4"}
     >
       <div className="tiles">
         <Tile
-          label="Şebekeden alınan"
+          label="Drawn from grid"
           value={precise(charge.gridEnergyKwh)}
           unit="kWh"
-          note={`${charge.sessions} DC şarj`}
+          note={`${charge.sessions} DC charge${charge.sessions === 1 ? "" : "s"}`}
           tone="gold"
         />
         <Tile
-          label="Ödenen"
+          label="Paid"
           value={money(charge.cost)}
-          note={charge.gridEnergyKwh > 0 ? `${money(charge.cost / charge.gridEnergyKwh)}/kWh ort.` : undefined}
+          note={charge.gridEnergyKwh > 0 ? `${money(charge.cost / charge.gridEnergyKwh)}/kWh avg.` : undefined}
           tone="gold"
         />
-        <Tile label="Son 30 gün" value={num(recent.km)} unit="km" note={efficiency(recent.kwh, recent.km)} tone="teal" />
+        <Tile label="Last 30 days" value={num(recent.km)} unit="km" note={efficiency(recent.kwh, recent.km)} tone="teal" />
         <Tile
-          label="Ömür boyu"
+          label="Lifetime"
           value={lifetime ? num(lifetime.km) : "—"}
           unit="km"
           note={lifetime ? efficiency(lifetime.kwh, lifetime.km) : undefined}
@@ -59,39 +59,39 @@ export default async function OverviewPage() {
       </div>
 
       <section className="card">
-        <h2 className="card-title">Son 30 gün</h2>
+        <h2 className="card-title">Last 30 days</h2>
         <DailyEnergyChart days={days.map((day) => ({ date: day.date, kwh: day.day.kwh, km: day.day.km }))} />
       </section>
 
       {lastSession && (
         <section className="card">
-          <h2 className="card-title">Son şarj</h2>
+          <h2 className="card-title">Last charge</h2>
           <div className="rows">
-            <Row label="Tarih" value={dateTime(lastSession.startedAt)} />
-            <Row label="Bataryaya giren net" value={`${precise(lastSession.energyKwh)} kWh`} />
-            <Row label="Şebekeden alınan (+%10)" value={`${precise(lastSession.gridEnergyKwh ?? lastSession.energyKwh * 1.1)} kWh`} />
+            <Row label="Date" value={dateTime(lastSession.startedAt)} />
+            <Row label="Net into battery" value={`${precise(lastSession.energyKwh)} kWh`} />
+            <Row label="Drawn from grid (+10%)" value={`${precise(lastSession.gridEnergyKwh ?? lastSession.energyKwh * 1.1)} kWh`} />
             <Row
-              label="Doluluk"
+              label="State of charge"
               value={
                 lastSession.startSocPercent !== undefined && lastSession.endSocPercent !== undefined
-                  ? `%${num(lastSession.startSocPercent)} → %${num(lastSession.endSocPercent)}`
+                  ? `${num(lastSession.startSocPercent)}% → ${num(lastSession.endSocPercent)}%`
                   : "—"
               }
             />
-            <Row label="Süre" value={duration(lastSession.durationSeconds)} />
-            <Row label="Ücret" value={money(lastSession.totalCost)} />
+            <Row label="Duration" value={duration(lastSession.durationSeconds)} />
+            <Row label="Cost" value={money(lastSession.totalCost)} />
           </div>
         </section>
       )}
 
       <section className="card">
-        <h2 className="card-title">Batarya ve toplamlar</h2>
+        <h2 className="card-title">Battery and totals</h2>
         <div className="rows">
-          <Row label="Sağlık (SOH)" value={soh === undefined ? "—" : `%${num(soh)}`} />
-          <Row label="Toplam şarj süresi" value={duration(charge.seconds)} />
-          <Row label="Görülen en yüksek güç" value={charge.peakKw > 0 ? `${num(charge.peakKw)} kW` : "—"} />
-          <Row label="Şarjla kazanılan doluluk" value={charge.socGained > 0 ? `%${num(charge.socGained)}` : "—"} />
-          <Row label="Kayıtlı gün" value={`${days.length}`} />
+          <Row label="Health (SoH)" value={soh === undefined ? "—" : `${num(soh)}%`} />
+          <Row label="Total charging time" value={duration(charge.seconds)} />
+          <Row label="Highest power seen" value={charge.peakKw > 0 ? `${num(charge.peakKw)} kW` : "—"} />
+          <Row label="Charge added" value={charge.socGained > 0 ? `${num(charge.socGained)}%` : "—"} />
+          <Row label="Days recorded" value={`${days.length}`} />
         </div>
       </section>
     </Shell>
diff --git a/web/src/components/charts.tsx b/web/src/components/charts.tsx
index b02c6be..351f5f6 100644
--- a/web/src/components/charts.tsx
+++ b/web/src/components/charts.tsx
@@ -78,7 +78,7 @@ export interface DayDatum {
  * distinction the telemetry side makes between a failed read and a zero.
  */
 export function DailyEnergyChart({ days }: { days: DayDatum[] }) {
-  if (days.length === 0) return <p className="empty">Henüz günlük kayıt yok</p>;
+  if (days.length === 0) return <p className="empty">No daily records yet</p>;
   const plot = PLOT;
   const max = niceMax(Math.max(...days.map((day) => day.kwh)));
   const slot = innerWidth(plot) / days.length;
@@ -86,7 +86,7 @@ export function DailyEnergyChart({ days }: { days: DayDatum[] }) {
   return (
     <>
       <svg className="chart" viewBox={`0 0 ${plot.width} ${plot.height}`} role="img"
-           aria-label="Gün gün tüketilen enerji">
+           aria-label="Energy used per day">
         <Grid plot={plot} max={max} format={(value) => value.toFixed(0)} />
         {days.map((day, index) => {
           const height = (day.kwh / max) * innerHeight(plot);
@@ -116,7 +116,7 @@ export function DailyEnergyChart({ days }: { days: DayDatum[] }) {
       <div className="legend">
         <span>
           <span className="swatch" style={{ background: GOLD }} />
-          Günlük enerji (kWh)
+          Daily energy (kWh)
         </span>
       </div>
     </>
@@ -128,7 +128,7 @@ export function EfficiencyChart({ days }: { days: DayDatum[] }) {
   const points = days
     .filter((day) => day.km >= 1 && day.kwh > 0)
     .map((day) => ({ date: day.date, value: (day.kwh * 100) / day.km }));
-  if (points.length < 2) return <p className="empty">Grafik için yeterli gün yok</p>;
+  if (points.length < 2) return <p className="empty">Not enough days for a chart</p>;
   const plot = PLOT;
   const max = niceMax(Math.max(...points.map((point) => point.value)));
   const step = innerWidth(plot) / Math.max(1, points.length - 1);
@@ -144,7 +144,7 @@ export function EfficiencyChart({ days }: { days: DayDatum[] }) {
   return (
     <>
       <svg className="chart" viewBox={`0 0 ${plot.width} ${plot.height}`} role="img"
-           aria-label="Gün gün ortalama tüketim">
+           aria-label="Average consumption per day">
         <Grid plot={plot} max={max} format={(value) => value.toFixed(0)} />
         <line
           x1={plot.padLeft}
@@ -176,7 +176,7 @@ export function EfficiencyChart({ days }: { days: DayDatum[] }) {
         </span>
         <span>
           <span className="swatch" style={{ background: GOLD }} />
-          Ortalama {average.toFixed(1)}
+          Average {average.toFixed(1)}
         </span>
       </div>
     </>
@@ -196,7 +196,7 @@ export interface CurveDatum {
  * them — the taper is only legible next to the percentage that caused it.
  */
 export function ChargeCurveChart({ curve }: { curve: CurveDatum[] }) {
-  if (curve.length < 2) return <p className="empty">Bu seans için eğri kaydı yok</p>;
+  if (curve.length < 2) return <p className="empty">No curve recorded for this session</p>;
   const plot = { ...PLOT, padRight: 26 };
   const times = curve.map((point) => new Date(point.timestamp).getTime());
   const start = times[0];
@@ -223,7 +223,7 @@ export function ChargeCurveChart({ curve }: { curve: CurveDatum[] }) {
   return (
     <>
       <svg className="chart" viewBox={`0 0 ${plot.width} ${plot.height}`} role="img"
-           aria-label="Şarj gücü ve doluluk eğrisi">
+           aria-label="Charging power and state-of-charge curve">
         <Grid plot={plot} max={maxPower} format={(value) => value.toFixed(0)} />
         <defs>
           <linearGradient id="powerFill" x1="0" x2="0" y1="0" y2="1">
@@ -241,20 +241,20 @@ export function ChargeCurveChart({ curve }: { curve: CurveDatum[] }) {
           0%
         </text>
         <text x={plot.padLeft} y={plot.height - 6} fill={MUTED} fontSize={9}>
-          0 dk
+          0 min
         </text>
         <text x={plot.width - plot.padRight} y={plot.height - 6} fill={MUTED} fontSize={9} textAnchor="end">
-          {Math.round(span / 60000)} dk
+          {Math.round(span / 60000)} min
         </text>
       </svg>
       <div className="legend">
         <span>
           <span className="swatch" style={{ background: GOLD }} />
-          Güç (kW)
+          Power (kW)
         </span>
         <span>
           <span className="swatch" style={{ background: CYAN }} />
-          Doluluk (%)
+          State of charge (%)
         </span>
       </div>
     </>
diff --git a/web/src/components/shell.tsx b/web/src/components/shell.tsx
index a9320aa..242adc8 100644
--- a/web/src/components/shell.tsx
+++ b/web/src/components/shell.tsx
@@ -2,9 +2,9 @@ import Link from "next/link";
 import type { ReactNode } from "react";
 
 const TABS = [
-  { href: "/", label: "Özet", icon: "◈" },
-  { href: "/consumption", label: "Tüketim", icon: "▤" },
-  { href: "/charging", label: "Şarj", icon: "⚡" },
+  { href: "/", label: "Overview", icon: "◈" },
+  { href: "/consumption", label: "Consumption", icon: "▤" },
+  { href: "/charging", label: "Charging", icon: "⚡" },
 ] as const;
 
 export type Tab = (typeof TABS)[number]["href"];
@@ -42,7 +42,7 @@ export function Shell({
           */}
           <form action="/logout" method="post">
             <button className="signout" type="submit">
-              Çıkış
+              Sign out
             </button>
           </form>
         </header>
diff --git a/web/src/lib/format.ts b/web/src/lib/format.ts
index 19869fc..4343772 100644
--- a/web/src/lib/format.ts
+++ b/web/src/lib/format.ts
@@ -1,10 +1,10 @@
-/** Turkish formatting for every user-facing number and date. */
+/** English formatting (en-GB: 24-hour clock, day-month dates) with euro for every number and date. */
 
-const NUMBER = new Intl.NumberFormat("tr-TR", { maximumFractionDigits: 1 });
-const PRECISE = new Intl.NumberFormat("tr-TR", { minimumFractionDigits: 2, maximumFractionDigits: 2 });
-const CURRENCY = new Intl.NumberFormat("tr-TR", { style: "currency", currency: "TRY", maximumFractionDigits: 2 });
-const DATE = new Intl.DateTimeFormat("tr-TR", { day: "numeric", month: "long", year: "numeric" });
-const DATE_TIME = new Intl.DateTimeFormat("tr-TR", {
+const NUMBER = new Intl.NumberFormat("en-GB", { maximumFractionDigits: 1 });
+const PRECISE = new Intl.NumberFormat("en-GB", { minimumFractionDigits: 2, maximumFractionDigits: 2 });
+const CURRENCY = new Intl.NumberFormat("en-GB", { style: "currency", currency: "EUR", maximumFractionDigits: 2 });
+const DATE = new Intl.DateTimeFormat("en-GB", { day: "numeric", month: "long", year: "numeric" });
+const DATE_TIME = new Intl.DateTimeFormat("en-GB", {
   day: "numeric",
   month: "short",
   hour: "2-digit",
@@ -32,13 +32,13 @@ export function dateTime(value: Date | string): string {
   return DATE_TIME.format(new Date(value));
 }
 
-/** `2 sa 05 dk` — the same shape the car's charging pane uses. */
+/** `2 h 05 min` — the same shape the car's charging pane uses. */
 export function duration(seconds: number): string {
   const total = Math.max(0, Math.round(seconds));
   const hours = Math.floor(total / 3600);
   const minutes = Math.floor((total % 3600) / 60);
-  if (hours === 0) return `${minutes} dk`;
-  return `${hours} sa ${String(minutes).padStart(2, "0")} dk`;
+  if (hours === 0) return `${minutes} min`;
+  return `${hours} h ${String(minutes).padStart(2, "0")} min`;
 }
 
 /** Energy per 100 km, or a dash — never a ratio computed from a distance of nothing. */

From 51e6f6fd4893ee55ed2d1e88102751f63c4c370f Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 15:17:42 +0200
Subject: [PATCH 18/79] Server: rewrite in Go as an API-only service

Same endpoints, request formats, validation rules and InfluxDB layout as
the Next.js server, so the car needs no change: POST /v1/telemetry,
PUT /v1/consumption/daily, PUT /v1/charging-sessions/{id}, GET
/v1/consumption/history/{id}, GET /v1/health. The dashboard, login and
the /v1/history reads are gone; Grafana takes over the dashboards.

- Go 1.26 standard library (net/http routing, log/slog) plus the
  official InfluxDB 2 client. Fails closed at startup on a missing
  InfluxDB setting or an ingest token under 24 characters.
- ABRP forwarder ported: newest fresh sample, rate limited, never
  queued, credentials only in the form body.
- 22 tests: validation, aggregation, forwarding, config, and the
  handlers through a fake store. govulncheck clean (x/net 0.60.0,
  toolchain go1.26.9).
- Image: static binary on distroless, about 11 MB, UID 65532, port
  8080; the build runs vet and the tests.
- Dev shell: Go, gopls and govulncheck instead of Node.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 .../cache/_events_79120_d0eaad9b80692b5d.json |    1 -
 .../cache/_events_79235_382896d082e25d69.json |    1 -
 .next/dev/build-manifest.json                 |   15 -
 .next/dev/cache/.rscinfo                      |    1 -
 .../cache/turbopack/v16.4.0-e273d5b2/CURRENT  |    1 -
 .next/dev/fallback-build-manifest.json        |   15 -
 .next/dev/lock                                |    1 -
 .next/dev/logs/next-development.log           |    3 -
 .next/dev/package.json                        |    3 -
 .next/dev/prerender-manifest.json             |    6 -
 .next/dev/routes-manifest.json                |    1 -
 .next/dev/server/app-paths-manifest.json      |    1 -
 .../interception-route-rewrite-manifest.js    |    1 -
 .next/dev/server/middleware-build-manifest.js |   15 -
 .next/dev/server/middleware-manifest.json     |    6 -
 .next/dev/server/next-font-manifest.js        |    1 -
 .next/dev/server/next-font-manifest.json      |    6 -
 .next/dev/server/pages-manifest.json          |    1 -
 .next/dev/server/preview-props.json           |    5 -
 .next/dev/server/server-reference-manifest.js |    1 -
 .../dev/server/server-reference-manifest.json |    5 -
 .../dev/static/development/_buildManifest.js  |    8 -
 .../development/_clientMiddlewareManifest.js  |    1 -
 .next/dev/static/development/_ssgManifest.js  |    1 -
 .next/dev/types/routes.d.ts                   |   55 -
 flake.nix                                     |    2 +-
 server/.dockerignore                          |    4 +
 server/Dockerfile                             |   16 +
 server/README.md                              |   77 ++
 server/abrp.go                                |  139 +++
 server/api.go                                 |  157 +++
 server/api_test.go                            |  170 +++
 server/days.go                                |   51 +
 server/go.mod                                 |   15 +
 server/go.sum                                 |   27 +
 server/logic_test.go                          |  121 ++
 server/main.go                                |  113 ++
 server/model.go                               |  108 ++
 server/store.go                               |  162 +++
 server/validate.go                            |  327 ++++++
 server/validate_test.go                       |  185 +++
 web/.dockerignore                             |    7 -
 web/.env.example                              |   18 -
 web/.gitignore                                |    7 -
 web/Dockerfile                                |   27 -
 web/README.md                                 |   88 --
 web/next.config.mjs                           |    8 -
 web/package-lock.json                         | 1002 -----------------
 web/package.json                              |   27 -
 web/src/app/api/session/route.ts              |   24 -
 web/src/app/charging/page.tsx                 |  100 --
 web/src/app/consumption/page.tsx              |  178 ---
 web/src/app/globals.css                       |  430 -------
 web/src/app/layout.tsx                        |   23 -
 web/src/app/login/page.tsx                    |   48 -
 web/src/app/logout/route.ts                   |   22 -
 web/src/app/page.tsx                          |   99 --
 .../v1/charging-sessions/[sessionId]/route.ts |   17 -
 web/src/app/v1/consumption/daily/route.ts     |   21 -
 .../history/[installationId]/route.ts         |   30 -
 web/src/app/v1/health/route.ts                |    9 -
 .../[installationId]/charging/route.ts        |   17 -
 .../[installationId]/consumption/route.ts     |   17 -
 web/src/app/v1/telemetry/route.ts             |   24 -
 web/src/components/charts.tsx                 |  267 -----
 web/src/components/shell.tsx                  |   99 --
 web/src/lib/abrp.ts                           |   88 --
 web/src/lib/api.ts                            |   53 -
 web/src/lib/auth.ts                           |   20 -
 web/src/lib/data.ts                           |   83 --
 web/src/lib/days.ts                           |   43 -
 web/src/lib/format.ts                         |   48 -
 web/src/lib/influx.ts                         |   40 -
 web/src/lib/session.ts                        |   80 --
 web/src/lib/store.ts                          |  225 ----
 web/src/lib/types.ts                          |   96 --
 web/src/lib/validate.ts                       |  167 ---
 web/test/days.test.ts                         |   37 -
 web/test/session.test.ts                      |   44 -
 web/test/telemetry.test.ts                    |   56 -
 web/test/validate.test.ts                     |   99 --
 web/tsconfig.json                             |   22 -
 82 files changed, 1673 insertions(+), 3966 deletions(-)
 delete mode 100644 .next/cache/_events_79120_d0eaad9b80692b5d.json
 delete mode 100644 .next/cache/_events_79235_382896d082e25d69.json
 delete mode 100644 .next/dev/build-manifest.json
 delete mode 100644 .next/dev/cache/.rscinfo
 delete mode 100644 .next/dev/cache/turbopack/v16.4.0-e273d5b2/CURRENT
 delete mode 100644 .next/dev/fallback-build-manifest.json
 delete mode 100644 .next/dev/lock
 delete mode 100644 .next/dev/logs/next-development.log
 delete mode 100644 .next/dev/package.json
 delete mode 100644 .next/dev/prerender-manifest.json
 delete mode 100644 .next/dev/routes-manifest.json
 delete mode 100644 .next/dev/server/app-paths-manifest.json
 delete mode 100644 .next/dev/server/interception-route-rewrite-manifest.js
 delete mode 100644 .next/dev/server/middleware-build-manifest.js
 delete mode 100644 .next/dev/server/middleware-manifest.json
 delete mode 100644 .next/dev/server/next-font-manifest.js
 delete mode 100644 .next/dev/server/next-font-manifest.json
 delete mode 100644 .next/dev/server/pages-manifest.json
 delete mode 100644 .next/dev/server/preview-props.json
 delete mode 100644 .next/dev/server/server-reference-manifest.js
 delete mode 100644 .next/dev/server/server-reference-manifest.json
 delete mode 100644 .next/dev/static/development/_buildManifest.js
 delete mode 100644 .next/dev/static/development/_clientMiddlewareManifest.js
 delete mode 100644 .next/dev/static/development/_ssgManifest.js
 delete mode 100644 .next/dev/types/routes.d.ts
 create mode 100644 server/.dockerignore
 create mode 100644 server/Dockerfile
 create mode 100644 server/README.md
 create mode 100644 server/abrp.go
 create mode 100644 server/api.go
 create mode 100644 server/api_test.go
 create mode 100644 server/days.go
 create mode 100644 server/go.mod
 create mode 100644 server/go.sum
 create mode 100644 server/logic_test.go
 create mode 100644 server/main.go
 create mode 100644 server/model.go
 create mode 100644 server/store.go
 create mode 100644 server/validate.go
 create mode 100644 server/validate_test.go
 delete mode 100644 web/.dockerignore
 delete mode 100644 web/.env.example
 delete mode 100644 web/.gitignore
 delete mode 100644 web/Dockerfile
 delete mode 100644 web/README.md
 delete mode 100644 web/next.config.mjs
 delete mode 100644 web/package-lock.json
 delete mode 100644 web/package.json
 delete mode 100644 web/src/app/api/session/route.ts
 delete mode 100644 web/src/app/charging/page.tsx
 delete mode 100644 web/src/app/consumption/page.tsx
 delete mode 100644 web/src/app/globals.css
 delete mode 100644 web/src/app/layout.tsx
 delete mode 100644 web/src/app/login/page.tsx
 delete mode 100644 web/src/app/logout/route.ts
 delete mode 100644 web/src/app/page.tsx
 delete mode 100644 web/src/app/v1/charging-sessions/[sessionId]/route.ts
 delete mode 100644 web/src/app/v1/consumption/daily/route.ts
 delete mode 100644 web/src/app/v1/consumption/history/[installationId]/route.ts
 delete mode 100644 web/src/app/v1/health/route.ts
 delete mode 100644 web/src/app/v1/history/[installationId]/charging/route.ts
 delete mode 100644 web/src/app/v1/history/[installationId]/consumption/route.ts
 delete mode 100644 web/src/app/v1/telemetry/route.ts
 delete mode 100644 web/src/components/charts.tsx
 delete mode 100644 web/src/components/shell.tsx
 delete mode 100644 web/src/lib/abrp.ts
 delete mode 100644 web/src/lib/api.ts
 delete mode 100644 web/src/lib/auth.ts
 delete mode 100644 web/src/lib/data.ts
 delete mode 100644 web/src/lib/days.ts
 delete mode 100644 web/src/lib/format.ts
 delete mode 100644 web/src/lib/influx.ts
 delete mode 100644 web/src/lib/session.ts
 delete mode 100644 web/src/lib/store.ts
 delete mode 100644 web/src/lib/types.ts
 delete mode 100644 web/src/lib/validate.ts
 delete mode 100644 web/test/days.test.ts
 delete mode 100644 web/test/session.test.ts
 delete mode 100644 web/test/telemetry.test.ts
 delete mode 100644 web/test/validate.test.ts
 delete mode 100644 web/tsconfig.json

diff --git a/.next/cache/_events_79120_d0eaad9b80692b5d.json b/.next/cache/_events_79120_d0eaad9b80692b5d.json
deleted file mode 100644
index a25504d..0000000
--- a/.next/cache/_events_79120_d0eaad9b80692b5d.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"eventName":"NEXT_CLI_SESSION_STOPPED","payload":{"nextVersion":"16.4.0","nodeVersion":"v24.12.0","cliCommand":"dev","durationMilliseconds":348,"turboFlag":true,"pagesDir":false,"appDir":true,"isRspack":false}}]
\ No newline at end of file
diff --git a/.next/cache/_events_79235_382896d082e25d69.json b/.next/cache/_events_79235_382896d082e25d69.json
deleted file mode 100644
index 24ede18..0000000
--- a/.next/cache/_events_79235_382896d082e25d69.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"eventName":"NEXT_CLI_SESSION_STOPPED","payload":{"nextVersion":"16.4.0","nodeVersion":"v24.12.0","cliCommand":"dev","durationMilliseconds":345,"turboFlag":true,"pagesDir":false,"appDir":true,"isRspack":false}}]
\ No newline at end of file
diff --git a/.next/dev/build-manifest.json b/.next/dev/build-manifest.json
deleted file mode 100644
index cc102f9..0000000
--- a/.next/dev/build-manifest.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "pages": {
-    "/_app": []
-  },
-  "devFiles": [],
-  "polyfillFiles": [],
-  "lowPriorityFiles": [
-    "static/development/_buildManifest.js",
-    "static/development/_ssgManifest.js",
-    "static/development/_clientMiddlewareManifest.js"
-  ],
-  "rootMainFiles": [],
-  "rootMainFilesTree": {},
-  "pagesChunkGroupBootstrapParams": {}
-}
\ No newline at end of file
diff --git a/.next/dev/cache/.rscinfo b/.next/dev/cache/.rscinfo
deleted file mode 100644
index 4830a4e..0000000
--- a/.next/dev/cache/.rscinfo
+++ /dev/null
@@ -1 +0,0 @@
-{"encryption.key":"UT9PfJliySgklhhPCIM4wpEhmx9PMD9GPB4iuPIamyM=","encryption.expire_at":1792761221411}
\ No newline at end of file
diff --git a/.next/dev/cache/turbopack/v16.4.0-e273d5b2/CURRENT b/.next/dev/cache/turbopack/v16.4.0-e273d5b2/CURRENT
deleted file mode 100644
index 5f9b019..0000000
--- a/.next/dev/cache/turbopack/v16.4.0-e273d5b2/CURRENT
+++ /dev/null
@@ -1 +0,0 @@
-{"max_sequence_number":0,"commit_time":"2026-10-09T13:13:41.418251Z"}
diff --git a/.next/dev/fallback-build-manifest.json b/.next/dev/fallback-build-manifest.json
deleted file mode 100644
index cc102f9..0000000
--- a/.next/dev/fallback-build-manifest.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "pages": {
-    "/_app": []
-  },
-  "devFiles": [],
-  "polyfillFiles": [],
-  "lowPriorityFiles": [
-    "static/development/_buildManifest.js",
-    "static/development/_ssgManifest.js",
-    "static/development/_clientMiddlewareManifest.js"
-  ],
-  "rootMainFiles": [],
-  "rootMainFilesTree": {},
-  "pagesChunkGroupBootstrapParams": {}
-}
\ No newline at end of file
diff --git a/.next/dev/lock b/.next/dev/lock
deleted file mode 100644
index faa33e6..0000000
--- a/.next/dev/lock
+++ /dev/null
@@ -1 +0,0 @@
-{"pid":79123,"port":3001,"hostname":"localhost","appUrl":"http://localhost:3001","startedAt":1791551621304}
\ No newline at end of file
diff --git a/.next/dev/logs/next-development.log b/.next/dev/logs/next-development.log
deleted file mode 100644
index 2cc714a..0000000
--- a/.next/dev/logs/next-development.log
+++ /dev/null
@@ -1,3 +0,0 @@
-{"timestamp":"00:00:01.802","source":"Server","level":"ERROR","message":"Turbopack build encountered 1 error:\n./app\nError: Could not find the Next.js package (next/package.json)\nResolved from: /Users/tcfdonmez/Desktop/Coding/MG/EVABRPUploader/app\nFilesystem root used for resolution: /Users/tcfdonmez/Desktop/Coding/MG/EVABRPUploader\n\nPossible causes:\n  - node_modules is being reorganized by a concurrent install (e.g. pnpm adding a package with a `next` peer dependency). This is transient and should clear once the install completes.\n  - node_modules/next was removed, renamed, or has a broken symlink.\n  - The workspace root is incorrect — see turbopack.root in the Next.js config docs for how to configure it.\n  - In a monorepo, the Next.js package may only exist in a directory above the closest directory containing a package manager lockfile. The workspace root is detected by locating the nearest package manager lockfile.\n  - Next.js is installed globally rather than as a project dependency. This is not supported; install it locally.\n\nNote: To ensure a hermetic build and a portable cache, files outside of the workspace root are not compiled.\n\nhttps://nextjs.org/docs/app/api-reference/config/next-config-js/turbopack#root-directory\n\n"}
-{"timestamp":"00:00:02.079","source":"Server","level":"LOG","message":""}
-{"timestamp":"00:00:02.080","source":"Server","level":"LOG","message":"✓ Generated AGENTS.md for AI agents. Set `agentRules: false` in next.config to disable."}
diff --git a/.next/dev/package.json b/.next/dev/package.json
deleted file mode 100644
index c9a4422..0000000
--- a/.next/dev/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "type": "commonjs"
-}
\ No newline at end of file
diff --git a/.next/dev/prerender-manifest.json b/.next/dev/prerender-manifest.json
deleted file mode 100644
index 4400a7a..0000000
--- a/.next/dev/prerender-manifest.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "version": 4,
-  "routes": {},
-  "dynamicRoutes": {},
-  "notFoundRoutes": []
-}
\ No newline at end of file
diff --git a/.next/dev/routes-manifest.json b/.next/dev/routes-manifest.json
deleted file mode 100644
index 442224a..0000000
--- a/.next/dev/routes-manifest.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"caseSensitive":false,"basePath":"","rewrites":{"beforeFiles":[],"afterFiles":[],"fallback":[]},"redirects":[{"source":"/:path+/","destination":"/:path+","permanent":true,"internal":true,"priority":true,"regex":"^(?:\\/((?:[^\\/]+?)(?:\\/(?:[^\\/]+?))*))\\/$"}],"headers":[],"onMatchHeaders":[]}
\ No newline at end of file
diff --git a/.next/dev/server/app-paths-manifest.json b/.next/dev/server/app-paths-manifest.json
deleted file mode 100644
index 9e26dfe..0000000
--- a/.next/dev/server/app-paths-manifest.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/.next/dev/server/interception-route-rewrite-manifest.js b/.next/dev/server/interception-route-rewrite-manifest.js
deleted file mode 100644
index 24f77ba..0000000
--- a/.next/dev/server/interception-route-rewrite-manifest.js
+++ /dev/null
@@ -1 +0,0 @@
-self.__INTERCEPTION_ROUTE_REWRITE_MANIFEST="[]";
\ No newline at end of file
diff --git a/.next/dev/server/middleware-build-manifest.js b/.next/dev/server/middleware-build-manifest.js
deleted file mode 100644
index 4de4f4f..0000000
--- a/.next/dev/server/middleware-build-manifest.js
+++ /dev/null
@@ -1,15 +0,0 @@
-globalThis.__BUILD_MANIFEST = {
-  "pages": {
-    "/_app": []
-  },
-  "devFiles": [],
-  "polyfillFiles": [],
-  "lowPriorityFiles": [
-    "static/development/_buildManifest.js",
-    "static/development/_ssgManifest.js",
-    "static/development/_clientMiddlewareManifest.js"
-  ],
-  "rootMainFiles": [],
-  "rootMainFilesTree": {},
-  "pagesChunkGroupBootstrapParams": {}
-};
diff --git a/.next/dev/server/middleware-manifest.json b/.next/dev/server/middleware-manifest.json
deleted file mode 100644
index eb7130b..0000000
--- a/.next/dev/server/middleware-manifest.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "version": 3,
-  "middleware": {},
-  "sortedMiddleware": [],
-  "functions": {}
-}
\ No newline at end of file
diff --git a/.next/dev/server/next-font-manifest.js b/.next/dev/server/next-font-manifest.js
deleted file mode 100644
index dcd0697..0000000
--- a/.next/dev/server/next-font-manifest.js
+++ /dev/null
@@ -1 +0,0 @@
-self.__NEXT_FONT_MANIFEST="{\n  \"app\": {},\n  \"appUsingSizeAdjust\": false,\n  \"pages\": {},\n  \"pagesUsingSizeAdjust\": false\n}"
\ No newline at end of file
diff --git a/.next/dev/server/next-font-manifest.json b/.next/dev/server/next-font-manifest.json
deleted file mode 100644
index 7b7649c..0000000
--- a/.next/dev/server/next-font-manifest.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "app": {},
-  "appUsingSizeAdjust": false,
-  "pages": {},
-  "pagesUsingSizeAdjust": false
-}
\ No newline at end of file
diff --git a/.next/dev/server/pages-manifest.json b/.next/dev/server/pages-manifest.json
deleted file mode 100644
index 9e26dfe..0000000
--- a/.next/dev/server/pages-manifest.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/.next/dev/server/preview-props.json b/.next/dev/server/preview-props.json
deleted file mode 100644
index 0969aea..0000000
--- a/.next/dev/server/preview-props.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "previewModeId": "a508c818777951bed52c0170453ef7e3",
-  "previewModeSigningKey": "591a19b72d1a845a81057e56fb15a2ced8409045c0ed580013f217b8c4a4ea61",
-  "previewModeEncryptionKey": "ded0359fbc3be263ec7ff240e7fb98fc5b836958070834f5bc954f1092afa91c"
-}
\ No newline at end of file
diff --git a/.next/dev/server/server-reference-manifest.js b/.next/dev/server/server-reference-manifest.js
deleted file mode 100644
index 272af9c..0000000
--- a/.next/dev/server/server-reference-manifest.js
+++ /dev/null
@@ -1 +0,0 @@
-self.__RSC_SERVER_MANIFEST="{\n  \"node\": {},\n  \"edge\": {},\n  \"encryptionKey\": \"UT9PfJliySgklhhPCIM4wpEhmx9PMD9GPB4iuPIamyM=\"\n}"
\ No newline at end of file
diff --git a/.next/dev/server/server-reference-manifest.json b/.next/dev/server/server-reference-manifest.json
deleted file mode 100644
index b5a989e..0000000
--- a/.next/dev/server/server-reference-manifest.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "node": {},
-  "edge": {},
-  "encryptionKey": "UT9PfJliySgklhhPCIM4wpEhmx9PMD9GPB4iuPIamyM="
-}
\ No newline at end of file
diff --git a/.next/dev/static/development/_buildManifest.js b/.next/dev/static/development/_buildManifest.js
deleted file mode 100644
index bffda53..0000000
--- a/.next/dev/static/development/_buildManifest.js
+++ /dev/null
@@ -1,8 +0,0 @@
-self.__BUILD_MANIFEST = {
-  "__rewrites": {
-    "afterFiles": [],
-    "beforeFiles": [],
-    "fallback": []
-  },
-  "sortedPages": []
-};self.__BUILD_MANIFEST_CB && self.__BUILD_MANIFEST_CB()
\ No newline at end of file
diff --git a/.next/dev/static/development/_clientMiddlewareManifest.js b/.next/dev/static/development/_clientMiddlewareManifest.js
deleted file mode 100644
index a8acaff..0000000
--- a/.next/dev/static/development/_clientMiddlewareManifest.js
+++ /dev/null
@@ -1 +0,0 @@
-self.__MIDDLEWARE_MATCHERS = [];self.__MIDDLEWARE_MATCHERS_CB && self.__MIDDLEWARE_MATCHERS_CB()
\ No newline at end of file
diff --git a/.next/dev/static/development/_ssgManifest.js b/.next/dev/static/development/_ssgManifest.js
deleted file mode 100644
index 2260768..0000000
--- a/.next/dev/static/development/_ssgManifest.js
+++ /dev/null
@@ -1 +0,0 @@
-self.__SSG_MANIFEST=new Set;self.__SSG_MANIFEST_CB&&self.__SSG_MANIFEST_CB()
\ No newline at end of file
diff --git a/.next/dev/types/routes.d.ts b/.next/dev/types/routes.d.ts
deleted file mode 100644
index 15617e1..0000000
--- a/.next/dev/types/routes.d.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-// This file is generated automatically by Next.js
-// Do not edit this file manually
-
-type AppRoutes = never
-type PageRoutes = never
-type LayoutRoutes = never
-type RedirectRoutes = never
-type RewriteRoutes = never
-type Routes = AppRoutes | PageRoutes | LayoutRoutes | RedirectRoutes | RewriteRoutes
-
-
-interface ParamMap {
-}
-
-
-export type ParamsOf<Route extends Routes> = ParamMap[Route]
-
-interface LayoutSlotMap {
-}
-
-
-export type { AppRoutes, PageRoutes, LayoutRoutes, RedirectRoutes, RewriteRoutes, ParamMap }
-
-declare global {
-  /**
-   * Props for Next.js App Router page components
-   * @example
-   * ```tsx
-   * export default function Page(props: PageProps<'/blog/[slug]'>) {
-   *   const { slug } = await props.params
-   *   return <div>Blog post: {slug}</div>
-   * }
-   * ```
-   */
-  interface PageProps<AppRoute extends AppRoutes> {
-    params: Promise<ParamMap[AppRoute]>
-    searchParams: Promise<Record<string, string | string[] | undefined>>
-  }
-
-  /**
-   * Props for Next.js App Router layout components
-   * @example
-   * ```tsx
-   * export default function Layout(props: LayoutProps<'/dashboard'>) {
-   *   return <div>{props.children}</div>
-   * }
-   * ```
-   */
-  type LayoutProps<LayoutRoute extends LayoutRoutes> = {
-    params: Promise<ParamMap[LayoutRoute]>
-    children: React.ReactNode
-  } & {
-    [K in LayoutSlotMap[LayoutRoute]]: React.ReactNode
-  }
-}
diff --git a/flake.nix b/flake.nix
index 88d38f0..a371adf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -112,7 +112,7 @@
         in
         {
           default = pkgs.mkShell {
-            packages = [ jdk android.androidsdk buildCar pkgs.nodejs_22 pkgs.influxdb2-server pkgs.influxdb2-cli ];
+            packages = [ jdk android.androidsdk buildCar pkgs.go pkgs.gopls pkgs.govulncheck pkgs.influxdb2-server pkgs.influxdb2-cli ];
 
             ANDROID_HOME = sdk;
             ANDROID_SDK_ROOT = sdk;
diff --git a/server/.dockerignore b/server/.dockerignore
new file mode 100644
index 0000000..6f1931b
--- /dev/null
+++ b/server/.dockerignore
@@ -0,0 +1,4 @@
+*
+!go.mod
+!go.sum
+!*.go
diff --git a/server/Dockerfile b/server/Dockerfile
new file mode 100644
index 0000000..c373c44
--- /dev/null
+++ b/server/Dockerfile
@@ -0,0 +1,16 @@
+# The car server: one static Go binary on distroless, running as non-root.
+# Configuration comes from the environment at runtime; nothing secret is baked in.
+
+FROM docker.io/library/golang:1.26.9-alpine AS build
+WORKDIR /src
+ENV CGO_ENABLED=0 GOFLAGS=-trimpath GOTOOLCHAIN=local
+COPY go.mod go.sum ./
+RUN go mod download && go mod verify
+COPY *.go ./
+RUN go vet ./... && go test ./... && go build -ldflags="-s -w" -o /out/server .
+
+FROM gcr.io/distroless/static-debian12:nonroot
+COPY --from=build /out/server /server
+USER 65532:65532
+EXPOSE 8080
+ENTRYPOINT ["/server"]
diff --git a/server/README.md b/server/README.md
new file mode 100644
index 0000000..8dfba01
--- /dev/null
+++ b/server/README.md
@@ -0,0 +1,77 @@
+# Nils' MG4 — car server
+
+A small Go service at car.stinnesbeck.com: the API the car writes to, and the ABRP
+forwarder. Data lives in InfluxDB 2; Grafana reads it from there for the dashboards
+(`../k8s/grafana/`).
+
+```
+car ──live telemetry───▶ server ──▶ ABRP  api.iternio.com/1/tlm/send
+    ──daily chunks─────▶   │
+    ──charging sessions▶   ▼
+                       InfluxDB 2 ◀── Grafana
+```
+
+## Configuration
+
+Environment only; the server refuses to start when a required value is missing.
+
+| Name | Notes |
+|---|---|
+| `INFLUX_URL`, `INFLUX_TOKEN`, `INFLUX_ORG` | required; the token needs read/write on the bucket |
+| `INFLUX_BUCKET` | default `mg4` |
+| `INGEST_TOKEN` | required, at least 24 characters: `openssl rand -hex 32` |
+| `ABRP_API_KEY`, `ABRP_USER_TOKEN` | optional; both needed to forward |
+| `ABRP_MIN_INTERVAL_SECONDS` | default 5 |
+| `LISTEN_ADDR` | default `:8080` |
+
+The ABRP credentials never reach the car.
+
+## Endpoints
+
+All but `/v1/health` need `Authorization: Bearer <INGEST_TOKEN>`.
+
+- `POST /v1/telemetry` — `{ installationId, samples: [...] }`, up to 500 samples in ABRP's `tlm`
+  field names and units (`utc` in epoch seconds; flags as 0/1 or booleans). Unknown fields are
+  dropped, known ones bounded. Stored, then the newest sample is forwarded to ABRP if it is under
+  5 minutes old.
+- `PUT /v1/consumption/daily` — one delta chunk of a day's consumption.
+- `PUT /v1/charging-sessions/{sessionId}` — a finished DC session with its curve.
+- `GET /v1/consumption/history/{installationId}` — the car reads its own totals back.
+- `GET /v1/health` — `{"status":"ok"}`.
+
+A bad request is a 400 naming the field; a database failure is a 500 without detail.
+
+## Storage
+
+One bucket, `installationId` tag on every point:
+
+| Measurement | Timestamp | Tags | Fields |
+|---|---|---|---|
+| `telemetry` | sample `utc` | — | the ABRP fields that were sent |
+| `consumption_chunk` | `recordedAt` | `date` | km, kwh, hours, socDrop, sohPercent |
+| `charging_session` | `startedAt` | `sessionId` | endedAtMs, duration, energy, cost, start/end SOC |
+| `charging_curve` | point time | `sessionId` | powerKw, socPercent |
+
+A point with the same measurement, tags and timestamp replaces the earlier one, so the car's
+retries are idempotent: a cached chunk is re-sent with its original `recordedAt`. Days and the
+lifetime total are summed from the chunks when read. Numbers are always written as floats,
+because InfluxDB fixes a field's type on first write.
+
+## Development
+
+```sh
+nix develop          # from the repository root: Go, govulncheck, InfluxDB 2
+cd server
+go test ./...
+govulncheck ./...
+```
+
+## Container image
+
+```sh
+podman build -t git.stinnesbeck.com/nils/mg4-server:<version> .
+podman push git.stinnesbeck.com/nils/mg4-server:<version>
+```
+
+The build runs `go vet` and the tests. The image is a static binary on distroless (about
+11 MB), running as UID 65532 on port 8080.
diff --git a/server/abrp.go b/server/abrp.go
new file mode 100644
index 0000000..9869cc6
--- /dev/null
+++ b/server/abrp.go
@@ -0,0 +1,139 @@
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"log/slog"
+	"net/http"
+	"net/url"
+	"strings"
+	"sync"
+	"time"
+)
+
+// Forwarder sends live telemetry on to A Better Route Planner.
+//
+// The ABRP credentials exist only here, from ABRP_API_KEY and ABRP_USER_TOKEN in the
+// server's environment; the car never holds them. Forwarding is off when either is empty.
+//
+// Only the newest sample of a batch is sent, and at most one per MinInterval. A failed
+// forward is logged and dropped, never queued: ABRP plans from the car's state now, and a
+// backlog replayed later would describe a car that has moved on. The stored copy in
+// InfluxDB is unaffected either way.
+type Forwarder struct {
+	APIKey      string
+	UserToken   string
+	MinInterval time.Duration
+	Endpoint    string
+	Client      *http.Client
+
+	mu         sync.Mutex
+	lastUTC    int64
+	lastSentAt time.Time
+}
+
+const (
+	abrpEndpoint = "https://api.iternio.com/1/tlm/send"
+	// Older than this, a sample is history rather than live state, and ABRP gets nothing.
+	abrpMaxAge = 5 * time.Minute
+)
+
+func (f *Forwarder) configured() bool {
+	return f != nil && f.APIKey != "" && f.UserToken != ""
+}
+
+// pick chooses the sample to forward, or false when there is nothing new or it is too
+// soon. It records the choice, so two batches arriving together cannot both forward.
+func (f *Forwarder) pick(samples []TelemetrySample, now time.Time) (TelemetrySample, bool) {
+	if len(samples) == 0 {
+		return TelemetrySample{}, false
+	}
+	newest := samples[0]
+	for _, s := range samples[1:] {
+		if s.UTC > newest.UTC {
+			newest = s
+		}
+	}
+	if now.Sub(time.Unix(newest.UTC, 0)) > abrpMaxAge {
+		return TelemetrySample{}, false
+	}
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	if f.lastUTC != 0 && newest.UTC <= f.lastUTC {
+		return TelemetrySample{}, false
+	}
+	if !f.lastSentAt.IsZero() && now.Sub(f.lastSentAt) < f.MinInterval {
+		return TelemetrySample{}, false
+	}
+	f.lastUTC = newest.UTC
+	f.lastSentAt = now
+	return newest, true
+}
+
+// Forward is fire-and-forget: the car's request is answered without waiting for ABRP.
+func (f *Forwarder) Forward(samples []TelemetrySample) {
+	if !f.configured() {
+		return
+	}
+	sample, ok := f.pick(samples, time.Now())
+	if !ok {
+		return
+	}
+	go func() {
+		if err := f.send(context.Background(), sample); err != nil {
+			slog.Warn("ABRP forward failed", "error", err)
+		}
+	}()
+}
+
+// tlm is the object ABRP expects: the same field names, flags as 0/1.
+func tlm(sample TelemetrySample) map[string]any {
+	out := map[string]any{"utc": sample.UTC}
+	for field, value := range sample.Numbers {
+		out[field] = value
+	}
+	for field, value := range sample.Flags {
+		if value {
+			out[field] = 1
+		} else {
+			out[field] = 0
+		}
+	}
+	return out
+}
+
+func (f *Forwarder) send(ctx context.Context, sample TelemetrySample) error {
+	payload, err := json.Marshal(tlm(sample))
+	if err != nil {
+		return err
+	}
+	// Credentials go in the form body, never the URL, which ends up in access logs.
+	form := url.Values{"api_key": {f.APIKey}, "token": {f.UserToken}, "tlm": {string(payload)}}
+	endpoint := f.Endpoint
+	if endpoint == "" {
+		endpoint = abrpEndpoint
+	}
+	ctx, cancel := context.WithTimeout(ctx, 8*time.Second)
+	defer cancel()
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint, strings.NewReader(form.Encode()))
+	if err != nil {
+		return err
+	}
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	client := f.Client
+	if client == nil {
+		client = http.DefaultClient
+	}
+	resp, err := client.Do(req)
+	if err != nil {
+		// A url.Error from the client quotes the URL, which holds no credentials.
+		return err
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+		// The response body can echo the request; only the status is reported.
+		return fmt.Errorf("rejected: HTTP %d", resp.StatusCode)
+	}
+	return nil
+}
diff --git a/server/api.go b/server/api.go
new file mode 100644
index 0000000..89b8923
--- /dev/null
+++ b/server/api.go
@@ -0,0 +1,157 @@
+package main
+
+import (
+	"crypto/subtle"
+	"encoding/json"
+	"errors"
+	"io"
+	"log/slog"
+	"net/http"
+	"strings"
+)
+
+// API serves the car. Every endpoint but /v1/health needs the ingest token.
+//
+//	POST /v1/telemetry                           live samples; stored, newest forwarded to ABRP
+//	PUT  /v1/consumption/daily                   one delta chunk of a day's consumption
+//	PUT  /v1/charging-sessions/{sessionId}       one finished DC charging session
+//	GET  /v1/consumption/history/{installationId} the car reads its own totals back
+//	GET  /v1/health                              unauthenticated liveness probe
+type API struct {
+	Store       Store
+	IngestToken string
+	Forwarder   *Forwarder
+}
+
+const maxBodyBytes = 512 * 1024
+
+func (a *API) Routes() http.Handler {
+	mux := http.NewServeMux()
+	mux.HandleFunc("GET /v1/health", func(w http.ResponseWriter, r *http.Request) {
+		writeJSON(w, http.StatusOK, map[string]string{"status": "ok"})
+	})
+	mux.HandleFunc("POST /v1/telemetry", a.ingest(a.telemetry))
+	mux.HandleFunc("PUT /v1/consumption/daily", a.ingest(a.consumption))
+	mux.HandleFunc("PUT /v1/charging-sessions/{sessionId}", a.ingest(a.chargingSession))
+	mux.HandleFunc("GET /v1/consumption/history/{installationId}", a.ingest(a.history))
+	return mux
+}
+
+// hasIngestToken compares in constant time. main refuses to start with a token under 24
+// characters, so an empty or short configured token can never match here.
+func (a *API) hasIngestToken(r *http.Request) bool {
+	header := r.Header.Get("Authorization")
+	supplied, ok := strings.CutPrefix(header, "Bearer ")
+	if !ok || len(a.IngestToken) < minIngestTokenLength {
+		return false
+	}
+	return subtle.ConstantTimeCompare([]byte(supplied), []byte(a.IngestToken)) == 1
+}
+
+type handler func(w http.ResponseWriter, r *http.Request, body []byte) error
+
+// ingest wraps a handler with the token check, the body limit and error mapping: a
+// validation failure is a 400 naming the field; anything else is a 500 whose detail
+// stays in the server log.
+func (a *API) ingest(h handler) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		if !a.hasIngestToken(r) {
+			writeJSON(w, http.StatusUnauthorized, map[string]string{"error": "unauthorized"})
+			return
+		}
+		body, err := io.ReadAll(io.LimitReader(r.Body, maxBodyBytes+1))
+		if err != nil {
+			writeJSON(w, http.StatusBadRequest, map[string]string{"error": "body could not be read"})
+			return
+		}
+		if len(body) > maxBodyBytes {
+			writeJSON(w, http.StatusBadRequest, map[string]string{"error": "body is too large"})
+			return
+		}
+		if err := h(w, r, body); err != nil {
+			var verr *ValidationError
+			if errors.As(err, &verr) {
+				writeJSON(w, http.StatusBadRequest, map[string]string{"error": verr.Error()})
+				return
+			}
+			slog.Error("request failed", "method", r.Method, "path", r.URL.Path, "error", err)
+			writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "internal server error"})
+		}
+	}
+}
+
+// telemetry stores the batch first; only once the write succeeded is the newest sample
+// handed to ABRP, so the car's retry of a failed request cannot leave ABRP with data the
+// database never got.
+func (a *API) telemetry(w http.ResponseWriter, r *http.Request, body []byte) error {
+	batch, err := validateTelemetryBatch(body)
+	if err != nil {
+		return err
+	}
+	if err := a.Store.WriteTelemetry(r.Context(), batch.InstallationID, batch.Samples); err != nil {
+		return err
+	}
+	a.Forwarder.Forward(batch.Samples)
+	w.WriteHeader(http.StatusNoContent)
+	return nil
+}
+
+// consumption stores one delta chunk at its recordedAt. Reads add a day's chunks up, so a
+// chunk the car re-sends from its offline cache replaces itself instead of counting twice.
+func (a *API) consumption(w http.ResponseWriter, r *http.Request, body []byte) error {
+	chunk, err := validateConsumption(body)
+	if err != nil {
+		return err
+	}
+	if err := a.Store.WriteConsumptionChunk(r.Context(), chunk); err != nil {
+		return err
+	}
+	w.WriteHeader(http.StatusNoContent)
+	return nil
+}
+
+func (a *API) chargingSession(w http.ResponseWriter, r *http.Request, body []byte) error {
+	session, err := validateChargingSession(body, r.PathValue("sessionId"))
+	if err != nil {
+		return err
+	}
+	if err := a.Store.WriteChargingSession(r.Context(), session); err != nil {
+		return err
+	}
+	w.WriteHeader(http.StatusNoContent)
+	return nil
+}
+
+// history is the car's read-back of its own uploaded totals, so an app reinstall does not
+// blank its Consumption tab. Up to 400 days, newest first, plus the lifetime sum of all.
+func (a *API) history(w http.ResponseWriter, r *http.Request, _ []byte) error {
+	id, err := validUUID(r.PathValue("installationId"), "installationId")
+	if err != nil {
+		return err
+	}
+	chunks, err := a.Store.ReadConsumptionChunks(r.Context(), id)
+	if err != nil {
+		return err
+	}
+	days := aggregateDays(chunks)
+	var lifetime Totals
+	if len(days) > 0 {
+		lifetime = days[0].Lifetime
+	}
+	if len(days) > 400 {
+		days = days[:400]
+	}
+	writeJSON(w, http.StatusOK, struct {
+		Records  []DailyConsumption `json:"records"`
+		Lifetime Totals             `json:"lifetime"`
+	}{Records: days, Lifetime: lifetime})
+	return nil
+}
+
+func writeJSON(w http.ResponseWriter, status int, value any) {
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(status)
+	if err := json.NewEncoder(w).Encode(value); err != nil {
+		slog.Warn("response not written", "error", err)
+	}
+}
diff --git a/server/api_test.go b/server/api_test.go
new file mode 100644
index 0000000..c466fde
--- /dev/null
+++ b/server/api_test.go
@@ -0,0 +1,170 @@
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"sync"
+	"testing"
+)
+
+type fakeStore struct {
+	mu        sync.Mutex
+	telemetry []TelemetrySample
+	chunks    []ConsumptionChunk
+	sessions  []ChargingSession
+	fail      error
+}
+
+func (f *fakeStore) WriteTelemetry(_ context.Context, _ string, s []TelemetrySample) error {
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	if f.fail != nil {
+		return f.fail
+	}
+	f.telemetry = append(f.telemetry, s...)
+	return nil
+}
+
+func (f *fakeStore) WriteConsumptionChunk(_ context.Context, c ConsumptionChunk) error {
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	if f.fail != nil {
+		return f.fail
+	}
+	f.chunks = append(f.chunks, c)
+	return nil
+}
+
+func (f *fakeStore) WriteChargingSession(_ context.Context, s ChargingSession) error {
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	f.sessions = append(f.sessions, s)
+	return f.fail
+}
+
+func (f *fakeStore) ReadConsumptionChunks(context.Context, string) ([]ConsumptionChunk, error) {
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	return f.chunks, f.fail
+}
+
+const testToken = "ingest-test-token-0123456789abcdef"
+
+func newTestAPI() (*API, *fakeStore) {
+	store := &fakeStore{}
+	return &API{Store: store, IngestToken: testToken, Forwarder: &Forwarder{}}, store
+}
+
+func do(t *testing.T, h http.Handler, method, path, token, body string) *httptest.ResponseRecorder {
+	t.Helper()
+	req := httptest.NewRequest(method, path, strings.NewReader(body))
+	if token != "" {
+		req.Header.Set("Authorization", "Bearer "+token)
+	}
+	rec := httptest.NewRecorder()
+	h.ServeHTTP(rec, req)
+	return rec
+}
+
+func TestHealthNeedsNoToken(t *testing.T) {
+	api, _ := newTestAPI()
+	rec := do(t, api.Routes(), "GET", "/v1/health", "", "")
+	if rec.Code != 200 || strings.TrimSpace(rec.Body.String()) != `{"status":"ok"}` {
+		t.Fatalf("%d %s", rec.Code, rec.Body)
+	}
+}
+
+func TestEveryOtherEndpointNeedsTheIngestToken(t *testing.T) {
+	api, _ := newTestAPI()
+	h := api.Routes()
+	for _, c := range []struct{ method, path string }{
+		{"POST", "/v1/telemetry"},
+		{"PUT", "/v1/consumption/daily"},
+		{"PUT", "/v1/charging-sessions/" + testSession},
+		{"GET", "/v1/consumption/history/" + testInstallation},
+	} {
+		for _, token := range []string{"", "wrong-token-0123456789abcdef", testToken + "x"} {
+			if rec := do(t, h, c.method, c.path, token, "{}"); rec.Code != 401 {
+				t.Errorf("%s %s with %q: want 401, got %d", c.method, c.path, token, rec.Code)
+			}
+		}
+	}
+}
+
+func TestTelemetryIsStoredAndBadInputIsA400(t *testing.T) {
+	api, store := newTestAPI()
+	h := api.Routes()
+	rec := do(t, h, "POST", "/v1/telemetry", testToken, string(telemetryBody(`{"utc":1790000000,"soc":80}`)))
+	if rec.Code != 204 || len(store.telemetry) != 1 {
+		t.Fatalf("%d, stored %d", rec.Code, len(store.telemetry))
+	}
+	rec = do(t, h, "POST", "/v1/telemetry", testToken, string(telemetryBody(`{"utc":1790000000,"soc":120}`)))
+	if rec.Code != 400 || !strings.Contains(rec.Body.String(), "samples[0].soc is invalid") {
+		t.Fatalf("%d %s", rec.Code, rec.Body)
+	}
+	if rec := do(t, h, "GET", "/v1/telemetry", testToken, ""); rec.Code != 405 {
+		t.Fatalf("GET on a POST route: want 405, got %d", rec.Code)
+	}
+}
+
+func TestAFailedWriteIsA500WithoutDetail(t *testing.T) {
+	api, store := newTestAPI()
+	store.fail = errors.New("influx says: token xyz rejected")
+	rec := do(t, api.Routes(), "POST", "/v1/telemetry", testToken, string(telemetryBody(`{"utc":1790000000,"soc":80}`)))
+	if rec.Code != 500 || strings.Contains(rec.Body.String(), "xyz") {
+		t.Fatalf("%d %s", rec.Code, rec.Body)
+	}
+}
+
+func TestOversizedBodiesAreRejected(t *testing.T) {
+	api, _ := newTestAPI()
+	big := `{"x":"` + strings.Repeat("a", maxBodyBytes) + `"}`
+	if rec := do(t, api.Routes(), "PUT", "/v1/consumption/daily", testToken, big); rec.Code != 400 {
+		t.Fatalf("want 400, got %d", rec.Code)
+	}
+}
+
+func TestHistoryReturnsDaysNewestFirstAndTheLifetime(t *testing.T) {
+	api, _ := newTestAPI()
+	h := api.Routes()
+	day := func(date string, at int64) string {
+		return `{"installationId":"` + testInstallation + `","date":"` + date + `","recordedAt":` +
+			jsonInt(at) + `,"day":{"km":2.5,"kwh":0.4,"hours":0.03,"socDrop":0.6}}`
+	}
+	// Two chunks on one day and one on the next. Retry dedupe is InfluxDB's overwrite and is
+	// covered by the end-to-end check, not this fake.
+	for _, body := range []string{day("2026-10-16", 1000), day("2026-10-16", 2000), day("2026-10-17", 3000)} {
+		if rec := do(t, h, "PUT", "/v1/consumption/daily", testToken, body); rec.Code != 204 {
+			t.Fatalf("chunk: %d %s", rec.Code, rec.Body)
+		}
+	}
+	rec := do(t, h, "GET", "/v1/consumption/history/"+testInstallation, testToken, "")
+	if rec.Code != 200 {
+		t.Fatalf("%d %s", rec.Code, rec.Body)
+	}
+	var got struct {
+		Records []struct {
+			Date string `json:"date"`
+			Day  Totals `json:"day"`
+		} `json:"records"`
+		Lifetime Totals `json:"lifetime"`
+	}
+	if err := json.Unmarshal(rec.Body.Bytes(), &got); err != nil {
+		t.Fatal(err)
+	}
+	if len(got.Records) != 2 || got.Records[0].Date != "2026-10-17" || got.Records[1].Day.Km != 5 || got.Lifetime.Km != 7.5 {
+		t.Fatalf("%s", rec.Body)
+	}
+	if rec := do(t, h, "GET", "/v1/consumption/history/not-a-uuid", testToken, ""); rec.Code != 400 {
+		t.Fatalf("bad id: want 400, got %d", rec.Code)
+	}
+}
+
+func jsonInt(v int64) string {
+	b, _ := json.Marshal(v)
+	return string(b)
+}
diff --git a/server/days.go b/server/days.go
new file mode 100644
index 0000000..2651bc6
--- /dev/null
+++ b/server/days.go
@@ -0,0 +1,51 @@
+package main
+
+import "sort"
+
+// aggregateDays folds chunks into days, newest day first, each with its running lifetime
+// total. Pure, so the arithmetic is tested without a database.
+func aggregateDays(chunks []ConsumptionChunk) []DailyConsumption {
+	type day struct {
+		DailyConsumption
+		sohAt  int64
+		hasSoh bool
+	}
+	byDate := map[string]*day{}
+	for _, chunk := range chunks {
+		d, ok := byDate[chunk.Date]
+		if !ok {
+			d = &day{DailyConsumption: DailyConsumption{
+				InstallationID: chunk.InstallationID,
+				Date:           chunk.Date,
+				RecordedAt:     chunk.RecordedAt,
+			}}
+			byDate[chunk.Date] = d
+		}
+		d.Day.add(chunk.Day)
+		if chunk.RecordedAt.After(d.RecordedAt) {
+			d.RecordedAt = chunk.RecordedAt
+		}
+		// The newest manual SoH of the day wins.
+		at := chunk.RecordedAt.UnixMilli()
+		if chunk.SohPercent != nil && (!d.hasSoh || at > d.sohAt) {
+			soh := *chunk.SohPercent
+			d.SohPercent = &soh
+			d.sohAt = at
+			d.hasSoh = true
+		}
+	}
+	days := make([]DailyConsumption, 0, len(byDate))
+	for _, d := range byDate {
+		days = append(days, d.DailyConsumption)
+	}
+	sort.Slice(days, func(i, j int) bool { return days[i].Date < days[j].Date })
+	var running Totals
+	for i := range days {
+		running.add(days[i].Day)
+		days[i].Lifetime = running
+	}
+	for i, j := 0, len(days)-1; i < j; i, j = i+1, j-1 {
+		days[i], days[j] = days[j], days[i]
+	}
+	return days
+}
diff --git a/server/go.mod b/server/go.mod
new file mode 100644
index 0000000..ed82e11
--- /dev/null
+++ b/server/go.mod
@@ -0,0 +1,15 @@
+module git.stinnesbeck.com/nils/mg4/server
+
+go 1.26.0
+
+toolchain go1.26.9
+
+require github.com/influxdata/influxdb-client-go/v2 v2.14.0
+
+require (
+	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
+	github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 // indirect
+	github.com/oapi-codegen/runtime v1.0.0 // indirect
+	golang.org/x/net v0.60.0 // indirect
+)
diff --git a/server/go.sum b/server/go.sum
new file mode 100644
index 0000000..7303d63
--- /dev/null
+++ b/server/go.sum
@@ -0,0 +1,27 @@
+github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk=
+github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
+github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
+github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/influxdata/influxdb-client-go/v2 v2.14.0 h1:AjbBfJuq+QoaXNcrova8smSjwJdUHnwvfjMF71M1iI4=
+github.com/influxdata/influxdb-client-go/v2 v2.14.0/go.mod h1:Ahpm3QXKMJslpXl3IftVLVezreAUtBOTZssDrjZEFHI=
+github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 h1:W9WBk7wlPfJLvMCdtV4zPulc4uCPrlywQOmbFOhgQNU=
+github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo=
+github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE=
+github.com/oapi-codegen/runtime v1.0.0 h1:P4rqFX5fMFWqRzY9M/3YF9+aPSPPB06IzP2P7oOxrWo=
+github.com/oapi-codegen/runtime v1.0.0/go.mod h1:LmCUMQuPB4M/nLXilQXhHw+BLZdDb18B34OO356yJ/A=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+golang.org/x/net v0.60.0 h1:79p50tfZlm0J9YfoDsSi639qSXNGVwEzOPLCxM2FsYU=
+golang.org/x/net v0.60.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/server/logic_test.go b/server/logic_test.go
new file mode 100644
index 0000000..bf83bf9
--- /dev/null
+++ b/server/logic_test.go
@@ -0,0 +1,121 @@
+package main
+
+import (
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"testing"
+	"time"
+)
+
+func chunk(date string, atMs int64, km, kwh float64, soh *float64) ConsumptionChunk {
+	return ConsumptionChunk{
+		InstallationID: testInstallation, Date: date, RecordedAt: time.UnixMilli(atMs),
+		Day: Totals{Km: km, Kwh: kwh, Hours: km / 50, SocDrop: kwh / 0.6}, SohPercent: soh,
+	}
+}
+
+func ptr(f float64) *float64 { return &f }
+
+func TestAggregateDaysSumsPerDayNewestFirstWithRunningLifetime(t *testing.T) {
+	days := aggregateDays([]ConsumptionChunk{
+		chunk("2026-10-16", 1000, 10, 2, nil),
+		chunk("2026-10-17", 3000, 5, 1, nil),
+		chunk("2026-10-16", 2000, 20, 3, nil),
+	})
+	if len(days) != 2 || days[0].Date != "2026-10-17" || days[1].Date != "2026-10-16" {
+		t.Fatalf("order: %+v", days)
+	}
+	if days[1].Day.Km != 30 || days[1].Day.Kwh != 5 || days[1].RecordedAt.UnixMilli() != 2000 {
+		t.Fatalf("day sums: %+v", days[1])
+	}
+	if days[1].Lifetime.Km != 30 || days[0].Lifetime.Km != 35 || days[0].Lifetime.Kwh != 6 {
+		t.Fatalf("lifetime: %+v / %+v", days[0].Lifetime, days[1].Lifetime)
+	}
+}
+
+func TestAggregateDaysNewestSohWins(t *testing.T) {
+	days := aggregateDays([]ConsumptionChunk{
+		chunk("2026-10-16", 2000, 1, 1, ptr(96)),
+		chunk("2026-10-16", 1000, 1, 1, ptr(98)),
+		chunk("2026-10-17", 3000, 1, 1, nil),
+	})
+	if *days[1].SohPercent != 96 {
+		t.Fatalf("want 96, got %v", *days[1].SohPercent)
+	}
+	if days[0].SohPercent != nil {
+		t.Fatal("a day without SoH got one")
+	}
+}
+
+func TestTlmSendsFlagsAsZeroOrOne(t *testing.T) {
+	got := tlm(TelemetrySample{UTC: testNowS, Numbers: map[string]float64{"soc": 50},
+		Flags: map[string]bool{"is_charging": true, "is_parked": false}})
+	if got["utc"] != int64(testNowS) || got["soc"] != 50.0 || got["is_charging"] != 1 || got["is_parked"] != 0 {
+		t.Fatalf("tlm %+v", got)
+	}
+}
+
+func TestForwarderPicksOnlyTheNewestFreshSampleOncePerInterval(t *testing.T) {
+	f := &Forwarder{MinInterval: 5 * time.Second}
+	now := time.Unix(testNowS, 0)
+	got, ok := f.pick([]TelemetrySample{{UTC: testNowS - 10}, {UTC: testNowS - 2}, {UTC: testNowS - 5}}, now)
+	if !ok || got.UTC != testNowS-2 {
+		t.Fatalf("picked %+v %v", got, ok)
+	}
+	if _, ok := f.pick([]TelemetrySample{{UTC: testNowS}}, now.Add(time.Second)); ok {
+		t.Fatal("forwarded again within the interval")
+	}
+	if _, ok := f.pick([]TelemetrySample{{UTC: testNowS - 3}}, now.Add(time.Minute)); ok {
+		t.Fatal("forwarded an older sample than the last one")
+	}
+	// A sample from ten minutes ago describes a car that has moved on.
+	fresh := &Forwarder{MinInterval: 5 * time.Second}
+	if _, ok := fresh.pick([]TelemetrySample{{UTC: testNowS - 600}}, now); ok {
+		t.Fatal("forwarded a stale sample")
+	}
+}
+
+func TestForwarderPutsCredentialsInTheBodyNotTheURL(t *testing.T) {
+	received := make(chan *http.Request, 1)
+	var form url.Values
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		body, _ := io.ReadAll(r.Body)
+		form, _ = url.ParseQuery(string(body))
+		received <- r
+	}))
+	defer srv.Close()
+	f := &Forwarder{APIKey: "key-123", UserToken: "token-456", Endpoint: srv.URL + "/1/tlm/send"}
+	if err := f.send(t.Context(), TelemetrySample{UTC: testNowS, Numbers: map[string]float64{"soc": 80}}); err != nil {
+		t.Fatal(err)
+	}
+	r := <-received
+	if r.URL.RawQuery != "" {
+		t.Fatalf("credentials leaked into the URL: %s", r.URL.RawQuery)
+	}
+	if form.Get("api_key") != "key-123" || form.Get("token") != "token-456" || form.Get("tlm") != `{"soc":80,"utc":1790000000}` {
+		t.Fatalf("form %v", form)
+	}
+}
+
+func TestLoadConfigFailsClosed(t *testing.T) {
+	env := map[string]string{
+		"INFLUX_URL": "http://influxdb:8086", "INFLUX_TOKEN": "t", "INFLUX_ORG": "mg4",
+		"INGEST_TOKEN": "0123456789abcdef01234567",
+	}
+	get := func(k string) string { return env[k] }
+	c, err := loadConfig(get)
+	if err != nil || c.listenAddr != ":8080" || c.influxBucket != "mg4" || c.abrpMinInterval != 5*time.Second {
+		t.Fatalf("defaults: %+v %v", c, err)
+	}
+	env["INGEST_TOKEN"] = "short"
+	if _, err := loadConfig(get); err == nil {
+		t.Fatal("short ingest token accepted")
+	}
+	env["INGEST_TOKEN"] = "0123456789abcdef01234567"
+	delete(env, "INFLUX_TOKEN")
+	if _, err := loadConfig(get); err == nil {
+		t.Fatal("missing InfluxDB token accepted")
+	}
+}
diff --git a/server/main.go b/server/main.go
new file mode 100644
index 0000000..18ca0b6
--- /dev/null
+++ b/server/main.go
@@ -0,0 +1,113 @@
+// Command server is the Nils' MG4 car server: the API the car writes its telemetry,
+// consumption and charging sessions to, stored in InfluxDB 2 and forwarded live to ABRP.
+// Dashboards are Grafana's job; Grafana reads the same bucket directly.
+package main
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"log/slog"
+	"net/http"
+	"os"
+	"os/signal"
+	"strconv"
+	"syscall"
+	"time"
+)
+
+const minIngestTokenLength = 24
+
+type config struct {
+	listenAddr      string
+	influxURL       string
+	influxToken     string
+	influxOrg       string
+	influxBucket    string
+	ingestToken     string
+	abrpAPIKey      string
+	abrpUserToken   string
+	abrpMinInterval time.Duration
+}
+
+// loadConfig reads the environment and fails closed: a missing InfluxDB setting or a
+// short ingest token stops the server from starting rather than serving something broken.
+func loadConfig(getenv func(string) string) (config, error) {
+	c := config{
+		listenAddr:    getenv("LISTEN_ADDR"),
+		influxURL:     getenv("INFLUX_URL"),
+		influxToken:   getenv("INFLUX_TOKEN"),
+		influxOrg:     getenv("INFLUX_ORG"),
+		influxBucket:  getenv("INFLUX_BUCKET"),
+		ingestToken:   getenv("INGEST_TOKEN"),
+		abrpAPIKey:    getenv("ABRP_API_KEY"),
+		abrpUserToken: getenv("ABRP_USER_TOKEN"),
+	}
+	if c.listenAddr == "" {
+		c.listenAddr = ":8080"
+	}
+	if c.influxBucket == "" {
+		c.influxBucket = "mg4"
+	}
+	for name, value := range map[string]string{"INFLUX_URL": c.influxURL, "INFLUX_TOKEN": c.influxToken, "INFLUX_ORG": c.influxOrg} {
+		if value == "" {
+			return config{}, fmt.Errorf("%s is not configured", name)
+		}
+	}
+	if len(c.ingestToken) < minIngestTokenLength {
+		return config{}, fmt.Errorf("INGEST_TOKEN must be at least %d characters", minIngestTokenLength)
+	}
+	c.abrpMinInterval = 5 * time.Second
+	if raw := getenv("ABRP_MIN_INTERVAL_SECONDS"); raw != "" {
+		seconds, err := strconv.ParseFloat(raw, 64)
+		if err != nil || seconds < 0 {
+			return config{}, errors.New("ABRP_MIN_INTERVAL_SECONDS must be a non-negative number")
+		}
+		c.abrpMinInterval = time.Duration(seconds * float64(time.Second))
+	}
+	return c, nil
+}
+
+func main() {
+	slog.SetDefault(slog.New(slog.NewTextHandler(os.Stderr, nil)))
+	cfg, err := loadConfig(os.Getenv)
+	if err != nil {
+		slog.Error("invalid configuration", "error", err)
+		os.Exit(1)
+	}
+
+	store := NewInfluxStore(cfg.influxURL, cfg.influxToken, cfg.influxOrg, cfg.influxBucket)
+	defer store.Close()
+	forwarder := &Forwarder{
+		APIKey:      cfg.abrpAPIKey,
+		UserToken:   cfg.abrpUserToken,
+		MinInterval: cfg.abrpMinInterval,
+		Client:      &http.Client{Timeout: 10 * time.Second},
+	}
+	api := &API{Store: store, IngestToken: cfg.ingestToken, Forwarder: forwarder}
+
+	srv := &http.Server{
+		Addr:              cfg.listenAddr,
+		Handler:           api.Routes(),
+		ReadHeaderTimeout: 10 * time.Second,
+		ReadTimeout:       30 * time.Second,
+		WriteTimeout:      30 * time.Second,
+		IdleTimeout:       120 * time.Second,
+	}
+
+	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
+	defer stop()
+	go func() {
+		slog.Info("listening", "addr", cfg.listenAddr, "bucket", cfg.influxBucket, "abrp", forwarder.configured())
+		if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
+			slog.Error("server failed", "error", err)
+			os.Exit(1)
+		}
+	}()
+	<-ctx.Done()
+	shutdown, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	if err := srv.Shutdown(shutdown); err != nil {
+		slog.Error("shutdown", "error", err)
+	}
+}
diff --git a/server/model.go b/server/model.go
new file mode 100644
index 0000000..955f932
--- /dev/null
+++ b/server/model.go
@@ -0,0 +1,108 @@
+package main
+
+import "time"
+
+// Totals are one day's (or one chunk's) consumption counters.
+type Totals struct {
+	Km      float64 `json:"km"`
+	Kwh     float64 `json:"kwh"`
+	Hours   float64 `json:"hours"`
+	SocDrop float64 `json:"socDrop"`
+}
+
+func (t *Totals) add(o Totals) {
+	t.Km += o.Km
+	t.Kwh += o.Kwh
+	t.Hours += o.Hours
+	t.SocDrop += o.SocDrop
+}
+
+// ConsumptionChunk is one 2-minute delta of a day's consumption, as the car sends it.
+// Days are built from these when history is read.
+type ConsumptionChunk struct {
+	InstallationID string
+	Date           string // the car's local date, YYYY-MM-DD
+	RecordedAt     time.Time
+	Day            Totals
+	SohPercent     *float64
+}
+
+// DailyConsumption is a day folded from its chunks.
+type DailyConsumption struct {
+	InstallationID string    `json:"installationId"`
+	Date           string    `json:"date"`
+	RecordedAt     time.Time `json:"recordedAt"`
+	Day            Totals    `json:"day"`
+	SohPercent     *float64  `json:"sohPercent,omitempty"`
+	// Lifetime is the running total up to and including this day; not part of the
+	// car's history response, which carries one lifetime for all days.
+	Lifetime Totals `json:"-"`
+}
+
+type CurvePoint struct {
+	Timestamp  time.Time
+	PowerKw    float64
+	SocPercent *float64
+}
+
+type ChargingSession struct {
+	InstallationID      string
+	SessionID           string
+	StartedAt           time.Time
+	EndedAt             time.Time
+	DurationSeconds     float64
+	EnergyKwh           float64
+	ChargingLossPercent float64
+	GridEnergyKwh       float64
+	PricePerKwh         float64
+	TotalCost           float64
+	IsDemo              bool
+	StartSocPercent     *float64
+	EndSocPercent       *float64
+	Curve               []CurvePoint
+}
+
+// telemetryNumbers are the numeric live fields, named and unit-ed as ABRP's tlm/send
+// expects them, with the range each one must fall in.
+var telemetryNumbers = map[string][2]float64{
+	"soc":               {0, 100},        // %
+	"speed":             {0, 400},        // km/h
+	"power":             {-1000, 1000},   // kW, positive leaving the battery
+	"est_battery_range": {0, 2000},       // km
+	"capacity":          {0, 500},        // kWh
+	"soe":               {0, 500},        // kWh
+	"soh":               {0, 100},        // %
+	"kwh_charged":       {0, 1000},       // kWh, this charge session
+	"odometer":          {0, 10_000_000}, // km
+	"lat":               {-90, 90},       // °
+	"lon":               {-180, 180},     // °
+	"elevation":         {-1000, 10_000}, // m
+	"heading":           {0, 360},        // °
+	"batt_temp":         {-60, 100},      // °C
+	"cabin_temp":        {-60, 100},      // °C
+	"ext_temp":          {-60, 70},       // °C
+	"hvac_setpoint":     {0, 40},         // °C
+	"hvac_power":        {0, 50},         // kW
+	"voltage":           {0, 1500},       // V
+	"current":           {-2000, 2000},   // A
+	"tire_pressure_fl":  {0, 1000},       // kPa
+	"tire_pressure_fr":  {0, 1000},       // kPa
+	"tire_pressure_rl":  {0, 1000},       // kPa
+	"tire_pressure_rr":  {0, 1000},       // kPa
+}
+
+// telemetryFlags are the boolean live fields; ABRP takes them as 0/1.
+var telemetryFlags = []string{"is_charging", "is_dcfc", "is_parked"}
+
+// TelemetrySample is one live sample. Only UTC is always present; an unread signal is
+// absent from Numbers and Flags, never 0.
+type TelemetrySample struct {
+	UTC     int64 // epoch seconds
+	Numbers map[string]float64
+	Flags   map[string]bool
+}
+
+type TelemetryBatch struct {
+	InstallationID string
+	Samples        []TelemetrySample
+}
diff --git a/server/store.go b/server/store.go
new file mode 100644
index 0000000..9f49601
--- /dev/null
+++ b/server/store.go
@@ -0,0 +1,162 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"time"
+
+	influxdb2 "github.com/influxdata/influxdb-client-go/v2"
+	"github.com/influxdata/influxdb-client-go/v2/api"
+	"github.com/influxdata/influxdb-client-go/v2/api/write"
+)
+
+// Store is what the handlers need from the database; a fake implements it in tests.
+type Store interface {
+	WriteTelemetry(ctx context.Context, installationID string, samples []TelemetrySample) error
+	WriteConsumptionChunk(ctx context.Context, chunk ConsumptionChunk) error
+	WriteChargingSession(ctx context.Context, session ChargingSession) error
+	ReadConsumptionChunks(ctx context.Context, installationID string) ([]ConsumptionChunk, error)
+}
+
+// InfluxStore keeps everything in one InfluxDB 2 bucket; every point carries an
+// installationId tag. Grafana reads the same bucket directly.
+//
+//	telemetry          time = sample utc                  ABRP tlm fields (floats and booleans)
+//	consumption_chunk  time = recordedAt   tags: date     km, kwh, hours, socDrop, sohPercent
+//	charging_session   time = startedAt    tags: sessionId summary fields
+//	charging_curve     time = point time   tags: sessionId powerKw, socPercent
+//
+// Idempotency comes from InfluxDB itself: a point with the same measurement, tags and
+// timestamp replaces the earlier one. The car re-sends a cached chunk with its original
+// recordedAt and a session under its own id, so a retry overwrites instead of adding.
+//
+// Every number is written as a float. InfluxDB fixes a field's type on first write, so
+// a 0 written as an integer would make every later 0.5 a rejected write.
+type InfluxStore struct {
+	client influxdb2.Client
+	write  api.WriteAPIBlocking
+	query  api.QueryAPI
+	bucket string
+}
+
+const tagInstallation = "installationId"
+
+func NewInfluxStore(url, token, org, bucket string) *InfluxStore {
+	client := influxdb2.NewClientWithOptions(url, token,
+		influxdb2.DefaultOptions().SetHTTPRequestTimeout(10).SetPrecision(time.Millisecond))
+	return &InfluxStore{
+		client: client,
+		write:  client.WriteAPIBlocking(org, bucket),
+		query:  client.QueryAPI(org),
+		bucket: bucket,
+	}
+}
+
+func (s *InfluxStore) Close() { s.client.Close() }
+
+func (s *InfluxStore) WriteTelemetry(ctx context.Context, id string, samples []TelemetrySample) error {
+	points := make([]*write.Point, 0, len(samples))
+	for _, sample := range samples {
+		fields := make(map[string]any, len(sample.Numbers)+len(sample.Flags))
+		for k, v := range sample.Numbers {
+			fields[k] = v
+		}
+		for k, v := range sample.Flags {
+			fields[k] = v
+		}
+		if len(fields) == 0 {
+			// A point needs at least one field; a bare timestamp says nothing anyway.
+			continue
+		}
+		points = append(points, influxdb2.NewPoint("telemetry",
+			map[string]string{tagInstallation: id}, fields, time.Unix(sample.UTC, 0)))
+	}
+	if len(points) == 0 {
+		return nil
+	}
+	return s.write.WritePoint(ctx, points...)
+}
+
+func (s *InfluxStore) WriteConsumptionChunk(ctx context.Context, c ConsumptionChunk) error {
+	fields := map[string]any{"km": c.Day.Km, "kwh": c.Day.Kwh, "hours": c.Day.Hours, "socDrop": c.Day.SocDrop}
+	if c.SohPercent != nil {
+		fields["sohPercent"] = *c.SohPercent
+	}
+	return s.write.WritePoint(ctx, influxdb2.NewPoint("consumption_chunk",
+		map[string]string{tagInstallation: c.InstallationID, "date": c.Date}, fields, c.RecordedAt))
+}
+
+func (s *InfluxStore) WriteChargingSession(ctx context.Context, cs ChargingSession) error {
+	tags := map[string]string{tagInstallation: cs.InstallationID, "sessionId": cs.SessionID}
+	summary := map[string]any{
+		"endedAtMs":           cs.EndedAt.UnixMilli(),
+		"durationSeconds":     cs.DurationSeconds,
+		"energyKwh":           cs.EnergyKwh,
+		"chargingLossPercent": cs.ChargingLossPercent,
+		"gridEnergyKwh":       cs.GridEnergyKwh,
+		"pricePerKwh":         cs.PricePerKwh,
+		"totalCost":           cs.TotalCost,
+		"isDemo":              cs.IsDemo,
+	}
+	if cs.StartSocPercent != nil {
+		summary["startSocPercent"] = *cs.StartSocPercent
+	}
+	if cs.EndSocPercent != nil {
+		summary["endSocPercent"] = *cs.EndSocPercent
+	}
+	points := []*write.Point{influxdb2.NewPoint("charging_session", tags, summary, cs.StartedAt)}
+	for _, p := range cs.Curve {
+		fields := map[string]any{"powerKw": p.PowerKw}
+		if p.SocPercent != nil {
+			fields["socPercent"] = *p.SocPercent
+		}
+		points = append(points, influxdb2.NewPoint("charging_curve", tags, fields, p.Timestamp))
+	}
+	return s.write.WritePoint(ctx, points...)
+}
+
+// fluxString quotes a value as a Flux string literal. Ids are validated UUIDs before they
+// get here; the escaping is for the bucket name and as a second line of defence.
+func fluxString(value string) string {
+	return `"` + strings.NewReplacer(`\`, `\\`, `"`, `\"`, "$", `\$`).Replace(value) + `"`
+}
+
+func (s *InfluxStore) ReadConsumptionChunks(ctx context.Context, id string) ([]ConsumptionChunk, error) {
+	query := fmt.Sprintf(`from(bucket: %s)
+  |> range(start: 0)
+  |> filter(fn: (r) => r._measurement == "consumption_chunk" and r.installationId == %s)
+  |> pivot(rowKey: ["_time"], columnKey: ["_field"], valueColumn: "_value")`,
+		fluxString(s.bucket), fluxString(id))
+	result, err := s.query.Query(ctx, query)
+	if err != nil {
+		return nil, err
+	}
+	defer result.Close()
+	var chunks []ConsumptionChunk
+	for result.Next() {
+		r := result.Record()
+		date, _ := r.ValueByKey("date").(string)
+		chunk := ConsumptionChunk{
+			InstallationID: id,
+			Date:           date,
+			RecordedAt:     r.Time(),
+			Day: Totals{
+				Km:      floatValue(r.ValueByKey("km")),
+				Kwh:     floatValue(r.ValueByKey("kwh")),
+				Hours:   floatValue(r.ValueByKey("hours")),
+				SocDrop: floatValue(r.ValueByKey("socDrop")),
+			},
+		}
+		if soh, ok := r.ValueByKey("sohPercent").(float64); ok {
+			chunk.SohPercent = &soh
+		}
+		chunks = append(chunks, chunk)
+	}
+	return chunks, result.Err()
+}
+
+func floatValue(v any) float64 {
+	f, _ := v.(float64)
+	return f
+}
diff --git a/server/validate.go b/server/validate.go
new file mode 100644
index 0000000..146a64e
--- /dev/null
+++ b/server/validate.go
@@ -0,0 +1,327 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"math"
+	"regexp"
+	"time"
+)
+
+// Request validation for the ingest endpoints, ported rule for rule from the TypeScript
+// server. The car is the only writer and it is trusted, but a bad field is written once
+// and read forever: every number is bounded, and an out-of-range value is rejected rather
+// than stored and quietly plotted.
+
+// ValidationError is a 400: the message may name the bad field.
+type ValidationError struct{ msg string }
+
+func (e *ValidationError) Error() string { return e.msg }
+
+func invalid(format string, args ...any) error {
+	return &ValidationError{msg: fmt.Sprintf(format, args...)}
+}
+
+var (
+	uuidPattern    = regexp.MustCompile(`(?i)^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$`)
+	isoDatePattern = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}$`)
+)
+
+const (
+	maxSamples      = 500
+	maxCurvePoints  = 720
+	maxSafeInteger  = 1<<53 - 1
+	utcMin          = 1_000_000_000 // epoch seconds: 2001…
+	utcMax          = 9_999_999_999 // …2286; milliseconds would be far above
+	totalsMaxAbs    = 10_000_000
+	chargingLossPct = 10
+)
+
+// object is a decoded JSON object whose numbers stay json.Number, so integers and
+// floats can be told apart and nothing is rounded on the way in.
+type object map[string]any
+
+func decodeObject(body []byte) (object, error) {
+	dec := json.NewDecoder(bytes.NewReader(body))
+	dec.UseNumber()
+	var value any
+	if err := dec.Decode(&value); err != nil {
+		return nil, invalid("body is not valid JSON")
+	}
+	if dec.More() {
+		return nil, invalid("body is not valid JSON")
+	}
+	return asObject(value, "body")
+}
+
+func asObject(value any, name string) (object, error) {
+	o, ok := value.(map[string]any)
+	if !ok {
+		if name == "body" {
+			return nil, invalid("body is required")
+		}
+		return nil, invalid("%s is invalid", name)
+	}
+	return object(o), nil
+}
+
+func (o object) has(key string) bool {
+	v, ok := o[key]
+	return ok && v != nil
+}
+
+func number(value any, name string) (float64, error) {
+	n, ok := value.(json.Number)
+	if !ok {
+		return 0, invalid("%s is invalid", name)
+	}
+	f, err := n.Float64()
+	if err != nil || math.IsNaN(f) || math.IsInf(f, 0) {
+		return 0, invalid("%s is invalid", name)
+	}
+	return f, nil
+}
+
+func bounded(value any, min, max float64, name string) (float64, error) {
+	f, err := number(value, name)
+	if err != nil || f < min || f > max {
+		return 0, invalid("%s is invalid", name)
+	}
+	return f, nil
+}
+
+// integer accepts a whole, non-negative number up to 2^53-1 — what JavaScript and the
+// car's JSON can carry exactly.
+func integer(value any, name string) (int64, error) {
+	f, err := number(value, name)
+	if err != nil || f != math.Trunc(f) || f < 0 || f > maxSafeInteger {
+		return 0, invalid("%s is invalid", name)
+	}
+	return int64(f), nil
+}
+
+func validDate(value any, name string) (time.Time, error) {
+	ms, err := integer(value, name)
+	if err != nil {
+		return time.Time{}, err
+	}
+	return time.UnixMilli(ms).UTC(), nil
+}
+
+func validUUID(value any, name string) (string, error) {
+	s, ok := value.(string)
+	if !ok || !uuidPattern.MatchString(s) {
+		return "", invalid("%s is invalid", name)
+	}
+	return s, nil
+}
+
+func optionalBounded(o object, key string, min, max float64, name string) (*float64, error) {
+	if !o.has(key) {
+		return nil, nil
+	}
+	f, err := bounded(o[key], min, max, name)
+	if err != nil {
+		return nil, err
+	}
+	return &f, nil
+}
+
+func validTotals(value any, name string) (Totals, error) {
+	o, err := asObject(value, name)
+	if err != nil {
+		return Totals{}, err
+	}
+	var t Totals
+	for _, field := range []struct {
+		key string
+		dst *float64
+	}{{"km", &t.Km}, {"kwh", &t.Kwh}, {"hours", &t.Hours}, {"socDrop", &t.SocDrop}} {
+		f, err := number(o[field.key], name+"."+field.key)
+		if err != nil || math.Abs(f) > totalsMaxAbs {
+			return Totals{}, invalid("%s.%s is invalid", name, field.key)
+		}
+		*field.dst = f
+	}
+	return t, nil
+}
+
+func validateConsumption(body []byte) (ConsumptionChunk, error) {
+	o, err := decodeObject(body)
+	if err != nil {
+		return ConsumptionChunk{}, err
+	}
+	date, ok := o["date"].(string)
+	if !ok || !isoDatePattern.MatchString(date) {
+		return ConsumptionChunk{}, invalid("date is invalid")
+	}
+	id, err := validUUID(o["installationId"], "installationId")
+	if err != nil {
+		return ConsumptionChunk{}, err
+	}
+	recordedAt, err := validDate(o["recordedAt"], "recordedAt")
+	if err != nil {
+		return ConsumptionChunk{}, err
+	}
+	day, err := validTotals(o["day"], "day")
+	if err != nil {
+		return ConsumptionChunk{}, err
+	}
+	// A lifetime from an older app is still validated, so a malformed one is still a 400,
+	// but it is not stored: lifetime is derived from the day totals when read.
+	if o.has("lifetime") {
+		if _, err := validTotals(o["lifetime"], "lifetime"); err != nil {
+			return ConsumptionChunk{}, err
+		}
+	}
+	soh, err := optionalBounded(o, "sohPercent", 0, 100, "sohPercent")
+	if err != nil {
+		return ConsumptionChunk{}, err
+	}
+	return ConsumptionChunk{InstallationID: id, Date: date, RecordedAt: recordedAt, Day: day, SohPercent: soh}, nil
+}
+
+func validateChargingSession(body []byte, pathSessionID string) (ChargingSession, error) {
+	o, err := decodeObject(body)
+	if err != nil {
+		return ChargingSession{}, err
+	}
+	sessionID, err := validUUID(o["sessionId"], "sessionId")
+	if err != nil {
+		return ChargingSession{}, err
+	}
+	if sessionID != pathSessionID {
+		return ChargingSession{}, invalid("sessionId does not match path")
+	}
+	rawCurve, ok := o["curve"].([]any)
+	if !ok || len(rawCurve) > maxCurvePoints {
+		return ChargingSession{}, invalid("curve is invalid")
+	}
+	curve := make([]CurvePoint, 0, len(rawCurve))
+	for _, entry := range rawCurve {
+		p, err := asObject(entry, "curve")
+		if err != nil {
+			return ChargingSession{}, err
+		}
+		ts, err := validDate(p["timestampMs"], "curve.timestampMs")
+		if err != nil {
+			return ChargingSession{}, err
+		}
+		power, err := bounded(p["powerKw"], 0, 1000, "curve.powerKw")
+		if err != nil {
+			return ChargingSession{}, err
+		}
+		soc, err := optionalBounded(p, "socPercent", 0, 100, "curve.socPercent")
+		if err != nil {
+			return ChargingSession{}, err
+		}
+		curve = append(curve, CurvePoint{Timestamp: ts, PowerKw: power, SocPercent: soc})
+	}
+	s := ChargingSession{SessionID: sessionID, Curve: curve, ChargingLossPercent: chargingLossPct}
+	if s.EnergyKwh, err = bounded(o["energyKwh"], 0, 1000, "energyKwh"); err != nil {
+		return ChargingSession{}, err
+	}
+	if s.PricePerKwh, err = bounded(o["pricePerKwh"], 0, 1_000_000, "pricePerKwh"); err != nil {
+		return ChargingSession{}, err
+	}
+	if s.InstallationID, err = validUUID(o["installationId"], "installationId"); err != nil {
+		return ChargingSession{}, err
+	}
+	if s.StartedAt, err = validDate(o["startedAt"], "startedAt"); err != nil {
+		return ChargingSession{}, err
+	}
+	if s.EndedAt, err = validDate(o["endedAt"], "endedAt"); err != nil {
+		return ChargingSession{}, err
+	}
+	if s.DurationSeconds, err = bounded(o["durationSeconds"], 0, 604800, "durationSeconds"); err != nil {
+		return ChargingSession{}, err
+	}
+	if s.StartSocPercent, err = optionalBounded(o, "startSocPercent", 0, 100, "startSocPercent"); err != nil {
+		return ChargingSession{}, err
+	}
+	if s.EndSocPercent, err = optionalBounded(o, "endSocPercent", 0, 100, "endSocPercent"); err != nil {
+		return ChargingSession{}, err
+	}
+	// The car's own loss and grid figures are not trusted: the server applies its fixed 10 %.
+	s.GridEnergyKwh = s.EnergyKwh * 1.1
+	s.TotalCost = s.GridEnergyKwh * s.PricePerKwh
+	s.IsDemo = o["isDemo"] == true
+	return s, nil
+}
+
+// validateTelemetryBatch checks a batch of live samples in ABRP's tlm field names and
+// units. Unknown fields are dropped rather than rejected, so a newer app can add one
+// without a server release; every known field is bounded; a flag may be 0/1 or a boolean.
+func validateTelemetryBatch(body []byte) (TelemetryBatch, error) {
+	o, err := decodeObject(body)
+	if err != nil {
+		return TelemetryBatch{}, err
+	}
+	id, err := validUUID(o["installationId"], "installationId")
+	if err != nil {
+		return TelemetryBatch{}, err
+	}
+	raw, ok := o["samples"].([]any)
+	if !ok || len(raw) == 0 || len(raw) > maxSamples {
+		return TelemetryBatch{}, invalid("samples is invalid")
+	}
+	samples := make([]TelemetrySample, 0, len(raw))
+	for i, entry := range raw {
+		sample, err := validateSample(entry, fmt.Sprintf("samples[%d]", i))
+		if err != nil {
+			return TelemetryBatch{}, err
+		}
+		samples = append(samples, sample)
+	}
+	return TelemetryBatch{InstallationID: id, Samples: samples}, nil
+}
+
+func validateSample(entry any, name string) (TelemetrySample, error) {
+	o, err := asObject(entry, name)
+	if err != nil {
+		return TelemetrySample{}, err
+	}
+	utc, err := integer(o["utc"], name+".utc")
+	if err != nil || utc < utcMin || utc > utcMax {
+		return TelemetrySample{}, invalid("%s.utc is invalid", name)
+	}
+	sample := TelemetrySample{UTC: utc, Numbers: map[string]float64{}, Flags: map[string]bool{}}
+	for field, limits := range telemetryNumbers {
+		if !o.has(field) {
+			continue
+		}
+		f, err := bounded(o[field], limits[0], limits[1], name+"."+field)
+		if err != nil {
+			return TelemetrySample{}, err
+		}
+		sample.Numbers[field] = f
+	}
+	for _, field := range telemetryFlags {
+		if !o.has(field) {
+			continue
+		}
+		switch v := o[field].(type) {
+		case bool:
+			sample.Flags[field] = v
+		case json.Number:
+			switch v.String() {
+			case "1":
+				sample.Flags[field] = true
+			case "0":
+				sample.Flags[field] = false
+			default:
+				return TelemetrySample{}, invalid("%s.%s is invalid", name, field)
+			}
+		default:
+			return TelemetrySample{}, invalid("%s.%s is invalid", name, field)
+		}
+	}
+	// A position is only a position as a pair.
+	_, hasLat := sample.Numbers["lat"]
+	_, hasLon := sample.Numbers["lon"]
+	if hasLat != hasLon {
+		return TelemetrySample{}, invalid("%s.lat and lon must be sent together", name)
+	}
+	return sample, nil
+}
diff --git a/server/validate_test.go b/server/validate_test.go
new file mode 100644
index 0000000..baead87
--- /dev/null
+++ b/server/validate_test.go
@@ -0,0 +1,185 @@
+package main
+
+import (
+	"errors"
+	"strings"
+	"testing"
+)
+
+const (
+	testInstallation = "6f1a2b3c-4d5e-4f60-8a9b-0c1d2e3f4a5b"
+	testSession      = "11111111-2222-4333-8444-555555555555"
+	testNowS         = 1_790_000_000
+)
+
+func isValidationError(err error) bool {
+	var v *ValidationError
+	return errors.As(err, &v)
+}
+
+func TestConsumptionAcceptsAWellFormedChunk(t *testing.T) {
+	c, err := validateConsumption([]byte(`{"installationId":"` + testInstallation + `","date":"2026-10-07",
+		"recordedAt":1760000000000,"day":{"km":42.5,"kwh":7.25,"hours":0.9,"socDrop":11.5},
+		"lifetime":{"km":12000,"kwh":2100,"hours":240,"socDrop":3400},"sohPercent":97.5}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if c.Date != "2026-10-07" || c.Day.Kwh != 7.25 || c.RecordedAt.UnixMilli() != 1760000000000 || *c.SohPercent != 97.5 {
+		t.Fatalf("unexpected chunk %+v", c)
+	}
+}
+
+func TestConsumptionMissingSohIsOmittedNotDefaulted(t *testing.T) {
+	// The car omits a field it could not read. Writing 0 would be a battery at nothing.
+	c, err := validateConsumption([]byte(`{"installationId":"` + testInstallation + `","date":"2026-10-07",
+		"recordedAt":1,"day":{"km":1,"kwh":1,"hours":1,"socDrop":1}}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if c.SohPercent != nil {
+		t.Fatalf("SoH should be absent, got %v", *c.SohPercent)
+	}
+}
+
+func TestConsumptionRejectsBadInput(t *testing.T) {
+	base := map[string]string{
+		"installationId": `"` + testInstallation + `"`, "date": `"2026-10-07"`, "recordedAt": "1",
+		"day": `{"km":1,"kwh":1,"hours":1,"socDrop":1}`,
+	}
+	cases := map[string][2]string{
+		"bad id":             {"installationId", `"nope"`},
+		"german date":        {"date", `"07.10.2026"`},
+		"negative timestamp": {"recordedAt", "-5"},
+		"fractional time":    {"recordedAt", "1.5"},
+		"string number":      {"day", `{"km":"1","kwh":1,"hours":1,"socDrop":1}`},
+		"huge totals":        {"day", `{"km":1e9,"kwh":1,"hours":1,"socDrop":1}`},
+		"missing field":      {"day", `{"km":1,"kwh":1,"hours":1}`},
+		"bad lifetime":       {"lifetime", `{"km":1}`},
+		"soh above 100":      {"sohPercent", "101"},
+	}
+	for name, change := range cases {
+		fields := map[string]string{}
+		for k, v := range base {
+			fields[k] = v
+		}
+		fields[change[0]] = change[1]
+		var parts []string
+		for k, v := range fields {
+			parts = append(parts, `"`+k+`":`+v)
+		}
+		if _, err := validateConsumption([]byte("{" + strings.Join(parts, ",") + "}")); !isValidationError(err) {
+			t.Errorf("%s: want ValidationError, got %v", name, err)
+		}
+	}
+	for _, body := range []string{"", "[]", "null", "{", `{"a":1}{"b":2}`} {
+		if _, err := validateConsumption([]byte(body)); !isValidationError(err) {
+			t.Errorf("body %q: want ValidationError, got %v", body, err)
+		}
+	}
+}
+
+func chargingBody(overrides string) []byte {
+	return []byte(`{"installationId":"` + testInstallation + `","sessionId":"` + testSession + `",
+		"startedAt":1760500000000,"endedAt":1760501800000,"durationSeconds":1800,"energyKwh":30,
+		"pricePerKwh":0.59,"startSocPercent":20,"endSocPercent":80,
+		"curve":[{"timestampMs":1760500060000,"powerKw":95,"socPercent":21},{"timestampMs":1760500120000,"powerKw":110}]` +
+		overrides + `}`)
+}
+
+func TestChargingSessionAppliesTheServersLossAndCost(t *testing.T) {
+	// The car's own grid and cost figures are not trusted; the server applies 10 % loss.
+	s, err := validateChargingSession(chargingBody(`,"gridEnergyKwh":1,"totalCost":1`), testSession)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if s.GridEnergyKwh != 33 || s.TotalCost != 33*0.59 || s.ChargingLossPercent != 10 {
+		t.Fatalf("grid %v cost %v loss %v", s.GridEnergyKwh, s.TotalCost, s.ChargingLossPercent)
+	}
+	if len(s.Curve) != 2 || s.Curve[1].SocPercent != nil || *s.Curve[0].SocPercent != 21 {
+		t.Fatalf("curve not kept as sent: %+v", s.Curve)
+	}
+}
+
+func TestChargingSessionMustMatchItsPath(t *testing.T) {
+	if _, err := validateChargingSession(chargingBody(""), "22222222-2222-4333-8444-555555555555"); !isValidationError(err) {
+		t.Fatalf("want ValidationError, got %v", err)
+	}
+}
+
+func TestChargingSessionRejectsOversizedCurvesAndBadPoints(t *testing.T) {
+	points := strings.Repeat(`{"timestampMs":1,"powerKw":1},`, 721)
+	long := []byte(`{"installationId":"` + testInstallation + `","sessionId":"` + testSession + `","curve":[` +
+		strings.TrimSuffix(points, ",") + `]}`)
+	if _, err := validateChargingSession(long, testSession); !isValidationError(err) {
+		t.Errorf("721 points: want ValidationError, got %v", err)
+	}
+	bad := []byte(strings.Replace(string(chargingBody("")), `"powerKw":95`, `"powerKw":-5`, 1))
+	if _, err := validateChargingSession(bad, testSession); !isValidationError(err) {
+		t.Errorf("negative power: want ValidationError, got %v", err)
+	}
+}
+
+func telemetryBody(samples string) []byte {
+	return []byte(`{"installationId":"` + testInstallation + `","samples":[` + samples + `]}`)
+}
+
+func TestTelemetryKeepsOnlyWhatWasSent(t *testing.T) {
+	b, err := validateTelemetryBatch(telemetryBody(
+		`{"utc":1790000000,"soc":81,"power":-12.5,"speed":0,"lat":52.1,"lon":7.6,"is_charging":1,"is_dcfc":false}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+	s := b.Samples[0]
+	if s.UTC != testNowS || s.Numbers["soc"] != 81 || s.Numbers["power"] != -12.5 || s.Numbers["lat"] != 52.1 {
+		t.Fatalf("numbers %+v", s.Numbers)
+	}
+	if v, ok := s.Numbers["speed"]; !ok || v != 0 {
+		t.Fatal("a real 0 must be kept")
+	}
+	if s.Flags["is_charging"] != true || s.Flags["is_dcfc"] != false || len(s.Flags) != 2 {
+		t.Fatalf("flags %+v", s.Flags)
+	}
+	// An unread signal stays absent: a missing SOC must never become 0.
+	if _, ok := s.Numbers["est_battery_range"]; ok {
+		t.Fatal("absent field invented")
+	}
+}
+
+func TestTelemetryDropsUnknownFields(t *testing.T) {
+	b, err := validateTelemetryBatch(telemetryBody(`{"utc":1790000000,"future_field":3}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(b.Samples[0].Numbers) != 0 || len(b.Samples[0].Flags) != 0 {
+		t.Fatalf("unknown field kept: %+v", b.Samples[0])
+	}
+}
+
+func TestTelemetryRejectsBadSamples(t *testing.T) {
+	for name, sample := range map[string]string{
+		"milliseconds":   `{"utc":1790000000000}`,
+		"fractional utc": `{"utc":1790000000.5}`,
+		"soc above 100":  `{"utc":1790000000,"soc":101}`,
+		"string speed":   `{"utc":1790000000,"speed":"fast"}`,
+		"flag 2":         `{"utc":1790000000,"is_parked":2}`,
+		"half position":  `{"utc":1790000000,"lat":52.1}`,
+		"not an object":  `5`,
+	} {
+		if _, err := validateTelemetryBatch(telemetryBody(sample)); !isValidationError(err) {
+			t.Errorf("%s: want ValidationError, got %v", name, err)
+		}
+	}
+}
+
+func TestTelemetryRejectsEmptyAndOversizedBatches(t *testing.T) {
+	if _, err := validateTelemetryBatch(telemetryBody("")); !isValidationError(err) {
+		t.Error("empty batch accepted")
+	}
+	many := strings.TrimSuffix(strings.Repeat(`{"utc":1790000000},`, 501), ",")
+	if _, err := validateTelemetryBatch(telemetryBody(many)); !isValidationError(err) {
+		t.Error("501 samples accepted")
+	}
+	if _, err := validateTelemetryBatch([]byte(`{"installationId":"nope","samples":[{"utc":1790000000}]}`)); !isValidationError(err) {
+		t.Error("bad installation id accepted")
+	}
+}
diff --git a/web/.dockerignore b/web/.dockerignore
deleted file mode 100644
index 6614541..0000000
--- a/web/.dockerignore
+++ /dev/null
@@ -1,7 +0,0 @@
-node_modules
-.next
-.env*
-!.env.example
-*.tsbuildinfo
-Dockerfile
-.dockerignore
diff --git a/web/.env.example b/web/.env.example
deleted file mode 100644
index 1a81b62..0000000
--- a/web/.env.example
+++ /dev/null
@@ -1,18 +0,0 @@
-# InfluxDB 2 — a token with read/write on the bucket.
-INFLUX_URL=http://influxdb:8086
-INFLUX_TOKEN=replace-with-an-influxdb-token
-INFLUX_ORG=mg4
-INFLUX_BUCKET=mg4
-
-# The car's write token (at least 24 characters): openssl rand -hex 32
-INGEST_TOKEN=replace-with-a-long-random-write-token
-# Signs dashboard sessions; rotating it signs every browser out: openssl rand -hex 32
-SESSION_SECRET=replace-with-a-long-random-session-secret
-# Dashboard login, at least 8 characters.
-DASHBOARD_PASSWORD=replace-with-a-strong-dashboard-password
-
-# ABRP forwarding; off when either is empty.
-ABRP_API_KEY=
-ABRP_USER_TOKEN=
-# Minimum seconds between two samples forwarded to ABRP.
-ABRP_MIN_INTERVAL_SECONDS=5
diff --git a/web/.gitignore b/web/.gitignore
deleted file mode 100644
index 27dfd45..0000000
--- a/web/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-node_modules
-.next
-# Every .env variant is secret except the committed template.
-.env*
-!.env.example
-next-env.d.ts
-*.tsbuildinfo
diff --git a/web/Dockerfile b/web/Dockerfile
deleted file mode 100644
index 22663d7..0000000
--- a/web/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Self-hosted image of the car server: Next.js standalone output on Node 22.
-# Configuration comes entirely from the environment at runtime (see .env.example);
-# nothing secret is baked in.
-
-FROM node:22-alpine AS deps
-WORKDIR /app
-COPY package.json package-lock.json ./
-RUN npm ci --no-audit --no-fund
-
-FROM node:22-alpine AS build
-WORKDIR /app
-ENV NEXT_TELEMETRY_DISABLED=1
-COPY --from=deps /app/node_modules ./node_modules
-COPY . .
-RUN npm test && npm run build
-
-FROM node:22-alpine
-WORKDIR /app
-ENV NODE_ENV=production \
-    NEXT_TELEMETRY_DISABLED=1 \
-    PORT=3000 \
-    HOSTNAME=0.0.0.0
-COPY --from=build --chown=10001:10001 /app/.next/standalone ./
-COPY --from=build --chown=10001:10001 /app/.next/static ./.next/static
-USER 10001:10001
-EXPOSE 3000
-CMD ["node", "server.js"]
diff --git a/web/README.md b/web/README.md
deleted file mode 100644
index 71ce266..0000000
--- a/web/README.md
+++ /dev/null
@@ -1,88 +0,0 @@
-# Nils' MG4 — car server
-
-Next.js app, self-hosted at car.stinnesbeck.com: the ingest API the car writes to, the ABRP
-forwarder, and a phone-shaped dashboard for reading the history back. Data lives in
-InfluxDB 2. Based on upstream's Vercel/MongoDB app in fatihdonmezdev/FatihsMG4.
-
-```
-car ──live telemetry───▶ server ──▶ ABRP  api.iternio.com/1/tlm/send
-    ──daily chunks─────▶   │
-    ──charging sessions▶   ▼
-                       InfluxDB 2
-```
-
-## Credentials
-
-| | Who holds it | What it opens |
-|---|---|---|
-| `INGEST_TOKEN` | the car, entered in the app | the write endpoints, and the car's own history read |
-| `DASHBOARD_PASSWORD` | you, in a browser | the dashboard and the `GET /v1/history` reads |
-| `ABRP_API_KEY`, `ABRP_USER_TOKEN` | only the server | forwarding live telemetry to ABRP |
-
-The ABRP credentials never reach the car. A missing or empty one switches forwarding off.
-
-## Environment variables
-
-See `.env.example`. In Kubernetes they come from the Secret in `../k8s/`.
-
-| Name | Notes |
-|---|---|
-| `INFLUX_URL`, `INFLUX_TOKEN`, `INFLUX_ORG`, `INFLUX_BUCKET` | bucket defaults to `mg4`; the token needs read/write on it |
-| `INGEST_TOKEN` | at least 24 characters, or every write is refused: `openssl rand -hex 32` |
-| `DASHBOARD_PASSWORD` | at least 8 characters, or login is refused outright |
-| `SESSION_SECRET` | `openssl rand -hex 32`; rotating it signs every browser out |
-| `ABRP_API_KEY`, `ABRP_USER_TOKEN` | optional; both needed to forward |
-| `ABRP_MIN_INTERVAL_SECONDS` | default 5 |
-
-## Endpoints
-
-Write, `Authorization: Bearer <INGEST_TOKEN>`:
-
-- `POST /v1/telemetry` — `{ installationId, samples: [...] }`, up to 500 samples in ABRP's `tlm`
-  field names and units (`utc` in epoch seconds; flags as 0/1 or booleans). Stored, then the
-  newest sample is forwarded to ABRP if it is under 5 minutes old.
-- `PUT /v1/consumption/daily` — one delta chunk of a day's consumption.
-- `PUT /v1/charging-sessions/:sessionId`
-
-Read:
-
-- `GET /v1/consumption/history/:installationId` — ingest token; the car reads its own totals back.
-- `GET /v1/history/:installationId/consumption`, `.../charging` — session cookie or
-  `Authorization: Bearer <DASHBOARD_PASSWORD>`.
-
-`GET /v1/health` is unauthenticated and returns `{"status":"ok"}`.
-
-## Storage
-
-One bucket, `installationId` tag on every point:
-
-| Measurement | Timestamp | Tags | Fields |
-|---|---|---|---|
-| `telemetry` | sample `utc` | — | the ABRP fields that were sent |
-| `consumption_chunk` | `recordedAt` | `date` | km, kwh, hours, socDrop, sohPercent |
-| `charging_session` | `startedAt` | `sessionId` | endedAtMs, duration, energy, cost, start/end SOC |
-| `charging_curve` | point time | `sessionId` | powerKw, socPercent |
-
-A point with the same measurement, tags and timestamp replaces the earlier one, so the car's
-retries are idempotent: a cached chunk is re-sent with its original `recordedAt`. Days and the
-lifetime total are summed from the chunks when read. All numbers are written as floats, because
-InfluxDB fixes a field's type on first write.
-
-## Local development
-
-```sh
-nix develop                  # from the repository root: Node 22 and InfluxDB 2
-cp .env.example .env.local   # Next loads .env.local automatically
-npm install
-npm run dev
-npm test                     # validation, aggregation and forwarding rules; no database
-```
-
-## Container image
-
-```sh
-podman build -t git.stinnesbeck.com/nils/mg4-server:<version> .
-podman push git.stinnesbeck.com/nils/mg4-server:<version>
-```
-
-The build runs the unit tests. The image runs as UID 10001 and listens on port 3000.
diff --git a/web/next.config.mjs b/web/next.config.mjs
deleted file mode 100644
index 7bd72cb..0000000
--- a/web/next.config.mjs
+++ /dev/null
@@ -1,8 +0,0 @@
-/** @type {import('next').NextConfig} */
-const nextConfig = {
-  // A self-contained server in .next/standalone, for the container image.
-  output: "standalone",
-  // Every page reads live telemetry; a cached shell would show yesterday's drive.
-  experimental: { serverActions: { bodySizeLimit: "1mb" } },
-};
-export default nextConfig;
diff --git a/web/package-lock.json b/web/package-lock.json
deleted file mode 100644
index 88db69d..0000000
--- a/web/package-lock.json
+++ /dev/null
@@ -1,1002 +0,0 @@
-{
-  "name": "nilsmg4-web",
-  "version": "1.1.2",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "nilsmg4-web",
-      "version": "1.1.2",
-      "dependencies": {
-        "@influxdata/influxdb-client": "^1.35.0",
-        "next": "^15.5.4",
-        "react": "^19.1.0",
-        "react-dom": "^19.1.0"
-      },
-      "devDependencies": {
-        "@types/node": "^22.15.3",
-        "@types/react": "^19.1.2",
-        "typescript": "^5.8.3"
-      },
-      "engines": {
-        "node": ">=22"
-      }
-    },
-    "node_modules/@emnapi/runtime": {
-      "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.3.tgz",
-      "integrity": "sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@img/colour": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.1.0.tgz",
-      "integrity": "sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==",
-      "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@img/sharp-darwin-arm64": {
-      "version": "0.35.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.35.5.tgz",
-      "integrity": "sha512-QRUlFQ0WxvdWyqqG/WtI3iupfD5rBzmCHXSdPsY91sAtVtTo7Q4cb6zOccZ3gqEqkr0f1As1ehLqmEpDsRf+lg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-darwin-arm64": "1.3.4"
-      }
-    },
-    "node_modules/@img/sharp-darwin-x64": {
-      "version": "0.35.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.35.5.tgz",
-      "integrity": "sha512-+BR255RhDlpygUpOc/Jdt1nT6DQ3XG/ERo5wbcdOf5Q320dKtPCKPLR1LJs9VGXRaMa8l1uUa0tkCNOXiAxZUw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-darwin-x64": "1.3.4"
-      }
-    },
-    "node_modules/@img/sharp-freebsd-wasm32": {
-      "version": "0.35.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-freebsd-wasm32/-/sharp-freebsd-wasm32-0.35.5.tgz",
-      "integrity": "sha512-Y/z91nEZ4uIBX5X3nfTovjU9lHNKFYbL2lpHCLVNmXQK03VIZvXBBt0KxbPGp2SdGSF+2mQU4e+hQaWOt86iAw==",
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "dependencies": {
-        "@img/sharp-wasm32": "0.35.5"
-      },
-      "engines": {
-        "node": ">=20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-darwin-arm64": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.3.4.tgz",
-      "integrity": "sha512-5R89nBYiRdUlSWJxPhO+GVtaXzXSxKnRu/xqMn3KTA3L9EB9Oy/P+Nn2f2vlhPuUdy/Zusb2DarbyTpGCfEDuw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-darwin-x64": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.3.4.tgz",
-      "integrity": "sha512-iR2OKH80yi0U+dUplyh3/xdpFvps6YkCwsXenIJxqxR1v9o+xtKTGbS9H7cps+2Vxjc8B1j96p75NmTGjIhtpQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linux-arm": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.3.4.tgz",
-      "integrity": "sha512-LmRtTsOHuvM2+wlO2Db37dx5MiZhB0FvSunciw48YjdOkZz9KAiRbm8ujeMOA1INqmei5NapFxYEK1D1ZSidmw==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linux-arm64": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.3.4.tgz",
-      "integrity": "sha512-Y3dgX/6lE2QhQb+Gxy0WZxfg9MEm/JBjamZpS2IklP7xIQoKN4hzAm7KcMVGtaVDt3neE9OKBC7vAfonA/Lr1A==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linux-ppc64": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.3.4.tgz",
-      "integrity": "sha512-Le6boB8Tai0Nis+gIxIpKx68UDVVIqdR8Tin5Yf1z2LJJQLDJvCDRqRu+jC2qCoD+eIomonmOwB4smBRxfVpYQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linux-riscv64": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-riscv64/-/sharp-libvips-linux-riscv64-1.3.4.tgz",
-      "integrity": "sha512-aHkkIEHPRdQEegJN20MLmGtxYD9R2wQr3Cwpddnu5+YKMt6Uzax7S9h5gpZTo8wyrGuZSlfQ63OevL5mTyOC7Q==",
-      "cpu": [
-        "riscv64"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linux-s390x": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.3.4.tgz",
-      "integrity": "sha512-ra/mB6MikESDUO7Yg+Mi95bFBb9GsObURuhnOv3OqknjGe9sZrG8tCe9q0xSIGrtLgvgw0gKnFWcK4blSgQOuQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linux-x64": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.3.4.tgz",
-      "integrity": "sha512-GJ//SSXbnwSDes02umB3nDJLFcQzw8a18V8fyhqr6tV515tOEMdImjjxj1AoafMRz56F3PHgftnj1QEKSU1zkw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linuxmusl-arm64": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.3.4.tgz",
-      "integrity": "sha512-hvulFwtjUcagsis6BBxHwGFwWoNZjgYmULGVrZcyfNbjA8hKILbRxGg15/7w5HDyXHXUos/j6baAWqnCyQ2DWA==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linuxmusl-x64": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.3.4.tgz",
-      "integrity": "sha512-6zXKeE/p39I1AmA3cJG35eyBGNqNddLnUXjhwBnsGjFPWqf5VKkDBEqaEkPDoTEtkxwi2vv8Tcr2mDyP4So7Fg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-linux-arm": {
-      "version": "0.35.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.35.5.tgz",
-      "integrity": "sha512-LEaXK2WdXVK5ykcw0buWyPMsmLLL2vpHLD6yrNSW+JGEL3BZPA4tpKN6iaMc4AxTTAoaX/sU1rOL51lcIz48ZQ==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-arm": "1.3.4"
-      }
-    },
-    "node_modules/@img/sharp-linux-arm64": {
-      "version": "0.35.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.35.5.tgz",
-      "integrity": "sha512-LYVx5JTsOM2CBzmxreh+nl64/3H6Xb09iSLknqH47z2T2DFFxDeFLP5y4dJwe6H7uGQlHPyEEtIqyo3DYsRwdQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-arm64": "1.3.4"
-      }
-    },
-    "node_modules/@img/sharp-linux-ppc64": {
-      "version": "0.35.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.35.5.tgz",
-      "integrity": "sha512-QVxAAq8evVRI9ia2vqgwrmWucn5Dfv+JdWzj75pD8omHLPSP7f8p20O8jxzjCcuCEQEOtYOZUmX1hkiZ0kdevA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-ppc64": "1.3.4"
-      }
-    },
-    "node_modules/@img/sharp-linux-riscv64": {
-      "version": "0.35.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-riscv64/-/sharp-linux-riscv64-0.35.5.tgz",
-      "integrity": "sha512-LtdreXguaavKODPIfzJ4kffx7UNt1omwtK0rch4EBbbSTXPnxWmYSayXdLJw0fJzQ97kHt1gL/yh4tvU+nCyRQ==",
-      "cpu": [
-        "riscv64"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-riscv64": "1.3.4"
-      }
-    },
-    "node_modules/@img/sharp-linux-s390x": {
-      "version": "0.35.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.35.5.tgz",
-      "integrity": "sha512-UZasTOFiYzotTsGOCu42BfUzP6Tu6Do/947iRm1RsLKvlllxwGcn4RN27LibGWceix4Y+Pmw3jsnTcCQIgWjqA==",
-      "cpu": [
-        "s390x"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-s390x": "1.3.4"
-      }
-    },
-    "node_modules/@img/sharp-linux-x64": {
-      "version": "0.35.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.35.5.tgz",
-      "integrity": "sha512-SxFtLTeJInhAA9Q836kux2vZNeOBQEx658qvbboZScr0wIARym3IcGmW7KpVD5sbVg0Ojy+udFQdayYIZyoNog==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-x64": "1.3.4"
-      }
-    },
-    "node_modules/@img/sharp-linuxmusl-arm64": {
-      "version": "0.35.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.35.5.tgz",
-      "integrity": "sha512-9HbMclmI1zlNkFRs3z9/eBtDjfD0sGlrX1z6b1qwmiFY5ElDLh4BC0LPBdVp7z1DXFiKlIcznf+ZlsuZzLxQqg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linuxmusl-arm64": "1.3.4"
-      }
-    },
-    "node_modules/@img/sharp-linuxmusl-x64": {
-      "version": "0.35.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.35.5.tgz",
-      "integrity": "sha512-4KOphqB035HrVdqLZfCgMzzERrQkkzOwRhl4OAkRO1YCldbaFjySXMaK534Mo0V+LndnlJk+sbUyLeU0ULyD1A==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linuxmusl-x64": "1.3.4"
-      }
-    },
-    "node_modules/@img/sharp-wasm32": {
-      "version": "0.35.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.35.5.tgz",
-      "integrity": "sha512-Ptsga1su4tQx+LLF1ECS9U6nz5kmrXKo6XVbtR48Ke3ZRxxgaWBu7IDtEe1quo8hiupwm6WFqxVlXaSf7IINGQ==",
-      "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/runtime": "^1.11.3"
-      },
-      "engines": {
-        "node": ">=20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-webcontainers-wasm32": {
-      "version": "0.35.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-webcontainers-wasm32/-/sharp-webcontainers-wasm32-0.35.5.tgz",
-      "integrity": "sha512-hfhF/FmoQyTUkA0bIKFOtw536BQSeBMe6BF6QyWlrPxT754+TFLaZ7sKKTfvvM0yJgKgaYTwnFCIZ/GuDw5SUA==",
-      "cpu": [
-        "wasm32"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "dependencies": {
-        "@img/sharp-wasm32": "0.35.5"
-      },
-      "engines": {
-        "node": ">=20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-win32-arm64": {
-      "version": "0.35.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.35.5.tgz",
-      "integrity": "sha512-X4t7g+7ZA5DKblCBEXGjUqqemj4vczING/5viFwAL8h4N3qYeyjwdCvRLHi4EdOUI+2Z7UFlp1VM+p/AuEtm6Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "Apache-2.0 AND LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-win32-ia32": {
-      "version": "0.35.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.35.5.tgz",
-      "integrity": "sha512-5Zm82LoBc43nhwNybZlG7Y1KO//Zhsn306fQl29ZOuStHLGTo3BWL83q3cznX0poxSAMuYL1On/BHBxkBeKr6A==",
-      "cpu": [
-        "ia32"
-      ],
-      "license": "Apache-2.0 AND LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": "^20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-win32-x64": {
-      "version": "0.35.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.35.5.tgz",
-      "integrity": "sha512-x76eH0vEiHlcMQu8Y8IenntaACtddpT6W0wmXtWrnKcnKI7ME5DdgqhAD6SEWOEl1v2zDvkZDhFA9KnURwpfqg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "Apache-2.0 AND LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@influxdata/influxdb-client": {
-      "version": "1.35.0",
-      "resolved": "https://registry.npmjs.org/@influxdata/influxdb-client/-/influxdb-client-1.35.0.tgz",
-      "integrity": "sha512-woWMi8PDpPQpvTsRaUw4Ig+nOGS/CWwAwS66Fa1Vr/EkW+NEwxI8YfPBsdBMn33jK2Y86/qMiiuX/ROHIkJLTw==",
-      "license": "MIT"
-    },
-    "node_modules/@next/env": {
-      "version": "15.5.27",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-15.5.27.tgz",
-      "integrity": "sha512-WC5hvVqiuFOcRyz6gKPeJkiVvSMf3scNeAV49CdWtVqxmUlzh8UKR6YHt9yiNkh8LngtzqSlVz07/Ma3ZAzchA==",
-      "license": "MIT"
-    },
-    "node_modules/@next/swc-darwin-arm64": {
-      "version": "15.5.27",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.27.tgz",
-      "integrity": "sha512-fBA9QurmK4+uj4wNhmRTuO5zMVRaBHCvp6H93zTG/5i6Yi6TewbvbesXB8YQNj8T99Cwrow87hHiFV6wL/hyMA==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-darwin-x64": {
-      "version": "15.5.27",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.5.27.tgz",
-      "integrity": "sha512-FGZwJwry8qZNHxD/nfwrCwCHHrqx6epqItkkxbYcBQEQ2uw5S43bY83fQB5zbAsZE7TELMjoYkbhsQ4oKM7wwg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "15.5.27",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.5.27.tgz",
-      "integrity": "sha512-GQulAaJYNF1RYuatlsw9/uzbKz4if2V7Ic9nVO+P0ljYPm4yBRTFIl6g5YkKTw40lMLbpy9edLoH44g3jSHMYA==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "15.5.27",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.5.27.tgz",
-      "integrity": "sha512-URFFsUmu8Pi0/1qdnUI7tx7keZw1Mt5zHfrIX1RfDG9Nih8DYxK54WZsDJUX2ZTlii1jgotL7qcbwKnSAES6xQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "15.5.27",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.5.27.tgz",
-      "integrity": "sha512-aJp74z7uvU5jQhyH7lyk+4qSRcTdKbKT9NQE3jiO9kWYkoHZjKi0zzHDbCoZ+v2sJDEiJ/z58R0UlWMGWNF3HA==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-x64-musl": {
-      "version": "15.5.27",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.5.27.tgz",
-      "integrity": "sha512-ILl2bQ8MbpvyMpY8AXljb3BXs0MJSC8HXZ6QV5AWpVS7ZELqNPtrHvhUk+SNarvjvICXX8bCS287TCi+gUFVYg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "15.5.27",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.5.27.tgz",
-      "integrity": "sha512-1MB9Rh5y8TOPN2x7naNTJNkCZQav9c70AI7EBYXxsEewwOffC4DjjwBwKf20NBvcA+u+5jDv7nVmHxunlP2d7Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "15.5.27",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.27.tgz",
-      "integrity": "sha512-XtYgpGOswgnyBWXzOEG6q9RhvnSw0CEZ0MbWqCsl5PISgt9EzvJvNW5mU5n1PsphX/lnamzxjgQXH2GUJL8nqg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@swc/helpers": {
-      "version": "0.5.15",
-      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.15.tgz",
-      "integrity": "sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.8.0"
-      }
-    },
-    "node_modules/@types/node": {
-      "version": "22.20.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.20.5.tgz",
-      "integrity": "sha512-U2+DNr+wSjpsTS/wZGYHq7GcwfuSmKiKvoPvK22zwTlRhU91yOniN4qRR5KhIjvif7ysw/dz/hKmfDH0Ris4aA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.21.0"
-      }
-    },
-    "node_modules/@types/react": {
-      "version": "19.3.0",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.3.0.tgz",
-      "integrity": "sha512-N0rFCuH9YoxG9/m61l9MfpJKfmLOVU0em7ipIz6TRgSSkvReLB9vL85GB+yr8Bs5leqpvg96JSwF4ZS1s4viQg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "csstype": "^3.2.2"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001815",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001815.tgz",
-      "integrity": "sha512-uDybUEyfgbyJJ93J1vikTylBX31AkdVYeVPeffMQpf8XN7hSfr0oZOn4VFOIMNvtU5+rHvC5Udg2TgtJKHm23Q==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "CC-BY-4.0"
-    },
-    "node_modules/client-only": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz",
-      "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==",
-      "license": "MIT"
-    },
-    "node_modules/csstype": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
-      "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/detect-libc": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
-      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
-      "license": "Apache-2.0",
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.20",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.20.tgz",
-      "integrity": "sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/next": {
-      "version": "15.5.27",
-      "resolved": "https://registry.npmjs.org/next/-/next-15.5.27.tgz",
-      "integrity": "sha512-F82CrlPZ8GRxBH9RIIoR3qU1t5RT3dv1K8moe8SjlDEquiFipvEI13R1Om90TaUOEwShkWCMlg8+gvTNzfMhvg==",
-      "license": "MIT",
-      "dependencies": {
-        "@next/env": "15.5.27",
-        "@swc/helpers": "0.5.15",
-        "caniuse-lite": "^1.0.30001579",
-        "postcss": "8.4.31",
-        "styled-jsx": "5.1.6"
-      },
-      "bin": {
-        "next": "dist/bin/next"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^19.8.0 || >= 20.0.0"
-      },
-      "optionalDependencies": {
-        "@next/swc-darwin-arm64": "15.5.27",
-        "@next/swc-darwin-x64": "15.5.27",
-        "@next/swc-linux-arm64-gnu": "15.5.27",
-        "@next/swc-linux-arm64-musl": "15.5.27",
-        "@next/swc-linux-x64-gnu": "15.5.27",
-        "@next/swc-linux-x64-musl": "15.5.27",
-        "@next/swc-win32-arm64-msvc": "15.5.27",
-        "@next/swc-win32-x64-msvc": "15.5.27",
-        "sharp": "^0.34.3 || ^0.35.4"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.1.0",
-        "@playwright/test": "^1.51.1",
-        "babel-plugin-react-compiler": "*",
-        "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0",
-        "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0",
-        "sass": "^1.3.0"
-      },
-      "peerDependenciesMeta": {
-        "@opentelemetry/api": {
-          "optional": true
-        },
-        "@playwright/test": {
-          "optional": true
-        },
-        "babel-plugin-react-compiler": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/picocolors": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "license": "ISC"
-    },
-    "node_modules/postcss": {
-      "version": "8.4.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "nanoid": "^3.3.6",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/react": {
-      "version": "19.3.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.3.0.tgz",
-      "integrity": "sha512-E8LUcbtBWt20bbl2YoHfx4ZDBdxVTfOKtCZn9cDSJ4l6/nuoApcpIBcj47t2wZoVX8g2ZHuMHbiShgCR1T5Sog==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dom": {
-      "version": "19.3.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.3.0.tgz",
-      "integrity": "sha512-JDk8dgif51OjFoDE70+OT9ICyYr+69HlmihNwp1+Nsfbna3t5sIiCa9ZJktDmQ4/1b/rn26hIAR2uYXDMr5r0Q==",
-      "license": "MIT",
-      "dependencies": {
-        "scheduler": "^0.28.0"
-      },
-      "peerDependencies": {
-        "react": "^19.3.0"
-      }
-    },
-    "node_modules/scheduler": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.28.0.tgz",
-      "integrity": "sha512-juorfCmIkIw8tT+p5BXSm6PJjQF/ycEYmKyzURCIt/RaZIhL+PulbQ9Yu2z1HdOJDdqDTlxA1+xKBmHXJsczAw==",
-      "license": "MIT"
-    },
-    "node_modules/semver": {
-      "version": "7.8.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
-      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
-      "license": "ISC",
-      "optional": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/sharp": {
-      "version": "0.35.5",
-      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.35.5.tgz",
-      "integrity": "sha512-Ywn4OnzGukp7CDMrp08RQ50YKmuwG47brZgIVPTvBaaAfQlRlygrRqSrxdCiL9M+LlzLBiJ68IR1QqvzHyjC7g==",
-      "license": "Apache-2.0",
-      "optional": true,
-      "dependencies": {
-        "@img/colour": "^1.1.0",
-        "detect-libc": "^2.1.2",
-        "semver": "^7.8.5"
-      },
-      "engines": {
-        "node": ">=20.9.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-darwin-arm64": "0.35.5",
-        "@img/sharp-darwin-x64": "0.35.5",
-        "@img/sharp-freebsd-wasm32": "0.35.5",
-        "@img/sharp-libvips-darwin-arm64": "1.3.4",
-        "@img/sharp-libvips-darwin-x64": "1.3.4",
-        "@img/sharp-libvips-linux-arm": "1.3.4",
-        "@img/sharp-libvips-linux-arm64": "1.3.4",
-        "@img/sharp-libvips-linux-ppc64": "1.3.4",
-        "@img/sharp-libvips-linux-riscv64": "1.3.4",
-        "@img/sharp-libvips-linux-s390x": "1.3.4",
-        "@img/sharp-libvips-linux-x64": "1.3.4",
-        "@img/sharp-libvips-linuxmusl-arm64": "1.3.4",
-        "@img/sharp-libvips-linuxmusl-x64": "1.3.4",
-        "@img/sharp-linux-arm": "0.35.5",
-        "@img/sharp-linux-arm64": "0.35.5",
-        "@img/sharp-linux-ppc64": "0.35.5",
-        "@img/sharp-linux-riscv64": "0.35.5",
-        "@img/sharp-linux-s390x": "0.35.5",
-        "@img/sharp-linux-x64": "0.35.5",
-        "@img/sharp-linuxmusl-arm64": "0.35.5",
-        "@img/sharp-linuxmusl-x64": "0.35.5",
-        "@img/sharp-webcontainers-wasm32": "0.35.5",
-        "@img/sharp-win32-arm64": "0.35.5",
-        "@img/sharp-win32-ia32": "0.35.5",
-        "@img/sharp-win32-x64": "0.35.5"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.2.tgz",
-      "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/styled-jsx": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.6.tgz",
-      "integrity": "sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==",
-      "license": "MIT",
-      "dependencies": {
-        "client-only": "0.0.1"
-      },
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "peerDependencies": {
-        "react": ">= 16.8.0 || 17.x.x || ^18.0.0-0 || ^19.0.0-0"
-      },
-      "peerDependenciesMeta": {
-        "@babel/core": {
-          "optional": true
-        },
-        "babel-plugin-macros": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "license": "0BSD"
-    },
-    "node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
-    "node_modules/undici-types": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-      "dev": true,
-      "license": "MIT"
-    }
-  }
-}
diff --git a/web/package.json b/web/package.json
deleted file mode 100644
index c1a59a3..0000000
--- a/web/package.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "name": "nilsmg4-web",
-  "version": "1.1.2",
-  "private": true,
-  "scripts": {
-    "dev": "next dev",
-    "build": "next build",
-    "start": "next start",
-    "lint": "next lint",
-    "test": "node --test --experimental-strip-types test/*.test.ts"
-  },
-  "engines": {
-    "node": ">=22"
-  },
-  "dependencies": {
-    "@influxdata/influxdb-client": "^1.35.0",
-    "next": "^15.5.4",
-    "react": "^19.1.0",
-    "react-dom": "^19.1.0"
-  },
-  "devDependencies": {
-    "@types/node": "^22.15.3",
-    "@types/react": "^19.1.2",
-    "typescript": "^5.8.3"
-  },
-  "type": "module"
-}
diff --git a/web/src/app/api/session/route.ts b/web/src/app/api/session/route.ts
deleted file mode 100644
index 9cbbcda..0000000
--- a/web/src/app/api/session/route.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { NextResponse } from "next/server";
-import { SESSION_COOKIE, checkDashboardPassword, issueSessionValue, sessionCookieOptions } from "@/lib/session";
-
-export const runtime = "nodejs";
-export const dynamic = "force-dynamic";
-
-/**
- * Deliberately slow to fail. The password is the only thing between the open internet and
- * the history, and a quarter second is unnoticeable once but ruinous for anyone working
- * through a list.
- */
-export async function POST(request: Request) {
-  const form = await request.formData();
-  const password = String(form.get("password") ?? "");
-  if (!checkDashboardPassword(password)) {
-    await new Promise((resolve) => setTimeout(resolve, 250));
-    return NextResponse.redirect(new URL("/login?error=1", request.url), { status: 303 });
-  }
-  const response = NextResponse.redirect(new URL("/", request.url), { status: 303 });
-  // Set on the response rather than through the cookies() store: a freshly constructed
-  // redirect does not reliably carry what that store recorded.
-  response.cookies.set(SESSION_COOKIE, issueSessionValue(), sessionCookieOptions);
-  return response;
-}
diff --git a/web/src/app/charging/page.tsx b/web/src/app/charging/page.tsx
deleted file mode 100644
index 6cf9e42..0000000
--- a/web/src/app/charging/page.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import { requireSession } from "@/lib/auth";
-import { loadOverview, sumCharging } from "@/lib/data";
-import { dateTime, duration, money, num, precise } from "@/lib/format";
-import { ChargeCurveChart } from "@/components/charts";
-import { Row, Shell, Tile } from "@/components/shell";
-
-export const dynamic = "force-dynamic";
-
-export default async function ChargingPage() {
-  await requireSession();
-  const { installationId, sessions } = await loadOverview(1, 200);
-
-  if (!installationId || sessions.length === 0) {
-    return (
-      <Shell active="/charging" title="Charging">
-        <div className="card">
-          <p className="empty">
-            No charging sessions yet. Only DC charges above 10 kW are metered; AC charging is not recorded.
-          </p>
-        </div>
-      </Shell>
-    );
-  }
-
-  const total = sumCharging(sessions);
-
-  return (
-    <Shell active="/charging" title="Charging" subtitle={`${sessions.length} DC session${sessions.length === 1 ? "" : "s"}`}>
-      <div className="tiles">
-        <Tile label="Net into battery" value={precise(total.energyKwh)} unit="kWh" tone="gold" />
-        <Tile label="Drawn from grid (+10%)" value={precise(total.gridEnergyKwh)} unit="kWh" tone="gold" />
-        <Tile label="Total paid" value={money(total.cost)} tone="gold" />
-        <Tile
-          label="Average price"
-          value={total.gridEnergyKwh > 0 ? money(total.cost / total.gridEnergyKwh) : "—"}
-          note="per kWh"
-          tone="teal"
-        />
-        <Tile label="Peak power" value={num(total.peakKw)} unit="kW" tone="teal" />
-      </div>
-
-      <section className="card">
-        <h2 className="card-title">Sessions</h2>
-        <ul className="list">
-          {sessions.map((session) => {
-            const gained =
-              session.startSocPercent !== undefined && session.endSocPercent !== undefined
-                ? session.endSocPercent - session.startSocPercent
-                : null;
-            const peak = session.curve.reduce((max, point) => Math.max(max, point.powerKw), 0);
-            const average =
-              session.durationSeconds > 0 ? (session.energyKwh * 3600) / session.durationSeconds : 0;
-            return (
-              <li key={session.sessionId}>
-                <details className="session">
-                  <summary>
-                    <div>
-                      <div className="session-when">{dateTime(session.startedAt)}</div>
-                      <div className="session-meta">
-                        {session.isDemo && "Demo · "}
-                        {duration(session.durationSeconds)}
-                        {gained !== null && ` · ${num(session.startSocPercent as number)}% → ${num(session.endSocPercent as number)}%`}
-                      </div>
-                    </div>
-                    <div className="session-energy">
-                      {precise(session.energyKwh)}
-                      <span className="session-cost"> kWh</span>
-                      <div className="session-cost">{money(session.totalCost)}</div>
-                    </div>
-                  </summary>
-                  <div className="session-body">
-                    <ChargeCurveChart
-                      curve={session.curve.map((point) => ({
-                        timestamp: new Date(point.timestamp).toISOString(),
-                        powerKw: point.powerKw,
-                        socPercent: point.socPercent,
-                      }))}
-                    />
-                    <div className="rows" style={{ marginTop: 14 }}>
-                      <Row label="Start" value={dateTime(session.startedAt)} />
-                      <Row label="End" value={dateTime(session.endedAt)} />
-                      <Row label="Metered duration" value={duration(session.durationSeconds)} />
-                      <Row label="Net into battery" value={`${precise(session.energyKwh)} kWh`} />
-                      <Row label="Drawn from grid (+10%)" value={`${precise(session.gridEnergyKwh ?? session.energyKwh * 1.1)} kWh`} />
-                      <Row label="Charge added" value={gained === null ? "—" : `${num(gained)}%`} />
-                      <Row label="Peak power" value={peak > 0 ? `${num(peak)} kW` : "—"} />
-                      <Row label="Average power" value={average > 0 ? `${num(average)} kW` : "—"} />
-                      <Row label="Unit price" value={`${money(session.pricePerKwh)}/kWh`} />
-                      <Row label="Amount" value={money(session.totalCost)} />
-                    </div>
-                  </div>
-                </details>
-              </li>
-            );
-          })}
-        </ul>
-      </section>
-    </Shell>
-  );
-}
diff --git a/web/src/app/consumption/page.tsx b/web/src/app/consumption/page.tsx
deleted file mode 100644
index d87b07a..0000000
--- a/web/src/app/consumption/page.tsx
+++ /dev/null
@@ -1,178 +0,0 @@
-import Link from "next/link";
-import { requireSession } from "@/lib/auth";
-import { loadOverview, sumDays } from "@/lib/data";
-import { duration, efficiency, isoDate, num, precise } from "@/lib/format";
-import { DailyEnergyChart, EfficiencyChart } from "@/components/charts";
-import { Row, Shell, Tile } from "@/components/shell";
-
-export const dynamic = "force-dynamic";
-
-export default async function ConsumptionPage({
-  searchParams,
-}: {
-  searchParams: Promise<{ date?: string }>;
-}) {
-  await requireSession();
-  const { date: selectedDate } = await searchParams;
-  const { installationId, days } = await loadOverview(90, 1);
-
-  if (!installationId || days.length === 0) {
-    return (
-      <Shell active="/consumption" title="Consumption">
-        <div className="card">
-          <p className="empty">No daily consumption records yet. The car uploads them as it drives.</p>
-        </div>
-      </Shell>
-    );
-  }
-
-  const chartDays = days.map((day) => ({ date: day.date, kwh: day.day.kwh, km: day.day.km }));
-  const total = sumDays(days);
-  // Lifetime is derived: the sum of every day's totals, same as the backend computes.
-  const lifetime = { km: total.km, kwh: total.kwh, hours: total.hours, socDrop: 0 };
-  // Newest first for reading; the charts above keep chronological order.
-  const table = [...days].reverse();
-
-  // Find the selected day's record (if any). table is newest-first; a Map would be overkill
-  // for ≤90 entries.
-  const selected = selectedDate ? table.find((d) => d.date === selectedDate) : null;
-  const hasFilter = !!selectedDate;
-  const validFilter = hasFilter && !!selected;
-
-  // Date input bounds: oldest record to today.
-  const minDate = days[0].date; // days is chronological (oldest first after loadOverview reverse)
-  const maxDate = new Date().toISOString().slice(0, 10);
-
-  return (
-    <Shell
-      active="/consumption"
-      title="Consumption"
-      subtitle={hasFilter ? (validFilter ? isoDate(selectedDate!) : "No record for the selected day") : `${days.length} day${days.length === 1 ? "" : "s"} recorded`}
-    >
-      {/* Date filter */}
-      <section className="card">
-        <form className="filter-form" method="get" action="/consumption">
-          <label className="filter-label" htmlFor="date-picker">
-            Filter by date
-          </label>
-          <div className="filter-row">
-            <input
-              id="date-picker"
-              type="date"
-              name="date"
-              defaultValue={selectedDate ?? ""}
-              min={minDate}
-              max={maxDate}
-              className="field date-input"
-            />
-            <button className="button filter-button" type="submit">Filter</button>
-            {hasFilter && (
-              <Link className="filter-clear" href="/consumption">Clear</Link>
-            )}
-          </div>
-        </form>
-      </section>
-
-      {/* Selected day detail — shown above the period tiles when a filter is active */}
-      {hasFilter && (
-        <section className="card">
-          <h2 className="card-title">{isoDate(selectedDate!)}</h2>
-          {validFilter && selected ? (
-            <>
-              <div className="tiles">
-                <Tile label="Distance" value={num(selected.day.km)} unit="km" tone="teal" />
-                <Tile label="Energy" value={precise(selected.day.kwh)} unit="kWh" tone="gold" />
-                <Tile label="Average" value={efficiency(selected.day.kwh, selected.day.km)} tone="teal" />
-                <Tile
-                  label="Average speed"
-                  value={selected.day.hours > 0 ? num(selected.day.km / selected.day.hours) : "—"}
-                  unit={selected.day.hours > 0 ? "km/h" : undefined}
-                />
-              </div>
-              <div className="rows">
-                <Row label="Driving time" value={duration(selected.day.hours * 3600)} />
-                <Row label="SoC used" value={`${num(selected.day.socDrop)}%`} />
-                <Row label="Lifetime at end of day" value={selected.lifetime ? `${num(selected.lifetime.km)} km` : "—"} />
-              </div>
-            </>
-          ) : (
-            <p className="empty">No consumption recorded for this date.</p>
-          )}
-        </section>
-      )}
-
-      <div className="tiles">
-        <Tile label="Total distance" value={num(total.km)} unit="km" tone="teal" />
-        <Tile label="Total energy" value={precise(total.kwh)} unit="kWh" tone="gold" />
-        <Tile label="Average" value={efficiency(total.kwh, total.km)} tone="teal" />
-        <Tile
-          label="Average speed"
-          value={total.hours > 0 ? num(total.km / total.hours) : "—"}
-          unit={total.hours > 0 ? "km/h" : undefined}
-        />
-      </div>
-
-      <section className="card">
-        <h2 className="card-title">Daily energy</h2>
-        <DailyEnergyChart days={chartDays} />
-      </section>
-
-      <section className="card">
-        <h2 className="card-title">Efficiency trend</h2>
-        <EfficiencyChart days={chartDays} />
-      </section>
-
-      <section className="card">
-        <h2 className="card-title">Lifetime</h2>
-        <div className="rows">
-          <Row label="Distance" value={`${num(lifetime.km)} km`} />
-          <Row label="Energy" value={`${precise(lifetime.kwh)} kWh`} />
-          <Row label="Average" value={efficiency(lifetime.kwh, lifetime.km)} />
-          <Row label="Driving time" value={duration(lifetime.hours * 3600)} />
-        </div>
-      </section>
-
-      <section className="card">
-        <h2 className="card-title">Day by day</h2>
-        <ul className="list">
-          {table.map((day) => {
-            const isSelected = hasFilter && day.date === selectedDate;
-            return (
-              <li key={day.date}>
-                <details className={`session${isSelected ? " selected" : ""}`} open={isSelected}>
-                  <summary>
-                    <div>
-                      <div className="session-when">
-                        <Link href={`/consumption?date=${day.date}`} className="day-link">
-                          {isoDate(day.date)}
-                        </Link>
-                      </div>
-                      <div className="session-meta">
-                        {num(day.day.km)} km · {efficiency(day.day.kwh, day.day.km)}
-                      </div>
-                    </div>
-                    <div className="session-energy">
-                      {precise(day.day.kwh)}
-                      <span className="session-cost"> kWh</span>
-                    </div>
-                  </summary>
-                  <div className="session-body">
-                    <div className="rows">
-                      <Row label="Driving time" value={duration(day.day.hours * 3600)} />
-                      <Row
-                        label="Average speed"
-                        value={day.day.hours > 0 ? `${num(day.day.km / day.day.hours)} km/h` : "—"}
-                      />
-                      <Row label="SoC used" value={`${num(day.day.socDrop)}%`} />
-                      <Row label="Lifetime at end of day" value={day.lifetime ? `${num(day.lifetime.km)} km` : "—"} />
-                    </div>
-                  </div>
-                </details>
-              </li>
-            );
-          })}
-        </ul>
-      </section>
-    </Shell>
-  );
-}
diff --git a/web/src/app/globals.css b/web/src/app/globals.css
deleted file mode 100644
index d10dbbc..0000000
--- a/web/src/app/globals.css
+++ /dev/null
@@ -1,430 +0,0 @@
-/*
- * The car's palette, from app/src/main/res/values/colors.xml.
- *
- * Permanent OLED black with charcoal cards and muted gold/cyan accents — the same visual
- * direction AGENTS.md pins for the head unit, so the phone and the dash read as one app.
- * No light mode: this is looked at in a dark car as often as anywhere else.
- */
-:root {
-  --bg: #000000;
-  --surface: #121212;
-  --raised: #1b1d1e;
-  --outline: #363b3d;
-  --text: #f4f3ef;
-  --muted: #bdc4c6;
-  --accent: #d8c39a;
-  --on-accent: #17140e;
-  --cyan: #a0e2e0;
-  --cyan-deep: #103436;
-  --gold-surface: #28241b;
-  --ok: #a4dcc1;
-  --warn: #e9ca96;
-  --error: #ffb4ab;
-
-  --radius: 18px;
-  --gap: 12px;
-}
-
-* {
-  box-sizing: border-box;
-}
-
-html,
-body {
-  margin: 0;
-  padding: 0;
-  background: var(--bg);
-  color: var(--text);
-  font-family: ui-sans-serif, system-ui, -apple-system, "Segoe UI", Roboto, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  font-variant-numeric: tabular-nums;
-}
-
-a {
-  color: inherit;
-  text-decoration: none;
-}
-
-/* The phone frame. Wide windows get the same column rather than a stretched dashboard. */
-.shell {
-  max-width: 480px;
-  margin: 0 auto;
-  min-height: 100dvh;
-  padding: 20px 16px calc(84px + env(safe-area-inset-bottom));
-  display: flex;
-  flex-direction: column;
-  gap: var(--gap);
-}
-
-.header {
-  display: flex;
-  align-items: baseline;
-  justify-content: space-between;
-  margin-bottom: 4px;
-}
-
-.title {
-  font-size: 26px;
-  font-weight: 650;
-  letter-spacing: -0.4px;
-  margin: 0;
-}
-
-.subtitle {
-  color: var(--muted);
-  font-size: 13px;
-  margin: 2px 0 0;
-}
-
-.card {
-  background: var(--surface);
-  border: 1px solid var(--outline);
-  border-radius: var(--radius);
-  padding: 16px;
-}
-
-.card-title {
-  font-size: 12px;
-  letter-spacing: 1.1px;
-  text-transform: uppercase;
-  color: var(--muted);
-  margin: 0 0 12px;
-  font-weight: 600;
-}
-
-/* Headline numbers: two per row, gold for energy/cost, cyan for distance/efficiency. */
-.tiles {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: var(--gap);
-}
-
-.tile {
-  background: var(--surface);
-  border: 1px solid var(--outline);
-  border-radius: var(--radius);
-  padding: 14px 16px;
-}
-
-.tile.gold {
-  background: linear-gradient(160deg, var(--gold-surface), var(--surface) 70%);
-}
-
-.tile.teal {
-  background: linear-gradient(160deg, var(--cyan-deep), var(--surface) 70%);
-}
-
-.tile-label {
-  font-size: 11px;
-  letter-spacing: 0.8px;
-  text-transform: uppercase;
-  color: var(--muted);
-  margin: 0;
-}
-
-.tile-value {
-  font-size: 24px;
-  font-weight: 650;
-  margin: 6px 0 0;
-  letter-spacing: -0.5px;
-}
-
-.tile-unit {
-  font-size: 13px;
-  font-weight: 500;
-  color: var(--muted);
-  margin-left: 3px;
-}
-
-.tile-note {
-  font-size: 11px;
-  color: var(--muted);
-  margin: 4px 0 0;
-}
-
-/* Key/value rows inside a card. */
-.rows {
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-}
-
-.row {
-  display: flex;
-  justify-content: space-between;
-  align-items: baseline;
-  gap: 12px;
-  font-size: 14px;
-}
-
-.row + .row {
-  border-top: 1px solid var(--outline);
-  padding-top: 10px;
-}
-
-.row-key {
-  color: var(--muted);
-}
-
-.row-value {
-  font-weight: 600;
-}
-
-.list {
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-
-.session {
-  background: var(--surface);
-  border: 1px solid var(--outline);
-  border-radius: var(--radius);
-  padding: 14px 16px;
-}
-
-.session summary {
-  cursor: pointer;
-  list-style: none;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  gap: 10px;
-}
-
-.session summary::-webkit-details-marker {
-  display: none;
-}
-
-.session-when {
-  font-size: 14px;
-  font-weight: 600;
-}
-
-.session-meta {
-  font-size: 12px;
-  color: var(--muted);
-  margin-top: 3px;
-}
-
-.session-energy {
-  text-align: right;
-  font-size: 18px;
-  font-weight: 650;
-  color: var(--accent);
-  white-space: nowrap;
-}
-
-.session-cost {
-  font-size: 12px;
-  color: var(--muted);
-  font-weight: 500;
-}
-
-.session-body {
-  margin-top: 14px;
-  padding-top: 14px;
-  border-top: 1px solid var(--outline);
-}
-
-.chart {
-  width: 100%;
-  height: auto;
-  display: block;
-  overflow: visible;
-}
-
-.legend {
-  display: flex;
-  gap: 14px;
-  font-size: 11px;
-  color: var(--muted);
-  margin-top: 8px;
-}
-
-.swatch {
-  display: inline-block;
-  width: 9px;
-  height: 9px;
-  border-radius: 2px;
-  margin-right: 5px;
-  vertical-align: baseline;
-}
-
-.empty {
-  color: var(--muted);
-  font-size: 14px;
-  text-align: center;
-  padding: 28px 12px;
-}
-
-/* Bottom navigation — the car app falls back to the same pattern below 1000dp. */
-.nav {
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: rgba(10, 10, 10, 0.92);
-  backdrop-filter: blur(14px);
-  border-top: 1px solid var(--outline);
-  padding: 8px 0 calc(8px + env(safe-area-inset-bottom));
-}
-
-.nav-inner {
-  max-width: 480px;
-  margin: 0 auto;
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-}
-
-.nav a {
-  text-align: center;
-  padding: 8px 4px;
-  font-size: 11px;
-  color: var(--muted);
-  font-weight: 600;
-  letter-spacing: 0.3px;
-}
-
-.nav a[aria-current="page"] {
-  color: var(--accent);
-}
-
-.nav-icon {
-  display: block;
-  font-size: 17px;
-  margin-bottom: 2px;
-}
-
-/* Login */
-.login {
-  min-height: 100dvh;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 24px;
-}
-
-.login-card {
-  width: 100%;
-  max-width: 360px;
-  background: var(--surface);
-  border: 1px solid var(--outline);
-  border-radius: var(--radius);
-  padding: 28px 24px;
-}
-
-.field {
-  width: 100%;
-  background: var(--raised);
-  border: 1px solid var(--outline);
-  border-radius: 12px;
-  color: var(--text);
-  padding: 13px 14px;
-  font-size: 16px;
-  margin-top: 16px;
-}
-
-.field:focus {
-  outline: none;
-  border-color: var(--accent);
-}
-
-.button {
-  width: 100%;
-  margin-top: 14px;
-  background: var(--accent);
-  color: var(--on-accent);
-  border: none;
-  border-radius: 12px;
-  padding: 13px;
-  font-size: 15px;
-  font-weight: 650;
-  cursor: pointer;
-}
-
-.error {
-  color: var(--error);
-  font-size: 13px;
-  margin: 14px 0 0;
-}
-
-.signout {
-  font: inherit;
-  font-size: 12px;
-  color: var(--muted);
-  background: none;
-  border: 1px solid var(--outline);
-  border-radius: 999px;
-  padding: 5px 12px;
-  cursor: pointer;
-}
-
-/* ---------- Consumption date filter ---------- */
-
-.filter-form {
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-}
-
-.filter-label {
-  font-size: 12px;
-  text-transform: uppercase;
-  letter-spacing: 0.5px;
-  color: var(--muted);
-}
-
-.filter-row {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  flex-wrap: wrap;
-}
-
-.date-input {
-  width: auto;
-  min-width: 0;
-  flex: 1 1 150px;
-  margin-top: 0;
-  color-scheme: dark;
-}
-
-.filter-button {
-  width: auto;
-  margin-top: 0;
-  padding: 12px 18px;
-  flex: 0 0 auto;
-}
-
-.filter-clear {
-  font: inherit;
-  font-size: 13px;
-  color: var(--muted);
-  text-decoration: none;
-  border: 1px solid var(--outline);
-  border-radius: 12px;
-  padding: 11px 14px;
-  flex: 0 0 auto;
-}
-
-.filter-clear:active {
-  border-color: var(--accent);
-}
-
-/* Highlighted selected day in the day-by-day list */
-.session.selected {
-  border-color: var(--accent);
-}
-
-.day-link {
-  color: var(--text);
-  text-decoration: none;
-}
-
-.day-link:active {
-  color: var(--accent);
-}
diff --git a/web/src/app/layout.tsx b/web/src/app/layout.tsx
deleted file mode 100644
index d4242ec..0000000
--- a/web/src/app/layout.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import type { Metadata, Viewport } from "next";
-import "./globals.css";
-
-export const metadata: Metadata = {
-  title: "Nils' MG4",
-  description: "MG4 consumption and charging history",
-};
-
-export const viewport: Viewport = {
-  themeColor: "#000000",
-  width: "device-width",
-  initialScale: 1,
-  // The dashboard is pinned to a phone-width column; zooming it is still the reader's call.
-  maximumScale: 5,
-};
-
-export default function RootLayout({ children }: { children: React.ReactNode }) {
-  return (
-    <html lang="en">
-      <body>{children}</body>
-    </html>
-  );
-}
diff --git a/web/src/app/login/page.tsx b/web/src/app/login/page.tsx
deleted file mode 100644
index 88cabd7..0000000
--- a/web/src/app/login/page.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { redirect } from "next/navigation";
-import { hasSession } from "@/lib/auth";
-
-export const dynamic = "force-dynamic";
-
-export default async function LoginPage({
-  searchParams,
-}: {
-  searchParams: Promise<{ error?: string }>;
-}) {
-  if (await hasSession()) redirect("/");
-  const { error } = await searchParams;
-  return (
-    <div className="login">
-      <form className="login-card" action="/api/session" method="post">
-        <h1 className="title">Nils&apos; MG4</h1>
-        <p className="subtitle">Consumption and charging history</p>
-        {/*
-          A hidden username so password managers will offer to save this.
-          Most of them ignore a lone password field — they key a saved entry on
-          (origin, username), and with nothing to key on they stay quiet. There is only
-          ever one account here, so the value is fixed and the server never reads it.
-        */}
-        <input
-          type="text"
-          name="username"
-          value="nils"
-          autoComplete="username"
-          readOnly
-          hidden
-        />
-        <input
-          className="field"
-          type="password"
-          name="password"
-          placeholder="Password"
-          autoComplete="current-password"
-          autoFocus
-          required
-        />
-        <button className="button" type="submit">
-          Sign in
-        </button>
-        {error && <p className="error">Wrong password.</p>}
-      </form>
-    </div>
-  );
-}
diff --git a/web/src/app/logout/route.ts b/web/src/app/logout/route.ts
deleted file mode 100644
index 8b016f6..0000000
--- a/web/src/app/logout/route.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { NextResponse } from "next/server";
-import { SESSION_COOKIE } from "@/lib/session";
-
-export const runtime = "nodejs";
-export const dynamic = "force-dynamic";
-
-/**
- * POST only, deliberately.
- *
- * This used to answer GET behind a `<Link>`, so Next's viewport prefetch called it on
- * every render and cleared the cookie before the reader had clicked anything — which
- * presented as the session expiring on every navigation. Anything that changes state has
- * to be unreachable by a prefetch, a crawler or a preloading browser, and that means not
- * answering GET.
- */
-export async function POST(request: Request) {
-  const response = NextResponse.redirect(new URL("/login", request.url), { status: 303 });
-  // Cleared on the response itself rather than through the cookies() store: a freshly
-  // constructed redirect does not reliably carry what that store recorded.
-  response.cookies.set(SESSION_COOKIE, "", { path: "/", maxAge: 0 });
-  return response;
-}
diff --git a/web/src/app/page.tsx b/web/src/app/page.tsx
deleted file mode 100644
index 6b1dc26..0000000
--- a/web/src/app/page.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import { requireSession } from "@/lib/auth";
-import { loadOverview, sumCharging, sumDays } from "@/lib/data";
-import { dateTime, duration, efficiency, money, num, precise } from "@/lib/format";
-import { DailyEnergyChart } from "@/components/charts";
-import { Row, Shell, Tile } from "@/components/shell";
-
-export const dynamic = "force-dynamic";
-
-export default async function OverviewPage() {
-  await requireSession();
-  const { installationId, installationCount, days, sessions } = await loadOverview(30, 200);
-
-  if (!installationId) {
-    return (
-      <Shell active="/" title="Overview">
-        <div className="card">
-          <p className="empty">
-            No data yet. It appears here once the car sends its first daily record.
-          </p>
-        </div>
-      </Shell>
-    );
-  }
-
-  const charge = sumCharging(sessions);
-  const recent = sumDays(days);
-  const lifetime = days.length > 0 ? days[days.length - 1].lifetime : null;
-  const soh = [...days].reverse().find((day) => day.sohPercent !== undefined)?.sohPercent;
-  const lastSession = sessions[0];
-
-  return (
-    <Shell
-      active="/"
-      title="Overview"
-      subtitle={installationCount > 1 ? `Most recent of ${installationCount} cars` : "MG4"}
-    >
-      <div className="tiles">
-        <Tile
-          label="Drawn from grid"
-          value={precise(charge.gridEnergyKwh)}
-          unit="kWh"
-          note={`${charge.sessions} DC charge${charge.sessions === 1 ? "" : "s"}`}
-          tone="gold"
-        />
-        <Tile
-          label="Paid"
-          value={money(charge.cost)}
-          note={charge.gridEnergyKwh > 0 ? `${money(charge.cost / charge.gridEnergyKwh)}/kWh avg.` : undefined}
-          tone="gold"
-        />
-        <Tile label="Last 30 days" value={num(recent.km)} unit="km" note={efficiency(recent.kwh, recent.km)} tone="teal" />
-        <Tile
-          label="Lifetime"
-          value={lifetime ? num(lifetime.km) : "—"}
-          unit="km"
-          note={lifetime ? efficiency(lifetime.kwh, lifetime.km) : undefined}
-          tone="teal"
-        />
-      </div>
-
-      <section className="card">
-        <h2 className="card-title">Last 30 days</h2>
-        <DailyEnergyChart days={days.map((day) => ({ date: day.date, kwh: day.day.kwh, km: day.day.km }))} />
-      </section>
-
-      {lastSession && (
-        <section className="card">
-          <h2 className="card-title">Last charge</h2>
-          <div className="rows">
-            <Row label="Date" value={dateTime(lastSession.startedAt)} />
-            <Row label="Net into battery" value={`${precise(lastSession.energyKwh)} kWh`} />
-            <Row label="Drawn from grid (+10%)" value={`${precise(lastSession.gridEnergyKwh ?? lastSession.energyKwh * 1.1)} kWh`} />
-            <Row
-              label="State of charge"
-              value={
-                lastSession.startSocPercent !== undefined && lastSession.endSocPercent !== undefined
-                  ? `${num(lastSession.startSocPercent)}% → ${num(lastSession.endSocPercent)}%`
-                  : "—"
-              }
-            />
-            <Row label="Duration" value={duration(lastSession.durationSeconds)} />
-            <Row label="Cost" value={money(lastSession.totalCost)} />
-          </div>
-        </section>
-      )}
-
-      <section className="card">
-        <h2 className="card-title">Battery and totals</h2>
-        <div className="rows">
-          <Row label="Health (SoH)" value={soh === undefined ? "—" : `${num(soh)}%`} />
-          <Row label="Total charging time" value={duration(charge.seconds)} />
-          <Row label="Highest power seen" value={charge.peakKw > 0 ? `${num(charge.peakKw)} kW` : "—"} />
-          <Row label="Charge added" value={charge.socGained > 0 ? `${num(charge.socGained)}%` : "—"} />
-          <Row label="Days recorded" value={`${days.length}`} />
-        </div>
-      </section>
-    </Shell>
-  );
-}
diff --git a/web/src/app/v1/charging-sessions/[sessionId]/route.ts b/web/src/app/v1/charging-sessions/[sessionId]/route.ts
deleted file mode 100644
index 55ee73a..0000000
--- a/web/src/app/v1/charging-sessions/[sessionId]/route.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NextResponse } from "next/server";
-import { handle, parseJson, requireIngest } from "@/lib/api";
-import { writeChargingSession } from "@/lib/store";
-import { validateChargingSession } from "@/lib/validate";
-
-export const runtime = "nodejs";
-export const dynamic = "force-dynamic";
-
-export async function PUT(request: Request, context: { params: Promise<{ sessionId: string }> }) {
-  const denied = requireIngest(request);
-  if (denied) return denied;
-  return handle(async () => {
-    const { sessionId } = await context.params;
-    await writeChargingSession(validateChargingSession(await parseJson(request), sessionId));
-    return new NextResponse(null, { status: 204 });
-  });
-}
diff --git a/web/src/app/v1/consumption/daily/route.ts b/web/src/app/v1/consumption/daily/route.ts
deleted file mode 100644
index 691fab5..0000000
--- a/web/src/app/v1/consumption/daily/route.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { NextResponse } from "next/server";
-import { handle, parseJson, requireIngest } from "@/lib/api";
-import { writeConsumptionChunk } from "@/lib/store";
-import { validateConsumption } from "@/lib/validate";
-
-export const runtime = "nodejs";
-export const dynamic = "force-dynamic";
-
-/**
- * One delta chunk (not a cumulative total) of a day's consumption. Stored as its own point
- * at its recordedAt; reads add a day's chunks up. A chunk the car re-sends from its offline
- * cache carries the same recordedAt and replaces itself, so a retry is never counted twice.
- */
-export async function PUT(request: Request) {
-  const denied = requireIngest(request);
-  if (denied) return denied;
-  return handle(async () => {
-    await writeConsumptionChunk(validateConsumption(await parseJson(request)));
-    return new NextResponse(null, { status: 204 });
-  });
-}
diff --git a/web/src/app/v1/consumption/history/[installationId]/route.ts b/web/src/app/v1/consumption/history/[installationId]/route.ts
deleted file mode 100644
index ffd2bc3..0000000
--- a/web/src/app/v1/consumption/history/[installationId]/route.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { NextResponse } from "next/server";
-import { handle, requireIngest } from "@/lib/api";
-import { readDays } from "@/lib/store";
-import { validateUuid } from "@/lib/validate";
-
-export const runtime = "nodejs";
-export const dynamic = "force-dynamic";
-
-/**
- * Ingest-token-authenticated history read for the head-unit app.
- *
- * The dashboard history endpoints under /v1/history use the dashboard password (a
- * browser-only credential). The head unit only holds the ingest token, which was
- * write-only by design — but the car's consumption UI now reads back its own uploaded
- * totals so an APK wipe does not blank the display. The installationId is a fixed UUID
- * baked into the APK, so an extracted token plus a guessed installationId is the only
- * exposure, and the data revealed is the owner's own consumption history.
- */
-export async function GET(request: Request, context: { params: Promise<{ installationId: string }> }) {
-  const denied = requireIngest(request);
-  if (denied) return denied;
-  return handle(async () => {
-    const { installationId } = await context.params;
-    const days = await readDays(validateUuid(installationId, "installationId"));
-    // Lifetime = sum of every day's totals, which is the newest day's running total.
-    const lifetime = days[0]?.lifetime ?? { km: 0, kwh: 0, hours: 0, socDrop: 0 };
-    const records = days.slice(0, 400).map(({ lifetime: _lifetime, ...day }) => day);
-    return NextResponse.json({ records, lifetime });
-  });
-}
diff --git a/web/src/app/v1/health/route.ts b/web/src/app/v1/health/route.ts
deleted file mode 100644
index 4efb85e..0000000
--- a/web/src/app/v1/health/route.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { NextResponse } from "next/server";
-
-export const runtime = "nodejs";
-export const dynamic = "force-dynamic";
-
-/** Unauthenticated on purpose: it reveals nothing and the car has no other probe. */
-export function GET() {
-  return NextResponse.json({ status: "ok" });
-}
diff --git a/web/src/app/v1/history/[installationId]/charging/route.ts b/web/src/app/v1/history/[installationId]/charging/route.ts
deleted file mode 100644
index 434bf4d..0000000
--- a/web/src/app/v1/history/[installationId]/charging/route.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NextResponse } from "next/server";
-import { handle, requireReader } from "@/lib/api";
-import { readChargingSessions } from "@/lib/store";
-import { validateUuid } from "@/lib/validate";
-
-export const runtime = "nodejs";
-export const dynamic = "force-dynamic";
-
-export async function GET(request: Request, context: { params: Promise<{ installationId: string }> }) {
-  const denied = await requireReader(request);
-  if (denied) return denied;
-  return handle(async () => {
-    const { installationId } = await context.params;
-    const records = await readChargingSessions(validateUuid(installationId, "installationId"), 200);
-    return NextResponse.json({ records });
-  });
-}
diff --git a/web/src/app/v1/history/[installationId]/consumption/route.ts b/web/src/app/v1/history/[installationId]/consumption/route.ts
deleted file mode 100644
index 158b0a8..0000000
--- a/web/src/app/v1/history/[installationId]/consumption/route.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NextResponse } from "next/server";
-import { handle, requireReader } from "@/lib/api";
-import { readDays } from "@/lib/store";
-import { validateUuid } from "@/lib/validate";
-
-export const runtime = "nodejs";
-export const dynamic = "force-dynamic";
-
-export async function GET(request: Request, context: { params: Promise<{ installationId: string }> }) {
-  const denied = await requireReader(request);
-  if (denied) return denied;
-  return handle(async () => {
-    const { installationId } = await context.params;
-    const records = (await readDays(validateUuid(installationId, "installationId"))).slice(0, 400);
-    return NextResponse.json({ records });
-  });
-}
diff --git a/web/src/app/v1/telemetry/route.ts b/web/src/app/v1/telemetry/route.ts
deleted file mode 100644
index ffbf8fb..0000000
--- a/web/src/app/v1/telemetry/route.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { NextResponse } from "next/server";
-import { forwardToAbrp } from "@/lib/abrp";
-import { handle, parseJson, requireIngest } from "@/lib/api";
-import { writeTelemetry } from "@/lib/store";
-import { validateTelemetryBatch } from "@/lib/validate";
-
-export const runtime = "nodejs";
-export const dynamic = "force-dynamic";
-
-/**
- * A batch of live samples from the car. Stored first; only once the write succeeded is the
- * newest sample handed to ABRP, so the car's retry of a failed request cannot leave ABRP
- * with data the database never got.
- */
-export async function POST(request: Request) {
-  const denied = requireIngest(request);
-  if (denied) return denied;
-  return handle(async () => {
-    const batch = validateTelemetryBatch(await parseJson(request));
-    await writeTelemetry(batch.installationId, batch.samples);
-    forwardToAbrp(batch.samples);
-    return new NextResponse(null, { status: 204 });
-  });
-}
diff --git a/web/src/components/charts.tsx b/web/src/components/charts.tsx
deleted file mode 100644
index 351f5f6..0000000
--- a/web/src/components/charts.tsx
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Hand-rolled SVG charts.
- *
- * A charting library would be the larger part of the bundle for three small plots, and
- * these are server-rendered: no hydration, no client JavaScript, and they draw correctly
- * before anything loads. Each one states its own units in the legend rather than relying
- * on a tooltip, because a tooltip needs a pointer and this is read on a phone.
- */
-
-const GOLD = "#d8c39a";
-const CYAN = "#a0e2e0";
-const GRID = "#363b3d";
-const MUTED = "#bdc4c6";
-
-interface Plot {
-  width: number;
-  height: number;
-  padTop: number;
-  padRight: number;
-  padBottom: number;
-  padLeft: number;
-}
-
-const PLOT: Plot = { width: 320, height: 150, padTop: 10, padRight: 8, padBottom: 20, padLeft: 34 };
-
-function innerWidth(plot: Plot) {
-  return plot.width - plot.padLeft - plot.padRight;
-}
-function innerHeight(plot: Plot) {
-  return plot.height - plot.padTop - plot.padBottom;
-}
-
-/** A rounded axis maximum, so the gridline labels are readable numbers. */
-function niceMax(value: number): number {
-  if (!(value > 0)) return 1;
-  const magnitude = 10 ** Math.floor(Math.log10(value));
-  const normalised = value / magnitude;
-  const step = normalised <= 1 ? 1 : normalised <= 2 ? 2 : normalised <= 5 ? 5 : 10;
-  return step * magnitude;
-}
-
-function Grid({ plot, max, format }: { plot: Plot; max: number; format: (value: number) => string }) {
-  const lines = [0, 0.5, 1];
-  return (
-    <g>
-      {lines.map((fraction) => {
-        const y = plot.padTop + innerHeight(plot) * (1 - fraction);
-        return (
-          <g key={fraction}>
-            <line
-              x1={plot.padLeft}
-              x2={plot.width - plot.padRight}
-              y1={y}
-              y2={y}
-              stroke={GRID}
-              strokeWidth={1}
-              strokeDasharray={fraction === 0 ? undefined : "2 4"}
-            />
-            <text x={plot.padLeft - 6} y={y + 3.5} fill={MUTED} fontSize={9} textAnchor="end">
-              {format(max * fraction)}
-            </text>
-          </g>
-        );
-      })}
-    </g>
-  );
-}
-
-export interface DayDatum {
-  date: string;
-  kwh: number;
-  km: number;
-}
-
-/**
- * Daily energy as bars. Days with no record are absent rather than drawn as zero — the
- * car was not driven, which is not the same as a day of zero consumption, and the same
- * distinction the telemetry side makes between a failed read and a zero.
- */
-export function DailyEnergyChart({ days }: { days: DayDatum[] }) {
-  if (days.length === 0) return <p className="empty">No daily records yet</p>;
-  const plot = PLOT;
-  const max = niceMax(Math.max(...days.map((day) => day.kwh)));
-  const slot = innerWidth(plot) / days.length;
-  const barWidth = Math.max(1.5, Math.min(14, slot * 0.62));
-  return (
-    <>
-      <svg className="chart" viewBox={`0 0 ${plot.width} ${plot.height}`} role="img"
-           aria-label="Energy used per day">
-        <Grid plot={plot} max={max} format={(value) => value.toFixed(0)} />
-        {days.map((day, index) => {
-          const height = (day.kwh / max) * innerHeight(plot);
-          const x = plot.padLeft + slot * (index + 0.5) - barWidth / 2;
-          return (
-            <rect
-              key={day.date}
-              x={x}
-              y={plot.padTop + innerHeight(plot) - height}
-              width={barWidth}
-              height={Math.max(height, day.kwh > 0 ? 1 : 0)}
-              rx={2}
-              fill={GOLD}
-              opacity={0.92}
-            >
-              <title>{`${day.date} — ${day.kwh.toFixed(2)} kWh, ${day.km.toFixed(1)} km`}</title>
-            </rect>
-          );
-        })}
-        <text x={plot.padLeft} y={plot.height - 6} fill={MUTED} fontSize={9}>
-          {shortDate(days[0].date)}
-        </text>
-        <text x={plot.width - plot.padRight} y={plot.height - 6} fill={MUTED} fontSize={9} textAnchor="end">
-          {shortDate(days[days.length - 1].date)}
-        </text>
-      </svg>
-      <div className="legend">
-        <span>
-          <span className="swatch" style={{ background: GOLD }} />
-          Daily energy (kWh)
-        </span>
-      </div>
-    </>
-  );
-}
-
-/** Efficiency over time. Days under 1 km are dropped: the ratio is meaningless there. */
-export function EfficiencyChart({ days }: { days: DayDatum[] }) {
-  const points = days
-    .filter((day) => day.km >= 1 && day.kwh > 0)
-    .map((day) => ({ date: day.date, value: (day.kwh * 100) / day.km }));
-  if (points.length < 2) return <p className="empty">Not enough days for a chart</p>;
-  const plot = PLOT;
-  const max = niceMax(Math.max(...points.map((point) => point.value)));
-  const step = innerWidth(plot) / Math.max(1, points.length - 1);
-  const path = points
-    .map((point, index) => {
-      const x = plot.padLeft + step * index;
-      const y = plot.padTop + innerHeight(plot) * (1 - point.value / max);
-      return `${index === 0 ? "M" : "L"}${x.toFixed(2)} ${y.toFixed(2)}`;
-    })
-    .join(" ");
-  const average = points.reduce((total, point) => total + point.value, 0) / points.length;
-  const averageY = plot.padTop + innerHeight(plot) * (1 - average / max);
-  return (
-    <>
-      <svg className="chart" viewBox={`0 0 ${plot.width} ${plot.height}`} role="img"
-           aria-label="Average consumption per day">
-        <Grid plot={plot} max={max} format={(value) => value.toFixed(0)} />
-        <line
-          x1={plot.padLeft}
-          x2={plot.width - plot.padRight}
-          y1={averageY}
-          y2={averageY}
-          stroke={GOLD}
-          strokeWidth={1}
-          strokeDasharray="4 4"
-          opacity={0.7}
-        />
-        <path d={path} fill="none" stroke={CYAN} strokeWidth={2} strokeLinejoin="round" strokeLinecap="round" />
-        {points.map((point, index) => (
-          <circle
-            key={point.date}
-            cx={plot.padLeft + step * index}
-            cy={plot.padTop + innerHeight(plot) * (1 - point.value / max)}
-            r={1.8}
-            fill={CYAN}
-          >
-            <title>{`${point.date} — ${point.value.toFixed(1)} kWh/100 km`}</title>
-          </circle>
-        ))}
-      </svg>
-      <div className="legend">
-        <span>
-          <span className="swatch" style={{ background: CYAN }} />
-          kWh/100 km
-        </span>
-        <span>
-          <span className="swatch" style={{ background: GOLD }} />
-          Average {average.toFixed(1)}
-        </span>
-      </div>
-    </>
-  );
-}
-
-export interface CurveDatum {
-  timestamp: string;
-  powerKw: number;
-  socPercent?: number;
-}
-
-/**
- * Charge curve: power against time, with SOC on its own 0–100 scale.
- *
- * Two quantities on one plot because the shape of a DC charge is the relationship between
- * them — the taper is only legible next to the percentage that caused it.
- */
-export function ChargeCurveChart({ curve }: { curve: CurveDatum[] }) {
-  if (curve.length < 2) return <p className="empty">No curve recorded for this session</p>;
-  const plot = { ...PLOT, padRight: 26 };
-  const times = curve.map((point) => new Date(point.timestamp).getTime());
-  const start = times[0];
-  const span = Math.max(1, times[times.length - 1] - start);
-  const maxPower = niceMax(Math.max(...curve.map((point) => point.powerKw)));
-
-  const x = (time: number) => plot.padLeft + (innerWidth(plot) * (time - start)) / span;
-  const yPower = (kw: number) => plot.padTop + innerHeight(plot) * (1 - kw / maxPower);
-  const ySoc = (percent: number) => plot.padTop + innerHeight(plot) * (1 - percent / 100);
-
-  const powerPath = curve
-    .map((point, index) => `${index === 0 ? "M" : "L"}${x(times[index]).toFixed(2)} ${yPower(point.powerKw).toFixed(2)}`)
-    .join(" ");
-  const areaPath = `${powerPath} L${x(times[times.length - 1]).toFixed(2)} ${(plot.padTop + innerHeight(plot)).toFixed(2)} L${x(start).toFixed(2)} ${(plot.padTop + innerHeight(plot)).toFixed(2)} Z`;
-
-  const socPoints = curve
-    .map((point, index) => ({ point, index }))
-    .filter((entry) => typeof entry.point.socPercent === "number");
-  const socPath = socPoints
-    .map((entry, order) =>
-      `${order === 0 ? "M" : "L"}${x(times[entry.index]).toFixed(2)} ${ySoc(entry.point.socPercent as number).toFixed(2)}`)
-    .join(" ");
-
-  return (
-    <>
-      <svg className="chart" viewBox={`0 0 ${plot.width} ${plot.height}`} role="img"
-           aria-label="Charging power and state-of-charge curve">
-        <Grid plot={plot} max={maxPower} format={(value) => value.toFixed(0)} />
-        <defs>
-          <linearGradient id="powerFill" x1="0" x2="0" y1="0" y2="1">
-            <stop offset="0%" stopColor={GOLD} stopOpacity={0.32} />
-            <stop offset="100%" stopColor={GOLD} stopOpacity={0.02} />
-          </linearGradient>
-        </defs>
-        <path d={areaPath} fill="url(#powerFill)" stroke="none" />
-        <path d={powerPath} fill="none" stroke={GOLD} strokeWidth={2} strokeLinejoin="round" />
-        {socPath && <path d={socPath} fill="none" stroke={CYAN} strokeWidth={1.6} strokeDasharray="5 3" />}
-        <text x={plot.width - plot.padRight + 4} y={plot.padTop + 4} fill={MUTED} fontSize={9}>
-          100%
-        </text>
-        <text x={plot.width - plot.padRight + 4} y={plot.padTop + innerHeight(plot)} fill={MUTED} fontSize={9}>
-          0%
-        </text>
-        <text x={plot.padLeft} y={plot.height - 6} fill={MUTED} fontSize={9}>
-          0 min
-        </text>
-        <text x={plot.width - plot.padRight} y={plot.height - 6} fill={MUTED} fontSize={9} textAnchor="end">
-          {Math.round(span / 60000)} min
-        </text>
-      </svg>
-      <div className="legend">
-        <span>
-          <span className="swatch" style={{ background: GOLD }} />
-          Power (kW)
-        </span>
-        <span>
-          <span className="swatch" style={{ background: CYAN }} />
-          State of charge (%)
-        </span>
-      </div>
-    </>
-  );
-}
-
-function shortDate(iso: string): string {
-  const [, month, day] = iso.split("-");
-  return `${day}.${month}`;
-}
diff --git a/web/src/components/shell.tsx b/web/src/components/shell.tsx
deleted file mode 100644
index 242adc8..0000000
--- a/web/src/components/shell.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import Link from "next/link";
-import type { ReactNode } from "react";
-
-const TABS = [
-  { href: "/", label: "Overview", icon: "◈" },
-  { href: "/consumption", label: "Consumption", icon: "▤" },
-  { href: "/charging", label: "Charging", icon: "⚡" },
-] as const;
-
-export type Tab = (typeof TABS)[number]["href"];
-
-/**
- * The phone frame and the bottom tab bar.
- *
- * `active` is passed in rather than read from the pathname so every page stays a server
- * component — the whole dashboard renders without shipping a line of client JavaScript.
- */
-export function Shell({
-  active,
-  title,
-  subtitle,
-  children,
-}: {
-  active: Tab;
-  title: string;
-  subtitle?: string;
-  children: ReactNode;
-}) {
-  return (
-    <>
-      <main className="shell">
-        <header className="header">
-          <div>
-            <h1 className="title">{title}</h1>
-            {subtitle && <p className="subtitle">{subtitle}</p>}
-          </div>
-          {/*
-            A form, not a link. Next prefetches links that are in the viewport, and this
-            one is in every page header — as a GET route it was fetched on render and
-            signed the reader out before they touched it, which looked like the session
-            expiring on every navigation. Nothing with a side effect may answer GET.
-          */}
-          <form action="/logout" method="post">
-            <button className="signout" type="submit">
-              Sign out
-            </button>
-          </form>
-        </header>
-        {children}
-      </main>
-      <nav className="nav">
-        <div className="nav-inner">
-          {TABS.map((tab) => (
-            <Link key={tab.href} href={tab.href} aria-current={tab.href === active ? "page" : undefined}>
-              <span className="nav-icon" aria-hidden>
-                {tab.icon}
-              </span>
-              {tab.label}
-            </Link>
-          ))}
-        </div>
-      </nav>
-    </>
-  );
-}
-
-export function Tile({
-  label,
-  value,
-  unit,
-  note,
-  tone,
-}: {
-  label: string;
-  value: string;
-  unit?: string;
-  note?: string;
-  tone?: "gold" | "teal";
-}) {
-  return (
-    <div className={`tile${tone ? ` ${tone}` : ""}`}>
-      <p className="tile-label">{label}</p>
-      <p className="tile-value">
-        {value}
-        {unit && <span className="tile-unit">{unit}</span>}
-      </p>
-      {note && <p className="tile-note">{note}</p>}
-    </div>
-  );
-}
-
-export function Row({ label, value }: { label: string; value: string }) {
-  return (
-    <div className="row">
-      <span className="row-key">{label}</span>
-      <span className="row-value">{value}</span>
-    </div>
-  );
-}
diff --git a/web/src/lib/abrp.ts b/web/src/lib/abrp.ts
deleted file mode 100644
index 87a7756..0000000
--- a/web/src/lib/abrp.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { TELEMETRY_FLAGS, type TelemetrySample } from "./types.ts";
-
-/**
- * Forwards live telemetry to A Better Route Planner.
- *
- * The ABRP credentials exist only here, as ABRP_API_KEY and ABRP_USER_TOKEN in the server's
- * environment; the car never holds them. Forwarding is off when either is unset.
- *
- * Only the newest sample of a batch is sent, and at most one every ABRP_MIN_INTERVAL_SECONDS
- * (default 5). A failed forward is logged and dropped, never queued: ABRP plans from the
- * car's state now, and a backlog replayed later would describe a car that has moved on.
- * The stored copy in InfluxDB is unaffected either way.
- */
-
-const API_URL = "https://api.iternio.com/1/tlm/send";
-const TIMEOUT_MS = 8_000;
-/** Older than this, a sample is history rather than live state, and ABRP gets nothing. */
-const MAX_AGE_SECONDS = 300;
-
-const state = globalThis as unknown as { abrpLastUtc?: number; abrpLastSentMs?: number };
-
-export function abrpConfigured(): boolean {
-  return Boolean(process.env.ABRP_API_KEY && process.env.ABRP_USER_TOKEN);
-}
-
-function minIntervalMs(): number {
-  const seconds = Number(process.env.ABRP_MIN_INTERVAL_SECONDS ?? "5");
-  return Number.isFinite(seconds) && seconds >= 0 ? seconds * 1000 : 5000;
-}
-
-/** The tlm object ABRP expects: the same field names, flags as 0/1. */
-export function toTlm(sample: TelemetrySample): Record<string, number> {
-  const tlm: Record<string, number> = {};
-  for (const [field, value] of Object.entries(sample)) {
-    if (typeof value === "number") tlm[field] = value;
-  }
-  for (const field of TELEMETRY_FLAGS) {
-    const value = sample[field];
-    if (value !== undefined) tlm[field] = value ? 1 : 0;
-  }
-  return tlm;
-}
-
-/** Picks the sample to forward, or null when there is nothing new or it is too soon. */
-export function pickForForward(samples: TelemetrySample[], nowMs: number): TelemetrySample | null {
-  if (samples.length === 0) return null;
-  const newest = samples.reduce((a, b) => (b.utc > a.utc ? b : a));
-  if (nowMs / 1000 - newest.utc > MAX_AGE_SECONDS) return null;
-  if (state.abrpLastUtc !== undefined && newest.utc <= state.abrpLastUtc) return null;
-  if (state.abrpLastSentMs !== undefined && nowMs - state.abrpLastSentMs < minIntervalMs()) return null;
-  return newest;
-}
-
-/** Fire-and-forget: the car's request is answered without waiting for ABRP. */
-export function forwardToAbrp(samples: TelemetrySample[]): void {
-  if (!abrpConfigured()) return;
-  const nowMs = Date.now();
-  const sample = pickForForward(samples, nowMs);
-  if (!sample) return;
-  state.abrpLastUtc = sample.utc;
-  state.abrpLastSentMs = nowMs;
-  void send(sample).catch((error) => console.warn("ABRP forward failed:", error instanceof Error ? error.message : error));
-}
-
-async function send(sample: TelemetrySample): Promise<void> {
-  // Credentials go in the form body, never the URL, which ends up in access logs.
-  const body = new URLSearchParams({
-    api_key: process.env.ABRP_API_KEY ?? "",
-    token: process.env.ABRP_USER_TOKEN ?? "",
-    tlm: JSON.stringify(toTlm(sample)),
-  });
-  const response = await fetch(API_URL, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body,
-    signal: AbortSignal.timeout(TIMEOUT_MS),
-  });
-  if (!response.ok) {
-    // The response body can echo the request; only the status is logged.
-    console.warn(`ABRP forward rejected: HTTP ${response.status}`);
-  }
-}
-
-/** For tests: forget what was forwarded. */
-export function resetAbrpState(): void {
-  state.abrpLastUtc = undefined;
-  state.abrpLastSentMs = undefined;
-}
diff --git a/web/src/lib/api.ts b/web/src/lib/api.ts
deleted file mode 100644
index a266559..0000000
--- a/web/src/lib/api.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { NextResponse } from "next/server";
-import { hasIngestToken, hasSession, checkDashboardPassword } from "./auth";
-import { ValidationError } from "./validate";
-
-/** Every endpoint touches InfluxDB, which rules out the edge runtime. */
-export const runtime = "nodejs";
-export const dynamic = "force-dynamic";
-
-export function unauthorized(): NextResponse {
-  return NextResponse.json({ error: "unauthorized" }, { status: 401 });
-}
-
-/**
- * Wraps a handler so a validation failure is a 400 and anything else is a 500 whose
- * detail stays in the server log. An error message is allowed to name a bad field; it is
- * never allowed to carry a connection string.
- */
-export async function handle(work: () => Promise<NextResponse>): Promise<NextResponse> {
-  try {
-    return await work();
-  } catch (error) {
-    if (error instanceof ValidationError) {
-      return NextResponse.json({ error: error.message }, { status: 400 });
-    }
-    console.error("Request failed", error);
-    return NextResponse.json({ error: "internal server error" }, { status: 500 });
-  }
-}
-
-export function requireIngest(request: Request): NextResponse | null {
-  return hasIngestToken(request) ? null : unauthorized();
-}
-
-/**
- * Read access: the dashboard's own session cookie, or the dashboard password as a bearer
- * token so a native client can read the same history without a browser.
- */
-export async function requireReader(request: Request): Promise<NextResponse | null> {
-  if (await hasSession()) return null;
-  const header = request.headers.get("authorization") ?? "";
-  if (header.startsWith("Bearer ") && checkDashboardPassword(header.slice(7))) return null;
-  return unauthorized();
-}
-
-export async function parseJson(request: Request): Promise<unknown> {
-  const raw = await request.text();
-  if (raw.length > 512 * 1024) throw new ValidationError("body is too large");
-  try {
-    return JSON.parse(raw);
-  } catch {
-    throw new ValidationError("body is not valid JSON");
-  }
-}
diff --git a/web/src/lib/auth.ts b/web/src/lib/auth.ts
deleted file mode 100644
index c1355b5..0000000
--- a/web/src/lib/auth.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * The Next-aware half of authentication. Everything cryptographic lives in
- * {@link ./session}, which imports nothing from Next and is therefore unit-testable
- * without a request, a build, or a running server.
- */
-import { cookies } from "next/headers";
-import { redirect } from "next/navigation";
-import { SESSION_COOKIE, isValidSessionValue } from "./session";
-
-export * from "./session";
-
-export async function hasSession(): Promise<boolean> {
-  const store = await cookies();
-  return isValidSessionValue(store.get(SESSION_COOKIE)?.value);
-}
-
-/** For pages: send an unauthenticated visitor to the password screen. */
-export async function requireSession(): Promise<void> {
-  if (!(await hasSession())) redirect("/login");
-}
diff --git a/web/src/lib/data.ts b/web/src/lib/data.ts
deleted file mode 100644
index 50c1d07..0000000
--- a/web/src/lib/data.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { installationIds, readChargingSessions, readDays, readLatestTelemetry } from "./store";
-import type { ChargingSession, DailyConsumption, TelemetrySample } from "./types";
-
-/**
- * Reads for the dashboard.
- *
- * Every query is scoped to one installation id. There is one car today, but the id is on
- * every point, so scoping now costs nothing and means a second head unit does not
- * silently merge its history into the first one's charts.
- */
-
-export interface Overview {
-  installationId: string | null;
-  installationCount: number;
-  days: DailyConsumption[];
-  sessions: ChargingSession[];
-  latest: (TelemetrySample & { at: Date }) | null;
-}
-
-/** The installation that reported most recently — the car in use, if there are ever two. */
-export async function latestInstallationId(): Promise<{ id: string | null; count: number }> {
-  const ids = await installationIds();
-  return { id: ids[0] ?? null, count: ids.length };
-}
-
-export async function loadOverview(dayLimit = 60, sessionLimit = 60): Promise<Overview> {
-  const { id, count } = await latestInstallationId();
-  if (!id) return { installationId: null, installationCount: 0, days: [], sessions: [], latest: null };
-  const [days, sessions, latest] = await Promise.all([
-    readDays(id),
-    readChargingSessions(id, sessionLimit),
-    readLatestTelemetry(id),
-  ]);
-  // Charts read left-to-right in time; the reads come newest-first so the limit keeps
-  // the recent end rather than the beginning of history.
-  return {
-    installationId: id,
-    installationCount: count,
-    days: days.slice(0, dayLimit).reverse(),
-    sessions,
-    latest,
-  };
-}
-
-export interface ChargeTotals {
-  energyKwh: number;
-  gridEnergyKwh: number;
-  cost: number;
-  sessions: number;
-  seconds: number;
-  socGained: number;
-  peakKw: number;
-}
-
-export function sumCharging(sessions: ChargingSession[]): ChargeTotals {
-  return sessions.reduce<ChargeTotals>(
-    (total, session) => ({
-      energyKwh: total.energyKwh + session.energyKwh,
-      gridEnergyKwh: total.gridEnergyKwh + (session.gridEnergyKwh ?? session.energyKwh * 1.1),
-      cost: total.cost + session.totalCost,
-      sessions: total.sessions + 1,
-      seconds: total.seconds + session.durationSeconds,
-      socGained:
-        total.socGained +
-        (session.startSocPercent !== undefined && session.endSocPercent !== undefined
-          ? Math.max(0, session.endSocPercent - session.startSocPercent)
-          : 0),
-      peakKw: Math.max(total.peakKw, ...session.curve.map((point) => point.powerKw), 0),
-    }),
-    { energyKwh: 0, gridEnergyKwh: 0, cost: 0, sessions: 0, seconds: 0, socGained: 0, peakKw: 0 },
-  );
-}
-
-export function sumDays(days: DailyConsumption[]) {
-  return days.reduce(
-    (total, record) => ({
-      km: total.km + record.day.km,
-      kwh: total.kwh + record.day.kwh,
-      hours: total.hours + record.day.hours,
-    }),
-    { km: 0, kwh: 0, hours: 0 },
-  );
-}
diff --git a/web/src/lib/days.ts b/web/src/lib/days.ts
deleted file mode 100644
index e5a36fd..0000000
--- a/web/src/lib/days.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import type { ConsumptionChunk, DailyConsumption, Totals } from "./types.ts";
-
-/**
- * Folds chunks into days, newest day first, each with its running lifetime total.
- * Pure, so the arithmetic is tested without a database.
- */
-export function aggregateDays(chunks: ConsumptionChunk[]): DailyConsumption[] {
-  const byDate = new Map<string, DailyConsumption & { sohAt: number }>();
-  for (const chunk of chunks) {
-    let day = byDate.get(chunk.date);
-    if (!day) {
-      day = {
-        installationId: chunk.installationId,
-        date: chunk.date,
-        recordedAt: chunk.recordedAt,
-        day: { km: 0, kwh: 0, hours: 0, socDrop: 0 },
-        sohAt: -Infinity,
-      };
-      byDate.set(chunk.date, day);
-    }
-    day.day.km += chunk.day.km;
-    day.day.kwh += chunk.day.kwh;
-    day.day.hours += chunk.day.hours;
-    day.day.socDrop += chunk.day.socDrop;
-    const at = chunk.recordedAt.getTime();
-    if (at > day.recordedAt.getTime()) day.recordedAt = chunk.recordedAt;
-    // The newest manual SoH of the day wins.
-    if (chunk.sohPercent !== undefined && at > day.sohAt) {
-      day.sohPercent = chunk.sohPercent;
-      day.sohAt = at;
-    }
-  }
-  const ascending = [...byDate.values()].sort((a, b) => a.date.localeCompare(b.date));
-  const running: Totals = { km: 0, kwh: 0, hours: 0, socDrop: 0 };
-  const days = ascending.map(({ sohAt: _sohAt, ...day }) => {
-    running.km += day.day.km;
-    running.kwh += day.day.kwh;
-    running.hours += day.day.hours;
-    running.socDrop += day.day.socDrop;
-    return { ...day, lifetime: { ...running } };
-  });
-  return days.reverse();
-}
diff --git a/web/src/lib/format.ts b/web/src/lib/format.ts
deleted file mode 100644
index 4343772..0000000
--- a/web/src/lib/format.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/** English formatting (en-GB: 24-hour clock, day-month dates) with euro for every number and date. */
-
-const NUMBER = new Intl.NumberFormat("en-GB", { maximumFractionDigits: 1 });
-const PRECISE = new Intl.NumberFormat("en-GB", { minimumFractionDigits: 2, maximumFractionDigits: 2 });
-const CURRENCY = new Intl.NumberFormat("en-GB", { style: "currency", currency: "EUR", maximumFractionDigits: 2 });
-const DATE = new Intl.DateTimeFormat("en-GB", { day: "numeric", month: "long", year: "numeric" });
-const DATE_TIME = new Intl.DateTimeFormat("en-GB", {
-  day: "numeric",
-  month: "short",
-  hour: "2-digit",
-  minute: "2-digit",
-});
-
-export function num(value: number): string {
-  return NUMBER.format(value);
-}
-
-export function precise(value: number): string {
-  return PRECISE.format(value);
-}
-
-export function money(value: number): string {
-  return CURRENCY.format(value);
-}
-
-export function isoDate(iso: string): string {
-  const [year, month, day] = iso.split("-").map(Number);
-  return DATE.format(new Date(Date.UTC(year, month - 1, day)));
-}
-
-export function dateTime(value: Date | string): string {
-  return DATE_TIME.format(new Date(value));
-}
-
-/** `2 h 05 min` — the same shape the car's charging pane uses. */
-export function duration(seconds: number): string {
-  const total = Math.max(0, Math.round(seconds));
-  const hours = Math.floor(total / 3600);
-  const minutes = Math.floor((total % 3600) / 60);
-  if (hours === 0) return `${minutes} min`;
-  return `${hours} h ${String(minutes).padStart(2, "0")} min`;
-}
-
-/** Energy per 100 km, or a dash — never a ratio computed from a distance of nothing. */
-export function efficiency(kwh: number, km: number): string {
-  if (km < 1) return "—";
-  return `${num((kwh * 100) / km)} kWh/100 km`;
-}
diff --git a/web/src/lib/influx.ts b/web/src/lib/influx.ts
deleted file mode 100644
index 4bb8c7d..0000000
--- a/web/src/lib/influx.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { InfluxDB, type QueryApi, type WriteApi } from "@influxdata/influxdb-client";
-
-/**
- * One InfluxDB client per server process.
- *
- * Configured entirely from the environment so the image carries no credentials:
- * INFLUX_URL, INFLUX_TOKEN, INFLUX_ORG and INFLUX_BUCKET (default "mg4"). The global
- * survives module reloads in dev, where Next re-evaluates modules on every edit.
- */
-const globalForInflux = globalThis as unknown as { influx?: InfluxDB };
-
-function env(name: string): string {
-  const value = process.env[name];
-  if (!value) throw new Error(`${name} is not configured`);
-  return value;
-}
-
-function client(): InfluxDB {
-  if (!globalForInflux.influx) {
-    globalForInflux.influx = new InfluxDB({ url: env("INFLUX_URL"), token: env("INFLUX_TOKEN"), timeout: 10_000 });
-  }
-  return globalForInflux.influx;
-}
-
-export function bucket(): string {
-  return process.env.INFLUX_BUCKET || "mg4";
-}
-
-/** A write API with millisecond precision; the caller must close() it to flush. */
-export function writeApi(): WriteApi {
-  return client().getWriteApi(env("INFLUX_ORG"), bucket(), "ms", {
-    // The caller waits for close(); a failed write must reach it rather than be retried
-    // in the background after the car has already been told it succeeded.
-    maxRetries: 0,
-  });
-}
-
-export function queryApi(): QueryApi {
-  return client().getQueryApi(env("INFLUX_ORG"));
-}
diff --git a/web/src/lib/session.ts b/web/src/lib/session.ts
deleted file mode 100644
index 07fbf8a..0000000
--- a/web/src/lib/session.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import crypto from "node:crypto";
-
-/**
- * Two separate credentials, deliberately.
- *
- * The car holds {@link INGEST_TOKEN} and can only write. It is baked into a build that
- * lives on a head unit and is published as an APK, so it must be assumed extractable —
- * and an extracted write token buys nothing but the ability to post junk under an
- * installation id the attacker would have to guess.
- *
- * Reading the history needs the dashboard password, which never leaves the browser's
- * cookie jar and is never compiled into anything.
- */
-export const SESSION_COOKIE = "nilsmg4_session";
-const SESSION_TTL_SECONDS = 60 * 60 * 24 * 30;
-
-/** Constant-time compare that does not leak length through an early return. */
-function sameSecret(supplied: string, expected: string): boolean {
-  const a = crypto.createHash("sha256").update(supplied).digest();
-  const b = crypto.createHash("sha256").update(expected).digest();
-  return crypto.timingSafeEqual(a, b);
-}
-
-function requireEnv(name: string): string {
-  const value = process.env[name];
-  if (!value) throw new Error(`${name} is not configured`);
-  return value;
-}
-
-/** Does this request carry the car's write token? */
-export function hasIngestToken(request: Request): boolean {
-  const expected = process.env.INGEST_TOKEN;
-  if (!expected || expected.length < 24) return false;
-  const header = request.headers.get("authorization") ?? "";
-  if (!header.startsWith("Bearer ")) return false;
-  return sameSecret(header.slice(7), expected);
-}
-
-export function checkDashboardPassword(supplied: string): boolean {
-  const expected = process.env.DASHBOARD_PASSWORD;
-  if (!expected || expected.length < 8) return false;
-  return sameSecret(supplied, expected);
-}
-
-/**
- * `<expiry>.<hmac>` — no server-side session store, which a serverless deployment has
- * nowhere to keep anyway. The expiry is inside the signed payload, so a browser that
- * keeps the cookie past its date cannot use it.
- */
-export function issueSessionValue(): string {
-  const expiresAt = Math.floor(Date.now() / 1000) + SESSION_TTL_SECONDS;
-  return `${expiresAt}.${sign(String(expiresAt))}`;
-}
-
-function sign(payload: string): string {
-  return crypto.createHmac("sha256", requireEnv("SESSION_SECRET")).update(payload).digest("hex");
-}
-
-export function isValidSessionValue(value: string | undefined): boolean {
-  if (!value) return false;
-  const separator = value.lastIndexOf(".");
-  if (separator <= 0) return false;
-  const expiresAt = Number(value.slice(0, separator));
-  if (!Number.isSafeInteger(expiresAt) || expiresAt * 1000 < Date.now()) return false;
-  try {
-    const expected = Buffer.from(sign(String(expiresAt)), "hex");
-    const supplied = Buffer.from(value.slice(separator + 1), "hex");
-    return expected.length === supplied.length && crypto.timingSafeEqual(expected, supplied);
-  } catch {
-    return false;
-  }
-}
-
-export const sessionCookieOptions = {
-  httpOnly: true,
-  secure: process.env.NODE_ENV === "production",
-  sameSite: "lax",
-  path: "/",
-  maxAge: SESSION_TTL_SECONDS,
-} as const;
diff --git a/web/src/lib/store.ts b/web/src/lib/store.ts
deleted file mode 100644
index 7836506..0000000
--- a/web/src/lib/store.ts
+++ /dev/null
@@ -1,225 +0,0 @@
-import { Point, flux } from "@influxdata/influxdb-client";
-import { aggregateDays } from "./days.ts";
-import { bucket, queryApi, writeApi } from "./influx.ts";
-import {
-  TELEMETRY_FLAGS,
-  TELEMETRY_NUMBERS,
-  type ChargingSession,
-  type ConsumptionChunk,
-  type CurvePoint,
-  type DailyConsumption,
-  type TelemetrySample,
-} from "./types.ts";
-
-/**
- * Storage on InfluxDB 2. One bucket; every point carries an `installationId` tag.
- *
- *   consumption_chunk  time = recordedAt   tags: date               km, kwh, hours, socDrop, sohPercent
- *   charging_session   time = startedAt    tags: sessionId          summary fields
- *   charging_curve     time = point time   tags: sessionId          powerKw, socPercent
- *   telemetry          time = sample utc                            ABRP tlm fields
- *
- * Idempotency comes from InfluxDB itself: a point with the same measurement, tags and
- * timestamp replaces the earlier one. The car re-sends a cached chunk with its original
- * recordedAt and a session under its own id, so a retry overwrites instead of adding.
- *
- * Every numeric field is written as a float. InfluxDB fixes a field's type on first
- * write, so a 0 sent as an integer would make every later 0.5 a rejected write.
- */
-
-const TAG = "installationId";
-
-async function write(points: Point[]): Promise<void> {
-  const api = writeApi();
-  api.writePoints(points);
-  await api.close();
-}
-
-export async function writeConsumptionChunk(chunk: ConsumptionChunk): Promise<void> {
-  const point = new Point("consumption_chunk")
-    .tag(TAG, chunk.installationId)
-    .tag("date", chunk.date)
-    .floatField("km", chunk.day.km)
-    .floatField("kwh", chunk.day.kwh)
-    .floatField("hours", chunk.day.hours)
-    .floatField("socDrop", chunk.day.socDrop)
-    .timestamp(chunk.recordedAt);
-  if (chunk.sohPercent !== undefined) point.floatField("sohPercent", chunk.sohPercent);
-  await write([point]);
-}
-
-export async function writeChargingSession(session: ChargingSession): Promise<void> {
-  const summary = new Point("charging_session")
-    .tag(TAG, session.installationId)
-    .tag("sessionId", session.sessionId)
-    .intField("endedAtMs", session.endedAt.getTime())
-    .floatField("durationSeconds", session.durationSeconds)
-    .floatField("energyKwh", session.energyKwh)
-    .floatField("chargingLossPercent", session.chargingLossPercent)
-    .floatField("gridEnergyKwh", session.gridEnergyKwh)
-    .floatField("pricePerKwh", session.pricePerKwh)
-    .floatField("totalCost", session.totalCost)
-    .booleanField("isDemo", session.isDemo === true)
-    .timestamp(session.startedAt);
-  if (session.startSocPercent !== undefined) summary.floatField("startSocPercent", session.startSocPercent);
-  if (session.endSocPercent !== undefined) summary.floatField("endSocPercent", session.endSocPercent);
-  const curve = session.curve.map((p) => {
-    const point = new Point("charging_curve")
-      .tag(TAG, session.installationId)
-      .tag("sessionId", session.sessionId)
-      .floatField("powerKw", p.powerKw)
-      .timestamp(p.timestamp);
-    if (p.socPercent !== undefined) point.floatField("socPercent", p.socPercent);
-    return point;
-  });
-  await write([summary, ...curve]);
-}
-
-export async function writeTelemetry(installationId: string, samples: TelemetrySample[]): Promise<void> {
-  const points = samples.map((sample) => {
-    const point = new Point("telemetry").tag(TAG, installationId).timestamp(new Date(sample.utc * 1000));
-    for (const field of Object.keys(TELEMETRY_NUMBERS) as (keyof typeof TELEMETRY_NUMBERS)[]) {
-      const value = sample[field];
-      if (value !== undefined) point.floatField(field, value);
-    }
-    for (const field of TELEMETRY_FLAGS) {
-      const value = sample[field];
-      if (value !== undefined) point.booleanField(field, value);
-    }
-    return point;
-  });
-  await write(points);
-}
-
-// ---------- Reads ----------
-
-type Row = Record<string, unknown> & { _time: string };
-
-async function rows(query: ReturnType<typeof flux>): Promise<Row[]> {
-  return queryApi().collectRows<Row>(query);
-}
-
-function num(row: Row, field: string): number | undefined {
-  const value = row[field];
-  return typeof value === "number" && Number.isFinite(value) ? value : undefined;
-}
-
-export async function readConsumptionChunks(installationId: string): Promise<ConsumptionChunk[]> {
-  const result = await rows(flux`
-    from(bucket: ${bucket()})
-      |> range(start: 0)
-      |> filter(fn: (r) => r._measurement == "consumption_chunk" and r.installationId == ${installationId})
-      |> pivot(rowKey: ["_time"], columnKey: ["_field"], valueColumn: "_value")`);
-  return result.map((row) => {
-    const sohPercent = num(row, "sohPercent");
-    return {
-      installationId,
-      date: String(row.date),
-      recordedAt: new Date(row._time),
-      day: {
-        km: num(row, "km") ?? 0,
-        kwh: num(row, "kwh") ?? 0,
-        hours: num(row, "hours") ?? 0,
-        socDrop: num(row, "socDrop") ?? 0,
-      },
-      ...(sohPercent === undefined ? {} : { sohPercent }),
-    };
-  });
-}
-
-export async function readDays(installationId: string): Promise<DailyConsumption[]> {
-  return aggregateDays(await readConsumptionChunks(installationId));
-}
-
-export async function readChargingSessions(installationId: string, limit: number): Promise<ChargingSession[]> {
-  const summaries = await rows(flux`
-    from(bucket: ${bucket()})
-      |> range(start: 0)
-      |> filter(fn: (r) => r._measurement == "charging_session" and r.installationId == ${installationId})
-      |> pivot(rowKey: ["_time"], columnKey: ["_field"], valueColumn: "_value")
-      |> group()
-      |> sort(columns: ["_time"], desc: true)
-      |> limit(n: ${limit})`);
-  if (summaries.length === 0) return [];
-
-  const sessions: ChargingSession[] = summaries.map((row) => {
-    const startSocPercent = num(row, "startSocPercent");
-    const endSocPercent = num(row, "endSocPercent");
-    return {
-      installationId,
-      sessionId: String(row.sessionId),
-      startedAt: new Date(row._time),
-      endedAt: new Date(num(row, "endedAtMs") ?? Date.parse(row._time)),
-      durationSeconds: num(row, "durationSeconds") ?? 0,
-      energyKwh: num(row, "energyKwh") ?? 0,
-      chargingLossPercent: num(row, "chargingLossPercent") ?? 10,
-      gridEnergyKwh: num(row, "gridEnergyKwh") ?? 0,
-      pricePerKwh: num(row, "pricePerKwh") ?? 0,
-      totalCost: num(row, "totalCost") ?? 0,
-      ...(row.isDemo === true ? { isDemo: true } : {}),
-      ...(startSocPercent === undefined ? {} : { startSocPercent }),
-      ...(endSocPercent === undefined ? {} : { endSocPercent }),
-      curve: [],
-    };
-  });
-
-  // Curves for exactly these sessions: bounded by the oldest start and the newest end.
-  const start = new Date(Math.min(...sessions.map((s) => s.startedAt.getTime())));
-  const stop = new Date(Math.max(...sessions.map((s) => s.endedAt.getTime())) + 1000);
-  const curveRows = await rows(flux`
-    from(bucket: ${bucket()})
-      |> range(start: ${start}, stop: ${stop})
-      |> filter(fn: (r) => r._measurement == "charging_curve" and r.installationId == ${installationId})
-      |> pivot(rowKey: ["_time"], columnKey: ["_field"], valueColumn: "_value")`);
-  const bySession = new Map(sessions.map((s) => [s.sessionId, s]));
-  for (const row of curveRows) {
-    const session = bySession.get(String(row.sessionId));
-    const powerKw = num(row, "powerKw");
-    if (!session || powerKw === undefined) continue;
-    const socPercent = num(row, "socPercent");
-    const point: CurvePoint = { timestamp: new Date(row._time), powerKw };
-    if (socPercent !== undefined) point.socPercent = socPercent;
-    session.curve.push(point);
-  }
-  for (const session of sessions) session.curve.sort((a, b) => a.timestamp.getTime() - b.timestamp.getTime());
-  return sessions;
-}
-
-/** Installations that reported in the last 400 days, the most recent first. */
-export async function installationIds(): Promise<string[]> {
-  const result = await rows(flux`
-    from(bucket: ${bucket()})
-      |> range(start: -400d)
-      |> filter(fn: (r) => r._measurement == "consumption_chunk" or r._measurement == "charging_session" or r._measurement == "telemetry")
-      |> keep(columns: ["_time", "installationId"])
-      |> group(columns: ["installationId"])
-      |> max(column: "_time")
-      |> group()
-      |> sort(columns: ["_time"], desc: true)`);
-  return result.map((row) => String(row.installationId));
-}
-
-/**
- * The latest known value of every live field over the last 30 days, for the dashboard.
- * Per field rather than per sample: the newest sample may lack a GPS fix that the one
- * before it had. `at` is when the newest of them arrived. Null when nothing was sent.
- */
-export async function readLatestTelemetry(installationId: string): Promise<(TelemetrySample & { at: Date }) | null> {
-  const result = await rows(flux`
-    from(bucket: ${bucket()})
-      |> range(start: -30d)
-      |> filter(fn: (r) => r._measurement == "telemetry" and r.installationId == ${installationId})
-      |> last()`);
-  if (result.length === 0) return null;
-  const newest = Math.max(...result.map((row) => Date.parse(row._time)));
-  const sample: TelemetrySample & { at: Date } = { utc: Math.floor(newest / 1000), at: new Date(newest) };
-  const numbers = TELEMETRY_NUMBERS as Record<string, unknown>;
-  const flags = TELEMETRY_FLAGS as readonly string[];
-  for (const row of result) {
-    const field = String(row._field);
-    const value = row._value;
-    if (field in numbers && typeof value === "number") (sample as Record<string, unknown>)[field] = value;
-    if (flags.includes(field) && typeof value === "boolean") (sample as Record<string, unknown>)[field] = value;
-  }
-  return sample;
-}
diff --git a/web/src/lib/types.ts b/web/src/lib/types.ts
deleted file mode 100644
index c523a46..0000000
--- a/web/src/lib/types.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-/** Record shapes shared by validation, storage and the dashboard. */
-
-export interface Totals {
-  km: number;
-  kwh: number;
-  hours: number;
-  socDrop: number;
-}
-
-/** One day's consumption: the sum of every chunk the car sent for that date. */
-export interface DailyConsumption {
-  installationId: string;
-  /** The car's local date, YYYY-MM-DD. */
-  date: string;
-  /** When the newest chunk of the day was recorded. */
-  recordedAt: Date;
-  day: Totals;
-  /** Running total up to and including this day, derived when history is read. */
-  lifetime?: Totals;
-  sohPercent?: number;
-}
-
-/** One 2-minute delta chunk as the car sends it; days are built from these. */
-export interface ConsumptionChunk {
-  installationId: string;
-  date: string;
-  recordedAt: Date;
-  day: Totals;
-  sohPercent?: number;
-}
-
-export interface CurvePoint {
-  timestamp: Date;
-  powerKw: number;
-  socPercent?: number;
-}
-
-export interface ChargingSession {
-  installationId: string;
-  sessionId: string;
-  startedAt: Date;
-  endedAt: Date;
-  durationSeconds: number;
-  energyKwh: number;
-  chargingLossPercent: number;
-  gridEnergyKwh: number;
-  pricePerKwh: number;
-  totalCost: number;
-  isDemo?: boolean;
-  startSocPercent?: number;
-  endSocPercent?: number;
-  curve: CurvePoint[];
-}
-
-/** Numeric live-telemetry fields, named and unit-ed as ABRP's tlm/send expects them. */
-export const TELEMETRY_NUMBERS = {
-  soc: [0, 100], // %
-  speed: [0, 400], // km/h
-  power: [-1000, 1000], // kW, positive leaving the battery
-  est_battery_range: [0, 2000], // km
-  capacity: [0, 500], // kWh
-  soe: [0, 500], // kWh
-  soh: [0, 100], // %
-  kwh_charged: [0, 1000], // kWh, this charge session
-  odometer: [0, 10_000_000], // km
-  lat: [-90, 90],
-  lon: [-180, 180],
-  elevation: [-1000, 10_000], // m
-  heading: [0, 360], // °
-  batt_temp: [-60, 100], // °C
-  cabin_temp: [-60, 100], // °C
-  ext_temp: [-60, 70], // °C
-  hvac_setpoint: [0, 40], // °C
-  hvac_power: [0, 50], // kW
-  voltage: [0, 1500], // V
-  current: [-2000, 2000], // A
-  tire_pressure_fl: [0, 1000], // kPa
-  tire_pressure_fr: [0, 1000],
-  tire_pressure_rl: [0, 1000],
-  tire_pressure_rr: [0, 1000],
-} as const satisfies Record<string, readonly [number, number]>;
-
-/** Boolean live-telemetry fields; ABRP takes them as 0/1. */
-export const TELEMETRY_FLAGS = ["is_charging", "is_dcfc", "is_parked"] as const;
-
-export type TelemetryNumber = keyof typeof TELEMETRY_NUMBERS;
-export type TelemetryFlag = (typeof TELEMETRY_FLAGS)[number];
-
-/** One live sample. Only `utc` is always present; an unread signal is absent, never 0. */
-export type TelemetrySample = { utc: number } & Partial<Record<TelemetryNumber, number>> &
-  Partial<Record<TelemetryFlag, boolean>>;
-
-export interface TelemetryBatch {
-  installationId: string;
-  samples: TelemetrySample[];
-}
diff --git a/web/src/lib/validate.ts b/web/src/lib/validate.ts
deleted file mode 100644
index 945657e..0000000
--- a/web/src/lib/validate.ts
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * Request validation for the ingest endpoints — a direct port of the Express service's
- * rules, kept pure so it can be unit-tested without a database or a request.
- *
- * The car is the only writer and it is trusted, but a bad field here is written once and
- * read forever. Every number is bounded; an out-of-range value is rejected rather than
- * stored and quietly plotted.
- */
-import {
-  TELEMETRY_FLAGS,
-  TELEMETRY_NUMBERS,
-  type ChargingSession,
-  type ConsumptionChunk,
-  type CurvePoint,
-  type TelemetryBatch,
-  type TelemetrySample,
-  type Totals,
-} from "./types.ts";
-
-export class ValidationError extends Error {}
-
-const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-const ISO_DATE = /^\d{4}-\d{2}-\d{2}$/;
-
-export function validateConsumption(body: unknown): ConsumptionChunk {
-  const record = asObject(body);
-  const date = record.date;
-  if (typeof date !== "string" || !ISO_DATE.test(date)) throw new ValidationError("date is invalid");
-  const sohPercent = record.sohPercent;
-  // A lifetime from an older app is still validated, so a malformed one is still a 400,
-  // but it is not stored: the backend derives lifetime from the day totals.
-  if (record.lifetime !== undefined) validateTotals(record.lifetime, "lifetime");
-  return {
-    installationId: validateUuid(record.installationId, "installationId"),
-    date,
-    recordedAt: validateDate(record.recordedAt, "recordedAt"),
-    day: validateTotals(record.day, "day"),
-    ...(sohPercent === undefined ? {} : { sohPercent: bounded(sohPercent, 0, 100, "sohPercent") }),
-  };
-}
-
-export function validateChargingSession(body: unknown, pathSessionId: string): ChargingSession {
-  const record = asObject(body);
-  const sessionId = validateUuid(record.sessionId, "sessionId");
-  if (sessionId !== pathSessionId) throw new ValidationError("sessionId does not match path");
-  if (!Array.isArray(record.curve) || record.curve.length > 720) {
-    throw new ValidationError("curve is invalid");
-  }
-  const curve: CurvePoint[] = record.curve.map((entry) => {
-    const point = asObject(entry);
-    const socPercent = point.socPercent;
-    return {
-      timestamp: validateDate(point.timestampMs, "curve.timestampMs"),
-      powerKw: bounded(point.powerKw, 0, 1000, "curve.powerKw"),
-      ...(socPercent === undefined ? {} : { socPercent: bounded(socPercent, 0, 100, "curve.socPercent") }),
-    };
-  });
-  const startSocPercent = record.startSocPercent;
-  const endSocPercent = record.endSocPercent;
-  const isDemo = record.isDemo;
-  const energyKwh = bounded(record.energyKwh, 0, 1000, "energyKwh");
-  const pricePerKwh = bounded(record.pricePerKwh, 0, 1_000_000, "pricePerKwh");
-  const chargingLossPercent = 10;
-  const gridEnergyKwh = energyKwh * 1.1;
-  return {
-    installationId: validateUuid(record.installationId, "installationId"),
-    sessionId,
-    startedAt: validateDate(record.startedAt, "startedAt"),
-    endedAt: validateDate(record.endedAt, "endedAt"),
-    durationSeconds: bounded(record.durationSeconds, 0, 604800, "durationSeconds"),
-    energyKwh,
-    chargingLossPercent,
-    gridEnergyKwh,
-    pricePerKwh,
-    totalCost: gridEnergyKwh * pricePerKwh,
-    ...(isDemo === true ? { isDemo: true } : {}),
-    ...(startSocPercent === undefined ? {} : { startSocPercent: bounded(startSocPercent, 0, 100, "startSocPercent") }),
-    ...(endSocPercent === undefined ? {} : { endSocPercent: bounded(endSocPercent, 0, 100, "endSocPercent") }),
-    curve,
-  };
-}
-
-const MAX_SAMPLES = 500;
-/** Epoch seconds: 2001 to 2286. Milliseconds would be far above the upper bound. */
-const UTC_MIN = 1_000_000_000;
-const UTC_MAX = 9_999_999_999;
-
-/**
- * A batch of live samples in ABRP's tlm field names and units. Fields the server does not
- * know are dropped rather than rejected, so a newer app can add one without a server
- * release; every known field is bounded, and a flag may be sent as 0/1 or a boolean.
- */
-export function validateTelemetryBatch(body: unknown): TelemetryBatch {
-  const record = asObject(body);
-  const installationId = validateUuid(record.installationId, "installationId");
-  const samples = record.samples;
-  if (!Array.isArray(samples) || samples.length === 0 || samples.length > MAX_SAMPLES) {
-    throw new ValidationError("samples is invalid");
-  }
-  return { installationId, samples: samples.map((entry, i) => validateSample(entry, `samples[${i}]`)) };
-}
-
-function validateSample(entry: unknown, name: string): TelemetrySample {
-  const raw = asObject(entry);
-  const utc = raw.utc;
-  if (typeof utc !== "number" || !Number.isSafeInteger(utc) || utc < UTC_MIN || utc > UTC_MAX) {
-    throw new ValidationError(`${name}.utc is invalid`);
-  }
-  const sample: TelemetrySample = { utc };
-  for (const [field, [min, max]] of Object.entries(TELEMETRY_NUMBERS)) {
-    const value = raw[field];
-    if (value === undefined || value === null) continue;
-    (sample as Record<string, unknown>)[field] = bounded(value, min, max, `${name}.${field}`);
-  }
-  for (const field of TELEMETRY_FLAGS) {
-    const value = raw[field];
-    if (value === undefined || value === null) continue;
-    if (value === true || value === 1) sample[field] = true;
-    else if (value === false || value === 0) sample[field] = false;
-    else throw new ValidationError(`${name}.${field} is invalid`);
-  }
-  // A position is only a position as a pair.
-  if ((sample.lat === undefined) !== (sample.lon === undefined)) {
-    throw new ValidationError(`${name}.lat and lon must be sent together`);
-  }
-  return sample;
-}
-
-export function validateUuid(value: unknown, name: string): string {
-  if (typeof value !== "string" || !UUID.test(value)) throw new ValidationError(`${name} is invalid`);
-  return value;
-}
-
-function asObject(value: unknown): Record<string, unknown> {
-  if (!value || typeof value !== "object" || Array.isArray(value)) {
-    throw new ValidationError("body is required");
-  }
-  return value as Record<string, unknown>;
-}
-
-/** Epoch milliseconds on the wire; a Date in the database. */
-function validateDate(value: unknown, name: string): Date {
-  if (typeof value !== "number" || !Number.isSafeInteger(value) || value < 0) {
-    throw new ValidationError(`${name} is invalid`);
-  }
-  return new Date(value);
-}
-
-function bounded(value: unknown, min: number, max: number, name: string): number {
-  if (typeof value !== "number" || !Number.isFinite(value) || value < min || value > max) {
-    throw new ValidationError(`${name} is invalid`);
-  }
-  return value;
-}
-
-function validateTotals(value: unknown, name: string): Totals {
-  const record = asObject(value);
-  const result = {} as Totals;
-  for (const field of ["km", "kwh", "hours", "socDrop"] as const) {
-    const number = record[field];
-    if (typeof number !== "number" || !Number.isFinite(number) || Math.abs(number) > 10_000_000) {
-      throw new ValidationError(`${name}.${field} is invalid`);
-    }
-    result[field] = number;
-  }
-  return result;
-}
diff --git a/web/test/days.test.ts b/web/test/days.test.ts
deleted file mode 100644
index 6fb6486..0000000
--- a/web/test/days.test.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import assert from "node:assert/strict";
-import { test } from "node:test";
-import { aggregateDays } from "../src/lib/days.ts";
-
-const ID = "6f1a2b3c-4d5e-4f60-8a9b-0c1d2e3f4a5b";
-const chunk = (date: string, at: number, km: number, kwh: number, sohPercent?: number) => ({
-  installationId: ID,
-  date,
-  recordedAt: new Date(at),
-  day: { km, kwh, hours: km / 50, socDrop: kwh / 0.6 },
-  ...(sohPercent === undefined ? {} : { sohPercent }),
-});
-
-test("adds chunks up per day, newest day first, with a running lifetime", () => {
-  const days = aggregateDays([
-    chunk("2026-10-16", 1_000, 10, 2),
-    chunk("2026-10-17", 3_000, 5, 1),
-    chunk("2026-10-16", 2_000, 20, 3),
-  ]);
-  assert.deepEqual(days.map((d) => d.date), ["2026-10-17", "2026-10-16"]);
-  assert.equal(days[1].day.km, 30);
-  assert.equal(days[1].day.kwh, 5);
-  assert.equal(days[1].recordedAt.getTime(), 2_000);
-  assert.equal(days[1].lifetime?.km, 30);
-  assert.equal(days[0].lifetime?.km, 35);
-  assert.equal(days[0].lifetime?.kwh, 6);
-});
-
-test("the newest manual SoH of a day wins, and a day without one has none", () => {
-  const days = aggregateDays([
-    chunk("2026-10-16", 2_000, 1, 1, 96),
-    chunk("2026-10-16", 1_000, 1, 1, 98),
-    chunk("2026-10-17", 3_000, 1, 1),
-  ]);
-  assert.equal(days[1].sohPercent, 96);
-  assert.equal("sohPercent" in days[0], false);
-});
diff --git a/web/test/session.test.ts b/web/test/session.test.ts
deleted file mode 100644
index 6d14b6f..0000000
--- a/web/test/session.test.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import assert from "node:assert/strict";
-import { test } from "node:test";
-
-process.env.SESSION_SECRET = "0123456789abcdef0123456789abcdef";
-process.env.DASHBOARD_PASSWORD = "correct-horse-battery";
-process.env.INGEST_TOKEN = "a".repeat(64);
-
-const { checkDashboardPassword, hasIngestToken, isValidSessionValue, issueSessionValue } =
-  await import("../src/lib/session.ts");
-
-test("a freshly issued session validates and a tampered one does not", () => {
-  const value = issueSessionValue();
-  assert.equal(isValidSessionValue(value), true);
-  const [expiry, signature] = value.split(".");
-  // Moving the expiry out invalidates the signature, so a cookie cannot extend itself.
-  assert.equal(isValidSessionValue(`${Number(expiry) + 86_400}.${signature}`), false);
-  assert.equal(isValidSessionValue(`${expiry}.${"0".repeat(signature.length)}`), false);
-  assert.equal(isValidSessionValue(undefined), false);
-  assert.equal(isValidSessionValue("garbage"), false);
-});
-
-test("an expired session is refused even with a valid signature", async () => {
-  const past = Math.floor(Date.now() / 1000) - 10;
-  // Signed by the same secret, so only the embedded expiry rejects it.
-  const crypto = await import("node:crypto");
-  const signature = crypto.createHmac("sha256", process.env.SESSION_SECRET as string)
-    .update(String(past)).digest("hex");
-  assert.equal(isValidSessionValue(`${past}.${signature}`), false);
-});
-
-test("the dashboard password is exact", () => {
-  assert.equal(checkDashboardPassword("correct-horse-battery"), true);
-  assert.equal(checkDashboardPassword("correct-horse-batter"), false);
-  assert.equal(checkDashboardPassword(""), false);
-});
-
-test("the ingest token is only accepted as a bearer header", () => {
-  const token = "a".repeat(64);
-  const bearer = (value: string) => new Request("https://x/v1", { headers: { authorization: value } });
-  assert.equal(hasIngestToken(bearer(`Bearer ${token}`)), true);
-  assert.equal(hasIngestToken(bearer(token)), false);
-  assert.equal(hasIngestToken(bearer(`Bearer ${"b".repeat(64)}`)), false);
-  assert.equal(hasIngestToken(new Request("https://x/v1")), false);
-});
diff --git a/web/test/telemetry.test.ts b/web/test/telemetry.test.ts
deleted file mode 100644
index 7adea8a..0000000
--- a/web/test/telemetry.test.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import assert from "node:assert/strict";
-import { test } from "node:test";
-import { pickForForward, resetAbrpState, toTlm } from "../src/lib/abrp.ts";
-import { ValidationError, validateTelemetryBatch } from "../src/lib/validate.ts";
-
-const INSTALLATION = "6f1a2b3c-4d5e-4f60-8a9b-0c1d2e3f4a5b";
-const NOW_S = 1_790_000_000;
-
-test("accepts a sample in ABRP's field names and keeps only what was sent", () => {
-  const batch = validateTelemetryBatch({
-    installationId: INSTALLATION,
-    samples: [{ utc: NOW_S, soc: 81, power: -12.5, speed: 0, lat: 52.1, lon: 7.6, is_charging: 1, is_dcfc: false }],
-  });
-  assert.deepEqual(batch.samples[0], {
-    utc: NOW_S, soc: 81, power: -12.5, speed: 0, lat: 52.1, lon: 7.6, is_charging: true, is_dcfc: false,
-  });
-  // An unread signal stays absent: a missing SOC must never become 0.
-  assert.equal("est_battery_range" in batch.samples[0], false);
-});
-
-test("drops unknown fields instead of rejecting the batch", () => {
-  const batch = validateTelemetryBatch({ installationId: INSTALLATION, samples: [{ utc: NOW_S, future_field: 3 }] });
-  assert.deepEqual(batch.samples[0], { utc: NOW_S });
-});
-
-test("rejects bad timestamps, out-of-range values, bad flags and half positions", () => {
-  const send = (sample: object) => validateTelemetryBatch({ installationId: INSTALLATION, samples: [sample] });
-  assert.throws(() => send({ utc: NOW_S * 1000 }), ValidationError); // milliseconds, not seconds
-  assert.throws(() => send({ utc: 1.5 }), ValidationError);
-  assert.throws(() => send({ utc: NOW_S, soc: 101 }), ValidationError);
-  assert.throws(() => send({ utc: NOW_S, speed: "fast" }), ValidationError);
-  assert.throws(() => send({ utc: NOW_S, is_parked: 2 }), ValidationError);
-  assert.throws(() => send({ utc: NOW_S, lat: 52.1 }), ValidationError);
-});
-
-test("rejects empty and oversized batches and bad installation ids", () => {
-  assert.throws(() => validateTelemetryBatch({ installationId: INSTALLATION, samples: [] }), ValidationError);
-  const many = Array.from({ length: 501 }, (_, i) => ({ utc: NOW_S + i }));
-  assert.throws(() => validateTelemetryBatch({ installationId: INSTALLATION, samples: many }), ValidationError);
-  assert.throws(() => validateTelemetryBatch({ installationId: "nope", samples: [{ utc: NOW_S }] }), ValidationError);
-});
-
-test("ABRP gets flags as 0/1", () => {
-  assert.deepEqual(toTlm({ utc: NOW_S, soc: 50, is_charging: true, is_parked: false }), {
-    utc: NOW_S, soc: 50, is_charging: 1, is_parked: 0,
-  });
-});
-
-test("forwards only the newest fresh sample, at most once per interval", () => {
-  resetAbrpState();
-  const nowMs = NOW_S * 1000;
-  const picked = pickForForward([{ utc: NOW_S - 10 }, { utc: NOW_S - 2 }, { utc: NOW_S - 5 }], nowMs);
-  assert.equal(picked?.utc, NOW_S - 2);
-  // A sample from ten minutes ago describes a car that has moved on.
-  assert.equal(pickForForward([{ utc: NOW_S - 600 }], nowMs), null);
-});
diff --git a/web/test/validate.test.ts b/web/test/validate.test.ts
deleted file mode 100644
index eeef907..0000000
--- a/web/test/validate.test.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import assert from "node:assert/strict";
-import { test } from "node:test";
-import { ValidationError, validateChargingSession, validateConsumption } from "../src/lib/validate.ts";
-
-const INSTALLATION = "6f1a2b3c-4d5e-4f60-8a9b-0c1d2e3f4a5b";
-const SESSION = "11111111-2222-4333-8444-555555555555";
-
-const day = { km: 42.5, kwh: 7.25, hours: 0.9, socDrop: 11.5 };
-
-test("accepts a well-formed daily record", () => {
-  const record = validateConsumption({
-    installationId: INSTALLATION,
-    date: "2026-10-07",
-    recordedAt: 1_760_000_000_000,
-    day,
-    lifetime: { km: 12000, kwh: 2100, hours: 240, socDrop: 3400 },
-    sohPercent: 97.5,
-  });
-  assert.equal(record.date, "2026-10-07");
-  assert.equal(record.day.kwh, 7.25);
-  assert.ok(record.recordedAt instanceof Date);
-});
-
-test("a missing SOH is omitted rather than defaulted", () => {
-  // The car omits a field it could not read. Writing 0 here would be a battery at
-  // nothing, which is the same class of lie the telemetry side refuses to send.
-  const record = validateConsumption({
-    installationId: INSTALLATION,
-    date: "2026-10-07",
-    recordedAt: 1,
-    day,
-    lifetime: day,
-  });
-  assert.equal("sohPercent" in record, false);
-});
-
-test("rejects malformed identifiers, dates and out-of-range numbers", () => {
-  const base = { installationId: INSTALLATION, date: "2026-10-07", recordedAt: 1, day, lifetime: day };
-  assert.throws(() => validateConsumption({ ...base, installationId: "nope" }), ValidationError);
-  assert.throws(() => validateConsumption({ ...base, date: "07.10.2026" }), ValidationError);
-  assert.throws(() => validateConsumption({ ...base, sohPercent: 140 }), ValidationError);
-  assert.throws(() => validateConsumption({ ...base, day: { ...day, kwh: "7" } }), ValidationError);
-  assert.throws(() => validateConsumption({ ...base, recordedAt: -1 }), ValidationError);
-  assert.throws(() => validateConsumption(null), ValidationError);
-});
-
-test("a charging session must match the id in its path", () => {
-  const body = {
-    installationId: INSTALLATION,
-    sessionId: SESSION,
-    startedAt: 1_760_000_000_000,
-    endedAt: 1_760_002_000_000,
-    durationSeconds: 1800,
-    energyKwh: 31.4,
-    chargingLossPercent: 10,
-    gridEnergyKwh: 34.54,
-    pricePerKwh: 7.5,
-    totalCost: 235.5,
-    isDemo: true,
-    startSocPercent: 18,
-    endSocPercent: 72,
-    curve: [{ timestampMs: 1_760_000_060_000, powerKw: 84.2, socPercent: 20 }],
-  };
-  const record = validateChargingSession(body, SESSION);
-  assert.equal(record.curve.length, 1);
-  assert.equal(record.curve[0].powerKw, 84.2);
-  assert.equal(record.chargingLossPercent, 10);
-  assert.equal(record.gridEnergyKwh, 34.54);
-  assert.equal(record.totalCost, 259.05);
-  assert.equal(record.isDemo, true);
-  assert.throws(() => validateChargingSession(body, "11111111-2222-4333-8444-555555555556"), ValidationError);
-});
-
-test("refuses a curve longer than the car can produce", () => {
-  const curve = Array.from({ length: 721 }, (_unused, index) => ({
-    timestampMs: 1_760_000_000_000 + index * 60_000,
-    powerKw: 50,
-  }));
-  assert.throws(
-    () =>
-      validateChargingSession(
-        {
-          installationId: INSTALLATION,
-          sessionId: SESSION,
-          startedAt: 1,
-          endedAt: 2,
-          durationSeconds: 1,
-          energyKwh: 1,
-          chargingLossPercent: 10,
-          gridEnergyKwh: 1.1,
-          pricePerKwh: 1,
-          totalCost: 1,
-          curve,
-        },
-        SESSION,
-      ),
-    ValidationError,
-  );
-});
diff --git a/web/tsconfig.json b/web/tsconfig.json
deleted file mode 100644
index deb57ab..0000000
--- a/web/tsconfig.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2022",
-    "lib": ["dom", "dom.iterable", "ES2022"],
-    "allowJs": false,
-    "skipLibCheck": true,
-    "strict": true,
-    "noEmit": true,
-    "allowImportingTsExtensions": true,
-    "esModuleInterop": true,
-    "module": "esnext",
-    "moduleResolution": "bundler",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "jsx": "preserve",
-    "incremental": true,
-    "plugins": [{ "name": "next" }],
-    "paths": { "@/*": ["./src/*"] }
-  },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
-  "exclude": ["node_modules"]
-}

From 5473ab1c2b6f74aa539f22672923a9ffca8d0aa8 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 15:18:09 +0200
Subject: [PATCH 19/79] Dashboards in Grafana; clean up after the Next.js app
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- k8s/grafana.yaml: Grafana 13.2.3 with a 1Gi PVC, sign-up and
  anonymous access off. The InfluxDB datasource (URL and token from the
  environment) and three dashboards — Live, Consumption, Charging — are
  provisioned from k8s/grafana/ via kustomize-generated ConfigMaps.
- server.yaml for the Go server (port 8080, UID 65532, smaller limits),
  image tag 2.0.0. The NetworkPolicy now admits Grafana to InfluxDB.
- ingress.yaml: IngressRoutes for car.stinnesbeck.com and Grafana
  (placeholder host car-grafana.stinnesbeck.com) with tls: {}, using
  Traefik's default certificate; the cert-manager Certificate is gone.
- secrets.example.yaml: drops the dashboard secrets, adds grafana-admin.
- AGENTS.md loses its Next.js block; SPECS.md describes the new setup.

The removal of web/ (the Next.js app) and of the stale .next/ cache
upstream had committed already landed in 51e6f6f, which was staged
together with the Go server by mistake.

Checked end to end in podman (Go server + InfluxDB 2.7.12 + Grafana
13.2.3): all 25 dashboard queries return the expected data, and the
dashboards were rendered with headless Chromium. Manifests validated
offline with kustomize and kubeconform. Nothing applied to a cluster.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 AGENTS.md                               |  10 -
 SPECS.md                                |  89 ++--
 k8s/README.md                           |  45 +-
 k8s/grafana.yaml                        | 137 ++++++
 k8s/grafana/dashboards.yaml             |  11 +
 k8s/grafana/dashboards/charging.json    | 517 ++++++++++++++++++++
 k8s/grafana/dashboards/consumption.json | 415 ++++++++++++++++
 k8s/grafana/dashboards/live.json        | 619 ++++++++++++++++++++++++
 k8s/grafana/datasources.yaml            |  17 +
 k8s/influxdb.yaml                       |   8 +-
 k8s/ingress.yaml                        |  43 +-
 k8s/kustomization.yaml                  |  21 +-
 k8s/secrets.example.yaml                |  18 +-
 k8s/server.yaml                         |  31 +-
 14 files changed, 1842 insertions(+), 139 deletions(-)
 create mode 100644 k8s/grafana.yaml
 create mode 100644 k8s/grafana/dashboards.yaml
 create mode 100644 k8s/grafana/dashboards/charging.json
 create mode 100644 k8s/grafana/dashboards/consumption.json
 create mode 100644 k8s/grafana/dashboards/live.json
 create mode 100644 k8s/grafana/datasources.yaml

diff --git a/AGENTS.md b/AGENTS.md
index 1f9ce97..a67abd4 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -120,13 +120,3 @@ a stale Gradle daemon started by VS Code's Java extension is being reused —
 Most of this cannot be verified off a vehicle. When reporting work, state plainly what was
 tested and what was not. "Unit tests pass, not tried on the car" is the expected and
 acceptable answer. Do not imply road-testing that did not happen.
-
-<!-- BEGIN:nextjs-agent-rules -->
-
-## This is NOT the Next.js you know
-
-This version has breaking changes — APIs, conventions, and file structure may all differ from your training data. Read the relevant guide in `node_modules/next/dist/docs/` (resolved from this file's directory; in monorepos the `next` package may not be visible from the repo root) before writing any code. Heed deprecation notices.
-
-This block is written and re-added by `next dev` — verify at `node_modules/next/dist/server/lib/generate-agent-files.js`. Removing it from a diff only re-creates the uncommitted change; committing it with your work keeps the tree clean.
-
-<!-- END:nextjs-agent-rules -->
diff --git a/SPECS.md b/SPECS.md
index dff6558..348eef3 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -7,76 +7,40 @@ what has been changed, and what is still to do.
 - Upstream: https://github.com/fatihdonmezdev/FatihsMG4 (itself a fork of malys / EVABRPUploader
   and Leon Kernan / ABRP_Uploader). Credited in the app's About dialog.
 
-## Plan: car server at car.stinnesbeck.com
+## Architecture: car server at car.stinnesbeck.com
 
-The car sends everything to our own server. The server stores it and forwards live telemetry to
-ABRP, so the ABRP token lives only on the server, never in the APK.
+The car sends everything to our own server. The server stores it in InfluxDB 2 and forwards live
+telemetry to ABRP, so the ABRP token lives only on the server, never in the APK. Grafana reads
+InfluxDB directly for the dashboards.
 
 ```
-car ──live telemetry───▶ car.stinnesbeck.com ──▶ ABRP  api.iternio.com/1/tlm/send
-    ──daily totals─────▶          │
+car ──live telemetry───▶ car.stinnesbeck.com (Go) ──▶ ABRP  api.iternio.com/1/tlm/send
+    ──daily chunks─────▶          │
     ──charging sessions▶          ▼
-                              InfluxDB 2
+                              InfluxDB 2 ◀── Grafana (car-grafana.stinnesbeck.com)
 ```
 
-### Server — extend `web/` (Next.js)
-
-- **Storage: MongoDB → InfluxDB 2.** Rewrite `web/src/lib/mongo.ts` / `data.ts` against one bucket
-  (tag `installationId` on every point):
-
-  | Measurement | Timestamp | Tags | Fields |
-  |---|---|---|---|
-  | `telemetry` | sample time | — | soc, power, speed, lat, lon, heading, elevation, is_charging, is_dcfc, is_parked, capacity, soe, odometer, est_battery_range, batt_temp, cabin_temp, ext_temp, hvac_setpoint, voltage, current, tire_pressure_fl/fr/rl/rr |
-  | `consumption_chunk` | recordedAt | date | km, kwh, hours, socDrop, sohPercent (days summed on read) |
-  | `charging_session` | startedAt | sessionId | endedAt, durationSeconds, energyKwh, gridEnergyKwh, pricePerKwh, totalCost, start/endSocPercent |
-  | `charging_curve` | point time | sessionId | powerKw, socPercent |
-
-  Same measurement + tags + timestamp overwrites, so the car's retries stay idempotent
-  (MongoDB used unique indexes for that).
-- **New endpoint `POST /v1/telemetry`:** a batch of live samples, ingest-token auth, validated
-  and bounded like the existing endpoints.
-- **ABRP forwarder:** after storing, forward the newest sample to `tlm/send` with `ABRP_API_KEY` and
-  `ABRP_USER_TOKEN` from the environment. Rate-limited; a failed forward is logged but not
-  retried, since stale live data is useless to ABRP. Off when the token is unset.
-- **Existing endpoints stay:** `PUT /v1/consumption/daily`, `PUT /v1/charging-sessions/:id`,
-  `GET /v1/consumption/history/:id`, the dashboard and `/v1/health`.
-- **Self-hosting:** `output: "standalone"`, a `Dockerfile`, and InfluxDB's own overwrite semantics
-  instead of `ensureIndexes()`.
-
-### Car app
-
-- Restore the live telemetry payload and upload cadence from before `ea8032a` (`TelemetryPayload`,
-  `UploadCadence`, location access), sending to the server instead of ABRP.
-- Server URL, ingest token and installation id are entered in a new **Server** tab or imported from
-  a config file; nothing about the server is compiled into the APK. Each installation generates
-  its own id.
-
-### Image and deployment
-
-- Image: `git.stinnesbeck.com/nils/mg4-server:<version>`, pushed to the forge's registry
-  (needs a registry login on the build machine).
-- `k8s/` with plain manifests: Namespace, InfluxDB StatefulSet + PVC + Service (cluster-internal),
-  server Deployment + Service + Ingress for `car.stinnesbeck.com` (TLS), and Secret *templates*
-  with placeholder values only.
-- **Nothing is ever applied to the cluster by us.** Nils applies the manifests.
-
-### Decisions (2026-10-17)
-
-- InfluxDB 2 runs in the cluster from our manifests.
-- TLS: cert-manager `ClusterIssuer` `letsencrypt-prod`; Traefik `IngressRoute` on `websecure`.
-- Car config is entered in the app (Server tab / config file), not baked into the APK.
-- The ABRP API key and user token are set by Nils in the `mg4-server` Secret.
+- **Server:** `server/`, Go 1.26, API only — see `server/README.md` for endpoints, configuration
+  and the storage layout. Replaced the Next.js app from upstream (`web/`, removed 2026-10-17).
+- **Dashboards:** Grafana, provisioned from `k8s/grafana/`: Live (stats, SoC/range, power/speed,
+  route map, temperatures, tyres), Consumption (period totals, lifetime, SoH, per-day energy,
+  distance and efficiency) and Charging (totals, session table, curves). Prices in euro.
+- **Car app:** Server tab (URL, ingest token, installation id, config import); live telemetry
+  every 15 s while driving or charging; consumption chunks and charging sessions as before.
+- **Deployment:** `k8s/`, plain manifests. **Nothing is ever applied to the cluster by us** —
+  Nils applies them (`k8s/README.md`). TLS comes from Traefik's default certificate.
 
 ### Status
 
-- [x] Server on InfluxDB 2 with `/v1/telemetry` and the ABRP forwarder (`web/`), tested locally
-      against InfluxDB 2.7.12. Image builds.
-- [x] Manifests in `k8s/`, validated offline. **Not applied** — that is Nils' step (`k8s/README.md`).
-- [x] Car app 2.3.0: Server tab with config import, live telemetry upload, cadence controls.
-      Unit tests and lint pass; **not yet tried on the car**.
-- [ ] Push the image (`mg4-server:1.1.2`) to git.stinnesbeck.com (needs a registry login on the build machine).
-- [ ] Check the Traefik ingress class in `k8s/ingress.yaml` (placeholder `traefik-external`).
-- [ ] First drive with 2.3.0: telemetry arrives in InfluxDB and at ABRP.
+- [x] Go server 2.0.0: tests and govulncheck clean; image builds (about 11 MB).
+- [x] End-to-end in podman (server + InfluxDB 2.7.12 + Grafana 13.2.3): every endpoint, retry
+      idempotency, all 25 dashboard queries return data, dashboards rendered and checked.
+- [x] Manifests validated offline (including Traefik CRDs). **Not applied.**
+- [x] Car app 2.3.0: unit tests and lint pass; **not yet tried on the car**.
+- [ ] Push the image (`mg4-server:2.0.0`) to git.stinnesbeck.com (needs a registry login here).
+- [ ] Check in `k8s/ingress.yaml`: the Traefik ingress class (placeholder `traefik-external`) and
+      Grafana's host (placeholder `car-grafana.stinnesbeck.com`).
+- [ ] First drive with 2.3.0: telemetry arrives in InfluxDB, Grafana and ABRP.
 
 ## To do
 
@@ -116,6 +80,9 @@ car ──live telemetry───▶ car.stinnesbeck.com ──▶ ABRP  api.ite
 - 2026-10-17 — Accent colour: MG red instead of muted gold. Web app renamed to Nils' MG4.
 - 2026-10-17 — Dashboard translated to English (en-GB formatting); euro instead of lira in the
   dashboard and the car app's charging tab.
+- 2026-10-17 — Server rewritten in Go (API only); dashboards moved to Grafana with provisioned
+  InfluxDB datasource and three dashboards; the Next.js app (`web/`) removed. Per-host
+  cert-manager certificates dropped in favour of Traefik's default certificate.
 - 2026-10-17 — Temporary on-screen diagnostics (b2a5b32) to debug blank values without adb;
   removed again (1002962) once values showed on the car. Revert 1002962 to bring them back.
 
diff --git a/k8s/README.md b/k8s/README.md
index ecbb682..db45c48 100644
--- a/k8s/README.md
+++ b/k8s/README.md
@@ -1,28 +1,30 @@
 # Kubernetes manifests — car.stinnesbeck.com
 
-Plain manifests for the car server and its InfluxDB 2. They are only files: nothing here is
-applied automatically. Apply them yourself.
+Plain manifests for the car server, InfluxDB 2 and Grafana. They are only files: nothing here
+is applied automatically. Apply them yourself.
 
 | File | What |
 |---|---|
 | `namespace.yaml` | Namespace `mg4` |
-| `influxdb.yaml` | InfluxDB 2.7.12 StatefulSet (10Gi PVC, default storage class), cluster-internal Service, NetworkPolicy allowing only the server |
-| `server.yaml` | Server Deployment (1 replica, non-root, read-only root filesystem) and Service |
-| `ingress.yaml` | cert-manager `Certificate` from `letsencrypt-prod`, Traefik `IngressRoute` on `websecure` |
-| `secrets.example.yaml` | **Template** for the two Secrets; not in `kustomization.yaml` |
-| `kustomization.yaml` | Everything except the Secrets; pins the server image tag |
+| `influxdb.yaml` | InfluxDB 2.7.12 StatefulSet (10Gi PVC, default storage class), cluster-internal Service, NetworkPolicy admitting only the server and Grafana |
+| `server.yaml` | Go server Deployment (1 replica, non-root, read-only root filesystem) and Service |
+| `grafana.yaml` | Grafana 13.2.3 Deployment (1Gi PVC), Service; datasource and dashboards provisioned |
+| `grafana/` | The provisioned InfluxDB datasource and the MG4 dashboards (Live, Consumption, Charging) |
+| `ingress.yaml` | Traefik `IngressRoute`s for car.stinnesbeck.com and Grafana, TLS from Traefik's default certificate |
+| `secrets.example.yaml` | **Template** for the Secrets; not in `kustomization.yaml` |
+| `kustomization.yaml` | Everything except the Secrets; pins the server image, generates the Grafana ConfigMaps |
 
 ## Before the first apply
 
-1. **Check the ingress class** in `ingress.yaml`. It is set to `traefik-external` as a
-   placeholder; use the class of your public-facing Traefik.
+1. **Check `ingress.yaml`:** the ingress class (placeholder `traefik-external` for the public
+   Traefik) and Grafana's host (placeholder `car-grafana.stinnesbeck.com`). Both hosts must be
+   covered by Traefik's default certificate.
 2. **Create the Secrets.** Copy `secrets.example.yaml` outside the repository, replace every
-   `CHANGE-ME` (`openssl rand -hex 32` for tokens), then apply the copy:
-   `influxdb-auth` (InfluxDB admin password and token) and `mg4-server` (ingest token,
-   session secret, dashboard password, your ABRP API key and user token).
-3. **Registry access.** If the `mg4-server` package on git.stinnesbeck.com is private, create
-   the `git-stinnesbeck-registry` pull secret (command in `secrets.example.yaml`); if it is
-   public, delete `imagePullSecrets` from `server.yaml`.
+   `CHANGE-ME` (`openssl rand -hex 32`), then apply the copy: `influxdb-auth`, `mg4-server`
+   (ingest token, your ABRP API key and user token) and `grafana-admin`.
+3. **Registry access.** If the `mg4-server` package on git.stinnesbeck.com is private, create the
+   `git-stinnesbeck-registry` pull secret (command in `secrets.example.yaml`); if it is public,
+   delete `imagePullSecrets` from `server.yaml`.
 
 ## Apply
 
@@ -32,13 +34,12 @@ kubectl apply -f <your filled-in secrets file>
 kubectl apply -k k8s/
 ```
 
-The Let's Encrypt HTTP-01 challenge needs car.stinnesbeck.com to resolve to the public
-Traefik before the certificate can be issued; check with `kubectl -n mg4 get certificate`.
-
 ## Notes
 
-- InfluxDB's setup mode runs only on an empty volume. Changing `admin-token` in the Secret
-  later does not change the token inside InfluxDB.
-- The server uses the InfluxDB admin token. A token scoped to the `mg4` bucket can replace it
-  later (`influx auth create --read-bucket … --write-bucket …`).
+- InfluxDB's setup mode runs only on an empty volume. Changing `admin-token` in the Secret later
+  does not change the token inside InfluxDB.
+- The server and Grafana use the InfluxDB admin token. A token scoped to the `mg4` bucket (read
+  for Grafana, read/write for the server) can replace it later.
+- The dashboards are read-only in Grafana's UI. Change the JSON in `grafana/dashboards/`; the
+  ConfigMap name changes with its content, which rolls Grafana.
 - To upgrade the server, push a new image tag and change `newTag` in `kustomization.yaml`.
diff --git a/k8s/grafana.yaml b/k8s/grafana.yaml
new file mode 100644
index 0000000..3b8724d
--- /dev/null
+++ b/k8s/grafana.yaml
@@ -0,0 +1,137 @@
+# Grafana for the dashboards. The InfluxDB datasource and the three MG4 dashboards are
+# provisioned from k8s/grafana/ (ConfigMaps generated by kustomization.yaml); the dashboards
+# are read-only in the UI — change the JSON in git instead.
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: grafana-data
+  namespace: mg4
+  labels:
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/part-of: mg4
+spec:
+  accessModes: ["ReadWriteOnce"]
+  # No storageClassName: the cluster's default class is used.
+  resources:
+    requests:
+      storage: 1Gi
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: grafana
+  namespace: mg4
+  labels:
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/part-of: mg4
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate # the SQLite database on the volume allows one writer
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: grafana
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: grafana
+        app.kubernetes.io/part-of: mg4
+    spec:
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 472
+        runAsGroup: 472
+        fsGroup: 472
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+        - name: grafana
+          image: docker.io/grafana/grafana:13.2.3
+          ports:
+            - name: http
+              containerPort: 3000
+          env:
+            - name: GF_SERVER_ROOT_URL
+              value: https://car-grafana.stinnesbeck.com
+            - name: GF_SECURITY_ADMIN_USER
+              value: admin
+            - name: GF_SECURITY_ADMIN_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: grafana-admin
+                  key: admin-password
+            - name: GF_USERS_ALLOW_SIGN_UP
+              value: "false"
+            - name: GF_AUTH_ANONYMOUS_ENABLED
+              value: "false"
+            - name: GF_ANALYTICS_REPORTING_ENABLED
+              value: "false"
+            - name: GF_ANALYTICS_CHECK_FOR_UPDATES
+              value: "false"
+            # Read by datasources.yaml.
+            - name: INFLUX_URL
+              value: http://influxdb.mg4.svc:8086
+            - name: INFLUX_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: influxdb-auth
+                  key: admin-token
+          volumeMounts:
+            - name: data
+              mountPath: /var/lib/grafana
+            - name: datasources
+              mountPath: /etc/grafana/provisioning/datasources
+            - name: dashboard-provider
+              mountPath: /etc/grafana/provisioning/dashboards
+            - name: dashboards
+              mountPath: /var/lib/grafana/dashboards/mg4
+          readinessProbe:
+            httpGet:
+              path: /api/health
+              port: http
+            periodSeconds: 10
+          livenessProbe:
+            httpGet:
+              path: /api/health
+              port: http
+            initialDelaySeconds: 30
+            periodSeconds: 30
+          resources:
+            requests:
+              cpu: 50m
+              memory: 128Mi
+            limits:
+              memory: 512Mi
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+      volumes:
+        - name: data
+          persistentVolumeClaim:
+            claimName: grafana-data
+        - name: datasources
+          configMap:
+            name: grafana-datasources
+        - name: dashboard-provider
+          configMap:
+            name: grafana-dashboard-provider
+        - name: dashboards
+          configMap:
+            name: grafana-dashboards
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: grafana
+  namespace: mg4
+  labels:
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/part-of: mg4
+spec:
+  selector:
+    app.kubernetes.io/name: grafana
+  ports:
+    - name: http
+      port: 80
+      targetPort: http
diff --git a/k8s/grafana/dashboards.yaml b/k8s/grafana/dashboards.yaml
new file mode 100644
index 0000000..de37763
--- /dev/null
+++ b/k8s/grafana/dashboards.yaml
@@ -0,0 +1,11 @@
+# Loads the dashboard JSON files in the mounted folder into a "MG4" folder. They are
+# managed in git: edits in the UI are not saved back, change the JSON instead.
+apiVersion: 1
+providers:
+  - name: mg4
+    folder: MG4
+    type: file
+    disableDeletion: true
+    allowUiUpdates: false
+    options:
+      path: /var/lib/grafana/dashboards/mg4
diff --git a/k8s/grafana/dashboards/charging.json b/k8s/grafana/dashboards/charging.json
new file mode 100644
index 0000000..28471c1
--- /dev/null
+++ b/k8s/grafana/dashboards/charging.json
@@ -0,0 +1,517 @@
+{
+  "uid": "mg4-charging",
+  "title": "MG4 — Charging",
+  "description": "DC charging sessions metered by the car. Prices in euro, as entered in the car's Charging tab.",
+  "tags": [
+    "mg4"
+  ],
+  "timezone": "browser",
+  "editable": false,
+  "graphTooltip": 1,
+  "schemaVersion": 39,
+  "version": 1,
+  "time": {
+    "from": "now-90d",
+    "to": "now"
+  },
+  "refresh": "",
+  "templating": {
+    "list": [
+      {
+        "name": "installationId",
+        "label": "Car",
+        "type": "query",
+        "datasource": {
+          "type": "influxdb",
+          "uid": "mg4-influxdb"
+        },
+        "query": "import \"influxdata/influxdb/schema\"\nschema.tagValues(bucket: \"mg4\", tag: \"installationId\", start: -400d)",
+        "definition": "installationId tag values",
+        "refresh": 1,
+        "includeAll": false,
+        "multi": false,
+        "current": {},
+        "hide": 0,
+        "sort": 1
+      }
+    ]
+  },
+  "annotations": {
+    "list": []
+  },
+  "panels": [
+    {
+      "id": 1,
+      "type": "stat",
+      "title": "DC sessions",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 0,
+        "y": 0,
+        "w": 6,
+        "h": 4
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r._measurement == \"charging_session\" and r.installationId == \"${installationId}\" and r._field == \"energyKwh\")\n  |> group()\n  |> count()"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "none",
+          "color": {
+            "mode": "fixed",
+            "fixedColor": "#E0424C"
+          },
+          "decimals": 0
+        },
+        "overrides": []
+      },
+      "options": {
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "colorMode": "value",
+        "graphMode": "none",
+        "textMode": "value"
+      }
+    },
+    {
+      "id": 2,
+      "type": "stat",
+      "title": "Drawn from grid",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 6,
+        "y": 0,
+        "w": 6,
+        "h": 4
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r._measurement == \"charging_session\" and r.installationId == \"${installationId}\" and r._field == \"gridEnergyKwh\")\n  |> group()\n  |> sum()"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "kwatth",
+          "color": {
+            "mode": "fixed",
+            "fixedColor": "#E0424C"
+          },
+          "decimals": 1
+        },
+        "overrides": []
+      },
+      "options": {
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "colorMode": "value",
+        "graphMode": "none",
+        "textMode": "value"
+      },
+      "description": "Net energy into the battery plus 10 % charging loss."
+    },
+    {
+      "id": 3,
+      "type": "stat",
+      "title": "Paid",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 12,
+        "y": 0,
+        "w": 6,
+        "h": 4
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r._measurement == \"charging_session\" and r.installationId == \"${installationId}\" and r._field == \"totalCost\")\n  |> group()\n  |> sum()"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "currencyEUR",
+          "color": {
+            "mode": "fixed",
+            "fixedColor": "#E0424C"
+          },
+          "decimals": 2
+        },
+        "overrides": []
+      },
+      "options": {
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "colorMode": "value",
+        "graphMode": "none",
+        "textMode": "value"
+      }
+    },
+    {
+      "id": 4,
+      "type": "stat",
+      "title": "Peak power",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 18,
+        "y": 0,
+        "w": 6,
+        "h": 4
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r._measurement == \"charging_curve\" and r.installationId == \"${installationId}\" and r._field == \"powerKw\")\n  |> group()\n  |> max()\n  |> keep(columns: [\"_value\"])"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "kwatt",
+          "color": {
+            "mode": "fixed",
+            "fixedColor": "#E0424C"
+          },
+          "decimals": 0
+        },
+        "overrides": []
+      },
+      "options": {
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "colorMode": "value",
+        "graphMode": "none",
+        "textMode": "value"
+      }
+    },
+    {
+      "id": 5,
+      "type": "table",
+      "title": "Sessions",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 0,
+        "y": 4,
+        "w": 24,
+        "h": 9
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r._measurement == \"charging_session\" and r.installationId == \"${installationId}\")\n  |> pivot(rowKey: [\"_time\"], columnKey: [\"_field\"], valueColumn: \"_value\")\n  |> group()\n  |> map(fn: (r) => ({r with gained: if exists r.endSocPercent and exists r.startSocPercent then r.endSocPercent - r.startSocPercent else 0.0}))\n  |> keep(columns: [\"_time\", \"startSocPercent\", \"endSocPercent\", \"gained\", \"energyKwh\", \"gridEnergyKwh\", \"durationSeconds\", \"pricePerKwh\", \"totalCost\"])\n  |> sort(columns: [\"_time\"], desc: true)"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {},
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "_time"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Start"
+              },
+              {
+                "id": "unit",
+                "value": "dateTimeAsIso"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": "startSocPercent|endSocPercent|gained"
+            },
+            "properties": [
+              {
+                "id": "unit",
+                "value": "percent"
+              },
+              {
+                "id": "decimals",
+                "value": 0
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "startSocPercent"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "SoC start"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "endSocPercent"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "SoC end"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "gained"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Charge added"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "energyKwh"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Net into battery"
+              },
+              {
+                "id": "unit",
+                "value": "kwatth"
+              },
+              {
+                "id": "decimals",
+                "value": 2
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "gridEnergyKwh"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "From grid (+10%)"
+              },
+              {
+                "id": "unit",
+                "value": "kwatth"
+              },
+              {
+                "id": "decimals",
+                "value": 2
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "durationSeconds"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Duration"
+              },
+              {
+                "id": "unit",
+                "value": "dtdurations"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "pricePerKwh"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Price"
+              },
+              {
+                "id": "unit",
+                "value": "currencyEUR"
+              },
+              {
+                "id": "decimals",
+                "value": 2
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "totalCost"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Cost"
+              },
+              {
+                "id": "unit",
+                "value": "currencyEUR"
+              },
+              {
+                "id": "decimals",
+                "value": 2
+              }
+            ]
+          }
+        ]
+      },
+      "options": {
+        "showHeader": true,
+        "cellHeight": "sm"
+      },
+      "transformations": [
+        {
+          "id": "organize",
+          "options": {
+            "indexByName": {
+              "_time": 0,
+              "durationSeconds": 1,
+              "startSocPercent": 2,
+              "endSocPercent": 3,
+              "gained": 4,
+              "energyKwh": 5,
+              "gridEnergyKwh": 6,
+              "pricePerKwh": 7,
+              "totalCost": 8
+            }
+          }
+        }
+      ]
+    },
+    {
+      "id": 6,
+      "type": "timeseries",
+      "title": "Charging curves",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 0,
+        "y": 13,
+        "w": 24,
+        "h": 9
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r._measurement == \"charging_curve\" and r.installationId == \"${installationId}\" and (r._field == \"powerKw\" or r._field == \"socPercent\"))\n  |> group(columns: [\"_field\"])\n  |> keep(columns: [\"_time\", \"_field\", \"_value\"])\n  |> sort(columns: [\"_time\"])"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "kwatt",
+          "custom": {
+            "lineWidth": 2,
+            "fillOpacity": 8,
+            "spanNulls": 600000,
+            "showPoints": "never"
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": ".*socPercent.*"
+            },
+            "properties": [
+              {
+                "id": "unit",
+                "value": "percent"
+              },
+              {
+                "id": "custom.axisPlacement",
+                "value": "right"
+              }
+            ]
+          }
+        ]
+      },
+      "options": {
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "multi"
+        }
+      },
+      "description": "Only DC charges above 10 kW are metered. Pick a time range around a session to see its curve."
+    }
+  ]
+}
diff --git a/k8s/grafana/dashboards/consumption.json b/k8s/grafana/dashboards/consumption.json
new file mode 100644
index 0000000..99b2078
--- /dev/null
+++ b/k8s/grafana/dashboards/consumption.json
@@ -0,0 +1,415 @@
+{
+  "uid": "mg4-consumption",
+  "title": "MG4 — Consumption",
+  "description": "Daily consumption, summed from the chunks the car sends while driving.",
+  "tags": [
+    "mg4"
+  ],
+  "timezone": "browser",
+  "editable": false,
+  "graphTooltip": 1,
+  "schemaVersion": 39,
+  "version": 1,
+  "time": {
+    "from": "now-30d",
+    "to": "now"
+  },
+  "refresh": "",
+  "templating": {
+    "list": [
+      {
+        "name": "installationId",
+        "label": "Car",
+        "type": "query",
+        "datasource": {
+          "type": "influxdb",
+          "uid": "mg4-influxdb"
+        },
+        "query": "import \"influxdata/influxdb/schema\"\nschema.tagValues(bucket: \"mg4\", tag: \"installationId\", start: -400d)",
+        "definition": "installationId tag values",
+        "refresh": 1,
+        "includeAll": false,
+        "multi": false,
+        "current": {},
+        "hide": 0,
+        "sort": 1
+      }
+    ]
+  },
+  "annotations": {
+    "list": []
+  },
+  "panels": [
+    {
+      "id": 1,
+      "type": "stat",
+      "title": "Distance",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 0,
+        "y": 0,
+        "w": 5,
+        "h": 4
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r._measurement == \"consumption_chunk\" and r.installationId == \"${installationId}\" and r._field == \"km\")\n  |> group()\n  |> sum()"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "suffix: km",
+          "color": {
+            "mode": "fixed",
+            "fixedColor": "#E0424C"
+          },
+          "decimals": 1
+        },
+        "overrides": []
+      },
+      "options": {
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "colorMode": "value",
+        "graphMode": "none",
+        "textMode": "value"
+      }
+    },
+    {
+      "id": 2,
+      "type": "stat",
+      "title": "Energy used",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 5,
+        "y": 0,
+        "w": 5,
+        "h": 4
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r._measurement == \"consumption_chunk\" and r.installationId == \"${installationId}\" and r._field == \"kwh\")\n  |> group()\n  |> sum()"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "kwatth",
+          "color": {
+            "mode": "fixed",
+            "fixedColor": "#E0424C"
+          },
+          "decimals": 2
+        },
+        "overrides": []
+      },
+      "options": {
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "colorMode": "value",
+        "graphMode": "none",
+        "textMode": "value"
+      }
+    },
+    {
+      "id": 3,
+      "type": "stat",
+      "title": "Average",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 10,
+        "y": 0,
+        "w": 5,
+        "h": 4
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r._measurement == \"consumption_chunk\" and r.installationId == \"${installationId}\" and (r._field == \"km\" or r._field == \"kwh\"))\n  |> group(columns: [\"_field\"])\n  |> sum()\n  |> group()\n  |> pivot(rowKey: [], columnKey: [\"_field\"], valueColumn: \"_value\")\n  |> map(fn: (r) => ({efficiency: if r.km >= 1.0 then r.kwh * 100.0 / r.km else 0.0}))"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "suffix: kWh/100 km",
+          "color": {
+            "mode": "fixed",
+            "fixedColor": "#E0424C"
+          },
+          "decimals": 1
+        },
+        "overrides": []
+      },
+      "options": {
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "colorMode": "value",
+        "graphMode": "none",
+        "textMode": "value"
+      },
+      "description": "kWh/100 km over the selected range."
+    },
+    {
+      "id": 4,
+      "type": "stat",
+      "title": "Lifetime distance",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 15,
+        "y": 0,
+        "w": 5,
+        "h": 4
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: 0)\n  |> filter(fn: (r) => r._measurement == \"consumption_chunk\" and r.installationId == \"${installationId}\" and r._field == \"km\")\n  |> group()\n  |> sum()"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "suffix: km",
+          "color": {
+            "mode": "fixed",
+            "fixedColor": "#E0424C"
+          },
+          "decimals": 0
+        },
+        "overrides": []
+      },
+      "options": {
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "colorMode": "value",
+        "graphMode": "none",
+        "textMode": "value"
+      }
+    },
+    {
+      "id": 5,
+      "type": "stat",
+      "title": "Battery health (SoH)",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 20,
+        "y": 0,
+        "w": 4,
+        "h": 4
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: 0)\n  |> filter(fn: (r) => r._measurement == \"consumption_chunk\" and r.installationId == \"${installationId}\" and r._field == \"sohPercent\")\n  |> group()\n  |> last()\n  |> keep(columns: [\"_value\"])"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "percent",
+          "color": {
+            "mode": "fixed",
+            "fixedColor": "#E0424C"
+          },
+          "decimals": 1
+        },
+        "overrides": []
+      },
+      "options": {
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "colorMode": "value",
+        "graphMode": "none",
+        "textMode": "value"
+      },
+      "description": "The manual SoH entered in the car's Consumption tab."
+    },
+    {
+      "id": 6,
+      "type": "barchart",
+      "title": "Energy per day",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 0,
+        "y": 4,
+        "w": 12,
+        "h": 9
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r._measurement == \"consumption_chunk\" and r.installationId == \"${installationId}\" and r._field == \"kwh\")\n  |> group(columns: [\"date\"])\n  |> sum()\n  |> group()\n  |> map(fn: (r) => ({date: r.date, kwh: r._value}))\n  |> sort(columns: [\"date\"])"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "kwatth",
+          "color": {
+            "mode": "fixed",
+            "fixedColor": "#E0424C"
+          }
+        },
+        "overrides": []
+      },
+      "options": {
+        "xField": "date",
+        "showValue": "never",
+        "legend": {
+          "showLegend": false
+        },
+        "xTickLabelRotation": -45
+      }
+    },
+    {
+      "id": 7,
+      "type": "barchart",
+      "title": "Distance per day",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 12,
+        "y": 4,
+        "w": 12,
+        "h": 9
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r._measurement == \"consumption_chunk\" and r.installationId == \"${installationId}\" and r._field == \"km\")\n  |> group(columns: [\"date\"])\n  |> sum()\n  |> group()\n  |> map(fn: (r) => ({date: r.date, km: r._value}))\n  |> sort(columns: [\"date\"])"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "suffix: km",
+          "color": {
+            "mode": "fixed",
+            "fixedColor": "#E0424C"
+          }
+        },
+        "overrides": []
+      },
+      "options": {
+        "xField": "date",
+        "showValue": "never",
+        "legend": {
+          "showLegend": false
+        },
+        "xTickLabelRotation": -45
+      }
+    },
+    {
+      "id": 8,
+      "type": "barchart",
+      "title": "Efficiency per day (kWh/100 km)",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 0,
+        "y": 13,
+        "w": 24,
+        "h": 8
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r._measurement == \"consumption_chunk\" and r.installationId == \"${installationId}\" and (r._field == \"km\" or r._field == \"kwh\"))\n  |> group(columns: [\"date\", \"_field\"])\n  |> sum()\n  |> group()\n  |> pivot(rowKey: [\"date\"], columnKey: [\"_field\"], valueColumn: \"_value\")\n  |> filter(fn: (r) => r.km >= 1.0)\n  |> map(fn: (r) => ({date: r.date, efficiency: r.kwh * 100.0 / r.km}))\n  |> sort(columns: [\"date\"])"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "suffix: kWh/100 km",
+          "color": {
+            "mode": "fixed",
+            "fixedColor": "#E0424C"
+          }
+        },
+        "overrides": []
+      },
+      "options": {
+        "xField": "date",
+        "showValue": "never",
+        "legend": {
+          "showLegend": false
+        },
+        "xTickLabelRotation": -45
+      }
+    }
+  ]
+}
diff --git a/k8s/grafana/dashboards/live.json b/k8s/grafana/dashboards/live.json
new file mode 100644
index 0000000..77dda27
--- /dev/null
+++ b/k8s/grafana/dashboards/live.json
@@ -0,0 +1,619 @@
+{
+  "uid": "mg4-live",
+  "title": "MG4 — Live",
+  "description": "Live telemetry from the car, as stored before it is forwarded to ABRP.",
+  "tags": [
+    "mg4"
+  ],
+  "timezone": "browser",
+  "editable": false,
+  "graphTooltip": 1,
+  "schemaVersion": 39,
+  "version": 1,
+  "time": {
+    "from": "now-24h",
+    "to": "now"
+  },
+  "refresh": "30s",
+  "templating": {
+    "list": [
+      {
+        "name": "installationId",
+        "label": "Car",
+        "type": "query",
+        "datasource": {
+          "type": "influxdb",
+          "uid": "mg4-influxdb"
+        },
+        "query": "import \"influxdata/influxdb/schema\"\nschema.tagValues(bucket: \"mg4\", tag: \"installationId\", start: -400d)",
+        "definition": "installationId tag values",
+        "refresh": 1,
+        "includeAll": false,
+        "multi": false,
+        "current": {},
+        "hide": 0,
+        "sort": 1
+      }
+    ]
+  },
+  "annotations": {
+    "list": []
+  },
+  "panels": [
+    {
+      "id": 1,
+      "type": "stat",
+      "title": "State of charge",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 0,
+        "y": 0,
+        "w": 4,
+        "h": 4
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: -30d)\n  |> filter(fn: (r) => r._measurement == \"telemetry\" and r.installationId == \"${installationId}\" and r._field == \"soc\")\n  |> last()"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "percent",
+          "color": {
+            "mode": "fixed",
+            "fixedColor": "#E0424C"
+          },
+          "decimals": 0
+        },
+        "overrides": []
+      },
+      "options": {
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "colorMode": "value",
+        "graphMode": "none",
+        "textMode": "value"
+      }
+    },
+    {
+      "id": 2,
+      "type": "stat",
+      "title": "Range",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 4,
+        "y": 0,
+        "w": 4,
+        "h": 4
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: -30d)\n  |> filter(fn: (r) => r._measurement == \"telemetry\" and r.installationId == \"${installationId}\" and r._field == \"est_battery_range\")\n  |> last()"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "suffix: km",
+          "color": {
+            "mode": "fixed",
+            "fixedColor": "#E0424C"
+          },
+          "decimals": 0
+        },
+        "overrides": []
+      },
+      "options": {
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "colorMode": "value",
+        "graphMode": "none",
+        "textMode": "value"
+      }
+    },
+    {
+      "id": 3,
+      "type": "stat",
+      "title": "Odometer",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 8,
+        "y": 0,
+        "w": 4,
+        "h": 4
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: -30d)\n  |> filter(fn: (r) => r._measurement == \"telemetry\" and r.installationId == \"${installationId}\" and r._field == \"odometer\")\n  |> last()"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "suffix: km",
+          "color": {
+            "mode": "fixed",
+            "fixedColor": "#E0424C"
+          },
+          "decimals": 0
+        },
+        "overrides": []
+      },
+      "options": {
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "colorMode": "value",
+        "graphMode": "none",
+        "textMode": "value"
+      }
+    },
+    {
+      "id": 4,
+      "type": "stat",
+      "title": "Battery temperature",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 12,
+        "y": 0,
+        "w": 4,
+        "h": 4
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: -30d)\n  |> filter(fn: (r) => r._measurement == \"telemetry\" and r.installationId == \"${installationId}\" and r._field == \"batt_temp\")\n  |> last()"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "celsius",
+          "color": {
+            "mode": "fixed",
+            "fixedColor": "#E0424C"
+          },
+          "decimals": 0
+        },
+        "overrides": []
+      },
+      "options": {
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "colorMode": "value",
+        "graphMode": "none",
+        "textMode": "value"
+      }
+    },
+    {
+      "id": 5,
+      "type": "stat",
+      "title": "Outside temperature",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 16,
+        "y": 0,
+        "w": 4,
+        "h": 4
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: -30d)\n  |> filter(fn: (r) => r._measurement == \"telemetry\" and r.installationId == \"${installationId}\" and r._field == \"ext_temp\")\n  |> last()"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "celsius",
+          "color": {
+            "mode": "fixed",
+            "fixedColor": "#E0424C"
+          },
+          "decimals": 0
+        },
+        "overrides": []
+      },
+      "options": {
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "colorMode": "value",
+        "graphMode": "none",
+        "textMode": "value"
+      }
+    },
+    {
+      "id": 6,
+      "type": "stat",
+      "title": "Energy in pack",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 20,
+        "y": 0,
+        "w": 4,
+        "h": 4
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: -30d)\n  |> filter(fn: (r) => r._measurement == \"telemetry\" and r.installationId == \"${installationId}\" and r._field == \"soe\")\n  |> last()"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "kwatth",
+          "color": {
+            "mode": "fixed",
+            "fixedColor": "#E0424C"
+          },
+          "decimals": 1
+        },
+        "overrides": []
+      },
+      "options": {
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "colorMode": "value",
+        "graphMode": "none",
+        "textMode": "value"
+      }
+    },
+    {
+      "id": 7,
+      "type": "timeseries",
+      "title": "State of charge and range",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 0,
+        "y": 4,
+        "w": 12,
+        "h": 8
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r._measurement == \"telemetry\" and r.installationId == \"${installationId}\" and (r._field == \"soc\" or r._field == \"est_battery_range\"))\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n  |> keep(columns: [\"_time\", \"_field\", \"_value\"])"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "percent",
+          "custom": {
+            "lineWidth": 2,
+            "fillOpacity": 8,
+            "spanNulls": 600000,
+            "showPoints": "never"
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": ".*est_battery_range.*"
+            },
+            "properties": [
+              {
+                "id": "unit",
+                "value": "suffix: km"
+              },
+              {
+                "id": "custom.axisPlacement",
+                "value": "right"
+              }
+            ]
+          }
+        ]
+      },
+      "options": {
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "multi"
+        }
+      }
+    },
+    {
+      "id": 8,
+      "type": "timeseries",
+      "title": "Power and speed",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 12,
+        "y": 4,
+        "w": 12,
+        "h": 8
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r._measurement == \"telemetry\" and r.installationId == \"${installationId}\" and (r._field == \"power\" or r._field == \"speed\"))\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n  |> keep(columns: [\"_time\", \"_field\", \"_value\"])"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "kwatt",
+          "custom": {
+            "lineWidth": 2,
+            "fillOpacity": 8,
+            "spanNulls": 600000,
+            "showPoints": "never"
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": ".*speed.*"
+            },
+            "properties": [
+              {
+                "id": "unit",
+                "value": "velocitykmh"
+              },
+              {
+                "id": "custom.axisPlacement",
+                "value": "right"
+              }
+            ]
+          }
+        ]
+      },
+      "options": {
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "multi"
+        }
+      },
+      "description": "Power is positive leaving the battery, negative while charging or regenerating."
+    },
+    {
+      "id": 9,
+      "type": "geomap",
+      "title": "Where the car was",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 0,
+        "y": 12,
+        "w": 12,
+        "h": 12
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r._measurement == \"telemetry\" and r.installationId == \"${installationId}\" and (r._field == \"lat\" or r._field == \"lon\"))\n  |> pivot(rowKey: [\"_time\"], columnKey: [\"_field\"], valueColumn: \"_value\")\n  |> keep(columns: [\"_time\", \"lat\", \"lon\"])\n  |> sort(columns: [\"_time\"])"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {},
+        "overrides": []
+      },
+      "options": {
+        "view": {
+          "id": "fit",
+          "lat": 0,
+          "lon": 0,
+          "zoom": 6,
+          "allLayers": true
+        },
+        "controls": {
+          "showZoom": true,
+          "mouseWheelZoom": true
+        },
+        "basemap": {
+          "type": "default",
+          "name": "Basemap"
+        },
+        "layers": [
+          {
+            "type": "route",
+            "name": "Drive",
+            "config": {
+              "style": {
+                "color": {
+                  "fixed": "#E0424C"
+                },
+                "size": {
+                  "fixed": 3
+                },
+                "opacity": 0.9
+              }
+            },
+            "location": {
+              "mode": "coords",
+              "latitude": "lat",
+              "longitude": "lon"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "id": 10,
+      "type": "timeseries",
+      "title": "Temperatures",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 12,
+        "y": 12,
+        "w": 12,
+        "h": 6
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r._measurement == \"telemetry\" and r.installationId == \"${installationId}\" and (r._field == \"batt_temp\" or r._field == \"cabin_temp\" or r._field == \"ext_temp\" or r._field == \"hvac_setpoint\"))\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n  |> keep(columns: [\"_time\", \"_field\", \"_value\"])"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "celsius",
+          "custom": {
+            "lineWidth": 2,
+            "fillOpacity": 8,
+            "spanNulls": 600000,
+            "showPoints": "never"
+          }
+        },
+        "overrides": []
+      },
+      "options": {
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "multi"
+        }
+      }
+    },
+    {
+      "id": 11,
+      "type": "timeseries",
+      "title": "Tire pressures",
+      "datasource": {
+        "type": "influxdb",
+        "uid": "mg4-influxdb"
+      },
+      "gridPos": {
+        "x": 12,
+        "y": 18,
+        "w": 12,
+        "h": 6
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "mg4-influxdb"
+          },
+          "query": "from(bucket: \"mg4\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r._measurement == \"telemetry\" and r.installationId == \"${installationId}\" and (r._field == \"tire_pressure_fl\" or r._field == \"tire_pressure_fr\" or r._field == \"tire_pressure_rl\" or r._field == \"tire_pressure_rr\"))\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n  |> keep(columns: [\"_time\", \"_field\", \"_value\"])"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "pressurekpa",
+          "custom": {
+            "lineWidth": 2,
+            "fillOpacity": 8,
+            "spanNulls": 600000,
+            "showPoints": "never"
+          }
+        },
+        "overrides": []
+      },
+      "options": {
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "multi"
+        }
+      }
+    }
+  ]
+}
diff --git a/k8s/grafana/datasources.yaml b/k8s/grafana/datasources.yaml
new file mode 100644
index 0000000..5d83a9a
--- /dev/null
+++ b/k8s/grafana/datasources.yaml
@@ -0,0 +1,17 @@
+# Provisioned InfluxDB datasource. URL and token come from the Grafana container's
+# environment (INFLUX_URL, INFLUX_TOKEN), so no credential is stored in this file.
+apiVersion: 1
+datasources:
+  - name: InfluxDB (mg4)
+    uid: mg4-influxdb
+    type: influxdb
+    access: proxy
+    url: $INFLUX_URL
+    isDefault: true
+    editable: false
+    jsonData:
+      version: Flux
+      organization: mg4
+      defaultBucket: mg4
+    secureJsonData:
+      token: $INFLUX_TOKEN
diff --git a/k8s/influxdb.yaml b/k8s/influxdb.yaml
index 72c2555..03247a5 100644
--- a/k8s/influxdb.yaml
+++ b/k8s/influxdb.yaml
@@ -110,11 +110,12 @@ spec:
       port: 8086
       targetPort: http
 ---
-# Only the server may reach InfluxDB. Has no effect on a CNI without NetworkPolicy support.
+# Only the server and Grafana may reach InfluxDB. Has no effect on a CNI without
+# NetworkPolicy support.
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: influxdb-from-server-only
+  name: influxdb-from-server-and-grafana
   namespace: mg4
 spec:
   podSelector:
@@ -126,5 +127,8 @@ spec:
         - podSelector:
             matchLabels:
               app.kubernetes.io/name: mg4-server
+        - podSelector:
+            matchLabels:
+              app.kubernetes.io/name: grafana
       ports:
         - port: 8086
diff --git a/k8s/ingress.yaml b/k8s/ingress.yaml
index ff60931..1e2fbf5 100644
--- a/k8s/ingress.yaml
+++ b/k8s/ingress.yaml
@@ -1,18 +1,5 @@
-# TLS certificate from cert-manager. cert-manager does not watch Traefik IngressRoutes, so the
-# certificate is requested explicitly and the IngressRoute references its Secret.
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: car-stinnesbeck-com
-  namespace: mg4
-spec:
-  secretName: car-stinnesbeck-com-tls
-  dnsNames:
-    - car.stinnesbeck.com
-  issuerRef:
-    kind: ClusterIssuer
-    name: letsencrypt-prod
----
+# Public routes. TLS uses Traefik's default certificate, so there is no per-host
+# Certificate here.
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
@@ -20,7 +7,7 @@ metadata:
   namespace: mg4
   annotations:
     # CHECK: the class of your public-facing Traefik. Your internal example uses
-    # "traefik-internal"; this host must be served by the external one.
+    # "traefik-internal"; these hosts must be served by the external one.
     kubernetes.io/ingress.class: traefik-external
 spec:
   entryPoints:
@@ -33,5 +20,25 @@ spec:
           name: mg4-server
           namespace: mg4
           port: 80
-  tls:
-    secretName: car-stinnesbeck-com-tls
+  tls: {}
+---
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: grafana
+  namespace: mg4
+  annotations:
+    kubernetes.io/ingress.class: traefik-external # CHECK, as above
+spec:
+  entryPoints:
+    - websecure
+  routes:
+    - kind: Rule
+      # CHECK: placeholder host. It must be covered by Traefik's default certificate.
+      match: Host(`car-grafana.stinnesbeck.com`)
+      services:
+        - kind: Service
+          name: grafana
+          namespace: mg4
+          port: 80
+  tls: {}
diff --git a/k8s/kustomization.yaml b/k8s/kustomization.yaml
index 1acf22d..0a643ee 100644
--- a/k8s/kustomization.yaml
+++ b/k8s/kustomization.yaml
@@ -6,7 +6,26 @@ resources:
   - namespace.yaml
   - influxdb.yaml
   - server.yaml
+  - grafana.yaml
   - ingress.yaml
 images:
   - name: git.stinnesbeck.com/nils/mg4-server
-    newTag: "1.1.2"
+    newTag: "2.0.0"
+generatorOptions:
+  labels:
+    app.kubernetes.io/part-of: mg4
+configMapGenerator:
+  - name: grafana-datasources
+    namespace: mg4
+    files:
+      - mg4.yaml=grafana/datasources.yaml
+  - name: grafana-dashboard-provider
+    namespace: mg4
+    files:
+      - mg4.yaml=grafana/dashboards.yaml
+  - name: grafana-dashboards
+    namespace: mg4
+    files:
+      - grafana/dashboards/live.json
+      - grafana/dashboards/consumption.json
+      - grafana/dashboards/charging.json
diff --git a/k8s/secrets.example.yaml b/k8s/secrets.example.yaml
index 9b7dd47..cc316cd 100644
--- a/k8s/secrets.example.yaml
+++ b/k8s/secrets.example.yaml
@@ -1,7 +1,7 @@
 # TEMPLATE ONLY — not part of kustomization.yaml. Copy it outside the repository, fill in
 # real values, and apply that copy yourself. Never commit the filled-in file.
 #
-#   openssl rand -hex 32     for every token and secret below
+#   openssl rand -hex 32     for every token and password below
 apiVersion: v1
 kind: Secret
 metadata:
@@ -19,15 +19,25 @@ metadata:
   namespace: mg4
 type: Opaque
 stringData:
-  # The car's write token, entered in the app. At least 24 characters.
+  # The car's write token, entered in the app. At least 24 characters, or the server
+  # refuses to start.
   INGEST_TOKEN: CHANGE-ME-openssl-rand-hex-32
-  SESSION_SECRET: CHANGE-ME-openssl-rand-hex-32
-  DASHBOARD_PASSWORD: CHANGE-ME-at-least-8-characters
   # Your ABRP credentials. Leave either empty to switch forwarding off.
   ABRP_API_KEY: CHANGE-ME
   ABRP_USER_TOKEN: CHANGE-ME
   ABRP_MIN_INTERVAL_SECONDS: "5"
 ---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: grafana-admin
+  namespace: mg4
+type: Opaque
+stringData:
+  # Grafana's admin login (user "admin"). Only read on first start: change it in Grafana
+  # afterwards, or reset it with grafana cli.
+  admin-password: CHANGE-ME
+---
 # Pull secret for a private image on git.stinnesbeck.com. Easier to create with:
 #   kubectl -n mg4 create secret docker-registry git-stinnesbeck-registry \
 #     --docker-server=git.stinnesbeck.com --docker-username=<user> --docker-password=<token>
diff --git a/k8s/server.yaml b/k8s/server.yaml
index 01c7039..e004ef8 100644
--- a/k8s/server.yaml
+++ b/k8s/server.yaml
@@ -1,5 +1,5 @@
-# The car server. One replica on purpose: the ABRP rate limit is kept in memory, and two
-# replicas would each forward to ABRP at the full rate.
+# The car server (Go). One replica on purpose: the ABRP rate limit is kept in memory, and
+# two replicas would each forward to ABRP at the full rate.
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -26,8 +26,8 @@ spec:
         - name: git-stinnesbeck-registry
       securityContext:
         runAsNonRoot: true
-        runAsUser: 10001
-        runAsGroup: 10001
+        runAsUser: 65532
+        runAsGroup: 65532
         seccompProfile:
           type: RuntimeDefault
       containers:
@@ -35,7 +35,7 @@ spec:
           image: git.stinnesbeck.com/nils/mg4-server:latest # pinned by kustomization.yaml
           ports:
             - name: http
-              containerPort: 3000
+              containerPort: 8080
           env:
             - name: INFLUX_URL
               value: http://influxdb.mg4.svc:8086
@@ -48,7 +48,7 @@ spec:
                 secretKeyRef:
                   name: influxdb-auth
                   key: admin-token
-          # INGEST_TOKEN, SESSION_SECRET, DASHBOARD_PASSWORD, ABRP_API_KEY, ABRP_USER_TOKEN.
+          # INGEST_TOKEN, ABRP_API_KEY, ABRP_USER_TOKEN, ABRP_MIN_INTERVAL_SECONDS.
           envFrom:
             - secretRef:
                 name: mg4-server
@@ -61,30 +61,19 @@ spec:
             httpGet:
               path: /v1/health
               port: http
-            initialDelaySeconds: 10
+            initialDelaySeconds: 5
             periodSeconds: 30
           resources:
             requests:
-              cpu: 50m
-              memory: 128Mi
+              cpu: 10m
+              memory: 32Mi
             limits:
-              memory: 512Mi
+              memory: 128Mi
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
             capabilities:
               drop: ["ALL"]
-          volumeMounts:
-            # Next.js writes its fetch/image cache here; the rest of the filesystem is read-only.
-            - name: next-cache
-              mountPath: /app/.next/cache
-            - name: tmp
-              mountPath: /tmp
-      volumes:
-        - name: next-cache
-          emptyDir: {}
-        - name: tmp
-          emptyDir: {}
 ---
 apiVersion: v1
 kind: Service

From e874578e5466e7b3123be658ecd3b43d68becf0f Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 15:45:18 +0200
Subject: [PATCH 20/79] Replace the turquoise with MG red tones

ev_cyan becomes a light red (#FF9A9E, for values and secondary
highlights, readable on black) and ev_cyan_deep a deep red (#3A1215,
version badge). Turquoise hardcoded in the battery card, switch track,
input panel, car outline, background glow and charging-graph grid is
replaced with matching red tones, as are two gold leftovers (tab
outline, second background glow). The mint "OK" status colour and the
amber charging curve are unchanged.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 AGENTS.md                                                  | 2 +-
 app/src/main/java/com/evsuite/abrp/ChargingGraphView.java  | 2 +-
 .../main/java/com/evsuite/abrp/PremiumBackdropView.java    | 4 ++--
 app/src/main/res/color/nav_tab_stroke.xml                  | 2 +-
 app/src/main/res/color/switch_track.xml                    | 2 +-
 app/src/main/res/drawable/bg_battery_card.xml              | 2 +-
 app/src/main/res/drawable/bg_input_panel.xml               | 2 +-
 app/src/main/res/drawable/ic_vehicle_outline.xml           | 4 ++--
 app/src/main/res/values/colors.xml                         | 7 ++++---
 9 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index a67abd4..e6ec9a0 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -8,7 +8,7 @@ workspace `DESIGN.md` apply; this file contains only telemetry-specific addition
 ## App-specific visual direction (2.2.6)
 
 The user explicitly requested a permanent OLED-black theme, charcoal glass-like cards,
-MG red (#E0424C, replacing the earlier muted gold) and cyan accents. These app resources intentionally override the shared
+MG red accents (#E0424C, with a light #FF9A9E and a deep #3A1215 variant; they replaced the earlier muted gold and cyan). These app resources intentionally override the shared
 DESIGN.md palette, DayNight preference and flat-surface rules. Do not overwrite them
 with the shared token generator. Use static gradients rather than continuous effects;
 keep large touch targets, readable text and null telemetry shown as a dash.
diff --git a/app/src/main/java/com/evsuite/abrp/ChargingGraphView.java b/app/src/main/java/com/evsuite/abrp/ChargingGraphView.java
index acd99da..be73a5c 100644
--- a/app/src/main/java/com/evsuite/abrp/ChargingGraphView.java
+++ b/app/src/main/java/com/evsuite/abrp/ChargingGraphView.java
@@ -14,7 +14,7 @@ public final class ChargingGraphView extends View {
     private final Paint grid = new Paint(1), line = new Paint(1), text = new Paint(1);
     private final List<float[]> points = new ArrayList<>();
     private final float[] socPower = new float[101];
-    public ChargingGraphView(Context c, AttributeSet a) { super(c,a); java.util.Arrays.fill(socPower, Float.NaN); grid.setColor(0x5548C7D9); line.setColor(0xFFFFC857); line.setStrokeWidth(4); text.setColor(0xFFBDC4C6); text.setTextSize(20); }
+    public ChargingGraphView(Context c, AttributeSet a) { super(c,a); java.util.Arrays.fill(socPower, Float.NaN); grid.setColor(0x55E0858A); line.setColor(0xFFFFC857); line.setStrokeWidth(4); text.setColor(0xFFBDC4C6); text.setTextSize(20); }
     synchronized void add(Float soc, Float power) {
         if (soc == null || power == null || power >= 0) return;
         float p = Math.abs(power);
diff --git a/app/src/main/java/com/evsuite/abrp/PremiumBackdropView.java b/app/src/main/java/com/evsuite/abrp/PremiumBackdropView.java
index 7261c20..fa843b1 100644
--- a/app/src/main/java/com/evsuite/abrp/PremiumBackdropView.java
+++ b/app/src/main/java/com/evsuite/abrp/PremiumBackdropView.java
@@ -21,9 +21,9 @@ public final class PremiumBackdropView extends View {
     @Override protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         float radius = Math.max(1, Math.max(w, h) * 0.65f);
         cyan.setShader(new RadialGradient(w * 0.70f, 0, radius,
-                new int[]{0x2419565B, 0x00000000}, null, Shader.TileMode.CLAMP));
+                new int[]{0x245B191D, 0x00000000}, null, Shader.TileMode.CLAMP));
         gold.setShader(new RadialGradient(w, h, radius * 0.65f,
-                new int[]{0x1C8B693A, 0x00000000}, null, Shader.TileMode.CLAMP));
+                new int[]{0x1C8B3A3F, 0x00000000}, null, Shader.TileMode.CLAMP));
     }
 
     @Override protected void onDraw(Canvas canvas) {
diff --git a/app/src/main/res/color/nav_tab_stroke.xml b/app/src/main/res/color/nav_tab_stroke.xml
index 62d6c16..9a29683 100644
--- a/app/src/main/res/color/nav_tab_stroke.xml
+++ b/app/src/main/res/color/nav_tab_stroke.xml
@@ -1 +1 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android"><item android:state_selected="true" android:color="#806F6045"/><item android:color="@color/ev_transparent"/></selector>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"><item android:state_selected="true" android:color="#80703A3D"/><item android:color="@color/ev_transparent"/></selector>
diff --git a/app/src/main/res/color/switch_track.xml b/app/src/main/res/color/switch_track.xml
index 0154b5b..145e36c 100644
--- a/app/src/main/res/color/switch_track.xml
+++ b/app/src/main/res/color/switch_track.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@color/ev_surface_raised" />
-    <item android:state_checked="true" android:color="#345E60" />
+    <item android:state_checked="true" android:color="#5E3436" />
     <item android:color="@color/ev_outline" />
 </selector>
diff --git a/app/src/main/res/drawable/bg_battery_card.xml b/app/src/main/res/drawable/bg_battery_card.xml
index bf08638..2201dc5 100644
--- a/app/src/main/res/drawable/bg_battery_card.xml
+++ b/app/src/main/res/drawable/bg_battery_card.xml
@@ -1 +1 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"><gradient android:angle="315" android:startColor="#E5183032" android:centerColor="#F012191A" android:endColor="#FA121212"/><corners android:radius="24dp"/><stroke android:width="1dp" android:color="#40528C8C"/></shape>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"><gradient android:angle="315" android:startColor="#E5301A1B" android:centerColor="#F012191A" android:endColor="#FA121212"/><corners android:radius="24dp"/><stroke android:width="1dp" android:color="#408C5255"/></shape>
diff --git a/app/src/main/res/drawable/bg_input_panel.xml b/app/src/main/res/drawable/bg_input_panel.xml
index 1b78256..e2b1f97 100644
--- a/app/src/main/res/drawable/bg_input_panel.xml
+++ b/app/src/main/res/drawable/bg_input_panel.xml
@@ -1 +1 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"><solid android:color="#101213"/><corners android:radius="16dp"/><stroke android:width="1dp" android:color="#263233"/></shape>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"><solid android:color="#101213"/><corners android:radius="16dp"/><stroke android:width="1dp" android:color="#322627"/></shape>
diff --git a/app/src/main/res/drawable/ic_vehicle_outline.xml b/app/src/main/res/drawable/ic_vehicle_outline.xml
index e6178ec..365da1d 100644
--- a/app/src/main/res/drawable/ic_vehicle_outline.xml
+++ b/app/src/main/res/drawable/ic_vehicle_outline.xml
@@ -1,5 +1,5 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="92dp" android:height="180dp" android:viewportWidth="92" android:viewportHeight="180">
-<path android:pathData="M27,12 Q46,5 65,12 Q74,18 74,38 L78,130 Q79,157 64,164 L28,164 Q13,157 14,130 L18,38 Q18,18 27,12Z" android:fillColor="#151D1E" android:strokeColor="#85BDBF" android:strokeWidth="1.4"/>
-<path android:pathData="M24,45 Q46,37 68,45 L63,65 Q46,61 29,65Z M28,129 Q46,135 64,129 L66,148 Q46,155 26,148Z M28,72 L28,122 M64,72 L64,122 M23,28 L35,25 M57,25 L69,28 M23,157 L35,159 M57,159 L69,157" android:fillColor="#102D30" android:strokeColor="#527B7C" android:strokeWidth="1.3"/>
+<path android:pathData="M27,12 Q46,5 65,12 Q74,18 74,38 L78,130 Q79,157 64,164 L28,164 Q13,157 14,130 L18,38 Q18,18 27,12Z" android:fillColor="#1E1516" android:strokeColor="#E0858A" android:strokeWidth="1.4"/>
+<path android:pathData="M24,45 Q46,37 68,45 L63,65 Q46,61 29,65Z M28,129 Q46,135 64,129 L66,148 Q46,155 26,148Z M28,72 L28,122 M64,72 L64,122 M23,28 L35,25 M57,25 L69,28 M23,157 L35,159 M57,159 L69,157" android:fillColor="#301012" android:strokeColor="#7C5254" android:strokeWidth="1.3"/>
 <path android:pathData="M10,43 L10,67 M82,43 L82,67 M10,120 L10,144 M82,120 L82,144" android:fillColor="#00000000" android:strokeColor="#E0424C" android:strokeWidth="5" android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index db6aef8..c5f6be3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- User-requested app-specific OLED palette. The accent is MG red (#E0424C, the red of the
      launcher icon); it replaced upstream's muted gold on 2026-10-17. ev_gold_surface keeps its
-     name but is now the dark red tint that goes with it. -->
+     name but is now the dark red tint that goes with it. ev_cyan / ev_cyan_deep likewise keep
+     their names but are the light and the deep red of the same palette (no turquoise left). -->
 <resources>
   <color name="ev_background">#000000</color>
   <color name="ev_surface">#121212</color>
@@ -11,8 +12,8 @@
   <color name="ev_text_secondary">#BDC4C6</color>
   <color name="ev_accent">#E0424C</color>
   <color name="ev_on_accent">#1A0B0C</color>
-  <color name="ev_cyan">#A0E2E0</color>
-  <color name="ev_cyan_deep">#103436</color>
+  <color name="ev_cyan">#FF9A9E</color>
+  <color name="ev_cyan_deep">#3A1215</color>
   <color name="ev_gold_surface">#2A1416</color>
   <color name="ev_ok">#A4DCC1</color>
   <color name="ev_warn">#E9CA96</color>

From 4fe29189c0871187278046956fe0903c88206ed9 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 16:00:29 +0200
Subject: [PATCH 21/79] Pin the pushed server image; drop the pull secret
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

mg4-server:2.0.0 is on git.stinnesbeck.com and pulls anonymously, so
the Deployment no longer references a registry pull secret. The image
is pinned by digest (sha256:6feea777…) so a re-pushed tag cannot
change what the cluster runs. README and secrets template updated.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                 | 3 ++-
 k8s/README.md            | 8 ++++----
 k8s/kustomization.yaml   | 3 ++-
 k8s/secrets.example.yaml | 5 -----
 k8s/server.yaml          | 3 ---
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index 348eef3..1f77b4e 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -37,7 +37,8 @@ car ──live telemetry───▶ car.stinnesbeck.com (Go) ──▶ ABRP  ap
       idempotency, all 25 dashboard queries return data, dashboards rendered and checked.
 - [x] Manifests validated offline (including Traefik CRDs). **Not applied.**
 - [x] Car app 2.3.0: unit tests and lint pass; **not yet tried on the car**.
-- [ ] Push the image (`mg4-server:2.0.0`) to git.stinnesbeck.com (needs a registry login here).
+- [x] Image `mg4-server:2.0.0` pushed to git.stinnesbeck.com (public; pinned by digest
+      `sha256:6feea777…` in `k8s/kustomization.yaml`).
 - [ ] Check in `k8s/ingress.yaml`: the Traefik ingress class (placeholder `traefik-external`) and
       Grafana's host (placeholder `car-grafana.stinnesbeck.com`).
 - [ ] First drive with 2.3.0: telemetry arrives in InfluxDB, Grafana and ABRP.
diff --git a/k8s/README.md b/k8s/README.md
index db45c48..83bd3a7 100644
--- a/k8s/README.md
+++ b/k8s/README.md
@@ -22,9 +22,8 @@ is applied automatically. Apply them yourself.
 2. **Create the Secrets.** Copy `secrets.example.yaml` outside the repository, replace every
    `CHANGE-ME` (`openssl rand -hex 32`), then apply the copy: `influxdb-auth`, `mg4-server`
    (ingest token, your ABRP API key and user token) and `grafana-admin`.
-3. **Registry access.** If the `mg4-server` package on git.stinnesbeck.com is private, create the
-   `git-stinnesbeck-registry` pull secret (command in `secrets.example.yaml`); if it is public,
-   delete `imagePullSecrets` from `server.yaml`.
+3. **Registry access.** The `mg4-server` package on git.stinnesbeck.com is public, so no pull
+   secret is needed. If you make it private, add an `imagePullSecrets` entry to `server.yaml`.
 
 ## Apply
 
@@ -42,4 +41,5 @@ kubectl apply -k k8s/
   for Grafana, read/write for the server) can replace it later.
 - The dashboards are read-only in Grafana's UI. Change the JSON in `grafana/dashboards/`; the
   ConfigMap name changes with its content, which rolls Grafana.
-- To upgrade the server, push a new image tag and change `newTag` in `kustomization.yaml`.
+- The server image is pinned by digest in `kustomization.yaml`. To upgrade, push a new tag and
+  put its digest there (`skopeo inspect docker://git.stinnesbeck.com/nils/mg4-server:<tag>`).
diff --git a/k8s/kustomization.yaml b/k8s/kustomization.yaml
index 0a643ee..61be4c7 100644
--- a/k8s/kustomization.yaml
+++ b/k8s/kustomization.yaml
@@ -10,7 +10,8 @@ resources:
   - ingress.yaml
 images:
   - name: git.stinnesbeck.com/nils/mg4-server
-    newTag: "2.0.0"
+    # 2.0.0, pinned by digest so a re-pushed tag cannot change what runs.
+    digest: sha256:6feea777c514b9488ffb0b49fad7c15423ee06f0e0e8d609cf31eb85755da815
 generatorOptions:
   labels:
     app.kubernetes.io/part-of: mg4
diff --git a/k8s/secrets.example.yaml b/k8s/secrets.example.yaml
index cc316cd..a60b124 100644
--- a/k8s/secrets.example.yaml
+++ b/k8s/secrets.example.yaml
@@ -37,8 +37,3 @@ stringData:
   # Grafana's admin login (user "admin"). Only read on first start: change it in Grafana
   # afterwards, or reset it with grafana cli.
   admin-password: CHANGE-ME
----
-# Pull secret for a private image on git.stinnesbeck.com. Easier to create with:
-#   kubectl -n mg4 create secret docker-registry git-stinnesbeck-registry \
-#     --docker-server=git.stinnesbeck.com --docker-username=<user> --docker-password=<token>
-# If the package is public, remove imagePullSecrets from server.yaml instead.
diff --git a/k8s/server.yaml b/k8s/server.yaml
index e004ef8..1f20507 100644
--- a/k8s/server.yaml
+++ b/k8s/server.yaml
@@ -21,9 +21,6 @@ spec:
         app.kubernetes.io/name: mg4-server
         app.kubernetes.io/part-of: mg4
     spec:
-      # Needed only if the image is private on git.stinnesbeck.com; see secrets.example.yaml.
-      imagePullSecrets:
-        - name: git-stinnesbeck-registry
       securityContext:
         runAsNonRoot: true
         runAsUser: 65532

From d5f68e1bd9c98ce95a6c93015abbd3c752cccbd3 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 16:16:19 +0200
Subject: [PATCH 22/79] Server 2.1.0: pair cars by QR code instead of typing
 the token

Modelled on the OAuth device authorization grant (RFC 8628) and on
only when APPROVAL_PASSWORD is set (at least 12 characters):

- POST /v1/pair/start opens a request for an installation and returns
  a short user code and the /pair URL for the car's QR code;
  POST /v1/pair/poll returns pending, the car's own token (once),
  denied or expired. Requests live 10 minutes, in memory.
- GET/POST /pair is a script-free approval page for the phone
  (strict CSP, no framing). Five wrong passwords lock approvals for a
  minute.
- Each car gets its own 43-character token; only its SHA-256 is stored
  (measurement "device"), and the device is persisted before the car
  can collect the token. Tokens are loaded at startup, so a restart
  keeps paired cars working; the server refuses to start if they cannot
  be loaded.
- GET /v1/devices and POST /v1/devices/{id}/revoke, authenticated with
  the approval password, list and revoke cars.
- The shared INGEST_TOKEN keeps working.

31 tests (race detector clean), govulncheck clean. Tested end to end
against InfluxDB 2.7.12: pairing, wrong password, single collection,
persistence across restarts, revocation (also across a restart), and
that InfluxDB holds only the hash.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 server/README.md       |  27 +++-
 server/api.go          |  21 ++-
 server/api_test.go     |  25 +++-
 server/main.go         |  30 +++-
 server/pairing.go      | 311 +++++++++++++++++++++++++++++++++++++++++
 server/pairing_http.go | 294 ++++++++++++++++++++++++++++++++++++++
 server/pairing_test.go | 234 +++++++++++++++++++++++++++++++
 server/store.go        |  38 +++++
 8 files changed, 970 insertions(+), 10 deletions(-)
 create mode 100644 server/pairing.go
 create mode 100644 server/pairing_http.go
 create mode 100644 server/pairing_test.go

diff --git a/server/README.md b/server/README.md
index 8dfba01..647d2cd 100644
--- a/server/README.md
+++ b/server/README.md
@@ -22,13 +22,16 @@ Environment only; the server refuses to start when a required value is missing.
 | `INGEST_TOKEN` | required, at least 24 characters: `openssl rand -hex 32` |
 | `ABRP_API_KEY`, `ABRP_USER_TOKEN` | optional; both needed to forward |
 | `ABRP_MIN_INTERVAL_SECONDS` | default 5 |
+| `APPROVAL_PASSWORD` | optional, at least 12 characters; switches pairing on (see below) |
+| `PUBLIC_URL` | the address a phone uses, for the pairing QR code; derived from the request if empty |
 | `LISTEN_ADDR` | default `:8080` |
 
 The ABRP credentials never reach the car.
 
 ## Endpoints
 
-All but `/v1/health` need `Authorization: Bearer <INGEST_TOKEN>`.
+The ingest endpoints accept `Authorization: Bearer <token>` with either the shared `INGEST_TOKEN`
+or a paired car's own token.
 
 - `POST /v1/telemetry` — `{ installationId, samples: [...] }`, up to 500 samples in ABRP's `tlm`
   field names and units (`utc` in epoch seconds; flags as 0/1 or booleans). Unknown fields are
@@ -41,6 +44,27 @@ All but `/v1/health` need `Authorization: Bearer <INGEST_TOKEN>`.
 
 A bad request is a 400 naming the field; a database failure is a 500 without detail.
 
+## Pairing a car by QR code
+
+So nobody types a token in the car. Modelled on the OAuth device authorization grant (RFC 8628);
+on only when `APPROVAL_PASSWORD` is set.
+
+1. The car calls `POST /v1/pair/start` `{installationId}` and shows the returned
+   `verificationUriComplete` as a QR code, plus the short `userCode` (e.g. `K7F-3QX`).
+2. The phone opens `/pair?code=…`, the owner checks the code and approves with the approval
+   password. Five wrong passwords lock approvals for a minute.
+3. The car polls `POST /v1/pair/poll` `{deviceCode}`: 202 pending, 200 with its own token
+   (handed out once), 403 denied, 410 expired (after 10 minutes) or unknown.
+
+Each car gets its own 43-character token; only its SHA-256 is stored (measurement `device` in
+the same bucket), and the device is persisted before the car can collect the token, so a
+restart never loses a paired car. Manage cars with the approval password:
+
+```sh
+curl -H "Authorization: Bearer $APPROVAL_PASSWORD" https://car.stinnesbeck.com/v1/devices
+curl -X POST -H "Authorization: Bearer $APPROVAL_PASSWORD" https://car.stinnesbeck.com/v1/devices/<id>/revoke
+```
+
 ## Storage
 
 One bucket, `installationId` tag on every point:
@@ -51,6 +75,7 @@ One bucket, `installationId` tag on every point:
 | `consumption_chunk` | `recordedAt` | `date` | km, kwh, hours, socDrop, sohPercent |
 | `charging_session` | `startedAt` | `sessionId` | endedAtMs, duration, energy, cost, start/end SOC |
 | `charging_curve` | point time | `sessionId` | powerKw, socPercent |
+| `device` | paired at | `deviceId` | tokenHash, installationId, revoked |
 
 A point with the same measurement, tags and timestamp replaces the earlier one, so the car's
 retries are idempotent: a cached chunk is re-sent with its original `recordedAt`. Days and the
diff --git a/server/api.go b/server/api.go
index 89b8923..ce1390e 100644
--- a/server/api.go
+++ b/server/api.go
@@ -17,10 +17,17 @@ import (
 //	PUT  /v1/charging-sessions/{sessionId}       one finished DC charging session
 //	GET  /v1/consumption/history/{installationId} the car reads its own totals back
 //	GET  /v1/health                              unauthenticated liveness probe
+//
+// A car authenticates with the shared INGEST_TOKEN or with its own token from pairing
+// (pairing_http.go).
 type API struct {
 	Store       Store
 	IngestToken string
 	Forwarder   *Forwarder
+	Pairing     *Pairing
+	// PublicURL is the server's address as a phone reaches it, for the pairing QR code;
+	// derived from the request when empty.
+	PublicURL string
 }
 
 const maxBodyBytes = 512 * 1024
@@ -34,18 +41,24 @@ func (a *API) Routes() http.Handler {
 	mux.HandleFunc("PUT /v1/consumption/daily", a.ingest(a.consumption))
 	mux.HandleFunc("PUT /v1/charging-sessions/{sessionId}", a.ingest(a.chargingSession))
 	mux.HandleFunc("GET /v1/consumption/history/{installationId}", a.ingest(a.history))
+	a.pairingRoutes(mux)
 	return mux
 }
 
-// hasIngestToken compares in constant time. main refuses to start with a token under 24
-// characters, so an empty or short configured token can never match here.
+// hasIngestToken accepts the shared token (compared in constant time; main refuses to start
+// with one under 24 characters, so an empty or short one never matches) or a paired car's
+// own, unrevoked token.
 func (a *API) hasIngestToken(r *http.Request) bool {
 	header := r.Header.Get("Authorization")
 	supplied, ok := strings.CutPrefix(header, "Bearer ")
-	if !ok || len(a.IngestToken) < minIngestTokenLength {
+	if !ok || supplied == "" {
 		return false
 	}
-	return subtle.ConstantTimeCompare([]byte(supplied), []byte(a.IngestToken)) == 1
+	if len(a.IngestToken) >= minIngestTokenLength &&
+		subtle.ConstantTimeCompare([]byte(supplied), []byte(a.IngestToken)) == 1 {
+		return true
+	}
+	return a.Pairing.Authorized(supplied)
 }
 
 type handler func(w http.ResponseWriter, r *http.Request, body []byte) error
diff --git a/server/api_test.go b/server/api_test.go
index c466fde..c3832ae 100644
--- a/server/api_test.go
+++ b/server/api_test.go
@@ -16,6 +16,7 @@ type fakeStore struct {
 	telemetry []TelemetrySample
 	chunks    []ConsumptionChunk
 	sessions  []ChargingSession
+	devices   []Device
 	fail      error
 }
 
@@ -46,17 +47,37 @@ func (f *fakeStore) WriteChargingSession(_ context.Context, s ChargingSession) e
 	return f.fail
 }
 
+func (f *fakeStore) SaveDevice(_ context.Context, d Device) error {
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	if f.fail != nil {
+		return f.fail
+	}
+	f.devices = append(f.devices, d)
+	return nil
+}
+
+func (f *fakeStore) LoadDevices(context.Context) ([]Device, error) {
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	return f.devices, f.fail
+}
+
 func (f *fakeStore) ReadConsumptionChunks(context.Context, string) ([]ConsumptionChunk, error) {
 	f.mu.Lock()
 	defer f.mu.Unlock()
 	return f.chunks, f.fail
 }
 
-const testToken = "ingest-test-token-0123456789abcdef"
+const (
+	testToken            = "ingest-test-token-0123456789abcdef"
+	testApprovalPassword = "approval-password-123"
+)
 
 func newTestAPI() (*API, *fakeStore) {
 	store := &fakeStore{}
-	return &API{Store: store, IngestToken: testToken, Forwarder: &Forwarder{}}, store
+	return &API{Store: store, IngestToken: testToken, Forwarder: &Forwarder{},
+		Pairing: NewPairing(testApprovalPassword, nil), PublicURL: "https://car.example.com"}, store
 }
 
 func do(t *testing.T, h http.Handler, method, path, token, body string) *httptest.ResponseRecorder {
diff --git a/server/main.go b/server/main.go
index 18ca0b6..6bc6eb7 100644
--- a/server/main.go
+++ b/server/main.go
@@ -16,7 +16,10 @@ import (
 	"time"
 )
 
-const minIngestTokenLength = 24
+const (
+	minIngestTokenLength      = 24
+	minApprovalPasswordLength = 12
+)
 
 type config struct {
 	listenAddr      string
@@ -28,6 +31,8 @@ type config struct {
 	abrpAPIKey      string
 	abrpUserToken   string
 	abrpMinInterval time.Duration
+	approvalPass    string
+	publicURL       string
 }
 
 // loadConfig reads the environment and fails closed: a missing InfluxDB setting or a
@@ -42,6 +47,8 @@ func loadConfig(getenv func(string) string) (config, error) {
 		ingestToken:   getenv("INGEST_TOKEN"),
 		abrpAPIKey:    getenv("ABRP_API_KEY"),
 		abrpUserToken: getenv("ABRP_USER_TOKEN"),
+		approvalPass:  getenv("APPROVAL_PASSWORD"),
+		publicURL:     getenv("PUBLIC_URL"),
 	}
 	if c.listenAddr == "" {
 		c.listenAddr = ":8080"
@@ -57,6 +64,11 @@ func loadConfig(getenv func(string) string) (config, error) {
 	if len(c.ingestToken) < minIngestTokenLength {
 		return config{}, fmt.Errorf("INGEST_TOKEN must be at least %d characters", minIngestTokenLength)
 	}
+	// Pairing is optional; when it is on, its password guards token issuance and must not
+	// be guessable.
+	if c.approvalPass != "" && len(c.approvalPass) < minApprovalPasswordLength {
+		return config{}, fmt.Errorf("APPROVAL_PASSWORD must be at least %d characters", minApprovalPasswordLength)
+	}
 	c.abrpMinInterval = 5 * time.Second
 	if raw := getenv("ABRP_MIN_INTERVAL_SECONDS"); raw != "" {
 		seconds, err := strconv.ParseFloat(raw, 64)
@@ -84,7 +96,18 @@ func main() {
 		MinInterval: cfg.abrpMinInterval,
 		Client:      &http.Client{Timeout: 10 * time.Second},
 	}
-	api := &API{Store: store, IngestToken: cfg.ingestToken, Forwarder: forwarder}
+	// Paired cars' tokens must be known before the first request; starting without them
+	// would answer every paired car with 401, so a failed load stops the start instead.
+	loadCtx, cancelLoad := context.WithTimeout(context.Background(), 30*time.Second)
+	devices, err := store.LoadDevices(loadCtx)
+	cancelLoad()
+	if err != nil {
+		slog.Error("paired devices could not be loaded", "error", err)
+		os.Exit(1)
+	}
+	pairing := NewPairing(cfg.approvalPass, devices)
+	api := &API{Store: store, IngestToken: cfg.ingestToken, Forwarder: forwarder,
+		Pairing: pairing, PublicURL: cfg.publicURL}
 
 	srv := &http.Server{
 		Addr:              cfg.listenAddr,
@@ -98,7 +121,8 @@ func main() {
 	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
 	defer stop()
 	go func() {
-		slog.Info("listening", "addr", cfg.listenAddr, "bucket", cfg.influxBucket, "abrp", forwarder.configured())
+		slog.Info("listening", "addr", cfg.listenAddr, "bucket", cfg.influxBucket,
+			"abrp", forwarder.configured(), "pairing", pairing.Enabled(), "pairedDevices", len(devices))
 		if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
 			slog.Error("server failed", "error", err)
 			os.Exit(1)
diff --git a/server/pairing.go b/server/pairing.go
new file mode 100644
index 0000000..f67438c
--- /dev/null
+++ b/server/pairing.go
@@ -0,0 +1,311 @@
+package main
+
+import (
+	"crypto/rand"
+	"crypto/sha256"
+	"crypto/subtle"
+	"encoding/base64"
+	"encoding/hex"
+	"errors"
+	"strings"
+	"sync"
+	"time"
+)
+
+// Pairing lets a car get its own ingest token without anyone typing it: the car asks for a
+// pairing request and shows its code as a QR code, a phone opens the approval page, the
+// owner signs in with the approval password and approves, and the car — polling meanwhile —
+// receives a token once. Modelled on the OAuth device authorization grant (RFC 8628).
+//
+// Pending requests live in memory only: they last ten minutes, and the server runs as one
+// replica. Approved devices are persisted (see Device) so their tokens survive a restart.
+
+const (
+	pairingTTL        = 10 * time.Minute
+	pairingInterval   = 5 * time.Second
+	maxPendingPairing = 50
+	// After this many wrong approval passwords in a window, approvals pause for the window.
+	maxFailedLogins    = 5
+	failedLoginsWindow = time.Minute
+	// Unambiguous characters only: no 0/O, 1/I/L, so a code reads right off a car screen.
+	userCodeAlphabet = "ABCDEFGHJKMNPQRSTUVWXYZ23456789"
+)
+
+var (
+	errUnknownCode   = errors.New("unknown or expired code")
+	errNotPending    = errors.New("request already decided")
+	errTooManyFailed = errors.New("too many wrong passwords, try again in a minute")
+	errWrongPassword = errors.New("wrong password")
+	errTooMany       = errors.New("too many pending pairing requests")
+)
+
+// Device is a paired car. Only the SHA-256 of its token is kept.
+type Device struct {
+	ID             string
+	InstallationID string
+	TokenHash      string
+	CreatedAt      time.Time
+	Revoked        bool
+}
+
+type pairingState int
+
+const (
+	pairingPending pairingState = iota
+	pairingApproved
+	pairingDenied
+)
+
+type pairingRequest struct {
+	deviceCode     string
+	userCode       string
+	installationID string
+	expires        time.Time
+	state          pairingState
+	token          string // set on approval, handed out once
+	deviceID       string
+}
+
+// Pairing holds pending requests and the known devices. The clock is injectable for tests.
+type Pairing struct {
+	ApprovalPassword string
+	Now              func() time.Time
+
+	mu       sync.Mutex
+	byDevice map[string]*pairingRequest
+	byUser   map[string]*pairingRequest
+	devices  map[string]Device // by token hash
+	failures []time.Time
+}
+
+func NewPairing(password string, devices []Device) *Pairing {
+	p := &Pairing{
+		ApprovalPassword: password,
+		Now:              time.Now,
+		byDevice:         map[string]*pairingRequest{},
+		byUser:           map[string]*pairingRequest{},
+		devices:          map[string]Device{},
+	}
+	for _, d := range devices {
+		p.devices[d.TokenHash] = d
+	}
+	return p
+}
+
+func (p *Pairing) Enabled() bool { return p != nil && p.ApprovalPassword != "" }
+
+func randomString(n int) string {
+	b := make([]byte, n)
+	if _, err := rand.Read(b); err != nil {
+		panic(err) // crypto/rand does not fail on supported platforms
+	}
+	return base64.RawURLEncoding.EncodeToString(b)
+}
+
+func newUserCode() string {
+	b := make([]byte, 6)
+	if _, err := rand.Read(b); err != nil {
+		panic(err)
+	}
+	code := make([]byte, 0, 7)
+	for i, v := range b {
+		if i == 3 {
+			code = append(code, '-')
+		}
+		// 256 % 31 leaves a slight bias; irrelevant for a 10-minute code that also needs
+		// the approval password.
+		code = append(code, userCodeAlphabet[int(v)%len(userCodeAlphabet)])
+	}
+	return string(code)
+}
+
+// normalizeUserCode accepts what a person types: any case, with or without the dash.
+func normalizeUserCode(code string) string {
+	code = strings.ToUpper(strings.TrimSpace(code))
+	code = strings.ReplaceAll(code, "-", "")
+	code = strings.ReplaceAll(code, " ", "")
+	if len(code) != 6 {
+		return ""
+	}
+	return code[:3] + "-" + code[3:]
+}
+
+func hashToken(token string) string {
+	sum := sha256.Sum256([]byte(token))
+	return hex.EncodeToString(sum[:])
+}
+
+func (p *Pairing) expireLocked(now time.Time) {
+	for code, r := range p.byDevice {
+		if now.After(r.expires) {
+			delete(p.byDevice, code)
+			delete(p.byUser, r.userCode)
+		}
+	}
+}
+
+// Start opens a pairing request for a car.
+func (p *Pairing) Start(installationID string) (*pairingRequest, error) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	now := p.Now()
+	p.expireLocked(now)
+	if len(p.byDevice) >= maxPendingPairing {
+		return nil, errTooMany
+	}
+	r := &pairingRequest{
+		deviceCode:     randomString(32),
+		installationID: installationID,
+		expires:        now.Add(pairingTTL),
+	}
+	for {
+		r.userCode = newUserCode()
+		if _, taken := p.byUser[r.userCode]; !taken {
+			break
+		}
+	}
+	p.byDevice[r.deviceCode] = r
+	p.byUser[r.userCode] = r
+	out := *r
+	return &out, nil
+}
+
+// Lookup returns the pending request for a user code, for the approval page.
+func (p *Pairing) Lookup(userCode string) (pairingRequest, error) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	p.expireLocked(p.Now())
+	r, ok := p.byUser[normalizeUserCode(userCode)]
+	if !ok {
+		return pairingRequest{}, errUnknownCode
+	}
+	return *r, nil
+}
+
+// checkPassword counts failures and refuses everything while too many are recent.
+func (p *Pairing) checkPasswordLocked(password string, now time.Time) error {
+	recent := p.failures[:0]
+	for _, t := range p.failures {
+		if now.Sub(t) < failedLoginsWindow {
+			recent = append(recent, t)
+		}
+	}
+	p.failures = recent
+	if len(p.failures) >= maxFailedLogins {
+		return errTooManyFailed
+	}
+	if subtle.ConstantTimeCompare([]byte(password), []byte(p.ApprovalPassword)) != 1 {
+		p.failures = append(p.failures, now)
+		return errWrongPassword
+	}
+	return nil
+}
+
+// Decide approves or denies a pending request. On approval it returns the new device, which
+// the caller must persist before the car can collect the token.
+func (p *Pairing) Decide(userCode, password string, approve bool) (Device, error) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	now := p.Now()
+	if err := p.checkPasswordLocked(password, now); err != nil {
+		return Device{}, err
+	}
+	p.expireLocked(now)
+	r, ok := p.byUser[normalizeUserCode(userCode)]
+	if !ok {
+		return Device{}, errUnknownCode
+	}
+	if r.state != pairingPending {
+		return Device{}, errNotPending
+	}
+	if !approve {
+		r.state = pairingDenied
+		return Device{}, nil
+	}
+	token := randomString(32) // 43 characters
+	d := Device{
+		ID:             randomString(9),
+		InstallationID: r.installationID,
+		TokenHash:      hashToken(token),
+		CreatedAt:      now,
+	}
+	r.state = pairingApproved
+	r.token = token
+	r.deviceID = d.ID
+	p.devices[d.TokenHash] = d
+	return d, nil
+}
+
+// Forget undoes an approval whose device could not be persisted, so no token is handed out
+// that would stop working at the next restart.
+func (p *Pairing) Forget(userCode string, d Device) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	delete(p.devices, d.TokenHash)
+	if r, ok := p.byUser[normalizeUserCode(userCode)]; ok {
+		r.state = pairingPending
+		r.token = ""
+		r.deviceID = ""
+	}
+}
+
+// Poll is what the car calls: pending, the token (exactly once), denied, or unknown.
+func (p *Pairing) Poll(deviceCode string) (state pairingState, token, deviceID string, err error) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	p.expireLocked(p.Now())
+	r, ok := p.byDevice[deviceCode]
+	if !ok {
+		return 0, "", "", errUnknownCode
+	}
+	switch r.state {
+	case pairingApproved, pairingDenied:
+		// Decided: hand the outcome out once, then forget the request.
+		delete(p.byDevice, r.deviceCode)
+		delete(p.byUser, r.userCode)
+	}
+	return r.state, r.token, r.deviceID, nil
+}
+
+// Authorized reports whether a token belongs to a paired, unrevoked device.
+func (p *Pairing) Authorized(token string) bool {
+	if p == nil || token == "" {
+		return false
+	}
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	d, ok := p.devices[hashToken(token)]
+	return ok && !d.Revoked
+}
+
+func (p *Pairing) Devices() []Device {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	out := make([]Device, 0, len(p.devices))
+	for _, d := range p.devices {
+		out = append(out, d)
+	}
+	return out
+}
+
+// Revoke marks a device revoked and returns it for persisting.
+func (p *Pairing) Revoke(id string) (Device, bool) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	for hash, d := range p.devices {
+		if d.ID == id {
+			d.Revoked = true
+			p.devices[hash] = d
+			return d, true
+		}
+	}
+	return Device{}, false
+}
+
+// CheckAdmin verifies the approval password for the device-management API, with the same
+// failure counting as the approval page.
+func (p *Pairing) CheckAdmin(password string) error {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	return p.checkPasswordLocked(password, p.Now())
+}
diff --git a/server/pairing_http.go b/server/pairing_http.go
new file mode 100644
index 0000000..f8341f1
--- /dev/null
+++ b/server/pairing_http.go
@@ -0,0 +1,294 @@
+package main
+
+import (
+	"errors"
+	"html/template"
+	"io"
+	"log/slog"
+	"net/http"
+	"net/url"
+	"strings"
+	"time"
+)
+
+// HTTP side of pairing.
+//
+//	POST /v1/pair/start            car: open a request          {installationId} → codes and URL
+//	POST /v1/pair/poll             car: collect the outcome     {deviceCode} → 202 / 200 token / 403 / 410
+//	GET  /pair[?code=XXX-XXX]      phone: approval page
+//	POST /pair                     phone: approve or deny (needs the approval password)
+//	GET  /v1/devices               list paired cars             Bearer <APPROVAL_PASSWORD>
+//	POST /v1/devices/{id}/revoke   revoke a car's token         Bearer <APPROVAL_PASSWORD>
+//
+// Start and poll need no token — the car does not have one yet. What they hand out is
+// worthless until a person who knows the approval password approves it.
+
+func (a *API) pairingRoutes(mux *http.ServeMux) {
+	mux.HandleFunc("POST /v1/pair/start", a.pairStart)
+	mux.HandleFunc("POST /v1/pair/poll", a.pairPoll)
+	mux.HandleFunc("GET /pair", a.pairPage)
+	mux.HandleFunc("POST /pair", a.pairDecide)
+	mux.HandleFunc("GET /v1/devices", a.listDevices)
+	mux.HandleFunc("POST /v1/devices/{id}/revoke", a.revokeDevice)
+}
+
+func (a *API) pairingDisabled(w http.ResponseWriter) bool {
+	if a.Pairing.Enabled() {
+		return false
+	}
+	writeJSON(w, http.StatusNotFound, map[string]string{"error": "pairing is not enabled"})
+	return true
+}
+
+func readSmallJSON(r *http.Request) (object, error) {
+	body, err := io.ReadAll(io.LimitReader(r.Body, 4097))
+	if err != nil || len(body) > 4096 {
+		return nil, invalid("body is too large")
+	}
+	return decodeObject(body)
+}
+
+// publicURL is where the phone should go: PUBLIC_URL when set, otherwise what the request
+// came in on (behind Traefik, the forwarded scheme and host).
+func (a *API) publicURL(r *http.Request) string {
+	if a.PublicURL != "" {
+		return strings.TrimRight(a.PublicURL, "/")
+	}
+	scheme := "http"
+	if r.TLS != nil || r.Header.Get("X-Forwarded-Proto") == "https" {
+		scheme = "https"
+	}
+	host := r.Header.Get("X-Forwarded-Host")
+	if host == "" {
+		host = r.Host
+	}
+	return scheme + "://" + host
+}
+
+func (a *API) pairStart(w http.ResponseWriter, r *http.Request) {
+	if a.pairingDisabled(w) {
+		return
+	}
+	o, err := readSmallJSON(r)
+	if err != nil {
+		writeJSON(w, http.StatusBadRequest, map[string]string{"error": err.Error()})
+		return
+	}
+	id, err := validUUID(o["installationId"], "installationId")
+	if err != nil {
+		writeJSON(w, http.StatusBadRequest, map[string]string{"error": err.Error()})
+		return
+	}
+	req, err := a.Pairing.Start(id)
+	if err != nil {
+		writeJSON(w, http.StatusTooManyRequests, map[string]string{"error": err.Error()})
+		return
+	}
+	base := a.publicURL(r) + "/pair"
+	writeJSON(w, http.StatusCreated, map[string]any{
+		"deviceCode":              req.deviceCode,
+		"userCode":                req.userCode,
+		"verificationUri":         base,
+		"verificationUriComplete": base + "?code=" + url.QueryEscape(req.userCode),
+		"expiresIn":               int(pairingTTL / time.Second),
+		"interval":                int(pairingInterval / time.Second),
+	})
+}
+
+func (a *API) pairPoll(w http.ResponseWriter, r *http.Request) {
+	if a.pairingDisabled(w) {
+		return
+	}
+	o, err := readSmallJSON(r)
+	if err != nil {
+		writeJSON(w, http.StatusBadRequest, map[string]string{"error": err.Error()})
+		return
+	}
+	code, _ := o["deviceCode"].(string)
+	state, token, deviceID, err := a.Pairing.Poll(code)
+	switch {
+	case err != nil:
+		writeJSON(w, http.StatusGone, map[string]string{"error": "expired_token"})
+	case state == pairingPending:
+		writeJSON(w, http.StatusAccepted, map[string]string{"status": "authorization_pending"})
+	case state == pairingDenied:
+		writeJSON(w, http.StatusForbidden, map[string]string{"error": "access_denied"})
+	default:
+		writeJSON(w, http.StatusOK, map[string]string{"token": token, "deviceId": deviceID})
+	}
+}
+
+// ---------- Approval page ----------
+
+type pageData struct {
+	Code    string
+	Message string
+	Error   string
+	Done    bool
+}
+
+var pairTemplate = template.Must(template.New("pair").Parse(`<!doctype html>
+<html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
+<title>Pair a car — Nils' MG4</title>
+<style>
+:root{color-scheme:dark}
+body{margin:0;min-height:100vh;display:flex;align-items:center;justify-content:center;background:#000;color:#F4F3EF;font:16px/1.5 system-ui,sans-serif}
+main{width:min(92vw,420px);background:#121212;border:1px solid #363B3D;border-radius:16px;padding:28px}
+h1{margin:0 0 4px;font-size:22px}p{color:#BDC4C6;margin:8px 0 18px}
+.code{font:600 34px/1.2 ui-monospace,monospace;letter-spacing:4px;color:#FF9A9E;text-align:center;margin:18px 0}
+label{display:block;font-size:14px;color:#BDC4C6;margin:14px 0 6px}
+input{box-sizing:border-box;width:100%;padding:14px;border-radius:10px;border:1px solid #363B3D;background:#000;color:#F4F3EF;font-size:18px}
+.row{display:flex;gap:10px;margin-top:20px}
+button{flex:1;padding:14px;border-radius:10px;border:0;font-size:17px;font-weight:600;cursor:pointer}
+.approve{background:#E0424C;color:#1A0B0C}.deny{background:#2A1416;color:#FF9A9E;border:1px solid #3A1215}
+.error{color:#FFB4AB}.ok{color:#A4DCC1}
+</style></head><body><main>
+<h1>Pair a car</h1>
+{{if .Done}}
+<p class="ok">{{.Message}}</p>
+{{else}}
+<p>Check that this code matches the one on the car's screen, then approve with the approval password.</p>
+<form method="post" action="/pair" autocomplete="on">
+{{if .Code}}<div class="code">{{.Code}}</div><input type="hidden" name="code" value="{{.Code}}">
+{{else}}<label for="code">Code shown on the car</label>
+<input id="code" name="code" autocapitalize="characters" autocomplete="off" placeholder="XXX-XXX" required>{{end}}
+<input type="text" name="username" value="mg4-approval" autocomplete="username" hidden readonly>
+<label for="password">Approval password</label>
+<input id="password" name="password" type="password" autocomplete="current-password" required {{if .Code}}autofocus{{end}}>
+{{if .Error}}<p class="error">{{.Error}}</p>{{end}}
+<div class="row"><button class="approve" name="action" value="approve">Approve</button>
+<button class="deny" name="action" value="deny" formnovalidate>Deny</button></div>
+</form>
+{{end}}
+</main></body></html>`))
+
+func renderPage(w http.ResponseWriter, status int, data pageData) {
+	h := w.Header()
+	h.Set("Content-Type", "text/html; charset=utf-8")
+	// No scripts at all, no framing, forms only back to this page.
+	h.Set("Content-Security-Policy", "default-src 'none'; style-src 'unsafe-inline'; form-action 'self'; frame-ancestors 'none'; base-uri 'none'")
+	h.Set("X-Content-Type-Options", "nosniff")
+	h.Set("Referrer-Policy", "no-referrer")
+	h.Set("Cache-Control", "no-store")
+	w.WriteHeader(status)
+	if err := pairTemplate.Execute(w, data); err != nil {
+		slog.Warn("pair page not rendered", "error", err)
+	}
+}
+
+func (a *API) pairPage(w http.ResponseWriter, r *http.Request) {
+	if !a.Pairing.Enabled() {
+		http.NotFound(w, r)
+		return
+	}
+	data := pageData{}
+	if raw := r.URL.Query().Get("code"); raw != "" {
+		if req, err := a.Pairing.Lookup(raw); err == nil && req.state == pairingPending {
+			data.Code = req.userCode
+		} else {
+			data.Error = "This code is unknown or has expired. Start pairing again on the car."
+		}
+	}
+	renderPage(w, http.StatusOK, data)
+}
+
+func (a *API) pairDecide(w http.ResponseWriter, r *http.Request) {
+	if !a.Pairing.Enabled() {
+		http.NotFound(w, r)
+		return
+	}
+	r.Body = http.MaxBytesReader(w, r.Body, 4096)
+	if err := r.ParseForm(); err != nil {
+		renderPage(w, http.StatusBadRequest, pageData{Error: "The form could not be read."})
+		return
+	}
+	code := normalizeUserCode(r.PostForm.Get("code"))
+	approve := r.PostForm.Get("action") != "deny"
+	device, err := a.Pairing.Decide(code, r.PostForm.Get("password"), approve)
+	switch {
+	case errors.Is(err, errWrongPassword):
+		renderPage(w, http.StatusUnauthorized, pageData{Code: code, Error: "Wrong password."})
+		return
+	case errors.Is(err, errTooManyFailed):
+		renderPage(w, http.StatusTooManyRequests, pageData{Code: code, Error: err.Error() + "."})
+		return
+	case errors.Is(err, errUnknownCode), errors.Is(err, errNotPending):
+		renderPage(w, http.StatusNotFound, pageData{Error: "This code is unknown, expired or already used. Start pairing again on the car."})
+		return
+	case err != nil:
+		renderPage(w, http.StatusInternalServerError, pageData{Code: code, Error: "Something went wrong."})
+		return
+	}
+	if !approve {
+		renderPage(w, http.StatusOK, pageData{Done: true, Message: "Denied. The car was not paired."})
+		return
+	}
+	// Persist before the car can collect the token: a token that vanished at the next
+	// restart would look like a pairing that worked.
+	if err := a.Store.SaveDevice(r.Context(), device); err != nil {
+		a.Pairing.Forget(code, device)
+		slog.Error("device not saved", "error", err)
+		renderPage(w, http.StatusInternalServerError, pageData{Code: code, Error: "The car could not be saved. Try again."})
+		return
+	}
+	slog.Info("car paired", "device", device.ID, "installation", device.InstallationID)
+	renderPage(w, http.StatusOK, pageData{Done: true, Message: "Approved. The car finishes pairing on its own within a few seconds — you can close this page."})
+}
+
+// ---------- Device management ----------
+
+func (a *API) adminAuthorized(w http.ResponseWriter, r *http.Request) bool {
+	if a.pairingDisabled(w) {
+		return false
+	}
+	supplied, ok := strings.CutPrefix(r.Header.Get("Authorization"), "Bearer ")
+	if !ok {
+		writeJSON(w, http.StatusUnauthorized, map[string]string{"error": "unauthorized"})
+		return false
+	}
+	switch err := a.Pairing.CheckAdmin(supplied); {
+	case errors.Is(err, errTooManyFailed):
+		writeJSON(w, http.StatusTooManyRequests, map[string]string{"error": err.Error()})
+		return false
+	case err != nil:
+		writeJSON(w, http.StatusUnauthorized, map[string]string{"error": "unauthorized"})
+		return false
+	}
+	return true
+}
+
+type deviceJSON struct {
+	ID             string    `json:"id"`
+	InstallationID string    `json:"installationId"`
+	CreatedAt      time.Time `json:"createdAt"`
+	Revoked        bool      `json:"revoked"`
+}
+
+func (a *API) listDevices(w http.ResponseWriter, r *http.Request) {
+	if !a.adminAuthorized(w, r) {
+		return
+	}
+	out := []deviceJSON{}
+	for _, d := range a.Pairing.Devices() {
+		out = append(out, deviceJSON{d.ID, d.InstallationID, d.CreatedAt, d.Revoked})
+	}
+	writeJSON(w, http.StatusOK, map[string]any{"devices": out})
+}
+
+func (a *API) revokeDevice(w http.ResponseWriter, r *http.Request) {
+	if !a.adminAuthorized(w, r) {
+		return
+	}
+	d, ok := a.Pairing.Revoke(r.PathValue("id"))
+	if !ok {
+		writeJSON(w, http.StatusNotFound, map[string]string{"error": "no such device"})
+		return
+	}
+	if err := a.Store.SaveDevice(r.Context(), d); err != nil {
+		slog.Error("revocation not saved", "error", err)
+		writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "revoked until restart only; saving failed"})
+		return
+	}
+	slog.Info("car revoked", "device", d.ID)
+	w.WriteHeader(http.StatusNoContent)
+}
diff --git a/server/pairing_test.go b/server/pairing_test.go
new file mode 100644
index 0000000..fce9b53
--- /dev/null
+++ b/server/pairing_test.go
@@ -0,0 +1,234 @@
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"regexp"
+	"strings"
+	"testing"
+	"time"
+)
+
+func startPairing(t *testing.T, h http.Handler) (deviceCode, userCode, uriComplete string) {
+	t.Helper()
+	rec := do(t, h, "POST", "/v1/pair/start", "", `{"installationId":"`+testInstallation+`"}`)
+	if rec.Code != 201 {
+		t.Fatalf("start: %d %s", rec.Code, rec.Body)
+	}
+	var got map[string]any
+	if err := json.Unmarshal(rec.Body.Bytes(), &got); err != nil {
+		t.Fatal(err)
+	}
+	return got["deviceCode"].(string), got["userCode"].(string), got["verificationUriComplete"].(string)
+}
+
+func poll(t *testing.T, h http.Handler, deviceCode string) (int, map[string]string) {
+	t.Helper()
+	rec := do(t, h, "POST", "/v1/pair/poll", "", `{"deviceCode":"`+deviceCode+`"}`)
+	var got map[string]string
+	_ = json.Unmarshal(rec.Body.Bytes(), &got)
+	return rec.Code, got
+}
+
+func submit(t *testing.T, h http.Handler, code, password, action string) *httptest.ResponseRecorder {
+	t.Helper()
+	form := url.Values{"code": {code}, "password": {password}, "action": {action}}
+	req := httptest.NewRequest("POST", "/pair", strings.NewReader(form.Encode()))
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	rec := httptest.NewRecorder()
+	h.ServeHTTP(rec, req)
+	return rec
+}
+
+func TestPairingHappyPath(t *testing.T) {
+	api, store := newTestAPI()
+	h := api.Routes()
+	deviceCode, userCode, uri := startPairing(t, h)
+	if !regexpUserCode.MatchString(userCode) {
+		t.Fatalf("user code %q", userCode)
+	}
+	if uri != "https://car.example.com/pair?code="+userCode {
+		t.Fatalf("verification URI %q", uri)
+	}
+	if status, _ := poll(t, h, deviceCode); status != 202 {
+		t.Fatalf("before approval: want 202, got %d", status)
+	}
+
+	// The phone opens the link: the page shows the code and asks for the password.
+	page := do(t, h, "GET", "/pair?code="+strings.ToLower(strings.ReplaceAll(userCode, "-", "")), "", "")
+	if page.Code != 200 || !strings.Contains(page.Body.String(), userCode) {
+		t.Fatalf("page: %d", page.Code)
+	}
+	if csp := page.Header().Get("Content-Security-Policy"); !strings.Contains(csp, "frame-ancestors 'none'") {
+		t.Fatalf("CSP %q", csp)
+	}
+
+	if rec := submit(t, h, userCode, testApprovalPassword, "approve"); rec.Code != 200 || !strings.Contains(rec.Body.String(), "Approved") {
+		t.Fatalf("approve: %d %s", rec.Code, rec.Body)
+	}
+	if len(store.devices) != 1 || store.devices[0].InstallationID != testInstallation {
+		t.Fatalf("device not persisted: %+v", store.devices)
+	}
+	status, got := poll(t, h, deviceCode)
+	if status != 200 || len(got["token"]) < minIngestTokenLength || got["deviceId"] == "" {
+		t.Fatalf("after approval: %d %v", status, got)
+	}
+	// Only the hash is stored, never the token.
+	if store.devices[0].TokenHash == got["token"] || store.devices[0].TokenHash != hashToken(got["token"]) {
+		t.Fatal("stored token hash is wrong")
+	}
+	// The token is handed out once.
+	if status, _ := poll(t, h, deviceCode); status != 410 {
+		t.Fatalf("second collection: want 410, got %d", status)
+	}
+	// And it works on the ingest endpoints.
+	rec := do(t, h, "POST", "/v1/telemetry", got["token"], string(telemetryBody(`{"utc":1790000000,"soc":80}`)))
+	if rec.Code != 204 {
+		t.Fatalf("paired token on telemetry: %d %s", rec.Code, rec.Body)
+	}
+}
+
+func TestPairingWrongPasswordAndLockout(t *testing.T) {
+	api, store := newTestAPI()
+	h := api.Routes()
+	deviceCode, userCode, _ := startPairing(t, h)
+	for i := 0; i < maxFailedLogins; i++ {
+		if rec := submit(t, h, userCode, "wrong", "approve"); rec.Code != 401 {
+			t.Fatalf("attempt %d: want 401, got %d", i, rec.Code)
+		}
+	}
+	// Locked now — even the right password waits.
+	if rec := submit(t, h, userCode, testApprovalPassword, "approve"); rec.Code != 429 {
+		t.Fatalf("locked: want 429, got %d", rec.Code)
+	}
+	if status, _ := poll(t, h, deviceCode); status != 202 || len(store.devices) != 0 {
+		t.Fatal("a locked-out attempt changed the request")
+	}
+	// After the window the right password works again.
+	api.Pairing.Now = func() time.Time { return time.Now().Add(failedLoginsWindow + time.Second) }
+	if rec := submit(t, h, userCode, testApprovalPassword, "approve"); rec.Code != 200 {
+		t.Fatalf("after the window: want 200, got %d %s", rec.Code, rec.Body)
+	}
+}
+
+func TestPairingDenyAndExpiry(t *testing.T) {
+	api, _ := newTestAPI()
+	h := api.Routes()
+	deviceCode, userCode, _ := startPairing(t, h)
+	if rec := submit(t, h, userCode, testApprovalPassword, "deny"); rec.Code != 200 || !strings.Contains(rec.Body.String(), "Denied") {
+		t.Fatalf("deny: %d", rec.Code)
+	}
+	if status, _ := poll(t, h, deviceCode); status != 403 {
+		t.Fatalf("denied: want 403, got %d", status)
+	}
+	if rec := submit(t, h, userCode, testApprovalPassword, "approve"); rec.Code != 404 {
+		t.Fatalf("a decided code was approvable: %d", rec.Code)
+	}
+
+	deviceCode, userCode, _ = startPairing(t, h)
+	api.Pairing.Now = func() time.Time { return time.Now().Add(pairingTTL + time.Second) }
+	if status, _ := poll(t, h, deviceCode); status != 410 {
+		t.Fatalf("expired: want 410, got %d", status)
+	}
+	if rec := submit(t, h, userCode, testApprovalPassword, "approve"); rec.Code != 404 {
+		t.Fatalf("an expired code was approvable: %d", rec.Code)
+	}
+}
+
+func TestPairingNotPersistedMeansNoToken(t *testing.T) {
+	api, store := newTestAPI()
+	h := api.Routes()
+	deviceCode, userCode, _ := startPairing(t, h)
+	store.fail = errors.New("influx down")
+	if rec := submit(t, h, userCode, testApprovalPassword, "approve"); rec.Code != 500 {
+		t.Fatalf("want 500, got %d", rec.Code)
+	}
+	if status, _ := poll(t, h, deviceCode); status != 202 {
+		t.Fatalf("a token was handed out that was never saved: %d", status)
+	}
+	store.fail = nil
+	if rec := submit(t, h, userCode, testApprovalPassword, "approve"); rec.Code != 200 {
+		t.Fatalf("retry: %d", rec.Code)
+	}
+	if status, _ := poll(t, h, deviceCode); status != 200 {
+		t.Fatalf("after retry: %d", status)
+	}
+}
+
+func TestRevokedTokenIsRejected(t *testing.T) {
+	api, store := newTestAPI()
+	h := api.Routes()
+	deviceCode, userCode, _ := startPairing(t, h)
+	submit(t, h, userCode, testApprovalPassword, "approve")
+	_, got := poll(t, h, deviceCode)
+	token := got["token"]
+
+	if rec := do(t, h, "GET", "/v1/devices", "wrong-password", ""); rec.Code != 401 {
+		t.Fatalf("devices without the password: %d", rec.Code)
+	}
+	if rec := do(t, h, "GET", "/v1/devices", token, ""); rec.Code != 401 {
+		t.Fatal("a car token opened the device list")
+	}
+	rec := do(t, h, "GET", "/v1/devices", testApprovalPassword, "")
+	if rec.Code != 200 || !strings.Contains(rec.Body.String(), got["deviceId"]) || strings.Contains(rec.Body.String(), store.devices[0].TokenHash) {
+		t.Fatalf("list: %d %s", rec.Code, rec.Body)
+	}
+	if rec := do(t, h, "POST", "/v1/devices/"+got["deviceId"]+"/revoke", testApprovalPassword, ""); rec.Code != 204 {
+		t.Fatalf("revoke: %d", rec.Code)
+	}
+	if last := store.devices[len(store.devices)-1]; !last.Revoked {
+		t.Fatal("revocation not persisted")
+	}
+	if rec := do(t, h, "POST", "/v1/telemetry", token, string(telemetryBody(`{"utc":1790000000}`))); rec.Code != 401 {
+		t.Fatalf("revoked token accepted: %d", rec.Code)
+	}
+	// The shared ingest token is unaffected.
+	if rec := do(t, h, "POST", "/v1/telemetry", testToken, string(telemetryBody(`{"utc":1790000000,"soc":1}`))); rec.Code != 204 {
+		t.Fatalf("shared token: %d", rec.Code)
+	}
+}
+
+func TestPairedDevicesSurviveARestart(t *testing.T) {
+	devices := []Device{{ID: "d1", TokenHash: hashToken("restored-token-0123456789abcdef"), CreatedAt: time.Now()},
+		{ID: "d2", TokenHash: hashToken("revoked-token-0123456789abcdef"), CreatedAt: time.Now(), Revoked: true}}
+	p := NewPairing(testApprovalPassword, devices)
+	if !p.Authorized("restored-token-0123456789abcdef") || p.Authorized("revoked-token-0123456789abcdef") {
+		t.Fatal("restored devices not honoured")
+	}
+}
+
+func TestPairingOffWithoutAPassword(t *testing.T) {
+	api, _ := newTestAPI()
+	api.Pairing = NewPairing("", nil)
+	h := api.Routes()
+	if rec := do(t, h, "POST", "/v1/pair/start", "", `{"installationId":"`+testInstallation+`"}`); rec.Code != 404 {
+		t.Fatalf("start: %d", rec.Code)
+	}
+	if rec := do(t, h, "GET", "/pair", "", ""); rec.Code != 404 {
+		t.Fatalf("page: %d", rec.Code)
+	}
+	if rec := do(t, h, "GET", "/v1/devices", "", ""); rec.Code != 404 {
+		t.Fatalf("devices: %d", rec.Code)
+	}
+}
+
+func TestUserCodesNormalise(t *testing.T) {
+	for in, want := range map[string]string{"k7f-3qx": "K7F-3QX", " K7F3QX ": "K7F-3QX", "k7f 3qx": "K7F-3QX", "K7F-3Q": "", "": ""} {
+		if got := normalizeUserCode(in); got != want {
+			t.Errorf("%q: got %q, want %q", in, got, want)
+		}
+	}
+}
+
+func TestApprovalPasswordMustBeLongEnough(t *testing.T) {
+	env := map[string]string{"INFLUX_URL": "u", "INFLUX_TOKEN": "t", "INFLUX_ORG": "o",
+		"INGEST_TOKEN": "0123456789abcdef01234567", "APPROVAL_PASSWORD": "short"}
+	if _, err := loadConfig(func(k string) string { return env[k] }); err == nil {
+		t.Fatal("short approval password accepted")
+	}
+}
+
+var regexpUserCode = regexp.MustCompile(`^[` + userCodeAlphabet + `]{3}-[` + userCodeAlphabet + `]{3}$`)
diff --git a/server/store.go b/server/store.go
index 9f49601..0dab1a8 100644
--- a/server/store.go
+++ b/server/store.go
@@ -17,6 +17,8 @@ type Store interface {
 	WriteConsumptionChunk(ctx context.Context, chunk ConsumptionChunk) error
 	WriteChargingSession(ctx context.Context, session ChargingSession) error
 	ReadConsumptionChunks(ctx context.Context, installationID string) ([]ConsumptionChunk, error)
+	SaveDevice(ctx context.Context, d Device) error
+	LoadDevices(ctx context.Context) ([]Device, error)
 }
 
 // InfluxStore keeps everything in one InfluxDB 2 bucket; every point carries an
@@ -26,6 +28,7 @@ type Store interface {
 //	consumption_chunk  time = recordedAt   tags: date     km, kwh, hours, socDrop, sohPercent
 //	charging_session   time = startedAt    tags: sessionId summary fields
 //	charging_curve     time = point time   tags: sessionId powerKw, socPercent
+//	device             time = createdAt    tags: deviceId  tokenHash, installationId, revoked
 //
 // Idempotency comes from InfluxDB itself: a point with the same measurement, tags and
 // timestamp replaces the earlier one. The car re-sends a cached chunk with its original
@@ -160,3 +163,38 @@ func floatValue(v any) float64 {
 	f, _ := v.(float64)
 	return f
 }
+
+// SaveDevice writes a paired car. Re-saving it (a revocation) overwrites the same point,
+// because measurement, tag and timestamp stay the same.
+func (s *InfluxStore) SaveDevice(ctx context.Context, d Device) error {
+	return s.write.WritePoint(ctx, influxdb2.NewPoint("device",
+		map[string]string{"deviceId": d.ID},
+		map[string]any{"tokenHash": d.TokenHash, "installationId": d.InstallationID, "revoked": d.Revoked},
+		d.CreatedAt))
+}
+
+func (s *InfluxStore) LoadDevices(ctx context.Context) ([]Device, error) {
+	query := fmt.Sprintf(`from(bucket: %s)
+  |> range(start: 0)
+  |> filter(fn: (r) => r._measurement == "device")
+  |> pivot(rowKey: ["_time"], columnKey: ["_field"], valueColumn: "_value")`, fluxString(s.bucket))
+	result, err := s.query.Query(ctx, query)
+	if err != nil {
+		return nil, err
+	}
+	defer result.Close()
+	var devices []Device
+	for result.Next() {
+		r := result.Record()
+		id, _ := r.ValueByKey("deviceId").(string)
+		hash, _ := r.ValueByKey("tokenHash").(string)
+		installation, _ := r.ValueByKey("installationId").(string)
+		revoked, _ := r.ValueByKey("revoked").(bool)
+		if id == "" || hash == "" {
+			continue
+		}
+		devices = append(devices, Device{ID: id, InstallationID: installation, TokenHash: hash,
+			CreatedAt: r.Time(), Revoked: revoked})
+	}
+	return devices, result.Err()
+}

From c578a882bddd371313ee0052a2cca62f7466344b Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 16:16:52 +0200
Subject: [PATCH 23/79] App 2.4.0: pair with the server by QR code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Server tab gets "Pair with phone" right under the server URL, which
is now pre-filled with https://car.stinnesbeck.com. It opens a dialog
with a QR code and the short code, polls the server, and on approval
saves this car's own token like Save would — nothing to type in the
car. Denied, expired, and pairing switched off on the server are each
reported. PairingClient is tested against a stand-in for the server.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 app/build.gradle                              |   4 +-
 .../java/com/evsuite/abrp/MainActivity.java   | 109 +++++++++++++++
 .../java/com/evsuite/abrp/PairingClient.java  | 122 ++++++++++++++++
 .../java/com/evsuite/abrp/ServerConfig.java   |   5 +-
 app/src/main/res/layout/pane_server.xml       |   2 +
 app/src/main/res/values/strings.xml           |  13 ++
 .../com/evsuite/abrp/PairingClientTest.java   | 132 ++++++++++++++++++
 7 files changed, 384 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/com/evsuite/abrp/PairingClient.java
 create mode 100644 app/src/test/java/com/evsuite/abrp/PairingClientTest.java

diff --git a/app/build.gradle b/app/build.gradle
index 0c0fc65..da13714 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 57
-        versionName "2.3.0"
+        versionCode 58
+        versionName "2.4.0"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 7df5cbb..cc225e7 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -391,6 +391,7 @@ public class MainActivity extends AppCompatActivity {
             }
         });
         serverPane.findViewById(R.id.server_test_button).setOnClickListener(v -> testConnection());
+        serverPane.findViewById(R.id.server_pair_button).setOnClickListener(v -> startPairing());
         serverPane.findViewById(R.id.import_button).setOnClickListener(v -> startConfigImport());
     }
 
@@ -463,6 +464,114 @@ public class MainActivity extends AppCompatActivity {
         }, "server-test").start();
     }
 
+    /**
+     * Pairs this car with the server through a phone: the server opens a pairing request, the
+     * dialog shows its code as a QR code, and a background thread polls until the request is
+     * approved, denied or expired. On approval the car's own token is saved with the URL from
+     * the field and the installation id, exactly as Save would.
+     */
+    private void startPairing() {
+        String url = ServerConfig.normalizeUrl(textOf(serverUrlInput));
+        if (url == null) {
+            serverUrlLayout.setError(getString(R.string.server_err_url));
+            return;
+        }
+        serverUrlLayout.setError(null);
+        String typedId = textOf(installationIdInput).toLowerCase(java.util.Locale.US);
+        String installationId = ServerConfig.isValidInstallationId(typedId)
+                ? typedId : ServerConfig.get(this).installationId;
+
+        float density = getResources().getDisplayMetrics().density;
+        int pad = (int) (24 * density);
+        android.widget.LinearLayout panel = new android.widget.LinearLayout(this);
+        panel.setOrientation(android.widget.LinearLayout.VERTICAL);
+        panel.setGravity(android.view.Gravity.CENTER_HORIZONTAL);
+        panel.setPadding(pad, pad, pad, pad);
+        TextView instructions = new TextView(this);
+        instructions.setTextAppearance(R.style.Text_EV_Secondary);
+        ImageView qr = new ImageView(this);
+        qr.setContentDescription(getString(R.string.pair_qr_description));
+        int qrSize = (int) (240 * density);
+        TextView code = new TextView(this);
+        code.setTextAppearance(R.style.Text_EV_Title);
+        code.setTypeface(android.graphics.Typeface.MONOSPACE, android.graphics.Typeface.BOLD);
+        code.setTextSize(36);
+        code.setLetterSpacing(0.15f);
+        code.setTextColor(getColor(R.color.ev_cyan));
+        TextView status = new TextView(this);
+        status.setTextAppearance(R.style.Text_EV_Body);
+        status.setText(R.string.pair_starting);
+        panel.addView(instructions);
+        android.widget.LinearLayout.LayoutParams qrParams = new android.widget.LinearLayout.LayoutParams(qrSize, qrSize);
+        qrParams.topMargin = pad / 2;
+        panel.addView(qr, qrParams);
+        panel.addView(code);
+        panel.addView(status);
+
+        final boolean[] cancelled = {false};
+        androidx.appcompat.app.AlertDialog dialog = new MaterialAlertDialogBuilder(this)
+                .setTitle(R.string.pair_title)
+                .setView(panel)
+                .setNegativeButton(R.string.pair_cancel, null)
+                .create();
+        dialog.setOnDismissListener(d -> cancelled[0] = true);
+        dialog.show();
+
+        new Thread(() -> {
+            String outcome;
+            int color = COLOR_ERROR;
+            try {
+                PairingClient.Request request = PairingClient.start(url, installationId);
+                android.graphics.Bitmap bitmap = QrCode.generate(request.verificationUriComplete, 416);
+                runOnUiThread(() -> {
+                    instructions.setText(getString(R.string.pair_scan, request.verificationUri));
+                    if (bitmap != null) qr.setImageBitmap(bitmap);
+                    code.setText(request.userCode);
+                    status.setText(R.string.pair_waiting);
+                });
+                PairingClient.PollResult result = null;
+                while (!cancelled[0] && System.currentTimeMillis() < request.expiresAtMs) {
+                    Thread.sleep(request.intervalMs);
+                    if (cancelled[0]) break;
+                    try {
+                        result = PairingClient.poll(url, request.deviceCode);
+                    } catch (java.io.IOException e) {
+                        continue; // a dropped connection mid-wait is not a failed pairing
+                    }
+                    if (result.outcome != PairingClient.Outcome.PENDING) break;
+                }
+                if (cancelled[0]) return;
+                if (result != null && result.outcome == PairingClient.Outcome.APPROVED) {
+                    ServerConfig.save(this, url, result.token, installationId);
+                    outcome = getString(R.string.pair_ok);
+                    color = COLOR_OK;
+                } else if (result != null && result.outcome == PairingClient.Outcome.DENIED) {
+                    outcome = getString(R.string.pair_denied);
+                } else {
+                    outcome = getString(R.string.pair_expired);
+                }
+            } catch (PairingClient.NotEnabledException e) {
+                outcome = getString(R.string.pair_not_enabled);
+            } catch (InterruptedException e) {
+                return;
+            } catch (Exception e) {
+                outcome = getString(R.string.pair_error, e.getClass().getSimpleName());
+            }
+            final String message = outcome;
+            final int c = color;
+            runOnUiThread(() -> {
+                if (!cancelled[0]) dialog.dismiss();
+                if (c == COLOR_OK) {
+                    if (consumptionCloudClient != null) consumptionCloudClient.invalidateHistory();
+                    showServerConfig();
+                    serverTokenLayout.setError(null);
+                    refreshStatus();
+                }
+                setConnectionStatus(c, message);
+            });
+        }, "server-pairing").start();
+    }
+
     private static int httpGet(String url, String token) throws java.io.IOException {
         java.net.HttpURLConnection connection = (java.net.HttpURLConnection) new java.net.URL(url).openConnection();
         try {
diff --git a/app/src/main/java/com/evsuite/abrp/PairingClient.java b/app/src/main/java/com/evsuite/abrp/PairingClient.java
new file mode 100644
index 0000000..29c0fd8
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/PairingClient.java
@@ -0,0 +1,122 @@
+package com.evsuite.abrp;
+
+import org.json.JSONObject;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * The car's side of pairing with the server (an OAuth device-authorization flow): ask for a
+ * pairing request, show its code as a QR code, then poll until a phone has approved it and
+ * collect this car's own token. Blocking calls — run them off the main thread.
+ */
+final class PairingClient {
+
+    private static final int TIMEOUT_MS = 8_000;
+
+    /** A pairing request as the server opened it. */
+    static final class Request {
+        final String deviceCode;
+        final String userCode;
+        final String verificationUri;
+        final String verificationUriComplete;
+        final long expiresAtMs;
+        final long intervalMs;
+
+        Request(String deviceCode, String userCode, String verificationUri, String verificationUriComplete,
+                long expiresAtMs, long intervalMs) {
+            this.deviceCode = deviceCode;
+            this.userCode = userCode;
+            this.verificationUri = verificationUri;
+            this.verificationUriComplete = verificationUriComplete;
+            this.expiresAtMs = expiresAtMs;
+            this.intervalMs = intervalMs;
+        }
+    }
+
+    enum Outcome { PENDING, APPROVED, DENIED, EXPIRED }
+
+    static final class PollResult {
+        final Outcome outcome;
+        final String token;
+
+        PollResult(Outcome outcome, String token) {
+            this.outcome = outcome;
+            this.token = token;
+        }
+    }
+
+    /** Thrown when pairing is switched off on the server (no APPROVAL_PASSWORD). */
+    static final class NotEnabledException extends Exception { }
+
+    private PairingClient() { }
+
+    static Request start(String serverUrl, String installationId) throws Exception {
+        Response r = post(serverUrl + "/v1/pair/start",
+                new JSONObject().put("installationId", installationId));
+        if (r.status == 404) throw new NotEnabledException();
+        if (r.status != 201) throw new java.io.IOException("HTTP " + r.status);
+        JSONObject json = new JSONObject(r.body);
+        long now = System.currentTimeMillis();
+        return new Request(
+                json.getString("deviceCode"),
+                json.getString("userCode"),
+                json.getString("verificationUri"),
+                json.getString("verificationUriComplete"),
+                now + json.optLong("expiresIn", 600) * 1000L,
+                Math.max(2, json.optLong("interval", 5)) * 1000L);
+    }
+
+    static PollResult poll(String serverUrl, String deviceCode) throws Exception {
+        Response r = post(serverUrl + "/v1/pair/poll", new JSONObject().put("deviceCode", deviceCode));
+        switch (r.status) {
+            case 200: return new PollResult(Outcome.APPROVED, new JSONObject(r.body).getString("token"));
+            case 202: return new PollResult(Outcome.PENDING, null);
+            case 403: return new PollResult(Outcome.DENIED, null);
+            case 410: return new PollResult(Outcome.EXPIRED, null);
+            default: throw new java.io.IOException("HTTP " + r.status);
+        }
+    }
+
+    private static final class Response {
+        final int status;
+        final String body;
+
+        Response(int status, String body) {
+            this.status = status;
+            this.body = body;
+        }
+    }
+
+    private static Response post(String url, JSONObject json) throws Exception {
+        byte[] body = json.toString().getBytes(StandardCharsets.UTF_8);
+        HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
+        try {
+            connection.setRequestMethod("POST");
+            connection.setConnectTimeout(TIMEOUT_MS);
+            connection.setReadTimeout(TIMEOUT_MS);
+            connection.setDoOutput(true);
+            connection.setFixedLengthStreamingMode(body.length);
+            connection.setRequestProperty("Content-Type", "application/json");
+            try (OutputStream out = connection.getOutputStream()) { out.write(body); }
+            int status = connection.getResponseCode();
+            InputStream in = status < 400 ? connection.getInputStream() : connection.getErrorStream();
+            String text = "";
+            if (in != null) {
+                try (InputStream stream = in) {
+                    java.io.ByteArrayOutputStream buf = new java.io.ByteArrayOutputStream();
+                    byte[] chunk = new byte[2048];
+                    int n;
+                    while ((n = stream.read(chunk)) != -1 && buf.size() < 16 * 1024) buf.write(chunk, 0, n);
+                    text = buf.toString(StandardCharsets.UTF_8.name());
+                }
+            }
+            return new Response(status, text);
+        } finally {
+            connection.disconnect();
+        }
+    }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/ServerConfig.java b/app/src/main/java/com/evsuite/abrp/ServerConfig.java
index af36f73..555685a 100644
--- a/app/src/main/java/com/evsuite/abrp/ServerConfig.java
+++ b/app/src/main/java/com/evsuite/abrp/ServerConfig.java
@@ -27,6 +27,9 @@ final class ServerConfig {
             "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$",
             Pattern.CASE_INSENSITIVE);
 
+    /** Pre-filled so pairing needs no typing in the car; can still be changed. */
+    static final String DEFAULT_URL = "https://car.stinnesbeck.com";
+
     /** The server refuses shorter ingest tokens outright. */
     static final int MIN_TOKEN_LENGTH = 24;
 
@@ -58,7 +61,7 @@ final class ServerConfig {
                 id = UUID.randomUUID().toString();
                 prefs.edit().putString(KEY_INSTALLATION_ID, id).apply();
             }
-            current = new ServerConfig(prefs.getString(KEY_URL, ""), prefs.getString(KEY_TOKEN, ""), id);
+            current = new ServerConfig(prefs.getString(KEY_URL, DEFAULT_URL), prefs.getString(KEY_TOKEN, ""), id);
             return current;
         }
     }
diff --git a/app/src/main/res/layout/pane_server.xml b/app/src/main/res/layout/pane_server.xml
index 455efa2..7eb14d7 100644
--- a/app/src/main/res/layout/pane_server.xml
+++ b/app/src/main/res/layout/pane_server.xml
@@ -6,6 +6,8 @@
             <com.google.android.material.textfield.TextInputLayout android:id="@+id/server_url_layout" style="@style/Widget.EV.Input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="18dp" android:hint="@string/hint_server_url" app:helperText="@string/helper_server_url">
                 <com.google.android.material.textfield.TextInputEditText android:id="@+id/server_url_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="textUri" android:singleLine="true" android:textSize="20sp" />
             </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.button.MaterialButton android:id="@+id/server_pair_button" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/btn_pair" />
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/pair_hint" android:textAppearance="@style/Text.EV.Secondary" />
             <com.google.android.material.textfield.TextInputLayout android:id="@+id/server_token_layout" style="@style/Widget.EV.Input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="18dp" android:hint="@string/hint_server_token" app:endIconMode="password_toggle" app:endIconMinSize="72dp" app:helperText="@string/helper_server_token">
                 <com.google.android.material.textfield.TextInputEditText android:id="@+id/server_token_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="textPassword" android:singleLine="true" android:textSize="20sp" />
             </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ef89248..67b4320 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,6 +55,19 @@
     <string name="hint_installation_id">Installation ID</string>
     <string name="helper_installation_id">Your data is stored under this ID. Keep it when reinstalling.</string>
     <string name="server_err_url">Enter an https:// URL</string>
+    <string name="btn_pair">Pair with phone</string>
+    <string name="pair_hint">Shows a QR code: scan it with your phone and approve with the approval password. The token below is then filled in for you.</string>
+    <string name="pair_title">Pair with phone</string>
+    <string name="pair_scan">Scan with your phone, or open %1$s and enter this code:</string>
+    <string name="pair_waiting">Waiting for approval…</string>
+    <string name="pair_starting">Contacting the server…</string>
+    <string name="pair_ok">Paired — this car now has its own token</string>
+    <string name="pair_denied">Pairing was denied on the phone</string>
+    <string name="pair_expired">The code expired — press Pair with phone again</string>
+    <string name="pair_not_enabled">Pairing is not enabled on the server (no APPROVAL_PASSWORD)</string>
+    <string name="pair_error">Pairing failed: %1$s</string>
+    <string name="pair_cancel">Cancel</string>
+    <string name="pair_qr_description">QR code to approve this car on your phone</string>
     <string name="server_err_token">The token must be at least 24 characters, without spaces</string>
     <string name="server_err_installation_id">Not a valid ID (UUID)</string>
     <string name="server_saved">Server settings saved</string>
diff --git a/app/src/test/java/com/evsuite/abrp/PairingClientTest.java b/app/src/test/java/com/evsuite/abrp/PairingClientTest.java
new file mode 100644
index 0000000..0bc8006
--- /dev/null
+++ b/app/src/test/java/com/evsuite/abrp/PairingClientTest.java
@@ -0,0 +1,132 @@
+package com.evsuite.abrp;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayDeque;
+import java.util.Deque;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/** The car's pairing client against a stand-in that answers like the Go server. */
+public class PairingClientTest {
+
+    private ServerSocket socket;
+    private Thread thread;
+    private String url;
+    private final Deque<Integer> pollStatuses = new ArrayDeque<>();
+    private volatile int startStatus = 201;
+    private volatile String lastStartBody;
+
+    @Before
+    public void setUp() throws Exception {
+        socket = new ServerSocket(0, 10, InetAddress.getLoopbackAddress());
+        url = "http://127.0.0.1:" + socket.getLocalPort();
+        thread = new Thread(() -> {
+            while (!socket.isClosed()) {
+                try (Socket client = socket.accept()) {
+                    handle(client);
+                } catch (Exception ignored) {
+                    // socket closed in tearDown
+                }
+            }
+        });
+        thread.start();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        socket.close();
+        thread.join(2000);
+    }
+
+    /** Minimal HTTP/1.1: one request per connection, body by Content-Length. */
+    private void handle(Socket client) throws Exception {
+        BufferedReader in = new BufferedReader(new InputStreamReader(client.getInputStream(), StandardCharsets.UTF_8));
+        String requestLine = in.readLine();
+        int length = 0;
+        for (String line = in.readLine(); line != null && !line.isEmpty(); line = in.readLine()) {
+            if (line.toLowerCase(java.util.Locale.US).startsWith("content-length:")) {
+                length = Integer.parseInt(line.substring(15).trim());
+            }
+        }
+        char[] body = new char[length];
+        int read = 0;
+        while (read < length) read += in.read(body, read, length - read);
+        String path = requestLine.split(" ")[1];
+        int status;
+        String response;
+        if (path.equals("/v1/pair/start")) {
+            lastStartBody = new String(body);
+            status = startStatus;
+            response = status == 201
+                    ? "{\"deviceCode\":\"dev-code\",\"userCode\":\"K7F-3QX\",\"verificationUri\":\"https://car.example.com/pair\","
+                      + "\"verificationUriComplete\":\"https://car.example.com/pair?code=K7F-3QX\",\"expiresIn\":600,\"interval\":5}"
+                    : "{\"error\":\"pairing is not enabled\"}";
+        } else {
+            Integer next;
+            synchronized (pollStatuses) { next = pollStatuses.poll(); }
+            status = next == null ? 410 : next;
+            response = status == 200 ? "{\"token\":\"car-token-0123456789abcdefghij\",\"deviceId\":\"d1\"}"
+                    : status == 202 ? "{\"status\":\"authorization_pending\"}" : "{\"error\":\"x\"}";
+        }
+        byte[] bytes = response.getBytes(StandardCharsets.UTF_8);
+        OutputStream out = client.getOutputStream();
+        out.write(("HTTP/1.1 " + status + " X\r\nContent-Type: application/json\r\nContent-Length: " + bytes.length
+                + "\r\nConnection: close\r\n\r\n").getBytes(StandardCharsets.UTF_8));
+        out.write(bytes);
+        out.flush();
+    }
+
+    @Test
+    public void startSendsTheInstallationAndReadsTheCodes() throws Exception {
+        long before = System.currentTimeMillis();
+        PairingClient.Request request = PairingClient.start(url, "6f1a2b3c-4d5e-4f60-8a9b-0c1d2e3f4a5b");
+        assertTrue(lastStartBody, lastStartBody.contains("6f1a2b3c-4d5e-4f60-8a9b-0c1d2e3f4a5b"));
+        assertEquals("dev-code", request.deviceCode);
+        assertEquals("K7F-3QX", request.userCode);
+        assertEquals("https://car.example.com/pair?code=K7F-3QX", request.verificationUriComplete);
+        assertEquals(5000L, request.intervalMs);
+        assertTrue(request.expiresAtMs >= before + 600_000L);
+    }
+
+    @Test
+    public void pollMapsEveryServerAnswer() throws Exception {
+        synchronized (pollStatuses) {
+            pollStatuses.add(202);
+            pollStatuses.add(200);
+            pollStatuses.add(403);
+            pollStatuses.add(410);
+        }
+        PairingClient.PollResult pending = PairingClient.poll(url, "dev-code");
+        assertEquals(PairingClient.Outcome.PENDING, pending.outcome);
+        assertNull(pending.token);
+        PairingClient.PollResult approved = PairingClient.poll(url, "dev-code");
+        assertEquals(PairingClient.Outcome.APPROVED, approved.outcome);
+        assertEquals("car-token-0123456789abcdefghij", approved.token);
+        assertEquals(PairingClient.Outcome.DENIED, PairingClient.poll(url, "dev-code").outcome);
+        assertEquals(PairingClient.Outcome.EXPIRED, PairingClient.poll(url, "dev-code").outcome);
+    }
+
+    @Test
+    public void pairingSwitchedOffOnTheServerIsReportedAsSuch() throws Exception {
+        startStatus = 404;
+        try {
+            PairingClient.start(url, "6f1a2b3c-4d5e-4f60-8a9b-0c1d2e3f4a5b");
+            fail("expected NotEnabledException");
+        } catch (PairingClient.NotEnabledException expected) {
+            // the dialog says pairing is off instead of a generic failure
+        }
+    }
+}

From 59ee2cae3b9ab80c76dfb91e658c4dc96ad4fd02 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 16:16:52 +0200
Subject: [PATCH 24/79] Deploy server 2.1.0; keep filled-in secrets out of git

- kustomization pins mg4-server 2.1.0 by digest; server.yaml sets
  PUBLIC_URL for the pairing QR code; the secrets template gains
  APPROVAL_PASSWORD.
- Filled-in Secrets now go into k8s/secrets.yaml, which is gitignored;
  the template stays on placeholders. This follows a leak where real
  values typed into the template were committed and pushed (amended and
  force-pushed since; both values regenerated).
- SPECS.md records pairing and the incident.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 .gitignore               |  3 +++
 SPECS.md                 | 17 ++++++++++++-----
 k8s/README.md            | 12 +++++++-----
 k8s/kustomization.yaml   |  4 ++--
 k8s/secrets.example.yaml |  7 +++++--
 k8s/server.yaml          |  6 +++++-
 6 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index aab93a6..c0a29a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,6 @@ mise.local.toml
 /EVHardware/build
 /EVHardware/.gradle
 /EVHardware/**/build
+
+# Filled-in Kubernetes Secrets (copy of k8s/secrets.example.yaml). Never commit.
+/k8s/secrets.yaml
diff --git a/SPECS.md b/SPECS.md
index 1f77b4e..95c54bf 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -25,7 +25,9 @@ car ──live telemetry───▶ car.stinnesbeck.com (Go) ──▶ ABRP  ap
 - **Dashboards:** Grafana, provisioned from `k8s/grafana/`: Live (stats, SoC/range, power/speed,
   route map, temperatures, tyres), Consumption (period totals, lifetime, SoH, per-day energy,
   distance and efficiency) and Charging (totals, session table, curves). Prices in euro.
-- **Car app:** Server tab (URL, ingest token, installation id, config import); live telemetry
+- **Pairing:** the car shows a QR code, a phone approves it with the approval password, and the car
+  gets its own token (RFC 8628-style; `server/README.md`). The shared `INGEST_TOKEN` still works.
+- **Car app:** Server tab (URL, pairing by QR, ingest token, installation id, config import); live telemetry
   every 15 s while driving or charging; consumption chunks and charging sessions as before.
 - **Deployment:** `k8s/`, plain manifests. **Nothing is ever applied to the cluster by us** —
   Nils applies them (`k8s/README.md`). TLS comes from Traefik's default certificate.
@@ -36,12 +38,12 @@ car ──live telemetry───▶ car.stinnesbeck.com (Go) ──▶ ABRP  ap
 - [x] End-to-end in podman (server + InfluxDB 2.7.12 + Grafana 13.2.3): every endpoint, retry
       idempotency, all 25 dashboard queries return data, dashboards rendered and checked.
 - [x] Manifests validated offline (including Traefik CRDs). **Not applied.**
-- [x] Car app 2.3.0: unit tests and lint pass; **not yet tried on the car**.
-- [x] Image `mg4-server:2.0.0` pushed to git.stinnesbeck.com (public; pinned by digest
-      `sha256:6feea777…` in `k8s/kustomization.yaml`).
+- [x] Car app 2.4.0 (pairing by QR): unit tests pass; **not yet tried on the car**.
+- [x] Image `mg4-server:2.1.0` (with pairing) pushed to git.stinnesbeck.com (public; pinned by
+      digest `sha256:e5f6e2d2…` in `k8s/kustomization.yaml`).
 - [ ] Check in `k8s/ingress.yaml`: the Traefik ingress class (placeholder `traefik-external`) and
       Grafana's host (placeholder `car-grafana.stinnesbeck.com`).
-- [ ] First drive with 2.3.0: telemetry arrives in InfluxDB, Grafana and ABRP.
+- [ ] First pairing and drive with 2.4.0: telemetry arrives in InfluxDB, Grafana and ABRP.
 
 ## To do
 
@@ -84,6 +86,11 @@ car ──live telemetry───▶ car.stinnesbeck.com (Go) ──▶ ABRP  ap
 - 2026-10-17 — Server rewritten in Go (API only); dashboards moved to Grafana with provisioned
   InfluxDB datasource and three dashboards; the Next.js app (`web/`) removed. Per-host
   cert-manager certificates dropped in favour of Traefik's default certificate.
+- 2026-10-17 — Pairing by QR code: server 2.1.0 issues per-car tokens after approval on a phone;
+  app 2.4.0 shows the QR code and collects its token. Tested end to end against InfluxDB.
+- 2026-10-17 — Incident: a commit swept the filled-in `secrets.example.yaml` (InfluxDB admin token,
+  INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
+  the now gitignored `k8s/secrets.yaml`. Filled-in secrets live only there from now on.
 - 2026-10-17 — Temporary on-screen diagnostics (b2a5b32) to debug blank values without adb;
   removed again (1002962) once values showed on the car. Revert 1002962 to bring them back.
 
diff --git a/k8s/README.md b/k8s/README.md
index 83bd3a7..8539e58 100644
--- a/k8s/README.md
+++ b/k8s/README.md
@@ -11,7 +11,8 @@ is applied automatically. Apply them yourself.
 | `grafana.yaml` | Grafana 13.2.3 Deployment (1Gi PVC), Service; datasource and dashboards provisioned |
 | `grafana/` | The provisioned InfluxDB datasource and the MG4 dashboards (Live, Consumption, Charging) |
 | `ingress.yaml` | Traefik `IngressRoute`s for car.stinnesbeck.com and Grafana, TLS from Traefik's default certificate |
-| `secrets.example.yaml` | **Template** for the Secrets; not in `kustomization.yaml` |
+| `secrets.example.yaml` | **Template** for the Secrets; placeholders only, not in `kustomization.yaml` |
+| `secrets.yaml` | Your filled-in copy — **gitignored**, never committed |
 | `kustomization.yaml` | Everything except the Secrets; pins the server image, generates the Grafana ConfigMaps |
 
 ## Before the first apply
@@ -19,9 +20,10 @@ is applied automatically. Apply them yourself.
 1. **Check `ingress.yaml`:** the ingress class (placeholder `traefik-external` for the public
    Traefik) and Grafana's host (placeholder `car-grafana.stinnesbeck.com`). Both hosts must be
    covered by Traefik's default certificate.
-2. **Create the Secrets.** Copy `secrets.example.yaml` outside the repository, replace every
-   `CHANGE-ME` (`openssl rand -hex 32`), then apply the copy: `influxdb-auth`, `mg4-server`
-   (ingest token, your ABRP API key and user token) and `grafana-admin`.
+2. **Create the Secrets.** `cp k8s/secrets.example.yaml k8s/secrets.yaml` (gitignored), replace
+   every `CHANGE-ME` there (`openssl rand -hex 32`): `influxdb-auth`, `mg4-server` (ingest token,
+   approval password for pairing, your ABRP API key and user token) and `grafana-admin`. Keep
+   `secrets.example.yaml` itself on placeholders only.
 3. **Registry access.** The `mg4-server` package on git.stinnesbeck.com is public, so no pull
    secret is needed. If you make it private, add an `imagePullSecrets` entry to `server.yaml`.
 
@@ -29,7 +31,7 @@ is applied automatically. Apply them yourself.
 
 ```sh
 kubectl apply -f k8s/namespace.yaml
-kubectl apply -f <your filled-in secrets file>
+kubectl apply -f k8s/secrets.yaml
 kubectl apply -k k8s/
 ```
 
diff --git a/k8s/kustomization.yaml b/k8s/kustomization.yaml
index 61be4c7..bd41dd3 100644
--- a/k8s/kustomization.yaml
+++ b/k8s/kustomization.yaml
@@ -10,8 +10,8 @@ resources:
   - ingress.yaml
 images:
   - name: git.stinnesbeck.com/nils/mg4-server
-    # 2.0.0, pinned by digest so a re-pushed tag cannot change what runs.
-    digest: sha256:6feea777c514b9488ffb0b49fad7c15423ee06f0e0e8d609cf31eb85755da815
+    # 2.1.0, pinned by digest so a re-pushed tag cannot change what runs.
+    digest: sha256:e5f6e2d2ef9dc2650055a0823a3f86d8903e46918a76e990540482edf819766d
 generatorOptions:
   labels:
     app.kubernetes.io/part-of: mg4
diff --git a/k8s/secrets.example.yaml b/k8s/secrets.example.yaml
index a60b124..6bea4d4 100644
--- a/k8s/secrets.example.yaml
+++ b/k8s/secrets.example.yaml
@@ -1,5 +1,5 @@
-# TEMPLATE ONLY — not part of kustomization.yaml. Copy it outside the repository, fill in
-# real values, and apply that copy yourself. Never commit the filled-in file.
+# TEMPLATE ONLY — not part of kustomization.yaml. Copy it to k8s/secrets.yaml (gitignored),
+# fill in real values there, and apply that file yourself. Never put real values in here.
 #
 #   openssl rand -hex 32     for every token and password below
 apiVersion: v1
@@ -22,6 +22,9 @@ stringData:
   # The car's write token, entered in the app. At least 24 characters, or the server
   # refuses to start.
   INGEST_TOKEN: CHANGE-ME-openssl-rand-hex-32
+  # Approves a car on your phone when it pairs by QR code (at least 12 characters). Leave it
+  # empty to switch pairing off; then only the INGEST_TOKEN above works.
+  APPROVAL_PASSWORD: CHANGE-ME-at-least-12-characters
   # Your ABRP credentials. Leave either empty to switch forwarding off.
   ABRP_API_KEY: CHANGE-ME
   ABRP_USER_TOKEN: CHANGE-ME
diff --git a/k8s/server.yaml b/k8s/server.yaml
index 1f20507..80b7b5f 100644
--- a/k8s/server.yaml
+++ b/k8s/server.yaml
@@ -40,12 +40,16 @@ spec:
               value: mg4
             - name: INFLUX_BUCKET
               value: mg4
+            # Where a phone reaches the server; the pairing QR code points here.
+            - name: PUBLIC_URL
+              value: https://car.stinnesbeck.com
             - name: INFLUX_TOKEN
               valueFrom:
                 secretKeyRef:
                   name: influxdb-auth
                   key: admin-token
-          # INGEST_TOKEN, ABRP_API_KEY, ABRP_USER_TOKEN, ABRP_MIN_INTERVAL_SECONDS.
+          # INGEST_TOKEN, APPROVAL_PASSWORD, ABRP_API_KEY, ABRP_USER_TOKEN,
+          # ABRP_MIN_INTERVAL_SECONDS.
           envFrom:
             - secretRef:
                 name: mg4-server

From 315586f94cbb1a9afbec5501a08b4b4d37d98d7c Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 18:08:35 +0200
Subject: [PATCH 25/79] Move the server to car.k8s.stinnesbeck.com

The server's host is car.k8s.stinnesbeck.com, not car.stinnesbeck.com:
IngressRoute, PUBLIC_URL (so the pairing QR code points there), the
app's pre-filled server URL and hint, and the docs. Grafana's
placeholder host follows to car-grafana.k8s.stinnesbeck.com, so one
*.k8s.stinnesbeck.com default certificate covers both. App 2.4.1 for the
new default; the server image is unchanged (its URL comes from the
manifest).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                             | 8 ++++----
 app/build.gradle                                     | 4 ++--
 app/src/main/java/com/evsuite/abrp/ConfigImport.java | 2 +-
 app/src/main/java/com/evsuite/abrp/ServerConfig.java | 2 +-
 app/src/main/res/values/strings.xml                  | 2 +-
 k8s/README.md                                        | 6 +++---
 k8s/grafana.yaml                                     | 2 +-
 k8s/ingress.yaml                                     | 4 ++--
 k8s/server.yaml                                      | 2 +-
 server/README.md                                     | 6 +++---
 10 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index 95c54bf..0a4df47 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -7,17 +7,17 @@ what has been changed, and what is still to do.
 - Upstream: https://github.com/fatihdonmezdev/FatihsMG4 (itself a fork of malys / EVABRPUploader
   and Leon Kernan / ABRP_Uploader). Credited in the app's About dialog.
 
-## Architecture: car server at car.stinnesbeck.com
+## Architecture: car server at car.k8s.stinnesbeck.com
 
 The car sends everything to our own server. The server stores it in InfluxDB 2 and forwards live
 telemetry to ABRP, so the ABRP token lives only on the server, never in the APK. Grafana reads
 InfluxDB directly for the dashboards.
 
 ```
-car ──live telemetry───▶ car.stinnesbeck.com (Go) ──▶ ABRP  api.iternio.com/1/tlm/send
+car ──live telemetry───▶ car.k8s.stinnesbeck.com (Go) ──▶ ABRP  api.iternio.com/1/tlm/send
     ──daily chunks─────▶          │
     ──charging sessions▶          ▼
-                              InfluxDB 2 ◀── Grafana (car-grafana.stinnesbeck.com)
+                              InfluxDB 2 ◀── Grafana (car-grafana.k8s.stinnesbeck.com)
 ```
 
 - **Server:** `server/`, Go 1.26, API only — see `server/README.md` for endpoints, configuration
@@ -42,7 +42,7 @@ car ──live telemetry───▶ car.stinnesbeck.com (Go) ──▶ ABRP  ap
 - [x] Image `mg4-server:2.1.0` (with pairing) pushed to git.stinnesbeck.com (public; pinned by
       digest `sha256:e5f6e2d2…` in `k8s/kustomization.yaml`).
 - [ ] Check in `k8s/ingress.yaml`: the Traefik ingress class (placeholder `traefik-external`) and
-      Grafana's host (placeholder `car-grafana.stinnesbeck.com`).
+      Grafana's host (placeholder `car-grafana.k8s.stinnesbeck.com`).
 - [ ] First pairing and drive with 2.4.0: telemetry arrives in InfluxDB, Grafana and ABRP.
 
 ## To do
diff --git a/app/build.gradle b/app/build.gradle
index da13714..1aa3515 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 58
-        versionName "2.4.0"
+        versionCode 59
+        versionName "2.4.1"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/ConfigImport.java b/app/src/main/java/com/evsuite/abrp/ConfigImport.java
index 0495edd..cbea2b1 100644
--- a/app/src/main/java/com/evsuite/abrp/ConfigImport.java
+++ b/app/src/main/java/com/evsuite/abrp/ConfigImport.java
@@ -7,7 +7,7 @@ package com.evsuite.abrp;
  *
  * <pre>
  *   # Nils' MG4 config
- *   server_url      = https://car.stinnesbeck.com
+ *   server_url      = https://car.k8s.stinnesbeck.com
  *   token           = 0123abcd...            (the server's INGEST_TOKEN)
  *   installation_id = 6f1a2b3c-4d5e-4f60-8a9b-0c1d2e3f4a5b
  *   interval_sec    = 60
diff --git a/app/src/main/java/com/evsuite/abrp/ServerConfig.java b/app/src/main/java/com/evsuite/abrp/ServerConfig.java
index 555685a..0f9fa2e 100644
--- a/app/src/main/java/com/evsuite/abrp/ServerConfig.java
+++ b/app/src/main/java/com/evsuite/abrp/ServerConfig.java
@@ -28,7 +28,7 @@ final class ServerConfig {
             Pattern.CASE_INSENSITIVE);
 
     /** Pre-filled so pairing needs no typing in the car; can still be changed. */
-    static final String DEFAULT_URL = "https://car.stinnesbeck.com";
+    static final String DEFAULT_URL = "https://car.k8s.stinnesbeck.com";
 
     /** The server refuses shorter ingest tokens outright. */
     static final int MIN_TOKEN_LENGTH = 24;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 67b4320..cd1beb8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,7 +49,7 @@
     <!-- Server page -->
     <string name="server_card_title">Car server</string>
     <string name="hint_server_url">Server URL</string>
-    <string name="helper_server_url">For example https://car.stinnesbeck.com</string>
+    <string name="helper_server_url">For example https://car.k8s.stinnesbeck.com</string>
     <string name="hint_server_token">Ingest token</string>
     <string name="helper_server_token">The server\'s INGEST_TOKEN, at least 24 characters</string>
     <string name="hint_installation_id">Installation ID</string>
diff --git a/k8s/README.md b/k8s/README.md
index 8539e58..d448687 100644
--- a/k8s/README.md
+++ b/k8s/README.md
@@ -1,4 +1,4 @@
-# Kubernetes manifests — car.stinnesbeck.com
+# Kubernetes manifests — car.k8s.stinnesbeck.com
 
 Plain manifests for the car server, InfluxDB 2 and Grafana. They are only files: nothing here
 is applied automatically. Apply them yourself.
@@ -10,7 +10,7 @@ is applied automatically. Apply them yourself.
 | `server.yaml` | Go server Deployment (1 replica, non-root, read-only root filesystem) and Service |
 | `grafana.yaml` | Grafana 13.2.3 Deployment (1Gi PVC), Service; datasource and dashboards provisioned |
 | `grafana/` | The provisioned InfluxDB datasource and the MG4 dashboards (Live, Consumption, Charging) |
-| `ingress.yaml` | Traefik `IngressRoute`s for car.stinnesbeck.com and Grafana, TLS from Traefik's default certificate |
+| `ingress.yaml` | Traefik `IngressRoute`s for car.k8s.stinnesbeck.com and Grafana, TLS from Traefik's default certificate |
 | `secrets.example.yaml` | **Template** for the Secrets; placeholders only, not in `kustomization.yaml` |
 | `secrets.yaml` | Your filled-in copy — **gitignored**, never committed |
 | `kustomization.yaml` | Everything except the Secrets; pins the server image, generates the Grafana ConfigMaps |
@@ -18,7 +18,7 @@ is applied automatically. Apply them yourself.
 ## Before the first apply
 
 1. **Check `ingress.yaml`:** the ingress class (placeholder `traefik-external` for the public
-   Traefik) and Grafana's host (placeholder `car-grafana.stinnesbeck.com`). Both hosts must be
+   Traefik) and Grafana's host (placeholder `car-grafana.k8s.stinnesbeck.com`). Both hosts must be
    covered by Traefik's default certificate.
 2. **Create the Secrets.** `cp k8s/secrets.example.yaml k8s/secrets.yaml` (gitignored), replace
    every `CHANGE-ME` there (`openssl rand -hex 32`): `influxdb-auth`, `mg4-server` (ingest token,
diff --git a/k8s/grafana.yaml b/k8s/grafana.yaml
index 3b8724d..c3bb156 100644
--- a/k8s/grafana.yaml
+++ b/k8s/grafana.yaml
@@ -52,7 +52,7 @@ spec:
               containerPort: 3000
           env:
             - name: GF_SERVER_ROOT_URL
-              value: https://car-grafana.stinnesbeck.com
+              value: https://car-grafana.k8s.stinnesbeck.com
             - name: GF_SECURITY_ADMIN_USER
               value: admin
             - name: GF_SECURITY_ADMIN_PASSWORD
diff --git a/k8s/ingress.yaml b/k8s/ingress.yaml
index 1e2fbf5..9e86840 100644
--- a/k8s/ingress.yaml
+++ b/k8s/ingress.yaml
@@ -14,7 +14,7 @@ spec:
     - websecure
   routes:
     - kind: Rule
-      match: Host(`car.stinnesbeck.com`)
+      match: Host(`car.k8s.stinnesbeck.com`)
       services:
         - kind: Service
           name: mg4-server
@@ -35,7 +35,7 @@ spec:
   routes:
     - kind: Rule
       # CHECK: placeholder host. It must be covered by Traefik's default certificate.
-      match: Host(`car-grafana.stinnesbeck.com`)
+      match: Host(`car-grafana.k8s.stinnesbeck.com`)
       services:
         - kind: Service
           name: grafana
diff --git a/k8s/server.yaml b/k8s/server.yaml
index 80b7b5f..7fc4743 100644
--- a/k8s/server.yaml
+++ b/k8s/server.yaml
@@ -42,7 +42,7 @@ spec:
               value: mg4
             # Where a phone reaches the server; the pairing QR code points here.
             - name: PUBLIC_URL
-              value: https://car.stinnesbeck.com
+              value: https://car.k8s.stinnesbeck.com
             - name: INFLUX_TOKEN
               valueFrom:
                 secretKeyRef:
diff --git a/server/README.md b/server/README.md
index 647d2cd..53a2fd9 100644
--- a/server/README.md
+++ b/server/README.md
@@ -1,6 +1,6 @@
 # Nils' MG4 — car server
 
-A small Go service at car.stinnesbeck.com: the API the car writes to, and the ABRP
+A small Go service at car.k8s.stinnesbeck.com: the API the car writes to, and the ABRP
 forwarder. Data lives in InfluxDB 2; Grafana reads it from there for the dashboards
 (`../k8s/grafana/`).
 
@@ -61,8 +61,8 @@ the same bucket), and the device is persisted before the car can collect the tok
 restart never loses a paired car. Manage cars with the approval password:
 
 ```sh
-curl -H "Authorization: Bearer $APPROVAL_PASSWORD" https://car.stinnesbeck.com/v1/devices
-curl -X POST -H "Authorization: Bearer $APPROVAL_PASSWORD" https://car.stinnesbeck.com/v1/devices/<id>/revoke
+curl -H "Authorization: Bearer $APPROVAL_PASSWORD" https://car.k8s.stinnesbeck.com/v1/devices
+curl -X POST -H "Authorization: Bearer $APPROVAL_PASSWORD" https://car.k8s.stinnesbeck.com/v1/devices/<id>/revoke
 ```
 
 ## Storage

From 6f57351866c193f90cc5ca34372cb3f9e0861e76 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 18:16:52 +0200
Subject: [PATCH 26/79] Use the traefik-internal ingress class

Both IngressRoutes (server and Grafana) now use traefik-internal, like
the rest of *.k8s.stinnesbeck.com, instead of the traefik-external
placeholder. README and SPECS updated.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md         |  3 +--
 k8s/README.md    |  4 ++--
 k8s/ingress.yaml | 10 ++++------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index 0a4df47..7272a3c 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -41,8 +41,7 @@ car ──live telemetry───▶ car.k8s.stinnesbeck.com (Go) ──▶ ABRP
 - [x] Car app 2.4.0 (pairing by QR): unit tests pass; **not yet tried on the car**.
 - [x] Image `mg4-server:2.1.0` (with pairing) pushed to git.stinnesbeck.com (public; pinned by
       digest `sha256:e5f6e2d2…` in `k8s/kustomization.yaml`).
-- [ ] Check in `k8s/ingress.yaml`: the Traefik ingress class (placeholder `traefik-external`) and
-      Grafana's host (placeholder `car-grafana.k8s.stinnesbeck.com`).
+- [ ] Check Grafana's host in `k8s/ingress.yaml` (placeholder `car-grafana.k8s.stinnesbeck.com`).
 - [ ] First pairing and drive with 2.4.0: telemetry arrives in InfluxDB, Grafana and ABRP.
 
 ## To do
diff --git a/k8s/README.md b/k8s/README.md
index d448687..27b4bd2 100644
--- a/k8s/README.md
+++ b/k8s/README.md
@@ -17,8 +17,8 @@ is applied automatically. Apply them yourself.
 
 ## Before the first apply
 
-1. **Check `ingress.yaml`:** the ingress class (placeholder `traefik-external` for the public
-   Traefik) and Grafana's host (placeholder `car-grafana.k8s.stinnesbeck.com`). Both hosts must be
+1. **Check `ingress.yaml`:** Grafana's host (placeholder `car-grafana.k8s.stinnesbeck.com`).
+   Both routes use the `traefik-internal` class, and both hosts must be
    covered by Traefik's default certificate.
 2. **Create the Secrets.** `cp k8s/secrets.example.yaml k8s/secrets.yaml` (gitignored), replace
    every `CHANGE-ME` there (`openssl rand -hex 32`): `influxdb-auth`, `mg4-server` (ingest token,
diff --git a/k8s/ingress.yaml b/k8s/ingress.yaml
index 9e86840..335dc03 100644
--- a/k8s/ingress.yaml
+++ b/k8s/ingress.yaml
@@ -1,14 +1,12 @@
-# Public routes. TLS uses Traefik's default certificate, so there is no per-host
-# Certificate here.
+# Routes on the traefik-internal class, like the rest of *.k8s.stinnesbeck.com. TLS uses
+# Traefik's default certificate, so there is no per-host Certificate here.
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: mg4-server
   namespace: mg4
   annotations:
-    # CHECK: the class of your public-facing Traefik. Your internal example uses
-    # "traefik-internal"; these hosts must be served by the external one.
-    kubernetes.io/ingress.class: traefik-external
+    kubernetes.io/ingress.class: traefik-internal
 spec:
   entryPoints:
     - websecure
@@ -28,7 +26,7 @@ metadata:
   name: grafana
   namespace: mg4
   annotations:
-    kubernetes.io/ingress.class: traefik-external # CHECK, as above
+    kubernetes.io/ingress.class: traefik-internal
 spec:
   entryPoints:
     - websecure

From 8a5813fa16ba7ee366ed3a1c50885507ddde2852 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 20:56:02 +0200
Subject: [PATCH 27/79] App 2.4.2: pairing dialog shows errors instead of
 closing

- On a failure the pairing dialog stays open and shows the reason in
  red (Cancel becomes Close); before, it closed at once and the reason
  was only in the Server tab's status line.
- "Pairing is not enabled" only when the server says so. Any other 404
  (a server older than 2.1.0, or a proxy's page) is reported as a
  server without pairing.
- Pairing and Test connection name the problem: a server name that
  does not resolve (Test connection used to say "No internet
  connection"), a server that does not answer, or the HTTP status.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 app/build.gradle                              |  4 +-
 .../java/com/evsuite/abrp/MainActivity.java   | 49 +++++++++++++++++--
 .../java/com/evsuite/abrp/PairingClient.java  | 21 ++++++--
 app/src/main/res/values/strings.xml           |  5 ++
 .../com/evsuite/abrp/PairingClientTest.java   | 16 +++++-
 k8s/{ => secrets}/secrets.example.yaml        |  0
 6 files changed, 84 insertions(+), 11 deletions(-)
 rename k8s/{ => secrets}/secrets.example.yaml (100%)

diff --git a/app/build.gradle b/app/build.gradle
index 1aa3515..c2c0330 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 59
-        versionName "2.4.1"
+        versionCode 60
+        versionName "2.4.2"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index cc225e7..3fe59c7 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -455,7 +455,7 @@ public class MainActivity extends AppCompatActivity {
                 message = getString(R.string.conn_err_timeout);
                 color = COLOR_ERROR;
             } catch (Exception e) {
-                message = getString(R.string.conn_err_no_internet);
+                message = describeNetworkError(e, url);
                 color = COLOR_ERROR;
             }
             final String m = message;
@@ -514,6 +514,9 @@ public class MainActivity extends AppCompatActivity {
                 .setView(panel)
                 .setNegativeButton(R.string.pair_cancel, null)
                 .create();
+        // Shown only once the server has answered, so a failure leaves no empty QR frame.
+        qr.setVisibility(View.GONE);
+        code.setVisibility(View.GONE);
         dialog.setOnDismissListener(d -> cancelled[0] = true);
         dialog.show();
 
@@ -525,8 +528,12 @@ public class MainActivity extends AppCompatActivity {
                 android.graphics.Bitmap bitmap = QrCode.generate(request.verificationUriComplete, 416);
                 runOnUiThread(() -> {
                     instructions.setText(getString(R.string.pair_scan, request.verificationUri));
-                    if (bitmap != null) qr.setImageBitmap(bitmap);
+                    if (bitmap != null) {
+                        qr.setImageBitmap(bitmap);
+                        qr.setVisibility(View.VISIBLE);
+                    }
                     code.setText(request.userCode);
+                    code.setVisibility(View.VISIBLE);
                     status.setText(R.string.pair_waiting);
                 });
                 PairingClient.PollResult result = null;
@@ -552,26 +559,58 @@ public class MainActivity extends AppCompatActivity {
                 }
             } catch (PairingClient.NotEnabledException e) {
                 outcome = getString(R.string.pair_not_enabled);
+            } catch (PairingClient.HttpStatusException e) {
+                outcome = e.status == 404 ? getString(R.string.pair_err_old_server)
+                        : getString(R.string.err_http, e.status);
             } catch (InterruptedException e) {
                 return;
             } catch (Exception e) {
-                outcome = getString(R.string.pair_error, e.getClass().getSimpleName());
+                outcome = describeNetworkError(e, url);
             }
             final String message = outcome;
             final int c = color;
             runOnUiThread(() -> {
-                if (!cancelled[0]) dialog.dismiss();
+                setConnectionStatus(c, message);
                 if (c == COLOR_OK) {
                     if (consumptionCloudClient != null) consumptionCloudClient.invalidateHistory();
                     showServerConfig();
                     serverTokenLayout.setError(null);
                     refreshStatus();
+                    if (!cancelled[0]) dialog.dismiss();
+                    return;
                 }
-                setConnectionStatus(c, message);
+                if (cancelled[0]) return;
+                // Keep the dialog up with the reason, instead of closing it on a failure the
+                // driver would otherwise only see as a flicker.
+                qr.setVisibility(View.GONE);
+                code.setVisibility(View.GONE);
+                instructions.setVisibility(View.GONE);
+                status.setText(message);
+                status.setTextColor(c);
+                android.widget.Button close = dialog.getButton(android.content.DialogInterface.BUTTON_NEGATIVE);
+                if (close != null) close.setText(R.string.pair_close);
             });
         }, "server-pairing").start();
     }
 
+    /**
+     * A network failure in words the driver can act on: a name that does not resolve, a
+     * server that does not answer, or a status. Shared by Test connection and pairing.
+     */
+    private String describeNetworkError(Exception e, String url) {
+        String host = Uri.parse(url).getHost();
+        if (host == null) host = url;
+        if (e instanceof java.net.UnknownHostException) return getString(R.string.err_dns, host);
+        if (e instanceof java.net.SocketTimeoutException || e instanceof java.net.ConnectException
+                || e instanceof java.net.NoRouteToHostException) {
+            return getString(R.string.err_unreachable, host);
+        }
+        if (e instanceof PairingClient.HttpStatusException) {
+            return getString(R.string.err_http, ((PairingClient.HttpStatusException) e).status);
+        }
+        return getString(R.string.pair_error, e.getClass().getSimpleName());
+    }
+
     private static int httpGet(String url, String token) throws java.io.IOException {
         java.net.HttpURLConnection connection = (java.net.HttpURLConnection) new java.net.URL(url).openConnection();
         try {
diff --git a/app/src/main/java/com/evsuite/abrp/PairingClient.java b/app/src/main/java/com/evsuite/abrp/PairingClient.java
index 29c0fd8..e349dca 100644
--- a/app/src/main/java/com/evsuite/abrp/PairingClient.java
+++ b/app/src/main/java/com/evsuite/abrp/PairingClient.java
@@ -52,13 +52,28 @@ final class PairingClient {
     /** Thrown when pairing is switched off on the server (no APPROVAL_PASSWORD). */
     static final class NotEnabledException extends Exception { }
 
+    /** The server answered with a status the flow does not expect. */
+    static final class HttpStatusException extends java.io.IOException {
+        final int status;
+
+        HttpStatusException(int status) {
+            super("HTTP " + status);
+            this.status = status;
+        }
+    }
+
+    /** What the server says when APPROVAL_PASSWORD is unset; any other 404 is a missing route. */
+    static final String NOT_ENABLED_MESSAGE = "pairing is not enabled";
+
     private PairingClient() { }
 
     static Request start(String serverUrl, String installationId) throws Exception {
         Response r = post(serverUrl + "/v1/pair/start",
                 new JSONObject().put("installationId", installationId));
-        if (r.status == 404) throw new NotEnabledException();
-        if (r.status != 201) throw new java.io.IOException("HTTP " + r.status);
+        // Only the server's own answer means "switched off". A 404 without it is a server (or
+        // proxy) that has no pairing route at all, e.g. one older than 2.1.0.
+        if (r.status == 404 && r.body.contains(NOT_ENABLED_MESSAGE)) throw new NotEnabledException();
+        if (r.status != 201) throw new HttpStatusException(r.status);
         JSONObject json = new JSONObject(r.body);
         long now = System.currentTimeMillis();
         return new Request(
@@ -77,7 +92,7 @@ final class PairingClient {
             case 202: return new PollResult(Outcome.PENDING, null);
             case 403: return new PollResult(Outcome.DENIED, null);
             case 410: return new PollResult(Outcome.EXPIRED, null);
-            default: throw new java.io.IOException("HTTP " + r.status);
+            default: throw new HttpStatusException(r.status);
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cd1beb8..f942d80 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -66,6 +66,11 @@
     <string name="pair_expired">The code expired — press Pair with phone again</string>
     <string name="pair_not_enabled">Pairing is not enabled on the server (no APPROVAL_PASSWORD)</string>
     <string name="pair_error">Pairing failed: %1$s</string>
+    <string name="pair_close">Close</string>
+    <string name="pair_err_old_server">The server has no pairing (HTTP 404). It needs server version 2.1.0 or newer.</string>
+    <string name="err_dns">Server name %1$s not found. Is it in public DNS?</string>
+    <string name="err_unreachable">Server %1$s not reachable</string>
+    <string name="err_http">Server answered HTTP %1$d</string>
     <string name="pair_cancel">Cancel</string>
     <string name="pair_qr_description">QR code to approve this car on your phone</string>
     <string name="server_err_token">The token must be at least 24 characters, without spaces</string>
diff --git a/app/src/test/java/com/evsuite/abrp/PairingClientTest.java b/app/src/test/java/com/evsuite/abrp/PairingClientTest.java
index 0bc8006..c9b6844 100644
--- a/app/src/test/java/com/evsuite/abrp/PairingClientTest.java
+++ b/app/src/test/java/com/evsuite/abrp/PairingClientTest.java
@@ -27,6 +27,7 @@ public class PairingClientTest {
     private String url;
     private final Deque<Integer> pollStatuses = new ArrayDeque<>();
     private volatile int startStatus = 201;
+    private volatile String startErrorBody = "{\"error\":\"pairing is not enabled\"}";
     private volatile String lastStartBody;
 
     @Before
@@ -73,7 +74,7 @@ public class PairingClientTest {
             response = status == 201
                     ? "{\"deviceCode\":\"dev-code\",\"userCode\":\"K7F-3QX\",\"verificationUri\":\"https://car.example.com/pair\","
                       + "\"verificationUriComplete\":\"https://car.example.com/pair?code=K7F-3QX\",\"expiresIn\":600,\"interval\":5}"
-                    : "{\"error\":\"pairing is not enabled\"}";
+                    : startErrorBody;
         } else {
             Integer next;
             synchronized (pollStatuses) { next = pollStatuses.poll(); }
@@ -119,6 +120,19 @@ public class PairingClientTest {
         assertEquals(PairingClient.Outcome.EXPIRED, PairingClient.poll(url, "dev-code").outcome);
     }
 
+    @Test
+    public void aServerWithoutPairingIsNotMistakenForPairingSwitchedOff() throws Exception {
+        // e.g. server 2.0.0, or a proxy's own 404 page
+        startStatus = 404;
+        startErrorBody = "404 page not found";
+        try {
+            PairingClient.start(url, "6f1a2b3c-4d5e-4f60-8a9b-0c1d2e3f4a5b");
+            fail("expected HttpStatusException");
+        } catch (PairingClient.HttpStatusException expected) {
+            assertEquals(404, expected.status);
+        }
+    }
+
     @Test
     public void pairingSwitchedOffOnTheServerIsReportedAsSuch() throws Exception {
         startStatus = 404;
diff --git a/k8s/secrets.example.yaml b/k8s/secrets/secrets.example.yaml
similarity index 100%
rename from k8s/secrets.example.yaml
rename to k8s/secrets/secrets.example.yaml

From 46dccee1dedeb8b6fb69ce796b7a8886dc534d5e Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 21:12:21 +0200
Subject: [PATCH 28/79] App 2.4.3: pairing code visible on the car screen

The code below the QR code was not visible on the head unit: the dialog
stacked the text, a 240 dp QR code, the code and the status, and its
content could not scroll, so on the wide, low screen the lower part
was cut off. On wide screens the QR code now sits left of the text,
the content scrolls, and the code is also part of the instruction
sentence, so it is readable wherever the text is.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 app/build.gradle                              |  4 +-
 .../java/com/evsuite/abrp/MainActivity.java   | 47 +++++++++++++++----
 app/src/main/res/values/strings.xml           |  2 +-
 3 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c2c0330..09ee60c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 60
-        versionName "2.4.2"
+        versionCode 61
+        versionName "2.4.3"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 3fe59c7..fb7d9d6 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -483,10 +483,17 @@ public class MainActivity extends AppCompatActivity {
 
         float density = getResources().getDisplayMetrics().density;
         int pad = (int) (24 * density);
+        // On the head unit's wide, low screen the QR code sits left of the text: stacked, the
+        // code and status below a 240 dp QR code were cut off. Scrollable either way, so
+        // nothing can be clipped on any screen.
+        android.util.DisplayMetrics metrics = getResources().getDisplayMetrics();
+        boolean wide = metrics.widthPixels > metrics.heightPixels;
         android.widget.LinearLayout panel = new android.widget.LinearLayout(this);
-        panel.setOrientation(android.widget.LinearLayout.VERTICAL);
-        panel.setGravity(android.view.Gravity.CENTER_HORIZONTAL);
+        panel.setOrientation(wide ? android.widget.LinearLayout.HORIZONTAL : android.widget.LinearLayout.VERTICAL);
+        panel.setGravity(wide ? android.view.Gravity.CENTER_VERTICAL : android.view.Gravity.CENTER_HORIZONTAL);
         panel.setPadding(pad, pad, pad, pad);
+        android.widget.LinearLayout column = new android.widget.LinearLayout(this);
+        column.setOrientation(android.widget.LinearLayout.VERTICAL);
         TextView instructions = new TextView(this);
         instructions.setTextAppearance(R.style.Text_EV_Secondary);
         ImageView qr = new ImageView(this);
@@ -501,17 +508,37 @@ public class MainActivity extends AppCompatActivity {
         TextView status = new TextView(this);
         status.setTextAppearance(R.style.Text_EV_Body);
         status.setText(R.string.pair_starting);
-        panel.addView(instructions);
         android.widget.LinearLayout.LayoutParams qrParams = new android.widget.LinearLayout.LayoutParams(qrSize, qrSize);
-        qrParams.topMargin = pad / 2;
-        panel.addView(qr, qrParams);
-        panel.addView(code);
-        panel.addView(status);
+        android.widget.LinearLayout.LayoutParams columnParams;
+        if (wide) {
+            qrParams.rightMargin = pad;
+            columnParams = new android.widget.LinearLayout.LayoutParams(
+                    0, android.view.ViewGroup.LayoutParams.WRAP_CONTENT, 1f);
+            panel.addView(qr, qrParams);
+            panel.addView(column, columnParams);
+            column.addView(instructions);
+        } else {
+            qrParams.topMargin = pad / 2;
+            qrParams.bottomMargin = pad / 2;
+            columnParams = new android.widget.LinearLayout.LayoutParams(
+                    android.view.ViewGroup.LayoutParams.MATCH_PARENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT);
+            panel.addView(instructions);
+            panel.addView(qr, qrParams);
+            panel.addView(column, columnParams);
+        }
+        android.widget.LinearLayout.LayoutParams codeParams = new android.widget.LinearLayout.LayoutParams(
+                android.view.ViewGroup.LayoutParams.WRAP_CONTENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT);
+        codeParams.topMargin = pad / 2;
+        codeParams.bottomMargin = pad / 2;
+        column.addView(code, codeParams);
+        column.addView(status);
+        android.widget.ScrollView scroll = new android.widget.ScrollView(this);
+        scroll.addView(panel);
 
         final boolean[] cancelled = {false};
         androidx.appcompat.app.AlertDialog dialog = new MaterialAlertDialogBuilder(this)
                 .setTitle(R.string.pair_title)
-                .setView(panel)
+                .setView(scroll)
                 .setNegativeButton(R.string.pair_cancel, null)
                 .create();
         // Shown only once the server has answered, so a failure leaves no empty QR frame.
@@ -527,7 +554,9 @@ public class MainActivity extends AppCompatActivity {
                 PairingClient.Request request = PairingClient.start(url, installationId);
                 android.graphics.Bitmap bitmap = QrCode.generate(request.verificationUriComplete, 416);
                 runOnUiThread(() -> {
-                    instructions.setText(getString(R.string.pair_scan, request.verificationUri));
+                    // The code is in the sentence as well as below it, so it is readable
+                    // wherever the text is.
+                    instructions.setText(getString(R.string.pair_scan, request.verificationUri, request.userCode));
                     if (bitmap != null) {
                         qr.setImageBitmap(bitmap);
                         qr.setVisibility(View.VISIBLE);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f942d80..b92d940 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -58,7 +58,7 @@
     <string name="btn_pair">Pair with phone</string>
     <string name="pair_hint">Shows a QR code: scan it with your phone and approve with the approval password. The token below is then filled in for you.</string>
     <string name="pair_title">Pair with phone</string>
-    <string name="pair_scan">Scan with your phone, or open %1$s and enter this code:</string>
+    <string name="pair_scan">Scan the QR code with your phone, or open %1$s and enter the code %2$s:</string>
     <string name="pair_waiting">Waiting for approval…</string>
     <string name="pair_starting">Contacting the server…</string>
     <string name="pair_ok">Paired — this car now has its own token</string>

From 84fb3aac2142804699dbc37330d43e31089165dd Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 21:36:17 +0200
Subject: [PATCH 29/79] k8s: work with `kubectl apply -f` as well as `-k`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- The secrets template moves to k8s/secrets/, and the filled-in copy to
  k8s/secrets/secrets.yaml (gitignored). `kubectl apply -f k8s/` does
  not recurse, so neither the placeholder template nor the real secrets
  can be applied by accident.
- The server image digest is pinned in server.yaml instead of through
  kustomize's images override, which `-f` ignores (it would have pulled
  a nonexistent :latest).
- README and kustomization.yaml say to use `-k`: plain `-f` never
  creates the generated Grafana ConfigMaps.
- The IngressRoutes drop `tls: {}`, like the other routes on this
  Traefik: TLS is configured on the websecure entrypoint.

Manifests validated both ways (14 resources rendered with kustomize,
11 as plain files — the difference is the Grafana ConfigMaps).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 .gitignore                       |  3 ++-
 SPECS.md                         |  5 +++--
 k8s/README.md                    | 19 +++++++++++--------
 k8s/ingress.yaml                 |  7 +++----
 k8s/kustomization.yaml           |  8 ++------
 k8s/secrets/secrets.example.yaml |  5 +++--
 k8s/server.yaml                  |  3 ++-
 7 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index c0a29a9..90dee08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,5 +40,6 @@ mise.local.toml
 /EVHardware/.gradle
 /EVHardware/**/build
 
-# Filled-in Kubernetes Secrets (copy of k8s/secrets.example.yaml). Never commit.
+# Filled-in Kubernetes Secrets (copy of k8s/secrets/secrets.example.yaml). Never commit.
 /k8s/secrets.yaml
+/k8s/secrets/secrets.yaml
diff --git a/SPECS.md b/SPECS.md
index 7272a3c..a0e0914 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -40,7 +40,7 @@ car ──live telemetry───▶ car.k8s.stinnesbeck.com (Go) ──▶ ABRP
 - [x] Manifests validated offline (including Traefik CRDs). **Not applied.**
 - [x] Car app 2.4.0 (pairing by QR): unit tests pass; **not yet tried on the car**.
 - [x] Image `mg4-server:2.1.0` (with pairing) pushed to git.stinnesbeck.com (public; pinned by
-      digest `sha256:e5f6e2d2…` in `k8s/kustomization.yaml`).
+      digest `sha256:e5f6e2d2…` in `k8s/server.yaml`).
 - [ ] Check Grafana's host in `k8s/ingress.yaml` (placeholder `car-grafana.k8s.stinnesbeck.com`).
 - [ ] First pairing and drive with 2.4.0: telemetry arrives in InfluxDB, Grafana and ABRP.
 
@@ -89,7 +89,8 @@ car ──live telemetry───▶ car.k8s.stinnesbeck.com (Go) ──▶ ABRP
   app 2.4.0 shows the QR code and collects its token. Tested end to end against InfluxDB.
 - 2026-10-17 — Incident: a commit swept the filled-in `secrets.example.yaml` (InfluxDB admin token,
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
-  the now gitignored `k8s/secrets.yaml`. Filled-in secrets live only there from now on.
+  the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
+  `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
 - 2026-10-17 — Temporary on-screen diagnostics (b2a5b32) to debug blank values without adb;
   removed again (1002962) once values showed on the car. Revert 1002962 to bring them back.
 
diff --git a/k8s/README.md b/k8s/README.md
index 27b4bd2..f2d2c0b 100644
--- a/k8s/README.md
+++ b/k8s/README.md
@@ -11,19 +11,19 @@ is applied automatically. Apply them yourself.
 | `grafana.yaml` | Grafana 13.2.3 Deployment (1Gi PVC), Service; datasource and dashboards provisioned |
 | `grafana/` | The provisioned InfluxDB datasource and the MG4 dashboards (Live, Consumption, Charging) |
 | `ingress.yaml` | Traefik `IngressRoute`s for car.k8s.stinnesbeck.com and Grafana, TLS from Traefik's default certificate |
-| `secrets.example.yaml` | **Template** for the Secrets; placeholders only, not in `kustomization.yaml` |
-| `secrets.yaml` | Your filled-in copy — **gitignored**, never committed |
-| `kustomization.yaml` | Everything except the Secrets; pins the server image, generates the Grafana ConfigMaps |
+| `secrets/secrets.example.yaml` | **Template** for the Secrets; placeholders only, not in `kustomization.yaml` |
+| `secrets/secrets.yaml` | Your filled-in copy — **gitignored**, never committed |
+| `kustomization.yaml` | Everything except the Secrets; generates the Grafana ConfigMaps |
 
 ## Before the first apply
 
 1. **Check `ingress.yaml`:** Grafana's host (placeholder `car-grafana.k8s.stinnesbeck.com`).
    Both routes use the `traefik-internal` class, and both hosts must be
    covered by Traefik's default certificate.
-2. **Create the Secrets.** `cp k8s/secrets.example.yaml k8s/secrets.yaml` (gitignored), replace
+2. **Create the Secrets.** `cp k8s/secrets/secrets.example.yaml k8s/secrets/secrets.yaml` (gitignored), replace
    every `CHANGE-ME` there (`openssl rand -hex 32`): `influxdb-auth`, `mg4-server` (ingest token,
    approval password for pairing, your ABRP API key and user token) and `grafana-admin`. Keep
-   `secrets.example.yaml` itself on placeholders only.
+   the template itself on placeholders only.
 3. **Registry access.** The `mg4-server` package on git.stinnesbeck.com is public, so no pull
    secret is needed. If you make it private, add an `imagePullSecrets` entry to `server.yaml`.
 
@@ -31,10 +31,13 @@ is applied automatically. Apply them yourself.
 
 ```sh
 kubectl apply -f k8s/namespace.yaml
-kubectl apply -f k8s/secrets.yaml
+kubectl apply -f k8s/secrets/secrets.yaml
 kubectl apply -k k8s/
 ```
 
+Use **`-k`**, not `-f k8s/`: plain `-f` applies the files without kustomize, so the Grafana
+ConfigMaps (datasource and dashboards) are never created and Grafana does not start.
+
 ## Notes
 
 - InfluxDB's setup mode runs only on an empty volume. Changing `admin-token` in the Secret later
@@ -43,5 +46,5 @@ kubectl apply -k k8s/
   for Grafana, read/write for the server) can replace it later.
 - The dashboards are read-only in Grafana's UI. Change the JSON in `grafana/dashboards/`; the
   ConfigMap name changes with its content, which rolls Grafana.
-- The server image is pinned by digest in `kustomization.yaml`. To upgrade, push a new tag and
-  put its digest there (`skopeo inspect docker://git.stinnesbeck.com/nils/mg4-server:<tag>`).
+- The server image is pinned by digest in `server.yaml`. To upgrade, push a new tag and put its
+  digest there (`skopeo inspect docker://git.stinnesbeck.com/nils/mg4-server:<tag>`).
diff --git a/k8s/ingress.yaml b/k8s/ingress.yaml
index 335dc03..0719533 100644
--- a/k8s/ingress.yaml
+++ b/k8s/ingress.yaml
@@ -1,5 +1,6 @@
-# Routes on the traefik-internal class, like the rest of *.k8s.stinnesbeck.com. TLS uses
-# Traefik's default certificate, so there is no per-host Certificate here.
+# Routes on the traefik-internal class, like the rest of *.k8s.stinnesbeck.com. No tls section
+# and no per-host Certificate: TLS is configured on Traefik's websecure entrypoint, which serves
+# the default certificate.
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
@@ -18,7 +19,6 @@ spec:
           name: mg4-server
           namespace: mg4
           port: 80
-  tls: {}
 ---
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
@@ -39,4 +39,3 @@ spec:
           name: grafana
           namespace: mg4
           port: 80
-  tls: {}
diff --git a/k8s/kustomization.yaml b/k8s/kustomization.yaml
index bd41dd3..a82bbc6 100644
--- a/k8s/kustomization.yaml
+++ b/k8s/kustomization.yaml
@@ -1,5 +1,5 @@
-# Render with `kustomize build k8s/` (or `kubectl kustomize k8s/`) and apply it yourself.
-# The Secrets are not included: create them from secrets.example.yaml first.
+# Apply with `kubectl apply -k k8s/` — not `-f k8s/`, which skips the Grafana ConfigMaps below.
+# The Secrets are not included: create them from secrets/secrets.example.yaml first.
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
@@ -8,10 +8,6 @@ resources:
   - server.yaml
   - grafana.yaml
   - ingress.yaml
-images:
-  - name: git.stinnesbeck.com/nils/mg4-server
-    # 2.1.0, pinned by digest so a re-pushed tag cannot change what runs.
-    digest: sha256:e5f6e2d2ef9dc2650055a0823a3f86d8903e46918a76e990540482edf819766d
 generatorOptions:
   labels:
     app.kubernetes.io/part-of: mg4
diff --git a/k8s/secrets/secrets.example.yaml b/k8s/secrets/secrets.example.yaml
index 6bea4d4..f97d66b 100644
--- a/k8s/secrets/secrets.example.yaml
+++ b/k8s/secrets/secrets.example.yaml
@@ -1,5 +1,6 @@
-# TEMPLATE ONLY — not part of kustomization.yaml. Copy it to k8s/secrets.yaml (gitignored),
-# fill in real values there, and apply that file yourself. Never put real values in here.
+# TEMPLATE ONLY — not part of kustomization.yaml. Copy it to k8s/secrets/secrets.yaml
+# (gitignored), fill in real values there, and apply that file yourself. Never put real values
+# in here. This folder is outside `kubectl apply -f k8s/`, which does not recurse.
 #
 #   openssl rand -hex 32     for every token and password below
 apiVersion: v1
diff --git a/k8s/server.yaml b/k8s/server.yaml
index 7fc4743..d698e1e 100644
--- a/k8s/server.yaml
+++ b/k8s/server.yaml
@@ -29,7 +29,8 @@ spec:
           type: RuntimeDefault
       containers:
         - name: server
-          image: git.stinnesbeck.com/nils/mg4-server:latest # pinned by kustomization.yaml
+          # 2.1.0, pinned by digest so a re-pushed tag cannot change what runs.
+          image: git.stinnesbeck.com/nils/mg4-server@sha256:e5f6e2d2ef9dc2650055a0823a3f86d8903e46918a76e990540482edf819766d
           ports:
             - name: http
               containerPort: 8080

From 756ae65d0bdac6e07e334818a1bad415442b1b26 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 21:43:49 +0200
Subject: [PATCH 30/79] Grafana: startup probe so a slow first start is not
 killed

Grafana's first start creates and migrates its database: 44 s at
0.5 CPU and 3 minutes at 0.1 CPU (measured with 13.2.3 on an empty
volume). With only 50m requested, the liveness probe (30 s delay,
3 x 30 s) restarted it mid-migration, in a loop, and readiness never
passed.

- startupProbe on /api/health allows up to 10 minutes; liveness and
  readiness start only after it succeeds.
- 5 s timeouts on all probes instead of the 1 s default.
- Requests raised to 250m CPU / 256Mi (measured about 240 MB in use);
  still no CPU limit.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 k8s/grafana.yaml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/k8s/grafana.yaml b/k8s/grafana.yaml
index c3bb156..0032a52 100644
--- a/k8s/grafana.yaml
+++ b/k8s/grafana.yaml
@@ -85,21 +85,34 @@ spec:
               mountPath: /etc/grafana/provisioning/dashboards
             - name: dashboards
               mountPath: /var/lib/grafana/dashboards/mg4
+          # The first start creates and migrates Grafana's database: measured 44 s at 0.5 CPU
+          # and 3 minutes at 0.1 CPU. The startup probe allows up to 10 minutes for that, and
+          # liveness/readiness only begin once it succeeded, so a slow first start is never
+          # killed mid-migration (which would restart it slowly again, in a loop).
+          startupProbe:
+            httpGet:
+              path: /api/health
+              port: http
+            periodSeconds: 10
+            timeoutSeconds: 5
+            failureThreshold: 60
           readinessProbe:
             httpGet:
               path: /api/health
               port: http
             periodSeconds: 10
+            timeoutSeconds: 5
           livenessProbe:
             httpGet:
               path: /api/health
               port: http
-            initialDelaySeconds: 30
             periodSeconds: 30
+            timeoutSeconds: 5
+            failureThreshold: 3
           resources:
             requests:
-              cpu: 50m
-              memory: 128Mi
+              cpu: 250m
+              memory: 256Mi
             limits:
               memory: 512Mi
           securityContext:

From cee0eaeab37ff40ba1e63c12b639c02f73c42be8 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 21:45:56 +0200
Subject: [PATCH 31/79] Grafana: memory request 512Mi, limit 1Gi

It runs at about 406 MiB in the cluster, too close to the 512Mi limit:
long-range dashboard queries could get it OOM-killed. The request now
matches what it uses, so the scheduler reserves it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 k8s/grafana.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/k8s/grafana.yaml b/k8s/grafana.yaml
index 0032a52..135aa75 100644
--- a/k8s/grafana.yaml
+++ b/k8s/grafana.yaml
@@ -109,12 +109,14 @@ spec:
             periodSeconds: 30
             timeoutSeconds: 5
             failureThreshold: 3
+          # About 406 MiB in steady state in the cluster: request what it uses, and leave room
+          # for long-range dashboard queries before the limit OOM-kills it.
           resources:
             requests:
               cpu: 250m
-              memory: 256Mi
-            limits:
               memory: 512Mi
+            limits:
+              memory: 1Gi
           securityContext:
             allowPrivilegeEscalation: false
             capabilities:

From f3de272c697c99b300f7fa0b9e36924802a354c1 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 21:59:17 +0200
Subject: [PATCH 32/79] Grafana: map zooms to the route; plain hyphens in
 titles

- "Where the car was" fits the route again: in Grafana's fit view the
  zoom value is the maximum zoom, and 6 held it at country level. Now
  15 with 10 % padding. Checked by rendering the Live dashboard with a
  simulated 10 km drive.
- Dashboard titles use "-" instead of an em dash: "MG4 - Live",
  "MG4 - Consumption", "MG4 - Charging".
- SPECS.md: Grafana keeps its state in SQLite on its PVC, which is why
  it runs as one replica with Recreate; high availability needs
  PostgreSQL or MySQL first.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                | 7 +++++++
 k8s/grafana/dashboards/charging.json    | 2 +-
 k8s/grafana/dashboards/consumption.json | 2 +-
 k8s/grafana/dashboards/live.json        | 5 +++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index a0e0914..5423990 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -56,6 +56,13 @@ car ──live telemetry───▶ car.k8s.stinnesbeck.com (Go) ──▶ ABRP
       (`ALLOWED_HOSTS`). For git.stinnesbeck.com it needs the host on the allowlist, and the
       response parsing checked against that server's releases API. Release assets must be named
       `NilsMG4-unstable-<version>.apk` with a `.sha256` sidecar (`build-car` writes both).
+- [ ] **Grafana high availability needs another database.** Grafana keeps its own state (users,
+      sessions, preferences, provisioned-dashboard records, alerting state) in SQLite at
+      `/var/lib/grafana/grafana.db` on the `grafana-data` PVC. That is fine for one replica, and is
+      why `k8s/grafana.yaml` uses `replicas: 1` and the `Recreate` strategy: only one Grafana may
+      write the file. To run more than one replica, first move Grafana to PostgreSQL or MySQL
+      (`GF_DATABASE_TYPE`, `GF_DATABASE_HOST`, …); the replicas then share that database instead
+      of a volume. The car data itself is in InfluxDB and unaffected.
 - [ ] **Telemetry queue survives restarts.** Unsent live samples are kept in memory only.
 - [ ] **Translate the rest.** The docs (`CHANGELOG.md`, `OTA.md`'s
       message table, comments in `mise.toml`/`app/build.gradle`) are still Turkish or French.
diff --git a/k8s/grafana/dashboards/charging.json b/k8s/grafana/dashboards/charging.json
index 28471c1..9550abd 100644
--- a/k8s/grafana/dashboards/charging.json
+++ b/k8s/grafana/dashboards/charging.json
@@ -1,6 +1,6 @@
 {
   "uid": "mg4-charging",
-  "title": "MG4 — Charging",
+  "title": "MG4 - Charging",
   "description": "DC charging sessions metered by the car. Prices in euro, as entered in the car's Charging tab.",
   "tags": [
     "mg4"
diff --git a/k8s/grafana/dashboards/consumption.json b/k8s/grafana/dashboards/consumption.json
index 99b2078..ff1e6b3 100644
--- a/k8s/grafana/dashboards/consumption.json
+++ b/k8s/grafana/dashboards/consumption.json
@@ -1,6 +1,6 @@
 {
   "uid": "mg4-consumption",
-  "title": "MG4 — Consumption",
+  "title": "MG4 - Consumption",
   "description": "Daily consumption, summed from the chunks the car sends while driving.",
   "tags": [
     "mg4"
diff --git a/k8s/grafana/dashboards/live.json b/k8s/grafana/dashboards/live.json
index 77dda27..5046df4 100644
--- a/k8s/grafana/dashboards/live.json
+++ b/k8s/grafana/dashboards/live.json
@@ -1,6 +1,6 @@
 {
   "uid": "mg4-live",
-  "title": "MG4 — Live",
+  "title": "MG4 - Live",
   "description": "Live telemetry from the car, as stored before it is forwarded to ABRP.",
   "tags": [
     "mg4"
@@ -488,7 +488,8 @@
           "id": "fit",
           "lat": 0,
           "lon": 0,
-          "zoom": 6,
+          "zoom": 15,
+          "padding": 10,
           "allLayers": true
         },
         "controls": {

From 582c084b3562b0fef4abe2b58f2efe4911b09f59 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 22:17:41 +0200
Subject: [PATCH 33/79] Live dashboard: show what the car sends, compute pack
 energy

The car publishes no battery, cabin or outside temperature and no pack
energy (checked against the fields that reached InfluxDB). Instead of
panels that stay empty:

- Battery temperature tile -> Climate setpoint.
- Outside temperature tile -> Last update ("2 minutes ago").
- Energy in pack = SOC x usable capacity, from the hidden dashboard
  constant usableKwh = 50.8 (51 kWh battery).
- Temperatures chart -> Battery voltage and current.

Checked with a simulated drive carrying exactly the car's fields: all
11 panels return data, energy matches 61 % x 50.8 kWh. SPECS.md lists
the missing signals and why.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                         | 19 +++++++++++
 k8s/grafana/dashboards/live.json | 57 +++++++++++++++++++++++---------
 2 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index 5423990..15496f6 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -44,6 +44,22 @@ car ──live telemetry───▶ car.k8s.stinnesbeck.com (Go) ──▶ ABRP
 - [ ] Check Grafana's host in `k8s/ingress.yaml` (placeholder `car-grafana.k8s.stinnesbeck.com`).
 - [ ] First pairing and drive with 2.4.0: telemetry arrives in InfluxDB, Grafana and ABRP.
 
+### Signals the car does not provide
+
+Checked 2026-10-17 against what actually reached InfluxDB (`schema.measurementFieldKeys`). The car
+sends soc, est_battery_range, odometer, power, voltage, current, speed, hvac_setpoint, the four
+tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does **not** send:
+
+- **Battery temperature:** read from `EV_BATTERY_AVERAGE_TEMPERATURE`, an Android 14 property; the
+  head unit runs Android 9, and the SAIC services offer none.
+- **Cabin temperature:** `HVAC_TEMPERATURE_CURRENT` is not published; only the setpoint is.
+- **Outside temperature:** not published by the vehicle (upstream noted the same). Upstream used
+  the head unit's weather service as a stand-in (`HeadUnitWeather`, removed in `ea8032a`);
+  restoring it was considered and declined.
+- **Pack energy (`soe`) and capacity:** not published. The Live dashboard computes energy in pack
+  as SOC × usable capacity, from the hidden dashboard constant `usableKwh` (50.8 kWh for the
+  51 kWh battery) in `k8s/grafana/dashboards/live.json`.
+
 ## To do
 
 - [ ] **About dialog link and QR code → https://git.stinnesbeck.com/nils/mg4.**
@@ -98,6 +114,9 @@ car ──live telemetry───▶ car.k8s.stinnesbeck.com (Go) ──▶ ABRP
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-17 — Live dashboard reworked around the signals the car sends: Climate setpoint, Last
+  update and a computed Energy in pack replace the empty temperature tiles; Battery voltage and
+  current replaces the Temperatures chart.
 - 2026-10-17 — Temporary on-screen diagnostics (b2a5b32) to debug blank values without adb;
   removed again (1002962) once values showed on the car. Revert 1002962 to bring them back.
 
diff --git a/k8s/grafana/dashboards/live.json b/k8s/grafana/dashboards/live.json
index 5046df4..73605d9 100644
--- a/k8s/grafana/dashboards/live.json
+++ b/k8s/grafana/dashboards/live.json
@@ -33,6 +33,14 @@
         "current": {},
         "hide": 0,
         "sort": 1
+      },
+      {
+        "name": "usableKwh",
+        "label": "Usable battery capacity (kWh)",
+        "type": "constant",
+        "query": "50.8",
+        "hide": 2,
+        "description": "MG4 51 kWh battery: 50.8 kWh usable."
       }
     ]
   },
@@ -187,7 +195,7 @@
     {
       "id": 4,
       "type": "stat",
-      "title": "Battery temperature",
+      "title": "Climate setpoint",
       "datasource": {
         "type": "influxdb",
         "uid": "mg4-influxdb"
@@ -205,7 +213,7 @@
             "type": "influxdb",
             "uid": "mg4-influxdb"
           },
-          "query": "from(bucket: \"mg4\")\n  |> range(start: -30d)\n  |> filter(fn: (r) => r._measurement == \"telemetry\" and r.installationId == \"${installationId}\" and r._field == \"batt_temp\")\n  |> last()"
+          "query": "from(bucket: \"mg4\")\n  |> range(start: -30d)\n  |> filter(fn: (r) => r._measurement == \"telemetry\" and r.installationId == \"${installationId}\" and r._field == \"hvac_setpoint\")\n  |> last()"
         }
       ],
       "fieldConfig": {
@@ -235,7 +243,7 @@
     {
       "id": 5,
       "type": "stat",
-      "title": "Outside temperature",
+      "title": "Last update",
       "datasource": {
         "type": "influxdb",
         "uid": "mg4-influxdb"
@@ -253,17 +261,16 @@
             "type": "influxdb",
             "uid": "mg4-influxdb"
           },
-          "query": "from(bucket: \"mg4\")\n  |> range(start: -30d)\n  |> filter(fn: (r) => r._measurement == \"telemetry\" and r.installationId == \"${installationId}\" and r._field == \"ext_temp\")\n  |> last()"
+          "query": "from(bucket: \"mg4\")\n  |> range(start: -30d)\n  |> filter(fn: (r) => r._measurement == \"telemetry\" and r.installationId == \"${installationId}\" and r._field == \"soc\")\n  |> last()\n  |> map(fn: (r) => ({_value: int(v: r._time) / 1000000}))"
         }
       ],
       "fieldConfig": {
         "defaults": {
-          "unit": "celsius",
+          "unit": "dateTimeFromNow",
           "color": {
             "mode": "fixed",
             "fixedColor": "#E0424C"
-          },
-          "decimals": 0
+          }
         },
         "overrides": []
       },
@@ -278,7 +285,8 @@
         "colorMode": "value",
         "graphMode": "none",
         "textMode": "value"
-      }
+      },
+      "description": "When the car last reported."
     },
     {
       "id": 6,
@@ -301,7 +309,7 @@
             "type": "influxdb",
             "uid": "mg4-influxdb"
           },
-          "query": "from(bucket: \"mg4\")\n  |> range(start: -30d)\n  |> filter(fn: (r) => r._measurement == \"telemetry\" and r.installationId == \"${installationId}\" and r._field == \"soe\")\n  |> last()"
+          "query": "from(bucket: \"mg4\")\n  |> range(start: -30d)\n  |> filter(fn: (r) => r._measurement == \"telemetry\" and r.installationId == \"${installationId}\" and r._field == \"soc\")\n  |> last()\n  |> map(fn: (r) => ({_value: r._value / 100.0 * float(v: \"${usableKwh}\")}))"
         }
       ],
       "fieldConfig": {
@@ -326,7 +334,8 @@
         "colorMode": "value",
         "graphMode": "none",
         "textMode": "value"
-      }
+      },
+      "description": "Computed: state of charge × usable capacity (dashboard constant usableKwh, 50.8 kWh for the 51 kWh battery). The car publishes no pack energy itself."
     },
     {
       "id": 7,
@@ -527,7 +536,7 @@
     {
       "id": 10,
       "type": "timeseries",
-      "title": "Temperatures",
+      "title": "Battery voltage and current",
       "datasource": {
         "type": "influxdb",
         "uid": "mg4-influxdb"
@@ -545,12 +554,12 @@
             "type": "influxdb",
             "uid": "mg4-influxdb"
           },
-          "query": "from(bucket: \"mg4\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r._measurement == \"telemetry\" and r.installationId == \"${installationId}\" and (r._field == \"batt_temp\" or r._field == \"cabin_temp\" or r._field == \"ext_temp\" or r._field == \"hvac_setpoint\"))\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n  |> keep(columns: [\"_time\", \"_field\", \"_value\"])"
+          "query": "from(bucket: \"mg4\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r._measurement == \"telemetry\" and r.installationId == \"${installationId}\" and (r._field == \"voltage\" or r._field == \"current\"))\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n  |> keep(columns: [\"_time\", \"_field\", \"_value\"])"
         }
       ],
       "fieldConfig": {
         "defaults": {
-          "unit": "celsius",
+          "unit": "volt",
           "custom": {
             "lineWidth": 2,
             "fillOpacity": 8,
@@ -558,7 +567,24 @@
             "showPoints": "never"
           }
         },
-        "overrides": []
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byRegexp",
+              "options": ".*current.*"
+            },
+            "properties": [
+              {
+                "id": "unit",
+                "value": "amp"
+              },
+              {
+                "id": "custom.axisPlacement",
+                "value": "right"
+              }
+            ]
+          }
+        ]
       },
       "options": {
         "legend": {
@@ -568,7 +594,8 @@
         "tooltip": {
           "mode": "multi"
         }
-      }
+      },
+      "description": "Traction battery. Current is negative while charging or regenerating."
     },
     {
       "id": 11,

From c5d61d1d116d9a3d6003b6df4d5f5acc179a5264 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 22:25:35 +0200
Subject: [PATCH 34/79] Grafana: line charts in MG red

The tiles, bar charts and route map were already MG red; the line
charts still used Grafana's default palette. Now the first line of a
pair is MG red (#E0424C) and the second light red (#FF9A9E), as in
the app; the tyre chart adds deep (#A8323A) and pale (#FFD0D2) red.
Covers SoC/range, power/speed, voltage/current, tyre pressures and the
charging curve. Checked by rendering the Live and Charging dashboards.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 k8s/grafana/dashboards/charging.json |  30 ++++++
 k8s/grafana/dashboards/live.json     | 153 ++++++++++++++++++++++++++-
 2 files changed, 182 insertions(+), 1 deletion(-)

diff --git a/k8s/grafana/dashboards/charging.json b/k8s/grafana/dashboards/charging.json
index 9550abd..30590d1 100644
--- a/k8s/grafana/dashboards/charging.json
+++ b/k8s/grafana/dashboards/charging.json
@@ -499,6 +499,36 @@
                 "value": "right"
               }
             ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "powerKw"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "mode": "fixed",
+                  "fixedColor": "#E0424C"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "socPercent"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "mode": "fixed",
+                  "fixedColor": "#FF9A9E"
+                }
+              }
+            ]
           }
         ]
       },
diff --git a/k8s/grafana/dashboards/live.json b/k8s/grafana/dashboards/live.json
index 73605d9..3a93f6d 100644
--- a/k8s/grafana/dashboards/live.json
+++ b/k8s/grafana/dashboards/live.json
@@ -387,6 +387,36 @@
                 "value": "right"
               }
             ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "soc"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "mode": "fixed",
+                  "fixedColor": "#E0424C"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "est_battery_range"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "mode": "fixed",
+                  "fixedColor": "#FF9A9E"
+                }
+              }
+            ]
           }
         ]
       },
@@ -450,6 +480,36 @@
                 "value": "right"
               }
             ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "power"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "mode": "fixed",
+                  "fixedColor": "#E0424C"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "speed"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "mode": "fixed",
+                  "fixedColor": "#FF9A9E"
+                }
+              }
+            ]
           }
         ]
       },
@@ -583,6 +643,36 @@
                 "value": "right"
               }
             ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "voltage"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "mode": "fixed",
+                  "fixedColor": "#E0424C"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "current"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "mode": "fixed",
+                  "fixedColor": "#FF9A9E"
+                }
+              }
+            ]
           }
         ]
       },
@@ -631,7 +721,68 @@
             "showPoints": "never"
           }
         },
-        "overrides": []
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "tire_pressure_fl"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "mode": "fixed",
+                  "fixedColor": "#E0424C"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "tire_pressure_fr"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "mode": "fixed",
+                  "fixedColor": "#FF9A9E"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "tire_pressure_rl"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "mode": "fixed",
+                  "fixedColor": "#A8323A"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "tire_pressure_rr"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "mode": "fixed",
+                  "fixedColor": "#FFD0D2"
+                }
+              }
+            ]
+          }
+        ]
       },
       "options": {
         "legend": {

From 5f6cf1e901a352aeb62fd81fccc7640517a31b9c Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 22:27:37 +0200
Subject: [PATCH 35/79] Revert "Grafana: line charts in MG red"

Back to Grafana's default palette for the line charts, as before.
This reverts commit c5d61d1.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 k8s/grafana/dashboards/charging.json |  30 ------
 k8s/grafana/dashboards/live.json     | 153 +--------------------------
 2 files changed, 1 insertion(+), 182 deletions(-)

diff --git a/k8s/grafana/dashboards/charging.json b/k8s/grafana/dashboards/charging.json
index 30590d1..9550abd 100644
--- a/k8s/grafana/dashboards/charging.json
+++ b/k8s/grafana/dashboards/charging.json
@@ -499,36 +499,6 @@
                 "value": "right"
               }
             ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "powerKw"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "mode": "fixed",
-                  "fixedColor": "#E0424C"
-                }
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "socPercent"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "mode": "fixed",
-                  "fixedColor": "#FF9A9E"
-                }
-              }
-            ]
           }
         ]
       },
diff --git a/k8s/grafana/dashboards/live.json b/k8s/grafana/dashboards/live.json
index 3a93f6d..73605d9 100644
--- a/k8s/grafana/dashboards/live.json
+++ b/k8s/grafana/dashboards/live.json
@@ -387,36 +387,6 @@
                 "value": "right"
               }
             ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "soc"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "mode": "fixed",
-                  "fixedColor": "#E0424C"
-                }
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "est_battery_range"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "mode": "fixed",
-                  "fixedColor": "#FF9A9E"
-                }
-              }
-            ]
           }
         ]
       },
@@ -480,36 +450,6 @@
                 "value": "right"
               }
             ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "power"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "mode": "fixed",
-                  "fixedColor": "#E0424C"
-                }
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "speed"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "mode": "fixed",
-                  "fixedColor": "#FF9A9E"
-                }
-              }
-            ]
           }
         ]
       },
@@ -643,36 +583,6 @@
                 "value": "right"
               }
             ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "voltage"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "mode": "fixed",
-                  "fixedColor": "#E0424C"
-                }
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "current"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "mode": "fixed",
-                  "fixedColor": "#FF9A9E"
-                }
-              }
-            ]
           }
         ]
       },
@@ -721,68 +631,7 @@
             "showPoints": "never"
           }
         },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "tire_pressure_fl"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "mode": "fixed",
-                  "fixedColor": "#E0424C"
-                }
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "tire_pressure_fr"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "mode": "fixed",
-                  "fixedColor": "#FF9A9E"
-                }
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "tire_pressure_rl"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "mode": "fixed",
-                  "fixedColor": "#A8323A"
-                }
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "tire_pressure_rr"
-            },
-            "properties": [
-              {
-                "id": "color",
-                "value": {
-                  "mode": "fixed",
-                  "fixedColor": "#FFD0D2"
-                }
-              }
-            ]
-          }
-        ]
+        "overrides": []
       },
       "options": {
         "legend": {

From a53ea589b2db3e038692b44f8f102805e6c1a4fa Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 22:33:10 +0200
Subject: [PATCH 36/79] App 2.5.0: range estimates from current and 5-minute
 average power
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Vehicle tab gets two tiles next to the car's own range:

- Range at current power: remaining energy / (power / speed) right now.
- Range at 5-min average: remaining energy / (energy used / distance
  driven) over the last 5 minutes, integrated time-weighted from both
  the service tick (15 s) and the open screen (2 s), so it is ready as
  soon as the app opens.

Each shows the consumption it is based on (kWh/100 km). Remaining
energy is SOC x usable capacity, because the car publishes no pack
energy; the capacity is a new setting in the Consumption tab (default
50.8 kWh, the 51 kWh battery). Estimates read "—" with the reason when
they cannot mean anything: standing still, regenerating, too little
driving, or across a gap in the samples; over 999 km shows "> 999 km".

RangeEstimator is Android-free and has 7 tests. Also fixes the battery
card's note, which still said the SoH goes to MongoDB.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 app/build.gradle                              |   4 +-
 .../com/evsuite/abrp/AbrpUploadService.java   |   2 +
 .../java/com/evsuite/abrp/MainActivity.java   |  61 +++++++++-
 .../java/com/evsuite/abrp/RangeEstimator.java | 107 ++++++++++++++++++
 .../main/res/layout-w1000dp/pane_vehicle.xml  |  13 +++
 app/src/main/res/layout/pane_consumption.xml  |   7 +-
 app/src/main/res/layout/pane_vehicle.xml      |  10 ++
 app/src/main/res/values/strings.xml           |  11 ++
 .../com/evsuite/abrp/RangeEstimatorTest.java  |  85 ++++++++++++++
 9 files changed, 296 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/com/evsuite/abrp/RangeEstimator.java
 create mode 100644 app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java

diff --git a/app/build.gradle b/app/build.gradle
index 09ee60c..a04f404 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 61
-        versionName "2.4.3"
+        versionCode 62
+        versionName "2.5.0"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
index 74e1a33..dac4284 100644
--- a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
+++ b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
@@ -155,6 +155,8 @@ public class AbrpUploadService extends Service {
     private void doUpload() {
         long sampleMs = System.currentTimeMillis();
         EnergySnapshot vehicle = energyReader.read(sampleMs);
+        // Keeps the 5-minute range average going while the app is in the background.
+        RangeEstimator.shared().add(sampleMs, vehicle.getBatteryPowerKw(), vehicle.getSpeedKmh());
         consumptionTracker.sample(vehicle);
         chargeSessionTracker.sample(vehicle);
         consumptionCloudClient.syncIfDue(consumptionTracker, chargeSessionTracker, sampleMs);
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index fb7d9d6..57b4aa1 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -89,7 +89,13 @@ public class MainActivity extends AppCompatActivity {
     private EnergyTelemetryReader vehicleReader;
     private TextView vehSoc, vehRange, vehPower, vehSpeed, vehOdometer,
             vehCharging, vehHvac,
-            vehTireFl, vehTireFr, vehTireRl, vehTireRr;
+            vehTireFl, vehTireFr, vehTireRl, vehTireRr,
+            vehRangePower, vehRangePowerNote, vehRangeAverage, vehRangeAverageNote;
+
+    /** Usable pack capacity for the range estimates; the car does not publish it. */
+    static final String USABLE_KWH_KEY = "usable_kwh";
+    private TextInputLayout usableCapacityLayout;
+    private TextInputEditText usableCapacityInput;
     private ConsumptionTracker consumptionTracker;
     private ConsumptionCloudClient consumptionCloudClient;
     private ConsumptionTracker.Period consumptionPeriod = ConsumptionTracker.Period.LIFETIME;
@@ -921,6 +927,41 @@ public class MainActivity extends AppCompatActivity {
         vehTireFr    = vehiclePane.findViewById(R.id.vehicle_tire_fr);
         vehTireRl    = vehiclePane.findViewById(R.id.vehicle_tire_rl);
         vehTireRr    = vehiclePane.findViewById(R.id.vehicle_tire_rr);
+        vehRangePower       = vehiclePane.findViewById(R.id.vehicle_range_power);
+        vehRangePowerNote   = vehiclePane.findViewById(R.id.vehicle_range_power_note);
+        vehRangeAverage     = vehiclePane.findViewById(R.id.vehicle_range_average);
+        vehRangeAverageNote = vehiclePane.findViewById(R.id.vehicle_range_average_note);
+    }
+
+    private double usableKwh() {
+        return prefs.getFloat(USABLE_KWH_KEY, (float) RangeEstimator.DEFAULT_USABLE_KWH);
+    }
+
+    /**
+     * The two range estimates. Both need the car to be moving on battery power; the average
+     * also needs a minute or more of driving, which the service has usually collected already.
+     */
+    private void refreshRangeEstimates(EnergySnapshot s, long nowMs) {
+        RangeEstimator estimator = RangeEstimator.shared();
+        estimator.add(nowMs, s.getBatteryPowerKw(), s.getSpeedKmh());
+        Double remaining = RangeEstimator.remainingKwh(s.getSocPercent(), usableKwh());
+        showEstimate(vehRangePower, vehRangePowerNote,
+                RangeEstimator.instant(remaining, s.getBatteryPowerKw(), s.getSpeedKmh()),
+                R.string.range_not_driving);
+        showEstimate(vehRangeAverage, vehRangeAverageNote,
+                estimator.average(remaining, nowMs), R.string.range_waiting);
+    }
+
+    private void showEstimate(TextView value, TextView note, RangeEstimator.Estimate e, int whyNot) {
+        if (e == null) {
+            value.setText("—");
+            note.setText(whyNot);
+            return;
+        }
+        // Coasting at speed costs almost nothing, which would read as thousands of km.
+        value.setText(e.rangeKm > 999 ? getString(R.string.range_over, 999)
+                : String.format(java.util.Locale.US, "%.0f km", e.rangeKm));
+        note.setText(getString(R.string.range_consumption, e.kwhPer100Km));
     }
 
     /**
@@ -948,6 +989,7 @@ public class MainActivity extends AppCompatActivity {
             vehHvac.setText(fmt(s.getClimate().getDriverTargetCelsius(), "%.0f °C"));
 
             vehCharging.setText(chargingLabel(s));
+            refreshRangeEstimates(s, System.currentTimeMillis());
 
             vehTireFl.setText(fmt(s.getTirePressures().getFrontLeftKpa(), "%.0f kPa"));
             vehTireFr.setText(fmt(s.getTirePressures().getFrontRightKpa(), "%.0f kPa"));
@@ -979,6 +1021,10 @@ public class MainActivity extends AppCompatActivity {
         if (savedSoh != null) consumptionSohInput.setText(String.format(
                 java.util.Locale.US, "%.1f", savedSoh));
         consumptionPane.findViewById(R.id.consumption_soh_save).setOnClickListener(v -> saveSoh());
+        usableCapacityLayout = consumptionPane.findViewById(R.id.usable_capacity_layout);
+        usableCapacityInput = consumptionPane.findViewById(R.id.usable_capacity_input);
+        usableCapacityInput.setText(String.format(java.util.Locale.US, "%.1f", usableKwh()));
+        consumptionPane.findViewById(R.id.usable_capacity_save).setOnClickListener(v -> saveUsableCapacity());
         bindPeriodButton(R.id.consumption_lifetime, ConsumptionTracker.Period.LIFETIME);
         bindPeriodButton(R.id.consumption_week, ConsumptionTracker.Period.WEEK);
         bindPeriodButton(R.id.consumption_month, ConsumptionTracker.Period.MONTH);
@@ -998,6 +1044,19 @@ public class MainActivity extends AppCompatActivity {
         });
     }
 
+    private void saveUsableCapacity() {
+        try {
+            float value = Float.parseFloat(textOf(usableCapacityInput).replace(',', '.'));
+            if (!(value >= 10f && value <= 150f)) throw new NumberFormatException();
+            prefs.edit().putFloat(USABLE_KWH_KEY, value).apply();
+            usableCapacityLayout.setError(null);
+            usableCapacityInput.setText(String.format(java.util.Locale.US, "%.1f", value));
+            Toast.makeText(this, R.string.usable_capacity_saved, Toast.LENGTH_SHORT).show();
+        } catch (NumberFormatException e) {
+            usableCapacityLayout.setError(getString(R.string.usable_capacity_invalid));
+        }
+    }
+
     private void saveSoh() {
         String raw = textOf(consumptionSohInput).replace(',', '.');
         try {
diff --git a/app/src/main/java/com/evsuite/abrp/RangeEstimator.java b/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
new file mode 100644
index 0000000..120db9a
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
@@ -0,0 +1,107 @@
+package com.evsuite.abrp;
+
+import java.util.ArrayDeque;
+import java.util.Iterator;
+
+/**
+ * Estimated range from the energy left in the pack and how fast it is being used.
+ *
+ *   instant:   remaining kWh / (power now / speed now)
+ *   average:   remaining kWh / (energy used / distance driven over the last 5 minutes)
+ *
+ * Remaining energy is SOC x usable capacity: the car publishes no pack energy, so the capacity
+ * is a setting. Every estimate is null when it cannot mean anything — standing still,
+ * regenerating, too little data — rather than a misleading number.
+ *
+ * Fed by both the service tick (15 s) and the open Vehicle page (2 s); the integration is
+ * time-weighted, so the two rates mix correctly. Free of Android types, unit-tested.
+ */
+final class RangeEstimator {
+
+    static final long WINDOW_MS = 5 * 60_000L;
+    /** Less than this much driving in the window is too little to average. */
+    static final long MIN_WINDOW_MS = 60_000L;
+    static final double MIN_DISTANCE_KM = 0.2;
+    /** Below this the car is not really moving, and power / speed blows up. */
+    static final double MIN_SPEED_KMH = 5;
+    /** A gap between samples longer than this (app paused, car off) is not integrated. */
+    static final long MAX_GAP_MS = 60_000L;
+
+    static final double DEFAULT_USABLE_KWH = 50.8; // MG4 51 kWh battery
+
+    private static final RangeEstimator SHARED = new RangeEstimator();
+
+    static RangeEstimator shared() { return SHARED; }
+
+    /** An estimate: the range and the consumption it is based on. */
+    static final class Estimate {
+        final double rangeKm;
+        final double kwhPer100Km;
+
+        Estimate(double rangeKm, double kwhPer100Km) {
+            this.rangeKm = rangeKm;
+            this.kwhPer100Km = kwhPer100Km;
+        }
+    }
+
+    private static final class Sample {
+        final long timeMs;
+        final double powerKw;
+        final double speedKmh;
+
+        Sample(long timeMs, double powerKw, double speedKmh) {
+            this.timeMs = timeMs;
+            this.powerKw = powerKw;
+            this.speedKmh = speedKmh;
+        }
+    }
+
+    private final ArrayDeque<Sample> samples = new ArrayDeque<>();
+
+    /** Power in kW, positive leaving the battery; speed in km/h. Unread values are skipped. */
+    synchronized void add(long timeMs, Float powerKw, Float speedKmh) {
+        if (powerKw == null || speedKmh == null || !Float.isFinite(powerKw) || !Float.isFinite(speedKmh)) return;
+        Sample last = samples.peekLast();
+        if (last != null && timeMs <= last.timeMs) return; // out of order or duplicate tick
+        samples.addLast(new Sample(timeMs, powerKw, Math.max(0f, speedKmh)));
+        while (!samples.isEmpty() && samples.peekFirst().timeMs < timeMs - WINDOW_MS) samples.removeFirst();
+    }
+
+    static Double remainingKwh(Float socPercent, double usableKwh) {
+        if (socPercent == null || !Float.isFinite(socPercent) || usableKwh <= 0) return null;
+        return Math.max(0, Math.min(100, socPercent)) / 100.0 * usableKwh;
+    }
+
+    static Estimate instant(Double remainingKwh, Float powerKw, Float speedKmh) {
+        if (remainingKwh == null || powerKw == null || speedKmh == null) return null;
+        if (speedKmh < MIN_SPEED_KMH || powerKw <= 0) return null;
+        double kwhPerKm = powerKw.doubleValue() / speedKmh.doubleValue();
+        return new Estimate(remainingKwh / kwhPerKm, kwhPerKm * 100);
+    }
+
+    synchronized Estimate average(Double remainingKwh, long nowMs) {
+        if (remainingKwh == null) return null;
+        double energyKwh = 0, distanceKm = 0;
+        long covered = 0;
+        Sample previous = null;
+        for (Iterator<Sample> it = samples.iterator(); it.hasNext(); ) {
+            Sample s = it.next();
+            if (s.timeMs < nowMs - WINDOW_MS) continue;
+            if (previous != null) {
+                long dt = s.timeMs - previous.timeMs;
+                if (dt > 0 && dt <= MAX_GAP_MS) {
+                    double hours = dt / 3_600_000.0;
+                    energyKwh += (previous.powerKw + s.powerKw) / 2 * hours;
+                    distanceKm += (previous.speedKmh + s.speedKmh) / 2 * hours;
+                    covered += dt;
+                }
+            }
+            previous = s;
+        }
+        if (covered < MIN_WINDOW_MS || distanceKm < MIN_DISTANCE_KM || energyKwh <= 0) return null;
+        double kwhPerKm = energyKwh / distanceKm;
+        return new Estimate(remainingKwh / kwhPerKm, kwhPerKm * 100);
+    }
+
+    synchronized void clear() { samples.clear(); }
+}
diff --git a/app/src/main/res/layout-w1000dp/pane_vehicle.xml b/app/src/main/res/layout-w1000dp/pane_vehicle.xml
index 676aa76..ff3cb6b 100644
--- a/app/src/main/res/layout-w1000dp/pane_vehicle.xml
+++ b/app/src/main/res/layout-w1000dp/pane_vehicle.xml
@@ -57,5 +57,18 @@
                 <TextView android:id="@+id/vehicle_speed" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
             </LinearLayout>
         </LinearLayout>
+        <Space android:layout_width="1dp" android:layout_height="10dp" />
+        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:baselineAligned="false">
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_power" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_range_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range_power_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_average" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_range_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
+        </LinearLayout>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/pane_consumption.xml b/app/src/main/res/layout/pane_consumption.xml
index da37318..1222f28 100644
--- a/app/src/main/res/layout/pane_consumption.xml
+++ b/app/src/main/res/layout/pane_consumption.xml
@@ -32,7 +32,12 @@
         <com.google.android.material.textfield.TextInputEditText android:id="@+id/consumption_soh_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="5" android:minHeight="72dp"/>
       </com.google.android.material.textfield.TextInputLayout>
       <com.google.android.material.button.MaterialButton android:id="@+id/consumption_soh_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="Save SoH value"/>
-      <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="This manual value is stored on the device and added to the lifetime record in MongoDB." android:textAppearance="@style/Text.EV.Secondary"/>
+      <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="This manual value is stored on the device and sent to your server with the daily totals." android:textAppearance="@style/Text.EV.Secondary"/>
+      <com.google.android.material.textfield.TextInputLayout android:id="@+id/usable_capacity_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:hint="@string/hint_usable_capacity" app:suffixText="kWh">
+        <com.google.android.material.textfield.TextInputEditText android:id="@+id/usable_capacity_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="5" android:minHeight="72dp"/>
+      </com.google.android.material.textfield.TextInputLayout>
+      <com.google.android.material.button.MaterialButton android:id="@+id/usable_capacity_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="@string/btn_save_capacity"/>
+      <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/helper_usable_capacity" android:textAppearance="@style/Text.EV.Secondary"/>
     </LinearLayout>
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:layout_marginTop="16dp" android:background="@drawable/bg_glass">
       <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="DAILY LOG · LAST 4 MONTHS" android:textAppearance="@style/Text.EV.Eyebrow"/>
diff --git a/app/src/main/res/layout/pane_vehicle.xml b/app/src/main/res/layout/pane_vehicle.xml
index f4cc6c7..6ce8956 100644
--- a/app/src/main/res/layout/pane_vehicle.xml
+++ b/app/src/main/res/layout/pane_vehicle.xml
@@ -54,6 +54,16 @@
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_speed" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_speed" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
             </LinearLayout>
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_power" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_range_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range_power_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_average" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_range_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
         </GridLayout>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b92d940..b99000d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,6 +31,17 @@
     <string name="vehicle_row_soc">Charge (SOC)</string>
     <string name="vehicle_row_range">Range</string>
     <string name="vehicle_row_power">Power</string>
+    <string name="vehicle_row_range_power">Range at current power</string>
+    <string name="vehicle_row_range_average">Range at 5-min average</string>
+    <string name="range_consumption">%1$.1f kWh/100 km</string>
+    <string name="range_over">&gt; %1$d km</string>
+    <string name="range_waiting">needs a few minutes of driving</string>
+    <string name="range_not_driving">only while driving</string>
+    <string name="hint_usable_capacity">Usable battery capacity</string>
+    <string name="btn_save_capacity">Save capacity</string>
+    <string name="helper_usable_capacity">Used for the range estimates on the Vehicle tab. The 51 kWh MG4 battery has 50.8 kWh usable, the 64 kWh one 61.7, the 77 kWh one 74.4.</string>
+    <string name="usable_capacity_saved">Usable capacity saved</string>
+    <string name="usable_capacity_invalid">Enter a value between 10 and 150 kWh</string>
     <string name="vehicle_row_speed">Speed</string>
     <string name="vehicle_row_odometer">Odometer</string>
     <string name="vehicle_row_batt_temp">Battery Temperature</string>
diff --git a/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java b/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java
new file mode 100644
index 0000000..6b73e59
--- /dev/null
+++ b/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java
@@ -0,0 +1,85 @@
+package com.evsuite.abrp;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Test;
+
+/** Range estimates from power and speed — pure JVM. */
+public class RangeEstimatorTest {
+
+    private static final double USABLE = 50.8;
+
+    @Test
+    public void remainingEnergyIsSocTimesUsableCapacity() {
+        assertEquals(25.4, RangeEstimator.remainingKwh(50f, USABLE), 1e-9);
+        assertEquals(50.8, RangeEstimator.remainingKwh(120f, USABLE), 1e-9); // clamped
+        assertNull(RangeEstimator.remainingKwh(null, USABLE));
+    }
+
+    @Test
+    public void instantRangeFromPowerAndSpeed() {
+        // 15 kW at 100 km/h = 15 kWh/100 km; 25.4 kWh left = 169.3 km.
+        RangeEstimator.Estimate e = RangeEstimator.instant(25.4, 15f, 100f);
+        assertNotNull(e);
+        assertEquals(15.0, e.kwhPer100Km, 1e-9);
+        assertEquals(169.333, e.rangeKm, 0.001);
+    }
+
+    @Test
+    public void noInstantEstimateWhenStandingRegeneratingOrUnread() {
+        assertNull(RangeEstimator.instant(25.4, 2f, 3f));     // not really moving
+        assertNull(RangeEstimator.instant(25.4, -10f, 60f));  // regenerating
+        assertNull(RangeEstimator.instant(25.4, null, 60f));  // power unread
+        assertNull(RangeEstimator.instant(null, 15f, 60f));   // SOC unread
+    }
+
+    @Test
+    public void averageIntegratesEnergyOverDistance() {
+        RangeEstimator r = new RangeEstimator();
+        // 4 minutes at a steady 20 kW and 100 km/h, sampled every 2 s: 20 kWh/100 km.
+        for (long t = 0; t <= 240_000; t += 2_000) r.add(t, 20f, 100f);
+        RangeEstimator.Estimate e = r.average(25.4, 240_000);
+        assertNotNull(e);
+        assertEquals(20.0, e.kwhPer100Km, 1e-6);
+        assertEquals(127.0, e.rangeKm, 1e-6);
+    }
+
+    @Test
+    public void averageMixesTheServiceAndScreenRates() {
+        RangeEstimator r = new RangeEstimator();
+        // A slow 15 s service tick for two minutes, then the 2 s screen tick: still 20 kWh/100 km.
+        for (long t = 0; t < 120_000; t += 15_000) r.add(t, 20f, 100f);
+        for (long t = 120_000; t <= 240_000; t += 2_000) r.add(t, 20f, 100f);
+        assertEquals(20.0, r.average(25.4, 240_000).kwhPer100Km, 1e-6);
+    }
+
+    @Test
+    public void averageOnlyCoversTheLastFiveMinutes() {
+        RangeEstimator r = new RangeEstimator();
+        for (long t = 0; t <= 300_000; t += 2_000) r.add(t, 40f, 100f);        // thirsty start
+        for (long t = 302_000; t <= 900_000; t += 2_000) r.add(t, 10f, 100f);  // then economical
+        assertEquals(10.0, r.average(25.4, 900_000).kwhPer100Km, 1e-6);
+    }
+
+    @Test
+    public void noAverageWithTooLittleDataOrDistanceOrAcrossAGap() {
+        RangeEstimator r = new RangeEstimator();
+        for (long t = 0; t <= 30_000; t += 2_000) r.add(t, 20f, 100f);
+        assertNull("30 s is too little", r.average(25.4, 30_000));
+
+        RangeEstimator parked = new RangeEstimator();
+        for (long t = 0; t <= 240_000; t += 2_000) parked.add(t, 1f, 0f);
+        assertNull("no distance", parked.average(25.4, 240_000));
+
+        RangeEstimator gap = new RangeEstimator();
+        gap.add(0, 20f, 100f);
+        gap.add(200_000, 20f, 100f); // the app was closed in between
+        assertNull("a gap is not integrated", gap.average(25.4, 200_000));
+
+        RangeEstimator downhill = new RangeEstimator();
+        for (long t = 0; t <= 240_000; t += 2_000) downhill.add(t, -5f, 80f);
+        assertNull("net regeneration", downhill.average(25.4, 240_000));
+    }
+}

From 11d53e7bc7ae23e4004104d1bffc1342e3e1679a Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 22:55:15 +0200
Subject: [PATCH 37/79] App 2.6.0: floating button to open the app

The MG4's launcher does not list third-party apps, so the app could
only be opened by reinstalling it. Now a small round MG-red button
floats over the car's screens: tap opens the app, drag moves it (the
position is kept and clamped to the screen), and it hides while the
app itself is open. A switch in the Upload tab turns it off.

The always-on service owns the overlay, so the button is there from
boot. It needs the overlay permission (SYSTEM_ALERT_WINDOW), which the
car build has through the system UID; without it, or if the window
manager refuses, the button stays away and nothing crashes, and the
Upload tab offers the system permission screen.

Tested on an Android 9 AOSP emulator at the head unit's 1920x1080 /
160 dpi with the car APK (installs as UID 1000): button appears over
the home screen, tap opens the app, hidden while open, drag moves it
without opening the app, position survives a force-stop, the switch
works through the UI. FloatingButtonGeometry has 3 unit tests.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                      |   5 +
 app/build.gradle                              |   4 +-
 app/src/main/AndroidManifest.xml              |   2 +
 .../com/evsuite/abrp/AbrpUploadService.java   |   5 +
 .../java/com/evsuite/abrp/FloatingButton.java | 224 ++++++++++++++++++
 .../evsuite/abrp/FloatingButtonGeometry.java  |  31 +++
 .../java/com/evsuite/abrp/MainActivity.java   |  32 ++-
 .../java/com/evsuite/abrp/UploadSettings.java |   7 +
 .../main/res/layout-w1000dp/pane_service.xml  |   6 +
 app/src/main/res/layout/pane_service.xml      |   6 +
 app/src/main/res/values/strings.xml           |   6 +
 .../abrp/FloatingButtonGeometryTest.java      |  37 +++
 12 files changed, 362 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/com/evsuite/abrp/FloatingButton.java
 create mode 100644 app/src/main/java/com/evsuite/abrp/FloatingButtonGeometry.java
 create mode 100644 app/src/test/java/com/evsuite/abrp/FloatingButtonGeometryTest.java

diff --git a/SPECS.md b/SPECS.md
index 15496f6..f1bd1f5 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -114,6 +114,11 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-17 — App 2.6.0: floating button to open the app, because the MG4 launcher does not list
+  it. Drawn over other apps (needs the overlay permission, which the car build has through the
+  system UID), draggable, hidden while the app is open, switch in the Upload tab. Tested on an
+  Android 9 AOSP emulator at 1920x1080/160 dpi with the car APK (installs as UID 1000 there too).
+- 2026-10-17 — App 2.5.0: range estimates at current and 5-minute average power (Vehicle tab).
 - 2026-10-17 — Live dashboard reworked around the signals the car sends: Climate setpoint, Last
   update and a computed Energy in pack replace the empty temperature tiles; Battery voltage and
   current replaces the Temperatures chart.
diff --git a/app/build.gradle b/app/build.gradle
index a04f404..0b35644 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 62
-        versionName "2.5.0"
+        versionCode 63
+        versionName "2.6.0"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 36b8413..191f880 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,6 +13,8 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+    <!-- The floating button that opens the app; the head unit's launcher does not list it. -->
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <!-- Wi-Fi auto-join. CHANGE_WIFI_STATE covers enabling the radio and asking the
          supplicant to join a network the unit already has saved; ACCESS_WIFI_STATE covers
diff --git a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
index dac4284..655ea9d 100644
--- a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
+++ b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
@@ -67,6 +67,7 @@ public class AbrpUploadService extends Service {
     private ConsumptionCloudClient consumptionCloudClient;
     private ChargeSessionTracker chargeSessionTracker;
     private TelemetryUploader telemetryUploader;
+    private FloatingButton floatingButton;
     private WifiAutoConnect wifi;
     private ScheduledExecutorService scheduler;
     private SharedPreferences prefs;
@@ -98,6 +99,9 @@ public class AbrpUploadService extends Service {
         chargeSessionTracker = ChargeSessionTracker.get(getApplicationContext());
         wifi = new WifiAutoConnect(getApplicationContext());
         telemetryUploader = new TelemetryUploader(getApplicationContext());
+        // onCreate runs on the main thread, where the overlay window must be added.
+        floatingButton = new FloatingButton(this, prefs);
+        FloatingButton.attach(floatingButton);
 
         scheduler.scheduleWithFixedDelay(
                 this::safeUploadCycle,
@@ -139,6 +143,7 @@ public class AbrpUploadService extends Service {
         prefs.edit().putBoolean("service_running", false).apply();
         if (scheduler != null) scheduler.shutdownNow();
         if (telemetryUploader != null) telemetryUploader.stop();
+        if (floatingButton != null) FloatingButton.detach(floatingButton);
         Log.i(TAG, "Service stopped");
     }
 
diff --git a/app/src/main/java/com/evsuite/abrp/FloatingButton.java b/app/src/main/java/com/evsuite/abrp/FloatingButton.java
new file mode 100644
index 0000000..9b6fc9f
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/FloatingButton.java
@@ -0,0 +1,224 @@
+package com.evsuite.abrp;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.PixelFormat;
+import android.graphics.drawable.GradientDrawable;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+
+/**
+ * A small round button floating over every app, so the app can be opened on a head unit whose
+ * launcher does not list it. Tap opens the app; drag moves the button, and the position is kept.
+ *
+ * Owned by the always-on {@link AbrpUploadService}, so it is there from boot. Hidden while the
+ * app itself is in front ({@link #setAppInForeground}) and when switched off in the Upload tab.
+ *
+ * Drawing over other apps needs the overlay permission, which the car build holds through the
+ * system UID. Without it — or if the window manager refuses — the button simply stays away:
+ * a third-party app must never crash the head unit (AGENTS.md).
+ *
+ * All methods run on the main thread.
+ */
+final class FloatingButton {
+
+    private static final String TAG = "NilsMG4.Floating";
+    static final String KEY_X = "floating_button_x";
+    static final String KEY_Y = "floating_button_y";
+    private static final int SIZE_DP = 64;
+    private static final int MARGIN_DP = 16;
+    private static final float GLYPH_SCALE = 1.45f;
+
+    private static final Handler MAIN = new Handler(Looper.getMainLooper());
+    private static FloatingButton current;
+    private static boolean appInForeground;
+
+    private final Context context;
+    private final SharedPreferences prefs;
+    private final WindowManager windowManager;
+    private View view;
+    private WindowManager.LayoutParams params;
+    private boolean added;
+
+    FloatingButton(Context context, SharedPreferences prefs) {
+        this.context = context.getApplicationContext();
+        this.prefs = prefs;
+        this.windowManager = (WindowManager) this.context.getSystemService(Context.WINDOW_SERVICE);
+    }
+
+    // ---------- Static hooks for the activity and the settings switch ----------
+
+    static void attach(FloatingButton button) {
+        current = button;
+        button.update();
+    }
+
+    static void detach(FloatingButton button) {
+        if (current == button) current = null;
+        button.removeView();
+    }
+
+    /** MainActivity's onResume/onPause: no button on top of the app itself. */
+    static void setAppInForeground(boolean inForeground) {
+        appInForeground = inForeground;
+        refresh();
+    }
+
+    /** Re-reads the switch and the permission; posted, so callable from anywhere. */
+    static void refresh() {
+        MAIN.post(() -> {
+            if (current != null) current.update();
+        });
+    }
+
+    static boolean canDraw(Context context) {
+        return Settings.canDrawOverlays(context);
+    }
+
+    // ---------- Showing and hiding ----------
+
+    void update() {
+        boolean wanted = UploadSettings.floatingButtonEnabled(prefs) && !appInForeground && canDraw(context);
+        if (wanted && !added) addView();
+        else if (!wanted && added) removeView();
+    }
+
+    private void addView() {
+        try {
+            if (view == null) view = createView();
+            DisplayMetrics metrics = new DisplayMetrics();
+            windowManager.getDefaultDisplay().getRealMetrics(metrics);
+            int size = dp(SIZE_DP);
+            int[] start = FloatingButtonGeometry.defaultPosition(
+                    metrics.widthPixels, metrics.heightPixels, size, dp(MARGIN_DP));
+            params = new WindowManager.LayoutParams(size, size,
+                    WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY,
+                    WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+                            | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
+                    PixelFormat.TRANSLUCENT);
+            params.gravity = Gravity.TOP | Gravity.START;
+            params.x = FloatingButtonGeometry.clamp(prefs.getInt(KEY_X, start[0]), size, metrics.widthPixels);
+            params.y = FloatingButtonGeometry.clamp(prefs.getInt(KEY_Y, start[1]), size, metrics.heightPixels);
+            windowManager.addView(view, params);
+            added = true;
+        } catch (RuntimeException e) {
+            // BadTokenException, SecurityException, or anything else the platform throws: no button.
+            Log.w(TAG, "Floating button not shown: " + e);
+            added = false;
+        }
+    }
+
+    void removeView() {
+        if (!added) return;
+        try {
+            windowManager.removeView(view);
+        } catch (RuntimeException e) {
+            Log.w(TAG, "Floating button not removed cleanly: " + e);
+        }
+        added = false;
+    }
+
+    private View createView() {
+        FrameLayout frame = new FrameLayout(context);
+        GradientDrawable circle = new GradientDrawable();
+        circle.setShape(GradientDrawable.OVAL);
+        circle.setColor(context.getColor(R.color.ev_accent));
+        circle.setStroke(dp(2), context.getColor(R.color.ev_text_primary));
+        frame.setBackground(circle);
+        frame.setAlpha(0.9f);
+        frame.setElevation(dp(6));
+        frame.setContentDescription(context.getString(R.string.floating_button_description));
+        ImageView glyph = new ImageView(context);
+        glyph.setImageResource(R.drawable.ic_launcher_monochrome);
+        glyph.setScaleType(ImageView.ScaleType.FIT_CENTER);
+        // The launcher glyph keeps the adaptive-icon safe zone (a third of it empty margin);
+        // enlarged here and clipped by the circle, it fills the button instead of a corner of it.
+        glyph.setScaleX(GLYPH_SCALE);
+        glyph.setScaleY(GLYPH_SCALE);
+        frame.addView(glyph, new FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
+        frame.setClipToOutline(true);
+        frame.setOutlineProvider(android.view.ViewOutlineProvider.BACKGROUND);
+        frame.setOnTouchListener(new DragOrTap());
+        return frame;
+    }
+
+    // ---------- Touch: drag moves, tap opens ----------
+
+    private final class DragOrTap implements View.OnTouchListener {
+        private final int touchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
+        private float downRawX, downRawY;
+        private int downX, downY;
+        private boolean dragging;
+
+        @SuppressLint("ClickableViewAccessibility") // a tap opens the app, as a click would
+        @Override
+        public boolean onTouch(View v, MotionEvent event) {
+            switch (event.getActionMasked()) {
+                case MotionEvent.ACTION_DOWN:
+                    downRawX = event.getRawX();
+                    downRawY = event.getRawY();
+                    downX = params.x;
+                    downY = params.y;
+                    dragging = false;
+                    return true;
+                case MotionEvent.ACTION_MOVE: {
+                    float dx = event.getRawX() - downRawX;
+                    float dy = event.getRawY() - downRawY;
+                    if (!dragging && FloatingButtonGeometry.isTap(dx, dy, touchSlop)) return true;
+                    dragging = true;
+                    moveTo(downX + Math.round(dx), downY + Math.round(dy));
+                    return true;
+                }
+                case MotionEvent.ACTION_UP:
+                    if (dragging) {
+                        prefs.edit().putInt(KEY_X, params.x).putInt(KEY_Y, params.y).apply();
+                    } else {
+                        openApp();
+                    }
+                    return true;
+                case MotionEvent.ACTION_CANCEL:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+    }
+
+    private void moveTo(int x, int y) {
+        DisplayMetrics metrics = new DisplayMetrics();
+        windowManager.getDefaultDisplay().getRealMetrics(metrics);
+        params.x = FloatingButtonGeometry.clamp(x, params.width, metrics.widthPixels);
+        params.y = FloatingButtonGeometry.clamp(y, params.height, metrics.heightPixels);
+        try {
+            windowManager.updateViewLayout(view, params);
+        } catch (RuntimeException e) {
+            Log.w(TAG, "Floating button not moved: " + e);
+        }
+    }
+
+    private void openApp() {
+        try {
+            context.startActivity(new Intent(context, MainActivity.class)
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT));
+        } catch (RuntimeException e) {
+            Log.w(TAG, "App not opened: " + e);
+        }
+    }
+
+    private int dp(int value) {
+        return Math.round(value * context.getResources().getDisplayMetrics().density);
+    }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/FloatingButtonGeometry.java b/app/src/main/java/com/evsuite/abrp/FloatingButtonGeometry.java
new file mode 100644
index 0000000..022300d
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/FloatingButtonGeometry.java
@@ -0,0 +1,31 @@
+package com.evsuite.abrp;
+
+/**
+ * Where the floating button sits and whether a touch was a tap. Android-free, unit-tested.
+ * Positions are the button's top-left corner in pixels, as WindowManager takes them.
+ */
+final class FloatingButtonGeometry {
+
+    /** How far down the screen the button starts, as a fraction of the height. */
+    static final float DEFAULT_TOP_FRACTION = 0.4f;
+
+    private FloatingButtonGeometry() { }
+
+    /** Right edge, about 40 % down, inset by [margin] from the edge. */
+    static int[] defaultPosition(int screenWidth, int screenHeight, int size, int margin) {
+        return new int[]{
+                clamp(screenWidth - size - margin, size, screenWidth),
+                clamp(Math.round(screenHeight * DEFAULT_TOP_FRACTION), size, screenHeight)};
+    }
+
+    /** Keeps the whole button on screen, whatever position was saved or dragged to. */
+    static int clamp(int position, int size, int screen) {
+        int max = Math.max(0, screen - size);
+        return Math.max(0, Math.min(position, max));
+    }
+
+    /** A touch that moved no further than the system touch slop is a tap, not a drag. */
+    static boolean isTap(float dx, float dy, int touchSlop) {
+        return dx * dx + dy * dy <= (float) touchSlop * touchSlop;
+    }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 57b4aa1..ae60556 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -120,7 +120,8 @@ public class MainActivity extends AppCompatActivity {
     private TextView connectionStatusText;
 
     /** Upload page: live telemetry switch and cadence. */
-    private SwitchMaterial liveTelemetrySwitch, boostSwitch;
+    private SwitchMaterial liveTelemetrySwitch, boostSwitch, floatingButtonSwitch;
+    private View overlayPermissionNote;
     private android.widget.Spinner intervalSpinner;
     private TextInputLayout lowSocLayout;
     private TextInputEditText lowSocInput;
@@ -303,6 +304,8 @@ public class MainActivity extends AppCompatActivity {
         super.onResume();
         // Poll state and log only while the screen is up; onPause cancels it.
         uiHandler.post(uiRefresh);
+        FloatingButton.setAppInForeground(true);
+        refreshOverlayPermissionNote();
     }
 
     @Override
@@ -310,6 +313,7 @@ public class MainActivity extends AppCompatActivity {
         super.onPause();
         // Stop polling off-screen: this activity has no reason to spend cycles then.
         uiHandler.removeCallbacks(uiRefresh);
+        FloatingButton.setAppInForeground(false);
     }
 
     // ---------- Update check ----------
@@ -791,6 +795,22 @@ public class MainActivity extends AppCompatActivity {
     // ---------- Upload page ----------
 
     private void bindServicePane() {
+        floatingButtonSwitch = servicePane.findViewById(R.id.floating_button_switch);
+        overlayPermissionNote = servicePane.findViewById(R.id.overlay_permission_note);
+        floatingButtonSwitch.setChecked(UploadSettings.floatingButtonEnabled(prefs));
+        floatingButtonSwitch.setOnCheckedChangeListener((btn, checked) -> {
+            prefs.edit().putBoolean(UploadSettings.KEY_FLOATING_BUTTON, checked).apply();
+            FloatingButton.refresh();
+            refreshOverlayPermissionNote();
+        });
+        servicePane.findViewById(R.id.overlay_permission_button).setOnClickListener(v -> {
+            try {
+                startActivity(new Intent(android.provider.Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+                        Uri.parse("package:" + getPackageName())));
+            } catch (android.content.ActivityNotFoundException e) {
+                Toast.makeText(this, R.string.overlay_settings_missing, Toast.LENGTH_LONG).show();
+            }
+        });
         liveTelemetrySwitch = servicePane.findViewById(R.id.abrp_upload_switch);
         intervalSpinner = servicePane.findViewById(R.id.interval_spinner);
         boostSwitch = servicePane.findViewById(R.id.boost_switch);
@@ -847,6 +867,16 @@ public class MainActivity extends AppCompatActivity {
         });
     }
 
+    /**
+     * The note under the floating-button switch: only when the button is wanted but this build
+     * may not draw over other apps (the car build may, through the system UID).
+     */
+    private void refreshOverlayPermissionNote() {
+        if (overlayPermissionNote == null) return;
+        boolean missing = UploadSettings.floatingButtonEnabled(prefs) && !FloatingButton.canDraw(this);
+        overlayPermissionNote.setVisibility(missing ? View.VISIBLE : View.GONE);
+    }
+
     /** Clamped to 1-99: 0 would never trigger and 100 would boost permanently. */
     private void saveLowSocThreshold() {
         CharSequence raw = lowSocInput.getText();
diff --git a/app/src/main/java/com/evsuite/abrp/UploadSettings.java b/app/src/main/java/com/evsuite/abrp/UploadSettings.java
index a30ec5a..82c1975 100644
--- a/app/src/main/java/com/evsuite/abrp/UploadSettings.java
+++ b/app/src/main/java/com/evsuite/abrp/UploadSettings.java
@@ -16,6 +16,13 @@ final class UploadSettings {
     static final String KEY_LOW_SOC_PERCENT = "low_soc_percent";
     static final String KEY_AUTOSTART       = "autostart";
     static final String KEY_ABRP_UPLOAD_ENABLED = "abrp_upload_enabled";
+    /** The floating button that opens the app over the head unit's own screens. */
+    static final String KEY_FLOATING_BUTTON = "floating_button";
+    static final boolean DEFAULT_FLOATING_BUTTON = true;
+
+    static boolean floatingButtonEnabled(SharedPreferences prefs) {
+        return prefs.getBoolean(KEY_FLOATING_BUTTON, DEFAULT_FLOATING_BUTTON);
+    }
 
     /**
      * On by default: an ABRP plan is only useful if it is fed from the moment the drive
diff --git a/app/src/main/res/layout-w1000dp/pane_service.xml b/app/src/main/res/layout-w1000dp/pane_service.xml
index 0d904ea..422c0fb 100644
--- a/app/src/main/res/layout-w1000dp/pane_service.xml
+++ b/app/src/main/res/layout-w1000dp/pane_service.xml
@@ -6,6 +6,12 @@
             <TextView android:id="@+id/status_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_input_panel" android:padding="16dp" android:layout_marginTop="20dp" android:layout_marginBottom="12dp" android:text="@string/state_stopped" android:textAppearance="@style/Text.EV.Body" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/abrp_upload_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Secondary" />
+            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/floating_button_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_floating_button" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_floating_button" android:textAppearance="@style/Text.EV.Secondary" />
+            <LinearLayout android:id="@+id/overlay_permission_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:layout_marginTop="8dp" android:visibility="gone">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/overlay_permission_missing" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_error" />
+                <com.google.android.material.button.MaterialButton android:id="@+id/overlay_permission_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/btn_overlay_permission" />
+            </LinearLayout>
         </LinearLayout>
         <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_service_timing" android:textAppearance="@style/Text.EV.Eyebrow" />
diff --git a/app/src/main/res/layout/pane_service.xml b/app/src/main/res/layout/pane_service.xml
index cfdda55..8692bbd 100644
--- a/app/src/main/res/layout/pane_service.xml
+++ b/app/src/main/res/layout/pane_service.xml
@@ -6,6 +6,12 @@
             <TextView android:id="@+id/status_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_input_panel" android:padding="16dp" android:layout_marginTop="20dp" android:layout_marginBottom="12dp" android:text="@string/state_stopped" android:textAppearance="@style/Text.EV.Body" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/abrp_upload_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Secondary" />
+            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/floating_button_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_floating_button" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_floating_button" android:textAppearance="@style/Text.EV.Secondary" />
+            <LinearLayout android:id="@+id/overlay_permission_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:layout_marginTop="8dp" android:visibility="gone">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/overlay_permission_missing" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_error" />
+                <com.google.android.material.button.MaterialButton android:id="@+id/overlay_permission_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/btn_overlay_permission" />
+            </LinearLayout>
         </LinearLayout>
         <Space android:layout_width="1dp" android:layout_height="20dp" />
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b99000d..dc031b3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -107,6 +107,12 @@
     <string name="conn_err_timeout">Connection timed out</string>
     <string name="conn_err_http">Server error (HTTP %1$d)</string>
 
+    <string name="label_floating_button">Show floating button</string>
+    <string name="hint_floating_button">A small round button over the car\'s screens that opens this app. Drag it to move it; it hides while the app is open.</string>
+    <string name="overlay_permission_missing">This build may not draw over other apps, so the button cannot appear.</string>
+    <string name="btn_overlay_permission">Allow display over other apps</string>
+    <string name="overlay_settings_missing">The system screen for this permission is not available here</string>
+    <string name="floating_button_description">Open Nils\' MG4</string>
     <string name="label_abrp_upload_enabled">Send live telemetry to the server</string>
     <string name="hint_abrp_upload_enabled">The server stores it and forwards it to ABRP. Turn this off when another app feeds ABRP; consumption and charging tracking keep running.</string>
 
diff --git a/app/src/test/java/com/evsuite/abrp/FloatingButtonGeometryTest.java b/app/src/test/java/com/evsuite/abrp/FloatingButtonGeometryTest.java
new file mode 100644
index 0000000..5f3dbbd
--- /dev/null
+++ b/app/src/test/java/com/evsuite/abrp/FloatingButtonGeometryTest.java
@@ -0,0 +1,37 @@
+package com.evsuite.abrp;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/** The floating button's position and tap rules — pure JVM. */
+public class FloatingButtonGeometryTest {
+
+    @Test
+    public void startsAtTheRightEdgeAboutFortyPercentDown() {
+        // 1920 x 1080 head unit, 64 px button, 16 px margin.
+        assertArrayEquals(new int[]{1840, 432}, FloatingButtonGeometry.defaultPosition(1920, 1080, 64, 16));
+    }
+
+    @Test
+    public void staysFullyOnScreen() {
+        assertEquals(0, FloatingButtonGeometry.clamp(-50, 64, 1920));
+        assertEquals(1856, FloatingButtonGeometry.clamp(5000, 64, 1920));
+        assertEquals(700, FloatingButtonGeometry.clamp(700, 64, 1920));
+        // A saved position from a larger screen still lands inside a smaller one.
+        assertEquals(720 - 64, FloatingButtonGeometry.clamp(1000, 64, 720));
+        // A screen smaller than the button pins it to the corner instead of going negative.
+        assertEquals(0, FloatingButtonGeometry.clamp(10, 64, 40));
+    }
+
+    @Test
+    public void aTouchWithinTheSlopIsATapAnythingFurtherADrag() {
+        assertTrue(FloatingButtonGeometry.isTap(0, 0, 8));
+        assertTrue(FloatingButtonGeometry.isTap(5, -6, 8));    // 7.8 px
+        assertFalse(FloatingButtonGeometry.isTap(6, 6, 8));    // 8.5 px
+        assertFalse(FloatingButtonGeometry.isTap(0, 40, 8));
+    }
+}

From fde963533d9600ff4a64642842b6552db6ab2712 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 22:58:28 +0200
Subject: [PATCH 38/79] Head unit is 1920x720, not 1920x1080

FIRMWARE.md, the mise emulator profile and SPECS.md said 1920x1080.
The MG4's display is 1920x720 at 160 dpi (an app window has been seen
at 1778x720, the car's sidebar taking the rest). The floating button's
geometry test now uses 1920x720.

The app itself assumed no height: checked on an Android 9 emulator at
1920x720, all tabs render (longer ones scroll), the sidebar holds all
seven tabs, and the floating button starts at 1840,312.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 FIRMWARE.md                                               | 5 +++--
 SPECS.md                                                  | 3 ++-
 .../java/com/evsuite/abrp/FloatingButtonGeometryTest.java | 4 ++--
 mise.toml                                                 | 8 ++++----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/FIRMWARE.md b/FIRMWARE.md
index cce5ddc..5339fca 100644
--- a/FIRMWARE.md
+++ b/FIRMWARE.md
@@ -11,7 +11,8 @@ development. It must not be treated as a vendor specification.
 | Android | 9 (Pie) — **API 28** |
 | Chipset | MediaTek **MT2712** |
 | Device | `mt2712_saic_eh32` (eh32 = MG4) |
-| Emulator display profile | **1920×1080 @ 160 dpi** |
+| Display | **1920×720 @ 160 dpi** (the car's sidebar takes part of the width; an app window has been reported at 1778×720) |
+| Emulator display profile | **1920×720 @ 160 dpi** |
 
 ## Signing caveat
 
@@ -42,5 +43,5 @@ follow the same path. See `AGENTS.md` for the full per-signal split.
 ## Emulator fidelity
 
 The `mise` emulator tasks use an API 33 automotive AVD for the car service and an API 28
-AVD at **1920×1080 @ 160 dpi** for the screen. Neither exposes the SAIC vendor properties,
+AVD at **1920×720 @ 160 dpi** for the screen. Neither exposes the SAIC vendor properties,
 so vehicle-specific behaviour still requires on-vehicle validation.
diff --git a/SPECS.md b/SPECS.md
index f1bd1f5..3e12022 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -117,7 +117,8 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
 - 2026-10-17 — App 2.6.0: floating button to open the app, because the MG4 launcher does not list
   it. Drawn over other apps (needs the overlay permission, which the car build has through the
   system UID), draggable, hidden while the app is open, switch in the Upload tab. Tested on an
-  Android 9 AOSP emulator at 1920x1080/160 dpi with the car APK (installs as UID 1000 there too).
+  Android 9 AOSP emulator with the car APK (installs as UID 1000 there too), at 1920x1080 and at the
+  head unit's real 1920x720 / 160 dpi, where all tabs and the button were checked as well.
 - 2026-10-17 — App 2.5.0: range estimates at current and 5-minute average power (Vehicle tab).
 - 2026-10-17 — Live dashboard reworked around the signals the car sends: Climate setpoint, Last
   update and a computed Energy in pack replace the empty temperature tiles; Battery voltage and
diff --git a/app/src/test/java/com/evsuite/abrp/FloatingButtonGeometryTest.java b/app/src/test/java/com/evsuite/abrp/FloatingButtonGeometryTest.java
index 5f3dbbd..ae4d5c5 100644
--- a/app/src/test/java/com/evsuite/abrp/FloatingButtonGeometryTest.java
+++ b/app/src/test/java/com/evsuite/abrp/FloatingButtonGeometryTest.java
@@ -12,8 +12,8 @@ public class FloatingButtonGeometryTest {
 
     @Test
     public void startsAtTheRightEdgeAboutFortyPercentDown() {
-        // 1920 x 1080 head unit, 64 px button, 16 px margin.
-        assertArrayEquals(new int[]{1840, 432}, FloatingButtonGeometry.defaultPosition(1920, 1080, 64, 16));
+        // The MG4 head unit is 1920 x 720; 64 px button, 16 px margin.
+        assertArrayEquals(new int[]{1840, 288}, FloatingButtonGeometry.defaultPosition(1920, 720, 64, 16));
     }
 
     @Test
diff --git a/mise.toml b/mise.toml
index 5253fd6..932bafb 100644
--- a/mise.toml
+++ b/mise.toml
@@ -53,20 +53,20 @@ BUILD_TOOLS = "36.0.0"
 #                    d'OS. Pour tester le cycle de vie du service et le chemin voiture.
 #                    Les propriétés VENDEUR SAIC (0x216xxxxx : SOC, autonomie) n'existent
 #                    pas dans l'émulateur : ces lectures échoueront, c'est normal.
-#   emulator-screen  API 28 tablette — bonne version d'OS et bon écran (1920x1080 @ 160dpi,
+#   emulator-screen  API 28 tablette — bonne version d'OS et bon écran (1920x720 @ 160dpi,
 #                    12,8" HD comme le MG4), mais AUCUN service voiture.
 #                    Pour l'UI, les layouts et la densité.
 #
 # Rien de tout cela ne remplace un essai sur le véhicule.
 # Densité cible du projet : 160 dpi.
-# Écran 12,8" 1920x1080. Firmware de référence : SWI68-29958-1300R69.
+# Écran 12,8" 1920x720. Firmware de référence : SWI68-29958-1300R69.
 
 EMU_CAR_AVD = "evabrp-car"
 EMU_CAR_IMAGE = "system-images;android-33;android-automotive;x86_64"
 EMU_SCREEN_AVD = "evabrp-screen"
 EMU_SCREEN_IMAGE = "system-images;android-28;google_apis;x86_64"
 EMU_WIDTH = "1920"
-EMU_HEIGHT = "1080"
+EMU_HEIGHT = "720"
 EMU_DENSITY = "160"
 
 [tasks.bootstrap]
@@ -189,7 +189,7 @@ echo "Émulateur voiture prêt."
 '''
 
 [tasks.emulator-screen]
-description = "Lance l'émulateur écran MG4 (API 28, 1920x1080 @ 160dpi — pas de service voiture)"
+description = "Lance l'émulateur écran MG4 (API 28, 1920x720 @ 160dpi — pas de service voiture)"
 run = '''
 set -e
 "$ANDROID_HOME/emulator/emulator" -avd "$EMU_SCREEN_AVD" \

From af15b15db1cd6d6fa60d229b718964d520237c89 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 23:24:48 +0200
Subject: [PATCH 39/79] App 2.7.0: voice-key double press opens the app; no
 scroll jumps

Steering wheel: a double press of the voice key (code 287) opens the
app. The floating button from 2.6.0 does not show over the MG4
launcher, so this is the way back into the app. The head unit reports
keys as the broadcast com.saic.keyevent.hardkey.report, whose extras
are not documented: the receiver tries the usual names (and an
embedded KeyEvent), and counts one press per report whichever way the
up/down field turns out to work; long presses never open the app. The
last 20 reports are listed raw on the Logs tab, so if the guess
misses, a photo of that list gives the real format. A switch in the
Upload tab turns it off. DoublePressDetector (500 ms window) has 5
tests; on the emulator, simulated double presses open the app and
single presses, other keys and long presses do not.

Scrolling: pages jumped back to the top on every 2 s refresh. A stack
trace on the emulator showed why: ViewPager2's RecyclerView lays the
pages out while measuring, at a provisional height, and
ScrollView.onLayout clamps the position to 0. StableScrollView keeps
the driver's position across layouts and is now the root of every
page; the scrolled Charging page stays put across refreshes.

Vehicle tab: all six value tiles, including both range estimates, sit
in one row at the top, so nothing needs scrolling at 1920x720.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                      |   6 +
 app/build.gradle                              |   4 +-
 .../com/evsuite/abrp/AbrpUploadService.java   |   4 +
 .../com/evsuite/abrp/DoublePressDetector.java |  46 +++++
 .../java/com/evsuite/abrp/MainActivity.java   |  18 +-
 .../com/evsuite/abrp/StableScrollView.java    |  49 +++++
 .../com/evsuite/abrp/SteeringKeyListener.java | 191 ++++++++++++++++++
 .../java/com/evsuite/abrp/UploadSettings.java |   7 +
 .../main/res/layout-w1000dp/pane_service.xml  |   6 +-
 .../main/res/layout-w1000dp/pane_vehicle.xml  |  67 +++---
 app/src/main/res/layout-w1000dp/pane_wifi.xml |   4 +-
 app/src/main/res/layout/pane_charging.xml     |   4 +-
 app/src/main/res/layout/pane_consumption.xml  |   4 +-
 app/src/main/res/layout/pane_log.xml          |   7 +-
 app/src/main/res/layout/pane_server.xml       |   4 +-
 app/src/main/res/layout/pane_service.xml      |   6 +-
 app/src/main/res/layout/pane_vehicle.xml      |  64 +++---
 app/src/main/res/layout/pane_wifi.xml         |   4 +-
 app/src/main/res/values/strings.xml           |   5 +
 .../evsuite/abrp/DoublePressDetectorTest.java |  57 ++++++
 20 files changed, 471 insertions(+), 86 deletions(-)
 create mode 100644 app/src/main/java/com/evsuite/abrp/DoublePressDetector.java
 create mode 100644 app/src/main/java/com/evsuite/abrp/StableScrollView.java
 create mode 100644 app/src/main/java/com/evsuite/abrp/SteeringKeyListener.java
 create mode 100644 app/src/test/java/com/evsuite/abrp/DoublePressDetectorTest.java

diff --git a/SPECS.md b/SPECS.md
index 3e12022..c4c7e6d 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -114,6 +114,12 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-17 — App 2.7.0: a double press of the steering wheel's voice key (code 287) opens the
+  app, from the head unit's `com.saic.keyevent.hardkey.report` broadcast. Its extras are not
+  documented; the usual names are tried and every report is listed raw on the Logs tab. The
+  floating button (2.6.0) did not show over the MG4 launcher. Pages no longer jump back to the
+  top on every refresh (`StableScrollView`), and the Vehicle tab shows all six value tiles,
+  including both range estimates, in one row at the top.
 - 2026-10-17 — App 2.6.0: floating button to open the app, because the MG4 launcher does not list
   it. Drawn over other apps (needs the overlay permission, which the car build has through the
   system UID), draggable, hidden while the app is open, switch in the Upload tab. Tested on an
diff --git a/app/build.gradle b/app/build.gradle
index 0b35644..d2e59ae 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 63
-        versionName "2.6.0"
+        versionCode 64
+        versionName "2.7.0"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
index 655ea9d..8431b91 100644
--- a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
+++ b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
@@ -68,6 +68,7 @@ public class AbrpUploadService extends Service {
     private ChargeSessionTracker chargeSessionTracker;
     private TelemetryUploader telemetryUploader;
     private FloatingButton floatingButton;
+    private SteeringKeyListener steeringKeys;
     private WifiAutoConnect wifi;
     private ScheduledExecutorService scheduler;
     private SharedPreferences prefs;
@@ -102,6 +103,8 @@ public class AbrpUploadService extends Service {
         // onCreate runs on the main thread, where the overlay window must be added.
         floatingButton = new FloatingButton(this, prefs);
         FloatingButton.attach(floatingButton);
+        steeringKeys = new SteeringKeyListener(this, prefs);
+        steeringKeys.register();
 
         scheduler.scheduleWithFixedDelay(
                 this::safeUploadCycle,
@@ -144,6 +147,7 @@ public class AbrpUploadService extends Service {
         if (scheduler != null) scheduler.shutdownNow();
         if (telemetryUploader != null) telemetryUploader.stop();
         if (floatingButton != null) FloatingButton.detach(floatingButton);
+        if (steeringKeys != null) steeringKeys.unregister();
         Log.i(TAG, "Service stopped");
     }
 
diff --git a/app/src/main/java/com/evsuite/abrp/DoublePressDetector.java b/app/src/main/java/com/evsuite/abrp/DoublePressDetector.java
new file mode 100644
index 0000000..1f3863f
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/DoublePressDetector.java
@@ -0,0 +1,46 @@
+package com.evsuite.abrp;
+
+/**
+ * Spots a double press of one steering-wheel key from the head unit's key broadcasts.
+ *
+ * The broadcast format is not documented, so this copes with all the shapes it could take:
+ *  - no up/down information at all: every broadcast is one press;
+ *  - separate down and up broadcasts: only releases count. If the meaning of the action field
+ *    is the other way round, downs count instead — still exactly one per press, so a double
+ *    press is found either way;
+ *  - a long press resets, so holding the key never opens anything.
+ *
+ * Android-free and unit-tested; the window is longer than the stock 300 ms, because a
+ * deliberate double press on a steering wheel is slower than one on a touch screen.
+ */
+final class DoublePressDetector {
+
+    static final long WINDOW_MS = 500;
+
+    private final int keyCode;
+    private long lastPressAt = Long.MIN_VALUE;
+
+    DoublePressDetector(int keyCode) {
+        this.keyCode = keyCode;
+    }
+
+    /**
+     * @param down true for a key-down, false for a release, null when the broadcast does not say
+     * @param longPress true when the broadcast marks a long press
+     * @return true exactly once per double press
+     */
+    synchronized boolean accept(int code, Boolean down, boolean longPress, long atMillis) {
+        if (code != keyCode) return false;
+        if (longPress) {
+            lastPressAt = Long.MIN_VALUE;
+            return false;
+        }
+        if (Boolean.TRUE.equals(down)) return false;
+        if (lastPressAt != Long.MIN_VALUE && atMillis - lastPressAt <= WINDOW_MS) {
+            lastPressAt = Long.MIN_VALUE; // a third press starts over
+            return true;
+        }
+        lastPressAt = atMillis;
+        return false;
+    }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index ae60556..2b21fb7 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -120,7 +120,8 @@ public class MainActivity extends AppCompatActivity {
     private TextView connectionStatusText;
 
     /** Upload page: live telemetry switch and cadence. */
-    private SwitchMaterial liveTelemetrySwitch, boostSwitch, floatingButtonSwitch;
+    private SwitchMaterial liveTelemetrySwitch, boostSwitch, floatingButtonSwitch, voiceKeySwitch;
+    private TextView steeringKeysText;
     private View overlayPermissionNote;
     private android.widget.Spinner intervalSpinner;
     private TextInputLayout lowSocLayout;
@@ -210,6 +211,7 @@ public class MainActivity extends AppCompatActivity {
         @Override public void run() {
             refreshStatus();
             refreshCallLog();
+            refreshSteeringKeys();
             refreshVehicle();
             refreshConsumption();
             refreshWifi();
@@ -254,6 +256,7 @@ public class MainActivity extends AppCompatActivity {
 
         statusText          = servicePane.findViewById(R.id.status_text);
         callLogText = logPane.findViewById(R.id.call_log_text);
+        steeringKeysText = logPane.findViewById(R.id.steering_keys_text);
         logPane.findViewById(R.id.flush_now_button).setOnClickListener(v -> manualFlush());
 
         setUpPager();
@@ -795,6 +798,10 @@ public class MainActivity extends AppCompatActivity {
     // ---------- Upload page ----------
 
     private void bindServicePane() {
+        voiceKeySwitch = servicePane.findViewById(R.id.voice_key_switch);
+        voiceKeySwitch.setChecked(UploadSettings.voiceKeyOpensApp(prefs));
+        voiceKeySwitch.setOnCheckedChangeListener((btn, checked) ->
+                prefs.edit().putBoolean(UploadSettings.KEY_VOICE_KEY_OPENS, checked).apply());
         floatingButtonSwitch = servicePane.findViewById(R.id.floating_button_switch);
         overlayPermissionNote = servicePane.findViewById(R.id.overlay_permission_note);
         floatingButtonSwitch.setChecked(UploadSettings.floatingButtonEnabled(prefs));
@@ -1340,6 +1347,15 @@ public class MainActivity extends AppCompatActivity {
         }, "cloud-refresh").start();
     }
 
+    /** What the car's steering-wheel key broadcasts looked like, newest first. */
+    private void refreshSteeringKeys() {
+        if (steeringKeysText == null) return;
+        java.util.List<String> keys = SteeringKeyListener.recent();
+        String text = keys.isEmpty() ? getString(R.string.steering_keys_empty)
+                : android.text.TextUtils.join("\n", keys);
+        if (!text.contentEquals(steeringKeysText.getText())) steeringKeysText.setText(text);
+    }
+
     private void refreshCallLog() {
         java.util.List<UploadLog.Entry> entries = AbrpUploadService.log().recent();
         if (entries.isEmpty()) {
diff --git a/app/src/main/java/com/evsuite/abrp/StableScrollView.java b/app/src/main/java/com/evsuite/abrp/StableScrollView.java
new file mode 100644
index 0000000..d760775
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/StableScrollView.java
@@ -0,0 +1,49 @@
+package com.evsuite.abrp;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.ScrollView;
+
+/**
+ * A ScrollView that keeps the position the driver scrolled to.
+ *
+ * The pages live in ViewPager2's RecyclerView. When the live values change, the tiles ask for
+ * a new layout, and the RecyclerView lays the pages out once already while it is still
+ * measuring, with a provisional height at which the content seems to fit. ScrollView.onLayout
+ * then clamps the scroll position to 0, and the real layout that follows keeps it there: every
+ * refresh threw the page back to the top (seen in a stack trace on the emulator).
+ *
+ * Here only scrolling that is not part of a layout counts as the driver's position, and every
+ * layout restores it. ScrollView.scrollTo clamps against the real content height, so a
+ * position that no longer exists still ends at the bottom rather than past it.
+ */
+public class StableScrollView extends ScrollView {
+
+    private int wantedScrollY;
+    private boolean inLayout;
+
+    public StableScrollView(Context context) { super(context); }
+
+    public StableScrollView(Context context, AttributeSet attrs) { super(context, attrs); }
+
+    public StableScrollView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onScrollChanged(int l, int t, int oldl, int oldt) {
+        super.onScrollChanged(l, t, oldl, oldt);
+        if (!inLayout) wantedScrollY = t;
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        inLayout = true;
+        try {
+            super.onLayout(changed, l, t, r, b);
+            if (getScrollY() != wantedScrollY) scrollTo(getScrollX(), wantedScrollY);
+        } finally {
+            inLayout = false;
+        }
+    }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/SteeringKeyListener.java b/app/src/main/java/com/evsuite/abrp/SteeringKeyListener.java
new file mode 100644
index 0000000..45431e5
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/SteeringKeyListener.java
@@ -0,0 +1,191 @@
+package com.evsuite.abrp;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.KeyEvent;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * Opens the app on a double press of the steering wheel's voice key.
+ *
+ * The head unit reports steering-wheel keys as the broadcast {@link #ACTION}; code 287 is the
+ * voice key (see EVHardware's PhysicalButtonEventDecoder). How the broadcast carries the code
+ * and the press is not documented, so the usual extras are tried, and every broadcast is kept
+ * raw for the Logs tab — if the guess misses, that list says exactly what the car sends.
+ *
+ * Registered by the always-on service on the main thread; never throws into the head unit.
+ */
+final class SteeringKeyListener {
+
+    static final String ACTION = "com.saic.keyevent.hardkey.report";
+    static final int VOICE_KEY = 287;
+    private static final String TAG = "NilsMG4.SteeringKey";
+    private static final int MAX_LOG = 20;
+
+    private static final ArrayDeque<String> RECENT = new ArrayDeque<>();
+
+    private final Context context;
+    private final SharedPreferences prefs;
+    private final DoublePressDetector detector = new DoublePressDetector(VOICE_KEY);
+    private boolean registered;
+
+    private final BroadcastReceiver receiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context c, Intent intent) {
+            try {
+                handle(intent);
+            } catch (RuntimeException e) {
+                Log.w(TAG, "Key broadcast not handled: " + e);
+            }
+        }
+    };
+
+    SteeringKeyListener(Context context, SharedPreferences prefs) {
+        this.context = context.getApplicationContext();
+        this.prefs = prefs;
+    }
+
+    void register() {
+        try {
+            // Exported on purpose: the report comes from the head unit's own key service, another
+            // app. The flag is required from API 33 and absent on this API-28 head unit;
+            // ContextCompat picks the right call for the platform underneath.
+            androidx.core.content.ContextCompat.registerReceiver(context, receiver, new IntentFilter(ACTION),
+                    androidx.core.content.ContextCompat.RECEIVER_EXPORTED);
+            registered = true;
+        } catch (RuntimeException e) {
+            Log.w(TAG, "Key broadcasts not available: " + e);
+        }
+    }
+
+    void unregister() {
+        if (!registered) return;
+        try {
+            context.unregisterReceiver(receiver);
+        } catch (RuntimeException ignored) {
+            // already gone
+        }
+        registered = false;
+    }
+
+    /** The last broadcasts, newest first, for the Logs tab. */
+    static synchronized List<String> recent() {
+        List<String> out = new ArrayList<>(RECENT);
+        java.util.Collections.reverse(out);
+        return out;
+    }
+
+    private static synchronized void remember(String line) {
+        if (RECENT.size() >= MAX_LOG) RECENT.removeFirst();
+        RECENT.addLast(line);
+    }
+
+    private void handle(Intent intent) {
+        Bundle extras = intent.getExtras();
+        Parsed key = parse(extras);
+        boolean opens = false;
+        if (key.code != null && UploadSettings.voiceKeyOpensApp(prefs)) {
+            opens = detector.accept(key.code, key.down, key.longPress, android.os.SystemClock.elapsedRealtime());
+        }
+        remember(new SimpleDateFormat("HH:mm:ss.SSS", Locale.US).format(new Date())
+                + "  " + describe(extras)
+                + "\n    -> code " + (key.code == null ? "?" : key.code)
+                + ", down " + (key.down == null ? "?" : key.down)
+                + ", long " + key.longPress + (opens ? "  OPENS APP" : ""));
+        if (opens) {
+            try {
+                context.startActivity(new Intent(context, MainActivity.class)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT));
+            } catch (RuntimeException e) {
+                Log.w(TAG, "App not opened: " + e);
+            }
+        }
+    }
+
+    // ---------- Reading an undocumented broadcast ----------
+
+    static final class Parsed {
+        Integer code;
+        Boolean down;
+        boolean longPress;
+    }
+
+    private static final String[] CODE_KEYS = {"keyCode", "keycode", "key_code", "KEY_CODE", "keyValue",
+            "key_value", "code", "key"};
+    private static final String[] ACTION_KEYS = {"keyAction", "key_action", "KEY_ACTION", "action",
+            "keyState", "key_state", "state", "event", "type"};
+    private static final String[] DOWN_KEYS = {"down", "isDown", "pressed", "isPressed"};
+    private static final String[] LONG_KEYS = {"longPress", "isLongPress", "long_press", "isLong", "long"};
+
+    static Parsed parse(Bundle extras) {
+        Parsed p = new Parsed();
+        if (extras == null) return p;
+        for (String k : extras.keySet()) {
+            Object v = extras.get(k);
+            if (v instanceof KeyEvent) {
+                KeyEvent e = (KeyEvent) v;
+                p.code = e.getKeyCode();
+                p.down = e.getAction() == KeyEvent.ACTION_DOWN;
+                p.longPress = e.isLongPress();
+                return p;
+            }
+        }
+        p.code = firstInt(extras, CODE_KEYS);
+        Integer action = firstInt(extras, ACTION_KEYS);
+        // KeyEvent's own convention: 0 down, 1 up; anything else (often 2) is a long press.
+        if (action != null) {
+            if (action == 0) p.down = true;
+            else if (action == 1) p.down = false;
+            else p.longPress = true;
+        }
+        Boolean down = firstBoolean(extras, DOWN_KEYS);
+        if (down != null) p.down = down;
+        Boolean longPress = firstBoolean(extras, LONG_KEYS);
+        if (longPress != null) p.longPress = longPress;
+        return p;
+    }
+
+    private static Integer firstInt(Bundle b, String[] keys) {
+        for (String k : keys) {
+            Object v = b.get(k);
+            if (v instanceof Integer) return (Integer) v;
+            if (v instanceof Long) return (int) (long) (Long) v;
+            if (v instanceof String) {
+                try { return Integer.parseInt(((String) v).trim()); } catch (NumberFormatException ignored) { }
+            }
+        }
+        return null;
+    }
+
+    private static Boolean firstBoolean(Bundle b, String[] keys) {
+        for (String k : keys) {
+            Object v = b.get(k);
+            if (v instanceof Boolean) return (Boolean) v;
+        }
+        return null;
+    }
+
+    /** All extras as name=value(type), so the Logs tab shows the real format. */
+    static String describe(Bundle extras) {
+        if (extras == null || extras.isEmpty()) return "(no extras)";
+        StringBuilder sb = new StringBuilder();
+        for (String k : extras.keySet()) {
+            Object v = extras.get(k);
+            if (sb.length() > 0) sb.append(", ");
+            sb.append(k).append('=').append(v).append(" (")
+              .append(v == null ? "null" : v.getClass().getSimpleName()).append(')');
+        }
+        return sb.toString();
+    }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/UploadSettings.java b/app/src/main/java/com/evsuite/abrp/UploadSettings.java
index 82c1975..aa00d32 100644
--- a/app/src/main/java/com/evsuite/abrp/UploadSettings.java
+++ b/app/src/main/java/com/evsuite/abrp/UploadSettings.java
@@ -20,6 +20,13 @@ final class UploadSettings {
     static final String KEY_FLOATING_BUTTON = "floating_button";
     static final boolean DEFAULT_FLOATING_BUTTON = true;
 
+    /** A double press of the steering wheel's voice key opens the app. */
+    static final String KEY_VOICE_KEY_OPENS = "voice_key_opens_app";
+
+    static boolean voiceKeyOpensApp(SharedPreferences prefs) {
+        return prefs.getBoolean(KEY_VOICE_KEY_OPENS, true);
+    }
+
     static boolean floatingButtonEnabled(SharedPreferences prefs) {
         return prefs.getBoolean(KEY_FLOATING_BUTTON, DEFAULT_FLOATING_BUTTON);
     }
diff --git a/app/src/main/res/layout-w1000dp/pane_service.xml b/app/src/main/res/layout-w1000dp/pane_service.xml
index 422c0fb..9506515 100644
--- a/app/src/main/res/layout-w1000dp/pane_service.xml
+++ b/app/src/main/res/layout-w1000dp/pane_service.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
+<com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:padding="24dp" android:baselineAligned="false">
         <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:layout_marginEnd="16dp" android:padding="24dp" android:background="@drawable/bg_glass">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_service_controls" android:textAppearance="@style/Text.EV.Eyebrow" />
             <TextView android:id="@+id/status_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_input_panel" android:padding="16dp" android:layout_marginTop="20dp" android:layout_marginBottom="12dp" android:text="@string/state_stopped" android:textAppearance="@style/Text.EV.Body" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/abrp_upload_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Secondary" />
+            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_key_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_voice_key" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_voice_key" android:textAppearance="@style/Text.EV.Secondary" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/floating_button_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_floating_button" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_floating_button" android:textAppearance="@style/Text.EV.Secondary" />
             <LinearLayout android:id="@+id/overlay_permission_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:layout_marginTop="8dp" android:visibility="gone">
@@ -24,4 +26,4 @@
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
     </LinearLayout>
-</ScrollView>
+</com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout-w1000dp/pane_vehicle.xml b/app/src/main/res/layout-w1000dp/pane_vehicle.xml
index ff3cb6b..16ee22d 100644
--- a/app/src/main/res/layout-w1000dp/pane_vehicle.xml
+++ b/app/src/main/res/layout-w1000dp/pane_vehicle.xml
@@ -1,6 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
+<com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp">
+        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:baselineAligned="false">
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_battery_card" android:layout_weight="1" android:layout_marginEnd="10dp">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_short" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_soc" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_charging" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_weight="1" android:layout_marginEnd="10dp">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_range" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+            </LinearLayout>
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_power" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_range_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range_power_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_average" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_range_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_weight="1" android:layout_marginEnd="10dp">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+            </LinearLayout>
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_weight="1" android:layout_marginEnd="10dp">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_speed" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_speed" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+            </LinearLayout>
+        </LinearLayout>
+        <Space android:layout_width="1dp" android:layout_height="16dp" />
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:baselineAligned="false">
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:layout_marginEnd="16dp" android:padding="20dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_energy" android:textAppearance="@style/Text.EV.Eyebrow" android:layout_marginBottom="12dp" />
@@ -37,38 +67,5 @@
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_no_data" android:textAppearance="@style/Text.EV.Secondary" />
             </LinearLayout>
         </LinearLayout>
-        <Space android:layout_width="1dp" android:layout_height="16dp" />
-        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:baselineAligned="false">
-            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_battery_card" android:layout_weight="1" android:layout_marginEnd="10dp">
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_short" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_soc" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_charging" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
-            </LinearLayout>
-            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_weight="1" android:layout_marginEnd="10dp">
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-            </LinearLayout>
-            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_weight="1" android:layout_marginEnd="10dp">
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-            </LinearLayout>
-            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_weight="1" android:layout_marginEnd="10dp">
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_speed" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_speed" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-            </LinearLayout>
-        </LinearLayout>
-        <Space android:layout_width="1dp" android:layout_height="10dp" />
-        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:baselineAligned="false">
-            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_power" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_range_power_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
-            </LinearLayout>
-            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_average" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_range_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
-            </LinearLayout>
-        </LinearLayout>
     </LinearLayout>
-</ScrollView>
+</com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout-w1000dp/pane_wifi.xml b/app/src/main/res/layout-w1000dp/pane_wifi.xml
index a6485be..c0461ea 100644
--- a/app/src/main/res/layout-w1000dp/pane_wifi.xml
+++ b/app/src/main/res/layout-w1000dp/pane_wifi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
+<com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:padding="24dp" android:baselineAligned="false">
         <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1.3" android:orientation="vertical" android:layout_marginEnd="16dp" android:padding="24dp" android:background="@drawable/bg_glass">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_card_title" android:textAppearance="@style/Text.EV.Eyebrow" />
@@ -14,4 +14,4 @@
             <TextView android:id="@+id/wifi_saved_list" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:textAppearance="@style/Text.EV.Body" android:lineSpacingExtra="16dp" />
         </LinearLayout>
     </LinearLayout>
-</ScrollView>
+</com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout/pane_charging.xml b/app/src/main/res/layout/pane_charging.xml
index 2a3f810..e701971 100644
--- a/app/src/main/res/layout/pane_charging.xml
+++ b/app/src/main/res/layout/pane_charging.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true">
+<com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true">
  <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp">
   <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:background="@drawable/bg_glass">
    <TextView android:id="@+id/charge_status" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="Not charging" android:textAppearance="@style/Text.EV.Title" android:textColor="@color/ev_cyan"/>
@@ -28,4 +28,4 @@
    <TextView android:id="@+id/charge_curve_table" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:fontFamily="monospace" android:text="No charging measurements yet" android:textAppearance="@style/Text.EV.Body" android:textColor="@color/ev_cyan"/>
   </LinearLayout>
  </LinearLayout>
-</ScrollView>
+</com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout/pane_consumption.xml b/app/src/main/res/layout/pane_consumption.xml
index 1222f28..93891bb 100644
--- a/app/src/main/res/layout/pane_consumption.xml
+++ b/app/src/main/res/layout/pane_consumption.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true">
+<com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true">
   <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp">
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:background="@drawable/bg_glass">
       <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical">
@@ -45,4 +45,4 @@
       <TextView android:id="@+id/consumption_daily_history" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:fontFamily="monospace" android:text="No daily data yet" android:textAppearance="@style/Text.EV.Body" android:textColor="@color/ev_cyan"/>
     </LinearLayout>
   </LinearLayout>
-</ScrollView>
+</com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout/pane_log.xml b/app/src/main/res/layout/pane_log.xml
index 31ea5d8..17f220e 100644
--- a/app/src/main/res/layout/pane_log.xml
+++ b/app/src/main/res/layout/pane_log.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
+<com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_call_log" android:textAppearance="@style/Text.EV.Eyebrow" />
         <com.google.android.material.button.MaterialButton android:id="@+id/flush_now_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/btn_flush_now" app:icon="@drawable/ic_refresh" app:iconGravity="textStart" style="@style/Widget.EV.Button.Outlined" xmlns:app="http://schemas.android.com/apk/res-auto" />
         <TextView android:id="@+id/call_log_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:minHeight="180dp" android:text="@string/call_log_empty" android:textAppearance="@style/Text.EV.Body" android:fontFamily="monospace" android:textSize="17sp" android:lineSpacingExtra="12dp" android:textIsSelectable="true" />
+        <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/label_steering_keys" android:textAppearance="@style/Text.EV.Eyebrow" />
+        <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/hint_steering_keys" android:textAppearance="@style/Text.EV.Secondary" />
+        <TextView android:id="@+id/steering_keys_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:text="@string/steering_keys_empty" android:textAppearance="@style/Text.EV.Body" android:fontFamily="monospace" android:textSize="14sp" android:lineSpacingExtra="4dp" />
     </LinearLayout>
-</ScrollView>
+</com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout/pane_server.xml b/app/src/main/res/layout/pane_server.xml
index 7eb14d7..850ed83 100644
--- a/app/src/main/res/layout/pane_server.xml
+++ b/app/src/main/res/layout/pane_server.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
+<com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp">
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/server_card_title" android:textAppearance="@style/Text.EV.Eyebrow" />
@@ -29,4 +29,4 @@
             <TextView android:id="@+id/import_hint" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:textAppearance="@style/Text.EV.Secondary" android:textIsSelectable="true" />
         </LinearLayout>
     </LinearLayout>
-</ScrollView>
+</com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout/pane_service.xml b/app/src/main/res/layout/pane_service.xml
index 8692bbd..2a70e57 100644
--- a/app/src/main/res/layout/pane_service.xml
+++ b/app/src/main/res/layout/pane_service.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
+<com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp">
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_service_controls" android:textAppearance="@style/Text.EV.Eyebrow" />
             <TextView android:id="@+id/status_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_input_panel" android:padding="16dp" android:layout_marginTop="20dp" android:layout_marginBottom="12dp" android:text="@string/state_stopped" android:textAppearance="@style/Text.EV.Body" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/abrp_upload_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Secondary" />
+            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_key_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_voice_key" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_voice_key" android:textAppearance="@style/Text.EV.Secondary" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/floating_button_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_floating_button" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_floating_button" android:textAppearance="@style/Text.EV.Secondary" />
             <LinearLayout android:id="@+id/overlay_permission_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:layout_marginTop="8dp" android:visibility="gone">
@@ -25,4 +27,4 @@
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
     </LinearLayout>
-</ScrollView>
+</com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout/pane_vehicle.xml b/app/src/main/res/layout/pane_vehicle.xml
index 6ce8956..f2cbfd7 100644
--- a/app/src/main/res/layout/pane_vehicle.xml
+++ b/app/src/main/res/layout/pane_vehicle.xml
@@ -1,6 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
+<com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp">
+        <GridLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:columnCount="2">
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_battery_card" android:layout_columnWeight="1" android:layout_margin="4dp">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_short" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_soc" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_charging" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_columnWeight="1" android:layout_margin="4dp">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_range" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+            </LinearLayout>
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_power" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_range_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range_power_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_average" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_range_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_columnWeight="1" android:layout_margin="4dp">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+            </LinearLayout>
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_columnWeight="1" android:layout_margin="4dp">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_speed" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_speed" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+            </LinearLayout>
+        </GridLayout>
+        <Space android:layout_width="1dp" android:layout_height="16dp" />
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:background="@drawable/bg_glass">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_energy" android:textAppearance="@style/Text.EV.Eyebrow" android:layout_marginBottom="12dp" />
             <TableLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:stretchColumns="0" android:shrinkColumns="0">
@@ -35,35 +65,5 @@
             </LinearLayout>
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_no_data" android:textAppearance="@style/Text.EV.Secondary" />
         </LinearLayout>
-        <Space android:layout_width="1dp" android:layout_height="16dp" />
-        <GridLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:columnCount="2">
-            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_battery_card" android:layout_columnWeight="1" android:layout_margin="4dp">
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_short" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_soc" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_charging" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
-            </LinearLayout>
-            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_columnWeight="1" android:layout_margin="4dp">
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-            </LinearLayout>
-            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_columnWeight="1" android:layout_margin="4dp">
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-            </LinearLayout>
-            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_columnWeight="1" android:layout_margin="4dp">
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_speed" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_speed" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-            </LinearLayout>
-            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_power" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_range_power_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
-            </LinearLayout>
-            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_average" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_range_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
-            </LinearLayout>
-        </GridLayout>
     </LinearLayout>
-</ScrollView>
+</com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout/pane_wifi.xml b/app/src/main/res/layout/pane_wifi.xml
index 80d7398..67796f6 100644
--- a/app/src/main/res/layout/pane_wifi.xml
+++ b/app/src/main/res/layout/pane_wifi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
+<com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp">
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_card_title" android:textAppearance="@style/Text.EV.Eyebrow" />
@@ -15,4 +15,4 @@
             <TextView android:id="@+id/wifi_saved_list" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:textAppearance="@style/Text.EV.Body" android:lineSpacingExtra="16dp" />
         </LinearLayout>
     </LinearLayout>
-</ScrollView>
+</com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dc031b3..79f6bc4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -107,6 +107,11 @@
     <string name="conn_err_timeout">Connection timed out</string>
     <string name="conn_err_http">Server error (HTTP %1$d)</string>
 
+    <string name="label_voice_key">Double-press the voice key to open this app</string>
+    <string name="hint_voice_key">Press the voice key on the steering wheel twice quickly. The voice assistant may still react to the presses.</string>
+    <string name="label_steering_keys">Steering-wheel keys</string>
+    <string name="hint_steering_keys">The last key reports the car sent, newest first. If double-pressing the voice key does not open the app, a photo of this list shows how the car reports it.</string>
+    <string name="steering_keys_empty">No key reports received yet. Press a steering-wheel key.</string>
     <string name="label_floating_button">Show floating button</string>
     <string name="hint_floating_button">A small round button over the car\'s screens that opens this app. Drag it to move it; it hides while the app is open.</string>
     <string name="overlay_permission_missing">This build may not draw over other apps, so the button cannot appear.</string>
diff --git a/app/src/test/java/com/evsuite/abrp/DoublePressDetectorTest.java b/app/src/test/java/com/evsuite/abrp/DoublePressDetectorTest.java
new file mode 100644
index 0000000..6f05bd6
--- /dev/null
+++ b/app/src/test/java/com/evsuite/abrp/DoublePressDetectorTest.java
@@ -0,0 +1,57 @@
+package com.evsuite.abrp;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/** Double-press detection for the voice key (287) — pure JVM. */
+public class DoublePressDetectorTest {
+
+    private static final int VOICE = 287;
+
+    @Test
+    public void broadcastsWithoutUpDownCountAsPresses() {
+        DoublePressDetector d = new DoublePressDetector(VOICE);
+        assertFalse(d.accept(VOICE, null, false, 1_000));
+        assertTrue(d.accept(VOICE, null, false, 1_350));
+    }
+
+    @Test
+    public void withDownAndUpOnlyReleasesCount() {
+        DoublePressDetector d = new DoublePressDetector(VOICE);
+        assertFalse(d.accept(VOICE, true, false, 1_000));
+        assertFalse(d.accept(VOICE, false, false, 1_080));
+        assertFalse(d.accept(VOICE, true, false, 1_250));
+        assertTrue(d.accept(VOICE, false, false, 1_330));
+    }
+
+    @Test
+    public void tooSlowIsTwoSinglePresses() {
+        DoublePressDetector d = new DoublePressDetector(VOICE);
+        assertFalse(d.accept(VOICE, null, false, 1_000));
+        assertFalse(d.accept(VOICE, null, false, 1_000 + DoublePressDetector.WINDOW_MS + 1));
+    }
+
+    @Test
+    public void otherKeysAndLongPressesDoNotCount() {
+        DoublePressDetector d = new DoublePressDetector(VOICE);
+        assertFalse(d.accept(17, null, false, 1_000));
+        assertFalse(d.accept(VOICE, null, false, 1_100));
+        assertFalse(d.accept(17, null, false, 1_200));   // another key in between is ignored
+        assertTrue(d.accept(VOICE, null, false, 1_300));
+
+        DoublePressDetector held = new DoublePressDetector(VOICE);
+        assertFalse(held.accept(VOICE, null, false, 1_000));
+        assertFalse(held.accept(VOICE, true, true, 1_100));  // long press resets
+        assertFalse(held.accept(VOICE, false, false, 1_300));
+    }
+
+    @Test
+    public void threePressesOpenOnceAndStartOver() {
+        DoublePressDetector d = new DoublePressDetector(VOICE);
+        assertFalse(d.accept(VOICE, null, false, 1_000));
+        assertTrue(d.accept(VOICE, null, false, 1_200));
+        assertFalse(d.accept(VOICE, null, false, 1_400));
+    }
+}

From 55710fb722d51c9a5ee7f8e164e85211b76ab2e8 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 23:38:36 +0200
Subject: [PATCH 40/79] App 2.7.1: voice-key double press works; floating
 button removed

The car's key report, from the on-screen key log in 2.7.0:
android.intent.extra.hardkey.keycode = 287 (Integer),
android.intent.extra.hardkey.down (Boolean; one report on press, one on
release) and android.intent.extra.hardkey.longpress (Boolean). 2.7.0
only looked for short names like "keyCode", so it never found the code.
SteeringKeyReport now matches extras by the last part of their name,
case-insensitively, and is Android-free; its tests include the exact
double press logged on the car (releases 279 ms apart). Replayed in the
car's format on the emulator: double press opens the app, single and
long presses do not.

The floating button is removed (class, geometry and test, the overlay
permission, setting, switch and strings): it did not show over the MG4
launcher.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                      |   4 +
 app/build.gradle                              |   4 +-
 app/src/main/AndroidManifest.xml              |   2 -
 .../com/evsuite/abrp/AbrpUploadService.java   |   5 -
 .../java/com/evsuite/abrp/FloatingButton.java | 224 ------------------
 .../evsuite/abrp/FloatingButtonGeometry.java  |  31 ---
 .../java/com/evsuite/abrp/MainActivity.java   |  32 +--
 .../com/evsuite/abrp/SteeringKeyListener.java |  70 +-----
 .../com/evsuite/abrp/SteeringKeyReport.java   |  82 +++++++
 .../java/com/evsuite/abrp/UploadSettings.java |   8 -
 .../main/res/layout-w1000dp/pane_service.xml  |   6 -
 app/src/main/res/layout/pane_service.xml      |   6 -
 app/src/main/res/values/strings.xml           |   6 -
 .../abrp/FloatingButtonGeometryTest.java      |  37 ---
 .../evsuite/abrp/SteeringKeyReportTest.java   |  66 ++++++
 15 files changed, 167 insertions(+), 416 deletions(-)
 delete mode 100644 app/src/main/java/com/evsuite/abrp/FloatingButton.java
 delete mode 100644 app/src/main/java/com/evsuite/abrp/FloatingButtonGeometry.java
 create mode 100644 app/src/main/java/com/evsuite/abrp/SteeringKeyReport.java
 delete mode 100644 app/src/test/java/com/evsuite/abrp/FloatingButtonGeometryTest.java
 create mode 100644 app/src/test/java/com/evsuite/abrp/SteeringKeyReportTest.java

diff --git a/SPECS.md b/SPECS.md
index c4c7e6d..0ec7454 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -114,6 +114,10 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-17 — App 2.7.1: the voice key works. The car's key report, read off the on-screen log:
+  `android.intent.extra.hardkey.keycode` (Integer), `.down` (Boolean, a report per press and per
+  release), `.longpress` (Boolean). 2.7.0 looked only for short names and never found the code.
+  Floating button removed (it did not show over the MG4 launcher).
 - 2026-10-17 — App 2.7.0: a double press of the steering wheel's voice key (code 287) opens the
   app, from the head unit's `com.saic.keyevent.hardkey.report` broadcast. Its extras are not
   documented; the usual names are tried and every report is listed raw on the Logs tab. The
diff --git a/app/build.gradle b/app/build.gradle
index d2e59ae..f38b18d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 64
-        versionName "2.7.0"
+        versionCode 65
+        versionName "2.7.1"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 191f880..36b8413 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,8 +13,6 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
-    <!-- The floating button that opens the app; the head unit's launcher does not list it. -->
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <!-- Wi-Fi auto-join. CHANGE_WIFI_STATE covers enabling the radio and asking the
          supplicant to join a network the unit already has saved; ACCESS_WIFI_STATE covers
diff --git a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
index 8431b91..ec9e2ae 100644
--- a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
+++ b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
@@ -67,7 +67,6 @@ public class AbrpUploadService extends Service {
     private ConsumptionCloudClient consumptionCloudClient;
     private ChargeSessionTracker chargeSessionTracker;
     private TelemetryUploader telemetryUploader;
-    private FloatingButton floatingButton;
     private SteeringKeyListener steeringKeys;
     private WifiAutoConnect wifi;
     private ScheduledExecutorService scheduler;
@@ -100,9 +99,6 @@ public class AbrpUploadService extends Service {
         chargeSessionTracker = ChargeSessionTracker.get(getApplicationContext());
         wifi = new WifiAutoConnect(getApplicationContext());
         telemetryUploader = new TelemetryUploader(getApplicationContext());
-        // onCreate runs on the main thread, where the overlay window must be added.
-        floatingButton = new FloatingButton(this, prefs);
-        FloatingButton.attach(floatingButton);
         steeringKeys = new SteeringKeyListener(this, prefs);
         steeringKeys.register();
 
@@ -146,7 +142,6 @@ public class AbrpUploadService extends Service {
         prefs.edit().putBoolean("service_running", false).apply();
         if (scheduler != null) scheduler.shutdownNow();
         if (telemetryUploader != null) telemetryUploader.stop();
-        if (floatingButton != null) FloatingButton.detach(floatingButton);
         if (steeringKeys != null) steeringKeys.unregister();
         Log.i(TAG, "Service stopped");
     }
diff --git a/app/src/main/java/com/evsuite/abrp/FloatingButton.java b/app/src/main/java/com/evsuite/abrp/FloatingButton.java
deleted file mode 100644
index 9b6fc9f..0000000
--- a/app/src/main/java/com/evsuite/abrp/FloatingButton.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package com.evsuite.abrp;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.PixelFormat;
-import android.graphics.drawable.GradientDrawable;
-import android.os.Handler;
-import android.os.Looper;
-import android.provider.Settings;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.WindowManager;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-
-/**
- * A small round button floating over every app, so the app can be opened on a head unit whose
- * launcher does not list it. Tap opens the app; drag moves the button, and the position is kept.
- *
- * Owned by the always-on {@link AbrpUploadService}, so it is there from boot. Hidden while the
- * app itself is in front ({@link #setAppInForeground}) and when switched off in the Upload tab.
- *
- * Drawing over other apps needs the overlay permission, which the car build holds through the
- * system UID. Without it — or if the window manager refuses — the button simply stays away:
- * a third-party app must never crash the head unit (AGENTS.md).
- *
- * All methods run on the main thread.
- */
-final class FloatingButton {
-
-    private static final String TAG = "NilsMG4.Floating";
-    static final String KEY_X = "floating_button_x";
-    static final String KEY_Y = "floating_button_y";
-    private static final int SIZE_DP = 64;
-    private static final int MARGIN_DP = 16;
-    private static final float GLYPH_SCALE = 1.45f;
-
-    private static final Handler MAIN = new Handler(Looper.getMainLooper());
-    private static FloatingButton current;
-    private static boolean appInForeground;
-
-    private final Context context;
-    private final SharedPreferences prefs;
-    private final WindowManager windowManager;
-    private View view;
-    private WindowManager.LayoutParams params;
-    private boolean added;
-
-    FloatingButton(Context context, SharedPreferences prefs) {
-        this.context = context.getApplicationContext();
-        this.prefs = prefs;
-        this.windowManager = (WindowManager) this.context.getSystemService(Context.WINDOW_SERVICE);
-    }
-
-    // ---------- Static hooks for the activity and the settings switch ----------
-
-    static void attach(FloatingButton button) {
-        current = button;
-        button.update();
-    }
-
-    static void detach(FloatingButton button) {
-        if (current == button) current = null;
-        button.removeView();
-    }
-
-    /** MainActivity's onResume/onPause: no button on top of the app itself. */
-    static void setAppInForeground(boolean inForeground) {
-        appInForeground = inForeground;
-        refresh();
-    }
-
-    /** Re-reads the switch and the permission; posted, so callable from anywhere. */
-    static void refresh() {
-        MAIN.post(() -> {
-            if (current != null) current.update();
-        });
-    }
-
-    static boolean canDraw(Context context) {
-        return Settings.canDrawOverlays(context);
-    }
-
-    // ---------- Showing and hiding ----------
-
-    void update() {
-        boolean wanted = UploadSettings.floatingButtonEnabled(prefs) && !appInForeground && canDraw(context);
-        if (wanted && !added) addView();
-        else if (!wanted && added) removeView();
-    }
-
-    private void addView() {
-        try {
-            if (view == null) view = createView();
-            DisplayMetrics metrics = new DisplayMetrics();
-            windowManager.getDefaultDisplay().getRealMetrics(metrics);
-            int size = dp(SIZE_DP);
-            int[] start = FloatingButtonGeometry.defaultPosition(
-                    metrics.widthPixels, metrics.heightPixels, size, dp(MARGIN_DP));
-            params = new WindowManager.LayoutParams(size, size,
-                    WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY,
-                    WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
-                            | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
-                    PixelFormat.TRANSLUCENT);
-            params.gravity = Gravity.TOP | Gravity.START;
-            params.x = FloatingButtonGeometry.clamp(prefs.getInt(KEY_X, start[0]), size, metrics.widthPixels);
-            params.y = FloatingButtonGeometry.clamp(prefs.getInt(KEY_Y, start[1]), size, metrics.heightPixels);
-            windowManager.addView(view, params);
-            added = true;
-        } catch (RuntimeException e) {
-            // BadTokenException, SecurityException, or anything else the platform throws: no button.
-            Log.w(TAG, "Floating button not shown: " + e);
-            added = false;
-        }
-    }
-
-    void removeView() {
-        if (!added) return;
-        try {
-            windowManager.removeView(view);
-        } catch (RuntimeException e) {
-            Log.w(TAG, "Floating button not removed cleanly: " + e);
-        }
-        added = false;
-    }
-
-    private View createView() {
-        FrameLayout frame = new FrameLayout(context);
-        GradientDrawable circle = new GradientDrawable();
-        circle.setShape(GradientDrawable.OVAL);
-        circle.setColor(context.getColor(R.color.ev_accent));
-        circle.setStroke(dp(2), context.getColor(R.color.ev_text_primary));
-        frame.setBackground(circle);
-        frame.setAlpha(0.9f);
-        frame.setElevation(dp(6));
-        frame.setContentDescription(context.getString(R.string.floating_button_description));
-        ImageView glyph = new ImageView(context);
-        glyph.setImageResource(R.drawable.ic_launcher_monochrome);
-        glyph.setScaleType(ImageView.ScaleType.FIT_CENTER);
-        // The launcher glyph keeps the adaptive-icon safe zone (a third of it empty margin);
-        // enlarged here and clipped by the circle, it fills the button instead of a corner of it.
-        glyph.setScaleX(GLYPH_SCALE);
-        glyph.setScaleY(GLYPH_SCALE);
-        frame.addView(glyph, new FrameLayout.LayoutParams(
-                FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
-        frame.setClipToOutline(true);
-        frame.setOutlineProvider(android.view.ViewOutlineProvider.BACKGROUND);
-        frame.setOnTouchListener(new DragOrTap());
-        return frame;
-    }
-
-    // ---------- Touch: drag moves, tap opens ----------
-
-    private final class DragOrTap implements View.OnTouchListener {
-        private final int touchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
-        private float downRawX, downRawY;
-        private int downX, downY;
-        private boolean dragging;
-
-        @SuppressLint("ClickableViewAccessibility") // a tap opens the app, as a click would
-        @Override
-        public boolean onTouch(View v, MotionEvent event) {
-            switch (event.getActionMasked()) {
-                case MotionEvent.ACTION_DOWN:
-                    downRawX = event.getRawX();
-                    downRawY = event.getRawY();
-                    downX = params.x;
-                    downY = params.y;
-                    dragging = false;
-                    return true;
-                case MotionEvent.ACTION_MOVE: {
-                    float dx = event.getRawX() - downRawX;
-                    float dy = event.getRawY() - downRawY;
-                    if (!dragging && FloatingButtonGeometry.isTap(dx, dy, touchSlop)) return true;
-                    dragging = true;
-                    moveTo(downX + Math.round(dx), downY + Math.round(dy));
-                    return true;
-                }
-                case MotionEvent.ACTION_UP:
-                    if (dragging) {
-                        prefs.edit().putInt(KEY_X, params.x).putInt(KEY_Y, params.y).apply();
-                    } else {
-                        openApp();
-                    }
-                    return true;
-                case MotionEvent.ACTION_CANCEL:
-                    return true;
-                default:
-                    return false;
-            }
-        }
-    }
-
-    private void moveTo(int x, int y) {
-        DisplayMetrics metrics = new DisplayMetrics();
-        windowManager.getDefaultDisplay().getRealMetrics(metrics);
-        params.x = FloatingButtonGeometry.clamp(x, params.width, metrics.widthPixels);
-        params.y = FloatingButtonGeometry.clamp(y, params.height, metrics.heightPixels);
-        try {
-            windowManager.updateViewLayout(view, params);
-        } catch (RuntimeException e) {
-            Log.w(TAG, "Floating button not moved: " + e);
-        }
-    }
-
-    private void openApp() {
-        try {
-            context.startActivity(new Intent(context, MainActivity.class)
-                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT));
-        } catch (RuntimeException e) {
-            Log.w(TAG, "App not opened: " + e);
-        }
-    }
-
-    private int dp(int value) {
-        return Math.round(value * context.getResources().getDisplayMetrics().density);
-    }
-}
diff --git a/app/src/main/java/com/evsuite/abrp/FloatingButtonGeometry.java b/app/src/main/java/com/evsuite/abrp/FloatingButtonGeometry.java
deleted file mode 100644
index 022300d..0000000
--- a/app/src/main/java/com/evsuite/abrp/FloatingButtonGeometry.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.evsuite.abrp;
-
-/**
- * Where the floating button sits and whether a touch was a tap. Android-free, unit-tested.
- * Positions are the button's top-left corner in pixels, as WindowManager takes them.
- */
-final class FloatingButtonGeometry {
-
-    /** How far down the screen the button starts, as a fraction of the height. */
-    static final float DEFAULT_TOP_FRACTION = 0.4f;
-
-    private FloatingButtonGeometry() { }
-
-    /** Right edge, about 40 % down, inset by [margin] from the edge. */
-    static int[] defaultPosition(int screenWidth, int screenHeight, int size, int margin) {
-        return new int[]{
-                clamp(screenWidth - size - margin, size, screenWidth),
-                clamp(Math.round(screenHeight * DEFAULT_TOP_FRACTION), size, screenHeight)};
-    }
-
-    /** Keeps the whole button on screen, whatever position was saved or dragged to. */
-    static int clamp(int position, int size, int screen) {
-        int max = Math.max(0, screen - size);
-        return Math.max(0, Math.min(position, max));
-    }
-
-    /** A touch that moved no further than the system touch slop is a tap, not a drag. */
-    static boolean isTap(float dx, float dy, int touchSlop) {
-        return dx * dx + dy * dy <= (float) touchSlop * touchSlop;
-    }
-}
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 2b21fb7..fae8d78 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -120,9 +120,8 @@ public class MainActivity extends AppCompatActivity {
     private TextView connectionStatusText;
 
     /** Upload page: live telemetry switch and cadence. */
-    private SwitchMaterial liveTelemetrySwitch, boostSwitch, floatingButtonSwitch, voiceKeySwitch;
+    private SwitchMaterial liveTelemetrySwitch, boostSwitch, voiceKeySwitch;
     private TextView steeringKeysText;
-    private View overlayPermissionNote;
     private android.widget.Spinner intervalSpinner;
     private TextInputLayout lowSocLayout;
     private TextInputEditText lowSocInput;
@@ -307,8 +306,6 @@ public class MainActivity extends AppCompatActivity {
         super.onResume();
         // Poll state and log only while the screen is up; onPause cancels it.
         uiHandler.post(uiRefresh);
-        FloatingButton.setAppInForeground(true);
-        refreshOverlayPermissionNote();
     }
 
     @Override
@@ -316,7 +313,6 @@ public class MainActivity extends AppCompatActivity {
         super.onPause();
         // Stop polling off-screen: this activity has no reason to spend cycles then.
         uiHandler.removeCallbacks(uiRefresh);
-        FloatingButton.setAppInForeground(false);
     }
 
     // ---------- Update check ----------
@@ -802,22 +798,6 @@ public class MainActivity extends AppCompatActivity {
         voiceKeySwitch.setChecked(UploadSettings.voiceKeyOpensApp(prefs));
         voiceKeySwitch.setOnCheckedChangeListener((btn, checked) ->
                 prefs.edit().putBoolean(UploadSettings.KEY_VOICE_KEY_OPENS, checked).apply());
-        floatingButtonSwitch = servicePane.findViewById(R.id.floating_button_switch);
-        overlayPermissionNote = servicePane.findViewById(R.id.overlay_permission_note);
-        floatingButtonSwitch.setChecked(UploadSettings.floatingButtonEnabled(prefs));
-        floatingButtonSwitch.setOnCheckedChangeListener((btn, checked) -> {
-            prefs.edit().putBoolean(UploadSettings.KEY_FLOATING_BUTTON, checked).apply();
-            FloatingButton.refresh();
-            refreshOverlayPermissionNote();
-        });
-        servicePane.findViewById(R.id.overlay_permission_button).setOnClickListener(v -> {
-            try {
-                startActivity(new Intent(android.provider.Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
-                        Uri.parse("package:" + getPackageName())));
-            } catch (android.content.ActivityNotFoundException e) {
-                Toast.makeText(this, R.string.overlay_settings_missing, Toast.LENGTH_LONG).show();
-            }
-        });
         liveTelemetrySwitch = servicePane.findViewById(R.id.abrp_upload_switch);
         intervalSpinner = servicePane.findViewById(R.id.interval_spinner);
         boostSwitch = servicePane.findViewById(R.id.boost_switch);
@@ -874,16 +854,6 @@ public class MainActivity extends AppCompatActivity {
         });
     }
 
-    /**
-     * The note under the floating-button switch: only when the button is wanted but this build
-     * may not draw over other apps (the car build may, through the system UID).
-     */
-    private void refreshOverlayPermissionNote() {
-        if (overlayPermissionNote == null) return;
-        boolean missing = UploadSettings.floatingButtonEnabled(prefs) && !FloatingButton.canDraw(this);
-        overlayPermissionNote.setVisibility(missing ? View.VISIBLE : View.GONE);
-    }
-
     /** Clamped to 1-99: 0 would never trigger and 100 would boost permanently. */
     private void saveLowSocThreshold() {
         CharSequence raw = lowSocInput.getText();
diff --git a/app/src/main/java/com/evsuite/abrp/SteeringKeyListener.java b/app/src/main/java/com/evsuite/abrp/SteeringKeyListener.java
index 45431e5..ec377f6 100644
--- a/app/src/main/java/com/evsuite/abrp/SteeringKeyListener.java
+++ b/app/src/main/java/com/evsuite/abrp/SteeringKeyListener.java
@@ -20,9 +20,9 @@ import java.util.Locale;
  * Opens the app on a double press of the steering wheel's voice key.
  *
  * The head unit reports steering-wheel keys as the broadcast {@link #ACTION}; code 287 is the
- * voice key (see EVHardware's PhysicalButtonEventDecoder). How the broadcast carries the code
- * and the press is not documented, so the usual extras are tried, and every broadcast is kept
- * raw for the Logs tab — if the guess misses, that list says exactly what the car sends.
+ * voice key (see EVHardware's PhysicalButtonEventDecoder). The extras' format was read off the
+ * car (see {@link SteeringKeyReport}); every report is still kept raw for the Logs tab, in case
+ * another firmware sends them differently.
  *
  * Registered by the always-on service on the main thread; never throws into the head unit.
  */
@@ -93,7 +93,7 @@ final class SteeringKeyListener {
 
     private void handle(Intent intent) {
         Bundle extras = intent.getExtras();
-        Parsed key = parse(extras);
+        SteeringKeyReport key = read(extras);
         boolean opens = false;
         if (key.code != null && UploadSettings.voiceKeyOpensApp(prefs)) {
             opens = detector.accept(key.code, key.down, key.longPress, android.os.SystemClock.elapsedRealtime());
@@ -113,67 +113,21 @@ final class SteeringKeyListener {
         }
     }
 
-    // ---------- Reading an undocumented broadcast ----------
+    // ---------- Reading the broadcast ----------
 
-    static final class Parsed {
-        Integer code;
-        Boolean down;
-        boolean longPress;
-    }
-
-    private static final String[] CODE_KEYS = {"keyCode", "keycode", "key_code", "KEY_CODE", "keyValue",
-            "key_value", "code", "key"};
-    private static final String[] ACTION_KEYS = {"keyAction", "key_action", "KEY_ACTION", "action",
-            "keyState", "key_state", "state", "event", "type"};
-    private static final String[] DOWN_KEYS = {"down", "isDown", "pressed", "isPressed"};
-    private static final String[] LONG_KEYS = {"longPress", "isLongPress", "long_press", "isLong", "long"};
-
-    static Parsed parse(Bundle extras) {
-        Parsed p = new Parsed();
-        if (extras == null) return p;
+    /** An embedded KeyEvent if there is one, otherwise the extras by name (SteeringKeyReport). */
+    static SteeringKeyReport read(Bundle extras) {
+        if (extras == null) return SteeringKeyReport.parse(null);
+        java.util.Map<String, Object> values = new java.util.HashMap<>();
         for (String k : extras.keySet()) {
             Object v = extras.get(k);
             if (v instanceof KeyEvent) {
                 KeyEvent e = (KeyEvent) v;
-                p.code = e.getKeyCode();
-                p.down = e.getAction() == KeyEvent.ACTION_DOWN;
-                p.longPress = e.isLongPress();
-                return p;
+                return new SteeringKeyReport(e.getKeyCode(), e.getAction() == KeyEvent.ACTION_DOWN, e.isLongPress());
             }
+            values.put(k, v);
         }
-        p.code = firstInt(extras, CODE_KEYS);
-        Integer action = firstInt(extras, ACTION_KEYS);
-        // KeyEvent's own convention: 0 down, 1 up; anything else (often 2) is a long press.
-        if (action != null) {
-            if (action == 0) p.down = true;
-            else if (action == 1) p.down = false;
-            else p.longPress = true;
-        }
-        Boolean down = firstBoolean(extras, DOWN_KEYS);
-        if (down != null) p.down = down;
-        Boolean longPress = firstBoolean(extras, LONG_KEYS);
-        if (longPress != null) p.longPress = longPress;
-        return p;
-    }
-
-    private static Integer firstInt(Bundle b, String[] keys) {
-        for (String k : keys) {
-            Object v = b.get(k);
-            if (v instanceof Integer) return (Integer) v;
-            if (v instanceof Long) return (int) (long) (Long) v;
-            if (v instanceof String) {
-                try { return Integer.parseInt(((String) v).trim()); } catch (NumberFormatException ignored) { }
-            }
-        }
-        return null;
-    }
-
-    private static Boolean firstBoolean(Bundle b, String[] keys) {
-        for (String k : keys) {
-            Object v = b.get(k);
-            if (v instanceof Boolean) return (Boolean) v;
-        }
-        return null;
+        return SteeringKeyReport.parse(values);
     }
 
     /** All extras as name=value(type), so the Logs tab shows the real format. */
diff --git a/app/src/main/java/com/evsuite/abrp/SteeringKeyReport.java b/app/src/main/java/com/evsuite/abrp/SteeringKeyReport.java
new file mode 100644
index 0000000..eb864de
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/SteeringKeyReport.java
@@ -0,0 +1,82 @@
+package com.evsuite.abrp;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Reads one steering-wheel key report from the broadcast's extras.
+ *
+ * Seen on the MG4 (2026-10-17, on-screen key log): the head unit sends
+ *   android.intent.extra.hardkey.keycode   = 287   (Integer)
+ *   android.intent.extra.hardkey.down      = true  (Boolean, then false on release)
+ *   android.intent.extra.hardkey.longpress = false (Boolean)
+ * Names are matched on their last dot-separated part, case-insensitively, so this exact form
+ * and simpler ones ("keyCode", "down", …) are both understood.
+ *
+ * Android-free (the extras arrive as a plain map), unit-tested.
+ */
+final class SteeringKeyReport {
+
+    final Integer code;
+    final Boolean down;
+    final boolean longPress;
+
+    SteeringKeyReport(Integer code, Boolean down, boolean longPress) {
+        this.code = code;
+        this.down = down;
+        this.longPress = longPress;
+    }
+
+    private static final String[] CODE_NAMES = {"keycode", "key_code", "keyvalue", "key_value", "code", "key"};
+    private static final String[] ACTION_NAMES = {"keyaction", "key_action", "action", "keystate", "key_state",
+            "state", "event", "type"};
+    private static final String[] DOWN_NAMES = {"down", "isdown", "pressed", "ispressed"};
+    private static final String[] LONG_NAMES = {"longpress", "islongpress", "long_press", "islong", "long"};
+
+    static SteeringKeyReport parse(Map<String, Object> extras) {
+        Map<String, Object> byName = new HashMap<>();
+        if (extras != null) {
+            for (Map.Entry<String, Object> e : extras.entrySet()) {
+                String key = e.getKey();
+                String last = key.substring(key.lastIndexOf('.') + 1).toLowerCase(Locale.US);
+                byName.putIfAbsent(last, e.getValue());
+            }
+        }
+        Integer code = firstInt(byName, CODE_NAMES);
+        Boolean down = null;
+        boolean longPress = false;
+        // KeyEvent's own convention for a numeric action: 0 down, 1 up; anything else is long.
+        Integer action = firstInt(byName, ACTION_NAMES);
+        if (action != null) {
+            if (action == 0) down = true;
+            else if (action == 1) down = false;
+            else longPress = true;
+        }
+        Boolean explicitDown = firstBoolean(byName, DOWN_NAMES);
+        if (explicitDown != null) down = explicitDown;
+        Boolean explicitLong = firstBoolean(byName, LONG_NAMES);
+        if (explicitLong != null) longPress = explicitLong;
+        return new SteeringKeyReport(code, down, longPress);
+    }
+
+    private static Integer firstInt(Map<String, Object> byName, String[] names) {
+        for (String n : names) {
+            Object v = byName.get(n);
+            if (v instanceof Integer) return (Integer) v;
+            if (v instanceof Long) return (int) (long) (Long) v;
+            if (v instanceof String) {
+                try { return Integer.parseInt(((String) v).trim()); } catch (NumberFormatException ignored) { }
+            }
+        }
+        return null;
+    }
+
+    private static Boolean firstBoolean(Map<String, Object> byName, String[] names) {
+        for (String n : names) {
+            Object v = byName.get(n);
+            if (v instanceof Boolean) return (Boolean) v;
+        }
+        return null;
+    }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/UploadSettings.java b/app/src/main/java/com/evsuite/abrp/UploadSettings.java
index aa00d32..fd3d717 100644
--- a/app/src/main/java/com/evsuite/abrp/UploadSettings.java
+++ b/app/src/main/java/com/evsuite/abrp/UploadSettings.java
@@ -16,10 +16,6 @@ final class UploadSettings {
     static final String KEY_LOW_SOC_PERCENT = "low_soc_percent";
     static final String KEY_AUTOSTART       = "autostart";
     static final String KEY_ABRP_UPLOAD_ENABLED = "abrp_upload_enabled";
-    /** The floating button that opens the app over the head unit's own screens. */
-    static final String KEY_FLOATING_BUTTON = "floating_button";
-    static final boolean DEFAULT_FLOATING_BUTTON = true;
-
     /** A double press of the steering wheel's voice key opens the app. */
     static final String KEY_VOICE_KEY_OPENS = "voice_key_opens_app";
 
@@ -27,10 +23,6 @@ final class UploadSettings {
         return prefs.getBoolean(KEY_VOICE_KEY_OPENS, true);
     }
 
-    static boolean floatingButtonEnabled(SharedPreferences prefs) {
-        return prefs.getBoolean(KEY_FLOATING_BUTTON, DEFAULT_FLOATING_BUTTON);
-    }
-
     /**
      * On by default: an ABRP plan is only useful if it is fed from the moment the drive
      * starts, and nobody opens this app before setting off. Kept as a switch because a
diff --git a/app/src/main/res/layout-w1000dp/pane_service.xml b/app/src/main/res/layout-w1000dp/pane_service.xml
index 9506515..ea2863f 100644
--- a/app/src/main/res/layout-w1000dp/pane_service.xml
+++ b/app/src/main/res/layout-w1000dp/pane_service.xml
@@ -8,12 +8,6 @@
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Secondary" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_key_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_voice_key" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_voice_key" android:textAppearance="@style/Text.EV.Secondary" />
-            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/floating_button_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_floating_button" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_floating_button" android:textAppearance="@style/Text.EV.Secondary" />
-            <LinearLayout android:id="@+id/overlay_permission_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:layout_marginTop="8dp" android:visibility="gone">
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/overlay_permission_missing" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_error" />
-                <com.google.android.material.button.MaterialButton android:id="@+id/overlay_permission_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/btn_overlay_permission" />
-            </LinearLayout>
         </LinearLayout>
         <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_service_timing" android:textAppearance="@style/Text.EV.Eyebrow" />
diff --git a/app/src/main/res/layout/pane_service.xml b/app/src/main/res/layout/pane_service.xml
index 2a70e57..b14540c 100644
--- a/app/src/main/res/layout/pane_service.xml
+++ b/app/src/main/res/layout/pane_service.xml
@@ -8,12 +8,6 @@
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Secondary" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_key_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_voice_key" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_voice_key" android:textAppearance="@style/Text.EV.Secondary" />
-            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/floating_button_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_floating_button" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_floating_button" android:textAppearance="@style/Text.EV.Secondary" />
-            <LinearLayout android:id="@+id/overlay_permission_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:layout_marginTop="8dp" android:visibility="gone">
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/overlay_permission_missing" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_error" />
-                <com.google.android.material.button.MaterialButton android:id="@+id/overlay_permission_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/btn_overlay_permission" />
-            </LinearLayout>
         </LinearLayout>
         <Space android:layout_width="1dp" android:layout_height="20dp" />
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 79f6bc4..9f7431d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -112,12 +112,6 @@
     <string name="label_steering_keys">Steering-wheel keys</string>
     <string name="hint_steering_keys">The last key reports the car sent, newest first. If double-pressing the voice key does not open the app, a photo of this list shows how the car reports it.</string>
     <string name="steering_keys_empty">No key reports received yet. Press a steering-wheel key.</string>
-    <string name="label_floating_button">Show floating button</string>
-    <string name="hint_floating_button">A small round button over the car\'s screens that opens this app. Drag it to move it; it hides while the app is open.</string>
-    <string name="overlay_permission_missing">This build may not draw over other apps, so the button cannot appear.</string>
-    <string name="btn_overlay_permission">Allow display over other apps</string>
-    <string name="overlay_settings_missing">The system screen for this permission is not available here</string>
-    <string name="floating_button_description">Open Nils\' MG4</string>
     <string name="label_abrp_upload_enabled">Send live telemetry to the server</string>
     <string name="hint_abrp_upload_enabled">The server stores it and forwards it to ABRP. Turn this off when another app feeds ABRP; consumption and charging tracking keep running.</string>
 
diff --git a/app/src/test/java/com/evsuite/abrp/FloatingButtonGeometryTest.java b/app/src/test/java/com/evsuite/abrp/FloatingButtonGeometryTest.java
deleted file mode 100644
index ae4d5c5..0000000
--- a/app/src/test/java/com/evsuite/abrp/FloatingButtonGeometryTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.evsuite.abrp;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-/** The floating button's position and tap rules — pure JVM. */
-public class FloatingButtonGeometryTest {
-
-    @Test
-    public void startsAtTheRightEdgeAboutFortyPercentDown() {
-        // The MG4 head unit is 1920 x 720; 64 px button, 16 px margin.
-        assertArrayEquals(new int[]{1840, 288}, FloatingButtonGeometry.defaultPosition(1920, 720, 64, 16));
-    }
-
-    @Test
-    public void staysFullyOnScreen() {
-        assertEquals(0, FloatingButtonGeometry.clamp(-50, 64, 1920));
-        assertEquals(1856, FloatingButtonGeometry.clamp(5000, 64, 1920));
-        assertEquals(700, FloatingButtonGeometry.clamp(700, 64, 1920));
-        // A saved position from a larger screen still lands inside a smaller one.
-        assertEquals(720 - 64, FloatingButtonGeometry.clamp(1000, 64, 720));
-        // A screen smaller than the button pins it to the corner instead of going negative.
-        assertEquals(0, FloatingButtonGeometry.clamp(10, 64, 40));
-    }
-
-    @Test
-    public void aTouchWithinTheSlopIsATapAnythingFurtherADrag() {
-        assertTrue(FloatingButtonGeometry.isTap(0, 0, 8));
-        assertTrue(FloatingButtonGeometry.isTap(5, -6, 8));    // 7.8 px
-        assertFalse(FloatingButtonGeometry.isTap(6, 6, 8));    // 8.5 px
-        assertFalse(FloatingButtonGeometry.isTap(0, 40, 8));
-    }
-}
diff --git a/app/src/test/java/com/evsuite/abrp/SteeringKeyReportTest.java b/app/src/test/java/com/evsuite/abrp/SteeringKeyReportTest.java
new file mode 100644
index 0000000..57cdc08
--- /dev/null
+++ b/app/src/test/java/com/evsuite/abrp/SteeringKeyReportTest.java
@@ -0,0 +1,66 @@
+package com.evsuite.abrp;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+
+/** Reading the head unit's key reports, as seen on the MG4 — pure JVM. */
+public class SteeringKeyReportTest {
+
+    private static Map<String, Object> car(int code, boolean down, boolean longPress) {
+        Map<String, Object> m = new HashMap<>();
+        m.put("android.intent.extra.hardkey.keycode", code);
+        m.put("android.intent.extra.hardkey.down", down);
+        m.put("android.intent.extra.hardkey.longpress", longPress);
+        return m;
+    }
+
+    @Test
+    public void readsTheMg4Format() {
+        SteeringKeyReport r = SteeringKeyReport.parse(car(287, true, false));
+        assertEquals(Integer.valueOf(287), r.code);
+        assertEquals(Boolean.TRUE, r.down);
+        assertFalse(r.longPress);
+        assertEquals(Boolean.FALSE, SteeringKeyReport.parse(car(287, false, false)).down);
+        assertTrue(SteeringKeyReport.parse(car(287, true, true)).longPress);
+    }
+
+    @Test
+    public void theDoublePressFromTheCarOpensTheApp() {
+        // The sequence logged on the MG4 at 23:31:02: down .300, up .442, down .545, up .721.
+        DoublePressDetector d = new DoublePressDetector(SteeringKeyListener.VOICE_KEY);
+        long[] at = {300, 442, 545, 721};
+        boolean[] down = {true, false, true, false};
+        boolean opened = false;
+        for (int i = 0; i < at.length; i++) {
+            SteeringKeyReport r = SteeringKeyReport.parse(car(287, down[i], false));
+            opened |= d.accept(r.code, r.down, r.longPress, at[i]);
+        }
+        assertTrue(opened);
+    }
+
+    @Test
+    public void simpleNamesStillWork() {
+        Map<String, Object> m = new HashMap<>();
+        m.put("keyCode", 17);
+        m.put("action", 1);
+        SteeringKeyReport r = SteeringKeyReport.parse(m);
+        assertEquals(Integer.valueOf(17), r.code);
+        assertEquals(Boolean.FALSE, r.down);
+    }
+
+    @Test
+    public void nothingUsableStaysUnknown() {
+        SteeringKeyReport r = SteeringKeyReport.parse(new HashMap<>());
+        assertNull(r.code);
+        assertNull(r.down);
+        assertFalse(r.longPress);
+        assertNull(SteeringKeyReport.parse(null).code);
+    }
+}

From 3f1e1968170cd362ad41cc48784148fddee7efe5 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 23:52:33 +0200
Subject: [PATCH 41/79] App 2.8.0: full screen

Immersive full screen while the app is in front: the system's top and
bottom bars are hidden, and a swipe from the edge shows them briefly.
Re-applied whenever the window regains focus. A "Full screen" switch in
the Upload tab (default on) turns it off.

On the Android 9 emulator the bars are hidden (system UI flags 0x1706),
stay hidden after leaving and returning, and the switch toggles them
through the UI. Whether SAIC's own bars on the MG4 obey the flags is
only known on the car; if they do not, nothing changes.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                      |  3 ++
 app/build.gradle                              |  4 +-
 .../java/com/evsuite/abrp/MainActivity.java   | 37 ++++++++++++++++++-
 .../java/com/evsuite/abrp/UploadSettings.java |  7 ++++
 .../main/res/layout-w1000dp/pane_service.xml  |  2 +
 app/src/main/res/layout/pane_service.xml      |  2 +
 app/src/main/res/values/strings.xml           |  2 +
 7 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index 0ec7454..d5fa8e9 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -114,6 +114,9 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-17 — App 2.8.0: immersive full screen (switch in the Upload tab, default on). Hides the
+  system bars on the emulator; whether SAIC's own bars on the MG4 can be hidden is only known once
+  tried on the car.
 - 2026-10-17 — App 2.7.1: the voice key works. The car's key report, read off the on-screen log:
   `android.intent.extra.hardkey.keycode` (Integer), `.down` (Boolean, a report per press and per
   release), `.longpress` (Boolean). 2.7.0 looked only for short names and never found the code.
diff --git a/app/build.gradle b/app/build.gradle
index f38b18d..a050f40 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 65
-        versionName "2.7.1"
+        versionCode 66
+        versionName "2.8.0"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index fae8d78..44fa0b0 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -120,7 +120,7 @@ public class MainActivity extends AppCompatActivity {
     private TextView connectionStatusText;
 
     /** Upload page: live telemetry switch and cadence. */
-    private SwitchMaterial liveTelemetrySwitch, boostSwitch, voiceKeySwitch;
+    private SwitchMaterial liveTelemetrySwitch, boostSwitch, voiceKeySwitch, fullScreenSwitch;
     private TextView steeringKeysText;
     private android.widget.Spinner intervalSpinner;
     private TextInputLayout lowSocLayout;
@@ -308,6 +308,35 @@ public class MainActivity extends AppCompatActivity {
         uiHandler.post(uiRefresh);
     }
 
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+        // The system shows its bars again when focus moves (a dialog, the bars swiped in);
+        // re-applying on regaining focus keeps the app full screen.
+        if (hasFocus) applyFullScreen();
+    }
+
+    /**
+     * Immersive full screen: the head unit's top and bottom bars are hidden while the app is
+     * in front, and a swipe from the edge shows them briefly. On the MG4 those bars are SAIC's
+     * own (climate strip, hazard and home shortcuts); if the platform keeps them, these flags
+     * simply have no effect.
+     */
+    @SuppressWarnings("deprecation") // the WindowInsetsController API starts at 30; this is 28
+    private void applyFullScreen() {
+        View decor = getWindow().getDecorView();
+        if (UploadSettings.fullScreen(prefs)) {
+            decor.setSystemUiVisibility(View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_FULLSCREEN);
+        } else {
+            decor.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
+        }
+    }
+
     @Override
     protected void onPause() {
         super.onPause();
@@ -798,6 +827,12 @@ public class MainActivity extends AppCompatActivity {
         voiceKeySwitch.setChecked(UploadSettings.voiceKeyOpensApp(prefs));
         voiceKeySwitch.setOnCheckedChangeListener((btn, checked) ->
                 prefs.edit().putBoolean(UploadSettings.KEY_VOICE_KEY_OPENS, checked).apply());
+        fullScreenSwitch = servicePane.findViewById(R.id.full_screen_switch);
+        fullScreenSwitch.setChecked(UploadSettings.fullScreen(prefs));
+        fullScreenSwitch.setOnCheckedChangeListener((btn, checked) -> {
+            prefs.edit().putBoolean(UploadSettings.KEY_FULL_SCREEN, checked).apply();
+            applyFullScreen();
+        });
         liveTelemetrySwitch = servicePane.findViewById(R.id.abrp_upload_switch);
         intervalSpinner = servicePane.findViewById(R.id.interval_spinner);
         boostSwitch = servicePane.findViewById(R.id.boost_switch);
diff --git a/app/src/main/java/com/evsuite/abrp/UploadSettings.java b/app/src/main/java/com/evsuite/abrp/UploadSettings.java
index fd3d717..7a867a3 100644
--- a/app/src/main/java/com/evsuite/abrp/UploadSettings.java
+++ b/app/src/main/java/com/evsuite/abrp/UploadSettings.java
@@ -16,6 +16,13 @@ final class UploadSettings {
     static final String KEY_LOW_SOC_PERCENT = "low_soc_percent";
     static final String KEY_AUTOSTART       = "autostart";
     static final String KEY_ABRP_UPLOAD_ENABLED = "abrp_upload_enabled";
+    /** Hide the head unit's system bars while the app is open. */
+    static final String KEY_FULL_SCREEN = "full_screen";
+
+    static boolean fullScreen(SharedPreferences prefs) {
+        return prefs.getBoolean(KEY_FULL_SCREEN, true);
+    }
+
     /** A double press of the steering wheel's voice key opens the app. */
     static final String KEY_VOICE_KEY_OPENS = "voice_key_opens_app";
 
diff --git a/app/src/main/res/layout-w1000dp/pane_service.xml b/app/src/main/res/layout-w1000dp/pane_service.xml
index ea2863f..2ed63fd 100644
--- a/app/src/main/res/layout-w1000dp/pane_service.xml
+++ b/app/src/main/res/layout-w1000dp/pane_service.xml
@@ -6,6 +6,8 @@
             <TextView android:id="@+id/status_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_input_panel" android:padding="16dp" android:layout_marginTop="20dp" android:layout_marginBottom="12dp" android:text="@string/state_stopped" android:textAppearance="@style/Text.EV.Body" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/abrp_upload_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Secondary" />
+            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/full_screen_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_full_screen" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_full_screen" android:textAppearance="@style/Text.EV.Secondary" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_key_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_voice_key" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_voice_key" android:textAppearance="@style/Text.EV.Secondary" />
         </LinearLayout>
diff --git a/app/src/main/res/layout/pane_service.xml b/app/src/main/res/layout/pane_service.xml
index b14540c..fbe693c 100644
--- a/app/src/main/res/layout/pane_service.xml
+++ b/app/src/main/res/layout/pane_service.xml
@@ -6,6 +6,8 @@
             <TextView android:id="@+id/status_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_input_panel" android:padding="16dp" android:layout_marginTop="20dp" android:layout_marginBottom="12dp" android:text="@string/state_stopped" android:textAppearance="@style/Text.EV.Body" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/abrp_upload_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Secondary" />
+            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/full_screen_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_full_screen" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_full_screen" android:textAppearance="@style/Text.EV.Secondary" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_key_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_voice_key" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_voice_key" android:textAppearance="@style/Text.EV.Secondary" />
         </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9f7431d..6d4d5ab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -107,6 +107,8 @@
     <string name="conn_err_timeout">Connection timed out</string>
     <string name="conn_err_http">Server error (HTTP %1$d)</string>
 
+    <string name="label_full_screen">Full screen</string>
+    <string name="hint_full_screen">Hides the car\'s top and bottom bars while this app is open. Swipe in from the top or bottom edge to show them briefly, e.g. for the climate controls.</string>
     <string name="label_voice_key">Double-press the voice key to open this app</string>
     <string name="hint_voice_key">Press the voice key on the steering wheel twice quickly. The voice assistant may still react to the presses.</string>
     <string name="label_steering_keys">Steering-wheel keys</string>

From 8bad5fc024c085691216aa44ce5656ee583ebebe Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sat, 17 Oct 2026 23:55:08 +0200
Subject: [PATCH 42/79] Three-part version names for the car build

The unstable flavor appended upstream's CI build number as a fourth
part (2.8.0.0-unstable; always .0 without CI). Versions are now the
plain three-part defaultConfig version: 2.8.1-unstable, and build-car
names the APK NilsMG4-unstable-2.8.1.apk. The version code keeps the
x100000 factor (2.8.1 = 6700000): without it the code would fall below
the 6600000 already installed, and the installer refuses downgrades.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md         |  3 +++
 app/build.gradle | 28 ++++++++++++----------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index d5fa8e9..7384c96 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -114,6 +114,9 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-17 — App 2.8.1: three-part version names (`2.8.1-unstable`, `NilsMG4-unstable-2.8.1.apk`).
+  Upstream's fourth part was its CI build number; the version code keeps the x100000 factor so it
+  never falls below codes already installed.
 - 2026-10-17 — App 2.8.0: immersive full screen (switch in the Upload tab, default on). Hides the
   system bars on the emulator; whether SAIC's own bars on the MG4 can be hidden is only known once
   tried on the car.
diff --git a/app/build.gradle b/app/build.gradle
index a050f40..663cecf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 66
-        versionName "2.8.0"
+        versionCode 67
+        versionName "2.8.1"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
@@ -61,16 +61,13 @@ android {
         unstable {
             dimension "channel"
             applicationIdSuffix ".unstable"
-            // Android uses versionCode, not versionName, to order package updates. Give
-            // every rolling CI build a strictly increasing code so Package Installer does
-            // not treat a newer unstable APK as the same package version.
-            versionCode defaultConfig.versionCode * 100000 +
-                    (project.findProperty('unstableBuild') ?: '0').toString().toInteger()
-            // Le numéro de build fait partie du COEUR numérique de la version
-            // ("1.0.42-unstable"), pas du suffixe : l'updater compare des segments
-            // numériques, donc deux builds unstable doivent différer avant le premier tiret.
-            // -PunstableBuild=<n> est passé par la CI ; 0 en local.
-            versionName "${defaultConfig.versionName}.${project.findProperty('unstableBuild') ?: '0'}"
+            // Three-part versions, the same as defaultConfig ("2.8.1-unstable"). Upstream added
+            // a fourth part for its CI build number; there is no CI here and the OTA updater is
+            // off. The version code keeps upstream's x100000 so it never drops below codes
+            // already installed on the car (2.8.0.0 was 6600000): a lower code is a downgrade,
+            // which the installer refuses.
+            versionCode defaultConfig.versionCode * 100000
+            versionName defaultConfig.versionName
             versionNameSuffix "-unstable"
             buildConfigField "boolean", "OTA_ENABLED", "true"
         }
@@ -106,12 +103,11 @@ android {
     }
 }
 
-// Version publiée par la CI pour composer le nom de l'asset APK : ce nom DOIT être
-// comparable par l'updater ("NilsMG4-unstable-1.0.42.apk"). Le tag de la
-// pré-release est la constante "unstable", écrasée à chaque build.
+// The version build-car puts in the APK's file name ("NilsMG4-unstable-2.8.1.apk"), which
+// is also the name the OTA updater reads a release's version from.
 tasks.register('printUnstableVersion') {
     doLast {
-        println "${android.defaultConfig.versionName}.${project.findProperty('unstableBuild') ?: '0'}"
+        println android.defaultConfig.versionName
     }
 }
 

From 1b918e3c397ca4296e072333797f89d73e7c62dd Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 00:00:58 +0200
Subject: [PATCH 43/79] App 2.8.2: full screen fills the space the bars leave

On the MG4 the immersive flags hid SAIC's bars but left a black band
where they had been. SYSTEM_UI_FLAG_LAYOUT_STABLE reports the bars'
insets even while they are hidden, and the fitsSystemWindows root
padded itself by them. In full screen the flag is dropped and the root
no longer fits system windows; switching full screen off restores both.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                           |  3 +++
 app/build.gradle                                   |  4 ++--
 .../main/java/com/evsuite/abrp/MainActivity.java   | 14 ++++++++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index 7384c96..ce32a63 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -114,6 +114,9 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.8.2: full screen uses the whole display. The MG4 hid its bars but left a black
+  band where they were: LAYOUT_STABLE kept reporting the bars' insets and the fitsSystemWindows root
+  padded for them. Both are off in full screen now.
 - 2026-10-17 — App 2.8.1: three-part version names (`2.8.1-unstable`, `NilsMG4-unstable-2.8.1.apk`).
   Upstream's fourth part was its CI build number; the version code keeps the x100000 factor so it
   never falls below codes already installed.
diff --git a/app/build.gradle b/app/build.gradle
index 663cecf..30a0a16 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 67
-        versionName "2.8.1"
+        versionCode 68
+        versionName "2.8.2"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 44fa0b0..6dc5165 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -321,13 +321,23 @@ public class MainActivity extends AppCompatActivity {
      * in front, and a swipe from the edge shows them briefly. On the MG4 those bars are SAIC's
      * own (climate strip, hazard and home shortcuts); if the platform keeps them, these flags
      * simply have no effect.
+     *
+     * The content takes the space the bars leave: no LAYOUT_STABLE (it reports the bars' insets
+     * even while they are hidden), and the root stops padding itself for them. On the MG4 that
+     * padding stayed as a black band where the bars had been (2.8.1).
      */
     @SuppressWarnings("deprecation") // the WindowInsetsController API starts at 30; this is 28
     private void applyFullScreen() {
         View decor = getWindow().getDecorView();
-        if (UploadSettings.fullScreen(prefs)) {
+        boolean full = UploadSettings.fullScreen(prefs);
+        View root = findViewById(R.id.app_root);
+        if (root != null) {
+            root.setFitsSystemWindows(!full);
+            if (full) root.setPadding(0, 0, 0, 0);
+            root.requestApplyInsets();
+        }
+        if (full) {
             decor.setSystemUiVisibility(View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE
                     | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
                     | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
                     | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION

From 4b858e3c3510e069d8229682ce4e0b68fcef5659 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 00:08:14 +0200
Subject: [PATCH 44/79] README for Nils' MG4

Rewritten for this fork: the car server, InfluxDB and Grafana setup,
pairing by QR code, the app's tabs, voice-key opening and full screen,
installing the platform-signed car build, the config file under the new
package ID, building with Nix, and credits. Adds a current screenshot
(2.8.2 at 1920x720, emulator).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 README.md                              | 327 +++++++++++--------------
 screenshots/nilsmg4-2.8.2-overview.png | Bin 0 -> 144681 bytes
 2 files changed, 140 insertions(+), 187 deletions(-)
 create mode 100644 screenshots/nilsmg4-2.8.2-overview.png

diff --git a/README.md b/README.md
index d723b58..6b1084f 100644
--- a/README.md
+++ b/README.md
@@ -1,261 +1,214 @@
-# FatihsMG4
+# Nils' MG4
 
-<p align="center"><img src="docs/logo.svg" width="440" alt="FatihsMG4"></p>
+An Android Automotive app for the **MG4 (SAIC eh32)** head unit, plus a small server: the car
+sends its telemetry to my own server at car.k8s.stinnesbeck.com, which stores it in InfluxDB 2,
+forwards live data to [A Better Route Planner](https://abetterrouteplanner.com) and feeds the
+Grafana dashboards.
 
-[![Release](https://img.shields.io/github/v/release/fatihdonmezdev/FatihsMG4?include_prereleases&sort=semver)](https://github.com/fatihdonmezdev/FatihsMG4/releases)
-[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
+No OBD dongle and no phone in the loop: the app runs on the head unit and reads the car's own
+APIs.
 
-Sends live telemetry from an **MG4 (SAIC eh32)** to
-[A Better Route Planner](https://abetterrouteplanner.com) — battery level, speed, range,
-temperature, charging state and position — straight from the car's own APIs.
-
-No OBD dongle. No Home Assistant. No phone in the loop. The app runs on the car's head
-unit and talks to ABRP directly.
+- Repository: https://git.stinnesbeck.com/nils/mg4
+- Fork of [fatihdonmezdev/FatihsMG4](https://github.com/fatihdonmezdev/FatihsMG4), itself built on malys' EVABRPUploader and Leon Kernan's `ABRP_Uploader`.
+- What changed and what is still to do: [`SPECS.md`](SPECS.md).
 
 > ⚠️ **No warranty, no liability.** This software is provided "as is" and runs on a
-> **vehicle**. Installing it is your decision and your risk — see
+> **vehicle**. Installing it is your decision and your risk; see
 > [`DISCLAIMER.md`](DISCLAIMER.md). Not affiliated with SAIC, MG Motor or Iternio.
-> MG and MG4 are third-party marks used only to identify compatibility; no official origin
-> or approval is claimed.
+> MG and MG4 are third-party marks used only to identify compatibility.
 
-> **Fork notice.** This is a fork of Leon Kernan's `ABRP_Uploader`, substantially
-> reworked. **Read [`LICENSE.md`](LICENSE.md) before redistributing anything** — the
-> upstream project carries no licence, which limits what may legally be published.
+> **Licence.** The original `ABRP_Uploader` carries no licence, which limits what may legally
+> be published. Read [`LICENSE.md`](LICENSE.md) before redistributing anything.
 
 ---
 
 ## Contents
 
-- [Screenshots](#screenshots)
-- [Overview](#overview)
-- [Install](#install)
-- [Configuration](#configuration)
+- [Screenshot](#screenshot)
+- [How it fits together](#how-it-fits-together)
+- [The app](#the-app)
+- [Install on the car](#install-on-the-car)
+- [Setup](#setup)
 - [Building](#building)
+- [Server and dashboards](#server-and-dashboards)
 - [Project layout](#project-layout)
 - [Project documents](#project-documents)
-- [Security](#security)
-- [Contributing](#contributing)
-- [Legal](#legal)
 - [Credits](#credits)
 
-## Screenshots
+## Screenshot
 
-Version 2.2.6 introduces an OLED-black interface with charcoal cards, muted gold and
-cyan accents, a vehicle overview, and responsive side or bottom navigation. This
-app-specific theme intentionally overrides the shared EVSuite visual tokens.
-Tablet UI previews at 1280×720; vehicle readings are unavailable on this device.
+Version 2.8.2 on the head unit's 1920x720 screen, in full screen (Android 9 emulator; no
+vehicle there, so every value shows as a dash).
 
 <p align="center">
-  <img src="screenshots/evabrp-2.2.6-overview.png" width="760" alt="OLED vehicle overview with energy and tyre panels above compact metrics">
-  <img src="screenshots/evabrp-2.2.6-abrp.png" width="760" alt="Dark ABRP account configuration">
+  <img src="screenshots/nilsmg4-2.8.2-overview.png" width="900" alt="Overview tab: battery, range, range estimates, power and speed tiles above the energy and tyre-pressure cards">
 </p>
 
----
+## How it fits together
 
-## Overview
-| Signal | Source | Firmwares |
-|---|---|---|
-| State of charge | `EVHardware` vendor charging service, with a SWI68 property fallback | all supported (fallback SWI68 only) |
-| Range | `EVHardware` vendor charging service, standard AAOS property, then SWI68 fallback | all supported |
-| Speed, parked state | `EVHardware` shared energy snapshot | all supported |
-| Outside temperature | The head unit's weather broadcast, falling back to its map-service query; the vehicle sensor first where one exists | all supported (the vehicle sensor is absent on MG4) |
-| Charging, DC fast charging | Charge port state + charge rate heuristic | where the VHAL implements them |
-| Charged energy this session | `EVHardware` charging-session integration | where the charge rate is readable |
-| State of energy, pack capacity, pack temperature | `EVHardware` typed standard-AAOS reads | where the VHAL implements them |
-| Odometer, tyre pressures | Standard AAOS properties (privileged) | platform-signed installs only |
-| Cabin temperature | `EVHardware` typed HVAC read | where the VHAL implements it |
-| Climate setpoint | `EVHardware` shared energy snapshot | all supported |
-| Position, elevation, heading | GPS | — |
+```
+car ──live telemetry───▶ car.k8s.stinnesbeck.com (Go) ──▶ ABRP
+    ──daily chunks─────▶          │
+    ──charging sessions▶          ▼
+                              InfluxDB 2 ◀── Grafana
+```
 
-All vehicle telemetry goes through **EVHardware**, which detects the generation
-(SWI68/69/131/132/133/165), owns property ids and units, and applies the shared nullable
-fallback order. `CarPropertyAdapter` remains only as transport for the debug-only VHAL probe
-and is never instantiated by the production service. See [`FIRMWARE.md`](FIRMWARE.md).
+The ABRP credentials live only on the server, never in the APK. The car authenticates with a
+token of its own, obtained by pairing with a phone (below).
 
-Odometer and tyre pressures sit behind privileged AAOS permissions: a platform-signed
-install sends them, any other install simply omits them.
+## The app
 
-A property the car will not give up is **omitted** from the payload, never sent as zero —
-so ABRP is never told the battery is empty because a read failed. Position is held to the
-same rule in time as well as in value: a GPS fix older than `max(5 min, 3 x your upload
-interval)` is dropped rather than resent, so a stale fix cannot report the car back at the
-place it set off from.
+| Tab | What it shows |
+|---|---|
+| **Overview** | Battery, range, range estimates at current power and at the 5-minute average, power, speed; odometer, climate setpoint and tyre pressures |
+| **Consumption** | Daily and period consumption, efficiency |
+| **Charging** | Charging sessions and curves, cost in euro |
+| **Upload** | Live telemetry on/off, full screen, voice key, upload cadence |
+| **Server** | Server URL, pairing by QR code, ingest token, installation ID, config import |
+| **Wi-Fi** | Joins a network the head unit already knows (e.g. the phone hotspot) |
+| **Logs** | Upload log and the last steering-wheel key reports |
 
-Telemetry only reads the car. Version 2.2.5 removes window automation entirely; there
-is no window service, door listener or window command path in the app.
+- **Opening the app:** the MG4 launcher does not list third-party apps. **Double-press the
+  voice key** on the steering wheel and the app comes to the front (switch on the Upload tab,
+  on by default).
+- **Full screen:** hides SAIC's top and bottom bars while the app is open; a swipe from the
+  edge shows them briefly (Upload tab, on by default).
+- **Live telemetry:** every 15 s while driving or charging, much less often while parked. A
+  value the car cannot read is left out, never sent as zero, so ABRP is never told the battery
+  is empty because a read failed.
+- **Read-only:** the app never writes a vehicle setting.
 
-## Install
-The MG4 head unit hides Settings and APK install. The known route in:
-The MG4 head unit has no visible way to open Settings or install an APK. The known route
-in (via the on-screen keyboard) is:
+Signals the MG4 does not publish (battery, cabin and outside temperature, pack energy and
+capacity) are listed in [`SPECS.md`](SPECS.md#signals-the-car-does-not-provide).
 
-1. Open any app with a text field and tap it to raise the on-screen keyboard — e.g. the
-   Amazon Music app's email/login field.
-2. **Long-press** the comma `,` (or the `@`) key on the keyboard.
-3. Tap **"Language settings"**.
-4. Tap the **search** icon in the top bar and type **`backup`**. It opens an empty page —
-   now press the **back** arrow, and you land in Android's Settings panel.
-5. Enable **Developer options**, and turn on **"Install unknown apps"** (unknown sources).
-6. In Settings, search **`storage`** — you now have access to internal storage and the USB
-   key. Navigate to the APK and tap it to install.
+## Install on the car
 
-> ⚠️ You are enabling developer options and sideloading on a car. Do this **parked**, and
-> only with an APK you trust. See [DISCLAIMER.md](DISCLAIMER.md).
+The car build (`NilsMG4-unstable-<version>.apk`) runs with the system UID and is signed with the
+AOSP test platform key that the MG4 head unit uses. It installs next to the old FatihsMG4 app
+(package `com.stinnesbeck.nilsmg4.unstable`), not over it.
 
-Two channels. Pick one — they install side by side.
+Without adb, through the head unit's hidden file manager:
 
-| Channel | Auto-update | Use it if |
-|---|---|---|
-| **Stable** | No. Contains no updater at all. | You want the car to run what you put on it |
-| **Unstable** | Yes, from GitHub pre-releases | You are testing and want fixes as they land |
+1. Copy the APK to a USB stick and plug it in.
+2. Open **Bluetooth Settings** and select the car name.
+3. Long-press the **comma** key until the keyboard settings appear.
+4. **Android Keyboard Settings → Languages**, then search for `file` in the box at the top.
+5. That opens the Files app: open the USB stick, tap the APK and install.
 
-Grab the APK from [Releases](https://github.com/fatihdonmezdev/FatihsMG4/releases). Stable builds are the tagged ones; unstable builds
-are marked pre-release.
+With adb:
 
-### Getting the APK onto the car
+```sh
+adb push build/car/NilsMG4-unstable-<version>.apk /data/local/tmp/update.apk
+adb shell "pm install -r -f -d -t /data/local/tmp/update.apk"
+```
 
-The MG4 has no visible file manager. To reach it:
+> ⚠️ Do this **parked**, and only with an APK you trust. See [DISCLAIMER.md](DISCLAIMER.md).
 
-1. Open **Bluetooth Settings** and select the car name.
-2. Long-press the **comma** key until the keyboard settings appear.
-3. **Android Keyboard Settings → Languages**.
-4. Search for `file` in the search box at the top.
-5. That gives you the Files app.
+Self-updating (OTA) is switched off: the updater points at an unresolvable host until it is
+pointed at this repository's releases (see `SPECS.md`).
 
-From there, open your USB stick and tap the APK.
+## Setup
 
-### First run
-
-1. Open the app.
-2. By default, the app prefills the open-source telemetry API key published by the
-   [SAIC Python MQTT Gateway](https://github.com/SAIC-iSmart-API/saic-python-mqtt-gateway#abrp-api-integration).
-   You can replace it with your own key. Get a token from your ABRP account.
-3. Paste the token, press **Test** (read-only — it does not send telemetry), then **Save**.
-4. Turn the switch on. The service restarts with the car from then on.
-
-Typing a long API key and token on the car's on-screen keyboard is painful. Instead you can
-put them in a text file and tap **Import file** — see [Config file](#config-file) below.
-
-## Configuration
-
-| Setting | Default | Notes |
-|---|---|---|
-| Upload frequency | 60 s | 15 / 30 / 60 / 120 / 300 s. Applies while driving |
-| More often at low battery | On | Tightens to 15 s below the threshold |
-| Low battery threshold | 20 % | Editable, 1–99 |
-| Service on/off | Off | Also the "stop uploading" control |
-
-Parked and unplugged, the app drops to **one upload every 15 minutes** on its own,
-whatever the setting. A state change — parked, plugged in, unplugged — always uploads
-immediately.
+1. Open the app (voice key double press, or "Open" right after installing).
+2. On the **Server** tab the URL is already `https://car.k8s.stinnesbeck.com`.
+3. Tap **Pair with phone**. Scan the QR code with a phone (or open the address shown and enter
+   the code), and approve with the server's approval password. The car receives its token.
+4. On the **Upload** tab, turn live telemetry on. The service starts with the car from then on.
 
 ### Config file
 
-To avoid typing on the head unit, put your settings in a plain text file and tap **Import file**
-on the **ABRP** tab. The app fills in whatever the file contains. Nothing is sent — press
-**Test**, then **Save** as usual.
-
-The head unit has no file picker, so the file is not chosen by hand: copy it from a PC into
+Instead of typing, put the settings in a text file and tap **Import file** on the Server tab.
+The head unit has no file picker, so copy the file to
 
 ```
-Android/data/com.evsuite.abrp/files/
+Android/data/com.stinnesbeck.nilsmg4.unstable/files/
 ```
 
-on the USB stick (or on the head unit's internal storage), then tap **Import file**. The app
-scans that folder on every mounted volume and takes the first file that parses — the name does
-not matter. If nothing is found it shows the exact path to copy to. On a phone or tablet, where
-a document picker exists, the button falls back to letting you pick any file.
-
-The file is a `key = value` list, one per line. Blank lines and lines starting with `#` are
-ignored, keys are case-insensitive, and any key you leave out keeps its current value:
+on the USB stick or the internal storage. The app scans that folder on every mounted volume and
+takes the first file that parses. Format, one `key = value` per line, `#` for comments; keys left
+out keep their current value:
 
 ```
-# ABRP Uploader config
-api_key = your-abrp-api-key
-token   = your-abrp-user-token
-
-# optional — the cadence controls, same values as the UI
-interval_sec    = 60      # snapped to 15 / 30 / 60 / 120 / 300
+server_url      = https://car.k8s.stinnesbeck.com
+token           = the server's INGEST_TOKEN (not needed after pairing)
+installation_id = keep the old one when reinstalling, so history stays together
+interval_sec    = 60      # 15 / 30 / 60 / 120 / 300
 boost_low_soc   = true
-low_soc_percent = 20      # clamped to 1–99
+low_soc_percent = 20
 ```
 
-Only `api_key` and `token` are usually needed. The file is read once on import and not kept —
-your credentials live only in the app's encrypted store afterwards.
+The file is read once and not kept; credentials live only in the app's encrypted store.
 
 ### Power
 
-The app holds **no wake lock** and schedules **no alarms**, so it cannot wake a sleeping
-head unit; it costs nothing while the car is off. While the car is on, both the upload tick
-and the GPS subscription cost power, and the GPS interval follows your configured
-frequency.
-
-At defaults that is roughly **59 uploads/hour driving** and **3/hour parked**.
+The app holds **no wake lock** and schedules **no alarms**, so it cannot wake a sleeping head
+unit and costs nothing while the car is off.
 
 ## Building
-Requires JDK 17 and the Android SDK. With [mise](https://mise.jdev):
 
-```bash
-mise install          # JDK
-mise run bootstrap    # Android SDK + local.properties
-mise run check        # permission gate + lint + tests
-mise run build        # debug APK
+With Nix:
+
+```sh
+nix develop                    # JDK 21, Android SDK, Go
+./gradlew assembleStableDebug  # debug APK for a phone or tablet
+build-car                      # car APK, signed with the AOSP test platform key
 ```
 
-Without mise: set `JAVA_HOME` to a JDK 17, write `sdk.dir` into `local.properties`, then
-`./gradlew assembleStableDebug`.
+`build-car` writes `build/car/NilsMG4-unstable-<version>.apk` and a `.sha256` next to it, and
+checks the signing certificate before it finishes.
 
-Release builds are signed from environment variables. These sign the **APK** and have
-nothing to do with your ABRP API key, which you type into the app itself:
+Tests and lint:
 
-| Variable | What it is |
-|---|---|
-| `SIGNING_KEYSTORE` | Path to the keystore file (CI decodes `SIGNING_KEYSTORE_BASE64` into one) |
-| `SIGNING_STORE_PASSWORD` | Opens the keystore container |
-| `SIGNING_KEY_ALIAS` | Which key inside it to sign with (default `platform`) |
-| `SIGNING_KEY_PASSWORD` | Opens that particular key — a keystore protects each key separately |
+```sh
+./gradlew testStableDebugUnitTest testUnstableDebugUnitTest lintStableDebug
+```
 
-**Never commit a keystore or a password.** Put them in `mise.local.toml`, which is
-gitignored, or in GitHub Actions secrets.
+[`mise`](https://mise.jdx.dev) tasks from upstream (`mise run check`, `mise run build`) still
+work for the plain Gradle builds.
+
+## Server and dashboards
+
+- **Server** ([`server/`](server/README.md)): Go, API only. Live telemetry, daily consumption
+  chunks, charging sessions, pairing; forwards live data to ABRP. Image at
+  `git.stinnesbeck.com/nils/mg4-server`.
+- **Kubernetes** ([`k8s/`](k8s/README.md)): plain manifests for the server, InfluxDB 2 and
+  Grafana, applied by hand with `kubectl apply -k k8s/`. Secrets go in the gitignored
+  `k8s/secrets/secrets.yaml`, from the template next to it.
+- **Grafana dashboards** (`k8s/grafana/dashboards/`): Live, Consumption and Charging, provisioned
+  with the InfluxDB datasource.
 
 ## Project layout
+
 ```
-app/src/main      upload service, ABRP payload and UI
-EVHardware        shared vehicle reads, energy snapshot and integration
-app/src/stable    no-op update hook — the stable channel cannot self-update
-app/src/unstable  audited updater policy; runtime trigger currently suspended
-app/src/debug     VHAL probe tools, absent from every release build
+app/src/main      app: upload service, server client, pairing, UI
+app/src/stable    no-op update hook (no updater in the APK)
+app/src/unstable  car build: system UID, updater (currently pointed nowhere)
+app/src/debug     VHAL probe tools, absent from release builds
 app/src/test      JVM unit tests
+EVHardware        shared vehicle reads per firmware generation
+server/           Go server
+k8s/              Kubernetes manifests and Grafana provisioning
+flake.nix         dev shell and build-car
 ```
 
 ## Project documents
+
 | Document | What it covers |
 |---|---|
-| [DESIGN.md](DESIGN.md) | The EVSuite design system — colour, type, touch targets, icons |
+| [SPECS.md](SPECS.md) | Journal of this fork: architecture, status, to-dos, done log |
+| [FIRMWARE.md](FIRMWARE.md) | MG4 firmware generations and how the app reads each |
 | [AGENTS.md](AGENTS.md) | Context for AI agents working in this repository |
-| [CONTRIBUTING.md](CONTRIBUTING.md) | How to build, test and submit a change |
-| [SECURITY.md](SECURITY.md) | Threat model and vulnerability disclosure |
-| [DISCLAIMER.md](DISCLAIMER.md) | Vehicle-safety disclaimer — read before installing |
-| [CHANGELOG.md](CHANGELOG.md) | Release history |
-| [LICENSE.md](LICENSE.md) | Licence text |
-
-## Security
-See [SECURITY.md](SECURITY.md) for the threat model and how to report a vulnerability
-privately.
-
-## Contributing
-See [`CONTRIBUTING.md`](CONTRIBUTING.md). Short version: this code runs on a moving
-vehicle, so changes need tests and a clear account of what you verified on a car and what
-you did not.
-
-## Legal
-- [`DISCLAIMER.md`](DISCLAIMER.md) — no warranty, no liability, not affiliated with the
-  carmaker or with ABRP.
-- [`LICENSE.md`](LICENSE.md) — unresolved licence status inherited from the fork source.
-  Read it before redistributing.
-- [`SECURITY.md`](SECURITY.md) — how to report a vulnerability privately.
+| [DESIGN.md](DESIGN.md) | The EVSuite design system (the app overrides its palette) |
+| [SECURITY.md](SECURITY.md) | Threat model |
+| [DISCLAIMER.md](DISCLAIMER.md) | Vehicle-safety disclaimer; read before installing |
+| [CHANGELOG.md](CHANGELOG.md) | Upstream release history |
+| [LICENSE.md](LICENSE.md) | Licence status |
 
 ## Credits
-- Original app: **Leon Kernan** — the car-API approach and the first working uploader.
+
+- **fatihdonmezdev**: [FatihsMG4](https://github.com/fatihdonmezdev/FatihsMG4), the app this fork
+  starts from.
+- **malys**: EVABRPUploader.
+- **Leon Kernan**: the original `ABRP_Uploader`, the car-API approach and the first working
+  uploader.
 - ABRP telemetry API: [Iternio](https://documenter.getpostman.com/view/7396339/SWTK5a8w).
-- Sibling project: **EVProfile**, whose security and CI patterns this repo reuses.
diff --git a/screenshots/nilsmg4-2.8.2-overview.png b/screenshots/nilsmg4-2.8.2-overview.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bfb9bd87d0b8e778b893ec4a4c22372a7ffbbb7
GIT binary patch
literal 144681
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%0AbjE
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
TxYSez1U^>g$IWU?h|&K84t*Hz

literal 0
HcmV?d00001


From 9bebf56b3a635e7157b07767e81d6f690dbd3825 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 00:09:52 +0200
Subject: [PATCH 45/79] Docs: new package ID and APK names

OTA.md, mise.toml and docs/MG4_PLATFORM_INSTALL.md now use
com.stinnesbeck.nilsmg4(.unstable) and NilsMG4-*.apk. OTA.md says the
updater is switched off and that its publishing steps are upstream's
GitHub process; it also drops the old four-part version example.
CHANGELOG.md keeps the old ID as upstream history.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 OTA.md                       | 23 ++++++++++++++---------
 SPECS.md                     |  5 +++--
 docs/MG4_PLATFORM_INSTALL.md | 10 +++++-----
 mise.toml                    |  2 +-
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/OTA.md b/OTA.md
index 1e1ad16..79d4c66 100644
--- a/OTA.md
+++ b/OTA.md
@@ -17,7 +17,8 @@ UI; it becomes available to OTA only after publication as a pre-release asset na
 `FatihsMG4-unstable-2.2.7.apk`, together with
 `FatihsMG4-unstable-2.2.7.apk.sha256`.
 
-The vehicle artifact uses `com.evsuite.abrp.unstable`, `android.uid.system`, and the
+The vehicle artifact uses `com.stinnesbeck.nilsmg4.unstable` (upstream: `com.evsuite.abrp.unstable`),
+`android.uid.system`, and the
 DriveHub_Kamera platform key. Its certificate SHA-256 must be
 `c8a2e9bccf597c2fb6dc66bee293fc13f2fc47ec77bc6b2b0d52c11f51192ab8`.
 The stable build used for a Samsung UI preview is a separate package without OTA or the
@@ -25,8 +26,12 @@ vehicle's shared UID; do not use that preview APK for the MG4 upgrade.
 
 ## What the updater actually looks for
 
-`OtaUpdater.check()` reads `https://api.github.com/repos/fatihdonmezdev/FatihsMG4/releases`
-and walks **every** entry, keeping the highest version rather than the first match. A
+> **Switched off in Nils' MG4.** `RELEASES_API` points at `updates.invalid`, so every check
+> fails. To re-enable it, point it at this repository's releases and add the host to
+> `ALLOWED_HOSTS` (see `SPECS.md`). The steps below are upstream's GitHub process.
+
+`OtaUpdater.check()` reads the `RELEASES_API` URL (upstream:
+`https://api.github.com/repos/fatihdonmezdev/FatihsMG4/releases`) and walks **every** entry, keeping the highest version rather than the first match. A
 release is a candidate only if all of these hold:
 
 | Requirement | Where it is enforced | What happens otherwise |
@@ -55,7 +60,7 @@ The version comes from the **asset filename**, not the git tag. The tag can stay
    versionName "2.2.7"
    ```
 
-   The unstable flavour appends its own suffix, so `2.2.7` becomes `2.2.7.0-unstable`.
+   The unstable flavour appends its own suffix, so `2.2.7` becomes `2.2.7-unstable`.
    Check what the installed build reports before picking a number: the app's About
    dialog shows it, and `isNewer` compares numerically segment by segment.
 
@@ -79,24 +84,24 @@ The version comes from the **asset filename**, not the git tag. The tag can stay
    "$BT/apksigner" sign \
      --key  "$KEYS/platform.pk8" \
      --cert "$KEYS/platform.x509.pem" \
-     --out  FatihsMG4-unstable-2.2.7.apk \
+     --out  NilsMG4-unstable-2.2.7.apk \
      aligned.apk
 
    rm aligned.apk
    ```
 
    The output filename **is** the version the updater reads. Name it
-   `FatihsMG4-unstable-<version>.apk`, then create its required integrity sidecar:
+   `NilsMG4-unstable-<version>.apk` (`build-car` does steps 2 to 4 and names it so), then create its required integrity sidecar:
 
    ```bash
-   shasum -a 256 FatihsMG4-unstable-2.2.7.apk \
-     > FatihsMG4-unstable-2.2.7.apk.sha256
+   shasum -a 256 NilsMG4-unstable-2.2.7.apk \
+     > NilsMG4-unstable-2.2.7.apk.sha256
    ```
 
 4. **Verify the signer** before uploading. It must say `CN=Android`:
 
    ```bash
-   "$BT/apksigner" verify --print-certs FatihsMG4-unstable-2.2.7.apk
+   "$BT/apksigner" verify --print-certs NilsMG4-unstable-2.2.7.apk
    ```
 
 5. **Publish.** On github.com/fatihdonmezdev/FatihsMG4 → Releases → Draft a new release:
diff --git a/SPECS.md b/SPECS.md
index ce32a63..5bb8cc2 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -82,8 +82,6 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
 - [ ] **Telemetry queue survives restarts.** Unsent live samples are kept in memory only.
 - [ ] **Translate the rest.** The docs (`CHANGELOG.md`, `OTA.md`'s
       message table, comments in `mise.toml`/`app/build.gradle`) are still Turkish or French.
-- [ ] **Docs still use the old package ID.** `README.md`, `OTA.md`, `CHANGELOG.md`, `mise.toml` and
-      `docs/MG4_PLATFORM_INSTALL.md` refer to `com.evsuite.abrp(.unstable)` and `FatihsMG4-*.apk`.
 - [ ] **Move hardcoded UI strings into `strings.xml`.** Many are inline in Java and layouts.
 
 ## Done
@@ -114,6 +112,9 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — README rewritten for Nils' MG4. `OTA.md`, `mise.toml` and
+  `docs/MG4_PLATFORM_INSTALL.md` use the new package ID and `NilsMG4-*.apk` names; `OTA.md` notes
+  that updates are switched off. `CHANGELOG.md` keeps the old ID as upstream history.
 - 2026-10-18 — App 2.8.2: full screen uses the whole display. The MG4 hid its bars but left a black
   band where they were: LAYOUT_STABLE kept reporting the bars' insets and the fitsSystemWindows root
   padded for them. Both are off in full screen now.
diff --git a/docs/MG4_PLATFORM_INSTALL.md b/docs/MG4_PLATFORM_INSTALL.md
index 32f923d..816f234 100644
--- a/docs/MG4_PLATFORM_INSTALL.md
+++ b/docs/MG4_PLATFORM_INSTALL.md
@@ -57,15 +57,15 @@ later install says `No such file or directory`, re-push.
 ## Verifying the Install
 
 ```bash
-adb shell pm path com.evsuite.abrp.unstable
-# -> package:/data/app/com.evsuite.abrp.unstable-.../base.apk
+adb shell pm path com.stinnesbeck.nilsmg4.unstable
+# -> package:/data/app/com.stinnesbeck.nilsmg4.unstable-.../base.apk
 ```
 
 To confirm the platform signature matches the system:
 
 ```bash
 BUILD_TOOLS="$ANDROID_HOME/build-tools/36.0.0"
-adb pull "$(adb shell pm path com.evsuite.abrp.unstable | sed 's/package://')" /tmp/installed.apk
+adb pull "$(adb shell pm path com.stinnesbeck.nilsmg4.unstable | sed 's/package://')" /tmp/installed.apk
 "$BUILD_TOOLS/apksigner" verify --print-certs /tmp/installed.apk
 # SHA-256 cert digest should match tools/platform.x509.pem
 ```
@@ -73,7 +73,7 @@ adb pull "$(adb shell pm path com.evsuite.abrp.unstable | sed 's/package://')" /
 ## Uninstalling
 
 ```bash
-adb uninstall com.evsuite.abrp.unstable
+adb uninstall com.stinnesbeck.nilsmg4.unstable
 ```
 
 Add `-k` to keep data/cache around (useful when re-installing to test without
@@ -92,7 +92,7 @@ SDK="$HOME/Library/Android/sdk"
 BT="$SDK/build-tools/36.0.0"
 IN=app/build/outputs/apk/unstable/debug/app-unstable-debug.apk
 ALIGNED=app/build/outputs/apk/unstable/debug/app-unstable-debug-aligned.apk
-OUT=FatihsMG4-unstable-platform.apk
+OUT=NilsMG4-unstable-platform.apk
 "$BT/zipalign" -f 4 "$IN" "$ALIGNED"
 "$BT/apksigner" sign --key tools/platform.pk8 --cert tools/platform.x509.pem --out "$OUT" "$ALIGNED"
 "$BT/apksigner" verify --verbose "$OUT"
diff --git a/mise.toml b/mise.toml
index 932bafb..35eb1ab 100644
--- a/mise.toml
+++ b/mise.toml
@@ -216,6 +216,6 @@ fi
 APK=$(ls -t app/build/outputs/apk/stable/debug/*.apk | head -1)
 echo "Installation de $APK"
 $ADB install -r -g "$APK"
-$ADB shell am start -n "com.evsuite.abrp/com.evsuite.abrp.MainActivity"
+$ADB shell am start -n "com.stinnesbeck.nilsmg4/com.evsuite.abrp.MainActivity"
 echo "Lancé. Logs : mise run logs"
 '''

From a5db5604d36f2c59c75424350c62178975da796d Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 00:36:19 +0200
Subject: [PATCH 46/79] Code review fixes: app 2.9.0, server 2.2.0

Telemetry no longer loses queued batches. The server drops a bad value,
or a sample without a plausible time, instead of rejecting the batch,
and answers 200 with what it dropped. The app sends only values inside
the server's ranges (speed as a magnitude, so reversing is fine) and no
samples before the head unit's clock is set.

Server:
- Pairing hands out and accepts a token only after the device is saved;
  a failed save leaves the request pending.
- A paired token serves only the installation id it was paired with
  (403 otherwise); the shared INGEST_TOKEN still serves any.
- Wrong-password lockouts and open pairing requests are limited per
  client address (last X-Forwarded-For entry), so a stranger cannot
  lock the owner out; a car starting again replaces its own request.
- ABRP forwarding skips samples stamped ahead of the server's clock,
  which used to stop it until a restart.

App:
- Settings written to plaintext during a keystore failure move back
  into encrypted storage; the stored installation id wins.
- The installation id is derived from ANDROID_ID on first start, so a
  reinstall finds its history; a stored or imported id still wins.
- The scanned config file is deleted after import (it holds the token).
- GPS stops while live telemetry is off or the server unconfigured, and
  pauses while parked and idle, keeping the fix the car parked with.
- Range estimates use the monotonic clock.
- One HTTP helper (ServerHttp) for telemetry, sync and pairing.
- Last Turkish strings translated; mise logs shows the NilsMG4 tags.

Grafana reads InfluxDB with its own read-only token (new grafana-influx
Secret, created by hand as described in k8s/README.md).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 README.md                                     |   9 +-
 SPECS.md                                      |  16 +++
 app/build.gradle                              |   4 +-
 .../com/evsuite/abrp/AbrpUploadService.java   |   5 +-
 .../evsuite/abrp/ConsumptionCloudClient.java  | 133 +++++-------------
 .../java/com/evsuite/abrp/MainActivity.java   |  33 +++--
 .../java/com/evsuite/abrp/PairingClient.java  |  51 +------
 .../java/com/evsuite/abrp/RangeEstimator.java |   4 +-
 .../java/com/evsuite/abrp/SecurePrefs.java    |  53 ++++++-
 .../java/com/evsuite/abrp/ServerConfig.java   |  33 ++++-
 .../java/com/evsuite/abrp/ServerHttp.java     |  87 ++++++++++++
 .../com/evsuite/abrp/TelemetryPayload.java    |  56 +++++++-
 .../com/evsuite/abrp/TelemetryUploader.java   |  86 ++++++-----
 .../com/evsuite/abrp/WifiAutoConnect.java     |   4 +-
 app/src/main/res/values/strings.xml           |   2 +
 .../com/evsuite/abrp/SecurePrefsTest.java     |  40 ++++++
 .../com/evsuite/abrp/ServerConfigTest.java    |  17 +++
 .../evsuite/abrp/TelemetryPayloadTest.java    |  41 ++++++
 .../evsuite/abrp/TelemetryUploaderTest.java   |  19 +++
 k8s/README.md                                 |  30 +++-
 k8s/grafana.yaml                              |   6 +-
 k8s/secrets/secrets.example.yaml              |  11 ++
 k8s/server.yaml                               |   4 +-
 mise.toml                                     |   2 +-
 server/README.md                              |  20 ++-
 server/abrp.go                                |  19 +--
 server/api.go                                 |  94 ++++++++++---
 server/api_test.go                            |  25 +++-
 server/logic_test.go                          |  12 ++
 server/model.go                               |   2 +
 server/pairing.go                             | 127 ++++++++++++-----
 server/pairing_http.go                        |  27 +++-
 server/pairing_test.go                        | 103 +++++++++++++-
 server/validate.go                            |  56 +++++---
 server/validate_test.go                       |  54 ++++---
 35 files changed, 962 insertions(+), 323 deletions(-)
 create mode 100644 app/src/main/java/com/evsuite/abrp/ServerHttp.java
 create mode 100644 app/src/test/java/com/evsuite/abrp/SecurePrefsTest.java
 create mode 100644 app/src/test/java/com/evsuite/abrp/TelemetryUploaderTest.java

diff --git a/README.md b/README.md
index 6b1084f..18a0a39 100644
--- a/README.md
+++ b/README.md
@@ -131,13 +131,18 @@ out keep their current value:
 ```
 server_url      = https://car.k8s.stinnesbeck.com
 token           = the server's INGEST_TOKEN (not needed after pairing)
-installation_id = keep the old one when reinstalling, so history stays together
+installation_id = only to carry over history from an install older than 2.9.0
 interval_sec    = 60      # 15 / 30 / 60 / 120 / 300
 boost_low_soc   = true
 low_soc_percent = 20
 ```
 
-The file is read once and not kept; credentials live only in the app's encrypted store.
+After a successful import the app deletes the file, since it holds the token; credentials live
+only in the app's encrypted store.
+
+The installation ID is derived from the head unit, so a reinstall finds its history again on its
+own. `installation_id` is only needed to carry history over from an install made before 2.9.0.
+A paired token belongs to one installation ID: after changing the ID, pair again.
 
 ### Power
 
diff --git a/SPECS.md b/SPECS.md
index 5bb8cc2..433bd62 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -112,6 +112,22 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — Code review fixes. App 2.9.0, server 2.2.0, Grafana token:
+  - The server drops a bad value (or a sample without a plausible time) instead of rejecting
+    the batch, and answers 200 with what it dropped; the app sends only values within the
+    server's ranges (speed as a magnitude) and no samples before its clock is set. Before, one
+    reversing sample cost the whole queued batch.
+  - Pairing: the token is handed out and accepted only after the device is saved; wrong-password
+    lockouts and open-request limits are per client address; a paired token only serves its
+    own installation id (403 otherwise).
+  - ABRP forwarding skips samples stamped ahead of the server's clock, which used to block it.
+  - App: settings written in plaintext during a keystore failure move back into encrypted
+    storage; the installation id is derived from ANDROID_ID, so a reinstall keeps its history;
+    the imported config file is deleted; GPS stops when live telemetry is off and pauses while
+    parked and idle; range estimates use the monotonic clock; one HTTP helper (`ServerHttp`)
+    for all server calls; the last Turkish strings translated.
+  - Grafana reads InfluxDB with its own read-only token (`grafana-influx` Secret, created by
+    hand: `k8s/README.md`).
 - 2026-10-18 — README rewritten for Nils' MG4. `OTA.md`, `mise.toml` and
   `docs/MG4_PLATFORM_INSTALL.md` use the new package ID and `NilsMG4-*.apk` names; `OTA.md` notes
   that updates are switched off. `CHANGELOG.md` keeps the old ID as upstream history.
diff --git a/app/build.gradle b/app/build.gradle
index 30a0a16..3abff06 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 68
-        versionName "2.8.2"
+        versionCode 69
+        versionName "2.9.0"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
index ec9e2ae..be5cb34 100644
--- a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
+++ b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
@@ -160,7 +160,8 @@ public class AbrpUploadService extends Service {
         long sampleMs = System.currentTimeMillis();
         EnergySnapshot vehicle = energyReader.read(sampleMs);
         // Keeps the 5-minute range average going while the app is in the background.
-        RangeEstimator.shared().add(sampleMs, vehicle.getBatteryPowerKw(), vehicle.getSpeedKmh());
+        RangeEstimator.shared().add(android.os.SystemClock.elapsedRealtime(),
+                vehicle.getBatteryPowerKw(), vehicle.getSpeedKmh());
         consumptionTracker.sample(vehicle);
         chargeSessionTracker.sample(vehicle);
         consumptionCloudClient.syncIfDue(consumptionTracker, chargeSessionTracker, sampleMs);
@@ -173,8 +174,10 @@ public class AbrpUploadService extends Service {
 
         UploadSettings settings = UploadSettings.from(prefs);
         if (!ServerConfig.get(this).isConfigured()) {
+            telemetryUploader.stop(); // no live telemetry, so no GPS either
             updateNotification(getString(R.string.server_not_configured));
         } else if (!settings.abrpUploadEnabled) {
+            telemetryUploader.stop();
             updateNotification(getString(R.string.notif_tracking_locally));
         } else {
             telemetryUploader.tick(vehicle, chargeSessionTracker.snapshot(), settings);
diff --git a/app/src/main/java/com/evsuite/abrp/ConsumptionCloudClient.java b/app/src/main/java/com/evsuite/abrp/ConsumptionCloudClient.java
index 0ac0a0e..bf217d5 100644
--- a/app/src/main/java/com/evsuite/abrp/ConsumptionCloudClient.java
+++ b/app/src/main/java/com/evsuite/abrp/ConsumptionCloudClient.java
@@ -7,13 +7,6 @@ import android.util.Log;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -23,8 +16,9 @@ import java.util.List;
  * Best-effort sync to the car server. Never blocks local persistence.
  *
  * Server URL, token and installation id come from {@link ServerConfig}, read on every use so
- * a change in the Server tab applies at once. The installation id is kept across updates; a
- * reinstall gets it back through the config file, so the history is not orphaned under a new
+ * a change in the Server tab applies at once. The installation id is kept across updates, and
+ * a reinstall derives the same one from the head unit ({@link ServerConfig#installationIdFor})
+ * or gets it back through the config file, so the history is not orphaned under a new
  * identity. The consumption UI reads back its own uploaded totals via
  * {@link #fetchHistoryIfDue}, so a reinstall picks up where the old one left off.
  */
@@ -33,7 +27,6 @@ final class ConsumptionCloudClient {
     private static final long CONSUMPTION_SYNC_INTERVAL_MS = 2 * 60_000L;
     private static final long CHARGE_RETRY_INTERVAL_MS = 5 * 60_000L;
     private static final long HISTORY_FETCH_INTERVAL_MS = 5 * 60_000L;
-    private static final int TIMEOUT_MS = 8_000;
     private static final String PREFS = "consumption_cloud";
     private static final String CHUNK_CACHE = "chunk_cache";   // JSON array of pending chunks
     private static final int MAX_CHARGES_PER_SYNC = 10;
@@ -244,36 +237,20 @@ final class ConsumptionCloudClient {
     }
 
     private boolean send(String path, String method, JSONObject body) throws Exception {
-        HttpURLConnection connection = null;
+        String url = trimSlash(config().url) + path;
+        Log.i(TAG, "Sending " + method + " request to " + url);
         try {
-            byte[] bytes = body.toString().getBytes(StandardCharsets.UTF_8);
-            String url = trimSlash(config().url) + path;
-            Log.i(TAG, "Sending " + method + " request to " + url + " (" + bytes.length + " bytes)");
-            Log.i(TAG, "Body: " + body.toString());
-            connection = (HttpURLConnection) new URL(url).openConnection();
-            connection.setRequestMethod(method);
-            connection.setConnectTimeout(TIMEOUT_MS);
-            connection.setReadTimeout(TIMEOUT_MS);
-            connection.setDoOutput(true);
-            connection.setFixedLengthStreamingMode(bytes.length);
-            connection.setRequestProperty("Content-Type", "application/json");
-            connection.setRequestProperty("Authorization", "Bearer " + config().token);
-            try (OutputStream out = connection.getOutputStream()) { out.write(bytes); }
-            int status = connection.getResponseCode();
-            Log.i(TAG, "Response: HTTP " + status);
-            if (status < 200 || status >= 300) {
-                String errBody = readErrorBody(connection);
-                Log.w(TAG, "Sync rejected with HTTP " + status + (errBody.isEmpty() ? "" : ": " + errBody));
+            ServerHttp.Response response = ServerHttp.request(method, url, config().token, body);
+            Log.i(TAG, "Response: HTTP " + response.status);
+            if (!response.ok()) {
+                String err = response.excerpt();
+                Log.w(TAG, "Sync rejected with HTTP " + response.status + (err.isEmpty() ? "" : ": " + err));
                 return false;
             }
-            InputStream response = connection.getInputStream();
-            if (response != null) try (InputStream ignored = response) { }
             return true;
         } catch (Exception e) {
             Log.w(TAG, "Network error: " + e.getMessage());
             throw e;
-        } finally {
-            if (connection != null) connection.disconnect();
         }
     }
 
@@ -352,43 +329,32 @@ final class ConsumptionCloudClient {
     }
 
     private List<DayRecord> fetchHistory() throws Exception {
-        HttpURLConnection connection = null;
-        try {
-            String url = trimSlash(config().url) + "/v1/consumption/history/" + config().installationId;
-            connection = (HttpURLConnection) new URL(url).openConnection();
-            connection.setRequestMethod("GET");
-            connection.setConnectTimeout(TIMEOUT_MS);
-            connection.setReadTimeout(TIMEOUT_MS);
-            connection.setRequestProperty("Authorization", "Bearer " + config().token);
-            int status = connection.getResponseCode();
-            Log.i(TAG, "History GET response: HTTP " + status);
-            if (status < 200 || status >= 300) {
-                String err = readErrorBody(connection);
-                Log.w(TAG, "History fetch rejected with HTTP " + status + (err.isEmpty() ? "" : ": " + err));
-                logEvent(false, status, "History GET HTTP " + status + (err.isEmpty() ? "" : " — " + err));
-                return cachedHistory;
-            }
-            String body = readBody(connection);
-            JSONObject json = new JSONObject(body);
-            JSONArray records = json.optJSONArray("records");
-            if (records == null) return Collections.emptyList();
-            // Lifetime is derived by the backend (sum of all days), sent once at the response
-            // level. Each DayRecord carries it so the UI's LIFETIME period can read it.
-            ConsumptionTracker.Totals lifetime = json.has("lifetime") && !json.isNull("lifetime")
-                    ? parseTotals(json.getJSONObject("lifetime")) : null;
-            List<DayRecord> result = new ArrayList<>(records.length());
-            for (int i = 0; i < records.length(); i++) {
-                JSONObject r = records.getJSONObject(i);
-                LocalDate date = LocalDate.parse(r.getString("date"));
-                ConsumptionTracker.Totals day = parseTotals(r.getJSONObject("day"));
-                Float soh = r.has("sohPercent") && !r.isNull("sohPercent")
-                        ? (float) r.getDouble("sohPercent") : null;
-                result.add(new DayRecord(date, day, lifetime, soh));
-            }
-            return result;
-        } finally {
-            if (connection != null) connection.disconnect();
+        String url = trimSlash(config().url) + "/v1/consumption/history/" + config().installationId;
+        ServerHttp.Response response = ServerHttp.request("GET", url, config().token, null);
+        Log.i(TAG, "History GET response: HTTP " + response.status);
+        if (!response.ok()) {
+            String err = response.excerpt();
+            Log.w(TAG, "History fetch rejected with HTTP " + response.status + (err.isEmpty() ? "" : ": " + err));
+            logEvent(false, response.status, "History GET HTTP " + response.status + (err.isEmpty() ? "" : " — " + err));
+            return cachedHistory;
         }
+        JSONObject json = new JSONObject(response.body);
+        JSONArray records = json.optJSONArray("records");
+        if (records == null) return Collections.emptyList();
+        // Lifetime is derived by the backend (sum of all days), sent once at the response
+        // level. Each DayRecord carries it so the UI's LIFETIME period can read it.
+        ConsumptionTracker.Totals lifetime = json.has("lifetime") && !json.isNull("lifetime")
+                ? parseTotals(json.getJSONObject("lifetime")) : null;
+        List<DayRecord> result = new ArrayList<>(records.length());
+        for (int i = 0; i < records.length(); i++) {
+            JSONObject r = records.getJSONObject(i);
+            LocalDate date = LocalDate.parse(r.getString("date"));
+            ConsumptionTracker.Totals day = parseTotals(r.getJSONObject("day"));
+            Float soh = r.has("sohPercent") && !r.isNull("sohPercent")
+                    ? (float) r.getDouble("sohPercent") : null;
+            result.add(new DayRecord(date, day, lifetime, soh));
+        }
+        return result;
     }
 
     private static ConsumptionTracker.Totals parseTotals(JSONObject o) {
@@ -397,35 +363,6 @@ final class ConsumptionCloudClient {
                 o.optDouble("hours", 0d), o.optDouble("socDrop", 0d));
     }
 
-    private static String readBody(HttpURLConnection connection) throws Exception {
-        InputStream stream = connection.getInputStream();
-        try (BufferedReader br = new BufferedReader(
-                new InputStreamReader(stream, StandardCharsets.UTF_8))) {
-            StringBuilder sb = new StringBuilder();
-            String line;
-            while ((line = br.readLine()) != null) sb.append(line);
-            return sb.toString();
-        }
-    }
-
-    /** Reads the error response body (truncated) for logging — never throws. */
-    private static String readErrorBody(HttpURLConnection connection) {
-        try {
-            InputStream stream = connection.getErrorStream();
-            if (stream == null) return "";
-            try (BufferedReader br = new BufferedReader(
-                    new InputStreamReader(stream, StandardCharsets.UTF_8))) {
-                StringBuilder sb = new StringBuilder();
-                String line;
-                while ((line = br.readLine()) != null) sb.append(line);
-                String body = sb.toString();
-                return body.length() > 300 ? body.substring(0, 300) + "…" : body;
-            }
-        } catch (Exception e) {
-            return "";
-        }
-    }
-
     private static String trimSlash(String value) {
         int end = value.length();
         while (end > 0 && value.charAt(end - 1) == '/') end--;
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 6dc5165..1d27277 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -774,13 +774,28 @@ public class MainActivity extends AppCompatActivity {
         return dirs.length > 0 && dirs[0] != null ? dirs[0].getAbsolutePath() : "";
     }
 
+    /**
+     * Imports a scanned file and then deletes it: it holds the ingest token in plaintext, maybe
+     * on a USB stick, and the settings live in encrypted storage from now on.
+     */
     private void importConfig(java.io.File file) {
         String text = readText(file);
         if (text.isEmpty()) {
             setConnectionStatus(COLOR_ERROR, getString(R.string.import_err_read));
             return;
         }
-        applyConfig(text);
+        if (!applyConfig(text)) return;
+        boolean deleted;
+        try {
+            deleted = file.delete();
+        } catch (SecurityException e) {
+            deleted = false;
+        }
+        if (deleted) {
+            setConnectionStatus(COLOR_OK, getString(R.string.import_ok_deleted));
+        } else {
+            setConnectionStatus(COLOR_ERROR, getString(R.string.import_ok_not_deleted, file.getAbsolutePath()));
+        }
     }
 
     private void importConfig(Uri uri) {
@@ -800,11 +815,11 @@ public class MainActivity extends AppCompatActivity {
      * only the token does not wipe the URL. Server settings are validated and saved together;
      * cadence keys go to the plain prefs the same way the Upload page writes them.
      */
-    private void applyConfig(String text) {
+    private boolean applyConfig(String text) {
         ConfigImport config = ConfigImport.parse(text);
         if (config.isEmpty()) {
             setConnectionStatus(COLOR_ERROR, getString(R.string.import_err_empty));
-            return;
+            return false;
         }
         ServerConfig current = ServerConfig.get(this);
         if (config.serverUrl != null || config.token != null || config.installationId != null) {
@@ -817,7 +832,7 @@ public class MainActivity extends AppCompatActivity {
                 if (config.serverUrl != null) serverUrlInput.setText(config.serverUrl);
                 if (config.token != null) serverTokenInput.setText(config.token);
                 if (config.installationId != null) installationIdInput.setText(config.installationId);
-                return;
+                return false;
             }
         }
         SharedPreferences.Editor edit = prefs.edit();
@@ -828,6 +843,7 @@ public class MainActivity extends AppCompatActivity {
         bindCadenceControls();
         setConnectionStatus(COLOR_OK, getString(R.string.import_ok));
         refreshStatus();
+        return true;
     }
 
     // ---------- Upload page ----------
@@ -993,15 +1009,16 @@ public class MainActivity extends AppCompatActivity {
      * The two range estimates. Both need the car to be moving on battery power; the average
      * also needs a minute or more of driving, which the service has usually collected already.
      */
-    private void refreshRangeEstimates(EnergySnapshot s, long nowMs) {
+    private void refreshRangeEstimates(EnergySnapshot s) {
         RangeEstimator estimator = RangeEstimator.shared();
-        estimator.add(nowMs, s.getBatteryPowerKw(), s.getSpeedKmh());
+        long monotonicMs = android.os.SystemClock.elapsedRealtime();
+        estimator.add(monotonicMs, s.getBatteryPowerKw(), s.getSpeedKmh());
         Double remaining = RangeEstimator.remainingKwh(s.getSocPercent(), usableKwh());
         showEstimate(vehRangePower, vehRangePowerNote,
                 RangeEstimator.instant(remaining, s.getBatteryPowerKw(), s.getSpeedKmh()),
                 R.string.range_not_driving);
         showEstimate(vehRangeAverage, vehRangeAverageNote,
-                estimator.average(remaining, nowMs), R.string.range_waiting);
+                estimator.average(remaining, monotonicMs), R.string.range_waiting);
     }
 
     private void showEstimate(TextView value, TextView note, RangeEstimator.Estimate e, int whyNot) {
@@ -1041,7 +1058,7 @@ public class MainActivity extends AppCompatActivity {
             vehHvac.setText(fmt(s.getClimate().getDriverTargetCelsius(), "%.0f °C"));
 
             vehCharging.setText(chargingLabel(s));
-            refreshRangeEstimates(s, System.currentTimeMillis());
+            refreshRangeEstimates(s);
 
             vehTireFl.setText(fmt(s.getTirePressures().getFrontLeftKpa(), "%.0f kPa"));
             vehTireFr.setText(fmt(s.getTirePressures().getFrontRightKpa(), "%.0f kPa"));
diff --git a/app/src/main/java/com/evsuite/abrp/PairingClient.java b/app/src/main/java/com/evsuite/abrp/PairingClient.java
index e349dca..8990af1 100644
--- a/app/src/main/java/com/evsuite/abrp/PairingClient.java
+++ b/app/src/main/java/com/evsuite/abrp/PairingClient.java
@@ -2,12 +2,6 @@ package com.evsuite.abrp;
 
 import org.json.JSONObject;
 
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-
 /**
  * The car's side of pairing with the server (an OAuth device-authorization flow): ask for a
  * pairing request, show its code as a QR code, then poll until a phone has approved it and
@@ -15,8 +9,6 @@ import java.nio.charset.StandardCharsets;
  */
 final class PairingClient {
 
-    private static final int TIMEOUT_MS = 8_000;
-
     /** A pairing request as the server opened it. */
     static final class Request {
         final String deviceCode;
@@ -68,7 +60,7 @@ final class PairingClient {
     private PairingClient() { }
 
     static Request start(String serverUrl, String installationId) throws Exception {
-        Response r = post(serverUrl + "/v1/pair/start",
+        ServerHttp.Response r = post(serverUrl + "/v1/pair/start",
                 new JSONObject().put("installationId", installationId));
         // Only the server's own answer means "switched off". A 404 without it is a server (or
         // proxy) that has no pairing route at all, e.g. one older than 2.1.0.
@@ -86,7 +78,7 @@ final class PairingClient {
     }
 
     static PollResult poll(String serverUrl, String deviceCode) throws Exception {
-        Response r = post(serverUrl + "/v1/pair/poll", new JSONObject().put("deviceCode", deviceCode));
+        ServerHttp.Response r = post(serverUrl + "/v1/pair/poll", new JSONObject().put("deviceCode", deviceCode));
         switch (r.status) {
             case 200: return new PollResult(Outcome.APPROVED, new JSONObject(r.body).getString("token"));
             case 202: return new PollResult(Outcome.PENDING, null);
@@ -96,42 +88,7 @@ final class PairingClient {
         }
     }
 
-    private static final class Response {
-        final int status;
-        final String body;
-
-        Response(int status, String body) {
-            this.status = status;
-            this.body = body;
-        }
-    }
-
-    private static Response post(String url, JSONObject json) throws Exception {
-        byte[] body = json.toString().getBytes(StandardCharsets.UTF_8);
-        HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
-        try {
-            connection.setRequestMethod("POST");
-            connection.setConnectTimeout(TIMEOUT_MS);
-            connection.setReadTimeout(TIMEOUT_MS);
-            connection.setDoOutput(true);
-            connection.setFixedLengthStreamingMode(body.length);
-            connection.setRequestProperty("Content-Type", "application/json");
-            try (OutputStream out = connection.getOutputStream()) { out.write(body); }
-            int status = connection.getResponseCode();
-            InputStream in = status < 400 ? connection.getInputStream() : connection.getErrorStream();
-            String text = "";
-            if (in != null) {
-                try (InputStream stream = in) {
-                    java.io.ByteArrayOutputStream buf = new java.io.ByteArrayOutputStream();
-                    byte[] chunk = new byte[2048];
-                    int n;
-                    while ((n = stream.read(chunk)) != -1 && buf.size() < 16 * 1024) buf.write(chunk, 0, n);
-                    text = buf.toString(StandardCharsets.UTF_8.name());
-                }
-            }
-            return new Response(status, text);
-        } finally {
-            connection.disconnect();
-        }
+    private static ServerHttp.Response post(String url, JSONObject json) throws Exception {
+        return ServerHttp.request("POST", url, null, json);
     }
 }
diff --git a/app/src/main/java/com/evsuite/abrp/RangeEstimator.java b/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
index 120db9a..351bd1f 100644
--- a/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
+++ b/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
@@ -14,7 +14,9 @@ import java.util.Iterator;
  * regenerating, too little data — rather than a misleading number.
  *
  * Fed by both the service tick (15 s) and the open Vehicle page (2 s); the integration is
- * time-weighted, so the two rates mix correctly. Free of Android types, unit-tested.
+ * time-weighted, so the two rates mix correctly. Times are on the monotonic clock
+ * (SystemClock.elapsedRealtime): the head unit sets its wall clock from GPS, and a jump back
+ * would make every new sample look out of order. Free of Android types, unit-tested.
  */
 final class RangeEstimator {
 
diff --git a/app/src/main/java/com/evsuite/abrp/SecurePrefs.java b/app/src/main/java/com/evsuite/abrp/SecurePrefs.java
index 3d51282..d4ced58 100644
--- a/app/src/main/java/com/evsuite/abrp/SecurePrefs.java
+++ b/app/src/main/java/com/evsuite/abrp/SecurePrefs.java
@@ -7,10 +7,18 @@ import android.util.Log;
 import androidx.security.crypto.EncryptedSharedPreferences;
 import androidx.security.crypto.MasterKey;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Encrypted storage for the server settings — above all the ingest token, which `adb backup`
  * would otherwise hand out with the regular SharedPreferences file. Backed by an
  * AndroidKeyStore master key.
+ *
+ * If the keystore fails, the settings go to a plaintext file for that run rather than the app
+ * crashing on the head unit. The next run that opens the encrypted store moves them back in
+ * and deletes the file ({@link #mergePlaintext}), so a token saved meanwhile is neither lost
+ * nor left in plaintext.
  */
 final class SecurePrefs {
 
@@ -33,16 +41,59 @@ final class SecurePrefs {
             MasterKey masterKey = new MasterKey.Builder(app)
                     .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
                     .build();
-            instance = EncryptedSharedPreferences.create(
+            SharedPreferences encrypted = EncryptedSharedPreferences.create(
                     app,
                     FILE_NAME,
                     masterKey,
                     EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
                     EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM);
+            migrateFromPlaintext(app, encrypted);
+            instance = encrypted;
         } catch (Exception e) {
             Log.e(TAG, "Encrypted preferences unavailable, falling back to plaintext", e);
             instance = app.getSharedPreferences(PLAIN_NAME, Context.MODE_PRIVATE);
         }
         return instance;
     }
+
+    /** Moves what a fallback run wrote into the encrypted store, then deletes the plaintext. */
+    private static void migrateFromPlaintext(Context app, SharedPreferences encrypted) {
+        SharedPreferences plain = app.getSharedPreferences(PLAIN_NAME, Context.MODE_PRIVATE);
+        Map<String, ?> leftover = plain.getAll();
+        if (leftover.isEmpty()) return;
+        Map<String, String> moves = mergePlaintext(strings(leftover), strings(encrypted.getAll()));
+        SharedPreferences.Editor edit = encrypted.edit();
+        for (Map.Entry<String, String> e : moves.entrySet()) edit.putString(e.getKey(), e.getValue());
+        if (edit.commit()) {
+            plain.edit().clear().commit();
+            Log.i(TAG, "Moved " + moves.size() + " setting(s) from plaintext into encrypted storage");
+        }
+    }
+
+    /**
+     * What to write into the encrypted store from a fallback run's plaintext file. The plaintext
+     * is newer, so its URL and token win — that is a pairing done while the keystore was down.
+     * The installation id is the exception: the encrypted one is what the car's history is
+     * stored under, and a fallback run may only have made up a new one.
+     */
+    static Map<String, String> mergePlaintext(Map<String, String> plain, Map<String, String> encrypted) {
+        Map<String, String> moves = new HashMap<>();
+        for (Map.Entry<String, String> e : plain.entrySet()) {
+            if (e.getValue() == null) continue;
+            String existing = encrypted.get(e.getKey());
+            if (ServerConfig.KEY_INSTALLATION_ID.equals(e.getKey()) && existing != null && !existing.isEmpty()) {
+                continue;
+            }
+            moves.put(e.getKey(), e.getValue());
+        }
+        return moves;
+    }
+
+    private static Map<String, String> strings(Map<String, ?> all) {
+        Map<String, String> out = new HashMap<>();
+        for (Map.Entry<String, ?> e : all.entrySet()) {
+            if (e.getValue() instanceof String) out.put(e.getKey(), (String) e.getValue());
+        }
+        return out;
+    }
 }
diff --git a/app/src/main/java/com/evsuite/abrp/ServerConfig.java b/app/src/main/java/com/evsuite/abrp/ServerConfig.java
index 0f9fa2e..7a94d42 100644
--- a/app/src/main/java/com/evsuite/abrp/ServerConfig.java
+++ b/app/src/main/java/com/evsuite/abrp/ServerConfig.java
@@ -49,6 +49,9 @@ final class ServerConfig {
         return !url.isEmpty() && !token.isEmpty();
     }
 
+    // ANDROID_ID on purpose: it is hashed into the installation id, so a reinstall keeps its
+    // history (installationIdFor). It is never sent or logged as it is.
+    @android.annotation.SuppressLint("HardwareIds")
     static ServerConfig get(Context context) {
         ServerConfig config = current;
         if (config != null) return config;
@@ -57,8 +60,18 @@ final class ServerConfig {
             SharedPreferences prefs = SecurePrefs.get(context);
             String id = prefs.getString(KEY_INSTALLATION_ID, "");
             if (!isValidInstallationId(id)) {
-                // First start: this installation gets its own identity, kept from now on.
-                id = UUID.randomUUID().toString();
+                // First start, or the first after a reinstall: derived from the head unit, so
+                // the history stays under the same id (see installationIdFor).
+                String androidId = null;
+                try {
+                    androidId = android.provider.Settings.Secure.getString(
+                            context.getApplicationContext().getContentResolver(),
+                            android.provider.Settings.Secure.ANDROID_ID);
+                } catch (RuntimeException ignored) {
+                    // no id from the platform: a random one below
+                }
+                id = installationIdFor(androidId);
+                if (id == null) id = UUID.randomUUID().toString();
                 prefs.edit().putString(KEY_INSTALLATION_ID, id).apply();
             }
             current = new ServerConfig(prefs.getString(KEY_URL, DEFAULT_URL), prefs.getString(KEY_TOKEN, ""), id);
@@ -97,6 +110,22 @@ final class ServerConfig {
         return token != null && token.trim().length() >= MIN_TOKEN_LENGTH && !token.trim().contains(" ");
     }
 
+    /**
+     * The installation id for a head unit, or null without a usable ANDROID_ID. From Android 8
+     * ANDROID_ID is fixed per device and signing key and survives an uninstall, so a
+     * reinstall of the same platform-signed build finds its history again without importing
+     * the id. Hashed into a name-based UUID: the server expects a UUID, and the raw
+     * ANDROID_ID never leaves the car. An id already stored (or imported) always wins over it.
+     */
+    static String installationIdFor(String androidId) {
+        if (androidId == null) return null;
+        String trimmed = androidId.trim();
+        // The emulator-era constant that many devices once shared; not an identity.
+        if (trimmed.isEmpty() || trimmed.equalsIgnoreCase("9774d56d682e549c")) return null;
+        byte[] name = ("nilsmg4:" + trimmed.toLowerCase(Locale.US)).getBytes(java.nio.charset.StandardCharsets.UTF_8);
+        return UUID.nameUUIDFromBytes(name).toString();
+    }
+
     static boolean isValidInstallationId(String id) {
         return id != null && UUID_PATTERN.matcher(id.trim()).matches();
     }
diff --git a/app/src/main/java/com/evsuite/abrp/ServerHttp.java b/app/src/main/java/com/evsuite/abrp/ServerHttp.java
new file mode 100644
index 0000000..1e9b9de
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/ServerHttp.java
@@ -0,0 +1,87 @@
+package com.evsuite.abrp;
+
+import org.json.JSONObject;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * One JSON request to the car server, shared by telemetry, consumption sync and pairing.
+ * Blocking, with short timeouts — call it off the main thread.
+ *
+ * The token goes in the Authorization header, never the URL, and is never logged. The answer
+ * body is read for every status (error bodies name the problem) and capped, so a wrong server
+ * cannot fill memory.
+ */
+final class ServerHttp {
+
+    static final int TIMEOUT_MS = 8_000;
+    private static final int MAX_BODY_BYTES = 64 * 1024;
+
+    /** Status and body of an answer. */
+    static final class Response {
+        final int status;
+        final String body;
+
+        Response(int status, String body) {
+            this.status = status;
+            this.body = body;
+        }
+
+        boolean ok() { return status >= 200 && status < 300; }
+
+        /** The body for a log line: short, on one line. */
+        String excerpt() {
+            String text = body.replace('\n', ' ').trim();
+            return text.length() > 300 ? text.substring(0, 300) + "…" : text;
+        }
+    }
+
+    private ServerHttp() { }
+
+    /**
+     * Sends {@code json} (or nothing, when null) with {@code method} to {@code url}.
+     * {@code token} may be null for the unauthenticated pairing calls.
+     */
+    static Response request(String method, String url, String token, JSONObject json) throws Exception {
+        HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
+        try {
+            connection.setRequestMethod(method);
+            connection.setConnectTimeout(TIMEOUT_MS);
+            connection.setReadTimeout(TIMEOUT_MS);
+            if (token != null) connection.setRequestProperty("Authorization", "Bearer " + token);
+            if (json != null) {
+                byte[] body = json.toString().getBytes(StandardCharsets.UTF_8);
+                connection.setDoOutput(true);
+                connection.setFixedLengthStreamingMode(body.length);
+                connection.setRequestProperty("Content-Type", "application/json");
+                try (OutputStream out = connection.getOutputStream()) { out.write(body); }
+            }
+            int status = connection.getResponseCode();
+            return new Response(status, readBody(connection, status));
+        } finally {
+            connection.disconnect();
+        }
+    }
+
+    private static String readBody(HttpURLConnection connection, int status) {
+        try {
+            InputStream in = status < 400 ? connection.getInputStream() : connection.getErrorStream();
+            if (in == null) return "";
+            try (InputStream stream = in) {
+                ByteArrayOutputStream buf = new ByteArrayOutputStream();
+                byte[] chunk = new byte[4096];
+                int n;
+                while ((n = stream.read(chunk)) != -1 && buf.size() < MAX_BODY_BYTES) buf.write(chunk, 0, n);
+                return buf.toString(StandardCharsets.UTF_8.name());
+            }
+        } catch (Exception e) {
+            // The status is what matters; an unreadable body is just empty.
+            return "";
+        }
+    }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/TelemetryPayload.java b/app/src/main/java/com/evsuite/abrp/TelemetryPayload.java
index 2d80635..031431f 100644
--- a/app/src/main/java/com/evsuite/abrp/TelemetryPayload.java
+++ b/app/src/main/java/com/evsuite/abrp/TelemetryPayload.java
@@ -64,7 +64,8 @@ final class TelemetryPayload {
             tlm.put("utc", utc);
 
             putIfPresent(tlm, "soc", soc);
-            putIfPresent(tlm, "speed", speedKmh == null ? null : Math.round(speedKmh));
+            // Reversing reads negative; ABRP and the server take speed as a magnitude.
+            putIfPresent(tlm, "speed", speedKmh == null ? null : Math.round(Math.abs(speedKmh)));
             putIfPresent(tlm, "est_battery_range", rangeKm);
             if (powerKw != null) tlm.put("power", round2(powerKw));
             putIfPresent(tlm, "is_charging", boolToInt(charging));
@@ -134,9 +135,62 @@ final class TelemetryPayload {
             // already exclude. Returning just the timestamp keeps the upload alive.
             return "{\"utc\":" + utc + "}";
         }
+        dropOutOfRange(tlm);
         return tlm.toString();
     }
 
+    /**
+     * The server's range for every numeric field (server/model.go, telemetryNumbers). A value
+     * outside it is left out here, as an unread one would be: the server would drop it anyway,
+     * and an older server rejects the whole batch for it.
+     */
+    static final java.util.Map<String, double[]> SERVER_LIMITS = new java.util.HashMap<>();
+    static {
+        SERVER_LIMITS.put("soc", new double[]{0, 100});
+        SERVER_LIMITS.put("speed", new double[]{0, 400});
+        SERVER_LIMITS.put("power", new double[]{-1000, 1000});
+        SERVER_LIMITS.put("est_battery_range", new double[]{0, 2000});
+        SERVER_LIMITS.put("capacity", new double[]{0, 500});
+        SERVER_LIMITS.put("soe", new double[]{0, 500});
+        SERVER_LIMITS.put("kwh_charged", new double[]{0, 1000});
+        SERVER_LIMITS.put("odometer", new double[]{0, 10_000_000});
+        SERVER_LIMITS.put("lat", new double[]{-90, 90});
+        SERVER_LIMITS.put("lon", new double[]{-180, 180});
+        SERVER_LIMITS.put("elevation", new double[]{-1000, 10_000});
+        SERVER_LIMITS.put("heading", new double[]{0, 360});
+        SERVER_LIMITS.put("batt_temp", new double[]{-60, 100});
+        SERVER_LIMITS.put("cabin_temp", new double[]{-60, 100});
+        SERVER_LIMITS.put("ext_temp", new double[]{-60, 70});
+        SERVER_LIMITS.put("hvac_setpoint", new double[]{0, 40});
+        SERVER_LIMITS.put("voltage", new double[]{0, 1500});
+        SERVER_LIMITS.put("current", new double[]{-2000, 2000});
+        SERVER_LIMITS.put("tire_pressure_fl", new double[]{0, 1000});
+        SERVER_LIMITS.put("tire_pressure_fr", new double[]{0, 1000});
+        SERVER_LIMITS.put("tire_pressure_rl", new double[]{0, 1000});
+        SERVER_LIMITS.put("tire_pressure_rr", new double[]{0, 1000});
+    }
+
+    private static void dropOutOfRange(JSONObject tlm) {
+        for (java.util.Map.Entry<String, double[]> limit : SERVER_LIMITS.entrySet()) {
+            String key = limit.getKey();
+            if (!tlm.has(key)) continue;
+            double value = tlm.optDouble(key, Double.NaN);
+            if (Double.isNaN(value) || value < limit.getValue()[0] || value > limit.getValue()[1]) tlm.remove(key);
+        }
+        // A position is only a position as a pair.
+        if (tlm.has("lat") != tlm.has("lon")) {
+            tlm.remove("lat");
+            tlm.remove("lon");
+        }
+    }
+
+    /** Epoch seconds the server accepts: from 2001. Earlier means the head unit's clock is not set yet. */
+    static final long MIN_UTC = 1_000_000_000L;
+
+    static boolean isPlausibleUtc(long utcSeconds) {
+        return utcSeconds >= MIN_UTC;
+    }
+
     /**
      * True for a temperature that a sensor could actually have measured. Excludes exactly
      * 0.0, which is what an unimplemented VHAL property returns — see cabin_temp above.
diff --git a/app/src/main/java/com/evsuite/abrp/TelemetryUploader.java b/app/src/main/java/com/evsuite/abrp/TelemetryUploader.java
index ce2b0a7..6616910 100644
--- a/app/src/main/java/com/evsuite/abrp/TelemetryUploader.java
+++ b/app/src/main/java/com/evsuite/abrp/TelemetryUploader.java
@@ -15,10 +15,6 @@ import com.evsuite.hardware.telemetry.TirePressureSnapshot;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Objects;
 
@@ -28,7 +24,9 @@ import java.util.Objects;
  * Called on every service tick. While the car is in use every tick becomes a sample; the
  * queue is sent when {@link UploadCadence} says so — every tick on a state change, otherwise
  * at the configured interval. Parked and not charging, a sample is only taken when one is
- * sent, every 15 minutes: nothing changes, and a sample every 15 s overnight is waste.
+ * sent, every 15 minutes: nothing changes, and a sample every 15 s overnight is waste. The GPS
+ * subscription follows the same rule: it is paused while parked and idle, and those samples
+ * carry the fix the car parked with. {@link #stop} ends it when live telemetry is off.
  *
  * Runs on the service's scheduler thread; the HTTP calls block it, with short timeouts.
  * Location updates arrive on the main looper and are only read here.
@@ -36,7 +34,6 @@ import java.util.Objects;
 final class TelemetryUploader {
 
     private static final String TAG = "NilsMG4.Telemetry";
-    private static final int TIMEOUT_MS = 8_000;
     /** Batches per tick: a backlog drains over a few ticks instead of stalling one. */
     private static final int MAX_BATCHES_PER_TICK = 2;
     /** A fix older than this no longer says where the car is; position is omitted. */
@@ -48,6 +45,10 @@ final class TelemetryUploader {
     private final ChargingSignal chargingSignal = new ChargingSignal();
 
     private volatile Location lastLocation;
+    /** The fix kept while parked and idle, with the GPS paused; null otherwise. */
+    private volatile Location parkedLocation;
+    /** Whether the GPS should run; a request still queued on the main looper checks it. */
+    private volatile boolean locationWanted;
     private volatile boolean locationActive;
     private volatile long lastLocationRequestMs;
     private LocationManager locationManager;
@@ -64,7 +65,6 @@ final class TelemetryUploader {
 
     void tick(EnergySnapshot vehicle, ChargeSessionTracker.Snapshot session, UploadSettings settings) {
         long nowMs = System.currentTimeMillis();
-        ensureLocationUpdates(settings);
 
         Integer soc = vehicle.getSocPercent() == null ? null : Math.round(vehicle.getSocPercent());
         Float powerKw = vehicle.getBatteryPowerKw();
@@ -82,10 +82,24 @@ final class TelemetryUploader {
         lastCharging = charging;
 
         boolean idle = Boolean.TRUE.equals(parked) && Boolean.FALSE.equals(charging);
+        if (idle) {
+            // Parked and idle the car does not move: keep one fresh fix and stop the GPS until
+            // the car is in use again. Without a fix yet (just started, or in a garage) it
+            // keeps looking.
+            if (parkedLocation == null) parkedLocation = freshLocation(settings);
+            if (parkedLocation == null) ensureLocationUpdates(settings);
+            else if (locationWanted) stop();
+        } else {
+            parkedLocation = null;
+            ensureLocationUpdates(settings);
+        }
         boolean uploadDue = UploadCadence.shouldUpload(
                 nowMs, lastUploadAttemptMs, parked, charging, soc, stateChanged, settings);
-        if (!idle || uploadDue) {
-            queue.add(buildSample(nowMs, vehicle, session, settings, soc, charging, dcfc, parked));
+        // Before the head unit has set its clock the sample's time is meaningless, and the
+        // server would drop it anyway.
+        boolean clockSet = TelemetryPayload.isPlausibleUtc(nowMs / 1000);
+        if (clockSet && (!idle || uploadDue)) {
+            queue.add(buildSample(nowMs, vehicle, session, settings, soc, charging, dcfc, parked, idle));
         }
         if (!uploadDue) return;
         // Cadence counts attempts, not successes: retrying every tick while offline would
@@ -99,7 +113,8 @@ final class TelemetryUploader {
     // ---------- Sample ----------
 
     private String buildSample(long nowMs, EnergySnapshot vehicle, ChargeSessionTracker.Snapshot session,
-                               UploadSettings settings, Integer soc, Boolean charging, Boolean dcfc, Boolean parked) {
+                               UploadSettings settings, Integer soc, Boolean charging, Boolean dcfc, Boolean parked,
+                               boolean idle) {
         TelemetryPayload tlm = new TelemetryPayload(nowMs / 1000);
         tlm.soc = soc;
         tlm.speedKmh = vehicle.getSpeedKmh();
@@ -124,7 +139,7 @@ final class TelemetryUploader {
         tlm.tirePressureFrKpa = tires.getFrontRightKpa();
         tlm.tirePressureRlKpa = tires.getRearLeftKpa();
         tlm.tirePressureRrKpa = tires.getRearRightKpa();
-        Location loc = freshLocation(settings);
+        Location loc = idle ? parkedLocation : freshLocation(settings);
         if (loc != null) {
             tlm.lat = loc.getLatitude();
             tlm.lon = loc.getLongitude();
@@ -146,14 +161,16 @@ final class TelemetryUploader {
             List<String> batch = queue.peekBatch();
             String summary = TelemetryPayload.summarize(batch.get(batch.size() - 1));
             try {
-                int status = post(config, batch);
-                boolean ok = status >= 200 && status < 300;
+                ServerHttp.Response response = post(config, batch);
+                int status = response.status;
+                boolean ok = response.ok();
                 AbrpUploadService.log().record(new UploadLog.Entry(System.currentTimeMillis(), status, ok,
-                        ok ? "Telemetry: " + batch.size() + " sample(s) sent"
-                           : "Telemetry rejected (" + batch.size() + " queued)", summary));
+                        ok ? "Telemetry: " + batch.size() + " sample(s) sent" + droppedNote(response)
+                           : "Telemetry rejected (" + batch.size() + " queued): " + response.excerpt(), summary));
                 if (!ok) {
-                    // A 400 will never succeed on retry: drop the batch rather than block the
-                    // queue behind it forever. Anything else (401, 5xx) is kept for later.
+                    // The server drops bad values itself and answers 200, so a 400 is a request
+                    // it cannot read at all and will never take: drop the batch rather than
+                    // block the queue behind it forever. Anything else (401, 403, 5xx) is kept.
                     if (status == 400) queue.remove(batch.size());
                     return;
                 }
@@ -167,28 +184,22 @@ final class TelemetryUploader {
         }
     }
 
-    private int post(ServerConfig config, List<String> batch) throws Exception {
+    private ServerHttp.Response post(ServerConfig config, List<String> batch) throws Exception {
         JSONArray samples = new JSONArray();
         for (String sample : batch) samples.put(new JSONObject(sample));
-        byte[] body = new JSONObject()
+        JSONObject body = new JSONObject()
                 .put("installationId", config.installationId)
-                .put("samples", samples)
-                .toString().getBytes(StandardCharsets.UTF_8);
-        HttpURLConnection connection = null;
+                .put("samples", samples);
+        return ServerHttp.request("POST", config.url + "/v1/telemetry", config.token, body);
+    }
+
+    /** ", 2 value(s) dropped by the server" when it left anything out, for the upload log. */
+    static String droppedNote(ServerHttp.Response response) {
         try {
-            connection = (HttpURLConnection) new URL(config.url + "/v1/telemetry").openConnection();
-            connection.setRequestMethod("POST");
-            connection.setConnectTimeout(TIMEOUT_MS);
-            connection.setReadTimeout(TIMEOUT_MS);
-            connection.setDoOutput(true);
-            connection.setFixedLengthStreamingMode(body.length);
-            connection.setRequestProperty("Content-Type", "application/json");
-            // The token goes in a header, never the URL, and is never logged.
-            connection.setRequestProperty("Authorization", "Bearer " + config.token);
-            try (OutputStream out = connection.getOutputStream()) { out.write(body); }
-            return connection.getResponseCode();
-        } finally {
-            if (connection != null) connection.disconnect();
+            int dropped = new JSONObject(response.body).optInt("droppedCount", 0);
+            return dropped > 0 ? ", " + dropped + " value(s) dropped by the server" : "";
+        } catch (Exception e) {
+            return ""; // an older server answers 204 with no body
         }
     }
 
@@ -207,6 +218,7 @@ final class TelemetryUploader {
 
     /** Subscribes to GPS once, and again after a failure or a provider change. */
     private void ensureLocationUpdates(UploadSettings settings) {
+        locationWanted = true;
         if (locationActive) return;
         long now = SystemClock.elapsedRealtime();
         if (lastLocationRequestMs != 0L && now - lastLocationRequestMs < LOCATION_RETRY_MS) return;
@@ -215,6 +227,7 @@ final class TelemetryUploader {
     }
 
     private void requestLocationUpdates(UploadSettings settings) {
+        if (!locationWanted) return; // stopped while this request was queued
         try {
             if (locationManager == null) {
                 locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
@@ -237,11 +250,14 @@ final class TelemetryUploader {
         }
     }
 
+    /** Ends the GPS subscription; the next tick that needs a position starts it again. */
     void stop() {
+        locationWanted = false;
         try {
             if (locationManager != null) locationManager.removeUpdates(locationListener);
         } catch (Exception ignored) { }
         locationActive = false;
+        lastLocationRequestMs = 0L;
     }
 
     private Location freshLocation(UploadSettings settings) {
diff --git a/app/src/main/java/com/evsuite/abrp/WifiAutoConnect.java b/app/src/main/java/com/evsuite/abrp/WifiAutoConnect.java
index 9228a75..ea2bfcc 100644
--- a/app/src/main/java/com/evsuite/abrp/WifiAutoConnect.java
+++ b/app/src/main/java/com/evsuite/abrp/WifiAutoConnect.java
@@ -154,10 +154,10 @@ final class WifiAutoConnect {
         static Result attempting(String ssid) { return new Result(false, ssid, "Connecting: " + ssid); }
 
         static final Result UNSUPPORTED = new Result(false, null, "Wi-Fi cannot be managed");
-        static final Result WAITING = new Result(false, null, "Bekleniyor…");
+        static final Result WAITING = new Result(false, null, "Waiting…");
         static final Result ENABLING = new Result(false, null, "Turning Wi-Fi on…");
         static final Result CANNOT_ENABLE = new Result(false, null, "Could not turn Wi-Fi on");
         static final Result NO_SAVED_NETWORKS = new Result(false, null, "No saved networks");
-        static final Result REFUSED = new Result(false, null, "Sistem izin vermedi");
+        static final Result REFUSED = new Result(false, null, "The system refused");
     }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6d4d5ab..e2cf188 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -92,6 +92,8 @@
 
     <!-- Config file import -->
     <string name="import_ok">Config imported and saved — press Test to verify</string>
+    <string name="import_ok_deleted">Config imported and saved; the file was deleted</string>
+    <string name="import_ok_not_deleted">Config imported and saved, but the file could not be deleted. It holds your token: delete %1$s</string>
     <string name="import_err_read">Could not read that file</string>
     <string name="import_err_empty">No settings found in that file</string>
     <string name="import_err_not_found">No config file found. Copy it to %1$s</string>
diff --git a/app/src/test/java/com/evsuite/abrp/SecurePrefsTest.java b/app/src/test/java/com/evsuite/abrp/SecurePrefsTest.java
new file mode 100644
index 0000000..cb60b31
--- /dev/null
+++ b/app/src/test/java/com/evsuite/abrp/SecurePrefsTest.java
@@ -0,0 +1,40 @@
+package com.evsuite.abrp;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+
+/** Moving a keystore-fallback run's settings back into encrypted storage — pure JVM. */
+public class SecurePrefsTest {
+
+    private static Map<String, String> map(String... kv) {
+        Map<String, String> m = new HashMap<>();
+        for (int i = 0; i < kv.length; i += 2) m.put(kv[i], kv[i + 1]);
+        return m;
+    }
+
+    @Test
+    public void aTokenSavedDuringTheFallbackIsKept() {
+        Map<String, String> moves = SecurePrefs.mergePlaintext(
+                map(ServerConfig.KEY_TOKEN, "new-token", ServerConfig.KEY_URL, "https://car.example.com"),
+                map(ServerConfig.KEY_TOKEN, "old-token"));
+        assertEquals("new-token", moves.get(ServerConfig.KEY_TOKEN));
+        assertEquals("https://car.example.com", moves.get(ServerConfig.KEY_URL));
+    }
+
+    @Test
+    public void theStoredInstallationIdWins() {
+        Map<String, String> moves = SecurePrefs.mergePlaintext(
+                map(ServerConfig.KEY_INSTALLATION_ID, "made-up-in-the-fallback"),
+                map(ServerConfig.KEY_INSTALLATION_ID, "the-one-history-is-under"));
+        assertFalse(moves.containsKey(ServerConfig.KEY_INSTALLATION_ID));
+
+        // With none stored yet, the fallback's id is the only one there is.
+        moves = SecurePrefs.mergePlaintext(map(ServerConfig.KEY_INSTALLATION_ID, "only-one"), map());
+        assertEquals("only-one", moves.get(ServerConfig.KEY_INSTALLATION_ID));
+    }
+}
diff --git a/app/src/test/java/com/evsuite/abrp/ServerConfigTest.java b/app/src/test/java/com/evsuite/abrp/ServerConfigTest.java
index f5bf0c8..ea803d4 100644
--- a/app/src/test/java/com/evsuite/abrp/ServerConfigTest.java
+++ b/app/src/test/java/com/evsuite/abrp/ServerConfigTest.java
@@ -44,4 +44,21 @@ public class ServerConfigTest {
         assertFalse(ServerConfig.isValidInstallationId("not-a-uuid"));
         assertFalse(ServerConfig.isValidInstallationId(""));
     }
+
+    @Test
+    public void theInstallationIdFollowsTheHeadUnit() {
+        String id = ServerConfig.installationIdFor("a1b2c3d4e5f60718");
+        assertTrue(id, ServerConfig.isValidInstallationId(id));
+        // The same head unit gets the same id after a reinstall; another gets another.
+        assertEquals(id, ServerConfig.installationIdFor(" A1B2C3D4E5F60718 "));
+        assertFalse(id.equals(ServerConfig.installationIdFor("0000000000000001")));
+        assertFalse(id.contains("a1b2c3d4e5f60718"));
+    }
+
+    @Test
+    public void noUsableAndroidIdMeansNoDerivedId() {
+        assertNull(ServerConfig.installationIdFor(null));
+        assertNull(ServerConfig.installationIdFor(""));
+        assertNull(ServerConfig.installationIdFor("9774d56d682e549c"));
+    }
 }
diff --git a/app/src/test/java/com/evsuite/abrp/TelemetryPayloadTest.java b/app/src/test/java/com/evsuite/abrp/TelemetryPayloadTest.java
index dc184a0..f91af99 100644
--- a/app/src/test/java/com/evsuite/abrp/TelemetryPayloadTest.java
+++ b/app/src/test/java/com/evsuite/abrp/TelemetryPayloadTest.java
@@ -311,4 +311,45 @@ public class TelemetryPayloadTest {
         assertTrue(summary, summary.startsWith("utc=1700000000"));
         assertTrue(summary, summary.contains("| omitted: soc,speed,"));
     }
+
+    // ---------- The server's ranges (server/model.go) ----------
+
+    @Test
+    public void reversingSendsSpeedAsAMagnitude() throws Exception {
+        TelemetryPayload t = new TelemetryPayload(1_700_000_000L);
+        t.speedKmh = -4.2f;
+        assertEquals(4, new JSONObject(t.build()).getInt("speed"));
+    }
+
+    @Test
+    public void valuesOutsideTheServersRangeAreLeftOut() throws Exception {
+        TelemetryPayload t = new TelemetryPayload(1_700_000_000L);
+        t.soc = 55;
+        t.extTempC = 72f;        // plausible to the car's guard, above the server's 70
+        t.hvacSetpointC = 50f;   // a HI sentinel, above the server's 40
+        t.rangeKm = 2500;
+        JSONObject json = new JSONObject(t.build());
+        assertEquals(55, json.getInt("soc"));
+        assertFalse(json.has("ext_temp"));
+        assertFalse(json.has("hvac_setpoint"));
+        assertFalse(json.has("est_battery_range"));
+    }
+
+    @Test
+    public void theAppsLimitsMatchEveryNumericServerField() {
+        String[] serverFields = {"soc", "speed", "power", "est_battery_range", "capacity", "soe",
+                "kwh_charged", "odometer", "lat", "lon", "elevation", "heading", "batt_temp",
+                "cabin_temp", "ext_temp", "hvac_setpoint", "voltage", "current",
+                "tire_pressure_fl", "tire_pressure_fr", "tire_pressure_rl", "tire_pressure_rr"};
+        for (String field : serverFields) {
+            assertTrue(field, TelemetryPayload.SERVER_LIMITS.containsKey(field));
+        }
+    }
+
+    @Test
+    public void aClockBefore2001IsNotATime() {
+        assertFalse(TelemetryPayload.isPlausibleUtc(0L));
+        assertFalse(TelemetryPayload.isPlausibleUtc(999_999_999L));
+        assertTrue(TelemetryPayload.isPlausibleUtc(1_790_000_000L));
+    }
 }
diff --git a/app/src/test/java/com/evsuite/abrp/TelemetryUploaderTest.java b/app/src/test/java/com/evsuite/abrp/TelemetryUploaderTest.java
new file mode 100644
index 0000000..517fe2f
--- /dev/null
+++ b/app/src/test/java/com/evsuite/abrp/TelemetryUploaderTest.java
@@ -0,0 +1,19 @@
+package com.evsuite.abrp;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+/** Reading the server's answer to a telemetry batch — pure JVM. */
+public class TelemetryUploaderTest {
+
+    @Test
+    public void theLogSaysWhatTheServerDropped() {
+        assertEquals(", 2 value(s) dropped by the server", TelemetryUploader.droppedNote(
+                new ServerHttp.Response(200, "{\"stored\":3,\"droppedCount\":2,\"dropped\":[]}")));
+        assertEquals("", TelemetryUploader.droppedNote(
+                new ServerHttp.Response(200, "{\"stored\":3,\"droppedCount\":0,\"dropped\":[]}")));
+        // An older server answers 204 without a body.
+        assertEquals("", TelemetryUploader.droppedNote(new ServerHttp.Response(204, "")));
+    }
+}
diff --git a/k8s/README.md b/k8s/README.md
index f2d2c0b..a2f694e 100644
--- a/k8s/README.md
+++ b/k8s/README.md
@@ -22,8 +22,8 @@ is applied automatically. Apply them yourself.
    covered by Traefik's default certificate.
 2. **Create the Secrets.** `cp k8s/secrets/secrets.example.yaml k8s/secrets/secrets.yaml` (gitignored), replace
    every `CHANGE-ME` there (`openssl rand -hex 32`): `influxdb-auth`, `mg4-server` (ingest token,
-   approval password for pairing, your ABRP API key and user token) and `grafana-admin`. Keep
-   the template itself on placeholders only.
+   approval password for pairing, your ABRP API key and user token), `grafana-admin` and
+   `grafana-influx` (see below). Keep the template itself on placeholders only.
 3. **Registry access.** The `mg4-server` package on git.stinnesbeck.com is public, so no pull
    secret is needed. If you make it private, add an `imagePullSecrets` entry to `server.yaml`.
 
@@ -38,12 +38,34 @@ kubectl apply -k k8s/
 Use **`-k`**, not `-f k8s/`: plain `-f` applies the files without kustomize, so the Grafana
 ConfigMaps (datasource and dashboards) are never created and Grafana does not start.
 
+## Grafana's InfluxDB token
+
+Grafana reads InfluxDB with a token that can only read the `mg4` bucket, from the
+`grafana-influx` Secret. InfluxDB has to create that token, so it is a step of its own:
+
+1. With InfluxDB running, create the token. The `influx` CLI in the pod is already signed in
+   as admin:
+
+   ```sh
+   kubectl -n mg4 exec influxdb-0 -- sh -c \
+     'influx auth create --org mg4 --description grafana-read-only --json \
+        --read-bucket "$(influx bucket find --name mg4 --hide-headers | cut -f1)"'
+   ```
+
+2. Copy the `"token"` value from the output into `grafana-influx` → `token` in
+   `k8s/secrets/secrets.yaml`, apply that file, and restart Grafana:
+   `kubectl -n mg4 rollout restart deployment/grafana`.
+
+Until the Secret exists, Grafana does not start (the container waits for the missing Secret).
+On a fresh install, apply everything once without Grafana working, create the token, then
+apply the Secret.
+
 ## Notes
 
 - InfluxDB's setup mode runs only on an empty volume. Changing `admin-token` in the Secret later
   does not change the token inside InfluxDB.
-- The server and Grafana use the InfluxDB admin token. A token scoped to the `mg4` bucket (read
-  for Grafana, read/write for the server) can replace it later.
+- The server uses the InfluxDB admin token; a token scoped to read/write on the `mg4` bucket can
+  replace it later. Grafana has its own read-only token (below).
 - The dashboards are read-only in Grafana's UI. Change the JSON in `grafana/dashboards/`; the
   ConfigMap name changes with its content, which rolls Grafana.
 - The server image is pinned by digest in `server.yaml`. To upgrade, push a new tag and put its
diff --git a/k8s/grafana.yaml b/k8s/grafana.yaml
index 135aa75..0cc1911 100644
--- a/k8s/grafana.yaml
+++ b/k8s/grafana.yaml
@@ -71,11 +71,13 @@ spec:
             # Read by datasources.yaml.
             - name: INFLUX_URL
               value: http://influxdb.mg4.svc:8086
+            # Read-only on the mg4 bucket; the dashboards never write (README, "Grafana's
+            # InfluxDB token").
             - name: INFLUX_TOKEN
               valueFrom:
                 secretKeyRef:
-                  name: influxdb-auth
-                  key: admin-token
+                  name: grafana-influx
+                  key: token
           volumeMounts:
             - name: data
               mountPath: /var/lib/grafana
diff --git a/k8s/secrets/secrets.example.yaml b/k8s/secrets/secrets.example.yaml
index f97d66b..3064ca0 100644
--- a/k8s/secrets/secrets.example.yaml
+++ b/k8s/secrets/secrets.example.yaml
@@ -41,3 +41,14 @@ stringData:
   # Grafana's admin login (user "admin"). Only read on first start: change it in Grafana
   # afterwards, or reset it with grafana cli.
   admin-password: CHANGE-ME
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: grafana-influx
+  namespace: mg4
+type: Opaque
+stringData:
+  # A read-only InfluxDB token for the mg4 bucket, not the admin token. InfluxDB makes it;
+  # the command is in k8s/README.md ("Grafana's InfluxDB token").
+  token: CHANGE-ME-read-only-token-from-influx-auth-create
diff --git a/k8s/server.yaml b/k8s/server.yaml
index d698e1e..5cb7dc3 100644
--- a/k8s/server.yaml
+++ b/k8s/server.yaml
@@ -29,8 +29,8 @@ spec:
           type: RuntimeDefault
       containers:
         - name: server
-          # 2.1.0, pinned by digest so a re-pushed tag cannot change what runs.
-          image: git.stinnesbeck.com/nils/mg4-server@sha256:e5f6e2d2ef9dc2650055a0823a3f86d8903e46918a76e990540482edf819766d
+          # 2.2.0, pinned by digest so a re-pushed tag cannot change what runs.
+          image: git.stinnesbeck.com/nils/mg4-server@sha256:09eb151ff65300b3990a74063cc44a14d24bef810461e4e0e63451cfbcfd8258
           ports:
             - name: http
               containerPort: 8080
diff --git a/mise.toml b/mise.toml
index 35eb1ab..dcd9206 100644
--- a/mise.toml
+++ b/mise.toml
@@ -121,7 +121,7 @@ run = './gradlew -Dorg.gradle.java.home=$JAVA_HOME installStableDebug'
 
 [tasks.logs]
 description = "Suit les logs de l'app sur le véhicule"
-run = "adb logcat -s AbrpUploadService:V CarPropertyAdapter:V VhalProbe:V SecurePrefs:V OtaUpdater:V UpdateHook:V"
+run = "adb logcat -s AbrpUploadService:V CarPropertyAdapter:V VhalProbe:V SecurePrefs:V OtaUpdater:V UpdateHook:V NilsMG4.Telemetry:V NilsMG4.Mongo:V NilsMG4.SteeringKey:V EVABRP.Boot:V EVABRP.Wifi:V"
 
 [tasks.release]
 description = "APK release des deux canaux (stable sans OTA, unstable avec OTA)"
diff --git a/server/README.md b/server/README.md
index 53a2fd9..0f565f3 100644
--- a/server/README.md
+++ b/server/README.md
@@ -31,18 +31,22 @@ The ABRP credentials never reach the car.
 ## Endpoints
 
 The ingest endpoints accept `Authorization: Bearer <token>` with either the shared `INGEST_TOKEN`
-or a paired car's own token.
+or a paired car's own token. A paired token only works for the installation id it was paired
+with (403 otherwise); the shared token works for any.
 
 - `POST /v1/telemetry` — `{ installationId, samples: [...] }`, up to 500 samples in ABRP's `tlm`
   field names and units (`utc` in epoch seconds; flags as 0/1 or booleans). Unknown fields are
-  dropped, known ones bounded. Stored, then the newest sample is forwarded to ABRP if it is under
-  5 minutes old.
+  dropped, known ones bounded: a value out of range is dropped on its own, and a sample without
+  a plausible time (before 2001, or more than an hour ahead) is dropped whole. The rest is stored
+  and the answer is `200 {stored, droppedCount, dropped}`, even when nothing was usable, since
+  the car would only send it again. The newest sample is forwarded to ABRP if it is under
+  5 minutes old and not ahead of the server's clock.
 - `PUT /v1/consumption/daily` — one delta chunk of a day's consumption.
 - `PUT /v1/charging-sessions/{sessionId}` — a finished DC session with its curve.
 - `GET /v1/consumption/history/{installationId}` — the car reads its own totals back.
 - `GET /v1/health` — `{"status":"ok"}`.
 
-A bad request is a 400 naming the field; a database failure is a 500 without detail.
+A malformed request is a 400 naming the field; a database failure is a 500 without detail.
 
 ## Pairing a car by QR code
 
@@ -52,13 +56,15 @@ on only when `APPROVAL_PASSWORD` is set.
 1. The car calls `POST /v1/pair/start` `{installationId}` and shows the returned
    `verificationUriComplete` as a QR code, plus the short `userCode` (e.g. `K7F-3QX`).
 2. The phone opens `/pair?code=…`, the owner checks the code and approves with the approval
-   password. Five wrong passwords lock approvals for a minute.
+   password. Five wrong passwords from one address lock that address out for a minute; other
+   addresses are unaffected (the address is the last `X-Forwarded-For` entry, which Traefik sets).
+   An address may hold three open requests; a car starting again replaces its own.
 3. The car polls `POST /v1/pair/poll` `{deviceCode}`: 202 pending, 200 with its own token
    (handed out once), 403 denied, 410 expired (after 10 minutes) or unknown.
 
 Each car gets its own 43-character token; only its SHA-256 is stored (measurement `device` in
-the same bucket), and the device is persisted before the car can collect the token, so a
-restart never loses a paired car. Manage cars with the approval password:
+the same bucket), and the token is only handed out, and only accepted, once the device is
+persisted, so a restart never loses a paired car. Manage cars with the approval password:
 
 ```sh
 curl -H "Authorization: Bearer $APPROVAL_PASSWORD" https://car.k8s.stinnesbeck.com/v1/devices
diff --git a/server/abrp.go b/server/abrp.go
index 9869cc6..50df2d6 100644
--- a/server/abrp.go
+++ b/server/abrp.go
@@ -37,6 +37,8 @@ const (
 	abrpEndpoint = "https://api.iternio.com/1/tlm/send"
 	// Older than this, a sample is history rather than live state, and ABRP gets nothing.
 	abrpMaxAge = 5 * time.Minute
+	// Newer than now by more than this, a sample's clock is wrong, and ABRP gets nothing.
+	abrpMaxAhead = 30 * time.Second
 )
 
 func (f *Forwarder) configured() bool {
@@ -46,16 +48,17 @@ func (f *Forwarder) configured() bool {
 // pick chooses the sample to forward, or false when there is nothing new or it is too
 // soon. It records the choice, so two batches arriving together cannot both forward.
 func (f *Forwarder) pick(samples []TelemetrySample, now time.Time) (TelemetrySample, bool) {
-	if len(samples) == 0 {
-		return TelemetrySample{}, false
-	}
-	newest := samples[0]
-	for _, s := range samples[1:] {
-		if s.UTC > newest.UTC {
-			newest = s
+	// A sample stamped ahead of now has a wrong clock. Taking it would also set lastUTC into
+	// the future, and every real sample after it would look older and never be sent.
+	latest := now.Add(abrpMaxAhead).Unix()
+	var newest TelemetrySample
+	found := false
+	for _, s := range samples {
+		if s.UTC <= latest && (!found || s.UTC > newest.UTC) {
+			newest, found = s, true
 		}
 	}
-	if now.Sub(time.Unix(newest.UTC, 0)) > abrpMaxAge {
+	if !found || now.Sub(time.Unix(newest.UTC, 0)) > abrpMaxAge {
 		return TelemetrySample{}, false
 	}
 	f.mu.Lock()
diff --git a/server/api.go b/server/api.go
index ce1390e..7b7bb83 100644
--- a/server/api.go
+++ b/server/api.go
@@ -8,6 +8,7 @@ import (
 	"log/slog"
 	"net/http"
 	"strings"
+	"time"
 )
 
 // API serves the car. Every endpoint but /v1/health needs the ingest token.
@@ -45,30 +46,49 @@ func (a *API) Routes() http.Handler {
 	return mux
 }
 
-// hasIngestToken accepts the shared token (compared in constant time; main refuses to start
+// caller is who sent an ingest request. A paired car's token is bound to the installation
+// id it was paired with; the shared INGEST_TOKEN may write and read for any.
+type caller struct {
+	installationID string // empty for the shared token
+}
+
+// mayUse reports whether the caller may write or read data stored under id.
+func (c caller) mayUse(id string) bool {
+	return c.installationID == "" || strings.EqualFold(c.installationID, id)
+}
+
+// errOtherInstallation is a 403: a paired car's token used for another car's data.
+var errOtherInstallation = errors.New("this token belongs to another installation; pair again after changing the installation id")
+
+// authenticate accepts the shared token (compared in constant time; main refuses to start
 // with one under 24 characters, so an empty or short one never matches) or a paired car's
 // own, unrevoked token.
-func (a *API) hasIngestToken(r *http.Request) bool {
+func (a *API) authenticate(r *http.Request) (caller, bool) {
 	header := r.Header.Get("Authorization")
 	supplied, ok := strings.CutPrefix(header, "Bearer ")
 	if !ok || supplied == "" {
-		return false
+		return caller{}, false
 	}
 	if len(a.IngestToken) >= minIngestTokenLength &&
 		subtle.ConstantTimeCompare([]byte(supplied), []byte(a.IngestToken)) == 1 {
-		return true
+		return caller{}, true
 	}
-	return a.Pairing.Authorized(supplied)
+	d, ok := a.Pairing.Authorized(supplied)
+	if !ok {
+		return caller{}, false
+	}
+	return caller{installationID: d.InstallationID}, true
 }
 
-type handler func(w http.ResponseWriter, r *http.Request, body []byte) error
+type handler func(w http.ResponseWriter, r *http.Request, c caller, body []byte) error
 
 // ingest wraps a handler with the token check, the body limit and error mapping: a
-// validation failure is a 400 naming the field; anything else is a 500 whose detail
-// stays in the server log.
+// validation failure is a 400 naming the field, another car's data a 403; anything else
+// is a 500 whose detail stays in the server log.
 func (a *API) ingest(h handler) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if !a.hasIngestToken(r) {
+		c, ok := a.authenticate(r)
+		if !ok {
 			writeJSON(w, http.StatusUnauthorized, map[string]string{"error": "unauthorized"})
 			return
 		}
@@ -81,7 +101,11 @@ func (a *API) ingest(h handler) http.HandlerFunc {
 			writeJSON(w, http.StatusBadRequest, map[string]string{"error": "body is too large"})
 			return
 		}
-		if err := h(w, r, body); err != nil {
+		if err := h(w, r, c, body); err != nil {
+			if errors.Is(err, errOtherInstallation) {
+				writeJSON(w, http.StatusForbidden, map[string]string{"error": err.Error()})
+				return
+			}
 			var verr *ValidationError
 			if errors.As(err, &verr) {
 				writeJSON(w, http.StatusBadRequest, map[string]string{"error": verr.Error()})
@@ -93,29 +117,53 @@ func (a *API) ingest(h handler) http.HandlerFunc {
 	}
 }
 
+// maxDroppedListed caps the dropped values named in a telemetry response and log line.
+const maxDroppedListed = 20
+
 // telemetry stores the batch first; only once the write succeeded is the newest sample
 // handed to ABRP, so the car's retry of a failed request cannot leave ABRP with data the
-// database never got.
-func (a *API) telemetry(w http.ResponseWriter, r *http.Request, body []byte) error {
-	batch, err := validateTelemetryBatch(body)
+// database never got. The answer says how many samples were stored and what was dropped;
+// a batch with nothing usable is still a 200, since sending it again would not help.
+func (a *API) telemetry(w http.ResponseWriter, r *http.Request, c caller, body []byte) error {
+	batch, err := validateTelemetryBatch(body, time.Now())
 	if err != nil {
 		return err
 	}
-	if err := a.Store.WriteTelemetry(r.Context(), batch.InstallationID, batch.Samples); err != nil {
-		return err
+	if !c.mayUse(batch.InstallationID) {
+		return errOtherInstallation
 	}
-	a.Forwarder.Forward(batch.Samples)
-	w.WriteHeader(http.StatusNoContent)
+	if len(batch.Samples) > 0 {
+		if err := a.Store.WriteTelemetry(r.Context(), batch.InstallationID, batch.Samples); err != nil {
+			return err
+		}
+		a.Forwarder.Forward(batch.Samples)
+	}
+	dropped := batch.Dropped
+	if len(dropped) > maxDroppedListed {
+		dropped = dropped[:maxDroppedListed]
+	}
+	if len(batch.Dropped) > 0 {
+		slog.Warn("telemetry values dropped", "installation", batch.InstallationID,
+			"count", len(batch.Dropped), "first", dropped)
+	}
+	writeJSON(w, http.StatusOK, map[string]any{
+		"stored":       len(batch.Samples),
+		"droppedCount": len(batch.Dropped),
+		"dropped":      append([]string{}, dropped...),
+	})
 	return nil
 }
 
 // consumption stores one delta chunk at its recordedAt. Reads add a day's chunks up, so a
 // chunk the car re-sends from its offline cache replaces itself instead of counting twice.
-func (a *API) consumption(w http.ResponseWriter, r *http.Request, body []byte) error {
+func (a *API) consumption(w http.ResponseWriter, r *http.Request, c caller, body []byte) error {
 	chunk, err := validateConsumption(body)
 	if err != nil {
 		return err
 	}
+	if !c.mayUse(chunk.InstallationID) {
+		return errOtherInstallation
+	}
 	if err := a.Store.WriteConsumptionChunk(r.Context(), chunk); err != nil {
 		return err
 	}
@@ -123,11 +171,14 @@ func (a *API) consumption(w http.ResponseWriter, r *http.Request, body []byte) e
 	return nil
 }
 
-func (a *API) chargingSession(w http.ResponseWriter, r *http.Request, body []byte) error {
+func (a *API) chargingSession(w http.ResponseWriter, r *http.Request, c caller, body []byte) error {
 	session, err := validateChargingSession(body, r.PathValue("sessionId"))
 	if err != nil {
 		return err
 	}
+	if !c.mayUse(session.InstallationID) {
+		return errOtherInstallation
+	}
 	if err := a.Store.WriteChargingSession(r.Context(), session); err != nil {
 		return err
 	}
@@ -137,11 +188,14 @@ func (a *API) chargingSession(w http.ResponseWriter, r *http.Request, body []byt
 
 // history is the car's read-back of its own uploaded totals, so an app reinstall does not
 // blank its Consumption tab. Up to 400 days, newest first, plus the lifetime sum of all.
-func (a *API) history(w http.ResponseWriter, r *http.Request, _ []byte) error {
+func (a *API) history(w http.ResponseWriter, r *http.Request, c caller, _ []byte) error {
 	id, err := validUUID(r.PathValue("installationId"), "installationId")
 	if err != nil {
 		return err
 	}
+	if !c.mayUse(id) {
+		return errOtherInstallation
+	}
 	chunks, err := a.Store.ReadConsumptionChunks(r.Context(), id)
 	if err != nil {
 		return err
diff --git a/server/api_test.go b/server/api_test.go
index c3832ae..4a69fa5 100644
--- a/server/api_test.go
+++ b/server/api_test.go
@@ -116,17 +116,32 @@ func TestEveryOtherEndpointNeedsTheIngestToken(t *testing.T) {
 	}
 }
 
-func TestTelemetryIsStoredAndBadInputIsA400(t *testing.T) {
+func TestTelemetryIsStoredAndBadValuesAreDropped(t *testing.T) {
 	api, store := newTestAPI()
 	h := api.Routes()
 	rec := do(t, h, "POST", "/v1/telemetry", testToken, string(telemetryBody(`{"utc":1790000000,"soc":80}`)))
-	if rec.Code != 204 || len(store.telemetry) != 1 {
-		t.Fatalf("%d, stored %d", rec.Code, len(store.telemetry))
+	if rec.Code != 200 || len(store.telemetry) != 1 || !strings.Contains(rec.Body.String(), `"stored":1`) {
+		t.Fatalf("%d %s, stored %d", rec.Code, rec.Body, len(store.telemetry))
 	}
-	rec = do(t, h, "POST", "/v1/telemetry", testToken, string(telemetryBody(`{"utc":1790000000,"soc":120}`)))
-	if rec.Code != 400 || !strings.Contains(rec.Body.String(), "samples[0].soc is invalid") {
+	// One bad value costs that value, not the batch: the car drops what the server rejects.
+	rec = do(t, h, "POST", "/v1/telemetry", testToken,
+		string(telemetryBody(`{"utc":1790000000,"soc":120,"speed":-3},{"utc":1790000015,"soc":79}`)))
+	if rec.Code != 200 || len(store.telemetry) != 3 || !strings.Contains(rec.Body.String(), "samples[0].soc") ||
+		!strings.Contains(rec.Body.String(), "samples[0].speed") || !strings.Contains(rec.Body.String(), `"stored":2`) {
+		t.Fatalf("%d %s, stored %d", rec.Code, rec.Body, len(store.telemetry))
+	}
+	if _, ok := store.telemetry[1].Numbers["soc"]; ok {
+		t.Fatal("out-of-range soc stored")
+	}
+	// Nothing usable is still a 200: sending it again would not help.
+	rec = do(t, h, "POST", "/v1/telemetry", testToken, string(telemetryBody(`{"utc":5}`)))
+	if rec.Code != 200 || len(store.telemetry) != 3 || !strings.Contains(rec.Body.String(), `"stored":0`) {
 		t.Fatalf("%d %s", rec.Code, rec.Body)
 	}
+	// A malformed request is still a 400.
+	if rec := do(t, h, "POST", "/v1/telemetry", testToken, `{"installationId":"nope","samples":[]}`); rec.Code != 400 {
+		t.Fatalf("malformed: %d", rec.Code)
+	}
 	if rec := do(t, h, "GET", "/v1/telemetry", testToken, ""); rec.Code != 405 {
 		t.Fatalf("GET on a POST route: want 405, got %d", rec.Code)
 	}
diff --git a/server/logic_test.go b/server/logic_test.go
index bf83bf9..6f8371c 100644
--- a/server/logic_test.go
+++ b/server/logic_test.go
@@ -75,6 +75,18 @@ func TestForwarderPicksOnlyTheNewestFreshSampleOncePerInterval(t *testing.T) {
 	if _, ok := fresh.pick([]TelemetrySample{{UTC: testNowS - 600}}, now); ok {
 		t.Fatal("forwarded a stale sample")
 	}
+	// A sample from a clock a day ahead is skipped, and does not block the real ones after it.
+	ahead := &Forwarder{MinInterval: 5 * time.Second}
+	got, ok = ahead.pick([]TelemetrySample{{UTC: testNowS + 86400}, {UTC: testNowS - 1}}, now)
+	if !ok || got.UTC != testNowS-1 {
+		t.Fatalf("picked %+v %v", got, ok)
+	}
+	if _, ok := ahead.pick([]TelemetrySample{{UTC: testNowS + 86400}}, now.Add(time.Minute)); ok {
+		t.Fatal("forwarded a sample from the future")
+	}
+	if _, ok := ahead.pick([]TelemetrySample{{UTC: testNowS + 60}}, now.Add(time.Minute)); !ok {
+		t.Fatal("a real sample after a future one was not forwarded")
+	}
 }
 
 func TestForwarderPutsCredentialsInTheBodyNotTheURL(t *testing.T) {
diff --git a/server/model.go b/server/model.go
index 955f932..b121c87 100644
--- a/server/model.go
+++ b/server/model.go
@@ -105,4 +105,6 @@ type TelemetrySample struct {
 type TelemetryBatch struct {
 	InstallationID string
 	Samples        []TelemetrySample
+	// Dropped names the values and samples validation left out, e.g. "samples[3].speed".
+	Dropped []string
 }
diff --git a/server/pairing.go b/server/pairing.go
index f67438c..4b698ee 100644
--- a/server/pairing.go
+++ b/server/pairing.go
@@ -21,12 +21,19 @@ import (
 // replica. Approved devices are persisted (see Device) so their tokens survive a restart.
 
 const (
-	pairingTTL        = 10 * time.Minute
-	pairingInterval   = 5 * time.Second
-	maxPendingPairing = 50
-	// After this many wrong approval passwords in a window, approvals pause for the window.
-	maxFailedLogins    = 5
-	failedLoginsWindow = time.Minute
+	pairingTTL      = 10 * time.Minute
+	pairingInterval = 5 * time.Second
+	// Pending requests per client address, and in all. A car needs one; a client that opens
+	// more only crowds out its own, and the total bounds memory.
+	maxPendingPerClient = 3
+	maxPendingPairing   = 1000
+	// After this many wrong approval passwords from one client address in a window, that
+	// address waits for the window. Other addresses are not affected, so a stranger guessing
+	// cannot lock the owner out. The global cap only bounds guessing spread over many
+	// addresses; it is far above anything a person types.
+	maxFailedLogins       = 5
+	maxFailedLoginsGlobal = 100
+	failedLoginsWindow    = time.Minute
 	// Unambiguous characters only: no 0/O, 1/I/L, so a code reads right off a car screen.
 	userCodeAlphabet = "ABCDEFGHJKMNPQRSTUVWXYZ23456789"
 )
@@ -52,6 +59,9 @@ type pairingState int
 
 const (
 	pairingPending pairingState = iota
+	// pairingSaving: approved, and the device is being persisted. The car still sees
+	// pending, so it cannot collect a token whose device might not be saved.
+	pairingSaving
 	pairingApproved
 	pairingDenied
 )
@@ -60,6 +70,7 @@ type pairingRequest struct {
 	deviceCode     string
 	userCode       string
 	installationID string
+	client         string // address that opened the request
 	expires        time.Time
 	state          pairingState
 	token          string // set on approval, handed out once
@@ -75,7 +86,9 @@ type Pairing struct {
 	byDevice map[string]*pairingRequest
 	byUser   map[string]*pairingRequest
 	devices  map[string]Device // by token hash
-	failures []time.Time
+	// Wrong passwords: per client address, and all of them together.
+	failures       map[string][]time.Time
+	globalFailures []time.Time
 }
 
 func NewPairing(password string, devices []Device) *Pairing {
@@ -85,6 +98,7 @@ func NewPairing(password string, devices []Device) *Pairing {
 		byDevice:         map[string]*pairingRequest{},
 		byUser:           map[string]*pairingRequest{},
 		devices:          map[string]Device{},
+		failures:         map[string][]time.Time{},
 	}
 	for _, d := range devices {
 		p.devices[d.TokenHash] = d
@@ -137,25 +151,43 @@ func hashToken(token string) string {
 
 func (p *Pairing) expireLocked(now time.Time) {
 	for code, r := range p.byDevice {
-		if now.After(r.expires) {
+		// A request being saved is finished by Commit or Forget, not expired under them.
+		if now.After(r.expires) && r.state != pairingSaving {
 			delete(p.byDevice, code)
 			delete(p.byUser, r.userCode)
 		}
 	}
 }
 
-// Start opens a pairing request for a car.
-func (p *Pairing) Start(installationID string) (*pairingRequest, error) {
+func (p *Pairing) dropLocked(r *pairingRequest) {
+	delete(p.byDevice, r.deviceCode)
+	delete(p.byUser, r.userCode)
+}
+
+// Start opens a pairing request for a car. A new request replaces the same installation's
+// undecided one; a client already holding maxPendingPerClient requests gets errTooMany.
+func (p *Pairing) Start(installationID, client string) (*pairingRequest, error) {
 	p.mu.Lock()
 	defer p.mu.Unlock()
 	now := p.Now()
 	p.expireLocked(now)
-	if len(p.byDevice) >= maxPendingPairing {
+	perClient := 0
+	for _, r := range p.byDevice {
+		if r.state == pairingPending && strings.EqualFold(r.installationID, installationID) {
+			p.dropLocked(r)
+			continue
+		}
+		if r.client == client {
+			perClient++
+		}
+	}
+	if perClient >= maxPendingPerClient || len(p.byDevice) >= maxPendingPairing {
 		return nil, errTooMany
 	}
 	r := &pairingRequest{
 		deviceCode:     randomString(32),
 		installationID: installationID,
+		client:         client,
 		expires:        now.Add(pairingTTL),
 	}
 	for {
@@ -182,32 +214,46 @@ func (p *Pairing) Lookup(userCode string) (pairingRequest, error) {
 	return *r, nil
 }
 
-// checkPassword counts failures and refuses everything while too many are recent.
-func (p *Pairing) checkPasswordLocked(password string, now time.Time) error {
-	recent := p.failures[:0]
-	for _, t := range p.failures {
+func recentOnly(times []time.Time, now time.Time) []time.Time {
+	recent := times[:0]
+	for _, t := range times {
 		if now.Sub(t) < failedLoginsWindow {
 			recent = append(recent, t)
 		}
 	}
-	p.failures = recent
-	if len(p.failures) >= maxFailedLogins {
+	return recent
+}
+
+// checkPasswordLocked counts failures per client address and refuses a client while it
+// has too many recent ones (or while too many arrive from everywhere at once).
+func (p *Pairing) checkPasswordLocked(password, client string, now time.Time) error {
+	for c, times := range p.failures {
+		if recent := recentOnly(times, now); len(recent) == 0 {
+			delete(p.failures, c)
+		} else {
+			p.failures[c] = recent
+		}
+	}
+	p.globalFailures = recentOnly(p.globalFailures, now)
+	if len(p.failures[client]) >= maxFailedLogins || len(p.globalFailures) >= maxFailedLoginsGlobal {
 		return errTooManyFailed
 	}
 	if subtle.ConstantTimeCompare([]byte(password), []byte(p.ApprovalPassword)) != 1 {
-		p.failures = append(p.failures, now)
+		p.failures[client] = append(p.failures[client], now)
+		p.globalFailures = append(p.globalFailures, now)
 		return errWrongPassword
 	}
 	return nil
 }
 
 // Decide approves or denies a pending request. On approval it returns the new device, which
-// the caller must persist before the car can collect the token.
-func (p *Pairing) Decide(userCode, password string, approve bool) (Device, error) {
+// the caller must persist and then Commit (or Forget, if saving failed): until Commit the
+// car keeps seeing pending and the token is not accepted anywhere.
+func (p *Pairing) Decide(userCode, password, client string, approve bool) (Device, error) {
 	p.mu.Lock()
 	defer p.mu.Unlock()
 	now := p.Now()
-	if err := p.checkPasswordLocked(password, now); err != nil {
+	if err := p.checkPasswordLocked(password, client, now); err != nil {
 		return Device{}, err
 	}
 	p.expireLocked(now)
@@ -229,20 +275,29 @@ func (p *Pairing) Decide(userCode, password string, approve bool) (Device, error
 		TokenHash:      hashToken(token),
 		CreatedAt:      now,
 	}
-	r.state = pairingApproved
+	r.state = pairingSaving
 	r.token = token
 	r.deviceID = d.ID
-	p.devices[d.TokenHash] = d
 	return d, nil
 }
 
+// Commit finishes an approval once its device is persisted: the token now works, and the
+// car collects it at its next poll.
+func (p *Pairing) Commit(userCode string, d Device) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	p.devices[d.TokenHash] = d
+	if r, ok := p.byUser[normalizeUserCode(userCode)]; ok && r.deviceID == d.ID {
+		r.state = pairingApproved
+	}
+}
+
 // Forget undoes an approval whose device could not be persisted, so no token is handed out
-// that would stop working at the next restart.
+// that would stop working at the next restart. The request is pending again.
 func (p *Pairing) Forget(userCode string, d Device) {
 	p.mu.Lock()
 	defer p.mu.Unlock()
-	delete(p.devices, d.TokenHash)
-	if r, ok := p.byUser[normalizeUserCode(userCode)]; ok {
+	if r, ok := p.byUser[normalizeUserCode(userCode)]; ok && r.deviceID == d.ID {
 		r.state = pairingPending
 		r.token = ""
 		r.deviceID = ""
@@ -259,23 +314,27 @@ func (p *Pairing) Poll(deviceCode string) (state pairingState, token, deviceID s
 		return 0, "", "", errUnknownCode
 	}
 	switch r.state {
+	case pairingSaving:
+		return pairingPending, "", "", nil
 	case pairingApproved, pairingDenied:
 		// Decided: hand the outcome out once, then forget the request.
-		delete(p.byDevice, r.deviceCode)
-		delete(p.byUser, r.userCode)
+		p.dropLocked(r)
 	}
 	return r.state, r.token, r.deviceID, nil
 }
 
-// Authorized reports whether a token belongs to a paired, unrevoked device.
-func (p *Pairing) Authorized(token string) bool {
+// Authorized returns the paired, unrevoked device a token belongs to.
+func (p *Pairing) Authorized(token string) (Device, bool) {
 	if p == nil || token == "" {
-		return false
+		return Device{}, false
 	}
 	p.mu.Lock()
 	defer p.mu.Unlock()
 	d, ok := p.devices[hashToken(token)]
-	return ok && !d.Revoked
+	if !ok || d.Revoked {
+		return Device{}, false
+	}
+	return d, true
 }
 
 func (p *Pairing) Devices() []Device {
@@ -304,8 +363,8 @@ func (p *Pairing) Revoke(id string) (Device, bool) {
 
 // CheckAdmin verifies the approval password for the device-management API, with the same
 // failure counting as the approval page.
-func (p *Pairing) CheckAdmin(password string) error {
+func (p *Pairing) CheckAdmin(password, client string) error {
 	p.mu.Lock()
 	defer p.mu.Unlock()
-	return p.checkPasswordLocked(password, p.Now())
+	return p.checkPasswordLocked(password, client, p.Now())
 }
diff --git a/server/pairing_http.go b/server/pairing_http.go
index f8341f1..2456969 100644
--- a/server/pairing_http.go
+++ b/server/pairing_http.go
@@ -5,6 +5,7 @@ import (
 	"html/template"
 	"io"
 	"log/slog"
+	"net"
 	"net/http"
 	"net/url"
 	"strings"
@@ -79,7 +80,7 @@ func (a *API) pairStart(w http.ResponseWriter, r *http.Request) {
 		writeJSON(w, http.StatusBadRequest, map[string]string{"error": err.Error()})
 		return
 	}
-	req, err := a.Pairing.Start(id)
+	req, err := a.Pairing.Start(id, clientAddress(r))
 	if err != nil {
 		writeJSON(w, http.StatusTooManyRequests, map[string]string{"error": err.Error()})
 		return
@@ -118,6 +119,25 @@ func (a *API) pairPoll(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+// clientAddress is who is asking, for the per-client limits: the last X-Forwarded-For entry,
+// which is the one Traefik adds (anything left of it comes from the client and can be
+// made up), or the connection's own address without a proxy.
+func clientAddress(r *http.Request) string {
+	if forwarded := r.Header.Values("X-Forwarded-For"); len(forwarded) > 0 {
+		last := forwarded[len(forwarded)-1]
+		if i := strings.LastIndex(last, ","); i >= 0 {
+			last = last[i+1:]
+		}
+		if addr := strings.TrimSpace(last); addr != "" {
+			return addr
+		}
+	}
+	if host, _, err := net.SplitHostPort(r.RemoteAddr); err == nil {
+		return host
+	}
+	return r.RemoteAddr
+}
+
 // ---------- Approval page ----------
 
 type pageData struct {
@@ -204,7 +224,7 @@ func (a *API) pairDecide(w http.ResponseWriter, r *http.Request) {
 	}
 	code := normalizeUserCode(r.PostForm.Get("code"))
 	approve := r.PostForm.Get("action") != "deny"
-	device, err := a.Pairing.Decide(code, r.PostForm.Get("password"), approve)
+	device, err := a.Pairing.Decide(code, r.PostForm.Get("password"), clientAddress(r), approve)
 	switch {
 	case errors.Is(err, errWrongPassword):
 		renderPage(w, http.StatusUnauthorized, pageData{Code: code, Error: "Wrong password."})
@@ -231,6 +251,7 @@ func (a *API) pairDecide(w http.ResponseWriter, r *http.Request) {
 		renderPage(w, http.StatusInternalServerError, pageData{Code: code, Error: "The car could not be saved. Try again."})
 		return
 	}
+	a.Pairing.Commit(code, device)
 	slog.Info("car paired", "device", device.ID, "installation", device.InstallationID)
 	renderPage(w, http.StatusOK, pageData{Done: true, Message: "Approved. The car finishes pairing on its own within a few seconds — you can close this page."})
 }
@@ -246,7 +267,7 @@ func (a *API) adminAuthorized(w http.ResponseWriter, r *http.Request) bool {
 		writeJSON(w, http.StatusUnauthorized, map[string]string{"error": "unauthorized"})
 		return false
 	}
-	switch err := a.Pairing.CheckAdmin(supplied); {
+	switch err := a.Pairing.CheckAdmin(supplied, clientAddress(r)); {
 	case errors.Is(err, errTooManyFailed):
 		writeJSON(w, http.StatusTooManyRequests, map[string]string{"error": err.Error()})
 		return false
diff --git a/server/pairing_test.go b/server/pairing_test.go
index fce9b53..2be5f00 100644
--- a/server/pairing_test.go
+++ b/server/pairing_test.go
@@ -34,10 +34,19 @@ func poll(t *testing.T, h http.Handler, deviceCode string) (int, map[string]stri
 }
 
 func submit(t *testing.T, h http.Handler, code, password, action string) *httptest.ResponseRecorder {
+	t.Helper()
+	return submitFrom(t, h, "", code, password, action)
+}
+
+// submitFrom submits the approval form as if from forwardedFor, the address Traefik adds.
+func submitFrom(t *testing.T, h http.Handler, forwardedFor, code, password, action string) *httptest.ResponseRecorder {
 	t.Helper()
 	form := url.Values{"code": {code}, "password": {password}, "action": {action}}
 	req := httptest.NewRequest("POST", "/pair", strings.NewReader(form.Encode()))
 	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	if forwardedFor != "" {
+		req.Header.Set("X-Forwarded-For", forwardedFor)
+	}
 	rec := httptest.NewRecorder()
 	h.ServeHTTP(rec, req)
 	return rec
@@ -86,7 +95,7 @@ func TestPairingHappyPath(t *testing.T) {
 	}
 	// And it works on the ingest endpoints.
 	rec := do(t, h, "POST", "/v1/telemetry", got["token"], string(telemetryBody(`{"utc":1790000000,"soc":80}`)))
-	if rec.Code != 204 {
+	if rec.Code != 200 {
 		t.Fatalf("paired token on telemetry: %d %s", rec.Code, rec.Body)
 	}
 }
@@ -107,6 +116,11 @@ func TestPairingWrongPasswordAndLockout(t *testing.T) {
 	if status, _ := poll(t, h, deviceCode); status != 202 || len(store.devices) != 0 {
 		t.Fatal("a locked-out attempt changed the request")
 	}
+	// The lockout is per address: someone guessing elsewhere does not lock the owner out.
+	if rec := submitFrom(t, h, "198.51.100.7", userCode, testApprovalPassword, "deny"); rec.Code != 200 {
+		t.Fatalf("other address locked out too: %d", rec.Code)
+	}
+	deviceCode, userCode, _ = startPairing(t, h)
 	// After the window the right password works again.
 	api.Pairing.Now = func() time.Time { return time.Now().Add(failedLoginsWindow + time.Second) }
 	if rec := submit(t, h, userCode, testApprovalPassword, "approve"); rec.Code != 200 {
@@ -186,7 +200,7 @@ func TestRevokedTokenIsRejected(t *testing.T) {
 		t.Fatalf("revoked token accepted: %d", rec.Code)
 	}
 	// The shared ingest token is unaffected.
-	if rec := do(t, h, "POST", "/v1/telemetry", testToken, string(telemetryBody(`{"utc":1790000000,"soc":1}`))); rec.Code != 204 {
+	if rec := do(t, h, "POST", "/v1/telemetry", testToken, string(telemetryBody(`{"utc":1790000000,"soc":1}`))); rec.Code != 200 {
 		t.Fatalf("shared token: %d", rec.Code)
 	}
 }
@@ -195,7 +209,9 @@ func TestPairedDevicesSurviveARestart(t *testing.T) {
 	devices := []Device{{ID: "d1", TokenHash: hashToken("restored-token-0123456789abcdef"), CreatedAt: time.Now()},
 		{ID: "d2", TokenHash: hashToken("revoked-token-0123456789abcdef"), CreatedAt: time.Now(), Revoked: true}}
 	p := NewPairing(testApprovalPassword, devices)
-	if !p.Authorized("restored-token-0123456789abcdef") || p.Authorized("revoked-token-0123456789abcdef") {
+	_, restored := p.Authorized("restored-token-0123456789abcdef")
+	_, revoked := p.Authorized("revoked-token-0123456789abcdef")
+	if !restored || revoked {
 		t.Fatal("restored devices not honoured")
 	}
 }
@@ -232,3 +248,84 @@ func TestApprovalPasswordMustBeLongEnough(t *testing.T) {
 }
 
 var regexpUserCode = regexp.MustCompile(`^[` + userCodeAlphabet + `]{3}-[` + userCodeAlphabet + `]{3}$`)
+
+func TestPairedTokenOnlyServesItsOwnInstallation(t *testing.T) {
+	api, _ := newTestAPI()
+	h := api.Routes()
+	deviceCode, userCode, _ := startPairing(t, h)
+	submit(t, h, userCode, testApprovalPassword, "approve")
+	_, got := poll(t, h, deviceCode)
+	token := got["token"]
+	other := "7e2b3c4d-5e6f-4a70-9b8c-1d2e3f4a5b6c"
+	body := `{"installationId":"` + other + `","samples":[{"utc":1790000000,"soc":5}]}`
+	if rec := do(t, h, "POST", "/v1/telemetry", token, body); rec.Code != 403 {
+		t.Fatalf("telemetry for another car: %d", rec.Code)
+	}
+	if rec := do(t, h, "GET", "/v1/consumption/history/"+other, token, ""); rec.Code != 403 {
+		t.Fatalf("another car's history: %d", rec.Code)
+	}
+	if rec := do(t, h, "GET", "/v1/consumption/history/"+testInstallation, token, ""); rec.Code != 200 {
+		t.Fatalf("own history: %d", rec.Code)
+	}
+	// The shared token serves any installation.
+	if rec := do(t, h, "POST", "/v1/telemetry", testToken, body); rec.Code != 200 {
+		t.Fatalf("shared token: %d", rec.Code)
+	}
+}
+
+func TestATokenIsCollectableOnlyOnceSaved(t *testing.T) {
+	p := NewPairing(testApprovalPassword, nil)
+	r, err := p.Start(testInstallation, "192.0.2.1")
+	if err != nil {
+		t.Fatal(err)
+	}
+	d, err := p.Decide(r.userCode, testApprovalPassword, "192.0.2.1", true)
+	if err != nil {
+		t.Fatal(err)
+	}
+	// Saving is in flight: the car still waits, and the token is not accepted yet.
+	if state, token, _, _ := p.Poll(r.deviceCode); state != pairingPending || token != "" {
+		t.Fatalf("collectable while saving: %v %q", state, token)
+	}
+	p.Forget(r.userCode, d)
+	if _, err := p.Decide(r.userCode, testApprovalPassword, "192.0.2.1", true); err != nil {
+		t.Fatalf("not approvable again after a failed save: %v", err)
+	}
+}
+
+func TestPairingStartsAreLimitedPerAddress(t *testing.T) {
+	p := NewPairing(testApprovalPassword, nil)
+	ids := []string{"6f1a2b3c-4d5e-4f60-8a9b-0c1d2e3f4a51", "6f1a2b3c-4d5e-4f60-8a9b-0c1d2e3f4a52",
+		"6f1a2b3c-4d5e-4f60-8a9b-0c1d2e3f4a53", "6f1a2b3c-4d5e-4f60-8a9b-0c1d2e3f4a54"}
+	for _, id := range ids[:maxPendingPerClient] {
+		if _, err := p.Start(id, "203.0.113.9"); err != nil {
+			t.Fatal(err)
+		}
+	}
+	if _, err := p.Start(ids[3], "203.0.113.9"); !errors.Is(err, errTooMany) {
+		t.Fatalf("over the per-address limit: %v", err)
+	}
+	// The car on its own address is unaffected, and starting again replaces its request.
+	first, err := p.Start(testInstallation, "192.0.2.1")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if _, err := p.Start(testInstallation, "192.0.2.1"); err != nil {
+		t.Fatal(err)
+	}
+	if _, _, _, err := p.Poll(first.deviceCode); !errors.Is(err, errUnknownCode) {
+		t.Fatal("the replaced request is still open")
+	}
+}
+
+func TestClientAddressTakesTheProxysEntry(t *testing.T) {
+	req := httptest.NewRequest("GET", "/", nil)
+	req.Header.Set("X-Forwarded-For", "10.9.9.9, 198.51.100.7")
+	if got := clientAddress(req); got != "198.51.100.7" {
+		t.Fatalf("got %q", got)
+	}
+	req.Header.Del("X-Forwarded-For")
+	if got := clientAddress(req); got != "192.0.2.1" {
+		t.Fatalf("without a proxy: %q", got)
+	}
+}
diff --git a/server/validate.go b/server/validate.go
index 146a64e..c82cbe3 100644
--- a/server/validate.go
+++ b/server/validate.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"math"
 	"regexp"
+	"sort"
 	"time"
 )
 
@@ -252,8 +253,13 @@ func validateChargingSession(body []byte, pathSessionID string) (ChargingSession
 
 // validateTelemetryBatch checks a batch of live samples in ABRP's tlm field names and
 // units. Unknown fields are dropped rather than rejected, so a newer app can add one
-// without a server release; every known field is bounded; a flag may be 0/1 or a boolean.
-func validateTelemetryBatch(body []byte) (TelemetryBatch, error) {
+// without a server release; a flag may be 0/1 or a boolean.
+//
+// Only a malformed request is a 400. A bad value inside a sample costs that value, and a
+// sample without a usable time costs that sample: the car drops a batch the server
+// rejects, and one sensor reading out of range must not take hours of queued driving with
+// it. What was dropped is listed in Dropped, for the response and the log.
+func validateTelemetryBatch(body []byte, now time.Time) (TelemetryBatch, error) {
 	o, err := decodeObject(body)
 	if err != nil {
 		return TelemetryBatch{}, err
@@ -266,34 +272,45 @@ func validateTelemetryBatch(body []byte) (TelemetryBatch, error) {
 	if !ok || len(raw) == 0 || len(raw) > maxSamples {
 		return TelemetryBatch{}, invalid("samples is invalid")
 	}
-	samples := make([]TelemetrySample, 0, len(raw))
+	batch := TelemetryBatch{InstallationID: id, Samples: make([]TelemetrySample, 0, len(raw))}
+	latest := now.Add(maxClockAhead).Unix()
 	for i, entry := range raw {
-		sample, err := validateSample(entry, fmt.Sprintf("samples[%d]", i))
-		if err != nil {
-			return TelemetryBatch{}, err
+		name := fmt.Sprintf("samples[%d]", i)
+		sample, dropped, ok := validateSample(entry, name, latest)
+		batch.Dropped = append(batch.Dropped, dropped...)
+		if ok {
+			batch.Samples = append(batch.Samples, sample)
 		}
-		samples = append(samples, sample)
 	}
-	return TelemetryBatch{InstallationID: id, Samples: samples}, nil
+	return batch, nil
 }
 
-func validateSample(entry any, name string) (TelemetrySample, error) {
+// maxClockAhead is how far in the future a sample may be stamped. The head unit sets its
+// clock from GPS; a sample from further ahead has a wrong time, and stored there it would
+// pose as the car's latest state until that time came.
+const maxClockAhead = time.Hour
+
+// validateSample keeps every valid field of one sample. It returns false when the sample
+// as a whole is unusable: not an object, or no plausible time. dropped names what was left
+// out.
+func validateSample(entry any, name string, latestUTC int64) (sample TelemetrySample, dropped []string, ok bool) {
 	o, err := asObject(entry, name)
 	if err != nil {
-		return TelemetrySample{}, err
+		return TelemetrySample{}, []string{name}, false
 	}
 	utc, err := integer(o["utc"], name+".utc")
-	if err != nil || utc < utcMin || utc > utcMax {
-		return TelemetrySample{}, invalid("%s.utc is invalid", name)
+	if err != nil || utc < utcMin || utc > utcMax || utc > latestUTC {
+		return TelemetrySample{}, []string{name + ".utc"}, false
 	}
-	sample := TelemetrySample{UTC: utc, Numbers: map[string]float64{}, Flags: map[string]bool{}}
+	sample = TelemetrySample{UTC: utc, Numbers: map[string]float64{}, Flags: map[string]bool{}}
 	for field, limits := range telemetryNumbers {
 		if !o.has(field) {
 			continue
 		}
 		f, err := bounded(o[field], limits[0], limits[1], name+"."+field)
 		if err != nil {
-			return TelemetrySample{}, err
+			dropped = append(dropped, name+"."+field)
+			continue
 		}
 		sample.Numbers[field] = f
 	}
@@ -311,17 +328,20 @@ func validateSample(entry any, name string) (TelemetrySample, error) {
 			case "0":
 				sample.Flags[field] = false
 			default:
-				return TelemetrySample{}, invalid("%s.%s is invalid", name, field)
+				dropped = append(dropped, name+"."+field)
 			}
 		default:
-			return TelemetrySample{}, invalid("%s.%s is invalid", name, field)
+			dropped = append(dropped, name+"."+field)
 		}
 	}
 	// A position is only a position as a pair.
 	_, hasLat := sample.Numbers["lat"]
 	_, hasLon := sample.Numbers["lon"]
 	if hasLat != hasLon {
-		return TelemetrySample{}, invalid("%s.lat and lon must be sent together", name)
+		delete(sample.Numbers, "lat")
+		delete(sample.Numbers, "lon")
+		dropped = append(dropped, name+".lat/lon")
 	}
-	return sample, nil
+	sort.Strings(dropped)
+	return sample, dropped, true
 }
diff --git a/server/validate_test.go b/server/validate_test.go
index baead87..8d05212 100644
--- a/server/validate_test.go
+++ b/server/validate_test.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"strings"
 	"testing"
+	"time"
 )
 
 const (
@@ -12,6 +13,9 @@ const (
 	testNowS         = 1_790_000_000
 )
 
+// testNow is the sample time the telemetry tests send, as "now" for the clock-ahead check.
+var testNow = time.Unix(testNowS, 0)
+
 func isValidationError(err error) bool {
 	var v *ValidationError
 	return errors.As(err, &v)
@@ -125,7 +129,7 @@ func telemetryBody(samples string) []byte {
 
 func TestTelemetryKeepsOnlyWhatWasSent(t *testing.T) {
 	b, err := validateTelemetryBatch(telemetryBody(
-		`{"utc":1790000000,"soc":81,"power":-12.5,"speed":0,"lat":52.1,"lon":7.6,"is_charging":1,"is_dcfc":false}`))
+		`{"utc":1790000000,"soc":81,"power":-12.5,"speed":0,"lat":52.1,"lon":7.6,"is_charging":1,"is_dcfc":false}`), testNow)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -146,7 +150,7 @@ func TestTelemetryKeepsOnlyWhatWasSent(t *testing.T) {
 }
 
 func TestTelemetryDropsUnknownFields(t *testing.T) {
-	b, err := validateTelemetryBatch(telemetryBody(`{"utc":1790000000,"future_field":3}`))
+	b, err := validateTelemetryBatch(telemetryBody(`{"utc":1790000000,"future_field":3}`), testNow)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -155,31 +159,49 @@ func TestTelemetryDropsUnknownFields(t *testing.T) {
 	}
 }
 
-func TestTelemetryRejectsBadSamples(t *testing.T) {
-	for name, sample := range map[string]string{
-		"milliseconds":   `{"utc":1790000000000}`,
-		"fractional utc": `{"utc":1790000000.5}`,
-		"soc above 100":  `{"utc":1790000000,"soc":101}`,
-		"string speed":   `{"utc":1790000000,"speed":"fast"}`,
-		"flag 2":         `{"utc":1790000000,"is_parked":2}`,
-		"half position":  `{"utc":1790000000,"lat":52.1}`,
-		"not an object":  `5`,
+func TestTelemetryDropsBadValuesAndKeepsTheRest(t *testing.T) {
+	for name, c := range map[string]struct {
+		sample  string
+		dropped string
+		kept    bool // the sample itself survives
+	}{
+		"milliseconds":      {`{"utc":1790000000000,"soc":5}`, "samples[0].utc", false},
+		"fractional utc":    {`{"utc":1790000000.5,"soc":5}`, "samples[0].utc", false},
+		"clock unset":       {`{"utc":0,"soc":5}`, "samples[0].utc", false},
+		"clock a day ahead": {`{"utc":1790086400,"soc":5}`, "samples[0].utc", false},
+		"not an object":     {`5`, "samples[0]", false},
+		"soc above 100":     {`{"utc":1790000000,"soc":101,"speed":20}`, "samples[0].soc", true},
+		"reversing":         {`{"utc":1790000000,"soc":5,"speed":-4}`, "samples[0].speed", true},
+		"string speed":      {`{"utc":1790000000,"soc":5,"speed":"fast"}`, "samples[0].speed", true},
+		"flag 2":            {`{"utc":1790000000,"soc":5,"is_parked":2}`, "samples[0].is_parked", true},
+		"half position":     {`{"utc":1790000000,"soc":5,"lat":52.1}`, "samples[0].lat/lon", true},
 	} {
-		if _, err := validateTelemetryBatch(telemetryBody(sample)); !isValidationError(err) {
-			t.Errorf("%s: want ValidationError, got %v", name, err)
+		b, err := validateTelemetryBatch(telemetryBody(c.sample), testNow)
+		if err != nil {
+			t.Errorf("%s: the batch was rejected: %v", name, err)
+			continue
+		}
+		if len(b.Dropped) != 1 || b.Dropped[0] != c.dropped {
+			t.Errorf("%s: dropped %v, want %s", name, b.Dropped, c.dropped)
+		}
+		if (len(b.Samples) == 1) != c.kept {
+			t.Errorf("%s: %d samples kept", name, len(b.Samples))
+		}
+		if c.kept && b.Samples[0].Numbers["soc"] != 5 && name != "soc above 100" {
+			t.Errorf("%s: the valid soc was lost", name)
 		}
 	}
 }
 
 func TestTelemetryRejectsEmptyAndOversizedBatches(t *testing.T) {
-	if _, err := validateTelemetryBatch(telemetryBody("")); !isValidationError(err) {
+	if _, err := validateTelemetryBatch(telemetryBody(""), testNow); !isValidationError(err) {
 		t.Error("empty batch accepted")
 	}
 	many := strings.TrimSuffix(strings.Repeat(`{"utc":1790000000},`, 501), ",")
-	if _, err := validateTelemetryBatch(telemetryBody(many)); !isValidationError(err) {
+	if _, err := validateTelemetryBatch(telemetryBody(many), testNow); !isValidationError(err) {
 		t.Error("501 samples accepted")
 	}
-	if _, err := validateTelemetryBatch([]byte(`{"installationId":"nope","samples":[{"utc":1790000000}]}`)); !isValidationError(err) {
+	if _, err := validateTelemetryBatch([]byte(`{"installationId":"nope","samples":[{"utc":1790000000}]}`), testNow); !isValidationError(err) {
 		t.Error("bad installation id accepted")
 	}
 }

From 2a0c4c9675ce6137c42f62ac801db0f94241066b Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 10:01:11 +0200
Subject: [PATCH 47/79] App 2.10.0: range since start, usage in its own cards

"Range since start" replaces the range at current power: remaining
energy over the consumption since the car was switched on, standing
with the climate on included. A trip starts again after 10 minutes
without samples (the car was off) or when charging.

The kWh/100 km for both estimates moved out of the range tiles into
two cards of their own, directly below them; the overview still fits
the full-screen 1920x720 display without scrolling.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                      |  5 ++
 app/build.gradle                              |  4 +-
 .../java/com/evsuite/abrp/MainActivity.java   | 43 ++++++++----
 .../java/com/evsuite/abrp/RangeEstimator.java | 69 +++++++++++++++----
 .../main/res/layout-w1000dp/pane_vehicle.xml  | 22 +++++-
 app/src/main/res/layout/pane_vehicle.xml      | 16 ++++-
 app/src/main/res/values/strings.xml           |  8 ++-
 .../com/evsuite/abrp/RangeEstimatorTest.java  | 52 +++++++++++---
 8 files changed, 169 insertions(+), 50 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index 433bd62..d5e5754 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -112,6 +112,11 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.10.0: "Range since start" replaces the range at current power. It uses
+  the consumption since the car was switched on, including standing with the climate on, and a
+  new trip starts after 10 minutes without samples or when charging. Usage (kWh/100 km) for both
+  estimates moved into cards of their own under the range tiles, which fit on the full-screen
+  1920x720 overview without scrolling.
 - 2026-10-18 — Code review fixes. App 2.9.0, server 2.2.0, Grafana token:
   - The server drops a bad value (or a sample without a plausible time) instead of rejecting
     the batch, and answers 200 with what it dropped; the app sends only values within the
diff --git a/app/build.gradle b/app/build.gradle
index 3abff06..02e8036 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 69
-        versionName "2.9.0"
+        versionCode 70
+        versionName "2.10.0"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 1d27277..883dbe4 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -90,7 +90,8 @@ public class MainActivity extends AppCompatActivity {
     private TextView vehSoc, vehRange, vehPower, vehSpeed, vehOdometer,
             vehCharging, vehHvac,
             vehTireFl, vehTireFr, vehTireRl, vehTireRr,
-            vehRangePower, vehRangePowerNote, vehRangeAverage, vehRangeAverageNote;
+            vehRangeTrip, vehRangeTripNote, vehRangeAverage, vehRangeAverageNote,
+            vehUsageTrip, vehUsageTripNote, vehUsageAverage, vehUsageAverageNote;
 
     /** Usable pack capacity for the range estimates; the car does not publish it. */
     static final String USABLE_KWH_KEY = "usable_kwh";
@@ -995,10 +996,14 @@ public class MainActivity extends AppCompatActivity {
         vehTireFr    = vehiclePane.findViewById(R.id.vehicle_tire_fr);
         vehTireRl    = vehiclePane.findViewById(R.id.vehicle_tire_rl);
         vehTireRr    = vehiclePane.findViewById(R.id.vehicle_tire_rr);
-        vehRangePower       = vehiclePane.findViewById(R.id.vehicle_range_power);
-        vehRangePowerNote   = vehiclePane.findViewById(R.id.vehicle_range_power_note);
+        vehRangeTrip        = vehiclePane.findViewById(R.id.vehicle_range_trip);
+        vehRangeTripNote    = vehiclePane.findViewById(R.id.vehicle_range_trip_note);
         vehRangeAverage     = vehiclePane.findViewById(R.id.vehicle_range_average);
         vehRangeAverageNote = vehiclePane.findViewById(R.id.vehicle_range_average_note);
+        vehUsageTrip        = vehiclePane.findViewById(R.id.vehicle_usage_trip);
+        vehUsageTripNote    = vehiclePane.findViewById(R.id.vehicle_usage_trip_note);
+        vehUsageAverage     = vehiclePane.findViewById(R.id.vehicle_usage_average);
+        vehUsageAverageNote = vehiclePane.findViewById(R.id.vehicle_usage_average_note);
     }
 
     private double usableKwh() {
@@ -1006,31 +1011,39 @@ public class MainActivity extends AppCompatActivity {
     }
 
     /**
-     * The two range estimates. Both need the car to be moving on battery power; the average
-     * also needs a minute or more of driving, which the service has usually collected already.
+     * The range estimates since start and at the 5-minute average, each with its usage in a
+     * card below it. Since start needs the car to have moved; the average needs a minute or more
+     * of driving, which the service has usually collected already.
      */
     private void refreshRangeEstimates(EnergySnapshot s) {
         RangeEstimator estimator = RangeEstimator.shared();
         long monotonicMs = android.os.SystemClock.elapsedRealtime();
         estimator.add(monotonicMs, s.getBatteryPowerKw(), s.getSpeedKmh());
         Double remaining = RangeEstimator.remainingKwh(s.getSocPercent(), usableKwh());
-        showEstimate(vehRangePower, vehRangePowerNote,
-                RangeEstimator.instant(remaining, s.getBatteryPowerKw(), s.getSpeedKmh()),
-                R.string.range_not_driving);
-        showEstimate(vehRangeAverage, vehRangeAverageNote,
-                estimator.average(remaining, monotonicMs), R.string.range_waiting);
+        RangeEstimator.Estimate trip = estimator.sinceStart(remaining);
+        showEstimate(vehRangeTrip, vehRangeTripNote, vehUsageTrip, vehUsageTripNote, trip,
+                trip == null ? "" : getString(R.string.usage_over_distance, trip.distanceKm),
+                R.string.range_trip_waiting);
+        showEstimate(vehRangeAverage, vehRangeAverageNote, vehUsageAverage, vehUsageAverageNote,
+                estimator.average(remaining, monotonicMs), getString(R.string.usage_last_5_min),
+                R.string.range_waiting);
     }
 
-    private void showEstimate(TextView value, TextView note, RangeEstimator.Estimate e, int whyNot) {
+    private void showEstimate(TextView range, TextView rangeNote, TextView usage, TextView usageNote,
+                              RangeEstimator.Estimate e, String basis, int whyNot) {
         if (e == null) {
-            value.setText("—");
-            note.setText(whyNot);
+            range.setText("—");
+            rangeNote.setText(whyNot);
+            usage.setText("—");
+            usageNote.setText(whyNot);
             return;
         }
         // Coasting at speed costs almost nothing, which would read as thousands of km.
-        value.setText(e.rangeKm > 999 ? getString(R.string.range_over, 999)
+        range.setText(e.rangeKm > 999 ? getString(R.string.range_over, 999)
                 : String.format(java.util.Locale.US, "%.0f km", e.rangeKm));
-        note.setText(getString(R.string.range_consumption, e.kwhPer100Km));
+        rangeNote.setText("");
+        usage.setText(getString(R.string.range_consumption, e.kwhPer100Km));
+        usageNote.setText(basis);
     }
 
     /**
diff --git a/app/src/main/java/com/evsuite/abrp/RangeEstimator.java b/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
index 351bd1f..58af824 100644
--- a/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
+++ b/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
@@ -6,8 +6,13 @@ import java.util.Iterator;
 /**
  * Estimated range from the energy left in the pack and how fast it is being used.
  *
- *   instant:   remaining kWh / (power now / speed now)
- *   average:   remaining kWh / (energy used / distance driven over the last 5 minutes)
+ *   since start: remaining kWh / (energy used / distance driven since the car was switched on)
+ *   average:     remaining kWh / (energy used / distance driven over the last 5 minutes)
+ *
+ * "Since start" is a trip like the car's own trip computer: it begins with the first sample
+ * after the head unit wakes (or after charging), so it includes standing with the climate on.
+ * A gap of {@link #TRIP_RESET_GAP_MS} without samples is the car having been off, and starts
+ * a new trip; so does charging.
  *
  * Remaining energy is SOC x usable capacity: the car publishes no pack energy, so the capacity
  * is a setting. Every estimate is null when it cannot mean anything — standing still,
@@ -24,25 +29,30 @@ final class RangeEstimator {
     /** Less than this much driving in the window is too little to average. */
     static final long MIN_WINDOW_MS = 60_000L;
     static final double MIN_DISTANCE_KM = 0.2;
-    /** Below this the car is not really moving, and power / speed blows up. */
-    static final double MIN_SPEED_KMH = 5;
     /** A gap between samples longer than this (app paused, car off) is not integrated. */
     static final long MAX_GAP_MS = 60_000L;
 
+    /** No sample for this long: the car was off, and the next sample starts a new trip. */
+    static final long TRIP_RESET_GAP_MS = 10 * 60_000L;
+    /** Standing still and taking in more than this: charging, which ends the trip. */
+    static final double CHARGING_KW = -1.0;
+
     static final double DEFAULT_USABLE_KWH = 50.8; // MG4 51 kWh battery
 
     private static final RangeEstimator SHARED = new RangeEstimator();
 
     static RangeEstimator shared() { return SHARED; }
 
-    /** An estimate: the range and the consumption it is based on. */
+    /** An estimate: the range, the consumption it is based on, and the distance behind it. */
     static final class Estimate {
         final double rangeKm;
         final double kwhPer100Km;
+        final double distanceKm;
 
-        Estimate(double rangeKm, double kwhPer100Km) {
+        Estimate(double rangeKm, double kwhPer100Km, double distanceKm) {
             this.rangeKm = rangeKm;
             this.kwhPer100Km = kwhPer100Km;
+            this.distanceKm = distanceKm;
         }
     }
 
@@ -60,12 +70,19 @@ final class RangeEstimator {
 
     private final ArrayDeque<Sample> samples = new ArrayDeque<>();
 
+    // The trip since start: running totals, so it is not limited to the 5-minute window.
+    private double tripEnergyKwh;
+    private double tripDistanceKm;
+    private Sample tripLast;
+
     /** Power in kW, positive leaving the battery; speed in km/h. Unread values are skipped. */
     synchronized void add(long timeMs, Float powerKw, Float speedKmh) {
         if (powerKw == null || speedKmh == null || !Float.isFinite(powerKw) || !Float.isFinite(speedKmh)) return;
         Sample last = samples.peekLast();
         if (last != null && timeMs <= last.timeMs) return; // out of order or duplicate tick
-        samples.addLast(new Sample(timeMs, powerKw, Math.max(0f, speedKmh)));
+        Sample sample = new Sample(timeMs, powerKw, Math.max(0f, speedKmh));
+        addToTrip(sample);
+        samples.addLast(sample);
         while (!samples.isEmpty() && samples.peekFirst().timeMs < timeMs - WINDOW_MS) samples.removeFirst();
     }
 
@@ -74,11 +91,30 @@ final class RangeEstimator {
         return Math.max(0, Math.min(100, socPercent)) / 100.0 * usableKwh;
     }
 
-    static Estimate instant(Double remainingKwh, Float powerKw, Float speedKmh) {
-        if (remainingKwh == null || powerKw == null || speedKmh == null) return null;
-        if (speedKmh < MIN_SPEED_KMH || powerKw <= 0) return null;
-        double kwhPerKm = powerKw.doubleValue() / speedKmh.doubleValue();
-        return new Estimate(remainingKwh / kwhPerKm, kwhPerKm * 100);
+    private void addToTrip(Sample s) {
+        boolean charging = s.speedKmh < 1 && s.powerKw < CHARGING_KW;
+        if (charging || (tripLast != null && s.timeMs - tripLast.timeMs > TRIP_RESET_GAP_MS)) {
+            tripEnergyKwh = 0;
+            tripDistanceKm = 0;
+            tripLast = null;
+        }
+        if (charging) return; // the trip starts again after the charge
+        if (tripLast != null) {
+            long dt = s.timeMs - tripLast.timeMs;
+            if (dt > 0 && dt <= MAX_GAP_MS) {
+                double hours = dt / 3_600_000.0;
+                tripEnergyKwh += (tripLast.powerKw + s.powerKw) / 2 * hours;
+                tripDistanceKm += (tripLast.speedKmh + s.speedKmh) / 2 * hours;
+            }
+        }
+        tripLast = s;
+    }
+
+    /** Range at the consumption since start; null until the trip has some distance behind it. */
+    synchronized Estimate sinceStart(Double remainingKwh) {
+        if (remainingKwh == null || tripDistanceKm < MIN_DISTANCE_KM || tripEnergyKwh <= 0) return null;
+        double kwhPerKm = tripEnergyKwh / tripDistanceKm;
+        return new Estimate(remainingKwh / kwhPerKm, kwhPerKm * 100, tripDistanceKm);
     }
 
     synchronized Estimate average(Double remainingKwh, long nowMs) {
@@ -102,8 +138,13 @@ final class RangeEstimator {
         }
         if (covered < MIN_WINDOW_MS || distanceKm < MIN_DISTANCE_KM || energyKwh <= 0) return null;
         double kwhPerKm = energyKwh / distanceKm;
-        return new Estimate(remainingKwh / kwhPerKm, kwhPerKm * 100);
+        return new Estimate(remainingKwh / kwhPerKm, kwhPerKm * 100, distanceKm);
     }
 
-    synchronized void clear() { samples.clear(); }
+    synchronized void clear() {
+        samples.clear();
+        tripEnergyKwh = 0;
+        tripDistanceKm = 0;
+        tripLast = null;
+    }
 }
diff --git a/app/src/main/res/layout-w1000dp/pane_vehicle.xml b/app/src/main/res/layout-w1000dp/pane_vehicle.xml
index 16ee22d..3ec4f97 100644
--- a/app/src/main/res/layout-w1000dp/pane_vehicle.xml
+++ b/app/src/main/res/layout-w1000dp/pane_vehicle.xml
@@ -12,9 +12,9 @@
                 <TextView android:id="@+id/vehicle_range" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_power" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_range_power_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_trip" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_range_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_average" android:textAppearance="@style/Text.EV.Secondary" />
@@ -30,6 +30,22 @@
                 <TextView android:id="@+id/vehicle_speed" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
             </LinearLayout>
         </LinearLayout>
+        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:orientation="horizontal" android:baselineAligned="false">
+            <Space android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" android:layout_marginEnd="10dp" />
+            <Space android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" android:layout_marginEnd="10dp" />
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_usage_trip" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_usage_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_usage_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_usage_average" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_usage_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_usage_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
+            <Space android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" android:layout_marginEnd="10dp" />
+            <Space android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" android:layout_marginEnd="10dp" />
+        </LinearLayout>
         <Space android:layout_width="1dp" android:layout_height="16dp" />
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:baselineAligned="false">
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:layout_marginEnd="16dp" android:padding="20dp" android:background="@drawable/bg_glass">
diff --git a/app/src/main/res/layout/pane_vehicle.xml b/app/src/main/res/layout/pane_vehicle.xml
index f2cbfd7..707b73b 100644
--- a/app/src/main/res/layout/pane_vehicle.xml
+++ b/app/src/main/res/layout/pane_vehicle.xml
@@ -12,15 +12,25 @@
                 <TextView android:id="@+id/vehicle_range" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_power" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_range_power_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_trip" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_range_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_average" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_range_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
                 <TextView android:id="@+id/vehicle_range_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_usage_trip" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_usage_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_usage_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_usage_average" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_usage_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_usage_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_columnWeight="1" android:layout_margin="4dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e2cf188..d96f844 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,12 +31,16 @@
     <string name="vehicle_row_soc">Charge (SOC)</string>
     <string name="vehicle_row_range">Range</string>
     <string name="vehicle_row_power">Power</string>
-    <string name="vehicle_row_range_power">Range at current power</string>
+    <string name="vehicle_row_range_trip">Range since start</string>
     <string name="vehicle_row_range_average">Range at 5-min average</string>
+    <string name="vehicle_row_usage_trip">Usage since start</string>
+    <string name="vehicle_row_usage_average">Usage, 5-min average</string>
     <string name="range_consumption">%1$.1f kWh/100 km</string>
     <string name="range_over">&gt; %1$d km</string>
     <string name="range_waiting">needs a few minutes of driving</string>
-    <string name="range_not_driving">only while driving</string>
+    <string name="range_trip_waiting">once the car has moved</string>
+    <string name="usage_over_distance">over %1$.1f km</string>
+    <string name="usage_last_5_min">over the last 5 minutes</string>
     <string name="hint_usable_capacity">Usable battery capacity</string>
     <string name="btn_save_capacity">Save capacity</string>
     <string name="helper_usable_capacity">Used for the range estimates on the Vehicle tab. The 51 kWh MG4 battery has 50.8 kWh usable, the 64 kWh one 61.7, the 77 kWh one 74.4.</string>
diff --git a/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java b/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java
index 6b73e59..50104c0 100644
--- a/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java
+++ b/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java
@@ -3,6 +3,7 @@ package com.evsuite.abrp;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
@@ -19,20 +20,49 @@ public class RangeEstimatorTest {
     }
 
     @Test
-    public void instantRangeFromPowerAndSpeed() {
-        // 15 kW at 100 km/h = 15 kWh/100 km; 25.4 kWh left = 169.3 km.
-        RangeEstimator.Estimate e = RangeEstimator.instant(25.4, 15f, 100f);
-        assertNotNull(e);
-        assertEquals(15.0, e.kwhPer100Km, 1e-9);
-        assertEquals(169.333, e.rangeKm, 0.001);
+    public void sinceStartCoversTheWholeTripNotJustFiveMinutes() {
+        RangeEstimator r = new RangeEstimator();
+        // 10 minutes at 30 kW then 10 minutes at 10 kW, both at 100 km/h: 20 kWh/100 km overall.
+        for (long t = 0; t <= 600_000; t += 15_000) r.add(t, 30f, 100f);
+        for (long t = 615_000; t <= 1_200_000; t += 15_000) r.add(t, 10f, 100f);
+        RangeEstimator.Estimate trip = r.sinceStart(25.4);
+        assertNotNull(trip);
+        assertEquals(20.0, trip.kwhPer100Km, 0.2);   // plus the 15 s step between the two
+        assertEquals(127.0, trip.rangeKm, 1.0);
+        assertEquals(33.3, trip.distanceKm, 0.1);
+        // The 5-minute average only sees the economical end.
+        assertEquals(10.0, r.average(25.4, 1_200_000).kwhPer100Km, 0.1);
     }
 
     @Test
-    public void noInstantEstimateWhenStandingRegeneratingOrUnread() {
-        assertNull(RangeEstimator.instant(25.4, 2f, 3f));     // not really moving
-        assertNull(RangeEstimator.instant(25.4, -10f, 60f));  // regenerating
-        assertNull(RangeEstimator.instant(25.4, null, 60f));  // power unread
-        assertNull(RangeEstimator.instant(null, 15f, 60f));   // SOC unread
+    public void standingWithTheClimateOnCountsTowardsTheTrip() {
+        RangeEstimator r = new RangeEstimator();
+        for (long t = 0; t <= 120_000; t += 15_000) r.add(t, 3f, 0f);       // warming up
+        for (long t = 135_000; t <= 735_000; t += 15_000) r.add(t, 15f, 60f);
+        assertTrue(r.sinceStart(25.4).kwhPer100Km > 15.0);
+    }
+
+    @Test
+    public void aLongGapOrChargingStartsANewTrip() {
+        RangeEstimator r = new RangeEstimator();
+        for (long t = 0; t <= 600_000; t += 15_000) r.add(t, 30f, 100f);
+        long later = 600_000 + RangeEstimator.TRIP_RESET_GAP_MS + 1;      // the car was off
+        for (long t = later; t <= later + 600_000; t += 15_000) r.add(t, 10f, 100f);
+        assertEquals(10.0, r.sinceStart(25.4).kwhPer100Km, 0.1);
+
+        long charge = later + 615_000;
+        r.add(charge, -7f, 0f);                                             // plugged in
+        assertNull(r.sinceStart(25.4));
+    }
+
+    @Test
+    public void noSinceStartBeforeAnyDistanceOrWithoutSoc() {
+        RangeEstimator r = new RangeEstimator();
+        assertNull(r.sinceStart(25.4));
+        for (long t = 0; t <= 60_000; t += 15_000) r.add(t, 2f, 0f);
+        assertNull(r.sinceStart(25.4));                                     // not moved yet
+        for (long t = 75_000; t <= 300_000; t += 15_000) r.add(t, 15f, 60f);
+        assertNull(r.sinceStart(null));
     }
 
     @Test

From 3ae1e18a43351b6c43d55a9ef9f42a923b52695c Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 10:07:08 +0200
Subject: [PATCH 48/79] App 2.10.1: show negative usage while recuperating

Net regeneration over the window (or the trip) used to hide both
estimates behind "needs a few minutes of driving". It is a real
reading: the usage now shows as negative kWh/100 km, and the range as
"> 999 km" with "while recuperating" beneath it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                      |  2 ++
 app/build.gradle                              |  4 ++--
 .../java/com/evsuite/abrp/MainActivity.java   |  2 +-
 .../java/com/evsuite/abrp/RangeEstimator.java | 22 +++++++++++++------
 app/src/main/res/values/strings.xml           |  1 +
 .../com/evsuite/abrp/RangeEstimatorTest.java  |  5 ++++-
 6 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index d5e5754..42912a4 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -112,6 +112,8 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.10.1: net regeneration (recuperating downhill) shows as negative usage, and
+  the range as "> 999 km" with "while recuperating", instead of "needs a few minutes of driving".
 - 2026-10-18 — App 2.10.0: "Range since start" replaces the range at current power. It uses
   the consumption since the car was switched on, including standing with the climate on, and a
   new trip starts after 10 minutes without samples or when charging. Usage (kWh/100 km) for both
diff --git a/app/build.gradle b/app/build.gradle
index 02e8036..791eb08 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 70
-        versionName "2.10.0"
+        versionCode 71
+        versionName "2.10.1"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 883dbe4..6b36f54 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -1041,7 +1041,7 @@ public class MainActivity extends AppCompatActivity {
         // Coasting at speed costs almost nothing, which would read as thousands of km.
         range.setText(e.rangeKm > 999 ? getString(R.string.range_over, 999)
                 : String.format(java.util.Locale.US, "%.0f km", e.rangeKm));
-        rangeNote.setText("");
+        rangeNote.setText(e.kwhPer100Km <= 0 ? getString(R.string.range_recuperating) : "");
         usage.setText(getString(R.string.range_consumption, e.kwhPer100Km));
         usageNote.setText(basis);
     }
diff --git a/app/src/main/java/com/evsuite/abrp/RangeEstimator.java b/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
index 58af824..c3aa60d 100644
--- a/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
+++ b/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
@@ -15,8 +15,8 @@ import java.util.Iterator;
  * a new trip; so does charging.
  *
  * Remaining energy is SOC x usable capacity: the car publishes no pack energy, so the capacity
- * is a setting. Every estimate is null when it cannot mean anything — standing still,
- * regenerating, too little data — rather than a misleading number.
+ * is a setting. An estimate is null when it cannot mean anything — not moved yet, too little
+ * data — rather than a misleading number. Net regeneration is shown as it is: negative usage.
  *
  * Fed by both the service tick (15 s) and the open Vehicle page (2 s); the integration is
  * time-weighted, so the two rates mix correctly. Times are on the monotonic clock
@@ -112,9 +112,8 @@ final class RangeEstimator {
 
     /** Range at the consumption since start; null until the trip has some distance behind it. */
     synchronized Estimate sinceStart(Double remainingKwh) {
-        if (remainingKwh == null || tripDistanceKm < MIN_DISTANCE_KM || tripEnergyKwh <= 0) return null;
-        double kwhPerKm = tripEnergyKwh / tripDistanceKm;
-        return new Estimate(remainingKwh / kwhPerKm, kwhPerKm * 100, tripDistanceKm);
+        if (remainingKwh == null || tripDistanceKm < MIN_DISTANCE_KM) return null;
+        return estimate(remainingKwh, tripEnergyKwh, tripDistanceKm);
     }
 
     synchronized Estimate average(Double remainingKwh, long nowMs) {
@@ -136,9 +135,18 @@ final class RangeEstimator {
             }
             previous = s;
         }
-        if (covered < MIN_WINDOW_MS || distanceKm < MIN_DISTANCE_KM || energyKwh <= 0) return null;
+        if (covered < MIN_WINDOW_MS || distanceKm < MIN_DISTANCE_KM) return null;
+        return estimate(remainingKwh, energyKwh, distanceKm);
+    }
+
+    /**
+     * Net regeneration (downhill, recuperating) is a real reading: the usage is negative, and
+     * the range is unbounded rather than negative.
+     */
+    private static Estimate estimate(double remainingKwh, double energyKwh, double distanceKm) {
         double kwhPerKm = energyKwh / distanceKm;
-        return new Estimate(remainingKwh / kwhPerKm, kwhPerKm * 100, distanceKm);
+        double rangeKm = kwhPerKm > 0 ? remainingKwh / kwhPerKm : Double.POSITIVE_INFINITY;
+        return new Estimate(rangeKm, kwhPerKm * 100, distanceKm);
     }
 
     synchronized void clear() {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d96f844..26b8b1c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,6 +38,7 @@
     <string name="range_consumption">%1$.1f kWh/100 km</string>
     <string name="range_over">&gt; %1$d km</string>
     <string name="range_waiting">needs a few minutes of driving</string>
+    <string name="range_recuperating">while recuperating</string>
     <string name="range_trip_waiting">once the car has moved</string>
     <string name="usage_over_distance">over %1$.1f km</string>
     <string name="usage_last_5_min">over the last 5 minutes</string>
diff --git a/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java b/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java
index 50104c0..cb442da 100644
--- a/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java
+++ b/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java
@@ -110,6 +110,9 @@ public class RangeEstimatorTest {
 
         RangeEstimator downhill = new RangeEstimator();
         for (long t = 0; t <= 240_000; t += 2_000) downhill.add(t, -5f, 80f);
-        assertNull("net regeneration", downhill.average(25.4, 240_000));
+        RangeEstimator.Estimate regen = downhill.average(25.4, 240_000);
+        assertNotNull("net regeneration is a reading", regen);
+        assertEquals(-6.25, regen.kwhPer100Km, 0.01);
+        assertTrue(Double.isInfinite(regen.rangeKm));
     }
 }

From 087f193f8c0177290eac092cdbee12311bf3602d Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 11:01:02 +0200
Subject: [PATCH 49/79] App 2.10.2: infinity as the range while recuperating

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                             | 1 +
 app/build.gradle                                     | 4 ++--
 app/src/main/java/com/evsuite/abrp/MainActivity.java | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index 42912a4..169ab12 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -112,6 +112,7 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.10.2: the range shows "∞" instead of "> 999 km" while recuperating.
 - 2026-10-18 — App 2.10.1: net regeneration (recuperating downhill) shows as negative usage, and
   the range as "> 999 km" with "while recuperating", instead of "needs a few minutes of driving".
 - 2026-10-18 — App 2.10.0: "Range since start" replaces the range at current power. It uses
diff --git a/app/build.gradle b/app/build.gradle
index 791eb08..36daf11 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 71
-        versionName "2.10.1"
+        versionCode 72
+        versionName "2.10.2"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 6b36f54..a5e1b5f 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -1038,8 +1038,10 @@ public class MainActivity extends AppCompatActivity {
             usageNote.setText(whyNot);
             return;
         }
-        // Coasting at speed costs almost nothing, which would read as thousands of km.
-        range.setText(e.rangeKm > 999 ? getString(R.string.range_over, 999)
+        // Recuperating, the pack gains energy: the range is unbounded. Coasting at speed costs
+        // almost nothing, which would read as thousands of km.
+        range.setText(e.kwhPer100Km <= 0 ? "∞"
+                : e.rangeKm > 999 ? getString(R.string.range_over, 999)
                 : String.format(java.util.Locale.US, "%.0f km", e.rangeKm));
         rangeNote.setText(e.kwhPer100Km <= 0 ? getString(R.string.range_recuperating) : "");
         usage.setText(getString(R.string.range_consumption, e.kwhPer100Km));

From ca2f899403f7a44fa8b8983b69d98c07bb24a28e Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 12:15:21 +0200
Subject: [PATCH 50/79] App 2.11.0, server 2.3.0: live data straight to ABRP;
 settings regrouped

ABRP keeps getting live data while the car server is down: with an ABRP
API key and user token set in the app (Live data tab, or abrp_api_key /
abrp_token in the config file), the car sends the newest sample to ABRP
itself at every upload. It tells the server the newest sample ABRP took
(abrpSentUtc), and the server forwards only newer ones, so ABRP gets
each sample once. Without credentials in the app the server forwards
everything, as before. The credentials sit in encrypted storage, go in
the request body, and neither they nor ABRP's answer are logged.

Settings are grouped by what they are for:
- Live data (was Upload): on/off, ABRP credentials, upload frequency.
- Settings (replaces the Wi-Fi tab): full screen and voice key,
  usable capacity and manual SoH (were on Consumption), charging price
  (was on Charging), Wi-Fi.
Charging and Live data get icons of their own.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 README.md                                     |  34 +++--
 SPECS.md                                      |  10 ++
 app/build.gradle                              |   4 +-
 .../main/java/com/evsuite/abrp/AbrpApi.java   |  59 +++++++++
 .../java/com/evsuite/abrp/AbrpConfig.java     |  63 ++++++++++
 .../com/evsuite/abrp/AbrpUploadService.java   |   4 +-
 .../java/com/evsuite/abrp/ConfigImport.java   |  22 +++-
 .../java/com/evsuite/abrp/MainActivity.java   | 119 ++++++++++++++----
 .../java/com/evsuite/abrp/ServerHttp.java     |  20 ++-
 .../java/com/evsuite/abrp/TelemetryQueue.java |   3 +
 .../com/evsuite/abrp/TelemetryUploader.java   |  49 +++++++-
 app/src/main/res/drawable/ic_tab_charging.xml |  11 ++
 app/src/main/res/drawable/ic_tab_live.xml     |  17 +++
 app/src/main/res/drawable/ic_tab_service.xml  |   2 +-
 app/src/main/res/drawable/ic_tab_wifi.xml     |  12 --
 .../main/res/layout-w1000dp/activity_main.xml |   6 +-
 .../main/res/layout-w1000dp/pane_service.xml  |  49 +++++---
 .../main/res/layout-w1000dp/pane_settings.xml |  48 +++++++
 app/src/main/res/layout-w1000dp/pane_wifi.xml |  17 ---
 app/src/main/res/layout/activity_main.xml     |   6 +-
 app/src/main/res/layout/pane_charging.xml     |   7 --
 app/src/main/res/layout/pane_consumption.xml  |  13 --
 app/src/main/res/layout/pane_service.xml      |  20 ++-
 app/src/main/res/layout/pane_settings.xml     |  44 +++++++
 app/src/main/res/layout/pane_wifi.xml         |  18 ---
 app/src/main/res/values/strings.xml           |  24 +++-
 app/src/main/res/values/strings_design.xml    |  14 ++-
 .../java/com/evsuite/abrp/AbrpApiTest.java    |  40 ++++++
 .../com/evsuite/abrp/ConfigImportTest.java    |   9 ++
 k8s/secrets/secrets.example.yaml              |   3 +-
 k8s/server.yaml                               |   4 +-
 server/README.md                              |   4 +-
 server/api.go                                 |  16 ++-
 server/api_test.go                            |  20 +++
 server/model.go                               |   3 +
 server/validate.go                            |   5 +
 36 files changed, 636 insertions(+), 163 deletions(-)
 create mode 100644 app/src/main/java/com/evsuite/abrp/AbrpApi.java
 create mode 100644 app/src/main/java/com/evsuite/abrp/AbrpConfig.java
 create mode 100644 app/src/main/res/drawable/ic_tab_charging.xml
 create mode 100644 app/src/main/res/drawable/ic_tab_live.xml
 delete mode 100644 app/src/main/res/drawable/ic_tab_wifi.xml
 create mode 100644 app/src/main/res/layout-w1000dp/pane_settings.xml
 delete mode 100644 app/src/main/res/layout-w1000dp/pane_wifi.xml
 create mode 100644 app/src/main/res/layout/pane_settings.xml
 delete mode 100644 app/src/main/res/layout/pane_wifi.xml
 create mode 100644 app/src/test/java/com/evsuite/abrp/AbrpApiTest.java

diff --git a/README.md b/README.md
index 18a0a39..ab1bdb4 100644
--- a/README.md
+++ b/README.md
@@ -47,32 +47,36 @@ vehicle there, so every value shows as a dash).
 ## How it fits together
 
 ```
-car ──live telemetry───▶ car.k8s.stinnesbeck.com (Go) ──▶ ABRP
-    ──daily chunks─────▶          │
-    ──charging sessions▶          ▼
-                              InfluxDB 2 ◀── Grafana
+car ──live telemetry───▶ car.k8s.stinnesbeck.com (Go) ──▶ ABRP (what the car did not send)
+ │  ──daily chunks─────▶          │
+ │  ──charging sessions▶          ▼
+ │                            InfluxDB 2 ◀── Grafana
+ └──live telemetry (optional, direct)──────────────────▶ ABRP
 ```
 
-The ABRP credentials live only on the server, never in the APK. The car authenticates with a
-token of its own, obtained by pairing with a phone (below).
+With ABRP credentials set in the app (Live data tab), the car sends live data to ABRP itself,
+so ABRP keeps getting it while the server is down; the server then forwards only samples the
+car could not deliver. Without them in the app, the server forwards everything with its own
+ABRP credentials. The car authenticates with the server using a token of its own, obtained by
+pairing with a phone (below).
 
 ## The app
 
 | Tab | What it shows |
 |---|---|
-| **Overview** | Battery, range, range estimates at current power and at the 5-minute average, power, speed; odometer, climate setpoint and tyre pressures |
+| **Overview** | Battery, range, range since start and at the 5-minute average with their usage, power, speed; odometer, climate setpoint and tyre pressures |
 | **Consumption** | Daily and period consumption, efficiency |
 | **Charging** | Charging sessions and curves, cost in euro |
-| **Upload** | Live telemetry on/off, full screen, voice key, upload cadence |
+| **Live data** | Live data on/off, ABRP credentials for sending directly from the car, upload frequency |
 | **Server** | Server URL, pairing by QR code, ingest token, installation ID, config import |
-| **Wi-Fi** | Joins a network the head unit already knows (e.g. the phone hotspot) |
+| **Settings** | Full screen, voice key, battery (usable capacity, manual SoH), charging price, Wi-Fi |
 | **Logs** | Upload log and the last steering-wheel key reports |
 
 - **Opening the app:** the MG4 launcher does not list third-party apps. **Double-press the
-  voice key** on the steering wheel and the app comes to the front (switch on the Upload tab,
-  on by default).
+  voice key** on the steering wheel and the app comes to the front (switch on the Settings
+  tab, on by default).
 - **Full screen:** hides SAIC's top and bottom bars while the app is open; a swipe from the
-  edge shows them briefly (Upload tab, on by default).
+  edge shows them briefly (Settings tab, on by default).
 - **Live telemetry:** every 15 s while driving or charging, much less often while parked. A
   value the car cannot read is left out, never sent as zero, so ABRP is never told the battery
   is empty because a read failed.
@@ -113,7 +117,9 @@ pointed at this repository's releases (see `SPECS.md`).
 2. On the **Server** tab the URL is already `https://car.k8s.stinnesbeck.com`.
 3. Tap **Pair with phone**. Scan the QR code with a phone (or open the address shown and enter
    the code), and approve with the server's approval password. The car receives its token.
-4. On the **Upload** tab, turn live telemetry on. The service starts with the car from then on.
+4. On the **Live data** tab, turn live data on. The service starts with the car from then on.
+5. Optional: enter your ABRP API key and user token on the same tab, so the car also sends
+   live data straight to ABRP.
 
 ### Config file
 
@@ -135,6 +141,8 @@ installation_id = only to carry over history from an install older than 2.9.0
 interval_sec    = 60      # 15 / 30 / 60 / 120 / 300
 boost_low_soc   = true
 low_soc_percent = 20
+abrp_api_key    = optional: your ABRP API key, to send to ABRP directly
+abrp_token      = optional: your ABRP user token
 ```
 
 After a successful import the app deletes the file, since it holds the token; credentials live
diff --git a/SPECS.md b/SPECS.md
index 169ab12..82eff48 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -112,6 +112,16 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.11.0, server 2.3.0:
+  - Live data goes to ABRP straight from the car when ABRP credentials are set in the app
+    (Live data tab or config file: `abrp_api_key`, `abrp_token`), so ABRP keeps getting it
+    while the server is down. The car tells the server the newest sample ABRP took
+    (`abrpSentUtc`); the server forwards only newer ones. Without credentials in the app the
+    server forwards as before. This deliberately puts ABRP credentials in the car again
+    (encrypted, never logged).
+  - Settings regrouped: Live data (on/off, ABRP, frequency), Server, Settings (full screen, voice
+    key, usable capacity and SoH from Consumption, charging price from Charging, Wi-Fi, which
+    lost its own tab). Charging and Live data have their own icons.
 - 2026-10-18 — App 2.10.2: the range shows "∞" instead of "> 999 km" while recuperating.
 - 2026-10-18 — App 2.10.1: net regeneration (recuperating downhill) shows as negative usage, and
   the range as "> 999 km" with "while recuperating", instead of "needs a few minutes of driving".
diff --git a/app/build.gradle b/app/build.gradle
index 36daf11..61914b1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 72
-        versionName "2.10.2"
+        versionCode 73
+        versionName "2.11.0"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/AbrpApi.java b/app/src/main/java/com/evsuite/abrp/AbrpApi.java
new file mode 100644
index 0000000..b658a09
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/AbrpApi.java
@@ -0,0 +1,59 @@
+package com.evsuite.abrp;
+
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * ABRP's telemetry API, for sending live data straight from the car.
+ *
+ * Credentials go in the POST body, never in the query string: a URL travels through proxies,
+ * access logs and crash reports, a body does not. Neither is ever logged.
+ */
+final class AbrpApi {
+
+    /** No query string: credentials travel in the body, so the URL is a constant. */
+    static final String SEND_URL = "https://api.iternio.com/1/tlm/send";
+
+    /**
+     * Read-only endpoint used to check credentials. The Test button must never touch
+     * /tlm/send: a placeholder sample would tell ABRP the car really is in that state and
+     * corrupt a live route plan.
+     */
+    static final String VERIFY_URL = "https://api.iternio.com/1/tlm/get_next_charge";
+
+    private AbrpApi() { }
+
+    /** Posts one tlm sample. Throws on a network failure. */
+    static ServerHttp.Response send(AbrpConfig config, String tlmJson) throws Exception {
+        byte[] body = formBody(config.apiKey, config.userToken, tlmJson).getBytes(StandardCharsets.UTF_8);
+        return ServerHttp.send("POST", SEND_URL, null, "application/x-www-form-urlencoded", body);
+    }
+
+    /**
+     * Checks the credentials without writing anything. This endpoint only takes the token as a
+     * query parameter; the API key goes in the Authorization header. One token in one URL when
+     * the user presses Test beats writing fake telemetry on every press.
+     */
+    static ServerHttp.Response verify(AbrpConfig config) throws Exception {
+        String url = VERIFY_URL + "?token=" + URLEncoder.encode(config.userToken, StandardCharsets.UTF_8.name());
+        return ServerHttp.send("GET", url, "APIKEY " + config.apiKey, null, null);
+    }
+
+    /** The form body: credentials and the sample, each URL-encoded. */
+    static String formBody(String apiKey, String userToken, String tlmJson) throws Exception {
+        String utf8 = StandardCharsets.UTF_8.name();
+        return "api_key=" + URLEncoder.encode(apiKey, utf8)
+             + "&token=" + URLEncoder.encode(userToken, utf8)
+             + "&tlm=" + URLEncoder.encode(tlmJson, utf8);
+    }
+
+    /** ABRP answers 200 with {"status":"ok"}; anything else is a rejection. */
+    static boolean accepted(ServerHttp.Response response) {
+        if (!response.ok()) return false;
+        try {
+            return "ok".equals(new org.json.JSONObject(response.body).optString("status"));
+        } catch (Exception e) {
+            return false;
+        }
+    }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/AbrpConfig.java b/app/src/main/java/com/evsuite/abrp/AbrpConfig.java
new file mode 100644
index 0000000..6ffee1b
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/AbrpConfig.java
@@ -0,0 +1,63 @@
+package com.evsuite.abrp;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+/**
+ * The ABRP credentials for sending live data straight from the car: the API key (which app is
+ * sending) and the user token (which car in which ABRP account). Kept in {@link SecurePrefs}
+ * next to the server settings, entered on the Live data tab or imported from a config file.
+ *
+ * With both set, the car sends to ABRP itself, so ABRP keeps getting live data when the car
+ * server is down; the server then only forwards what the car could not deliver. Without them,
+ * the server forwards as before.
+ */
+final class AbrpConfig {
+
+    static final String KEY_API_KEY = "abrp_api_key";
+    static final String KEY_USER_TOKEN = "abrp_user_token";
+
+    final String apiKey;
+    final String userToken;
+
+    private static volatile AbrpConfig current;
+
+    AbrpConfig(String apiKey, String userToken) {
+        this.apiKey = apiKey;
+        this.userToken = userToken;
+    }
+
+    boolean isConfigured() {
+        return !apiKey.isEmpty() && !userToken.isEmpty();
+    }
+
+    static AbrpConfig get(Context context) {
+        AbrpConfig config = current;
+        if (config != null) return config;
+        synchronized (AbrpConfig.class) {
+            if (current == null) {
+                SharedPreferences prefs = SecurePrefs.get(context);
+                current = new AbrpConfig(prefs.getString(KEY_API_KEY, ""), prefs.getString(KEY_USER_TOKEN, ""));
+            }
+            return current;
+        }
+    }
+
+    /** Stores trimmed values; empty strings switch direct sending off. */
+    static synchronized void save(Context context, String apiKey, String userToken) {
+        String key = apiKey == null ? "" : apiKey.trim();
+        String token = userToken == null ? "" : userToken.trim();
+        SecurePrefs.get(context).edit()
+                .putString(KEY_API_KEY, key)
+                .putString(KEY_USER_TOKEN, token)
+                .apply();
+        current = new AbrpConfig(key, token);
+    }
+
+    /** Plausible as an ABRP credential: no spaces, not absurdly short or long. */
+    static boolean isPlausible(String value) {
+        if (value == null) return false;
+        String v = value.trim();
+        return v.length() >= 8 && v.length() <= 200 && !v.contains(" ");
+    }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
index be5cb34..c30a27b 100644
--- a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
+++ b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
@@ -173,7 +173,9 @@ public class AbrpUploadService extends Service {
         }
 
         UploadSettings settings = UploadSettings.from(prefs);
-        if (!ServerConfig.get(this).isConfigured()) {
+        // Live data goes to the server, to ABRP directly, or both; with neither set up there is
+        // nowhere to send it.
+        if (!ServerConfig.get(this).isConfigured() && !AbrpConfig.get(this).isConfigured()) {
             telemetryUploader.stop(); // no live telemetry, so no GPS either
             updateNotification(getString(R.string.server_not_configured));
         } else if (!settings.abrpUploadEnabled) {
diff --git a/app/src/main/java/com/evsuite/abrp/ConfigImport.java b/app/src/main/java/com/evsuite/abrp/ConfigImport.java
index cbea2b1..674bac3 100644
--- a/app/src/main/java/com/evsuite/abrp/ConfigImport.java
+++ b/app/src/main/java/com/evsuite/abrp/ConfigImport.java
@@ -13,6 +13,8 @@ package com.evsuite.abrp;
  *   interval_sec    = 60
  *   boost_low_soc   = true
  *   low_soc_percent = 20
+ *   abrp_api_key    = your-abrp-api-key       (optional: send live data to ABRP directly)
+ *   abrp_token      = your-abrp-user-token
  * </pre>
  *
  * Usually only server_url and token are needed. installation_id is for a reinstall: it puts
@@ -29,25 +31,29 @@ final class ConfigImport {
     final Integer intervalSec;
     final Boolean boostLowSoc;
     final Integer lowSocPercent;
+    final String abrpApiKey;
+    final String abrpToken;
 
     private ConfigImport(String serverUrl, String token, String installationId, Integer intervalSec,
-                         Boolean boostLowSoc, Integer lowSocPercent) {
+                         Boolean boostLowSoc, Integer lowSocPercent, String abrpApiKey, String abrpToken) {
         this.serverUrl = serverUrl;
         this.token = token;
         this.installationId = installationId;
         this.intervalSec = intervalSec;
         this.boostLowSoc = boostLowSoc;
         this.lowSocPercent = lowSocPercent;
+        this.abrpApiKey = abrpApiKey;
+        this.abrpToken = abrpToken;
     }
 
     /** True when the file yielded nothing usable — an empty or malformed file, not a config. */
     boolean isEmpty() {
         return serverUrl == null && token == null && installationId == null && intervalSec == null
-                && boostLowSoc == null && lowSocPercent == null;
+                && boostLowSoc == null && lowSocPercent == null && abrpApiKey == null && abrpToken == null;
     }
 
     static ConfigImport parse(String text) {
-        String serverUrl = null, token = null, installationId = null;
+        String serverUrl = null, token = null, installationId = null, abrpApiKey = null, abrpToken = null;
         Integer intervalSec = null, lowSocPercent = null;
         Boolean boostLowSoc = null;
 
@@ -85,13 +91,21 @@ final class ConfigImport {
                 case "low_soc_percent":
                     lowSocPercent = clampPercent(value);
                     break;
+                case "abrp_api_key":
+                    abrpApiKey = value;
+                    break;
+                case "abrp_token":
+                case "abrp_user_token":
+                    abrpToken = value;
+                    break;
                 default:
                     // Unknown keys are ignored rather than rejected, so a file can carry
                     // comments or future keys without breaking an older build.
                     break;
             }
         }
-        return new ConfigImport(serverUrl, token, installationId, intervalSec, boostLowSoc, lowSocPercent);
+        return new ConfigImport(serverUrl, token, installationId, intervalSec, boostLowSoc, lowSocPercent,
+                abrpApiKey, abrpToken);
     }
 
     /** Snaps to the nearest offered choice: the UI spinner has no free-form interval. */
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index a5e1b5f..4e1646d 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -42,16 +42,16 @@ public class MainActivity extends AppCompatActivity {
     /** Navigation destinations in page order. Parallel to {@link #panes}. */
     private static final int[] TAB_IDS =
             { R.id.tabVehicle, R.id.tabConsumption, R.id.tabCharging, R.id.tabService, R.id.tabServer,
-              R.id.tabWifi, R.id.tabLog };
+              R.id.tabSettings, R.id.tabLog };
 
     private static final int[] PAGE_TITLES = {
             R.string.design_overview_title, R.string.consumption_title, R.string.charging_title,
-            R.string.design_service_title, R.string.design_server_title, R.string.design_wifi_title,
+            R.string.design_service_title, R.string.design_server_title, R.string.design_settings_title,
             R.string.design_log_title
     };
     private static final int[] PAGE_SUBTITLES = {
             R.string.design_overview_subtitle, R.string.consumption_subtitle, R.string.charging_subtitle,
-            R.string.design_service_subtitle, R.string.design_server_subtitle, R.string.design_wifi_subtitle,
+            R.string.design_service_subtitle, R.string.design_server_subtitle, R.string.design_settings_subtitle,
             R.string.design_log_subtitle
     };
 
@@ -70,7 +70,8 @@ public class MainActivity extends AppCompatActivity {
     private View vehiclePane;
     private View consumptionPane;
     private View chargingPane;
-    private View wifiPane;
+    /** Display, battery, charging price and Wi-Fi. */
+    private View settingsPane;
 
     /** The pages in navigation order. Parallel to {@link #TAB_IDS}. */
     private View[] panes;
@@ -241,10 +242,10 @@ public class MainActivity extends AppCompatActivity {
         vehiclePane   = inflatePane(R.layout.pane_vehicle);
         consumptionPane = inflatePane(R.layout.pane_consumption);
         chargingPane = inflatePane(R.layout.pane_charging);
-        wifiPane    = inflatePane(R.layout.pane_wifi);
+        settingsPane = inflatePane(R.layout.pane_settings);
         logPane     = inflatePane(R.layout.pane_log);
         panes = new View[] { vehiclePane, consumptionPane, chargingPane, servicePane, serverPane,
-                wifiPane, logPane };
+                settingsPane, logPane };
 
         bindVehiclePane();
         bindConsumptionPane();
@@ -836,6 +837,14 @@ public class MainActivity extends AppCompatActivity {
                 return false;
             }
         }
+        if (config.abrpApiKey != null || config.abrpToken != null) {
+            AbrpConfig abrp = AbrpConfig.get(this);
+            if (!saveAbrpConfig(config.abrpApiKey != null ? config.abrpApiKey : abrp.apiKey,
+                    config.abrpToken != null ? config.abrpToken : abrp.userToken)) {
+                setConnectionStatus(COLOR_ERROR, getString(R.string.abrp_invalid));
+                return false;
+            }
+        }
         SharedPreferences.Editor edit = prefs.edit();
         if (config.intervalSec != null) edit.putInt(UploadSettings.KEY_INTERVAL_SEC, config.intervalSec);
         if (config.boostLowSoc != null) edit.putBoolean(UploadSettings.KEY_BOOST_LOW_SOC, config.boostLowSoc);
@@ -850,11 +859,11 @@ public class MainActivity extends AppCompatActivity {
     // ---------- Upload page ----------
 
     private void bindServicePane() {
-        voiceKeySwitch = servicePane.findViewById(R.id.voice_key_switch);
+        voiceKeySwitch = settingsPane.findViewById(R.id.voice_key_switch);
         voiceKeySwitch.setChecked(UploadSettings.voiceKeyOpensApp(prefs));
         voiceKeySwitch.setOnCheckedChangeListener((btn, checked) ->
                 prefs.edit().putBoolean(UploadSettings.KEY_VOICE_KEY_OPENS, checked).apply());
-        fullScreenSwitch = servicePane.findViewById(R.id.full_screen_switch);
+        fullScreenSwitch = settingsPane.findViewById(R.id.full_screen_switch);
         fullScreenSwitch.setChecked(UploadSettings.fullScreen(prefs));
         fullScreenSwitch.setOnCheckedChangeListener((btn, checked) -> {
             prefs.edit().putBoolean(UploadSettings.KEY_FULL_SCREEN, checked).apply();
@@ -871,6 +880,66 @@ public class MainActivity extends AppCompatActivity {
             refreshStatus();
         });
         bindCadenceControls();
+        bindAbrpControls();
+    }
+
+    // ---------- ABRP, directly from the car ----------
+
+    private TextInputEditText abrpApiKeyInput, abrpTokenInput;
+    private TextView abrpStatusText;
+
+    private void bindAbrpControls() {
+        abrpApiKeyInput = servicePane.findViewById(R.id.abrp_api_key_input);
+        abrpTokenInput = servicePane.findViewById(R.id.abrp_token_input);
+        abrpStatusText = servicePane.findViewById(R.id.abrp_status_text);
+        AbrpConfig current = AbrpConfig.get(this);
+        abrpApiKeyInput.setText(current.apiKey);
+        abrpTokenInput.setText(current.userToken);
+        servicePane.findViewById(R.id.abrp_save_button).setOnClickListener(v ->
+                saveAbrpConfig(text(abrpApiKeyInput), text(abrpTokenInput)));
+        servicePane.findViewById(R.id.abrp_test_button).setOnClickListener(v -> testAbrpConfig());
+    }
+
+    private static String text(TextInputEditText input) {
+        CharSequence raw = input.getText();
+        return raw == null ? "" : raw.toString().trim();
+    }
+
+    /** Both set and plausible, or both empty (direct sending off). Returns whether it saved. */
+    private boolean saveAbrpConfig(String apiKey, String token) {
+        boolean clear = apiKey.isEmpty() && token.isEmpty();
+        if (!clear && !(AbrpConfig.isPlausible(apiKey) && AbrpConfig.isPlausible(token))) {
+            abrpStatusText.setText(R.string.abrp_invalid);
+            return false;
+        }
+        AbrpConfig.save(this, apiKey, token);
+        abrpApiKeyInput.setText(apiKey);
+        abrpTokenInput.setText(token);
+        abrpStatusText.setText(clear ? R.string.abrp_cleared : R.string.abrp_saved);
+        refreshStatus();
+        return true;
+    }
+
+    /** Read-only check against ABRP; never sends telemetry. Off the main thread. */
+    private void testAbrpConfig() {
+        AbrpConfig config = new AbrpConfig(text(abrpApiKeyInput), text(abrpTokenInput));
+        if (!config.isConfigured()) {
+            abrpStatusText.setText(R.string.abrp_not_set);
+            return;
+        }
+        abrpStatusText.setText(R.string.abrp_testing);
+        new Thread(() -> {
+            String message;
+            try {
+                ServerHttp.Response response = AbrpApi.verify(config);
+                message = response.ok() ? getString(R.string.abrp_test_ok)
+                        : getString(R.string.abrp_test_failed, response.status);
+            } catch (Exception e) {
+                message = getString(R.string.abrp_test_offline, e.getClass().getSimpleName());
+            }
+            String shown = message;
+            runOnUiThread(() -> abrpStatusText.setText(shown));
+        }, "abrp-test").start();
     }
 
     /** The service reads these settings on every tick, so a change applies without a restart. */
@@ -946,16 +1015,16 @@ public class MainActivity extends AppCompatActivity {
 
     private void bindWifiPane() {
         wifi = new WifiAutoConnect(getApplicationContext());
-        wifiSsid      = wifiPane.findViewById(R.id.wifi_ssid);
-        wifiState     = wifiPane.findViewById(R.id.wifi_state);
-        wifiSavedList = wifiPane.findViewById(R.id.wifi_saved_list);
+        wifiSsid      = settingsPane.findViewById(R.id.wifi_ssid);
+        wifiState     = settingsPane.findViewById(R.id.wifi_state);
+        wifiSavedList = settingsPane.findViewById(R.id.wifi_saved_list);
 
-        SwitchMaterial auto = wifiPane.findViewById(R.id.wifi_auto_switch);
+        SwitchMaterial auto = settingsPane.findViewById(R.id.wifi_auto_switch);
         auto.setChecked(prefs.getBoolean(WIFI_AUTO_KEY, true));
         auto.setOnCheckedChangeListener((btn, checked) ->
                 prefs.edit().putBoolean(WIFI_AUTO_KEY, checked).apply());
 
-        wifiPane.findViewById(R.id.wifi_connect_button).setOnClickListener(v -> {
+        settingsPane.findViewById(R.id.wifi_connect_button).setOnClickListener(v -> {
             // force: the driver is asking now, so the rate limit does not apply.
             WifiAutoConnect.Result r = wifi.ensureConnected(true);
             wifiState.setText(r.message);
@@ -1099,16 +1168,16 @@ public class MainActivity extends AppCompatActivity {
         consumptionDateButton.setOnClickListener(v -> showConsumptionDatePicker());
         consumptionPane.findViewById(R.id.consumption_refresh).setOnClickListener(v -> refreshFromCloud());
         consumptionReset = consumptionPane.findViewById(R.id.consumption_reset);
-        consumptionSohLayout = consumptionPane.findViewById(R.id.consumption_soh_layout);
-        consumptionSohInput = consumptionPane.findViewById(R.id.consumption_soh_input);
+        consumptionSohLayout = settingsPane.findViewById(R.id.consumption_soh_layout);
+        consumptionSohInput = settingsPane.findViewById(R.id.consumption_soh_input);
         Float savedSoh = consumptionTracker.sohPercent();
         if (savedSoh != null) consumptionSohInput.setText(String.format(
                 java.util.Locale.US, "%.1f", savedSoh));
-        consumptionPane.findViewById(R.id.consumption_soh_save).setOnClickListener(v -> saveSoh());
-        usableCapacityLayout = consumptionPane.findViewById(R.id.usable_capacity_layout);
-        usableCapacityInput = consumptionPane.findViewById(R.id.usable_capacity_input);
+        settingsPane.findViewById(R.id.consumption_soh_save).setOnClickListener(v -> saveSoh());
+        usableCapacityLayout = settingsPane.findViewById(R.id.usable_capacity_layout);
+        usableCapacityInput = settingsPane.findViewById(R.id.usable_capacity_input);
         usableCapacityInput.setText(String.format(java.util.Locale.US, "%.1f", usableKwh()));
-        consumptionPane.findViewById(R.id.usable_capacity_save).setOnClickListener(v -> saveUsableCapacity());
+        settingsPane.findViewById(R.id.usable_capacity_save).setOnClickListener(v -> saveUsableCapacity());
         bindPeriodButton(R.id.consumption_lifetime, ConsumptionTracker.Period.LIFETIME);
         bindPeriodButton(R.id.consumption_week, ConsumptionTracker.Period.WEEK);
         bindPeriodButton(R.id.consumption_month, ConsumptionTracker.Period.MONTH);
@@ -1192,11 +1261,11 @@ public class MainActivity extends AppCompatActivity {
         chargeTotalCost = chargingPane.findViewById(R.id.charge_total_cost);
         chargeGraph = chargingPane.findViewById(R.id.charge_graph);
         chargeCurveTable = chargingPane.findViewById(R.id.charge_curve_table);
-        chargePriceLayout = chargingPane.findViewById(R.id.charge_price_layout);
-        chargePriceInput = chargingPane.findViewById(R.id.charge_price_input);
+        chargePriceLayout = settingsPane.findViewById(R.id.charge_price_layout);
+        chargePriceInput = settingsPane.findViewById(R.id.charge_price_input);
         chargePriceInput.setText(String.format(java.util.Locale.US, "%.2f",
                 chargeSessionTracker.pricePerKwh()));
-        chargingPane.findViewById(R.id.charge_price_save).setOnClickListener(v -> saveChargePrice());
+        settingsPane.findViewById(R.id.charge_price_save).setOnClickListener(v -> saveChargePrice());
     }
 
     private void saveChargePrice() {
@@ -1446,9 +1515,13 @@ public class MainActivity extends AppCompatActivity {
                 break;
             case RUNNING:
             case STARTING:
-                if (!ServerConfig.get(this).isConfigured()) {
+                boolean server = ServerConfig.get(this).isConfigured();
+                if (!server && !AbrpConfig.get(this).isConfigured()) {
                     statusText.setText(R.string.server_not_configured);
                     statusText.setTextColor(COLOR_ERROR);
+                } else if (!server && UploadSettings.from(prefs).abrpUploadEnabled) {
+                    statusText.setText(R.string.state_abrp_only);
+                    statusText.setTextColor(COLOR_PENDING);
                 } else if (!UploadSettings.from(prefs).abrpUploadEnabled) {
                     statusText.setText(R.string.state_tracking_locally);
                     statusText.setTextColor(COLOR_PENDING);
diff --git a/app/src/main/java/com/evsuite/abrp/ServerHttp.java b/app/src/main/java/com/evsuite/abrp/ServerHttp.java
index 1e9b9de..96d8526 100644
--- a/app/src/main/java/com/evsuite/abrp/ServerHttp.java
+++ b/app/src/main/java/com/evsuite/abrp/ServerHttp.java
@@ -10,7 +10,8 @@ import java.net.URL;
 import java.nio.charset.StandardCharsets;
 
 /**
- * One JSON request to the car server, shared by telemetry, consumption sync and pairing.
+ * One JSON request to the car server, shared by telemetry, consumption sync and pairing (and,
+ * through {@link #send}, the direct ABRP upload).
  * Blocking, with short timeouts — call it off the main thread.
  *
  * The token goes in the Authorization header, never the URL, and is never logged. The answer
@@ -48,17 +49,26 @@ final class ServerHttp {
      * {@code token} may be null for the unauthenticated pairing calls.
      */
     static Response request(String method, String url, String token, JSONObject json) throws Exception {
+        byte[] body = json == null ? null : json.toString().getBytes(StandardCharsets.UTF_8);
+        return send(method, url, token == null ? null : "Bearer " + token, "application/json", body);
+    }
+
+    /**
+     * The request underneath, also used for ABRP ({@link AbrpApi}): {@code authorization} is the
+     * whole header value or null, {@code body} null for none.
+     */
+    static Response send(String method, String url, String authorization, String contentType, byte[] body)
+            throws Exception {
         HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
         try {
             connection.setRequestMethod(method);
             connection.setConnectTimeout(TIMEOUT_MS);
             connection.setReadTimeout(TIMEOUT_MS);
-            if (token != null) connection.setRequestProperty("Authorization", "Bearer " + token);
-            if (json != null) {
-                byte[] body = json.toString().getBytes(StandardCharsets.UTF_8);
+            if (authorization != null) connection.setRequestProperty("Authorization", authorization);
+            if (body != null) {
                 connection.setDoOutput(true);
                 connection.setFixedLengthStreamingMode(body.length);
-                connection.setRequestProperty("Content-Type", "application/json");
+                connection.setRequestProperty("Content-Type", contentType);
                 try (OutputStream out = connection.getOutputStream()) { out.write(body); }
             }
             int status = connection.getResponseCode();
diff --git a/app/src/main/java/com/evsuite/abrp/TelemetryQueue.java b/app/src/main/java/com/evsuite/abrp/TelemetryQueue.java
index 3ce0bf9..50883d7 100644
--- a/app/src/main/java/com/evsuite/abrp/TelemetryQueue.java
+++ b/app/src/main/java/com/evsuite/abrp/TelemetryQueue.java
@@ -52,6 +52,9 @@ final class TelemetryQueue {
         for (int i = 0; i < count && !samples.isEmpty(); i++) samples.removeFirst();
     }
 
+    /** The newest sample, or null when the queue is empty; it stays queued. */
+    synchronized String newest() { return samples.peekLast(); }
+
     synchronized int size() { return samples.size(); }
 
     /** Samples lost to the capacity limit since the queue was created. */
diff --git a/app/src/main/java/com/evsuite/abrp/TelemetryUploader.java b/app/src/main/java/com/evsuite/abrp/TelemetryUploader.java
index 6616910..ae7804d 100644
--- a/app/src/main/java/com/evsuite/abrp/TelemetryUploader.java
+++ b/app/src/main/java/com/evsuite/abrp/TelemetryUploader.java
@@ -152,9 +152,12 @@ final class TelemetryUploader {
     // ---------- Upload ----------
 
     private void flush() {
+        // ABRP first and on its own: live data must not wait for, or fail with, the server.
+        sendNewestToAbrp();
         ServerConfig config = ServerConfig.get(context);
         if (!config.isConfigured()) {
-            Log.i(TAG, "Telemetry not sent: server not configured (" + queue.size() + " queued)");
+            // Kept for the server once one is set up; the queue is bounded.
+            Log.i(TAG, "Telemetry not sent to a server: none configured (" + queue.size() + " queued)");
             return;
         }
         for (int i = 0; i < MAX_BATCHES_PER_TICK && queue.size() > 0; i++) {
@@ -190,9 +193,53 @@ final class TelemetryUploader {
         JSONObject body = new JSONObject()
                 .put("installationId", config.installationId)
                 .put("samples", samples);
+        // What the car already delivered to ABRP itself; the server forwards only newer samples.
+        if (lastAbrpUtc > 0) body.put("abrpSentUtc", lastAbrpUtc);
         return ServerHttp.request("POST", config.url + "/v1/telemetry", config.token, body);
     }
 
+    // ---------- ABRP, directly ----------
+
+    /** Older than this, a sample is history rather than live state, and ABRP gets nothing. */
+    private static final long ABRP_MAX_AGE_S = 5 * 60;
+
+    /** Time of the newest sample ABRP accepted from the car; 0 before the first. */
+    private volatile long lastAbrpUtc;
+
+    /**
+     * Sends the newest queued sample straight to ABRP when ABRP credentials are set: once per
+     * upload, only if it is newer than the last one sent and still live. It stays queued for
+     * the server either way.
+     */
+    private void sendNewestToAbrp() {
+        AbrpConfig abrp = AbrpConfig.get(context);
+        if (!abrp.isConfigured()) return;
+        String newest = queue.newest();
+        if (newest == null) return;
+        long utc = utcOf(newest);
+        if (utc <= lastAbrpUtc || System.currentTimeMillis() / 1000 - utc > ABRP_MAX_AGE_S) return;
+        String summary = TelemetryPayload.summarize(newest);
+        try {
+            ServerHttp.Response response = AbrpApi.send(abrp, newest);
+            boolean ok = AbrpApi.accepted(response);
+            if (ok) lastAbrpUtc = utc;
+            // ABRP's answer is not quoted: it can echo the request, credentials included.
+            AbrpUploadService.log().record(new UploadLog.Entry(System.currentTimeMillis(), response.status, ok,
+                    ok ? "ABRP: live data sent" : "ABRP rejected: HTTP " + response.status, summary));
+        } catch (Exception e) {
+            AbrpUploadService.log().record(new UploadLog.Entry(System.currentTimeMillis(), 0, false,
+                    "ABRP offline: " + e.getClass().getSimpleName(), summary));
+        }
+    }
+
+    static long utcOf(String sampleJson) {
+        try {
+            return new JSONObject(sampleJson).optLong("utc", 0L);
+        } catch (Exception e) {
+            return 0L;
+        }
+    }
+
     /** ", 2 value(s) dropped by the server" when it left anything out, for the upload log. */
     static String droppedNote(ServerHttp.Response response) {
         try {
diff --git a/app/src/main/res/drawable/ic_tab_charging.xml b/app/src/main/res/drawable/ic_tab_charging.xml
new file mode 100644
index 0000000..c331058
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tab_charging.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Lightning bolt: the Charging tab. Tinted by @color/nav_tab_foreground. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13,2L4,14H11L10,22L20,9H13L13,2Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_tab_live.xml b/app/src/main/res/drawable/ic_tab_live.xml
new file mode 100644
index 0000000..0db73a1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tab_live.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Broadcast waves around a dot: the Live data tab. Tinted by @color/nav_tab_foreground. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,10a2,2 0,1 1,0 4a2,2 0,1 1,0 -4z" />
+    <path
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:fillColor="#00000000"
+        android:pathData="M8.5,8.5A5,5 0,0 0,8.5 15.5M15.5,8.5A5,5 0,0 1,15.5 15.5M5.6,5.6A9,9 0,0 0,5.6 18.4M18.4,5.6A9,9 0,0 1,18.4 18.4" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_tab_service.xml b/app/src/main/res/drawable/ic_tab_service.xml
index 40bd181..14b498e 100644
--- a/app/src/main/res/drawable/ic_tab_service.xml
+++ b/app/src/main/res/drawable/ic_tab_service.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Engrenage : onglet Service. Teinté par @color/nav_tab_foreground. -->
+<!-- Gear: the Settings tab. Tinted by @color/nav_tab_foreground. -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/ic_tab_wifi.xml b/app/src/main/res/drawable/ic_tab_wifi.xml
deleted file mode 100644
index 30b440f..0000000
--- a/app/src/main/res/drawable/ic_tab_wifi.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Wi-Fi arcs, for the Wi-Fi page. -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3 3,-3c-1.65,-1.66 -4.34,-1.66 -6,0zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z" />
-</vector>
diff --git a/app/src/main/res/layout-w1000dp/activity_main.xml b/app/src/main/res/layout-w1000dp/activity_main.xml
index bd06d3b..9f322f1 100644
--- a/app/src/main/res/layout-w1000dp/activity_main.xml
+++ b/app/src/main/res/layout-w1000dp/activity_main.xml
@@ -8,10 +8,10 @@
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_brand_caption" android:textAppearance="@style/Text.EV.Secondary" android:paddingStart="14dp" android:layout_marginBottom="24dp" />
                 <com.google.android.material.button.MaterialButton android:id="@+id/tabVehicle" style="@style/Widget.EV.NavTab" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginBottom="6dp" android:text="@string/tab_vehicle" app:icon="@drawable/ic_tab_vehicle" />
                 <com.google.android.material.button.MaterialButton android:id="@+id/tabConsumption" style="@style/Widget.EV.NavTab" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginBottom="6dp" android:text="@string/tab_consumption" app:icon="@drawable/ic_tab_vehicle" />
-                <com.google.android.material.button.MaterialButton android:id="@+id/tabCharging" style="@style/Widget.EV.NavTab" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginBottom="6dp" android:text="@string/tab_charging" app:icon="@drawable/ic_tab_service" />
-                <com.google.android.material.button.MaterialButton android:id="@+id/tabService" style="@style/Widget.EV.NavTab" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginBottom="6dp" android:text="@string/tab_service" app:icon="@drawable/ic_tab_service" />
+                <com.google.android.material.button.MaterialButton android:id="@+id/tabCharging" style="@style/Widget.EV.NavTab" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginBottom="6dp" android:text="@string/tab_charging" app:icon="@drawable/ic_tab_charging" />
+                <com.google.android.material.button.MaterialButton android:id="@+id/tabService" style="@style/Widget.EV.NavTab" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginBottom="6dp" android:text="@string/tab_service" app:icon="@drawable/ic_tab_live" />
                 <com.google.android.material.button.MaterialButton android:id="@+id/tabServer" style="@style/Widget.EV.NavTab" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginBottom="6dp" android:text="@string/tab_server" app:icon="@drawable/ic_tab_server" />
-                <com.google.android.material.button.MaterialButton android:id="@+id/tabWifi" style="@style/Widget.EV.NavTab" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginBottom="6dp" android:text="@string/tab_wifi" app:icon="@drawable/ic_tab_wifi" />
+                <com.google.android.material.button.MaterialButton android:id="@+id/tabSettings" style="@style/Widget.EV.NavTab" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginBottom="6dp" android:text="@string/tab_settings" app:icon="@drawable/ic_tab_service" />
                 <com.google.android.material.button.MaterialButton android:id="@+id/tabLog" style="@style/Widget.EV.NavTab" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginBottom="6dp" android:text="@string/tab_log" app:icon="@drawable/ic_tab_log" />
             </LinearLayout>
         </ScrollView>
diff --git a/app/src/main/res/layout-w1000dp/pane_service.xml b/app/src/main/res/layout-w1000dp/pane_service.xml
index 2ed63fd..8a580dd 100644
--- a/app/src/main/res/layout-w1000dp/pane_service.xml
+++ b/app/src/main/res/layout-w1000dp/pane_service.xml
@@ -1,25 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:padding="24dp" android:baselineAligned="false">
-        <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:layout_marginEnd="16dp" android:padding="24dp" android:background="@drawable/bg_glass">
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_service_controls" android:textAppearance="@style/Text.EV.Eyebrow" />
-            <TextView android:id="@+id/status_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_input_panel" android:padding="16dp" android:layout_marginTop="20dp" android:layout_marginBottom="12dp" android:text="@string/state_stopped" android:textAppearance="@style/Text.EV.Body" />
-            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/abrp_upload_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Secondary" />
-            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/full_screen_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_full_screen" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_full_screen" android:textAppearance="@style/Text.EV.Secondary" />
-            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_key_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_voice_key" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_voice_key" android:textAppearance="@style/Text.EV.Secondary" />
+        <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:layout_marginEnd="16dp">
+            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_service_controls" android:textAppearance="@style/Text.EV.Eyebrow" />
+                <TextView android:id="@+id/status_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_input_panel" android:padding="16dp" android:layout_marginTop="20dp" android:layout_marginBottom="12dp" android:text="@string/state_stopped" android:textAppearance="@style/Text.EV.Body" />
+                <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/abrp_upload_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Secondary" />
+            </LinearLayout>
+            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_abrp_title" android:textAppearance="@style/Text.EV.Eyebrow" />
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:text="@string/hint_abrp_direct" android:textAppearance="@style/Text.EV.Secondary" />
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/abrp_api_key_layout" style="@style/Widget.EV.Input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="18dp" android:hint="@string/hint_abrp_api_key" app:endIconMode="password_toggle" app:endIconMinSize="72dp">
+                    <com.google.android.material.textfield.TextInputEditText android:id="@+id/abrp_api_key_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="textPassword" android:singleLine="true" android:textSize="20sp" />
+                </com.google.android.material.textfield.TextInputLayout>
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/abrp_token_layout" style="@style/Widget.EV.Input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="18dp" android:hint="@string/hint_abrp_token" app:endIconMode="password_toggle" app:endIconMinSize="72dp">
+                    <com.google.android.material.textfield.TextInputEditText android:id="@+id/abrp_token_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="textPassword" android:singleLine="true" android:textSize="20sp" />
+                </com.google.android.material.textfield.TextInputLayout>
+                <com.google.android.material.button.MaterialButton android:id="@+id/abrp_save_button" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_save" android:layout_marginTop="20dp" />
+                <com.google.android.material.button.MaterialButton android:id="@+id/abrp_test_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_test" android:layout_marginTop="8dp" />
+                <TextView android:id="@+id/abrp_status_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:textAppearance="@style/Text.EV.Body" />
+            </LinearLayout>
         </LinearLayout>
-        <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_service_timing" android:textAppearance="@style/Text.EV.Eyebrow" />
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_frequency" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
-            <Spinner android:id="@+id/interval_spinner" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:layout_marginTop="12dp" android:background="@drawable/bg_input_panel" android:popupBackground="@color/ev_surface_raised" android:contentDescription="@string/label_frequency" android:spinnerMode="dropdown" />
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_frequency" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="12dp" />
-            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/boost_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_boost_low_soc" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/low_soc_layout" style="@style/Widget.EV.Input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="@string/label_low_soc_threshold">
-                <com.google.android.material.textfield.TextInputEditText android:id="@+id/low_soc_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="number" android:maxLength="2" android:textSize="20sp" />
-            </com.google.android.material.textfield.TextInputLayout>
+        <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical">
+            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_service_timing" android:textAppearance="@style/Text.EV.Eyebrow" />
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_frequency" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
+                <Spinner android:id="@+id/interval_spinner" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:layout_marginTop="12dp" android:background="@drawable/bg_input_panel" android:popupBackground="@color/ev_surface_raised" android:contentDescription="@string/label_frequency" android:spinnerMode="dropdown" />
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_frequency" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="12dp" />
+                <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/boost_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_boost_low_soc" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/low_soc_layout" style="@style/Widget.EV.Input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="@string/label_low_soc_threshold">
+                    <com.google.android.material.textfield.TextInputEditText android:id="@+id/low_soc_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="number" android:maxLength="2" android:textSize="20sp" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
         </LinearLayout>
     </LinearLayout>
 </com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout-w1000dp/pane_settings.xml b/app/src/main/res/layout-w1000dp/pane_settings.xml
new file mode 100644
index 0000000..22cf8de
--- /dev/null
+++ b/app/src/main/res/layout-w1000dp/pane_settings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
+    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:padding="24dp" android:baselineAligned="false">
+        <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:layout_marginEnd="16dp">
+            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_display_title" android:textAppearance="@style/Text.EV.Eyebrow" />
+                <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/full_screen_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_full_screen" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_full_screen" android:textAppearance="@style/Text.EV.Secondary" />
+                <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_key_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_voice_key" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_voice_key" android:textAppearance="@style/Text.EV.Secondary" />
+            </LinearLayout>
+            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_settings_title" android:textAppearance="@style/Text.EV.Eyebrow" />
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/consumption_soh_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="Manual SoH (%)" app:suffixText="%">
+                    <com.google.android.material.textfield.TextInputEditText android:id="@+id/consumption_soh_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="5" android:minHeight="72dp"/>
+                </com.google.android.material.textfield.TextInputLayout>
+                <com.google.android.material.button.MaterialButton android:id="@+id/consumption_soh_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="Save SoH value"/>
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="This manual value is stored on the device and sent to your server with the daily totals." android:textAppearance="@style/Text.EV.Secondary"/>
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/usable_capacity_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:hint="@string/hint_usable_capacity" app:suffixText="kWh">
+                    <com.google.android.material.textfield.TextInputEditText android:id="@+id/usable_capacity_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="5" android:minHeight="72dp"/>
+                </com.google.android.material.textfield.TextInputLayout>
+                <com.google.android.material.button.MaterialButton android:id="@+id/usable_capacity_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="@string/btn_save_capacity"/>
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/helper_usable_capacity" android:textAppearance="@style/Text.EV.Secondary"/>
+            </LinearLayout>
+            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_price_title" android:textAppearance="@style/Text.EV.Eyebrow" />
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/charge_price_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="Unit price" app:suffixText="€/kWh">
+                    <com.google.android.material.textfield.TextInputEditText android:id="@+id/charge_price_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="10" android:minHeight="72dp"/>
+                </com.google.android.material.textfield.TextInputLayout>
+                <com.google.android.material.button.MaterialButton android:id="@+id/charge_price_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="Save price"/>
+            </LinearLayout>
+        </LinearLayout>
+        <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical">
+            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_card_title" android:textAppearance="@style/Text.EV.Eyebrow" />
+                <TextView android:id="@+id/wifi_ssid" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Metric" android:layout_marginTop="20dp" />
+                <TextView android:id="@+id/wifi_state" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="12dp" />
+                <com.google.android.material.button.MaterialButton android:id="@+id/wifi_connect_button" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_connect_now" android:layout_marginTop="24dp" />
+                <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/wifi_auto_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/wifi_auto_label" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_auto_hint" android:textAppearance="@style/Text.EV.Secondary" />
+            </LinearLayout>
+            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_saved_title" android:textAppearance="@style/Text.EV.Eyebrow" />
+                <TextView android:id="@+id/wifi_saved_list" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:textAppearance="@style/Text.EV.Body" android:lineSpacingExtra="16dp" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout-w1000dp/pane_wifi.xml b/app/src/main/res/layout-w1000dp/pane_wifi.xml
deleted file mode 100644
index c0461ea..0000000
--- a/app/src/main/res/layout-w1000dp/pane_wifi.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
-    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:padding="24dp" android:baselineAligned="false">
-        <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1.3" android:orientation="vertical" android:layout_marginEnd="16dp" android:padding="24dp" android:background="@drawable/bg_glass">
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_card_title" android:textAppearance="@style/Text.EV.Eyebrow" />
-            <TextView android:id="@+id/wifi_ssid" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Metric" android:layout_marginTop="20dp" />
-            <TextView android:id="@+id/wifi_state" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="12dp" />
-            <com.google.android.material.button.MaterialButton android:id="@+id/wifi_connect_button" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_connect_now" android:layout_marginTop="24dp" />
-            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/wifi_auto_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/wifi_auto_label" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_auto_hint" android:textAppearance="@style/Text.EV.Secondary" />
-        </LinearLayout>
-        <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_saved_title" android:textAppearance="@style/Text.EV.Eyebrow" />
-            <TextView android:id="@+id/wifi_saved_list" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:textAppearance="@style/Text.EV.Body" android:lineSpacingExtra="16dp" />
-        </LinearLayout>
-    </LinearLayout>
-</com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a0ea4c8..27ba5ae 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -15,10 +15,10 @@
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:padding="8dp" android:background="@drawable/bg_sidebar">
       <com.google.android.material.button.MaterialButton android:id="@+id/tabVehicle" style="@style/Widget.EV.NavTab.Compact" android:layout_width="0dp" android:layout_height="76dp" android:layout_weight="1" android:text="@string/tab_vehicle" app:icon="@drawable/ic_tab_vehicle"/>
       <com.google.android.material.button.MaterialButton android:id="@+id/tabConsumption" style="@style/Widget.EV.NavTab.Compact" android:layout_width="0dp" android:layout_height="76dp" android:layout_weight="1" android:text="@string/tab_consumption" app:icon="@drawable/ic_tab_vehicle"/>
-      <com.google.android.material.button.MaterialButton android:id="@+id/tabCharging" style="@style/Widget.EV.NavTab.Compact" android:layout_width="0dp" android:layout_height="76dp" android:layout_weight="1" android:text="@string/tab_charging" app:icon="@drawable/ic_tab_service"/>
-      <com.google.android.material.button.MaterialButton android:id="@+id/tabService" style="@style/Widget.EV.NavTab.Compact" android:layout_width="0dp" android:layout_height="76dp" android:layout_weight="1" android:text="@string/tab_service" app:icon="@drawable/ic_tab_service"/>
+      <com.google.android.material.button.MaterialButton android:id="@+id/tabCharging" style="@style/Widget.EV.NavTab.Compact" android:layout_width="0dp" android:layout_height="76dp" android:layout_weight="1" android:text="@string/tab_charging" app:icon="@drawable/ic_tab_charging"/>
+      <com.google.android.material.button.MaterialButton android:id="@+id/tabService" style="@style/Widget.EV.NavTab.Compact" android:layout_width="0dp" android:layout_height="76dp" android:layout_weight="1" android:text="@string/tab_service" app:icon="@drawable/ic_tab_live"/>
       <com.google.android.material.button.MaterialButton android:id="@+id/tabServer" style="@style/Widget.EV.NavTab.Compact" android:layout_width="0dp" android:layout_height="76dp" android:layout_weight="1" android:text="@string/tab_server" app:icon="@drawable/ic_tab_server"/>
-      <com.google.android.material.button.MaterialButton android:id="@+id/tabWifi" style="@style/Widget.EV.NavTab.Compact" android:layout_width="0dp" android:layout_height="76dp" android:layout_weight="1" android:text="@string/tab_wifi" app:icon="@drawable/ic_tab_wifi"/>
+      <com.google.android.material.button.MaterialButton android:id="@+id/tabSettings" style="@style/Widget.EV.NavTab.Compact" android:layout_width="0dp" android:layout_height="76dp" android:layout_weight="1" android:text="@string/tab_settings" app:icon="@drawable/ic_tab_service"/>
       <com.google.android.material.button.MaterialButton android:id="@+id/tabLog" style="@style/Widget.EV.NavTab.Compact" android:layout_width="0dp" android:layout_height="76dp" android:layout_weight="1" android:text="@string/tab_log" app:icon="@drawable/ic_tab_log"/>
     </LinearLayout>
   </LinearLayout>
diff --git a/app/src/main/res/layout/pane_charging.xml b/app/src/main/res/layout/pane_charging.xml
index e701971..5fab99e 100644
--- a/app/src/main/res/layout/pane_charging.xml
+++ b/app/src/main/res/layout/pane_charging.xml
@@ -15,13 +15,6 @@
     <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Total cost" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_total_cost" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
    </GridLayout>
   </LinearLayout>
-  <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:layout_marginTop="16dp" android:background="@drawable/bg_glass">
-   <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="CHARGING PRICE" android:textAppearance="@style/Text.EV.Eyebrow"/>
-   <com.google.android.material.textfield.TextInputLayout android:id="@+id/charge_price_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="Unit price" app:suffixText="€/kWh">
-    <com.google.android.material.textfield.TextInputEditText android:id="@+id/charge_price_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="10" android:minHeight="72dp"/>
-   </com.google.android.material.textfield.TextInputLayout>
-   <com.google.android.material.button.MaterialButton android:id="@+id/charge_price_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="Save price"/>
-  </LinearLayout>
   <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:layout_marginTop="16dp" android:background="@drawable/bg_glass">
    <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="CHARGING CURVE" android:textAppearance="@style/Text.EV.Eyebrow"/>
    <com.evsuite.abrp.ChargingGraphView android:id="@+id/charge_graph" android:layout_width="match_parent" android:layout_height="280dp" android:layout_marginTop="12dp"/>
diff --git a/app/src/main/res/layout/pane_consumption.xml b/app/src/main/res/layout/pane_consumption.xml
index 93891bb..791c8fb 100644
--- a/app/src/main/res/layout/pane_consumption.xml
+++ b/app/src/main/res/layout/pane_consumption.xml
@@ -26,19 +26,6 @@
       <com.google.android.material.button.MaterialButton android:id="@+id/consumption_reset" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginTop="12dp" android:text="Reset selected trip" android:visibility="gone"/>
     </LinearLayout>
     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:text="Last 7/30 days, lifetime and Trip A/B are stored permanently on the device; app and OTA updates do not erase them." android:textAppearance="@style/Text.EV.Secondary"/>
-    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:layout_marginTop="16dp" android:background="@drawable/bg_glass">
-      <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="BATTERY HEALTH (SOH)" android:textAppearance="@style/Text.EV.Eyebrow"/>
-      <com.google.android.material.textfield.TextInputLayout android:id="@+id/consumption_soh_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="Manual SoH (%)" app:suffixText="%">
-        <com.google.android.material.textfield.TextInputEditText android:id="@+id/consumption_soh_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="5" android:minHeight="72dp"/>
-      </com.google.android.material.textfield.TextInputLayout>
-      <com.google.android.material.button.MaterialButton android:id="@+id/consumption_soh_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="Save SoH value"/>
-      <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="This manual value is stored on the device and sent to your server with the daily totals." android:textAppearance="@style/Text.EV.Secondary"/>
-      <com.google.android.material.textfield.TextInputLayout android:id="@+id/usable_capacity_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:hint="@string/hint_usable_capacity" app:suffixText="kWh">
-        <com.google.android.material.textfield.TextInputEditText android:id="@+id/usable_capacity_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="5" android:minHeight="72dp"/>
-      </com.google.android.material.textfield.TextInputLayout>
-      <com.google.android.material.button.MaterialButton android:id="@+id/usable_capacity_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="@string/btn_save_capacity"/>
-      <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/helper_usable_capacity" android:textAppearance="@style/Text.EV.Secondary"/>
-    </LinearLayout>
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:layout_marginTop="16dp" android:background="@drawable/bg_glass">
       <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="DAILY LOG · LAST 4 MONTHS" android:textAppearance="@style/Text.EV.Eyebrow"/>
       <com.google.android.material.button.MaterialButton android:id="@+id/consumption_date_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="56dp" android:layout_marginTop="12dp" android:text="Pick a date"/>
diff --git a/app/src/main/res/layout/pane_service.xml b/app/src/main/res/layout/pane_service.xml
index fbe693c..8904c1c 100644
--- a/app/src/main/res/layout/pane_service.xml
+++ b/app/src/main/res/layout/pane_service.xml
@@ -6,13 +6,21 @@
             <TextView android:id="@+id/status_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_input_panel" android:padding="16dp" android:layout_marginTop="20dp" android:layout_marginBottom="12dp" android:text="@string/state_stopped" android:textAppearance="@style/Text.EV.Body" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/abrp_upload_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_abrp_upload_enabled" android:textAppearance="@style/Text.EV.Secondary" />
-            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/full_screen_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_full_screen" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_full_screen" android:textAppearance="@style/Text.EV.Secondary" />
-            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_key_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_voice_key" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_voice_key" android:textAppearance="@style/Text.EV.Secondary" />
         </LinearLayout>
-        <Space android:layout_width="1dp" android:layout_height="20dp" />
-        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
+        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_abrp_title" android:textAppearance="@style/Text.EV.Eyebrow" />
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:text="@string/hint_abrp_direct" android:textAppearance="@style/Text.EV.Secondary" />
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/abrp_api_key_layout" style="@style/Widget.EV.Input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="18dp" android:hint="@string/hint_abrp_api_key" app:endIconMode="password_toggle" app:endIconMinSize="72dp">
+                <com.google.android.material.textfield.TextInputEditText android:id="@+id/abrp_api_key_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="textPassword" android:singleLine="true" android:textSize="20sp" />
+            </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/abrp_token_layout" style="@style/Widget.EV.Input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="18dp" android:hint="@string/hint_abrp_token" app:endIconMode="password_toggle" app:endIconMinSize="72dp">
+                <com.google.android.material.textfield.TextInputEditText android:id="@+id/abrp_token_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="textPassword" android:singleLine="true" android:textSize="20sp" />
+            </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.button.MaterialButton android:id="@+id/abrp_save_button" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_save" android:layout_marginTop="20dp" />
+            <com.google.android.material.button.MaterialButton android:id="@+id/abrp_test_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_test" android:layout_marginTop="8dp" />
+            <TextView android:id="@+id/abrp_status_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:textAppearance="@style/Text.EV.Body" />
+        </LinearLayout>
+        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_service_timing" android:textAppearance="@style/Text.EV.Eyebrow" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_frequency" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
             <Spinner android:id="@+id/interval_spinner" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:layout_marginTop="12dp" android:background="@drawable/bg_input_panel" android:popupBackground="@color/ev_surface_raised" android:contentDescription="@string/label_frequency" android:spinnerMode="dropdown" />
diff --git a/app/src/main/res/layout/pane_settings.xml b/app/src/main/res/layout/pane_settings.xml
new file mode 100644
index 0000000..155fcab
--- /dev/null
+++ b/app/src/main/res/layout/pane_settings.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
+    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp">
+        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_display_title" android:textAppearance="@style/Text.EV.Eyebrow" />
+            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/full_screen_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_full_screen" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_full_screen" android:textAppearance="@style/Text.EV.Secondary" />
+            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_key_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_voice_key" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_voice_key" android:textAppearance="@style/Text.EV.Secondary" />
+        </LinearLayout>
+        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_settings_title" android:textAppearance="@style/Text.EV.Eyebrow" />
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/consumption_soh_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="Manual SoH (%)" app:suffixText="%">
+                <com.google.android.material.textfield.TextInputEditText android:id="@+id/consumption_soh_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="5" android:minHeight="72dp"/>
+            </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.button.MaterialButton android:id="@+id/consumption_soh_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="Save SoH value"/>
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="This manual value is stored on the device and sent to your server with the daily totals." android:textAppearance="@style/Text.EV.Secondary"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/usable_capacity_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:hint="@string/hint_usable_capacity" app:suffixText="kWh">
+                <com.google.android.material.textfield.TextInputEditText android:id="@+id/usable_capacity_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="5" android:minHeight="72dp"/>
+            </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.button.MaterialButton android:id="@+id/usable_capacity_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="@string/btn_save_capacity"/>
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/helper_usable_capacity" android:textAppearance="@style/Text.EV.Secondary"/>
+        </LinearLayout>
+        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_price_title" android:textAppearance="@style/Text.EV.Eyebrow" />
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/charge_price_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="Unit price" app:suffixText="€/kWh">
+                <com.google.android.material.textfield.TextInputEditText android:id="@+id/charge_price_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="10" android:minHeight="72dp"/>
+            </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.button.MaterialButton android:id="@+id/charge_price_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="Save price"/>
+        </LinearLayout>
+        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_card_title" android:textAppearance="@style/Text.EV.Eyebrow" />
+            <TextView android:id="@+id/wifi_ssid" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Metric" android:layout_marginTop="20dp" />
+            <TextView android:id="@+id/wifi_state" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="12dp" />
+            <com.google.android.material.button.MaterialButton android:id="@+id/wifi_connect_button" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_connect_now" android:layout_marginTop="24dp" />
+            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/wifi_auto_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/wifi_auto_label" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_auto_hint" android:textAppearance="@style/Text.EV.Secondary" />
+        </LinearLayout>
+        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_saved_title" android:textAppearance="@style/Text.EV.Eyebrow" />
+            <TextView android:id="@+id/wifi_saved_list" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:textAppearance="@style/Text.EV.Body" android:lineSpacingExtra="16dp" />
+        </LinearLayout>
+    </LinearLayout>
+</com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout/pane_wifi.xml b/app/src/main/res/layout/pane_wifi.xml
deleted file mode 100644
index 67796f6..0000000
--- a/app/src/main/res/layout/pane_wifi.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
-    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp">
-        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_card_title" android:textAppearance="@style/Text.EV.Eyebrow" />
-            <TextView android:id="@+id/wifi_ssid" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Metric" android:layout_marginTop="20dp" />
-            <TextView android:id="@+id/wifi_state" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="12dp" />
-            <com.google.android.material.button.MaterialButton android:id="@+id/wifi_connect_button" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_connect_now" android:layout_marginTop="24dp" />
-            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/wifi_auto_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/wifi_auto_label" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_auto_hint" android:textAppearance="@style/Text.EV.Secondary" />
-        </LinearLayout>
-        <Space android:layout_width="1dp" android:layout_height="20dp" />
-        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_saved_title" android:textAppearance="@style/Text.EV.Eyebrow" />
-            <TextView android:id="@+id/wifi_saved_list" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:textAppearance="@style/Text.EV.Body" android:lineSpacingExtra="16dp" />
-        </LinearLayout>
-    </LinearLayout>
-</com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 26b8b1c..6056cf0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
     <string name="app_name">Nils\' MG4</string>
 
     <!-- Main screen -->
-    <string name="tab_service">Upload</string>
+    <string name="tab_service">Live data</string>
     <string name="tab_vehicle">Overview</string>
     <string name="tab_consumption">Consumption</string>
     <string name="tab_charging">Charging</string>
@@ -11,17 +11,17 @@
     <string name="charging_title">Charging</string>
     <string name="charging_subtitle">Live battery values and SOC/power curve</string>
     <string name="tab_server">Server</string>
-    <string name="tab_wifi">Wi-Fi</string>
+    <string name="tab_settings">Settings</string>
     <string name="tab_log">Logs</string>
 
     <!-- Wi-Fi page -->
-    <string name="wifi_card_title">Wi-Fi Connection</string>
+    <string name="wifi_card_title">WI-FI</string>
     <string name="wifi_current">Connected network</string>
     <string name="wifi_state">Status</string>
     <string name="wifi_connect_now">Connect Now</string>
     <string name="wifi_auto_label">Auto-connect in the background</string>
     <string name="wifi_auto_hint">While the upload service is running, it tries to reconnect to saved networks on its own when the connection drops.</string>
-    <string name="wifi_saved_title">Saved Networks</string>
+    <string name="wifi_saved_title">SAVED NETWORKS</string>
     <string name="wifi_saved_empty">Could not read saved networks</string>
     <string name="wifi_not_connected">Not connected</string>
 
@@ -121,8 +121,19 @@
     <string name="label_steering_keys">Steering-wheel keys</string>
     <string name="hint_steering_keys">The last key reports the car sent, newest first. If double-pressing the voice key does not open the app, a photo of this list shows how the car reports it.</string>
     <string name="steering_keys_empty">No key reports received yet. Press a steering-wheel key.</string>
-    <string name="label_abrp_upload_enabled">Send live telemetry to the server</string>
-    <string name="hint_abrp_upload_enabled">The server stores it and forwards it to ABRP. Turn this off when another app feeds ABRP; consumption and charging tracking keep running.</string>
+    <string name="label_abrp_upload_enabled">Send live data</string>
+    <string name="hint_abrp_upload_enabled">To your server, which stores it, and to ABRP: straight from the car when the ABRP credentials below are set, otherwise forwarded by the server. Consumption and charging tracking keep running when this is off.</string>
+    <string name="hint_abrp_direct">With your ABRP API key and user token here, the car sends live data to ABRP itself, so ABRP keeps getting it while your server is down. The server then forwards only what the car could not send. Leave both empty to let the server forward everything.</string>
+    <string name="hint_abrp_api_key">ABRP API key</string>
+    <string name="hint_abrp_token">ABRP user token</string>
+    <string name="abrp_saved">Saved: the car sends live data to ABRP directly</string>
+    <string name="abrp_cleared">Cleared: the server forwards live data to ABRP</string>
+    <string name="abrp_invalid">Enter both, without spaces, or leave both empty</string>
+    <string name="abrp_testing">Checking with ABRP…</string>
+    <string name="abrp_test_ok">ABRP accepted these credentials</string>
+    <string name="abrp_test_failed">ABRP refused: HTTP %1$d</string>
+    <string name="abrp_test_offline">ABRP not reachable: %1$s</string>
+    <string name="abrp_not_set">Set both first</string>
 
 
     <!-- Cadence configuration -->
@@ -143,6 +154,7 @@
     <string name="state_stopped">Stopped</string>
     <string name="state_starting">Starting…</string>
     <string name="state_running">Running</string>
+    <string name="state_abrp_only">Running — live data to ABRP only, no server set up</string>
     <string name="state_tracking_locally">Tracking locally — live telemetry off</string>
     <string name="notif_tracking_locally">Tracking locally — live telemetry off</string>
     <string name="state_error">In error — last %1$d uploads failed</string>
diff --git a/app/src/main/res/values/strings_design.xml b/app/src/main/res/values/strings_design.xml
index dbadaea..d21a79c 100644
--- a/app/src/main/res/values/strings_design.xml
+++ b/app/src/main/res/values/strings_design.xml
@@ -9,10 +9,10 @@
   <string name="design_overview_subtitle">Data from your car, all in one place.</string>
   <string name="design_server_title">Where your data goes.</string>
   <string name="design_server_subtitle">Your own server stores it and passes it on to ABRP.</string>
-  <string name="design_service_title">You focus on the road.</string>
-  <string name="design_service_subtitle">Your data stays up to date in the background.</string>
-  <string name="design_wifi_title">Stay connected.</string>
-  <string name="design_wifi_subtitle">The internet connection for your journey.</string>
+  <string name="design_service_title">Live data.</string>
+  <string name="design_service_subtitle">Where your car\'s live data goes, and how often.</string>
+  <string name="design_settings_title">Settings.</string>
+  <string name="design_settings_subtitle">Display, battery, charging price and Wi-Fi.</string>
   <string name="design_log_title">Every upload, right here.</string>
   <string name="design_log_subtitle">Status and details of recent uploads.</string>
   <string name="design_battery">BATTERY</string>
@@ -22,7 +22,11 @@
   <string name="design_private_title">Your private connection.</string>
   <string name="design_private_body">The token lets the car write to your server. It is stored encrypted on this device; your ABRP credentials stay on the server.</string>
   <string name="design_no_data">Values that cannot be read are shown as &#x2014;.</string>
-  <string name="design_service_controls">UPLOAD CONTROL</string>
+  <string name="design_service_controls">LIVE DATA</string>
+  <string name="design_abrp_title">ABRP, DIRECTLY FROM THE CAR</string>
+  <string name="design_display_title">DISPLAY AND STEERING WHEEL</string>
+  <string name="design_battery_settings_title">BATTERY</string>
+  <string name="design_price_title">CHARGING PRICE</string>
   <string name="design_service_timing">UPDATE FREQUENCY</string>
   <string name="design_car_desc">Tire pressure positions on the vehicle</string>
 </resources>
diff --git a/app/src/test/java/com/evsuite/abrp/AbrpApiTest.java b/app/src/test/java/com/evsuite/abrp/AbrpApiTest.java
new file mode 100644
index 0000000..e63fd0e
--- /dev/null
+++ b/app/src/test/java/com/evsuite/abrp/AbrpApiTest.java
@@ -0,0 +1,40 @@
+package com.evsuite.abrp;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/** The direct ABRP request and its answer — pure JVM, nothing is sent. */
+public class AbrpApiTest {
+
+    @Test
+    public void credentialsGoInTheBodyEncoded() throws Exception {
+        String body = AbrpApi.formBody("key+1", "tok&en", "{\"utc\":1790000000,\"soc\":80}");
+        assertEquals("api_key=key%2B1&token=tok%26en&tlm=%7B%22utc%22%3A1790000000%2C%22soc%22%3A80%7D", body);
+        assertFalse(AbrpApi.SEND_URL.contains("?"));
+    }
+
+    @Test
+    public void onlyAnOkStatusIsAccepted() {
+        assertTrue(AbrpApi.accepted(new ServerHttp.Response(200, "{\"status\":\"ok\"}")));
+        assertFalse(AbrpApi.accepted(new ServerHttp.Response(200, "{\"status\":\"error\",\"errors\":[\"bad token\"]}")));
+        assertFalse(AbrpApi.accepted(new ServerHttp.Response(401, "{\"status\":\"ok\"}")));
+        assertFalse(AbrpApi.accepted(new ServerHttp.Response(200, "not json")));
+    }
+
+    @Test
+    public void credentialsMustLookLikeCredentials() {
+        assertTrue(AbrpConfig.isPlausible("0a1b2c3d-4e5f-6789"));
+        assertFalse(AbrpConfig.isPlausible("short"));
+        assertFalse(AbrpConfig.isPlausible("has a space in it"));
+        assertFalse(AbrpConfig.isPlausible(null));
+    }
+
+    @Test
+    public void theSampleTimeIsReadFromItsJson() {
+        assertEquals(1790000000L, TelemetryUploader.utcOf("{\"utc\":1790000000,\"soc\":5}"));
+        assertEquals(0L, TelemetryUploader.utcOf("garbage"));
+    }
+}
diff --git a/app/src/test/java/com/evsuite/abrp/ConfigImportTest.java b/app/src/test/java/com/evsuite/abrp/ConfigImportTest.java
index bde9e65..5144111 100644
--- a/app/src/test/java/com/evsuite/abrp/ConfigImportTest.java
+++ b/app/src/test/java/com/evsuite/abrp/ConfigImportTest.java
@@ -87,4 +87,13 @@ public class ConfigImportTest {
         assertEquals("https://k.example", c.serverUrl);
         assertEquals("t", c.token);
     }
+
+    @Test
+    public void abrpCredentialsAreRead() {
+        ConfigImport c = ConfigImport.parse("abrp_api_key = key-1234567890\nABRP_TOKEN = token-abcdefghij\n");
+        assertEquals("key-1234567890", c.abrpApiKey);
+        assertEquals("token-abcdefghij", c.abrpToken);
+        assertFalse(c.isEmpty());
+        assertEquals("token-2", ConfigImport.parse("abrp_user_token = token-2").abrpToken);
+    }
 }
diff --git a/k8s/secrets/secrets.example.yaml b/k8s/secrets/secrets.example.yaml
index 3064ca0..ee2572e 100644
--- a/k8s/secrets/secrets.example.yaml
+++ b/k8s/secrets/secrets.example.yaml
@@ -26,7 +26,8 @@ stringData:
   # Approves a car on your phone when it pairs by QR code (at least 12 characters). Leave it
   # empty to switch pairing off; then only the INGEST_TOKEN above works.
   APPROVAL_PASSWORD: CHANGE-ME-at-least-12-characters
-  # Your ABRP credentials. Leave either empty to switch forwarding off.
+  # Your ABRP credentials. Leave either empty to switch forwarding off. Keep them set even
+  # when the app sends to ABRP itself: the server then forwards only what the car could not.
   ABRP_API_KEY: CHANGE-ME
   ABRP_USER_TOKEN: CHANGE-ME
   ABRP_MIN_INTERVAL_SECONDS: "5"
diff --git a/k8s/server.yaml b/k8s/server.yaml
index 5cb7dc3..a3b2c40 100644
--- a/k8s/server.yaml
+++ b/k8s/server.yaml
@@ -29,8 +29,8 @@ spec:
           type: RuntimeDefault
       containers:
         - name: server
-          # 2.2.0, pinned by digest so a re-pushed tag cannot change what runs.
-          image: git.stinnesbeck.com/nils/mg4-server@sha256:09eb151ff65300b3990a74063cc44a14d24bef810461e4e0e63451cfbcfd8258
+          # 2.3.0, pinned by digest so a re-pushed tag cannot change what runs.
+          image: git.stinnesbeck.com/nils/mg4-server@sha256:dc5eb49cd88a1fd6a8e853c6e2291f2b5d62252e8bb6daf1750e1c3698bc7e0a
           ports:
             - name: http
               containerPort: 8080
diff --git a/server/README.md b/server/README.md
index 0f565f3..c8dce01 100644
--- a/server/README.md
+++ b/server/README.md
@@ -40,7 +40,9 @@ with (403 otherwise); the shared token works for any.
   a plausible time (before 2001, or more than an hour ahead) is dropped whole. The rest is stored
   and the answer is `200 {stored, droppedCount, dropped}`, even when nothing was usable, since
   the car would only send it again. The newest sample is forwarded to ABRP if it is under
-  5 minutes old and not ahead of the server's clock.
+  5 minutes old and not ahead of the server's clock. A car that sends to ABRP itself adds
+  `abrpSentUtc`, the newest sample ABRP took from it; only samples newer than that are
+  forwarded, so ABRP gets each one once.
 - `PUT /v1/consumption/daily` — one delta chunk of a day's consumption.
 - `PUT /v1/charging-sessions/{sessionId}` — a finished DC session with its curve.
 - `GET /v1/consumption/history/{installationId}` — the car reads its own totals back.
diff --git a/server/api.go b/server/api.go
index 7b7bb83..b1208e1 100644
--- a/server/api.go
+++ b/server/api.go
@@ -117,6 +117,20 @@ func (a *API) ingest(h handler) http.HandlerFunc {
 	}
 }
 
+// notYetAtAbrp leaves out the samples the car already sent to ABRP itself.
+func notYetAtAbrp(samples []TelemetrySample, sentUTC int64) []TelemetrySample {
+	if sentUTC == 0 {
+		return samples
+	}
+	out := make([]TelemetrySample, 0, len(samples))
+	for _, s := range samples {
+		if s.UTC > sentUTC {
+			out = append(out, s)
+		}
+	}
+	return out
+}
+
 // maxDroppedListed caps the dropped values named in a telemetry response and log line.
 const maxDroppedListed = 20
 
@@ -136,7 +150,7 @@ func (a *API) telemetry(w http.ResponseWriter, r *http.Request, c caller, body [
 		if err := a.Store.WriteTelemetry(r.Context(), batch.InstallationID, batch.Samples); err != nil {
 			return err
 		}
-		a.Forwarder.Forward(batch.Samples)
+		a.Forwarder.Forward(notYetAtAbrp(batch.Samples, batch.AbrpSentUTC))
 	}
 	dropped := batch.Dropped
 	if len(dropped) > maxDroppedListed {
diff --git a/server/api_test.go b/server/api_test.go
index 4a69fa5..5b6d0b5 100644
--- a/server/api_test.go
+++ b/server/api_test.go
@@ -204,3 +204,23 @@ func jsonInt(v int64) string {
 	b, _ := json.Marshal(v)
 	return string(b)
 }
+
+func TestSamplesTheCarSentToAbrpAreNotForwardedAgain(t *testing.T) {
+	samples := []TelemetrySample{{UTC: 100}, {UTC: 115}, {UTC: 130}}
+	if got := notYetAtAbrp(samples, 0); len(got) != 3 {
+		t.Fatalf("without abrpSentUtc everything is forwardable: %d", len(got))
+	}
+	if got := notYetAtAbrp(samples, 130); len(got) != 0 {
+		t.Fatalf("the car sent the newest: %d left", len(got))
+	}
+	if got := notYetAtAbrp(samples, 115); len(got) != 1 || got[0].UTC != 130 {
+		t.Fatalf("only the newer sample: %+v", got)
+	}
+	b, err := validateTelemetryBatch([]byte(`{"installationId":"`+testInstallation+`","abrpSentUtc":1790000000,"samples":[{"utc":1790000000}]}`), testNow)
+	if err != nil || b.AbrpSentUTC != 1790000000 {
+		t.Fatalf("abrpSentUtc not read: %v %d", err, b.AbrpSentUTC)
+	}
+	if _, err := validateTelemetryBatch([]byte(`{"installationId":"`+testInstallation+`","abrpSentUtc":"x","samples":[{"utc":1790000000}]}`), testNow); !isValidationError(err) {
+		t.Fatal("a malformed abrpSentUtc was accepted")
+	}
+}
diff --git a/server/model.go b/server/model.go
index b121c87..ca94b25 100644
--- a/server/model.go
+++ b/server/model.go
@@ -107,4 +107,7 @@ type TelemetryBatch struct {
 	Samples        []TelemetrySample
 	// Dropped names the values and samples validation left out, e.g. "samples[3].speed".
 	Dropped []string
+	// AbrpSentUTC is the newest sample the car delivered to ABRP itself (0: none). The
+	// server forwards only samples newer than that, so ABRP gets each one once.
+	AbrpSentUTC int64
 }
diff --git a/server/validate.go b/server/validate.go
index c82cbe3..4e0cc97 100644
--- a/server/validate.go
+++ b/server/validate.go
@@ -273,6 +273,11 @@ func validateTelemetryBatch(body []byte, now time.Time) (TelemetryBatch, error)
 		return TelemetryBatch{}, invalid("samples is invalid")
 	}
 	batch := TelemetryBatch{InstallationID: id, Samples: make([]TelemetrySample, 0, len(raw))}
+	if o.has("abrpSentUtc") {
+		if batch.AbrpSentUTC, err = integer(o["abrpSentUtc"], "abrpSentUtc"); err != nil {
+			return TelemetryBatch{}, err
+		}
+	}
 	latest := now.Add(maxClockAhead).Unix()
 	for i, entry := range raw {
 		name := fmt.Sprintf("samples[%d]", i)

From 9f184362f02c025c5c0e990083481562d1e09c2e Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 12:49:46 +0200
Subject: [PATCH 51/79] Server 2.4.0, app 2.11.1: ABRP forwarding removed from
 the server

The car sends live data to ABRP itself, and the car and the server go
over the same mobile connection: when the car cannot reach ABRP, it
cannot reach the server either, so the server's fallback bought
nothing. The forwarder, its ABRP_* settings and abrpSentUtc are gone;
the server only stores. The app stops sending abrpSentUtc (the server
ignores unknown fields, so 2.11.0 keeps working) and its texts no longer
promise a server fallback.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 README.md                                     |  27 ++--
 SPECS.md                                      |  18 ++-
 app/build.gradle                              |   4 +-
 .../java/com/evsuite/abrp/AbrpConfig.java     |   5 +-
 .../com/evsuite/abrp/AbrpUploadService.java   |   4 +-
 .../com/evsuite/abrp/TelemetryUploader.java   |   6 +-
 app/src/main/res/values/strings.xml           |   6 +-
 k8s/README.md                                 |   2 +-
 k8s/secrets/secrets.example.yaml              |   5 -
 k8s/server.yaml                               |  11 +-
 server/README.md                              |  17 +--
 server/abrp.go                                | 142 ------------------
 server/api.go                                 |  24 +--
 server/api_test.go                            |  22 +--
 server/logic_test.go                          |  68 +--------
 server/main.go                                |  60 +++-----
 server/model.go                               |   3 -
 server/validate.go                            |   5 -
 18 files changed, 70 insertions(+), 359 deletions(-)
 delete mode 100644 server/abrp.go

diff --git a/README.md b/README.md
index ab1bdb4..144a6ea 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # Nils' MG4
 
 An Android Automotive app for the **MG4 (SAIC eh32)** head unit, plus a small server: the car
-sends its telemetry to my own server at car.k8s.stinnesbeck.com, which stores it in InfluxDB 2,
-forwards live data to [A Better Route Planner](https://abetterrouteplanner.com) and feeds the
-Grafana dashboards.
+sends its telemetry to my own server at car.k8s.stinnesbeck.com, which stores it in InfluxDB 2
+for the Grafana dashboards, and its live data straight to
+[A Better Route Planner](https://abetterrouteplanner.com).
 
 No OBD dongle and no phone in the loop: the app runs on the head unit and reads the car's own
 APIs.
@@ -47,18 +47,16 @@ vehicle there, so every value shows as a dash).
 ## How it fits together
 
 ```
-car ──live telemetry───▶ car.k8s.stinnesbeck.com (Go) ──▶ ABRP (what the car did not send)
+car ──live telemetry───▶ car.k8s.stinnesbeck.com (Go)
  │  ──daily chunks─────▶          │
  │  ──charging sessions▶          ▼
  │                            InfluxDB 2 ◀── Grafana
- └──live telemetry (optional, direct)──────────────────▶ ABRP
+ └──live telemetry─────▶ ABRP
 ```
 
-With ABRP credentials set in the app (Live data tab), the car sends live data to ABRP itself,
-so ABRP keeps getting it while the server is down; the server then forwards only samples the
-car could not deliver. Without them in the app, the server forwards everything with its own
-ABRP credentials. The car authenticates with the server using a token of its own, obtained by
-pairing with a phone (below).
+The car sends live data to ABRP itself, with the ABRP credentials set on the Live data tab, so
+ABRP and the server do not depend on each other. The server only stores. The car authenticates
+with the server using a token of its own, obtained by pairing with a phone (below).
 
 ## The app
 
@@ -118,8 +116,7 @@ pointed at this repository's releases (see `SPECS.md`).
 3. Tap **Pair with phone**. Scan the QR code with a phone (or open the address shown and enter
    the code), and approve with the server's approval password. The car receives its token.
 4. On the **Live data** tab, turn live data on. The service starts with the car from then on.
-5. Optional: enter your ABRP API key and user token on the same tab, so the car also sends
-   live data straight to ABRP.
+5. Enter your ABRP API key and user token on the same tab, so the car sends live data to ABRP.
 
 ### Config file
 
@@ -141,8 +138,8 @@ installation_id = only to carry over history from an install older than 2.9.0
 interval_sec    = 60      # 15 / 30 / 60 / 120 / 300
 boost_low_soc   = true
 low_soc_percent = 20
-abrp_api_key    = optional: your ABRP API key, to send to ABRP directly
-abrp_token      = optional: your ABRP user token
+abrp_api_key    = your ABRP API key
+abrp_token      = your ABRP user token
 ```
 
 After a successful import the app deletes the file, since it holds the token; credentials live
@@ -182,7 +179,7 @@ work for the plain Gradle builds.
 ## Server and dashboards
 
 - **Server** ([`server/`](server/README.md)): Go, API only. Live telemetry, daily consumption
-  chunks, charging sessions, pairing; forwards live data to ABRP. Image at
+  chunks, charging sessions, pairing. Image at
   `git.stinnesbeck.com/nils/mg4-server`.
 - **Kubernetes** ([`k8s/`](k8s/README.md)): plain manifests for the server, InfluxDB 2 and
   Grafana, applied by hand with `kubectl apply -k k8s/`. Secrets go in the gitignored
diff --git a/SPECS.md b/SPECS.md
index 82eff48..b5ca00b 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -9,15 +9,16 @@ what has been changed, and what is still to do.
 
 ## Architecture: car server at car.k8s.stinnesbeck.com
 
-The car sends everything to our own server. The server stores it in InfluxDB 2 and forwards live
-telemetry to ABRP, so the ABRP token lives only on the server, never in the APK. Grafana reads
-InfluxDB directly for the dashboards.
+The car sends everything to our own server, which stores it in InfluxDB 2, and its live data
+straight to ABRP with the ABRP credentials kept (encrypted) in the app. The server does not talk
+to ABRP. Grafana reads InfluxDB directly for the dashboards.
 
 ```
-car ──live telemetry───▶ car.k8s.stinnesbeck.com (Go) ──▶ ABRP  api.iternio.com/1/tlm/send
-    ──daily chunks─────▶          │
-    ──charging sessions▶          ▼
-                              InfluxDB 2 ◀── Grafana (car-grafana.k8s.stinnesbeck.com)
+car ──live telemetry───▶ car.k8s.stinnesbeck.com (Go)
+ │  ──daily chunks─────▶          │
+ │  ──charging sessions▶          ▼
+ │                            InfluxDB 2 ◀── Grafana (car-grafana.k8s.stinnesbeck.com)
+ └──live telemetry─────▶ ABRP  api.iternio.com/1/tlm/send
 ```
 
 - **Server:** `server/`, Go 1.26, API only — see `server/README.md` for endpoints, configuration
@@ -112,6 +113,9 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.11.1, server 2.4.0: ABRP forwarding removed from the server. The car and the
+  server use the same mobile connection, so a server fallback for ABRP bought nothing. The car no
+  longer sends `abrpSentUtc`; the server ignores unknown fields, so older apps keep working.
 - 2026-10-18 — App 2.11.0, server 2.3.0:
   - Live data goes to ABRP straight from the car when ABRP credentials are set in the app
     (Live data tab or config file: `abrp_api_key`, `abrp_token`), so ABRP keeps getting it
diff --git a/app/build.gradle b/app/build.gradle
index 61914b1..5cb6663 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 73
-        versionName "2.11.0"
+        versionCode 74
+        versionName "2.11.1"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/AbrpConfig.java b/app/src/main/java/com/evsuite/abrp/AbrpConfig.java
index 6ffee1b..5d20a5d 100644
--- a/app/src/main/java/com/evsuite/abrp/AbrpConfig.java
+++ b/app/src/main/java/com/evsuite/abrp/AbrpConfig.java
@@ -8,9 +8,8 @@ import android.content.SharedPreferences;
  * sending) and the user token (which car in which ABRP account). Kept in {@link SecurePrefs}
  * next to the server settings, entered on the Live data tab or imported from a config file.
  *
- * With both set, the car sends to ABRP itself, so ABRP keeps getting live data when the car
- * server is down; the server then only forwards what the car could not deliver. Without them,
- * the server forwards as before.
+ * The car is the only one that sends to ABRP: the server stores live data but does not forward
+ * it. Without these, ABRP gets no live data.
  */
 final class AbrpConfig {
 
diff --git a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
index c30a27b..5b3e351 100644
--- a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
+++ b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
@@ -25,8 +25,8 @@ import java.util.concurrent.TimeUnit;
 /**
  * Foreground service that polls vehicle telemetry every 15 s, integrates consumption locally,
  * syncs it to the car server in 2-minute delta chunks, and sends live telemetry samples that
- * the server stores and forwards to ABRP ({@link TelemetryUploader}). The car itself never
- * talks to ABRP and holds no ABRP credentials.
+ * the server stores and, with ABRP credentials set, that go straight to ABRP
+ * ({@link TelemetryUploader}).
  *
  * Always-on by design: started at boot (BootReceiver) and on app open, never gated on
  * credentials or a toggle. The only thing it needs is a network, and a missing one is
diff --git a/app/src/main/java/com/evsuite/abrp/TelemetryUploader.java b/app/src/main/java/com/evsuite/abrp/TelemetryUploader.java
index ae7804d..8fbd144 100644
--- a/app/src/main/java/com/evsuite/abrp/TelemetryUploader.java
+++ b/app/src/main/java/com/evsuite/abrp/TelemetryUploader.java
@@ -19,7 +19,7 @@ import java.util.List;
 import java.util.Objects;
 
 /**
- * Live telemetry to the car server, which stores it and forwards the newest sample to ABRP.
+ * Live telemetry to the car server, which stores it, and the newest sample straight to ABRP.
  *
  * Called on every service tick. While the car is in use every tick becomes a sample; the
  * queue is sent when {@link UploadCadence} says so — every tick on a state change, otherwise
@@ -193,8 +193,6 @@ final class TelemetryUploader {
         JSONObject body = new JSONObject()
                 .put("installationId", config.installationId)
                 .put("samples", samples);
-        // What the car already delivered to ABRP itself; the server forwards only newer samples.
-        if (lastAbrpUtc > 0) body.put("abrpSentUtc", lastAbrpUtc);
         return ServerHttp.request("POST", config.url + "/v1/telemetry", config.token, body);
     }
 
@@ -209,7 +207,7 @@ final class TelemetryUploader {
     /**
      * Sends the newest queued sample straight to ABRP when ABRP credentials are set: once per
      * upload, only if it is newer than the last one sent and still live. It stays queued for
-     * the server either way.
+     * the server either way; the server does not forward to ABRP.
      */
     private void sendNewestToAbrp() {
         AbrpConfig abrp = AbrpConfig.get(context);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6056cf0..e365d13 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -122,12 +122,12 @@
     <string name="hint_steering_keys">The last key reports the car sent, newest first. If double-pressing the voice key does not open the app, a photo of this list shows how the car reports it.</string>
     <string name="steering_keys_empty">No key reports received yet. Press a steering-wheel key.</string>
     <string name="label_abrp_upload_enabled">Send live data</string>
-    <string name="hint_abrp_upload_enabled">To your server, which stores it, and to ABRP: straight from the car when the ABRP credentials below are set, otherwise forwarded by the server. Consumption and charging tracking keep running when this is off.</string>
-    <string name="hint_abrp_direct">With your ABRP API key and user token here, the car sends live data to ABRP itself, so ABRP keeps getting it while your server is down. The server then forwards only what the car could not send. Leave both empty to let the server forward everything.</string>
+    <string name="hint_abrp_upload_enabled">To your server, which stores it, and straight to ABRP when the ABRP credentials below are set. Consumption and charging tracking keep running when this is off.</string>
+    <string name="hint_abrp_direct">The car sends live data to ABRP itself with your ABRP API key and user token. Without them, ABRP gets no live data; your server only stores it.</string>
     <string name="hint_abrp_api_key">ABRP API key</string>
     <string name="hint_abrp_token">ABRP user token</string>
     <string name="abrp_saved">Saved: the car sends live data to ABRP directly</string>
-    <string name="abrp_cleared">Cleared: the server forwards live data to ABRP</string>
+    <string name="abrp_cleared">Cleared: ABRP gets no live data</string>
     <string name="abrp_invalid">Enter both, without spaces, or leave both empty</string>
     <string name="abrp_testing">Checking with ABRP…</string>
     <string name="abrp_test_ok">ABRP accepted these credentials</string>
diff --git a/k8s/README.md b/k8s/README.md
index a2f694e..15c87ed 100644
--- a/k8s/README.md
+++ b/k8s/README.md
@@ -22,7 +22,7 @@ is applied automatically. Apply them yourself.
    covered by Traefik's default certificate.
 2. **Create the Secrets.** `cp k8s/secrets/secrets.example.yaml k8s/secrets/secrets.yaml` (gitignored), replace
    every `CHANGE-ME` there (`openssl rand -hex 32`): `influxdb-auth`, `mg4-server` (ingest token,
-   approval password for pairing, your ABRP API key and user token), `grafana-admin` and
+   approval password for pairing), `grafana-admin` and
    `grafana-influx` (see below). Keep the template itself on placeholders only.
 3. **Registry access.** The `mg4-server` package on git.stinnesbeck.com is public, so no pull
    secret is needed. If you make it private, add an `imagePullSecrets` entry to `server.yaml`.
diff --git a/k8s/secrets/secrets.example.yaml b/k8s/secrets/secrets.example.yaml
index ee2572e..9a9e853 100644
--- a/k8s/secrets/secrets.example.yaml
+++ b/k8s/secrets/secrets.example.yaml
@@ -26,11 +26,6 @@ stringData:
   # Approves a car on your phone when it pairs by QR code (at least 12 characters). Leave it
   # empty to switch pairing off; then only the INGEST_TOKEN above works.
   APPROVAL_PASSWORD: CHANGE-ME-at-least-12-characters
-  # Your ABRP credentials. Leave either empty to switch forwarding off. Keep them set even
-  # when the app sends to ABRP itself: the server then forwards only what the car could not.
-  ABRP_API_KEY: CHANGE-ME
-  ABRP_USER_TOKEN: CHANGE-ME
-  ABRP_MIN_INTERVAL_SECONDS: "5"
 ---
 apiVersion: v1
 kind: Secret
diff --git a/k8s/server.yaml b/k8s/server.yaml
index a3b2c40..aaf17df 100644
--- a/k8s/server.yaml
+++ b/k8s/server.yaml
@@ -1,5 +1,5 @@
-# The car server (Go). One replica on purpose: the ABRP rate limit is kept in memory, and
-# two replicas would each forward to ABRP at the full rate.
+# The car server (Go). One replica on purpose: pending pairing requests and the wrong-password
+# counters are kept in memory.
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -29,8 +29,8 @@ spec:
           type: RuntimeDefault
       containers:
         - name: server
-          # 2.3.0, pinned by digest so a re-pushed tag cannot change what runs.
-          image: git.stinnesbeck.com/nils/mg4-server@sha256:dc5eb49cd88a1fd6a8e853c6e2291f2b5d62252e8bb6daf1750e1c3698bc7e0a
+          # 2.4.0, pinned by digest so a re-pushed tag cannot change what runs.
+          image: git.stinnesbeck.com/nils/mg4-server@sha256:ab243f37812efa7294efc594f65ca65f9d551161a85e7cc641afb168e226a2fe
           ports:
             - name: http
               containerPort: 8080
@@ -49,8 +49,7 @@ spec:
                 secretKeyRef:
                   name: influxdb-auth
                   key: admin-token
-          # INGEST_TOKEN, APPROVAL_PASSWORD, ABRP_API_KEY, ABRP_USER_TOKEN,
-          # ABRP_MIN_INTERVAL_SECONDS.
+          # INGEST_TOKEN, APPROVAL_PASSWORD.
           envFrom:
             - secretRef:
                 name: mg4-server
diff --git a/server/README.md b/server/README.md
index c8dce01..b6fa69f 100644
--- a/server/README.md
+++ b/server/README.md
@@ -1,11 +1,11 @@
 # Nils' MG4 — car server
 
-A small Go service at car.k8s.stinnesbeck.com: the API the car writes to, and the ABRP
-forwarder. Data lives in InfluxDB 2; Grafana reads it from there for the dashboards
-(`../k8s/grafana/`).
+A small Go service at car.k8s.stinnesbeck.com: the API the car writes to. Data lives in
+InfluxDB 2; Grafana reads it from there for the dashboards (`../k8s/grafana/`). The car sends
+its live data to ABRP itself; the server does not talk to ABRP (removed in 2.4.0).
 
 ```
-car ──live telemetry───▶ server ──▶ ABRP  api.iternio.com/1/tlm/send
+car ──live telemetry───▶ server
     ──daily chunks─────▶   │
     ──charging sessions▶   ▼
                        InfluxDB 2 ◀── Grafana
@@ -20,14 +20,10 @@ Environment only; the server refuses to start when a required value is missing.
 | `INFLUX_URL`, `INFLUX_TOKEN`, `INFLUX_ORG` | required; the token needs read/write on the bucket |
 | `INFLUX_BUCKET` | default `mg4` |
 | `INGEST_TOKEN` | required, at least 24 characters: `openssl rand -hex 32` |
-| `ABRP_API_KEY`, `ABRP_USER_TOKEN` | optional; both needed to forward |
-| `ABRP_MIN_INTERVAL_SECONDS` | default 5 |
 | `APPROVAL_PASSWORD` | optional, at least 12 characters; switches pairing on (see below) |
 | `PUBLIC_URL` | the address a phone uses, for the pairing QR code; derived from the request if empty |
 | `LISTEN_ADDR` | default `:8080` |
 
-The ABRP credentials never reach the car.
-
 ## Endpoints
 
 The ingest endpoints accept `Authorization: Bearer <token>` with either the shared `INGEST_TOKEN`
@@ -39,10 +35,7 @@ with (403 otherwise); the shared token works for any.
   dropped, known ones bounded: a value out of range is dropped on its own, and a sample without
   a plausible time (before 2001, or more than an hour ahead) is dropped whole. The rest is stored
   and the answer is `200 {stored, droppedCount, dropped}`, even when nothing was usable, since
-  the car would only send it again. The newest sample is forwarded to ABRP if it is under
-  5 minutes old and not ahead of the server's clock. A car that sends to ABRP itself adds
-  `abrpSentUtc`, the newest sample ABRP took from it; only samples newer than that are
-  forwarded, so ABRP gets each one once.
+  the car would only send it again.
 - `PUT /v1/consumption/daily` — one delta chunk of a day's consumption.
 - `PUT /v1/charging-sessions/{sessionId}` — a finished DC session with its curve.
 - `GET /v1/consumption/history/{installationId}` — the car reads its own totals back.
diff --git a/server/abrp.go b/server/abrp.go
deleted file mode 100644
index 50df2d6..0000000
--- a/server/abrp.go
+++ /dev/null
@@ -1,142 +0,0 @@
-package main
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"log/slog"
-	"net/http"
-	"net/url"
-	"strings"
-	"sync"
-	"time"
-)
-
-// Forwarder sends live telemetry on to A Better Route Planner.
-//
-// The ABRP credentials exist only here, from ABRP_API_KEY and ABRP_USER_TOKEN in the
-// server's environment; the car never holds them. Forwarding is off when either is empty.
-//
-// Only the newest sample of a batch is sent, and at most one per MinInterval. A failed
-// forward is logged and dropped, never queued: ABRP plans from the car's state now, and a
-// backlog replayed later would describe a car that has moved on. The stored copy in
-// InfluxDB is unaffected either way.
-type Forwarder struct {
-	APIKey      string
-	UserToken   string
-	MinInterval time.Duration
-	Endpoint    string
-	Client      *http.Client
-
-	mu         sync.Mutex
-	lastUTC    int64
-	lastSentAt time.Time
-}
-
-const (
-	abrpEndpoint = "https://api.iternio.com/1/tlm/send"
-	// Older than this, a sample is history rather than live state, and ABRP gets nothing.
-	abrpMaxAge = 5 * time.Minute
-	// Newer than now by more than this, a sample's clock is wrong, and ABRP gets nothing.
-	abrpMaxAhead = 30 * time.Second
-)
-
-func (f *Forwarder) configured() bool {
-	return f != nil && f.APIKey != "" && f.UserToken != ""
-}
-
-// pick chooses the sample to forward, or false when there is nothing new or it is too
-// soon. It records the choice, so two batches arriving together cannot both forward.
-func (f *Forwarder) pick(samples []TelemetrySample, now time.Time) (TelemetrySample, bool) {
-	// A sample stamped ahead of now has a wrong clock. Taking it would also set lastUTC into
-	// the future, and every real sample after it would look older and never be sent.
-	latest := now.Add(abrpMaxAhead).Unix()
-	var newest TelemetrySample
-	found := false
-	for _, s := range samples {
-		if s.UTC <= latest && (!found || s.UTC > newest.UTC) {
-			newest, found = s, true
-		}
-	}
-	if !found || now.Sub(time.Unix(newest.UTC, 0)) > abrpMaxAge {
-		return TelemetrySample{}, false
-	}
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	if f.lastUTC != 0 && newest.UTC <= f.lastUTC {
-		return TelemetrySample{}, false
-	}
-	if !f.lastSentAt.IsZero() && now.Sub(f.lastSentAt) < f.MinInterval {
-		return TelemetrySample{}, false
-	}
-	f.lastUTC = newest.UTC
-	f.lastSentAt = now
-	return newest, true
-}
-
-// Forward is fire-and-forget: the car's request is answered without waiting for ABRP.
-func (f *Forwarder) Forward(samples []TelemetrySample) {
-	if !f.configured() {
-		return
-	}
-	sample, ok := f.pick(samples, time.Now())
-	if !ok {
-		return
-	}
-	go func() {
-		if err := f.send(context.Background(), sample); err != nil {
-			slog.Warn("ABRP forward failed", "error", err)
-		}
-	}()
-}
-
-// tlm is the object ABRP expects: the same field names, flags as 0/1.
-func tlm(sample TelemetrySample) map[string]any {
-	out := map[string]any{"utc": sample.UTC}
-	for field, value := range sample.Numbers {
-		out[field] = value
-	}
-	for field, value := range sample.Flags {
-		if value {
-			out[field] = 1
-		} else {
-			out[field] = 0
-		}
-	}
-	return out
-}
-
-func (f *Forwarder) send(ctx context.Context, sample TelemetrySample) error {
-	payload, err := json.Marshal(tlm(sample))
-	if err != nil {
-		return err
-	}
-	// Credentials go in the form body, never the URL, which ends up in access logs.
-	form := url.Values{"api_key": {f.APIKey}, "token": {f.UserToken}, "tlm": {string(payload)}}
-	endpoint := f.Endpoint
-	if endpoint == "" {
-		endpoint = abrpEndpoint
-	}
-	ctx, cancel := context.WithTimeout(ctx, 8*time.Second)
-	defer cancel()
-	req, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint, strings.NewReader(form.Encode()))
-	if err != nil {
-		return err
-	}
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	client := f.Client
-	if client == nil {
-		client = http.DefaultClient
-	}
-	resp, err := client.Do(req)
-	if err != nil {
-		// A url.Error from the client quotes the URL, which holds no credentials.
-		return err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		// The response body can echo the request; only the status is reported.
-		return fmt.Errorf("rejected: HTTP %d", resp.StatusCode)
-	}
-	return nil
-}
diff --git a/server/api.go b/server/api.go
index b1208e1..5d8b660 100644
--- a/server/api.go
+++ b/server/api.go
@@ -13,7 +13,7 @@ import (
 
 // API serves the car. Every endpoint but /v1/health needs the ingest token.
 //
-//	POST /v1/telemetry                           live samples; stored, newest forwarded to ABRP
+//	POST /v1/telemetry                           live samples, stored
 //	PUT  /v1/consumption/daily                   one delta chunk of a day's consumption
 //	PUT  /v1/charging-sessions/{sessionId}       one finished DC charging session
 //	GET  /v1/consumption/history/{installationId} the car reads its own totals back
@@ -24,7 +24,6 @@ import (
 type API struct {
 	Store       Store
 	IngestToken string
-	Forwarder   *Forwarder
 	Pairing     *Pairing
 	// PublicURL is the server's address as a phone reaches it, for the pairing QR code;
 	// derived from the request when empty.
@@ -117,27 +116,11 @@ func (a *API) ingest(h handler) http.HandlerFunc {
 	}
 }
 
-// notYetAtAbrp leaves out the samples the car already sent to ABRP itself.
-func notYetAtAbrp(samples []TelemetrySample, sentUTC int64) []TelemetrySample {
-	if sentUTC == 0 {
-		return samples
-	}
-	out := make([]TelemetrySample, 0, len(samples))
-	for _, s := range samples {
-		if s.UTC > sentUTC {
-			out = append(out, s)
-		}
-	}
-	return out
-}
-
 // maxDroppedListed caps the dropped values named in a telemetry response and log line.
 const maxDroppedListed = 20
 
-// telemetry stores the batch first; only once the write succeeded is the newest sample
-// handed to ABRP, so the car's retry of a failed request cannot leave ABRP with data the
-// database never got. The answer says how many samples were stored and what was dropped;
-// a batch with nothing usable is still a 200, since sending it again would not help.
+// telemetry stores the batch. The answer says how many samples were stored and what was
+// dropped; a batch with nothing usable is still a 200, since sending it again would not help.
 func (a *API) telemetry(w http.ResponseWriter, r *http.Request, c caller, body []byte) error {
 	batch, err := validateTelemetryBatch(body, time.Now())
 	if err != nil {
@@ -150,7 +133,6 @@ func (a *API) telemetry(w http.ResponseWriter, r *http.Request, c caller, body [
 		if err := a.Store.WriteTelemetry(r.Context(), batch.InstallationID, batch.Samples); err != nil {
 			return err
 		}
-		a.Forwarder.Forward(notYetAtAbrp(batch.Samples, batch.AbrpSentUTC))
 	}
 	dropped := batch.Dropped
 	if len(dropped) > maxDroppedListed {
diff --git a/server/api_test.go b/server/api_test.go
index 5b6d0b5..7007992 100644
--- a/server/api_test.go
+++ b/server/api_test.go
@@ -76,7 +76,7 @@ const (
 
 func newTestAPI() (*API, *fakeStore) {
 	store := &fakeStore{}
-	return &API{Store: store, IngestToken: testToken, Forwarder: &Forwarder{},
+	return &API{Store: store, IngestToken: testToken,
 		Pairing: NewPairing(testApprovalPassword, nil), PublicURL: "https://car.example.com"}, store
 }
 
@@ -204,23 +204,3 @@ func jsonInt(v int64) string {
 	b, _ := json.Marshal(v)
 	return string(b)
 }
-
-func TestSamplesTheCarSentToAbrpAreNotForwardedAgain(t *testing.T) {
-	samples := []TelemetrySample{{UTC: 100}, {UTC: 115}, {UTC: 130}}
-	if got := notYetAtAbrp(samples, 0); len(got) != 3 {
-		t.Fatalf("without abrpSentUtc everything is forwardable: %d", len(got))
-	}
-	if got := notYetAtAbrp(samples, 130); len(got) != 0 {
-		t.Fatalf("the car sent the newest: %d left", len(got))
-	}
-	if got := notYetAtAbrp(samples, 115); len(got) != 1 || got[0].UTC != 130 {
-		t.Fatalf("only the newer sample: %+v", got)
-	}
-	b, err := validateTelemetryBatch([]byte(`{"installationId":"`+testInstallation+`","abrpSentUtc":1790000000,"samples":[{"utc":1790000000}]}`), testNow)
-	if err != nil || b.AbrpSentUTC != 1790000000 {
-		t.Fatalf("abrpSentUtc not read: %v %d", err, b.AbrpSentUTC)
-	}
-	if _, err := validateTelemetryBatch([]byte(`{"installationId":"`+testInstallation+`","abrpSentUtc":"x","samples":[{"utc":1790000000}]}`), testNow); !isValidationError(err) {
-		t.Fatal("a malformed abrpSentUtc was accepted")
-	}
-}
diff --git a/server/logic_test.go b/server/logic_test.go
index 6f8371c..366086e 100644
--- a/server/logic_test.go
+++ b/server/logic_test.go
@@ -1,10 +1,6 @@
 package main
 
 import (
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
 	"testing"
 	"time"
 )
@@ -49,68 +45,6 @@ func TestAggregateDaysNewestSohWins(t *testing.T) {
 	}
 }
 
-func TestTlmSendsFlagsAsZeroOrOne(t *testing.T) {
-	got := tlm(TelemetrySample{UTC: testNowS, Numbers: map[string]float64{"soc": 50},
-		Flags: map[string]bool{"is_charging": true, "is_parked": false}})
-	if got["utc"] != int64(testNowS) || got["soc"] != 50.0 || got["is_charging"] != 1 || got["is_parked"] != 0 {
-		t.Fatalf("tlm %+v", got)
-	}
-}
-
-func TestForwarderPicksOnlyTheNewestFreshSampleOncePerInterval(t *testing.T) {
-	f := &Forwarder{MinInterval: 5 * time.Second}
-	now := time.Unix(testNowS, 0)
-	got, ok := f.pick([]TelemetrySample{{UTC: testNowS - 10}, {UTC: testNowS - 2}, {UTC: testNowS - 5}}, now)
-	if !ok || got.UTC != testNowS-2 {
-		t.Fatalf("picked %+v %v", got, ok)
-	}
-	if _, ok := f.pick([]TelemetrySample{{UTC: testNowS}}, now.Add(time.Second)); ok {
-		t.Fatal("forwarded again within the interval")
-	}
-	if _, ok := f.pick([]TelemetrySample{{UTC: testNowS - 3}}, now.Add(time.Minute)); ok {
-		t.Fatal("forwarded an older sample than the last one")
-	}
-	// A sample from ten minutes ago describes a car that has moved on.
-	fresh := &Forwarder{MinInterval: 5 * time.Second}
-	if _, ok := fresh.pick([]TelemetrySample{{UTC: testNowS - 600}}, now); ok {
-		t.Fatal("forwarded a stale sample")
-	}
-	// A sample from a clock a day ahead is skipped, and does not block the real ones after it.
-	ahead := &Forwarder{MinInterval: 5 * time.Second}
-	got, ok = ahead.pick([]TelemetrySample{{UTC: testNowS + 86400}, {UTC: testNowS - 1}}, now)
-	if !ok || got.UTC != testNowS-1 {
-		t.Fatalf("picked %+v %v", got, ok)
-	}
-	if _, ok := ahead.pick([]TelemetrySample{{UTC: testNowS + 86400}}, now.Add(time.Minute)); ok {
-		t.Fatal("forwarded a sample from the future")
-	}
-	if _, ok := ahead.pick([]TelemetrySample{{UTC: testNowS + 60}}, now.Add(time.Minute)); !ok {
-		t.Fatal("a real sample after a future one was not forwarded")
-	}
-}
-
-func TestForwarderPutsCredentialsInTheBodyNotTheURL(t *testing.T) {
-	received := make(chan *http.Request, 1)
-	var form url.Values
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		body, _ := io.ReadAll(r.Body)
-		form, _ = url.ParseQuery(string(body))
-		received <- r
-	}))
-	defer srv.Close()
-	f := &Forwarder{APIKey: "key-123", UserToken: "token-456", Endpoint: srv.URL + "/1/tlm/send"}
-	if err := f.send(t.Context(), TelemetrySample{UTC: testNowS, Numbers: map[string]float64{"soc": 80}}); err != nil {
-		t.Fatal(err)
-	}
-	r := <-received
-	if r.URL.RawQuery != "" {
-		t.Fatalf("credentials leaked into the URL: %s", r.URL.RawQuery)
-	}
-	if form.Get("api_key") != "key-123" || form.Get("token") != "token-456" || form.Get("tlm") != `{"soc":80,"utc":1790000000}` {
-		t.Fatalf("form %v", form)
-	}
-}
-
 func TestLoadConfigFailsClosed(t *testing.T) {
 	env := map[string]string{
 		"INFLUX_URL": "http://influxdb:8086", "INFLUX_TOKEN": "t", "INFLUX_ORG": "mg4",
@@ -118,7 +52,7 @@ func TestLoadConfigFailsClosed(t *testing.T) {
 	}
 	get := func(k string) string { return env[k] }
 	c, err := loadConfig(get)
-	if err != nil || c.listenAddr != ":8080" || c.influxBucket != "mg4" || c.abrpMinInterval != 5*time.Second {
+	if err != nil || c.listenAddr != ":8080" || c.influxBucket != "mg4" {
 		t.Fatalf("defaults: %+v %v", c, err)
 	}
 	env["INGEST_TOKEN"] = "short"
diff --git a/server/main.go b/server/main.go
index 6bc6eb7..1d99853 100644
--- a/server/main.go
+++ b/server/main.go
@@ -1,5 +1,6 @@
 // Command server is the Nils' MG4 car server: the API the car writes its telemetry,
-// consumption and charging sessions to, stored in InfluxDB 2 and forwarded live to ABRP.
+// consumption and charging sessions to, stored in InfluxDB 2. The car sends live data to ABRP
+// itself.
 // Dashboards are Grafana's job; Grafana reads the same bucket directly.
 package main
 
@@ -11,7 +12,6 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
-	"strconv"
 	"syscall"
 	"time"
 )
@@ -22,33 +22,28 @@ const (
 )
 
 type config struct {
-	listenAddr      string
-	influxURL       string
-	influxToken     string
-	influxOrg       string
-	influxBucket    string
-	ingestToken     string
-	abrpAPIKey      string
-	abrpUserToken   string
-	abrpMinInterval time.Duration
-	approvalPass    string
-	publicURL       string
+	listenAddr   string
+	influxURL    string
+	influxToken  string
+	influxOrg    string
+	influxBucket string
+	ingestToken  string
+	approvalPass string
+	publicURL    string
 }
 
 // loadConfig reads the environment and fails closed: a missing InfluxDB setting or a
 // short ingest token stops the server from starting rather than serving something broken.
 func loadConfig(getenv func(string) string) (config, error) {
 	c := config{
-		listenAddr:    getenv("LISTEN_ADDR"),
-		influxURL:     getenv("INFLUX_URL"),
-		influxToken:   getenv("INFLUX_TOKEN"),
-		influxOrg:     getenv("INFLUX_ORG"),
-		influxBucket:  getenv("INFLUX_BUCKET"),
-		ingestToken:   getenv("INGEST_TOKEN"),
-		abrpAPIKey:    getenv("ABRP_API_KEY"),
-		abrpUserToken: getenv("ABRP_USER_TOKEN"),
-		approvalPass:  getenv("APPROVAL_PASSWORD"),
-		publicURL:     getenv("PUBLIC_URL"),
+		listenAddr:   getenv("LISTEN_ADDR"),
+		influxURL:    getenv("INFLUX_URL"),
+		influxToken:  getenv("INFLUX_TOKEN"),
+		influxOrg:    getenv("INFLUX_ORG"),
+		influxBucket: getenv("INFLUX_BUCKET"),
+		ingestToken:  getenv("INGEST_TOKEN"),
+		approvalPass: getenv("APPROVAL_PASSWORD"),
+		publicURL:    getenv("PUBLIC_URL"),
 	}
 	if c.listenAddr == "" {
 		c.listenAddr = ":8080"
@@ -69,14 +64,6 @@ func loadConfig(getenv func(string) string) (config, error) {
 	if c.approvalPass != "" && len(c.approvalPass) < minApprovalPasswordLength {
 		return config{}, fmt.Errorf("APPROVAL_PASSWORD must be at least %d characters", minApprovalPasswordLength)
 	}
-	c.abrpMinInterval = 5 * time.Second
-	if raw := getenv("ABRP_MIN_INTERVAL_SECONDS"); raw != "" {
-		seconds, err := strconv.ParseFloat(raw, 64)
-		if err != nil || seconds < 0 {
-			return config{}, errors.New("ABRP_MIN_INTERVAL_SECONDS must be a non-negative number")
-		}
-		c.abrpMinInterval = time.Duration(seconds * float64(time.Second))
-	}
 	return c, nil
 }
 
@@ -90,12 +77,6 @@ func main() {
 
 	store := NewInfluxStore(cfg.influxURL, cfg.influxToken, cfg.influxOrg, cfg.influxBucket)
 	defer store.Close()
-	forwarder := &Forwarder{
-		APIKey:      cfg.abrpAPIKey,
-		UserToken:   cfg.abrpUserToken,
-		MinInterval: cfg.abrpMinInterval,
-		Client:      &http.Client{Timeout: 10 * time.Second},
-	}
 	// Paired cars' tokens must be known before the first request; starting without them
 	// would answer every paired car with 401, so a failed load stops the start instead.
 	loadCtx, cancelLoad := context.WithTimeout(context.Background(), 30*time.Second)
@@ -106,8 +87,7 @@ func main() {
 		os.Exit(1)
 	}
 	pairing := NewPairing(cfg.approvalPass, devices)
-	api := &API{Store: store, IngestToken: cfg.ingestToken, Forwarder: forwarder,
-		Pairing: pairing, PublicURL: cfg.publicURL}
+	api := &API{Store: store, IngestToken: cfg.ingestToken, Pairing: pairing, PublicURL: cfg.publicURL}
 
 	srv := &http.Server{
 		Addr:              cfg.listenAddr,
@@ -122,7 +102,7 @@ func main() {
 	defer stop()
 	go func() {
 		slog.Info("listening", "addr", cfg.listenAddr, "bucket", cfg.influxBucket,
-			"abrp", forwarder.configured(), "pairing", pairing.Enabled(), "pairedDevices", len(devices))
+			"pairing", pairing.Enabled(), "pairedDevices", len(devices))
 		if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
 			slog.Error("server failed", "error", err)
 			os.Exit(1)
diff --git a/server/model.go b/server/model.go
index ca94b25..b121c87 100644
--- a/server/model.go
+++ b/server/model.go
@@ -107,7 +107,4 @@ type TelemetryBatch struct {
 	Samples        []TelemetrySample
 	// Dropped names the values and samples validation left out, e.g. "samples[3].speed".
 	Dropped []string
-	// AbrpSentUTC is the newest sample the car delivered to ABRP itself (0: none). The
-	// server forwards only samples newer than that, so ABRP gets each one once.
-	AbrpSentUTC int64
 }
diff --git a/server/validate.go b/server/validate.go
index 4e0cc97..c82cbe3 100644
--- a/server/validate.go
+++ b/server/validate.go
@@ -273,11 +273,6 @@ func validateTelemetryBatch(body []byte, now time.Time) (TelemetryBatch, error)
 		return TelemetryBatch{}, invalid("samples is invalid")
 	}
 	batch := TelemetryBatch{InstallationID: id, Samples: make([]TelemetrySample, 0, len(raw))}
-	if o.has("abrpSentUtc") {
-		if batch.AbrpSentUTC, err = integer(o["abrpSentUtc"], "abrpSentUtc"); err != nil {
-			return TelemetryBatch{}, err
-		}
-	}
 	latest := now.Add(maxClockAhead).Unix()
 	for i, entry := range raw {
 		name := fmt.Sprintf("samples[%d]", i)

From d711e0cfdab3a14ba6b6da9dfc22ea962d598251 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 12:59:03 +0200
Subject: [PATCH 52/79] App 2.12.0, server 2.5.0: enter settings on the phone

The ABRP credentials are long to type on the car. "Enter on phone"
(Live data tab, and Settings next to the charging price) shows a QR
code; it opens a form on the server where the phone sends the ABRP API
key and user token, charging price and usable capacity, confirmed with
the approval password. The car polls with its own token and collects
the values once, then saves them through the same checks as the fields
on screen.

Same device-flow shape as pairing. The server keeps the values in memory
only, at most ten minutes, hands them out once with no-store, and never
logs them or puts them back into the page; a paired token only reaches
its own installation's request. Pairing's QR dialog is now shared
(PhoneQrDialog), and the phone pages share one stylesheet.

The config file also takes charging_price and usable_kwh.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 README.md                                     |  11 +
 SPECS.md                                      |   6 +
 app/build.gradle                              |   4 +-
 .../java/com/evsuite/abrp/ConfigImport.java   |  36 ++-
 .../java/com/evsuite/abrp/MainActivity.java   | 287 ++++++++++++------
 .../com/evsuite/abrp/PhoneSettingsClient.java |  66 ++++
 .../main/res/layout-w1000dp/pane_service.xml  |   1 +
 .../main/res/layout-w1000dp/pane_settings.xml |   2 +
 app/src/main/res/layout/pane_service.xml      |   1 +
 app/src/main/res/layout/pane_settings.xml     |   2 +
 app/src/main/res/values/strings.xml           |  11 +
 .../com/evsuite/abrp/ConfigImportTest.java    |  10 +
 .../evsuite/abrp/PhoneSettingsClientTest.java |  29 ++
 k8s/server.yaml                               |   4 +-
 server/README.md                              |  11 +
 server/api.go                                 |   4 +
 server/api_test.go                            |   2 +-
 server/handoff.go                             | 132 ++++++++
 server/handoff_http.go                        | 240 +++++++++++++++
 server/handoff_test.go                        | 143 +++++++++
 server/main.go                                |   3 +-
 server/pairing_http.go                        |  13 +-
 22 files changed, 918 insertions(+), 100 deletions(-)
 create mode 100644 app/src/main/java/com/evsuite/abrp/PhoneSettingsClient.java
 create mode 100644 app/src/test/java/com/evsuite/abrp/PhoneSettingsClientTest.java
 create mode 100644 server/handoff.go
 create mode 100644 server/handoff_http.go
 create mode 100644 server/handoff_test.go

diff --git a/README.md b/README.md
index 144a6ea..fdf9000 100644
--- a/README.md
+++ b/README.md
@@ -118,6 +118,15 @@ pointed at this repository's releases (see `SPECS.md`).
 4. On the **Live data** tab, turn live data on. The service starts with the car from then on.
 5. Enter your ABRP API key and user token on the same tab, so the car sends live data to ABRP.
 
+### On your phone
+
+Once the car is paired, **Enter on phone** (Live data tab, and Settings → Charging price) shows a
+QR code. It opens a form on your server where you type the ABRP API key and user token, the
+charging price and the usable capacity, and send them with the approval password. The car
+collects them within a few seconds and saves them through the same checks as the fields on
+screen. The server only passes them on: they are held in memory until the car has them (at most
+ten minutes), never stored or logged.
+
 ### Config file
 
 Instead of typing, put the settings in a text file and tap **Import file** on the Server tab.
@@ -140,6 +149,8 @@ boost_low_soc   = true
 low_soc_percent = 20
 abrp_api_key    = your ABRP API key
 abrp_token      = your ABRP user token
+charging_price  = 0.39    # €/kWh
+usable_kwh      = 50.8    # usable battery capacity, for the range estimates
 ```
 
 After a successful import the app deletes the file, since it holds the token; credentials live
diff --git a/SPECS.md b/SPECS.md
index b5ca00b..b2b7357 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -113,6 +113,12 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.12.0, server 2.5.0: settings entered on a phone. "Enter on phone" shows a QR
+  code; the phone form on the server (approval password) takes the ABRP credentials, charging
+  price and usable capacity, and the car collects them once (RFC 8628-style, like pairing; values
+  in server memory only, at most 10 minutes). The config file also takes `charging_price` and
+  `usable_kwh`. The QR dialog is shared with pairing (`PhoneQrDialog`). Tested end to end with
+  curl against the server image and InfluxDB; the app side on the emulator only up to the dialog.
 - 2026-10-18 — App 2.11.1, server 2.4.0: ABRP forwarding removed from the server. The car and the
   server use the same mobile connection, so a server fallback for ABRP bought nothing. The car no
   longer sends `abrpSentUtc`; the server ignores unknown fields, so older apps keep working.
diff --git a/app/build.gradle b/app/build.gradle
index 5cb6663..1ddd708 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 74
-        versionName "2.11.1"
+        versionCode 75
+        versionName "2.12.0"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/ConfigImport.java b/app/src/main/java/com/evsuite/abrp/ConfigImport.java
index 674bac3..414a65e 100644
--- a/app/src/main/java/com/evsuite/abrp/ConfigImport.java
+++ b/app/src/main/java/com/evsuite/abrp/ConfigImport.java
@@ -15,6 +15,8 @@ package com.evsuite.abrp;
  *   low_soc_percent = 20
  *   abrp_api_key    = your-abrp-api-key       (optional: send live data to ABRP directly)
  *   abrp_token      = your-abrp-user-token
+ *   charging_price  = 0.39                    (€/kWh)
+ *   usable_kwh      = 50.8                    (usable battery capacity, for the range estimates)
  * </pre>
  *
  * Usually only server_url and token are needed. installation_id is for a reinstall: it puts
@@ -33,9 +35,12 @@ final class ConfigImport {
     final Integer lowSocPercent;
     final String abrpApiKey;
     final String abrpToken;
+    final Double chargingPrice;
+    final Double usableKwh;
 
     private ConfigImport(String serverUrl, String token, String installationId, Integer intervalSec,
-                         Boolean boostLowSoc, Integer lowSocPercent, String abrpApiKey, String abrpToken) {
+                         Boolean boostLowSoc, Integer lowSocPercent, String abrpApiKey, String abrpToken,
+                         Double chargingPrice, Double usableKwh) {
         this.serverUrl = serverUrl;
         this.token = token;
         this.installationId = installationId;
@@ -44,18 +49,22 @@ final class ConfigImport {
         this.lowSocPercent = lowSocPercent;
         this.abrpApiKey = abrpApiKey;
         this.abrpToken = abrpToken;
+        this.chargingPrice = chargingPrice;
+        this.usableKwh = usableKwh;
     }
 
     /** True when the file yielded nothing usable — an empty or malformed file, not a config. */
     boolean isEmpty() {
         return serverUrl == null && token == null && installationId == null && intervalSec == null
-                && boostLowSoc == null && lowSocPercent == null && abrpApiKey == null && abrpToken == null;
+                && boostLowSoc == null && lowSocPercent == null && abrpApiKey == null && abrpToken == null
+                && chargingPrice == null && usableKwh == null;
     }
 
     static ConfigImport parse(String text) {
         String serverUrl = null, token = null, installationId = null, abrpApiKey = null, abrpToken = null;
         Integer intervalSec = null, lowSocPercent = null;
         Boolean boostLowSoc = null;
+        Double chargingPrice = null, usableKwh = null;
 
         for (String line : text.split("\n", -1)) {
             line = line.trim();
@@ -98,6 +107,14 @@ final class ConfigImport {
                 case "abrp_user_token":
                     abrpToken = value;
                     break;
+                case "charging_price":
+                case "price_per_kwh":
+                    chargingPrice = parseDecimal(value);
+                    break;
+                case "usable_kwh":
+                case "usable_capacity_kwh":
+                    usableKwh = parseDecimal(value);
+                    break;
                 default:
                     // Unknown keys are ignored rather than rejected, so a file can carry
                     // comments or future keys without breaking an older build.
@@ -105,7 +122,7 @@ final class ConfigImport {
             }
         }
         return new ConfigImport(serverUrl, token, installationId, intervalSec, boostLowSoc, lowSocPercent,
-                abrpApiKey, abrpToken);
+                abrpApiKey, abrpToken, chargingPrice, usableKwh);
     }
 
     /** Snaps to the nearest offered choice: the UI spinner has no free-form interval. */
@@ -132,6 +149,19 @@ final class ConfigImport {
         }
     }
 
+    /**
+     * A decimal with a dot or a comma; null when it is not a number. Ranges are checked where
+     * the value is saved, the same as for the fields on screen.
+     */
+    private static Double parseDecimal(String value) {
+        try {
+            double d = Double.parseDouble(value.replace(',', '.'));
+            return Double.isFinite(d) ? d : null;
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+
     private static Boolean parseBool(String value) {
         value = value.toLowerCase(java.util.Locale.US);
         if (value.equals("true") || value.equals("on") || value.equals("1")) return Boolean.TRUE;
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 4e1646d..9372425 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -531,71 +531,8 @@ public class MainActivity extends AppCompatActivity {
         String installationId = ServerConfig.isValidInstallationId(typedId)
                 ? typedId : ServerConfig.get(this).installationId;
 
-        float density = getResources().getDisplayMetrics().density;
-        int pad = (int) (24 * density);
-        // On the head unit's wide, low screen the QR code sits left of the text: stacked, the
-        // code and status below a 240 dp QR code were cut off. Scrollable either way, so
-        // nothing can be clipped on any screen.
-        android.util.DisplayMetrics metrics = getResources().getDisplayMetrics();
-        boolean wide = metrics.widthPixels > metrics.heightPixels;
-        android.widget.LinearLayout panel = new android.widget.LinearLayout(this);
-        panel.setOrientation(wide ? android.widget.LinearLayout.HORIZONTAL : android.widget.LinearLayout.VERTICAL);
-        panel.setGravity(wide ? android.view.Gravity.CENTER_VERTICAL : android.view.Gravity.CENTER_HORIZONTAL);
-        panel.setPadding(pad, pad, pad, pad);
-        android.widget.LinearLayout column = new android.widget.LinearLayout(this);
-        column.setOrientation(android.widget.LinearLayout.VERTICAL);
-        TextView instructions = new TextView(this);
-        instructions.setTextAppearance(R.style.Text_EV_Secondary);
-        ImageView qr = new ImageView(this);
-        qr.setContentDescription(getString(R.string.pair_qr_description));
-        int qrSize = (int) (240 * density);
-        TextView code = new TextView(this);
-        code.setTextAppearance(R.style.Text_EV_Title);
-        code.setTypeface(android.graphics.Typeface.MONOSPACE, android.graphics.Typeface.BOLD);
-        code.setTextSize(36);
-        code.setLetterSpacing(0.15f);
-        code.setTextColor(getColor(R.color.ev_cyan));
-        TextView status = new TextView(this);
-        status.setTextAppearance(R.style.Text_EV_Body);
-        status.setText(R.string.pair_starting);
-        android.widget.LinearLayout.LayoutParams qrParams = new android.widget.LinearLayout.LayoutParams(qrSize, qrSize);
-        android.widget.LinearLayout.LayoutParams columnParams;
-        if (wide) {
-            qrParams.rightMargin = pad;
-            columnParams = new android.widget.LinearLayout.LayoutParams(
-                    0, android.view.ViewGroup.LayoutParams.WRAP_CONTENT, 1f);
-            panel.addView(qr, qrParams);
-            panel.addView(column, columnParams);
-            column.addView(instructions);
-        } else {
-            qrParams.topMargin = pad / 2;
-            qrParams.bottomMargin = pad / 2;
-            columnParams = new android.widget.LinearLayout.LayoutParams(
-                    android.view.ViewGroup.LayoutParams.MATCH_PARENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT);
-            panel.addView(instructions);
-            panel.addView(qr, qrParams);
-            panel.addView(column, columnParams);
-        }
-        android.widget.LinearLayout.LayoutParams codeParams = new android.widget.LinearLayout.LayoutParams(
-                android.view.ViewGroup.LayoutParams.WRAP_CONTENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT);
-        codeParams.topMargin = pad / 2;
-        codeParams.bottomMargin = pad / 2;
-        column.addView(code, codeParams);
-        column.addView(status);
-        android.widget.ScrollView scroll = new android.widget.ScrollView(this);
-        scroll.addView(panel);
-
-        final boolean[] cancelled = {false};
-        androidx.appcompat.app.AlertDialog dialog = new MaterialAlertDialogBuilder(this)
-                .setTitle(R.string.pair_title)
-                .setView(scroll)
-                .setNegativeButton(R.string.pair_cancel, null)
-                .create();
-        // Shown only once the server has answered, so a failure leaves no empty QR frame.
-        qr.setVisibility(View.GONE);
-        code.setVisibility(View.GONE);
-        dialog.setOnDismissListener(d -> cancelled[0] = true);
-        dialog.show();
+        PhoneQrDialog ui = new PhoneQrDialog(R.string.pair_title, R.string.pair_starting);
+        final boolean[] cancelled = ui.cancelled;
 
         new Thread(() -> {
             String outcome;
@@ -603,18 +540,7 @@ public class MainActivity extends AppCompatActivity {
             try {
                 PairingClient.Request request = PairingClient.start(url, installationId);
                 android.graphics.Bitmap bitmap = QrCode.generate(request.verificationUriComplete, 416);
-                runOnUiThread(() -> {
-                    // The code is in the sentence as well as below it, so it is readable
-                    // wherever the text is.
-                    instructions.setText(getString(R.string.pair_scan, request.verificationUri, request.userCode));
-                    if (bitmap != null) {
-                        qr.setImageBitmap(bitmap);
-                        qr.setVisibility(View.VISIBLE);
-                    }
-                    code.setText(request.userCode);
-                    code.setVisibility(View.VISIBLE);
-                    status.setText(R.string.pair_waiting);
-                });
+                runOnUiThread(() -> ui.showRequest(request, bitmap, R.string.pair_scan, R.string.pair_waiting));
                 PairingClient.PollResult result = null;
                 while (!cancelled[0] && System.currentTimeMillis() < request.expiresAtMs) {
                     Thread.sleep(request.intervalMs);
@@ -655,23 +581,201 @@ public class MainActivity extends AppCompatActivity {
                     showServerConfig();
                     serverTokenLayout.setError(null);
                     refreshStatus();
-                    if (!cancelled[0]) dialog.dismiss();
+                    if (!cancelled[0]) ui.dialog.dismiss();
                     return;
                 }
-                if (cancelled[0]) return;
                 // Keep the dialog up with the reason, instead of closing it on a failure the
                 // driver would otherwise only see as a flicker.
-                qr.setVisibility(View.GONE);
-                code.setVisibility(View.GONE);
-                instructions.setVisibility(View.GONE);
-                status.setText(message);
-                status.setTextColor(c);
-                android.widget.Button close = dialog.getButton(android.content.DialogInterface.BUTTON_NEGATIVE);
-                if (close != null) close.setText(R.string.pair_close);
+                if (!cancelled[0]) ui.finish(message, c);
             });
         }, "server-pairing").start();
     }
 
+    /**
+     * Settings typed on a phone instead of the car's keyboard: the server opens a request for
+     * this car, the dialog shows it as a QR code, and the values the phone sends (ABRP
+     * credentials, charging price, usable capacity) are applied through the same checks as the
+     * fields here. Needs the server set up, since the request is made with this car's token.
+     */
+    private void startPhoneSettings() {
+        ServerConfig config = ServerConfig.get(this);
+        PhoneQrDialog ui = new PhoneQrDialog(R.string.phone_settings_title, R.string.pair_starting);
+        if (!config.isConfigured()) {
+            ui.finish(getString(R.string.phone_settings_needs_server), COLOR_ERROR);
+            return;
+        }
+        new Thread(() -> {
+            String outcome;
+            int color = COLOR_ERROR;
+            PhoneSettingsClient.Settings received = null;
+            try {
+                PairingClient.Request request = PhoneSettingsClient.start(config);
+                android.graphics.Bitmap bitmap = QrCode.generate(request.verificationUriComplete, 416);
+                runOnUiThread(() -> ui.showRequest(request, bitmap, R.string.phone_settings_scan,
+                        R.string.phone_settings_waiting));
+                while (!ui.cancelled[0] && System.currentTimeMillis() < request.expiresAtMs) {
+                    Thread.sleep(request.intervalMs);
+                    if (ui.cancelled[0]) return;
+                    try {
+                        received = PhoneSettingsClient.poll(config, request.deviceCode);
+                    } catch (java.io.IOException e) {
+                        continue; // a dropped connection mid-wait is not a failure
+                    }
+                    if (received != null) break;
+                }
+                if (ui.cancelled[0]) return;
+                outcome = received == null ? getString(R.string.pair_expired_settings) : null;
+            } catch (PairingClient.NotEnabledException e) {
+                outcome = getString(R.string.phone_settings_not_enabled);
+            } catch (PairingClient.HttpStatusException e) {
+                outcome = e.status == 410 ? getString(R.string.pair_expired_settings)
+                        : getString(R.string.err_http, e.status);
+            } catch (InterruptedException e) {
+                return;
+            } catch (Exception e) {
+                outcome = describeNetworkError(e, config.url);
+            }
+            final PhoneSettingsClient.Settings settings = received;
+            final String failure = outcome;
+            runOnUiThread(() -> {
+                if (ui.cancelled[0]) return;
+                if (settings == null) {
+                    ui.finish(failure, COLOR_ERROR);
+                    return;
+                }
+                String applied = applyPhoneSettings(settings);
+                ui.finish(applied, applied.equals(getString(R.string.phone_settings_applied)) ? COLOR_OK : COLOR_ERROR);
+            });
+        }, "phone-settings").start();
+    }
+
+    /**
+     * Puts what the phone sent into the fields and saves each through its own Save, so the
+     * same limits apply as when typed here. A credential sent alone is paired with the one
+     * already stored. Returns the message for the dialog. UI thread.
+     */
+    private String applyPhoneSettings(PhoneSettingsClient.Settings s) {
+        boolean ok = true;
+        if (s.abrpApiKey != null || s.abrpToken != null) {
+            AbrpConfig current = AbrpConfig.get(this);
+            ok &= saveAbrpConfig(s.abrpApiKey != null ? s.abrpApiKey : current.apiKey,
+                    s.abrpToken != null ? s.abrpToken : current.userToken);
+        }
+        if (s.pricePerKwh != null) {
+            chargePriceInput.setText(String.format(java.util.Locale.US, "%.2f", s.pricePerKwh));
+            saveChargePrice();
+            ok &= chargePriceLayout.getError() == null;
+        }
+        if (s.usableKwh != null) {
+            usableCapacityInput.setText(String.format(java.util.Locale.US, "%.1f", s.usableKwh));
+            saveUsableCapacity();
+            ok &= usableCapacityLayout.getError() == null;
+        }
+        return getString(ok ? R.string.phone_settings_applied : R.string.phone_settings_partly);
+    }
+
+    /**
+     * The dialog of both phone flows (pairing, settings): a QR code beside the code to type
+     * and a status line. The QR code and code stay hidden until the server has answered.
+     */
+    private final class PhoneQrDialog {
+        final TextView instructions, code, status;
+        final ImageView qr;
+        final androidx.appcompat.app.AlertDialog dialog;
+        /** Set when the driver closes the dialog; the polling thread then stops. */
+        final boolean[] cancelled = {false};
+
+        PhoneQrDialog(int title, int startingText) {
+            float density = getResources().getDisplayMetrics().density;
+            int pad = (int) (24 * density);
+            // On the head unit's wide, low screen the QR code sits left of the text: stacked, the
+            // code and status below a 240 dp QR code were cut off. Scrollable either way, so
+            // nothing can be clipped on any screen.
+            android.util.DisplayMetrics metrics = getResources().getDisplayMetrics();
+            boolean wide = metrics.widthPixels > metrics.heightPixels;
+            android.widget.LinearLayout panel = new android.widget.LinearLayout(MainActivity.this);
+            panel.setOrientation(wide ? android.widget.LinearLayout.HORIZONTAL : android.widget.LinearLayout.VERTICAL);
+            panel.setGravity(wide ? android.view.Gravity.CENTER_VERTICAL : android.view.Gravity.CENTER_HORIZONTAL);
+            panel.setPadding(pad, pad, pad, pad);
+            android.widget.LinearLayout column = new android.widget.LinearLayout(MainActivity.this);
+            column.setOrientation(android.widget.LinearLayout.VERTICAL);
+            instructions = new TextView(MainActivity.this);
+            instructions.setTextAppearance(R.style.Text_EV_Secondary);
+            qr = new ImageView(MainActivity.this);
+            qr.setContentDescription(getString(R.string.pair_qr_description));
+            int qrSize = (int) (240 * density);
+            code = new TextView(MainActivity.this);
+            code.setTextAppearance(R.style.Text_EV_Title);
+            code.setTypeface(android.graphics.Typeface.MONOSPACE, android.graphics.Typeface.BOLD);
+            code.setTextSize(36);
+            code.setLetterSpacing(0.15f);
+            code.setTextColor(getColor(R.color.ev_cyan));
+            status = new TextView(MainActivity.this);
+            status.setTextAppearance(R.style.Text_EV_Body);
+            status.setText(startingText);
+            android.widget.LinearLayout.LayoutParams qrParams = new android.widget.LinearLayout.LayoutParams(qrSize, qrSize);
+            android.widget.LinearLayout.LayoutParams columnParams;
+            if (wide) {
+                qrParams.rightMargin = pad;
+                columnParams = new android.widget.LinearLayout.LayoutParams(
+                        0, android.view.ViewGroup.LayoutParams.WRAP_CONTENT, 1f);
+                panel.addView(qr, qrParams);
+                panel.addView(column, columnParams);
+                column.addView(instructions);
+            } else {
+                qrParams.topMargin = pad / 2;
+                qrParams.bottomMargin = pad / 2;
+                columnParams = new android.widget.LinearLayout.LayoutParams(
+                        android.view.ViewGroup.LayoutParams.MATCH_PARENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT);
+                panel.addView(instructions);
+                panel.addView(qr, qrParams);
+                panel.addView(column, columnParams);
+            }
+            android.widget.LinearLayout.LayoutParams codeParams = new android.widget.LinearLayout.LayoutParams(
+                    android.view.ViewGroup.LayoutParams.WRAP_CONTENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT);
+            codeParams.topMargin = pad / 2;
+            codeParams.bottomMargin = pad / 2;
+            column.addView(code, codeParams);
+            column.addView(status);
+            android.widget.ScrollView scroll = new android.widget.ScrollView(MainActivity.this);
+            scroll.addView(panel);
+
+            dialog = new MaterialAlertDialogBuilder(MainActivity.this)
+                    .setTitle(title)
+                    .setView(scroll)
+                    .setNegativeButton(R.string.pair_cancel, null)
+                    .create();
+            // Shown only once the server has answered, so a failure leaves no empty QR frame.
+            qr.setVisibility(View.GONE);
+            code.setVisibility(View.GONE);
+            dialog.setOnDismissListener(d -> cancelled[0] = true);
+            dialog.show();
+        }
+
+        /** Shows the request: QR code, the code in the sentence and below it. UI thread. */
+        void showRequest(PairingClient.Request request, android.graphics.Bitmap bitmap, int scanText, int waitingText) {
+            instructions.setText(getString(scanText, request.verificationUri, request.userCode));
+            if (bitmap != null) {
+                qr.setImageBitmap(bitmap);
+                qr.setVisibility(View.VISIBLE);
+            }
+            code.setText(request.userCode);
+            code.setVisibility(View.VISIBLE);
+            status.setText(waitingText);
+        }
+
+        /** Keeps the dialog up with the outcome instead of closing it. UI thread. */
+        void finish(String message, int color) {
+            qr.setVisibility(View.GONE);
+            code.setVisibility(View.GONE);
+            instructions.setVisibility(View.GONE);
+            status.setText(message);
+            status.setTextColor(color);
+            android.widget.Button close = dialog.getButton(android.content.DialogInterface.BUTTON_NEGATIVE);
+            if (close != null) close.setText(R.string.pair_close);
+        }
+    }
+
     /**
      * A network failure in words the driver can act on: a name that does not resolve, a
      * server that does not answer, or a status. Shared by Test connection and pairing.
@@ -845,6 +949,15 @@ public class MainActivity extends AppCompatActivity {
                 return false;
             }
         }
+        if (config.chargingPrice != null || config.usableKwh != null) {
+            // Through the same Save as the fields (and the phone form), with the same limits.
+            String applied = applyPhoneSettings(new PhoneSettingsClient.Settings(
+                    null, null, config.chargingPrice, config.usableKwh));
+            if (!applied.equals(getString(R.string.phone_settings_applied))) {
+                setConnectionStatus(COLOR_ERROR, getString(R.string.import_err_values));
+                return false;
+            }
+        }
         SharedPreferences.Editor edit = prefs.edit();
         if (config.intervalSec != null) edit.putInt(UploadSettings.KEY_INTERVAL_SEC, config.intervalSec);
         if (config.boostLowSoc != null) edit.putBoolean(UploadSettings.KEY_BOOST_LOW_SOC, config.boostLowSoc);
@@ -898,6 +1011,7 @@ public class MainActivity extends AppCompatActivity {
         servicePane.findViewById(R.id.abrp_save_button).setOnClickListener(v ->
                 saveAbrpConfig(text(abrpApiKeyInput), text(abrpTokenInput)));
         servicePane.findViewById(R.id.abrp_test_button).setOnClickListener(v -> testAbrpConfig());
+        servicePane.findViewById(R.id.abrp_phone_button).setOnClickListener(v -> startPhoneSettings());
     }
 
     private static String text(TextInputEditText input) {
@@ -1266,6 +1380,7 @@ public class MainActivity extends AppCompatActivity {
         chargePriceInput.setText(String.format(java.util.Locale.US, "%.2f",
                 chargeSessionTracker.pricePerKwh()));
         settingsPane.findViewById(R.id.charge_price_save).setOnClickListener(v -> saveChargePrice());
+        settingsPane.findViewById(R.id.settings_phone_button).setOnClickListener(v -> startPhoneSettings());
     }
 
     private void saveChargePrice() {
diff --git a/app/src/main/java/com/evsuite/abrp/PhoneSettingsClient.java b/app/src/main/java/com/evsuite/abrp/PhoneSettingsClient.java
new file mode 100644
index 0000000..f7eec56
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/PhoneSettingsClient.java
@@ -0,0 +1,66 @@
+package com.evsuite.abrp;
+
+import org.json.JSONObject;
+
+/**
+ * The car's side of entering settings on a phone: open a request on the server (with this
+ * car's token), show it as a QR code, then poll until the phone has sent the values, which
+ * the server hands out once. Same codes and QR flow as pairing ({@link PairingClient}).
+ * Blocking calls — run them off the main thread.
+ */
+final class PhoneSettingsClient {
+
+    /** What the phone sent; null fields were left empty there. */
+    static final class Settings {
+        final String abrpApiKey;
+        final String abrpToken;
+        final Double pricePerKwh;
+        final Double usableKwh;
+
+        Settings(String abrpApiKey, String abrpToken, Double pricePerKwh, Double usableKwh) {
+            this.abrpApiKey = abrpApiKey;
+            this.abrpToken = abrpToken;
+            this.pricePerKwh = pricePerKwh;
+            this.usableKwh = usableKwh;
+        }
+
+        static Settings parse(String body) throws Exception {
+            JSONObject json = new JSONObject(body);
+            return new Settings(text(json, "abrpApiKey"), text(json, "abrpToken"),
+                    json.has("pricePerKwh") ? json.getDouble("pricePerKwh") : null,
+                    json.has("usableKwh") ? json.getDouble("usableKwh") : null);
+        }
+
+        private static String text(JSONObject json, String key) {
+            String value = json.optString(key, "").trim();
+            return value.isEmpty() ? null : value;
+        }
+    }
+
+    private PhoneSettingsClient() { }
+
+    static PairingClient.Request start(ServerConfig config) throws Exception {
+        ServerHttp.Response r = ServerHttp.request("POST", config.url + "/v1/settings/start", config.token,
+                new JSONObject().put("installationId", config.installationId));
+        if (r.status == 404) throw new PairingClient.NotEnabledException();
+        if (r.status != 201) throw new PairingClient.HttpStatusException(r.status);
+        JSONObject json = new JSONObject(r.body);
+        long now = System.currentTimeMillis();
+        return new PairingClient.Request(
+                json.getString("deviceCode"),
+                json.getString("userCode"),
+                json.getString("verificationUri"),
+                json.getString("verificationUriComplete"),
+                now + json.optLong("expiresIn", 600) * 1000L,
+                Math.max(2, json.optLong("interval", 5)) * 1000L);
+    }
+
+    /** Null while the phone has not sent anything; throws once the request has expired (410). */
+    static Settings poll(ServerConfig config, String deviceCode) throws Exception {
+        ServerHttp.Response r = ServerHttp.request("POST", config.url + "/v1/settings/poll", config.token,
+                new JSONObject().put("deviceCode", deviceCode));
+        if (r.status == 202) return null;
+        if (r.status == 200) return Settings.parse(r.body);
+        throw new PairingClient.HttpStatusException(r.status);
+    }
+}
diff --git a/app/src/main/res/layout-w1000dp/pane_service.xml b/app/src/main/res/layout-w1000dp/pane_service.xml
index 8a580dd..c4dee5b 100644
--- a/app/src/main/res/layout-w1000dp/pane_service.xml
+++ b/app/src/main/res/layout-w1000dp/pane_service.xml
@@ -19,6 +19,7 @@
                 </com.google.android.material.textfield.TextInputLayout>
                 <com.google.android.material.button.MaterialButton android:id="@+id/abrp_save_button" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_save" android:layout_marginTop="20dp" />
                 <com.google.android.material.button.MaterialButton android:id="@+id/abrp_test_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_test" android:layout_marginTop="8dp" />
+                <com.google.android.material.button.MaterialButton android:id="@+id/abrp_phone_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_phone_settings" android:layout_marginTop="8dp" />
                 <TextView android:id="@+id/abrp_status_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:textAppearance="@style/Text.EV.Body" />
             </LinearLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout-w1000dp/pane_settings.xml b/app/src/main/res/layout-w1000dp/pane_settings.xml
index 22cf8de..0732e99 100644
--- a/app/src/main/res/layout-w1000dp/pane_settings.xml
+++ b/app/src/main/res/layout-w1000dp/pane_settings.xml
@@ -28,6 +28,8 @@
                     <com.google.android.material.textfield.TextInputEditText android:id="@+id/charge_price_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="10" android:minHeight="72dp"/>
                 </com.google.android.material.textfield.TextInputLayout>
                 <com.google.android.material.button.MaterialButton android:id="@+id/charge_price_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="Save price"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/settings_phone_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_phone_settings" android:layout_marginTop="8dp" />
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/hint_phone_settings" android:textAppearance="@style/Text.EV.Secondary" />
             </LinearLayout>
         </LinearLayout>
         <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical">
diff --git a/app/src/main/res/layout/pane_service.xml b/app/src/main/res/layout/pane_service.xml
index 8904c1c..d1b1d05 100644
--- a/app/src/main/res/layout/pane_service.xml
+++ b/app/src/main/res/layout/pane_service.xml
@@ -18,6 +18,7 @@
             </com.google.android.material.textfield.TextInputLayout>
             <com.google.android.material.button.MaterialButton android:id="@+id/abrp_save_button" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_save" android:layout_marginTop="20dp" />
             <com.google.android.material.button.MaterialButton android:id="@+id/abrp_test_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_test" android:layout_marginTop="8dp" />
+            <com.google.android.material.button.MaterialButton android:id="@+id/abrp_phone_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_phone_settings" android:layout_marginTop="8dp" />
             <TextView android:id="@+id/abrp_status_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:textAppearance="@style/Text.EV.Body" />
         </LinearLayout>
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
diff --git a/app/src/main/res/layout/pane_settings.xml b/app/src/main/res/layout/pane_settings.xml
index 155fcab..4d17a49 100644
--- a/app/src/main/res/layout/pane_settings.xml
+++ b/app/src/main/res/layout/pane_settings.xml
@@ -27,6 +27,8 @@
                 <com.google.android.material.textfield.TextInputEditText android:id="@+id/charge_price_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="10" android:minHeight="72dp"/>
             </com.google.android.material.textfield.TextInputLayout>
             <com.google.android.material.button.MaterialButton android:id="@+id/charge_price_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="Save price"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/settings_phone_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_phone_settings" android:layout_marginTop="8dp" />
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/hint_phone_settings" android:textAppearance="@style/Text.EV.Secondary" />
         </LinearLayout>
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_card_title" android:textAppearance="@style/Text.EV.Eyebrow" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e365d13..e75f2cf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -100,6 +100,7 @@
     <string name="import_ok_deleted">Config imported and saved; the file was deleted</string>
     <string name="import_ok_not_deleted">Config imported and saved, but the file could not be deleted. It holds your token: delete %1$s</string>
     <string name="import_err_read">Could not read that file</string>
+    <string name="import_err_values">The charging price or usable capacity in the file is not plausible</string>
     <string name="import_err_empty">No settings found in that file</string>
     <string name="import_err_not_found">No config file found. Copy it to %1$s</string>
 
@@ -134,6 +135,16 @@
     <string name="abrp_test_failed">ABRP refused: HTTP %1$d</string>
     <string name="abrp_test_offline">ABRP not reachable: %1$s</string>
     <string name="abrp_not_set">Set both first</string>
+    <string name="btn_phone_settings">Enter on phone</string>
+    <string name="hint_phone_settings">Type the ABRP credentials, charging price and usable capacity on your phone instead: a QR code opens a form on your server.</string>
+    <string name="phone_settings_title">Enter settings on your phone</string>
+    <string name="phone_settings_scan">Scan the QR code with your phone, or open %1$s and enter the code %2$s. Fill in what you want to change and send it with the approval password.</string>
+    <string name="phone_settings_waiting">Waiting for the phone…</string>
+    <string name="phone_settings_needs_server">Set up the server first (Server tab): the form for the phone runs on your server.</string>
+    <string name="phone_settings_not_enabled">Not available on the server: it needs version 2.5.0 or newer and an APPROVAL_PASSWORD</string>
+    <string name="pair_expired_settings">The code expired — press Enter on phone again</string>
+    <string name="phone_settings_applied">Settings from the phone saved</string>
+    <string name="phone_settings_partly">Some values from the phone were not plausible and were not saved</string>
 
 
     <!-- Cadence configuration -->
diff --git a/app/src/test/java/com/evsuite/abrp/ConfigImportTest.java b/app/src/test/java/com/evsuite/abrp/ConfigImportTest.java
index 5144111..058ab62 100644
--- a/app/src/test/java/com/evsuite/abrp/ConfigImportTest.java
+++ b/app/src/test/java/com/evsuite/abrp/ConfigImportTest.java
@@ -96,4 +96,14 @@ public class ConfigImportTest {
         assertFalse(c.isEmpty());
         assertEquals("token-2", ConfigImport.parse("abrp_user_token = token-2").abrpToken);
     }
+
+    @Test
+    public void chargingPriceAndUsableCapacityAreRead() {
+        ConfigImport c = ConfigImport.parse("charging_price = 0,39\nusable_kwh = 50.8\n");
+        assertEquals(0.39, c.chargingPrice, 1e-9);
+        assertEquals(50.8, c.usableKwh, 1e-9);
+        assertFalse(c.isEmpty());
+        assertNull(ConfigImport.parse("charging_price = cheap").chargingPrice);
+        assertEquals(0.5, ConfigImport.parse("price_per_kwh = 0.5").chargingPrice, 1e-9);
+    }
 }
diff --git a/app/src/test/java/com/evsuite/abrp/PhoneSettingsClientTest.java b/app/src/test/java/com/evsuite/abrp/PhoneSettingsClientTest.java
new file mode 100644
index 0000000..761d5e5
--- /dev/null
+++ b/app/src/test/java/com/evsuite/abrp/PhoneSettingsClientTest.java
@@ -0,0 +1,29 @@
+package com.evsuite.abrp;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Test;
+
+/** Reading what the phone sent, as the server hands it out — pure JVM. */
+public class PhoneSettingsClientTest {
+
+    @Test
+    public void everythingTheServerSends() throws Exception {
+        PhoneSettingsClient.Settings s = PhoneSettingsClient.Settings.parse(
+                "{\"abrpApiKey\":\"api-key-1234\",\"abrpToken\":\" user-token-5678 \",\"pricePerKwh\":0.39,\"usableKwh\":50.8}");
+        assertEquals("api-key-1234", s.abrpApiKey);
+        assertEquals("user-token-5678", s.abrpToken);
+        assertEquals(0.39, s.pricePerKwh, 1e-9);
+        assertEquals(50.8, s.usableKwh, 1e-9);
+    }
+
+    @Test
+    public void whatThePhoneLeftEmptyStaysUnset() throws Exception {
+        PhoneSettingsClient.Settings s = PhoneSettingsClient.Settings.parse("{\"abrpToken\":\"user-token-5678\"}");
+        assertNull(s.abrpApiKey);
+        assertNull(s.pricePerKwh);
+        assertNull(s.usableKwh);
+        assertEquals("user-token-5678", s.abrpToken);
+    }
+}
diff --git a/k8s/server.yaml b/k8s/server.yaml
index aaf17df..b848271 100644
--- a/k8s/server.yaml
+++ b/k8s/server.yaml
@@ -29,8 +29,8 @@ spec:
           type: RuntimeDefault
       containers:
         - name: server
-          # 2.4.0, pinned by digest so a re-pushed tag cannot change what runs.
-          image: git.stinnesbeck.com/nils/mg4-server@sha256:ab243f37812efa7294efc594f65ca65f9d551161a85e7cc641afb168e226a2fe
+          # 2.5.0, pinned by digest so a re-pushed tag cannot change what runs.
+          image: git.stinnesbeck.com/nils/mg4-server@sha256:93b82b24a649c7b8b6fb7c0d4ef0bfda5694689808991a211e22ddeb257a39e2
           ports:
             - name: http
               containerPort: 8080
diff --git a/server/README.md b/server/README.md
index b6fa69f..5eecc00 100644
--- a/server/README.md
+++ b/server/README.md
@@ -43,6 +43,17 @@ with (403 otherwise); the shared token works for any.
 
 A malformed request is a 400 naming the field; a database failure is a 500 without detail.
 
+## Settings from a phone
+
+The ABRP credentials are long to type on the car. With pairing on, the car (with its own token)
+opens `POST /v1/settings/start` `{installationId}` and shows `verificationUriComplete` as a QR
+code. The phone fills in the form at `/settings?code=…` (ABRP API key and user token, charging
+price, usable capacity; empty fields are left alone) and sends it with the approval password.
+The car polls `POST /v1/settings/poll` `{deviceCode}`: 202 pending, 200 with the values (handed
+out once, `Cache-Control: no-store`), 410 expired or unknown. A paired token only reaches its own
+installation's request. The values live in memory only, at most ten minutes, and are never
+stored, logged or put back into the page.
+
 ## Pairing a car by QR code
 
 So nobody types a token in the car. Modelled on the OAuth device authorization grant (RFC 8628);
diff --git a/server/api.go b/server/api.go
index 5d8b660..0fcdf89 100644
--- a/server/api.go
+++ b/server/api.go
@@ -18,6 +18,7 @@ import (
 //	PUT  /v1/charging-sessions/{sessionId}       one finished DC charging session
 //	GET  /v1/consumption/history/{installationId} the car reads its own totals back
 //	GET  /v1/health                              unauthenticated liveness probe
+//	     /v1/settings/…, /settings                settings typed on a phone (handoff_http.go)
 //
 // A car authenticates with the shared INGEST_TOKEN or with its own token from pairing
 // (pairing_http.go).
@@ -25,6 +26,8 @@ type API struct {
 	Store       Store
 	IngestToken string
 	Pairing     *Pairing
+	// Handoff carries settings typed on a phone to the car (handoff.go).
+	Handoff *Handoff
 	// PublicURL is the server's address as a phone reaches it, for the pairing QR code;
 	// derived from the request when empty.
 	PublicURL string
@@ -42,6 +45,7 @@ func (a *API) Routes() http.Handler {
 	mux.HandleFunc("PUT /v1/charging-sessions/{sessionId}", a.ingest(a.chargingSession))
 	mux.HandleFunc("GET /v1/consumption/history/{installationId}", a.ingest(a.history))
 	a.pairingRoutes(mux)
+	a.handoffRoutes(mux)
 	return mux
 }
 
diff --git a/server/api_test.go b/server/api_test.go
index 7007992..fb53862 100644
--- a/server/api_test.go
+++ b/server/api_test.go
@@ -77,7 +77,7 @@ const (
 func newTestAPI() (*API, *fakeStore) {
 	store := &fakeStore{}
 	return &API{Store: store, IngestToken: testToken,
-		Pairing: NewPairing(testApprovalPassword, nil), PublicURL: "https://car.example.com"}, store
+		Pairing: NewPairing(testApprovalPassword, nil), Handoff: NewHandoff(), PublicURL: "https://car.example.com"}, store
 }
 
 func do(t *testing.T, h http.Handler, method, path, token, body string) *httptest.ResponseRecorder {
diff --git a/server/handoff.go b/server/handoff.go
new file mode 100644
index 0000000..9ea46aa
--- /dev/null
+++ b/server/handoff.go
@@ -0,0 +1,132 @@
+package main
+
+import (
+	"errors"
+	"strings"
+	"sync"
+	"time"
+)
+
+// Handoff lets a phone fill in settings the car would otherwise need its on-screen keyboard
+// for: the ABRP credentials above all, which are long. The car opens a request and shows it as
+// a QR code, the phone fills in a form (with the approval password), and the car, polling,
+// collects the values once.
+//
+// The values only pass through: they are held in memory until the car collects them, or for
+// the request's ten minutes, and are never stored, logged or echoed back to the page.
+type Handoff struct {
+	Now func() time.Time
+
+	mu       sync.Mutex
+	byDevice map[string]*handoffRequest
+	byUser   map[string]*handoffRequest
+}
+
+// maxPendingHandoffs bounds memory; only an authenticated car can open one.
+const maxPendingHandoffs = 200
+
+// PhoneSettings is what the phone may set. A nil or empty field leaves the car's value alone.
+type PhoneSettings struct {
+	AbrpAPIKey  string   `json:"abrpApiKey,omitempty"`
+	AbrpToken   string   `json:"abrpToken,omitempty"`
+	PricePerKwh *float64 `json:"pricePerKwh,omitempty"`
+	UsableKwh   *float64 `json:"usableKwh,omitempty"`
+}
+
+func (s PhoneSettings) empty() bool {
+	return s.AbrpAPIKey == "" && s.AbrpToken == "" && s.PricePerKwh == nil && s.UsableKwh == nil
+}
+
+type handoffRequest struct {
+	deviceCode     string
+	userCode       string
+	installationID string
+	expires        time.Time
+	settings       *PhoneSettings // set by the phone, handed to the car once
+}
+
+var errAlreadyFilled = errors.New("these settings were already sent")
+
+func NewHandoff() *Handoff {
+	return &Handoff{Now: time.Now, byDevice: map[string]*handoffRequest{}, byUser: map[string]*handoffRequest{}}
+}
+
+func (h *Handoff) expireLocked(now time.Time) {
+	for code, r := range h.byDevice {
+		if now.After(r.expires) {
+			delete(h.byDevice, code)
+			delete(h.byUser, r.userCode)
+		}
+	}
+}
+
+// Start opens a request for a car; a new one replaces the same installation's open request.
+func (h *Handoff) Start(installationID string) (*handoffRequest, error) {
+	h.mu.Lock()
+	defer h.mu.Unlock()
+	now := h.Now()
+	h.expireLocked(now)
+	for _, r := range h.byDevice {
+		if strings.EqualFold(r.installationID, installationID) {
+			delete(h.byDevice, r.deviceCode)
+			delete(h.byUser, r.userCode)
+		}
+	}
+	if len(h.byDevice) >= maxPendingHandoffs {
+		return nil, errTooMany
+	}
+	r := &handoffRequest{deviceCode: randomString(32), installationID: installationID, expires: now.Add(pairingTTL)}
+	for {
+		r.userCode = newUserCode()
+		if _, taken := h.byUser[r.userCode]; !taken {
+			break
+		}
+	}
+	h.byDevice[r.deviceCode] = r
+	h.byUser[r.userCode] = r
+	out := *r
+	return &out, nil
+}
+
+// Open reports whether a user code belongs to a request still waiting for the phone.
+func (h *Handoff) Open(userCode string) bool {
+	h.mu.Lock()
+	defer h.mu.Unlock()
+	h.expireLocked(h.Now())
+	r, ok := h.byUser[normalizeUserCode(userCode)]
+	return ok && r.settings == nil
+}
+
+// Fill stores what the phone entered, once.
+func (h *Handoff) Fill(userCode string, s PhoneSettings) error {
+	h.mu.Lock()
+	defer h.mu.Unlock()
+	h.expireLocked(h.Now())
+	r, ok := h.byUser[normalizeUserCode(userCode)]
+	if !ok {
+		return errUnknownCode
+	}
+	if r.settings != nil {
+		return errAlreadyFilled
+	}
+	r.settings = &s
+	return nil
+}
+
+// Poll is the car's side: nil while the phone has not sent anything, the settings exactly
+// once, then errUnknownCode. installationID must be the one the request was opened for.
+func (h *Handoff) Poll(deviceCode string, mayUse func(installationID string) bool) (*PhoneSettings, error) {
+	h.mu.Lock()
+	defer h.mu.Unlock()
+	h.expireLocked(h.Now())
+	r, ok := h.byDevice[deviceCode]
+	if !ok || !mayUse(r.installationID) {
+		return nil, errUnknownCode
+	}
+	if r.settings == nil {
+		return nil, nil
+	}
+	delete(h.byDevice, r.deviceCode)
+	delete(h.byUser, r.userCode)
+	return r.settings, nil
+}
diff --git a/server/handoff_http.go b/server/handoff_http.go
new file mode 100644
index 0000000..cfc8a76
--- /dev/null
+++ b/server/handoff_http.go
@@ -0,0 +1,240 @@
+package main
+
+import (
+	"errors"
+	"html/template"
+	"log/slog"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// HTTP side of entering settings on the phone (handoff.go).
+//
+//	POST /v1/settings/start   car, with its token: open a request   {installationId} → codes and URL
+//	POST /v1/settings/poll    car, with its token: collect          {deviceCode} → 202 / 200 settings / 410
+//	GET  /settings?code=…     phone: the form
+//	POST /settings            phone: send it (needs the approval password)
+//
+// Switched on together with pairing, by APPROVAL_PASSWORD: the phone page needs it.
+
+func (a *API) handoffRoutes(mux *http.ServeMux) {
+	mux.HandleFunc("POST /v1/settings/start", a.ingest(a.settingsStart))
+	mux.HandleFunc("POST /v1/settings/poll", a.ingest(a.settingsPoll))
+	mux.HandleFunc("GET /settings", a.settingsPage)
+	mux.HandleFunc("POST /settings", a.settingsSubmit)
+}
+
+func (a *API) handoffEnabled() bool { return a.Handoff != nil && a.Pairing.Enabled() }
+
+var errHandoffOff = errors.New("entering settings on the phone is not enabled")
+
+func (a *API) settingsStart(w http.ResponseWriter, r *http.Request, c caller, body []byte) error {
+	if !a.handoffEnabled() {
+		writeJSON(w, http.StatusNotFound, map[string]string{"error": errHandoffOff.Error()})
+		return nil
+	}
+	o, err := decodeObject(body)
+	if err != nil {
+		return err
+	}
+	id, err := validUUID(o["installationId"], "installationId")
+	if err != nil {
+		return err
+	}
+	if !c.mayUse(id) {
+		return errOtherInstallation
+	}
+	req, err := a.Handoff.Start(id)
+	if err != nil {
+		writeJSON(w, http.StatusTooManyRequests, map[string]string{"error": err.Error()})
+		return nil
+	}
+	base := a.publicURL(r) + "/settings"
+	writeJSON(w, http.StatusCreated, map[string]any{
+		"deviceCode":              req.deviceCode,
+		"userCode":                req.userCode,
+		"verificationUri":         base,
+		"verificationUriComplete": base + "?code=" + url.QueryEscape(req.userCode),
+		"expiresIn":               int(pairingTTL / time.Second),
+		"interval":                int(pairingInterval / time.Second),
+	})
+	return nil
+}
+
+func (a *API) settingsPoll(w http.ResponseWriter, r *http.Request, c caller, body []byte) error {
+	if !a.handoffEnabled() {
+		writeJSON(w, http.StatusNotFound, map[string]string{"error": errHandoffOff.Error()})
+		return nil
+	}
+	o, err := decodeObject(body)
+	if err != nil {
+		return err
+	}
+	code, _ := o["deviceCode"].(string)
+	settings, err := a.Handoff.Poll(code, c.mayUse)
+	switch {
+	case err != nil:
+		writeJSON(w, http.StatusGone, map[string]string{"error": "expired_token"})
+	case settings == nil:
+		writeJSON(w, http.StatusAccepted, map[string]string{"status": "pending"})
+	default:
+		// The answer carries credentials: never cached anywhere on the way.
+		w.Header().Set("Cache-Control", "no-store")
+		writeJSON(w, http.StatusOK, settings)
+	}
+	return nil
+}
+
+// ---------- Phone page ----------
+
+type settingsPageData struct {
+	Code    string
+	Price   string
+	Usable  string
+	Error   string
+	Done    bool
+	Message string
+}
+
+var settingsTemplate = template.Must(template.New("settings").Parse(`<!doctype html>
+<html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
+<title>Car settings — Nils' MG4</title>
+<style>` + pageStyle + `.hint{font-size:13px;color:#8E9597;margin:4px 0 0}</style></head><body><main>
+<h1>Car settings</h1>
+{{if .Done}}
+<p class="ok">{{.Message}}</p>
+{{else}}
+<p>Fill in what you want to change; empty fields leave the car's value as it is. The car picks the values up within a few seconds.</p>
+<form method="post" action="/settings" autocomplete="off">
+{{if .Code}}<div class="code">{{.Code}}</div><input type="hidden" name="code" value="{{.Code}}">
+{{else}}<label for="code">Code shown on the car</label>
+<input id="code" name="code" autocapitalize="characters" placeholder="XXX-XXX" required>{{end}}
+<label for="abrpApiKey">ABRP API key</label>
+<input id="abrpApiKey" name="abrpApiKey" type="password" autocomplete="off" spellcheck="false">
+<label for="abrpToken">ABRP user token</label>
+<input id="abrpToken" name="abrpToken" type="password" autocomplete="off" spellcheck="false">
+<p class="hint">The car needs both to send live data to ABRP.</p>
+<label for="price">Charging price (€/kWh)</label>
+<input id="price" name="price" inputmode="decimal" value="{{.Price}}">
+<label for="usable">Usable battery capacity (kWh)</label>
+<input id="usable" name="usable" inputmode="decimal" value="{{.Usable}}">
+<input type="text" name="username" value="mg4-approval" autocomplete="username" hidden readonly>
+<label for="password">Approval password</label>
+<input id="password" name="password" type="password" autocomplete="current-password" required>
+{{if .Error}}<p class="error">{{.Error}}</p>{{end}}
+<div class="row"><button class="approve">Send to the car</button></div>
+</form>
+{{end}}
+</main></body></html>`))
+
+func renderSettingsPage(w http.ResponseWriter, status int, data settingsPageData) {
+	h := w.Header()
+	h.Set("Content-Type", "text/html; charset=utf-8")
+	h.Set("Content-Security-Policy", "default-src 'none'; style-src 'unsafe-inline'; form-action 'self'; frame-ancestors 'none'; base-uri 'none'")
+	h.Set("X-Content-Type-Options", "nosniff")
+	h.Set("Referrer-Policy", "no-referrer")
+	h.Set("Cache-Control", "no-store")
+	w.WriteHeader(status)
+	if err := settingsTemplate.Execute(w, data); err != nil {
+		slog.Warn("settings page not rendered", "error", err)
+	}
+}
+
+func (a *API) settingsPage(w http.ResponseWriter, r *http.Request) {
+	if !a.handoffEnabled() {
+		http.NotFound(w, r)
+		return
+	}
+	data := settingsPageData{}
+	if raw := r.URL.Query().Get("code"); raw != "" {
+		if a.Handoff.Open(raw) {
+			data.Code = normalizeUserCode(raw)
+		} else {
+			data.Error = "This code is unknown or has expired. Start again on the car."
+		}
+	}
+	renderSettingsPage(w, http.StatusOK, data)
+}
+
+// phoneSettingsFromForm checks what the phone sent. Credentials are never put back into the
+// page; the numbers are, so a typo is fixed without typing them again.
+func phoneSettingsFromForm(form url.Values) (PhoneSettings, error) {
+	var s PhoneSettings
+	for _, f := range []struct {
+		name string
+		dst  *string
+	}{{"abrpApiKey", &s.AbrpAPIKey}, {"abrpToken", &s.AbrpToken}} {
+		v := strings.TrimSpace(form.Get(f.name))
+		if v == "" {
+			continue
+		}
+		if len(v) < 8 || len(v) > 200 || strings.ContainsAny(v, " \t\r\n") {
+			return PhoneSettings{}, errors.New("the ABRP API key or user token does not look right")
+		}
+		*f.dst = v
+	}
+	for _, f := range []struct {
+		name     string
+		min, max float64
+		dst      **float64
+		label    string
+	}{{"price", 0, 100, &s.PricePerKwh, "charging price"}, {"usable", 10, 150, &s.UsableKwh, "usable capacity"}} {
+		v := strings.ReplaceAll(strings.TrimSpace(form.Get(f.name)), ",", ".")
+		if v == "" {
+			continue
+		}
+		n, err := strconv.ParseFloat(v, 64)
+		if err != nil || n < f.min || n > f.max {
+			return PhoneSettings{}, errors.New("the " + f.label + " is not a plausible number")
+		}
+		*f.dst = &n
+	}
+	if s.empty() {
+		return PhoneSettings{}, errors.New("nothing filled in")
+	}
+	return s, nil
+}
+
+func (a *API) settingsSubmit(w http.ResponseWriter, r *http.Request) {
+	if !a.handoffEnabled() {
+		http.NotFound(w, r)
+		return
+	}
+	r.Body = http.MaxBytesReader(w, r.Body, 8192)
+	if err := r.ParseForm(); err != nil {
+		renderSettingsPage(w, http.StatusBadRequest, settingsPageData{Error: "The form could not be read."})
+		return
+	}
+	code := normalizeUserCode(r.PostForm.Get("code"))
+	back := settingsPageData{Code: code, Price: r.PostForm.Get("price"), Usable: r.PostForm.Get("usable")}
+	switch err := a.Pairing.CheckAdmin(r.PostForm.Get("password"), clientAddress(r)); {
+	case errors.Is(err, errTooManyFailed):
+		back.Error = err.Error() + "."
+		renderSettingsPage(w, http.StatusTooManyRequests, back)
+		return
+	case err != nil:
+		back.Error = "Wrong password."
+		renderSettingsPage(w, http.StatusUnauthorized, back)
+		return
+	}
+	settings, err := phoneSettingsFromForm(r.PostForm)
+	if err != nil {
+		back.Error = strings.ToUpper(err.Error()[:1]) + err.Error()[1:] + "."
+		renderSettingsPage(w, http.StatusBadRequest, back)
+		return
+	}
+	switch err := a.Handoff.Fill(code, settings); {
+	case errors.Is(err, errAlreadyFilled):
+		renderSettingsPage(w, http.StatusConflict, settingsPageData{Error: "These settings were already sent. Start again on the car to send more."})
+		return
+	case err != nil:
+		renderSettingsPage(w, http.StatusNotFound, settingsPageData{Error: "This code is unknown or has expired. Start again on the car."})
+		return
+	}
+	slog.Info("settings sent from a phone")
+	renderSettingsPage(w, http.StatusOK, settingsPageData{Done: true,
+		Message: "Sent. The car picks the settings up within a few seconds — you can close this page."})
+}
diff --git a/server/handoff_test.go b/server/handoff_test.go
new file mode 100644
index 0000000..cb94947
--- /dev/null
+++ b/server/handoff_test.go
@@ -0,0 +1,143 @@
+package main
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"strings"
+	"testing"
+	"time"
+)
+
+func startHandoff(t *testing.T, h http.Handler, token string) (deviceCode, userCode string) {
+	t.Helper()
+	rec := do(t, h, "POST", "/v1/settings/start", token, `{"installationId":"`+testInstallation+`"}`)
+	if rec.Code != 201 {
+		t.Fatalf("start: %d %s", rec.Code, rec.Body)
+	}
+	var got map[string]any
+	if err := json.Unmarshal(rec.Body.Bytes(), &got); err != nil {
+		t.Fatal(err)
+	}
+	if got["verificationUriComplete"] != "https://car.example.com/settings?code="+got["userCode"].(string) {
+		t.Fatalf("uri %v", got["verificationUriComplete"])
+	}
+	return got["deviceCode"].(string), got["userCode"].(string)
+}
+
+func sendSettings(t *testing.T, h http.Handler, form url.Values) *httptest.ResponseRecorder {
+	t.Helper()
+	req := httptest.NewRequest("POST", "/settings", strings.NewReader(form.Encode()))
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	rec := httptest.NewRecorder()
+	h.ServeHTTP(rec, req)
+	return rec
+}
+
+func TestSettingsTravelFromThePhoneToTheCarOnce(t *testing.T) {
+	api, _ := newTestAPI()
+	h := api.Routes()
+	if rec := do(t, h, "POST", "/v1/settings/start", "", `{"installationId":"`+testInstallation+`"}`); rec.Code != 401 {
+		t.Fatalf("start without a token: %d", rec.Code)
+	}
+	deviceCode, userCode := startHandoff(t, h, testToken)
+	poll := func() *httptest.ResponseRecorder {
+		return do(t, h, "POST", "/v1/settings/poll", testToken, `{"deviceCode":"`+deviceCode+`"}`)
+	}
+	if rec := poll(); rec.Code != 202 {
+		t.Fatalf("before the phone: %d", rec.Code)
+	}
+	page := do(t, h, "GET", "/settings?code="+userCode, "", "")
+	if page.Code != 200 || !strings.Contains(page.Body.String(), userCode) {
+		t.Fatalf("page %d", page.Code)
+	}
+
+	form := url.Values{"code": {userCode}, "abrpApiKey": {"api-key-1234"}, "abrpToken": {"user-token-5678"},
+		"price": {"0,39"}, "password": {"wrong"}}
+	if rec := sendSettings(t, h, form); rec.Code != 401 || strings.Contains(rec.Body.String(), "user-token-5678") {
+		t.Fatalf("wrong password: %d (credentials must not be echoed)", rec.Code)
+	}
+	form.Set("password", testApprovalPassword)
+	if rec := sendSettings(t, h, form); rec.Code != 200 {
+		t.Fatalf("send: %d %s", rec.Code, rec.Body)
+	}
+	if rec := sendSettings(t, h, form); rec.Code != 409 {
+		t.Fatalf("sent twice: %d", rec.Code)
+	}
+
+	rec := poll()
+	var got PhoneSettings
+	if rec.Code != 200 || json.Unmarshal(rec.Body.Bytes(), &got) != nil {
+		t.Fatalf("collect: %d %s", rec.Code, rec.Body)
+	}
+	if got.AbrpAPIKey != "api-key-1234" || got.AbrpToken != "user-token-5678" || got.PricePerKwh == nil ||
+		*got.PricePerKwh != 0.39 || got.UsableKwh != nil {
+		t.Fatalf("settings %+v", got)
+	}
+	if rec.Header().Get("Cache-Control") != "no-store" {
+		t.Fatal("credentials cacheable")
+	}
+	if rec := poll(); rec.Code != 410 {
+		t.Fatalf("collected twice: %d", rec.Code)
+	}
+}
+
+func TestSettingsAreOnlyForTheCarThatAsked(t *testing.T) {
+	api, _ := newTestAPI()
+	h := api.Routes()
+	deviceCode, userCode := startHandoff(t, h, testToken)
+	_ = api.Handoff.Fill(userCode, PhoneSettings{AbrpToken: "user-token-5678"})
+	// A car paired as another installation cannot open a request for this one, nor collect it.
+	other := caller{installationID: "7e2b3c4d-5e6f-4a70-9b8c-1d2e3f4a5b6c"}
+	if s, err := api.Handoff.Poll(deviceCode, other.mayUse); s != nil || err == nil {
+		t.Fatal("another car collected the settings")
+	}
+	if s, err := api.Handoff.Poll(deviceCode, caller{}.mayUse); s == nil || err != nil {
+		t.Fatalf("the car itself could not collect: %v", err)
+	}
+}
+
+func TestPhoneSettingsAreChecked(t *testing.T) {
+	for name, form := range map[string]url.Values{
+		"nothing":        {},
+		"short token":    {"abrpToken": {"abc"}},
+		"spaced key":     {"abrpApiKey": {"has a space here"}},
+		"price absurd":   {"price": {"250"}},
+		"usable too low": {"usable": {"3"}},
+		"not a number":   {"price": {"cheap"}},
+	} {
+		if _, err := phoneSettingsFromForm(form); err == nil {
+			t.Errorf("%s accepted", name)
+		}
+	}
+	s, err := phoneSettingsFromForm(url.Values{"usable": {" 50,8 "}})
+	if err != nil || s.UsableKwh == nil || *s.UsableKwh != 50.8 || s.AbrpToken != "" {
+		t.Fatalf("%+v %v", s, err)
+	}
+}
+
+func TestHandoffRequestsExpireAndAreReplaced(t *testing.T) {
+	h := NewHandoff()
+	first, _ := h.Start(testInstallation)
+	second, _ := h.Start(testInstallation)
+	if _, err := h.Poll(first.deviceCode, caller{}.mayUse); err == nil {
+		t.Fatal("the replaced request is still open")
+	}
+	h.Now = func() time.Time { return time.Now().Add(pairingTTL + time.Second) }
+	if err := h.Fill(second.userCode, PhoneSettings{AbrpToken: "user-token-5678"}); err == nil {
+		t.Fatal("an expired request took settings")
+	}
+}
+
+func TestPhoneSettingsNeedPairingSwitchedOn(t *testing.T) {
+	api, _ := newTestAPI()
+	api.Pairing = NewPairing("", nil)
+	h := api.Routes()
+	if rec := do(t, h, "POST", "/v1/settings/start", testToken, `{"installationId":"`+testInstallation+`"}`); rec.Code != 404 {
+		t.Fatalf("start: %d", rec.Code)
+	}
+	if rec := do(t, h, "GET", "/settings", "", ""); rec.Code != 404 {
+		t.Fatalf("page: %d", rec.Code)
+	}
+}
diff --git a/server/main.go b/server/main.go
index 1d99853..be65222 100644
--- a/server/main.go
+++ b/server/main.go
@@ -87,7 +87,8 @@ func main() {
 		os.Exit(1)
 	}
 	pairing := NewPairing(cfg.approvalPass, devices)
-	api := &API{Store: store, IngestToken: cfg.ingestToken, Pairing: pairing, PublicURL: cfg.publicURL}
+	api := &API{Store: store, IngestToken: cfg.ingestToken, Pairing: pairing, Handoff: NewHandoff(),
+		PublicURL: cfg.publicURL}
 
 	srv := &http.Server{
 		Addr:              cfg.listenAddr,
diff --git a/server/pairing_http.go b/server/pairing_http.go
index 2456969..bece390 100644
--- a/server/pairing_http.go
+++ b/server/pairing_http.go
@@ -147,10 +147,8 @@ type pageData struct {
 	Done    bool
 }
 
-var pairTemplate = template.Must(template.New("pair").Parse(`<!doctype html>
-<html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
-<title>Pair a car — Nils' MG4</title>
-<style>
+// pageStyle is shared by the phone pages (pairing, settings): dark, MG red, no scripts.
+const pageStyle = `
 :root{color-scheme:dark}
 body{margin:0;min-height:100vh;display:flex;align-items:center;justify-content:center;background:#000;color:#F4F3EF;font:16px/1.5 system-ui,sans-serif}
 main{width:min(92vw,420px);background:#121212;border:1px solid #363B3D;border-radius:16px;padding:28px}
@@ -162,7 +160,12 @@ input{box-sizing:border-box;width:100%;padding:14px;border-radius:10px;border:1p
 button{flex:1;padding:14px;border-radius:10px;border:0;font-size:17px;font-weight:600;cursor:pointer}
 .approve{background:#E0424C;color:#1A0B0C}.deny{background:#2A1416;color:#FF9A9E;border:1px solid #3A1215}
 .error{color:#FFB4AB}.ok{color:#A4DCC1}
-</style></head><body><main>
+`
+
+var pairTemplate = template.Must(template.New("pair").Parse(`<!doctype html>
+<html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
+<title>Pair a car — Nils' MG4</title>
+<style>` + pageStyle + `</style></head><body><main>
 <h1>Pair a car</h1>
 {{if .Done}}
 <p class="ok">{{.Message}}</p>

From 66fed48aaebccdb708afa5d3806c58aefbef662f Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 13:12:12 +0200
Subject: [PATCH 53/79] App 2.12.1: no scroll bars; energy since start

The pages' scroll bars never faded on the car: a ScrollView shows its
bar on every layout, and the live values lay the page out every two
seconds. StableScrollView, the root of every page, now has none.

A new "Energy since start" tile, left of "Usage since start", shows the
net kWh taken from the pack since the trip began, recuperation counted
back.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                           |  3 +++
 app/build.gradle                                   |  4 ++--
 .../main/java/com/evsuite/abrp/MainActivity.java   |  8 +++++++-
 .../main/java/com/evsuite/abrp/RangeEstimator.java |  5 +++++
 .../java/com/evsuite/abrp/StableScrollView.java    | 14 ++++++++++++--
 app/src/main/res/layout-w1000dp/pane_vehicle.xml   |  6 +++++-
 app/src/main/res/layout/pane_vehicle.xml           |  5 +++++
 app/src/main/res/values/strings.xml                |  4 ++++
 .../java/com/evsuite/abrp/RangeEstimatorTest.java  | 13 +++++++++++++
 9 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index b2b7357..32ba765 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -113,6 +113,9 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.12.1: no scroll bars (the 2-second refresh kept them from ever fading);
+  "Energy since start" tile (net kWh of the trip, recuperation counted back) left of "Usage since
+  start".
 - 2026-10-18 — App 2.12.0, server 2.5.0: settings entered on a phone. "Enter on phone" shows a QR
   code; the phone form on the server (approval password) takes the ABRP credentials, charging
   price and usable capacity, and the car collects them once (RFC 8628-style, like pairing; values
diff --git a/app/build.gradle b/app/build.gradle
index 1ddd708..15b2507 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 75
-        versionName "2.12.0"
+        versionCode 76
+        versionName "2.12.1"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 9372425..883b6fc 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -92,7 +92,8 @@ public class MainActivity extends AppCompatActivity {
             vehCharging, vehHvac,
             vehTireFl, vehTireFr, vehTireRl, vehTireRr,
             vehRangeTrip, vehRangeTripNote, vehRangeAverage, vehRangeAverageNote,
-            vehUsageTrip, vehUsageTripNote, vehUsageAverage, vehUsageAverageNote;
+            vehUsageTrip, vehUsageTripNote, vehUsageAverage, vehUsageAverageNote,
+            vehEnergyTrip, vehEnergyTripNote;
 
     /** Usable pack capacity for the range estimates; the car does not publish it. */
     static final String USABLE_KWH_KEY = "usable_kwh";
@@ -1187,6 +1188,8 @@ public class MainActivity extends AppCompatActivity {
         vehUsageTripNote    = vehiclePane.findViewById(R.id.vehicle_usage_trip_note);
         vehUsageAverage     = vehiclePane.findViewById(R.id.vehicle_usage_average);
         vehUsageAverageNote = vehiclePane.findViewById(R.id.vehicle_usage_average_note);
+        vehEnergyTrip       = vehiclePane.findViewById(R.id.vehicle_energy_trip);
+        vehEnergyTripNote   = vehiclePane.findViewById(R.id.vehicle_energy_trip_note);
     }
 
     private double usableKwh() {
@@ -1204,6 +1207,9 @@ public class MainActivity extends AppCompatActivity {
         estimator.add(monotonicMs, s.getBatteryPowerKw(), s.getSpeedKmh());
         Double remaining = RangeEstimator.remainingKwh(s.getSocPercent(), usableKwh());
         RangeEstimator.Estimate trip = estimator.sinceStart(remaining);
+        Double energy = estimator.energySinceStart();
+        vehEnergyTrip.setText(energy == null ? "—" : getString(R.string.energy_kwh, energy));
+        vehEnergyTripNote.setText(energy == null ? R.string.energy_trip_waiting : R.string.energy_trip_note);
         showEstimate(vehRangeTrip, vehRangeTripNote, vehUsageTrip, vehUsageTripNote, trip,
                 trip == null ? "" : getString(R.string.usage_over_distance, trip.distanceKm),
                 R.string.range_trip_waiting);
diff --git a/app/src/main/java/com/evsuite/abrp/RangeEstimator.java b/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
index c3aa60d..8d55ea3 100644
--- a/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
+++ b/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
@@ -110,6 +110,11 @@ final class RangeEstimator {
         tripLast = s;
     }
 
+    /** Net energy taken from the pack since start, in kWh; null before the trip's first sample. */
+    synchronized Double energySinceStart() {
+        return tripLast == null ? null : tripEnergyKwh;
+    }
+
     /** Range at the consumption since start; null until the trip has some distance behind it. */
     synchronized Estimate sinceStart(Double remainingKwh) {
         if (remainingKwh == null || tripDistanceKm < MIN_DISTANCE_KM) return null;
diff --git a/app/src/main/java/com/evsuite/abrp/StableScrollView.java b/app/src/main/java/com/evsuite/abrp/StableScrollView.java
index d760775..bf56944 100644
--- a/app/src/main/java/com/evsuite/abrp/StableScrollView.java
+++ b/app/src/main/java/com/evsuite/abrp/StableScrollView.java
@@ -16,18 +16,28 @@ import android.widget.ScrollView;
  * Here only scrolling that is not part of a layout counts as the driver's position, and every
  * layout restores it. ScrollView.scrollTo clamps against the real content height, so a
  * position that no longer exists still ends at the bottom rather than past it.
+ *
+ * No scroll bar: a ScrollView shows its bar on every layout, and the live values lay the page
+ * out every two seconds, so on the car it never faded. The pages scroll by touch.
  */
 public class StableScrollView extends ScrollView {
 
     private int wantedScrollY;
     private boolean inLayout;
 
-    public StableScrollView(Context context) { super(context); }
+    public StableScrollView(Context context) {
+        super(context);
+        setVerticalScrollBarEnabled(false);
+    }
 
-    public StableScrollView(Context context, AttributeSet attrs) { super(context, attrs); }
+    public StableScrollView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setVerticalScrollBarEnabled(false);
+    }
 
     public StableScrollView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
+        setVerticalScrollBarEnabled(false);
     }
 
     @Override
diff --git a/app/src/main/res/layout-w1000dp/pane_vehicle.xml b/app/src/main/res/layout-w1000dp/pane_vehicle.xml
index 3ec4f97..c5d1457 100644
--- a/app/src/main/res/layout-w1000dp/pane_vehicle.xml
+++ b/app/src/main/res/layout-w1000dp/pane_vehicle.xml
@@ -32,7 +32,11 @@
         </LinearLayout>
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:orientation="horizontal" android:baselineAligned="false">
             <Space android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" android:layout_marginEnd="10dp" />
-            <Space android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" android:layout_marginEnd="10dp" />
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_energy_trip" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_energy_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_energy_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_usage_trip" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_usage_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
diff --git a/app/src/main/res/layout/pane_vehicle.xml b/app/src/main/res/layout/pane_vehicle.xml
index 707b73b..c75c93c 100644
--- a/app/src/main/res/layout/pane_vehicle.xml
+++ b/app/src/main/res/layout/pane_vehicle.xml
@@ -21,6 +21,11 @@
                 <TextView android:id="@+id/vehicle_range_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
                 <TextView android:id="@+id/vehicle_range_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_energy_trip" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_energy_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_energy_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_usage_trip" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_usage_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e75f2cf..8133840 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,6 +34,10 @@
     <string name="vehicle_row_range_trip">Range since start</string>
     <string name="vehicle_row_range_average">Range at 5-min average</string>
     <string name="vehicle_row_usage_trip">Usage since start</string>
+    <string name="vehicle_row_energy_trip">Energy since start</string>
+    <string name="energy_kwh">%1$.1f kWh</string>
+    <string name="energy_trip_note">net, after recuperation</string>
+    <string name="energy_trip_waiting">once the car is on</string>
     <string name="vehicle_row_usage_average">Usage, 5-min average</string>
     <string name="range_consumption">%1$.1f kWh/100 km</string>
     <string name="range_over">&gt; %1$d km</string>
diff --git a/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java b/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java
index cb442da..b50d822 100644
--- a/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java
+++ b/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java
@@ -115,4 +115,17 @@ public class RangeEstimatorTest {
         assertEquals(-6.25, regen.kwhPer100Km, 0.01);
         assertTrue(Double.isInfinite(regen.rangeKm));
     }
+
+    @Test
+    public void energySinceStartIsTheNetEnergyOfTheTrip() {
+        RangeEstimator r = new RangeEstimator();
+        assertNull(r.energySinceStart());
+        r.add(0, 3f, 0f);
+        assertEquals(0.0, r.energySinceStart(), 1e-9);                 // the trip has begun
+        for (long t = 15_000; t <= 600_000; t += 15_000) r.add(t, 30f, 100f);
+        // 10 minutes at 30 kW = 5 kWh, plus the first 15 s ramp from 3 kW.
+        assertEquals(5.0, r.energySinceStart(), 0.1);
+        for (long t = 615_000; t <= 735_000; t += 15_000) r.add(t, -20f, 60f); // downhill
+        assertTrue(r.energySinceStart() < 5.0);                         // recuperation counts back
+    }
 }

From 40906ec4a7e9b2a88bb8571b9072cea075657cb2 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 13:26:02 +0200
Subject: [PATCH 54/79] App 2.13.0: tyre pressures in bar; 5-minute average
 power
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tyre pressures show in bar by default; Settings → Display offers kPa
and psi as well. Display only: the car reports kPa and the server keeps
storing kPa.

A "Power, 5-min average" card under Power: the time-weighted mean
battery power over the last five minutes, standing included, from the
same samples as the 5-minute range.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                      |  3 ++
 app/build.gradle                              |  4 +-
 .../java/com/evsuite/abrp/MainActivity.java   | 37 ++++++++++++++---
 .../java/com/evsuite/abrp/PressureUnit.java   | 40 +++++++++++++++++++
 .../java/com/evsuite/abrp/RangeEstimator.java | 23 +++++++++++
 .../main/res/layout-w1000dp/pane_settings.xml |  2 +
 .../main/res/layout-w1000dp/pane_vehicle.xml  |  6 ++-
 app/src/main/res/layout/pane_settings.xml     |  2 +
 app/src/main/res/layout/pane_vehicle.xml      |  5 +++
 app/src/main/res/values/strings.xml           |  4 ++
 .../com/evsuite/abrp/PressureUnitTest.java    | 29 ++++++++++++++
 .../com/evsuite/abrp/RangeEstimatorTest.java  | 12 ++++++
 12 files changed, 159 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/com/evsuite/abrp/PressureUnit.java
 create mode 100644 app/src/test/java/com/evsuite/abrp/PressureUnitTest.java

diff --git a/SPECS.md b/SPECS.md
index 32ba765..4866cf4 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -113,6 +113,9 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.13.0: tyre pressures in bar by default, kPa or psi selectable (Settings →
+  Display; display only, the car and the server keep kPa). "Power, 5-min average" card under
+  Power: time-weighted mean battery power, standing included.
 - 2026-10-18 — App 2.12.1: no scroll bars (the 2-second refresh kept them from ever fading);
   "Energy since start" tile (net kWh of the trip, recuperation counted back) left of "Usage since
   start".
diff --git a/app/build.gradle b/app/build.gradle
index 15b2507..e82f366 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 76
-        versionName "2.12.1"
+        versionCode 77
+        versionName "2.13.0"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 883b6fc..f9eb258 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -93,7 +93,7 @@ public class MainActivity extends AppCompatActivity {
             vehTireFl, vehTireFr, vehTireRl, vehTireRr,
             vehRangeTrip, vehRangeTripNote, vehRangeAverage, vehRangeAverageNote,
             vehUsageTrip, vehUsageTripNote, vehUsageAverage, vehUsageAverageNote,
-            vehEnergyTrip, vehEnergyTripNote;
+            vehEnergyTrip, vehEnergyTripNote, vehPowerAverage, vehPowerAverageNote;
 
     /** Usable pack capacity for the range estimates; the car does not publish it. */
     static final String USABLE_KWH_KEY = "usable_kwh";
@@ -977,6 +977,7 @@ public class MainActivity extends AppCompatActivity {
         voiceKeySwitch.setChecked(UploadSettings.voiceKeyOpensApp(prefs));
         voiceKeySwitch.setOnCheckedChangeListener((btn, checked) ->
                 prefs.edit().putBoolean(UploadSettings.KEY_VOICE_KEY_OPENS, checked).apply());
+        bindTireUnit();
         fullScreenSwitch = settingsPane.findViewById(R.id.full_screen_switch);
         fullScreenSwitch.setChecked(UploadSettings.fullScreen(prefs));
         fullScreenSwitch.setOnCheckedChangeListener((btn, checked) -> {
@@ -1057,6 +1058,26 @@ public class MainActivity extends AppCompatActivity {
         }, "abrp-test").start();
     }
 
+    /** Tyre pressure unit: display only, read on every refresh of the Overview. */
+    private void bindTireUnit() {
+        android.widget.Spinner spinner = settingsPane.findViewById(R.id.tire_unit_spinner);
+        PressureUnit[] units = PressureUnit.values();
+        String[] labels = new String[units.length];
+        for (int i = 0; i < units.length; i++) labels[i] = units[i].label;
+        android.widget.ArrayAdapter<String> adapter = new android.widget.ArrayAdapter<>(
+                this, R.layout.spinner_value, labels);
+        adapter.setDropDownViewResource(R.layout.spinner_dropdown);
+        spinner.setAdapter(adapter);
+        spinner.setSelection(PressureUnit.fromPref(prefs.getString(PressureUnit.PREF_KEY, null)).ordinal());
+        spinner.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(android.widget.AdapterView<?> parent, View view, int position, long id) {
+                prefs.edit().putString(PressureUnit.PREF_KEY, units[position].name()).apply();
+            }
+            @Override public void onNothingSelected(android.widget.AdapterView<?> parent) { }
+        });
+    }
+
     /** The service reads these settings on every tick, so a change applies without a restart. */
     private void bindCadenceControls() {
         UploadSettings current = UploadSettings.from(prefs);
@@ -1190,6 +1211,8 @@ public class MainActivity extends AppCompatActivity {
         vehUsageAverageNote = vehiclePane.findViewById(R.id.vehicle_usage_average_note);
         vehEnergyTrip       = vehiclePane.findViewById(R.id.vehicle_energy_trip);
         vehEnergyTripNote   = vehiclePane.findViewById(R.id.vehicle_energy_trip_note);
+        vehPowerAverage     = vehiclePane.findViewById(R.id.vehicle_power_average);
+        vehPowerAverageNote = vehiclePane.findViewById(R.id.vehicle_power_average_note);
     }
 
     private double usableKwh() {
@@ -1207,6 +1230,9 @@ public class MainActivity extends AppCompatActivity {
         estimator.add(monotonicMs, s.getBatteryPowerKw(), s.getSpeedKmh());
         Double remaining = RangeEstimator.remainingKwh(s.getSocPercent(), usableKwh());
         RangeEstimator.Estimate trip = estimator.sinceStart(remaining);
+        Double power = estimator.averagePowerKw(monotonicMs);
+        vehPowerAverage.setText(power == null ? "—" : getString(R.string.power_kw, power));
+        vehPowerAverageNote.setText(power == null ? R.string.power_waiting : R.string.usage_last_5_min);
         Double energy = estimator.energySinceStart();
         vehEnergyTrip.setText(energy == null ? "—" : getString(R.string.energy_kwh, energy));
         vehEnergyTripNote.setText(energy == null ? R.string.energy_trip_waiting : R.string.energy_trip_note);
@@ -1264,10 +1290,11 @@ public class MainActivity extends AppCompatActivity {
             vehCharging.setText(chargingLabel(s));
             refreshRangeEstimates(s);
 
-            vehTireFl.setText(fmt(s.getTirePressures().getFrontLeftKpa(), "%.0f kPa"));
-            vehTireFr.setText(fmt(s.getTirePressures().getFrontRightKpa(), "%.0f kPa"));
-            vehTireRl.setText(fmt(s.getTirePressures().getRearLeftKpa(), "%.0f kPa"));
-            vehTireRr.setText(fmt(s.getTirePressures().getRearRightKpa(), "%.0f kPa"));
+            PressureUnit unit = PressureUnit.fromPref(prefs.getString(PressureUnit.PREF_KEY, null));
+            vehTireFl.setText(unit.format(s.getTirePressures().getFrontLeftKpa()));
+            vehTireFr.setText(unit.format(s.getTirePressures().getFrontRightKpa()));
+            vehTireRl.setText(unit.format(s.getTirePressures().getRearLeftKpa()));
+            vehTireRr.setText(unit.format(s.getTirePressures().getRearRightKpa()));
         } catch (Throwable ignored) {
             // Leave the last good reading on screen.
         }
diff --git a/app/src/main/java/com/evsuite/abrp/PressureUnit.java b/app/src/main/java/com/evsuite/abrp/PressureUnit.java
new file mode 100644
index 0000000..51fd5ea
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/PressureUnit.java
@@ -0,0 +1,40 @@
+package com.evsuite.abrp;
+
+import java.util.Locale;
+
+/**
+ * The unit tyre pressures are shown in. The car reports kPa; this only changes the display.
+ * Android-free, unit-tested.
+ */
+enum PressureUnit {
+    BAR("bar", "%.1f bar", 0.01),
+    KPA("kPa", "%.0f kPa", 1.0),
+    PSI("psi", "%.1f psi", 0.145038);
+
+    static final String PREF_KEY = "tire_pressure_unit";
+    static final PressureUnit DEFAULT = BAR;
+
+    final String label;
+    private final String pattern;
+    private final double perKpa;
+
+    PressureUnit(String label, String pattern, double perKpa) {
+        this.label = label;
+        this.pattern = pattern;
+        this.perKpa = perKpa;
+    }
+
+    /** A reading in this unit, or a dash for none. */
+    String format(Float kpa) {
+        if (kpa == null || kpa.isNaN() || kpa.isInfinite()) return "—";
+        return String.format(Locale.US, pattern, kpa * perKpa);
+    }
+
+    /** The stored choice; anything unknown falls back to bar. */
+    static PressureUnit fromPref(String name) {
+        for (PressureUnit u : values()) {
+            if (u.name().equals(name)) return u;
+        }
+        return DEFAULT;
+    }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/RangeEstimator.java b/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
index 8d55ea3..b982760 100644
--- a/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
+++ b/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
@@ -154,6 +154,29 @@ final class RangeEstimator {
         return new Estimate(rangeKm, kwhPerKm * 100, distanceKm);
     }
 
+    /**
+     * Mean battery power over the last five minutes, time-weighted, standing included; null with
+     * less than a minute of samples. Positive is drawn from the pack, as the Power tile shows it.
+     */
+    synchronized Double averagePowerKw(long nowMs) {
+        double energyKwh = 0;
+        long covered = 0;
+        Sample previous = null;
+        for (Sample s : samples) {
+            if (s.timeMs < nowMs - WINDOW_MS) continue;
+            if (previous != null) {
+                long dt = s.timeMs - previous.timeMs;
+                if (dt > 0 && dt <= MAX_GAP_MS) {
+                    energyKwh += (previous.powerKw + s.powerKw) / 2 * (dt / 3_600_000.0);
+                    covered += dt;
+                }
+            }
+            previous = s;
+        }
+        if (covered < MIN_WINDOW_MS) return null;
+        return energyKwh / (covered / 3_600_000.0);
+    }
+
     synchronized void clear() {
         samples.clear();
         tripEnergyKwh = 0;
diff --git a/app/src/main/res/layout-w1000dp/pane_settings.xml b/app/src/main/res/layout-w1000dp/pane_settings.xml
index 0732e99..8dfb182 100644
--- a/app/src/main/res/layout-w1000dp/pane_settings.xml
+++ b/app/src/main/res/layout-w1000dp/pane_settings.xml
@@ -8,6 +8,8 @@
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_full_screen" android:textAppearance="@style/Text.EV.Secondary" />
                 <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_key_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_voice_key" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_voice_key" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_tire_unit" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
+                <Spinner android:id="@+id/tire_unit_spinner" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:layout_marginTop="12dp" android:background="@drawable/bg_input_panel" android:popupBackground="@color/ev_surface_raised" android:contentDescription="@string/label_tire_unit" android:spinnerMode="dropdown" />
             </LinearLayout>
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_settings_title" android:textAppearance="@style/Text.EV.Eyebrow" />
diff --git a/app/src/main/res/layout-w1000dp/pane_vehicle.xml b/app/src/main/res/layout-w1000dp/pane_vehicle.xml
index c5d1457..44a9930 100644
--- a/app/src/main/res/layout-w1000dp/pane_vehicle.xml
+++ b/app/src/main/res/layout-w1000dp/pane_vehicle.xml
@@ -47,7 +47,11 @@
                 <TextView android:id="@+id/vehicle_usage_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
                 <TextView android:id="@+id/vehicle_usage_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
-            <Space android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" android:layout_marginEnd="10dp" />
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power_average" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_power_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_power_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
             <Space android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" android:layout_marginEnd="10dp" />
         </LinearLayout>
         <Space android:layout_width="1dp" android:layout_height="16dp" />
diff --git a/app/src/main/res/layout/pane_settings.xml b/app/src/main/res/layout/pane_settings.xml
index 4d17a49..534f54b 100644
--- a/app/src/main/res/layout/pane_settings.xml
+++ b/app/src/main/res/layout/pane_settings.xml
@@ -7,6 +7,8 @@
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_full_screen" android:textAppearance="@style/Text.EV.Secondary" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_key_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_voice_key" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_voice_key" android:textAppearance="@style/Text.EV.Secondary" />
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_tire_unit" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
+            <Spinner android:id="@+id/tire_unit_spinner" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:layout_marginTop="12dp" android:background="@drawable/bg_input_panel" android:popupBackground="@color/ev_surface_raised" android:contentDescription="@string/label_tire_unit" android:spinnerMode="dropdown" />
         </LinearLayout>
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_settings_title" android:textAppearance="@style/Text.EV.Eyebrow" />
diff --git a/app/src/main/res/layout/pane_vehicle.xml b/app/src/main/res/layout/pane_vehicle.xml
index c75c93c..28d6816 100644
--- a/app/src/main/res/layout/pane_vehicle.xml
+++ b/app/src/main/res/layout/pane_vehicle.xml
@@ -40,6 +40,11 @@
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
             </LinearLayout>
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power_average" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_power_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_power_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_columnWeight="1" android:layout_margin="4dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_speed" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_speed" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8133840..e6e7459 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,6 +35,10 @@
     <string name="vehicle_row_range_average">Range at 5-min average</string>
     <string name="vehicle_row_usage_trip">Usage since start</string>
     <string name="vehicle_row_energy_trip">Energy since start</string>
+    <string name="vehicle_row_power_average">Power, 5-min average</string>
+    <string name="power_kw">%1$.1f kW</string>
+    <string name="power_waiting">needs a minute of data</string>
+    <string name="label_tire_unit">Tyre pressure unit</string>
     <string name="energy_kwh">%1$.1f kWh</string>
     <string name="energy_trip_note">net, after recuperation</string>
     <string name="energy_trip_waiting">once the car is on</string>
diff --git a/app/src/test/java/com/evsuite/abrp/PressureUnitTest.java b/app/src/test/java/com/evsuite/abrp/PressureUnitTest.java
new file mode 100644
index 0000000..b7d8485
--- /dev/null
+++ b/app/src/test/java/com/evsuite/abrp/PressureUnitTest.java
@@ -0,0 +1,29 @@
+package com.evsuite.abrp;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+/** Tyre pressure display units — pure JVM. */
+public class PressureUnitTest {
+
+    @Test
+    public void kpaFromTheCarInEachUnit() {
+        assertEquals("2.5 bar", PressureUnit.BAR.format(250f));
+        assertEquals("250 kPa", PressureUnit.KPA.format(250f));
+        assertEquals("36.3 psi", PressureUnit.PSI.format(250f));
+    }
+
+    @Test
+    public void anUnreadPressureStaysADash() {
+        assertEquals("—", PressureUnit.BAR.format(null));
+        assertEquals("—", PressureUnit.PSI.format(Float.NaN));
+    }
+
+    @Test
+    public void barUnlessSomethingElseWasChosen() {
+        assertEquals(PressureUnit.BAR, PressureUnit.fromPref(null));
+        assertEquals(PressureUnit.BAR, PressureUnit.fromPref("nonsense"));
+        assertEquals(PressureUnit.PSI, PressureUnit.fromPref("PSI"));
+    }
+}
diff --git a/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java b/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java
index b50d822..b5f4a62 100644
--- a/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java
+++ b/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java
@@ -128,4 +128,16 @@ public class RangeEstimatorTest {
         for (long t = 615_000; t <= 735_000; t += 15_000) r.add(t, -20f, 60f); // downhill
         assertTrue(r.energySinceStart() < 5.0);                         // recuperation counts back
     }
+
+    @Test
+    public void averagePowerOverTheLastFiveMinutes() {
+        RangeEstimator r = new RangeEstimator();
+        r.add(0, 20f, 50f);
+        assertNull(r.averagePowerKw(0));                                   // too little yet
+        for (long t = 15_000; t <= 300_000; t += 15_000) r.add(t, 20f, 50f);
+        assertEquals(20.0, r.averagePowerKw(300_000), 1e-6);
+        // Standing with the climate on counts: half the window at 2 kW.
+        for (long t = 315_000; t <= 450_000; t += 15_000) r.add(t, 2f, 0f);
+        assertEquals(11.0, r.averagePowerKw(450_000), 1.0);
+    }
 }

From 9b5fcc0734178b1ca9f996b9e9d1142fd3077aaf Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 13:52:57 +0200
Subject: [PATCH 55/79] App 2.14.0: accent colour after the MG4 paints; car
 colour probe
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The accent is selectable in Settings → Display: Dynamic Red (default),
Volcano Orange, Holborn Blue, Racing Green, Camden Grey, Monument
Silver, Arctic White and Black Pearl. White, silver and black cannot be
an accent on the black screen as they are, so they become light greys
and a pearl blue-grey.

The accent palette is now theme attributes (attrs_accent.xml) with one
overlay per paint (accents.xml), applied before the activity inflates;
layouts, colour lists, drawables and the views that draw in code use
them, including the red tints that were hard-coded. A change recreates
the activity on the same page. Android 9 crashes on gradients with
theme colours, so the battery card is built from layers.

Logs → "Look for the car colour" lists the head unit's system
properties that mention colour, paint or car model, to find out whether
the paint colour can be read from the car.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 AGENTS.md                                     |  4 +-
 SPECS.md                                      |  8 ++
 app/build.gradle                              |  4 +-
 .../java/com/evsuite/abrp/AccentColor.java    | 51 +++++++++++
 .../java/com/evsuite/abrp/CarColorProbe.java  | 59 +++++++++++++
 .../com/evsuite/abrp/ChargingGraphView.java   |  2 +-
 .../java/com/evsuite/abrp/MainActivity.java   | 54 +++++++++++-
 .../com/evsuite/abrp/PremiumBackdropView.java | 11 ++-
 app/src/main/res/color/input_stroke.xml       |  2 +-
 app/src/main/res/color/nav_tab_background.xml |  2 +-
 app/src/main/res/color/nav_tab_foreground.xml |  2 +-
 app/src/main/res/color/nav_tab_stroke.xml     |  2 +-
 app/src/main/res/color/switch_thumb.xml       |  2 +-
 app/src/main/res/color/switch_track.xml       |  2 +-
 app/src/main/res/drawable/bg_battery_card.xml | 16 +++-
 app/src/main/res/drawable/bg_input_panel.xml  |  2 +-
 app/src/main/res/drawable/bg_topbar.xml       |  2 +-
 .../main/res/drawable/bg_version_badge.xml    |  4 +-
 app/src/main/res/drawable/ic_chevron_down.xml |  2 +-
 app/src/main/res/drawable/ic_info.xml         |  2 +-
 .../main/res/drawable/ic_vehicle_outline.xml  |  6 +-
 .../main/res/layout-w1000dp/activity_main.xml |  4 +-
 .../main/res/layout-w1000dp/pane_settings.xml |  2 +
 .../main/res/layout-w1000dp/pane_vehicle.xml  | 22 ++---
 .../main/res/layout-w600dp/dialog_about.xml   |  4 +-
 app/src/main/res/layout/activity_main.xml     |  2 +-
 app/src/main/res/layout/dialog_about.xml      |  4 +-
 app/src/main/res/layout/pane_charging.xml     |  4 +-
 app/src/main/res/layout/pane_consumption.xml  |  4 +-
 app/src/main/res/layout/pane_log.xml          |  4 +
 app/src/main/res/layout/pane_settings.xml     |  2 +
 app/src/main/res/layout/pane_vehicle.xml      | 22 ++---
 app/src/main/res/values/accents.xml           | 87 +++++++++++++++++++
 app/src/main/res/values/attrs_accent.xml      | 13 +++
 app/src/main/res/values/colors.xml            |  7 +-
 app/src/main/res/values/strings.xml           |  5 ++
 app/src/main/res/values/styles_app.xml        |  6 +-
 app/src/main/res/values/styles_ev.xml         |  6 +-
 app/src/main/res/values/themes.xml            | 16 +++-
 .../com/evsuite/abrp/AccentColorTest.java     | 22 +++++
 .../com/evsuite/abrp/CarColorProbeTest.java   | 24 +++++
 41 files changed, 425 insertions(+), 74 deletions(-)
 create mode 100644 app/src/main/java/com/evsuite/abrp/AccentColor.java
 create mode 100644 app/src/main/java/com/evsuite/abrp/CarColorProbe.java
 create mode 100644 app/src/main/res/values/accents.xml
 create mode 100644 app/src/main/res/values/attrs_accent.xml
 create mode 100644 app/src/test/java/com/evsuite/abrp/AccentColorTest.java
 create mode 100644 app/src/test/java/com/evsuite/abrp/CarColorProbeTest.java

diff --git a/AGENTS.md b/AGENTS.md
index e6ec9a0..7eb7106 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -8,7 +8,9 @@ workspace `DESIGN.md` apply; this file contains only telemetry-specific addition
 ## App-specific visual direction (2.2.6)
 
 The user explicitly requested a permanent OLED-black theme, charcoal glass-like cards,
-MG red accents (#E0424C, with a light #FF9A9E and a deep #3A1215 variant; they replaced the earlier muted gold and cyan). These app resources intentionally override the shared
+an accent the user picks from the MG4 paint colours (Dynamic Red #E0424C by default; the palette
+is theme attributes in `res/values/attrs_accent.xml` and `accents.xml` — use `?attr/evAccent…`,
+never a hard-coded accent hex). These app resources intentionally override the shared
 DESIGN.md palette, DayNight preference and flat-surface rules. Do not overwrite them
 with the shared token generator. Use static gradients rather than continuous effects;
 keep large touch targets, readable text and null telemetry shown as a dash.
diff --git a/SPECS.md b/SPECS.md
index 4866cf4..7692eb7 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -113,6 +113,14 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.14.0: accent colour selectable after the MG4 paints (Settings → Display):
+  Dynamic Red (default), Volcano Orange, Holborn Blue, Racing Green, Camden Grey, Monument Silver,
+  Arctic White, Black Pearl; white, silver and black become light greys and a pearl blue-grey,
+  since they cannot be an accent on black. The accent palette is theme attributes
+  (`attrs_accent.xml`, overlays in `accents.xml`); a change recreates the activity on the same
+  page. Android 9 crashes on gradients with theme colours, so the battery card is layered.
+  Logs tab: "Look for the car colour" lists system properties that mention colour, paint or car
+  model, to find out whether the paint colour can be read (nothing on the emulator).
 - 2026-10-18 — App 2.13.0: tyre pressures in bar by default, kPa or psi selectable (Settings →
   Display; display only, the car and the server keep kPa). "Power, 5-min average" card under
   Power: time-weighted mean battery power, standing included.
diff --git a/app/build.gradle b/app/build.gradle
index e82f366..03d0b55 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 77
-        versionName "2.13.0"
+        versionCode 78
+        versionName "2.14.0"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/AccentColor.java b/app/src/main/java/com/evsuite/abrp/AccentColor.java
new file mode 100644
index 0000000..762c4f2
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/AccentColor.java
@@ -0,0 +1,51 @@
+package com.evsuite.abrp;
+
+import android.content.Context;
+import android.util.TypedValue;
+
+/**
+ * The app's accent colour, after the MG4 paint colours; Dynamic Red unless another is chosen
+ * (Settings → Display). Each is a theme overlay in res/values/accents.xml that MainActivity lays
+ * over the app theme before it inflates anything; a change recreates the activity.
+ */
+enum AccentColor {
+    DYNAMIC_RED("Dynamic Red", R.style.ThemeOverlay_EV_Accent_DynamicRed),
+    VOLCANO_ORANGE("Volcano Orange", R.style.ThemeOverlay_EV_Accent_VolcanoOrange),
+    HOLBORN_BLUE("Holborn Blue", R.style.ThemeOverlay_EV_Accent_HolbornBlue),
+    RACING_GREEN("Racing Green", R.style.ThemeOverlay_EV_Accent_RacingGreen),
+    CAMDEN_GREY("Camden Grey", R.style.ThemeOverlay_EV_Accent_CamdenGrey),
+    MONUMENT_SILVER("Monument Silver", R.style.ThemeOverlay_EV_Accent_MonumentSilver),
+    ARCTIC_WHITE("Arctic White", R.style.ThemeOverlay_EV_Accent_ArcticWhite),
+    BLACK_PEARL("Black Pearl", R.style.ThemeOverlay_EV_Accent_BlackPearl);
+
+    static final String PREF_KEY = "accent_color";
+    static final AccentColor DEFAULT = DYNAMIC_RED;
+
+    final String label;
+    final int overlay;
+
+    AccentColor(String label, int overlay) {
+        this.label = label;
+        this.overlay = overlay;
+    }
+
+    /** The stored choice; anything unknown falls back to Dynamic Red. */
+    static AccentColor fromPref(String name) {
+        for (AccentColor c : values()) {
+            if (c.name().equals(name)) return c;
+        }
+        return DEFAULT;
+    }
+
+    /** A colour of the current accent palette, e.g. {@code R.attr.evAccent}, for code that draws. */
+    static int resolve(Context context, int attr) {
+        TypedValue value = new TypedValue();
+        context.getTheme().resolveAttribute(attr, value, true);
+        return value.data;
+    }
+
+    /** The colour with its alpha replaced, for glows and grids drawn in code. */
+    static int withAlpha(int color, int alpha) {
+        return (color & 0x00FFFFFF) | (alpha << 24);
+    }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/CarColorProbe.java b/app/src/main/java/com/evsuite/abrp/CarColorProbe.java
new file mode 100644
index 0000000..3800e07
--- /dev/null
+++ b/app/src/main/java/com/evsuite/abrp/CarColorProbe.java
@@ -0,0 +1,59 @@
+package com.evsuite.abrp;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Looks for the car's paint colour among the head unit's system properties, for the Logs tab.
+ *
+ * The MG launcher draws the car in its own colour, so the head unit knows it somewhere; where is
+ * not documented. This lists every property whose name or value mentions a colour or paint, so
+ * a photo of the Logs tab shows whether (and how) it can be read. Read-only: it runs the
+ * platform's own getprop, which only reads.
+ */
+final class CarColorProbe {
+
+    private static final Pattern LINE = Pattern.compile("^\\[([^\\]]*)\\]: \\[(.*)\\]$");
+    private static final Pattern INTERESTING = Pattern.compile(
+            "(?i)colou?r|paint|body_?col|exterior|car_?model|vehicle_?(config|type|model)");
+
+    private CarColorProbe() { }
+
+    /** getprop's output, filtered; at most {@code max} lines. Never throws. */
+    static List<String> run(int max) {
+        try {
+            Process p = new ProcessBuilder("getprop").redirectErrorStream(true).start();
+            StringBuilder out = new StringBuilder();
+            try (BufferedReader r = new BufferedReader(new InputStreamReader(p.getInputStream(), StandardCharsets.UTF_8))) {
+                String line;
+                while ((line = r.readLine()) != null && out.length() < 512 * 1024) out.append(line).append('\n');
+            }
+            p.waitFor();
+            return filter(out.toString(), max);
+        } catch (Exception e) {
+            List<String> failed = new ArrayList<>();
+            failed.add("getprop failed: " + e.getClass().getSimpleName());
+            return failed;
+        }
+    }
+
+    /** The "name = value" lines whose name or value looks colour- or model-related. Pure. */
+    static List<String> filter(String getpropOutput, int max) {
+        List<String> found = new ArrayList<>();
+        for (String line : getpropOutput.split("\n")) {
+            Matcher m = LINE.matcher(line.trim());
+            if (!m.matches()) continue;
+            String name = m.group(1), value = m.group(2);
+            if (INTERESTING.matcher(name).find() || INTERESTING.matcher(value).find()) {
+                found.add(name + " = " + value);
+                if (found.size() >= max) break;
+            }
+        }
+        return found;
+    }
+}
diff --git a/app/src/main/java/com/evsuite/abrp/ChargingGraphView.java b/app/src/main/java/com/evsuite/abrp/ChargingGraphView.java
index be73a5c..a4c7ccc 100644
--- a/app/src/main/java/com/evsuite/abrp/ChargingGraphView.java
+++ b/app/src/main/java/com/evsuite/abrp/ChargingGraphView.java
@@ -14,7 +14,7 @@ public final class ChargingGraphView extends View {
     private final Paint grid = new Paint(1), line = new Paint(1), text = new Paint(1);
     private final List<float[]> points = new ArrayList<>();
     private final float[] socPower = new float[101];
-    public ChargingGraphView(Context c, AttributeSet a) { super(c,a); java.util.Arrays.fill(socPower, Float.NaN); grid.setColor(0x55E0858A); line.setColor(0xFFFFC857); line.setStrokeWidth(4); text.setColor(0xFFBDC4C6); text.setTextSize(20); }
+    public ChargingGraphView(Context c, AttributeSet a) { super(c,a); java.util.Arrays.fill(socPower, Float.NaN); grid.setColor(AccentColor.withAlpha(AccentColor.resolve(c, R.attr.evAccentLight), 0x55)); line.setColor(0xFFFFC857); line.setStrokeWidth(4); text.setColor(0xFFBDC4C6); text.setTextSize(20); }
     synchronized void add(Float soc, Float power) {
         if (soc == null || power == null || power >= 0) return;
         float p = Math.abs(power);
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index f9eb258..d86d2ce 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -227,11 +227,13 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES);
         super.onCreate(savedInstanceState);
+        prefs = getSharedPreferences("abrp_prefs", MODE_PRIVATE);
+        // Before anything is inflated: every ?attr/evAccent… resolves against this overlay.
+        getTheme().applyStyle(AccentColor.fromPref(prefs.getString(AccentColor.PREF_KEY, null)).overlay, true);
         setContentView(R.layout.activity_main);
 
         ((TextView) findViewById(R.id.version_badge)).setText("v" + BuildConfig.VERSION_NAME);
 
-        prefs = getSharedPreferences("abrp_prefs", MODE_PRIVATE);
 
         // The pages are inflated here, once, and handed to the pager as fixed,
         // non-recycled items. That is what lets every widget below be looked up now and
@@ -259,9 +261,20 @@ public class MainActivity extends AppCompatActivity {
         statusText          = servicePane.findViewById(R.id.status_text);
         callLogText = logPane.findViewById(R.id.call_log_text);
         steeringKeysText = logPane.findViewById(R.id.steering_keys_text);
+        TextView carColorText = logPane.findViewById(R.id.car_color_text);
+        logPane.findViewById(R.id.car_color_button).setOnClickListener(v -> new Thread(() -> {
+            java.util.List<String> found = CarColorProbe.run(60);
+            String shown = found.isEmpty() ? getString(R.string.car_color_none)
+                    : android.text.TextUtils.join("\n", found);
+            runOnUiThread(() -> carColorText.setText(shown));
+        }, "car-color-probe").start());
         logPane.findViewById(R.id.flush_now_button).setOnClickListener(v -> manualFlush());
 
         setUpPager();
+        // Back on the page that was open when the activity was recreated (accent colour change).
+        if (savedInstanceState != null) {
+            ((ViewPager2) findViewById(R.id.content)).setCurrentItem(savedInstanceState.getInt(STATE_PAGE, 0), false);
+        }
         findViewById(R.id.about_button).setOnClickListener(v -> showAbout());
         findViewById(R.id.update_button).setOnClickListener(v -> checkForUpdate(v));
 
@@ -275,6 +288,14 @@ public class MainActivity extends AppCompatActivity {
         startForegroundService(new Intent(this, AbrpUploadService.class));
     }
 
+    private static final String STATE_PAGE = "page";
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(STATE_PAGE, ((ViewPager2) findViewById(R.id.content)).getCurrentItem());
+    }
+
     private void showAbout() {
         String version;
         try {
@@ -710,7 +731,7 @@ public class MainActivity extends AppCompatActivity {
             code.setTypeface(android.graphics.Typeface.MONOSPACE, android.graphics.Typeface.BOLD);
             code.setTextSize(36);
             code.setLetterSpacing(0.15f);
-            code.setTextColor(getColor(R.color.ev_cyan));
+            code.setTextColor(AccentColor.resolve(MainActivity.this, R.attr.evAccentLight));
             status = new TextView(MainActivity.this);
             status.setTextAppearance(R.style.Text_EV_Body);
             status.setText(startingText);
@@ -978,6 +999,7 @@ public class MainActivity extends AppCompatActivity {
         voiceKeySwitch.setOnCheckedChangeListener((btn, checked) ->
                 prefs.edit().putBoolean(UploadSettings.KEY_VOICE_KEY_OPENS, checked).apply());
         bindTireUnit();
+        bindAccentColor();
         fullScreenSwitch = settingsPane.findViewById(R.id.full_screen_switch);
         fullScreenSwitch.setChecked(UploadSettings.fullScreen(prefs));
         fullScreenSwitch.setOnCheckedChangeListener((btn, checked) -> {
@@ -1058,6 +1080,29 @@ public class MainActivity extends AppCompatActivity {
         }, "abrp-test").start();
     }
 
+    /** The accent colour; a change recreates the activity so every view takes it. */
+    private void bindAccentColor() {
+        android.widget.Spinner spinner = settingsPane.findViewById(R.id.accent_spinner);
+        AccentColor[] colors = AccentColor.values();
+        String[] labels = new String[colors.length];
+        for (int i = 0; i < colors.length; i++) labels[i] = colors[i].label;
+        android.widget.ArrayAdapter<String> adapter = new android.widget.ArrayAdapter<>(
+                this, R.layout.spinner_value, labels);
+        adapter.setDropDownViewResource(R.layout.spinner_dropdown);
+        spinner.setAdapter(adapter);
+        AccentColor current = AccentColor.fromPref(prefs.getString(AccentColor.PREF_KEY, null));
+        spinner.setSelection(current.ordinal());
+        spinner.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(android.widget.AdapterView<?> parent, View view, int position, long id) {
+                if (colors[position] == current) return;
+                prefs.edit().putString(AccentColor.PREF_KEY, colors[position].name()).apply();
+                recreate();
+            }
+            @Override public void onNothingSelected(android.widget.AdapterView<?> parent) { }
+        });
+    }
+
     /** Tyre pressure unit: display only, read on every refresh of the Overview. */
     private void bindTireUnit() {
         android.widget.Spinner spinner = settingsPane.findViewById(R.id.tire_unit_spinner);
@@ -1388,9 +1433,10 @@ public class MainActivity extends AppCompatActivity {
             MaterialButton button = consumptionPane.findViewById(id);
             boolean selected = id == selectedId;
             button.setSelected(selected);
-            button.setTextColor(selected ? 0xFFE0424C : COLOR_PENDING);
+            int accent = AccentColor.resolve(this, R.attr.evAccent);
+            button.setTextColor(selected ? accent : COLOR_PENDING);
             button.setStrokeColor(android.content.res.ColorStateList.valueOf(
-                    selected ? 0xFFE0424C : 0xFF3A4143));
+                    selected ? accent : 0xFF3A4143));
         }
     }
 
diff --git a/app/src/main/java/com/evsuite/abrp/PremiumBackdropView.java b/app/src/main/java/com/evsuite/abrp/PremiumBackdropView.java
index fa843b1..b74e90c 100644
--- a/app/src/main/java/com/evsuite/abrp/PremiumBackdropView.java
+++ b/app/src/main/java/com/evsuite/abrp/PremiumBackdropView.java
@@ -8,7 +8,10 @@ import android.graphics.Shader;
 import android.util.AttributeSet;
 import android.view.View;
 
-/** Static, low-opacity light behind the glass panels; no blur passes or animation loop. */
+/**
+ * Static, low-opacity light behind the glass panels, in the accent colour; no blur passes or
+ * animation loop.
+ */
 public final class PremiumBackdropView extends View {
     private final Paint cyan = new Paint(Paint.ANTI_ALIAS_FLAG);
     private final Paint gold = new Paint(Paint.ANTI_ALIAS_FLAG);
@@ -20,10 +23,12 @@ public final class PremiumBackdropView extends View {
 
     @Override protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         float radius = Math.max(1, Math.max(w, h) * 0.65f);
+        int deep = AccentColor.resolve(getContext(), R.attr.evAccentDeep);
+        int stroke = AccentColor.resolve(getContext(), R.attr.evAccentStroke);
         cyan.setShader(new RadialGradient(w * 0.70f, 0, radius,
-                new int[]{0x245B191D, 0x00000000}, null, Shader.TileMode.CLAMP));
+                new int[]{AccentColor.withAlpha(deep, 0x48), 0x00000000}, null, Shader.TileMode.CLAMP));
         gold.setShader(new RadialGradient(w, h, radius * 0.65f,
-                new int[]{0x1C8B3A3F, 0x00000000}, null, Shader.TileMode.CLAMP));
+                new int[]{AccentColor.withAlpha(stroke, 0x1C), 0x00000000}, null, Shader.TileMode.CLAMP));
     }
 
     @Override protected void onDraw(Canvas canvas) {
diff --git a/app/src/main/res/color/input_stroke.xml b/app/src/main/res/color/input_stroke.xml
index 852e4d5..1928860 100644
--- a/app/src/main/res/color/input_stroke.xml
+++ b/app/src/main/res/color/input_stroke.xml
@@ -1 +1 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android"><item android:state_focused="true" android:color="@color/ev_accent"/><item android:color="@color/ev_outline"/></selector>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"><item android:state_focused="true" android:color="?attr/evAccent"/><item android:color="@color/ev_outline"/></selector>
diff --git a/app/src/main/res/color/nav_tab_background.xml b/app/src/main/res/color/nav_tab_background.xml
index 42a552f..efd63c6 100644
--- a/app/src/main/res/color/nav_tab_background.xml
+++ b/app/src/main/res/color/nav_tab_background.xml
@@ -1 +1 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android"><item android:state_selected="true" android:color="@color/ev_gold_surface"/><item android:color="@color/ev_transparent"/></selector>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"><item android:state_selected="true" android:color="?attr/evAccentSurface"/><item android:color="@color/ev_transparent"/></selector>
diff --git a/app/src/main/res/color/nav_tab_foreground.xml b/app/src/main/res/color/nav_tab_foreground.xml
index 64477ea..6abaedc 100644
--- a/app/src/main/res/color/nav_tab_foreground.xml
+++ b/app/src/main/res/color/nav_tab_foreground.xml
@@ -1 +1 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android"><item android:state_selected="true" android:color="@color/ev_accent"/><item android:color="@color/ev_text_secondary"/></selector>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"><item android:state_selected="true" android:color="?attr/evAccent"/><item android:color="@color/ev_text_secondary"/></selector>
diff --git a/app/src/main/res/color/nav_tab_stroke.xml b/app/src/main/res/color/nav_tab_stroke.xml
index 9a29683..3c88fab 100644
--- a/app/src/main/res/color/nav_tab_stroke.xml
+++ b/app/src/main/res/color/nav_tab_stroke.xml
@@ -1 +1 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android"><item android:state_selected="true" android:color="#80703A3D"/><item android:color="@color/ev_transparent"/></selector>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"><item android:state_selected="true" android:color="?attr/evAccentStroke"/><item android:color="@color/ev_transparent"/></selector>
diff --git a/app/src/main/res/color/switch_thumb.xml b/app/src/main/res/color/switch_thumb.xml
index deef655..656d80c 100644
--- a/app/src/main/res/color/switch_thumb.xml
+++ b/app/src/main/res/color/switch_thumb.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@color/ev_outline" />
-    <item android:state_checked="true" android:color="@color/ev_cyan" />
+    <item android:state_checked="true" android:color="?attr/evAccentLight" />
     <item android:color="@color/ev_text_secondary" />
 </selector>
diff --git a/app/src/main/res/color/switch_track.xml b/app/src/main/res/color/switch_track.xml
index 145e36c..176f030 100644
--- a/app/src/main/res/color/switch_track.xml
+++ b/app/src/main/res/color/switch_track.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@color/ev_surface_raised" />
-    <item android:state_checked="true" android:color="#5E3436" />
+    <item android:state_checked="true" android:color="?attr/evAccentTrack" />
     <item android:color="@color/ev_outline" />
 </selector>
diff --git a/app/src/main/res/drawable/bg_battery_card.xml b/app/src/main/res/drawable/bg_battery_card.xml
index 2201dc5..37f6020 100644
--- a/app/src/main/res/drawable/bg_battery_card.xml
+++ b/app/src/main/res/drawable/bg_battery_card.xml
@@ -1 +1,15 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"><gradient android:angle="315" android:startColor="#E5301A1B" android:centerColor="#F012191A" android:endColor="#FA121212"/><corners android:radius="24dp"/><stroke android:width="1dp" android:color="#408C5255"/></shape>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- The accent-tinted card: an accent surface under a neutral fade. Built as layers because a
+     gradient with ?attr colours crashes on Android 9 (fixed in 10); solid and stroke are fine. -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape><solid android:color="?attr/evAccentSurface"/><corners android:radius="24dp"/></shape>
+    </item>
+    <item>
+        <shape>
+            <gradient android:angle="315" android:startColor="#00121212" android:centerColor="#D0121212" android:endColor="#FA121212"/>
+            <corners android:radius="24dp"/>
+            <stroke android:width="1dp" android:color="?attr/evAccentStroke"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/bg_input_panel.xml b/app/src/main/res/drawable/bg_input_panel.xml
index e2b1f97..8eb88fe 100644
--- a/app/src/main/res/drawable/bg_input_panel.xml
+++ b/app/src/main/res/drawable/bg_input_panel.xml
@@ -1 +1 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"><solid android:color="#101213"/><corners android:radius="16dp"/><stroke android:width="1dp" android:color="#322627"/></shape>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"><solid android:color="#101213"/><corners android:radius="16dp"/><stroke android:width="1dp" android:color="?attr/evAccentDeep"/></shape>
diff --git a/app/src/main/res/drawable/bg_topbar.xml b/app/src/main/res/drawable/bg_topbar.xml
index 1d5b3ba..1a26e08 100644
--- a/app/src/main/res/drawable/bg_topbar.xml
+++ b/app/src/main/res/drawable/bg_topbar.xml
@@ -9,7 +9,7 @@
     </item>
     <item android:gravity="bottom" android:height="2dp">
         <shape android:shape="rectangle">
-            <solid android:color="@color/ev_accent" />
+            <solid android:color="?attr/evAccent" />
         </shape>
     </item>
 </layer-list>
diff --git a/app/src/main/res/drawable/bg_version_badge.xml b/app/src/main/res/drawable/bg_version_badge.xml
index 81362e0..d87eb68 100644
--- a/app/src/main/res/drawable/bg_version_badge.xml
+++ b/app/src/main/res/drawable/bg_version_badge.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/ev_cyan_deep" />
-    <stroke android:width="1dp" android:color="@color/ev_cyan" />
+    <solid android:color="?attr/evAccentDeep" />
+    <stroke android:width="1dp" android:color="?attr/evAccentLight" />
     <corners android:radius="14dp" />
 </shape>
diff --git a/app/src/main/res/drawable/ic_chevron_down.xml b/app/src/main/res/drawable/ic_chevron_down.xml
index 8cd2a5d..c290ce9 100644
--- a/app/src/main/res/drawable/ic_chevron_down.xml
+++ b/app/src/main/res/drawable/ic_chevron_down.xml
@@ -2,5 +2,5 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
     <path android:pathData="M6,9 L12,15 L18,9" android:fillColor="@android:color/transparent"
-        android:strokeColor="@color/ev_accent" android:strokeWidth="1.8" android:strokeLineCap="round" android:strokeLineJoin="round" />
+        android:strokeColor="?attr/evAccent" android:strokeWidth="1.8" android:strokeLineCap="round" android:strokeLineJoin="round" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
index 78f93a3..b61bd65 100644
--- a/app/src/main/res/drawable/ic_info.xml
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -1 +1 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:pathData="M12,3 A9,9 0,1 0,12 21 A9,9 0,1 0,12 3 M12,10 L12,17 M12,7 L12,7.2" android:fillColor="#00000000" android:strokeColor="#E0424C" android:strokeWidth="1.6" android:strokeLineCap="round"/></vector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:pathData="M12,3 A9,9 0,1 0,12 21 A9,9 0,1 0,12 3 M12,10 L12,17 M12,7 L12,7.2" android:fillColor="#00000000" android:strokeColor="?attr/evAccent" android:strokeWidth="1.6" android:strokeLineCap="round"/></vector>
diff --git a/app/src/main/res/drawable/ic_vehicle_outline.xml b/app/src/main/res/drawable/ic_vehicle_outline.xml
index 365da1d..806b126 100644
--- a/app/src/main/res/drawable/ic_vehicle_outline.xml
+++ b/app/src/main/res/drawable/ic_vehicle_outline.xml
@@ -1,5 +1,5 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="92dp" android:height="180dp" android:viewportWidth="92" android:viewportHeight="180">
-<path android:pathData="M27,12 Q46,5 65,12 Q74,18 74,38 L78,130 Q79,157 64,164 L28,164 Q13,157 14,130 L18,38 Q18,18 27,12Z" android:fillColor="#1E1516" android:strokeColor="#E0858A" android:strokeWidth="1.4"/>
-<path android:pathData="M24,45 Q46,37 68,45 L63,65 Q46,61 29,65Z M28,129 Q46,135 64,129 L66,148 Q46,155 26,148Z M28,72 L28,122 M64,72 L64,122 M23,28 L35,25 M57,25 L69,28 M23,157 L35,159 M57,159 L69,157" android:fillColor="#301012" android:strokeColor="#7C5254" android:strokeWidth="1.3"/>
-<path android:pathData="M10,43 L10,67 M82,43 L82,67 M10,120 L10,144 M82,120 L82,144" android:fillColor="#00000000" android:strokeColor="#E0424C" android:strokeWidth="5" android:strokeLineCap="round"/>
+<path android:pathData="M27,12 Q46,5 65,12 Q74,18 74,38 L78,130 Q79,157 64,164 L28,164 Q13,157 14,130 L18,38 Q18,18 27,12Z" android:fillColor="?attr/evAccentSurface" android:strokeColor="?attr/evAccentLight" android:strokeWidth="1.4"/>
+<path android:pathData="M24,45 Q46,37 68,45 L63,65 Q46,61 29,65Z M28,129 Q46,135 64,129 L66,148 Q46,155 26,148Z M28,72 L28,122 M64,72 L64,122 M23,28 L35,25 M57,25 L69,28 M23,157 L35,159 M57,159 L69,157" android:fillColor="?attr/evAccentDeep" android:strokeColor="?attr/evAccentStroke" android:strokeWidth="1.3"/>
+<path android:pathData="M10,43 L10,67 M82,43 L82,67 M10,120 L10,144 M82,120 L82,144" android:fillColor="#00000000" android:strokeColor="?attr/evAccent" android:strokeWidth="5" android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/layout-w1000dp/activity_main.xml b/app/src/main/res/layout-w1000dp/activity_main.xml
index 9f322f1..9c564a4 100644
--- a/app/src/main/res/layout-w1000dp/activity_main.xml
+++ b/app/src/main/res/layout-w1000dp/activity_main.xml
@@ -4,7 +4,7 @@
     <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal">
         <ScrollView android:layout_width="192dp" android:layout_height="match_parent" android:layout_margin="16dp" android:fillViewport="true" android:background="@drawable/bg_sidebar" android:scrollbars="none">
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="12dp">
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_brand" android:textAppearance="@style/Text.EV.Hero" android:textColor="@color/ev_accent" android:paddingStart="14dp" android:paddingTop="8dp" />
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_brand" android:textAppearance="@style/Text.EV.Hero" android:textColor="?attr/evAccent" android:paddingStart="14dp" android:paddingTop="8dp" />
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_brand_caption" android:textAppearance="@style/Text.EV.Secondary" android:paddingStart="14dp" android:layout_marginBottom="24dp" />
                 <com.google.android.material.button.MaterialButton android:id="@+id/tabVehicle" style="@style/Widget.EV.NavTab" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginBottom="6dp" android:text="@string/tab_vehicle" app:icon="@drawable/ic_tab_vehicle" />
                 <com.google.android.material.button.MaterialButton android:id="@+id/tabConsumption" style="@style/Widget.EV.NavTab" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginBottom="6dp" android:text="@string/tab_consumption" app:icon="@drawable/ic_tab_vehicle" />
@@ -22,7 +22,7 @@
                     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_overview_subtitle" android:textAppearance="@style/Text.EV.Secondary" android:id="@+id/header_subtitle" android:layout_marginTop="6dp" />
                 </LinearLayout>
                 <TextView android:id="@+id/version_badge" style="@style/Text.EV.VersionBadge" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="8dp" />
-                <com.google.android.material.button.MaterialButton android:id="@+id/update_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="72dp" android:layout_height="72dp" android:minWidth="0dp" android:padding="0dp" android:contentDescription="@string/update_check" app:icon="@drawable/ic_refresh" app:iconGravity="textStart" app:iconPadding="0dp" app:iconTint="@color/ev_accent" />
+                <com.google.android.material.button.MaterialButton android:id="@+id/update_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="72dp" android:layout_height="72dp" android:minWidth="0dp" android:padding="0dp" android:contentDescription="@string/update_check" app:icon="@drawable/ic_refresh" app:iconGravity="textStart" app:iconPadding="0dp" app:iconTint="?attr/evAccent" />
                 <com.google.android.material.button.MaterialButton android:id="@+id/about_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="72dp" android:layout_height="72dp" android:layout_marginStart="8dp" android:minWidth="0dp" android:padding="0dp" android:contentDescription="@string/about_action" app:icon="@drawable/ic_info" app:iconGravity="textStart" app:iconPadding="0dp" />
             </LinearLayout>
             <androidx.viewpager2.widget.ViewPager2 android:id="@+id/content" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" />
diff --git a/app/src/main/res/layout-w1000dp/pane_settings.xml b/app/src/main/res/layout-w1000dp/pane_settings.xml
index 8dfb182..12005cd 100644
--- a/app/src/main/res/layout-w1000dp/pane_settings.xml
+++ b/app/src/main/res/layout-w1000dp/pane_settings.xml
@@ -10,6 +10,8 @@
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_voice_key" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_tire_unit" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
                 <Spinner android:id="@+id/tire_unit_spinner" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:layout_marginTop="12dp" android:background="@drawable/bg_input_panel" android:popupBackground="@color/ev_surface_raised" android:contentDescription="@string/label_tire_unit" android:spinnerMode="dropdown" />
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_accent" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
+                <Spinner android:id="@+id/accent_spinner" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:layout_marginTop="12dp" android:background="@drawable/bg_input_panel" android:popupBackground="@color/ev_surface_raised" android:contentDescription="@string/label_accent" android:spinnerMode="dropdown" />
             </LinearLayout>
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_settings_title" android:textAppearance="@style/Text.EV.Eyebrow" />
diff --git a/app/src/main/res/layout-w1000dp/pane_vehicle.xml b/app/src/main/res/layout-w1000dp/pane_vehicle.xml
index 44a9930..c588ec7 100644
--- a/app/src/main/res/layout-w1000dp/pane_vehicle.xml
+++ b/app/src/main/res/layout-w1000dp/pane_vehicle.xml
@@ -5,7 +5,7 @@
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_battery_card" android:layout_weight="1" android:layout_marginEnd="10dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_short" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_soc" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_charging" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_charging" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_weight="1" android:layout_marginEnd="10dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range" android:textAppearance="@style/Text.EV.Secondary" />
@@ -14,12 +14,12 @@
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_trip" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_range_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_range_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_range_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_average" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_range_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_range_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_range_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_weight="1" android:layout_marginEnd="10dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power" android:textAppearance="@style/Text.EV.Secondary" />
@@ -35,22 +35,22 @@
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_energy_trip" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_energy_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_energy_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_energy_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_usage_trip" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_usage_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_usage_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_usage_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_usage_average" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_usage_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_usage_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_usage_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power_average" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_power_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_power_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_power_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <Space android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" android:layout_marginEnd="10dp" />
         </LinearLayout>
@@ -74,18 +74,18 @@
                 <LinearLayout android:layout_width="match_parent" android:layout_height="224dp" android:orientation="horizontal" android:gravity="center_vertical">
                     <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:orientation="vertical" android:gravity="center">
                         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_fl" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                        <TextView android:id="@+id/vehicle_tire_fl" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="@color/ev_cyan" />
+                        <TextView android:id="@+id/vehicle_tire_fl" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                         <Space android:layout_width="1dp" android:layout_height="44dp" />
                         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_rl" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                        <TextView android:id="@+id/vehicle_tire_rl" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="@color/ev_cyan" />
+                        <TextView android:id="@+id/vehicle_tire_rl" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                     </LinearLayout>
                     <ImageView android:layout_width="92dp" android:layout_height="180dp" android:src="@drawable/ic_vehicle_outline" android:contentDescription="@string/design_car_desc" />
                     <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:orientation="vertical" android:gravity="center">
                         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_fr" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                        <TextView android:id="@+id/vehicle_tire_fr" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="@color/ev_cyan" />
+                        <TextView android:id="@+id/vehicle_tire_fr" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                         <Space android:layout_width="1dp" android:layout_height="44dp" />
                         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_rr" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                        <TextView android:id="@+id/vehicle_tire_rr" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="@color/ev_cyan" />
+                        <TextView android:id="@+id/vehicle_tire_rr" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                     </LinearLayout>
                 </LinearLayout>
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_no_data" android:textAppearance="@style/Text.EV.Secondary" />
diff --git a/app/src/main/res/layout-w600dp/dialog_about.xml b/app/src/main/res/layout-w600dp/dialog_about.xml
index d0994a6..73569f8 100644
--- a/app/src/main/res/layout-w600dp/dialog_about.xml
+++ b/app/src/main/res/layout-w600dp/dialog_about.xml
@@ -4,14 +4,14 @@
     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/about_title" android:textAppearance="@style/Text.EV.Eyebrow" android:layout_marginBottom="24dp"/>
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:baselineAligned="false">
       <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="32dp" android:orientation="vertical">
-        <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_brand" android:textAppearance="@style/Text.EV.Hero" android:textColor="@color/ev_accent"/>
+        <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_brand" android:textAppearance="@style/Text.EV.Hero" android:textColor="?attr/evAccent"/>
         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_brand_caption" android:textAppearance="@style/Text.EV.Title" android:layout_marginTop="12dp"/>
         <TextView android:id="@+id/about_version" android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="8dp"/>
         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/about_attribution" android:textAppearance="@style/Text.EV.Secondary" android:lineSpacingMultiplier="1.3" android:layout_marginTop="24dp"/>
       </LinearLayout>
       <LinearLayout android:layout_width="240dp" android:layout_height="wrap_content" android:orientation="vertical">
         <ImageView android:id="@+id/about_qr_code" android:layout_width="160dp" android:layout_height="160dp" android:layout_gravity="center_horizontal" android:background="#FFFFFF" android:padding="8dp" android:scaleType="fitCenter" android:contentDescription="@string/about_qr_description"/>
-        <TextView android:id="@+id/about_repository" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:gravity="center" android:clickable="true" android:focusable="true" android:background="?attr/selectableItemBackground" android:text="@string/about_repository" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:paddingTop="12dp" android:paddingBottom="12dp"/>
+        <TextView android:id="@+id/about_repository" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:gravity="center" android:clickable="true" android:focusable="true" android:background="?attr/selectableItemBackground" android:text="@string/about_repository" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:paddingTop="12dp" android:paddingBottom="12dp"/>
       </LinearLayout>
     </LinearLayout>
     <View android:layout_width="match_parent" android:layout_height="1dp" android:background="@color/ev_outline" android:layout_marginTop="24dp" android:layout_marginBottom="12dp"/>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 27ba5ae..376a9f8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,7 +8,7 @@
         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_overview_subtitle" android:textAppearance="@style/Text.EV.Secondary" android:id="@+id/header_subtitle" android:layout_marginTop="6dp"/>
       </LinearLayout>
       <TextView android:id="@+id/version_badge" style="@style/Text.EV.VersionBadge" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="8dp"/>
-      <com.google.android.material.button.MaterialButton android:id="@+id/update_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="72dp" android:layout_height="72dp" android:minWidth="0dp" android:padding="0dp" android:contentDescription="@string/update_check" app:icon="@drawable/ic_refresh" app:iconGravity="textStart" app:iconPadding="0dp" app:iconTint="@color/ev_accent"/>
+      <com.google.android.material.button.MaterialButton android:id="@+id/update_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="72dp" android:layout_height="72dp" android:minWidth="0dp" android:padding="0dp" android:contentDescription="@string/update_check" app:icon="@drawable/ic_refresh" app:iconGravity="textStart" app:iconPadding="0dp" app:iconTint="?attr/evAccent"/>
       <com.google.android.material.button.MaterialButton android:id="@+id/about_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="72dp" android:layout_height="72dp" android:layout_marginStart="8dp" android:minWidth="0dp" android:padding="0dp" android:contentDescription="@string/about_action" app:icon="@drawable/ic_info" app:iconGravity="textStart" app:iconPadding="0dp"/>
     </LinearLayout>
     <androidx.viewpager2.widget.ViewPager2 android:id="@+id/content" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1"/>
diff --git a/app/src/main/res/layout/dialog_about.xml b/app/src/main/res/layout/dialog_about.xml
index 5b4a7ac..d552f4c 100644
--- a/app/src/main/res/layout/dialog_about.xml
+++ b/app/src/main/res/layout/dialog_about.xml
@@ -2,13 +2,13 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/bg_glass" android:clipToOutline="true">
   <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="28dp">
     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/about_title" android:textAppearance="@style/Text.EV.Eyebrow" android:layout_marginBottom="24dp"/>
-    <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_brand" android:textAppearance="@style/Text.EV.Hero" android:textColor="@color/ev_accent"/>
+    <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_brand" android:textAppearance="@style/Text.EV.Hero" android:textColor="?attr/evAccent"/>
     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_brand_caption" android:textAppearance="@style/Text.EV.Title" android:layout_marginTop="12dp"/>
     <TextView android:id="@+id/about_version" android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="8dp"/>
     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/about_attribution" android:textAppearance="@style/Text.EV.Secondary" android:lineSpacingMultiplier="1.3" android:layout_marginTop="24dp"/>
     <Space android:layout_width="1dp" android:layout_height="24dp"/>
     <ImageView android:id="@+id/about_qr_code" android:layout_width="160dp" android:layout_height="160dp" android:layout_gravity="center_horizontal" android:background="#FFFFFF" android:padding="8dp" android:scaleType="fitCenter" android:contentDescription="@string/about_qr_description"/>
-    <TextView android:id="@+id/about_repository" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:gravity="center" android:clickable="true" android:focusable="true" android:background="?attr/selectableItemBackground" android:text="@string/about_repository" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:paddingTop="12dp" android:paddingBottom="12dp"/>
+    <TextView android:id="@+id/about_repository" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:gravity="center" android:clickable="true" android:focusable="true" android:background="?attr/selectableItemBackground" android:text="@string/about_repository" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:paddingTop="12dp" android:paddingBottom="12dp"/>
     <View android:layout_width="match_parent" android:layout_height="1dp" android:background="@color/ev_outline" android:layout_marginTop="24dp" android:layout_marginBottom="12dp"/>
     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/about_made_with_love" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginBottom="12dp"/>
     <com.google.android.material.button.MaterialButton android:id="@+id/about_close" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/about_close"/>
diff --git a/app/src/main/res/layout/pane_charging.xml b/app/src/main/res/layout/pane_charging.xml
index 5fab99e..43c34d0 100644
--- a/app/src/main/res/layout/pane_charging.xml
+++ b/app/src/main/res/layout/pane_charging.xml
@@ -2,7 +2,7 @@
 <com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true">
  <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp">
   <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:background="@drawable/bg_glass">
-   <TextView android:id="@+id/charge_status" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="Not charging" android:textAppearance="@style/Text.EV.Title" android:textColor="@color/ev_cyan"/>
+   <TextView android:id="@+id/charge_status" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="Not charging" android:textAppearance="@style/Text.EV.Title" android:textColor="?attr/evAccentLight"/>
    <GridLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:columnCount="2" android:layout_marginTop="12dp">
     <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="SOC" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_soc" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
     <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Start SOC" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_start_soc" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
@@ -18,7 +18,7 @@
   <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:layout_marginTop="16dp" android:background="@drawable/bg_glass">
    <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="CHARGING CURVE" android:textAppearance="@style/Text.EV.Eyebrow"/>
    <com.evsuite.abrp.ChargingGraphView android:id="@+id/charge_graph" android:layout_width="match_parent" android:layout_height="280dp" android:layout_marginTop="12dp"/>
-   <TextView android:id="@+id/charge_curve_table" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:fontFamily="monospace" android:text="No charging measurements yet" android:textAppearance="@style/Text.EV.Body" android:textColor="@color/ev_cyan"/>
+   <TextView android:id="@+id/charge_curve_table" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:fontFamily="monospace" android:text="No charging measurements yet" android:textAppearance="@style/Text.EV.Body" android:textColor="?attr/evAccentLight"/>
   </LinearLayout>
  </LinearLayout>
 </com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout/pane_consumption.xml b/app/src/main/res/layout/pane_consumption.xml
index 791c8fb..3f19a5a 100644
--- a/app/src/main/res/layout/pane_consumption.xml
+++ b/app/src/main/res/layout/pane_consumption.xml
@@ -4,7 +4,7 @@
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:background="@drawable/bg_glass">
       <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical">
         <TextView android:layout_width="0dp" android:layout_weight="1" android:layout_height="wrap_content" android:text="CONSUMPTION PERIOD" android:textAppearance="@style/Text.EV.Eyebrow"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_refresh" style="@style/Widget.EV.Button.Outlined" android:layout_width="48dp" android:layout_height="48dp" android:minWidth="0dp" android:padding="0dp" android:contentDescription="Refresh" app:icon="@drawable/ic_refresh" app:iconGravity="textStart" app:iconPadding="0dp" app:iconTint="@color/ev_accent"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_refresh" style="@style/Widget.EV.Button.Outlined" android:layout_width="48dp" android:layout_height="48dp" android:minWidth="0dp" android:padding="0dp" android:contentDescription="Refresh" app:icon="@drawable/ic_refresh" app:iconGravity="textStart" app:iconPadding="0dp" app:iconTint="?attr/evAccent"/>
       </LinearLayout>
       <HorizontalScrollView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:scrollbars="none">
        <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal">
@@ -29,7 +29,7 @@
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:layout_marginTop="16dp" android:background="@drawable/bg_glass">
       <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="DAILY LOG · LAST 4 MONTHS" android:textAppearance="@style/Text.EV.Eyebrow"/>
       <com.google.android.material.button.MaterialButton android:id="@+id/consumption_date_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="56dp" android:layout_marginTop="12dp" android:text="Pick a date"/>
-      <TextView android:id="@+id/consumption_daily_history" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:fontFamily="monospace" android:text="No daily data yet" android:textAppearance="@style/Text.EV.Body" android:textColor="@color/ev_cyan"/>
+      <TextView android:id="@+id/consumption_daily_history" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:fontFamily="monospace" android:text="No daily data yet" android:textAppearance="@style/Text.EV.Body" android:textColor="?attr/evAccentLight"/>
     </LinearLayout>
   </LinearLayout>
 </com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout/pane_log.xml b/app/src/main/res/layout/pane_log.xml
index 17f220e..b6ba2e1 100644
--- a/app/src/main/res/layout/pane_log.xml
+++ b/app/src/main/res/layout/pane_log.xml
@@ -7,5 +7,9 @@
         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/label_steering_keys" android:textAppearance="@style/Text.EV.Eyebrow" />
         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/hint_steering_keys" android:textAppearance="@style/Text.EV.Secondary" />
         <TextView android:id="@+id/steering_keys_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:text="@string/steering_keys_empty" android:textAppearance="@style/Text.EV.Body" android:fontFamily="monospace" android:textSize="14sp" android:lineSpacingExtra="4dp" />
+        <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/label_car_color" android:textAppearance="@style/Text.EV.Eyebrow" />
+        <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/hint_car_color" android:textAppearance="@style/Text.EV.Secondary" />
+        <com.google.android.material.button.MaterialButton android:id="@+id/car_color_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:text="@string/btn_car_color" />
+        <TextView android:id="@+id/car_color_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:textAppearance="@style/Text.EV.Body" android:fontFamily="monospace" android:textSize="14sp" android:lineSpacingExtra="4dp" android:textIsSelectable="true" />
     </LinearLayout>
 </com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout/pane_settings.xml b/app/src/main/res/layout/pane_settings.xml
index 534f54b..943732d 100644
--- a/app/src/main/res/layout/pane_settings.xml
+++ b/app/src/main/res/layout/pane_settings.xml
@@ -9,6 +9,8 @@
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_voice_key" android:textAppearance="@style/Text.EV.Secondary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_tire_unit" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
             <Spinner android:id="@+id/tire_unit_spinner" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:layout_marginTop="12dp" android:background="@drawable/bg_input_panel" android:popupBackground="@color/ev_surface_raised" android:contentDescription="@string/label_tire_unit" android:spinnerMode="dropdown" />
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_accent" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
+            <Spinner android:id="@+id/accent_spinner" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:layout_marginTop="12dp" android:background="@drawable/bg_input_panel" android:popupBackground="@color/ev_surface_raised" android:contentDescription="@string/label_accent" android:spinnerMode="dropdown" />
         </LinearLayout>
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_settings_title" android:textAppearance="@style/Text.EV.Eyebrow" />
diff --git a/app/src/main/res/layout/pane_vehicle.xml b/app/src/main/res/layout/pane_vehicle.xml
index 28d6816..3a27579 100644
--- a/app/src/main/res/layout/pane_vehicle.xml
+++ b/app/src/main/res/layout/pane_vehicle.xml
@@ -5,7 +5,7 @@
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_battery_card" android:layout_columnWeight="1" android:layout_margin="4dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_short" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_soc" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_charging" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_charging" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_columnWeight="1" android:layout_margin="4dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range" android:textAppearance="@style/Text.EV.Secondary" />
@@ -14,27 +14,27 @@
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_trip" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_range_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_range_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_range_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_average" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_range_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_range_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_range_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_energy_trip" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_energy_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_energy_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_energy_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_usage_trip" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_usage_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_usage_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_usage_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_usage_average" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_usage_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_usage_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_usage_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_columnWeight="1" android:layout_margin="4dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power" android:textAppearance="@style/Text.EV.Secondary" />
@@ -43,7 +43,7 @@
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power_average" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_power_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_power_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="@color/ev_cyan" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_power_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_columnWeight="1" android:layout_margin="4dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_speed" android:textAppearance="@style/Text.EV.Secondary" />
@@ -69,18 +69,18 @@
             <LinearLayout android:layout_width="match_parent" android:layout_height="224dp" android:orientation="horizontal" android:gravity="center_vertical">
                 <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:orientation="vertical" android:gravity="center">
                     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_fl" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                    <TextView android:id="@+id/vehicle_tire_fl" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="@color/ev_cyan" />
+                    <TextView android:id="@+id/vehicle_tire_fl" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                     <Space android:layout_width="1dp" android:layout_height="44dp" />
                     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_rl" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                    <TextView android:id="@+id/vehicle_tire_rl" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="@color/ev_cyan" />
+                    <TextView android:id="@+id/vehicle_tire_rl" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                 </LinearLayout>
                 <ImageView android:layout_width="92dp" android:layout_height="180dp" android:src="@drawable/ic_vehicle_outline" android:contentDescription="@string/design_car_desc" />
                 <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:orientation="vertical" android:gravity="center">
                     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_fr" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                    <TextView android:id="@+id/vehicle_tire_fr" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="@color/ev_cyan" />
+                    <TextView android:id="@+id/vehicle_tire_fr" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                     <Space android:layout_width="1dp" android:layout_height="44dp" />
                     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_rr" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                    <TextView android:id="@+id/vehicle_tire_rr" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="@color/ev_cyan" />
+                    <TextView android:id="@+id/vehicle_tire_rr" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                 </LinearLayout>
             </LinearLayout>
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_no_data" android:textAppearance="@style/Text.EV.Secondary" />
diff --git a/app/src/main/res/values/accents.xml b/app/src/main/res/values/accents.xml
new file mode 100644
index 0000000..b781709
--- /dev/null
+++ b/app/src/main/res/values/accents.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Accent palettes after the MG4 paint colours, applied over the app theme by MainActivity
+     (AccentColor.java). Each: accent, text on it, light and deep variants, the tinted card
+     surface, a muted stroke and the switch track. White, silver and black cannot be an accent on
+     an OLED-black screen as they are, so they become cool light greys and a pearl blue-grey. -->
+<resources>
+    <!-- Dynamic Red -->
+    <style name="ThemeOverlay.EV.Accent.DynamicRed" parent="">
+        <item name="evAccent">#E0424C</item>
+        <item name="evOnAccent">#1A0B0C</item>
+        <item name="evAccentLight">#FF9A9E</item>
+        <item name="evAccentDeep">#3A1215</item>
+        <item name="evAccentSurface">#2A1416</item>
+        <item name="evAccentStroke">#80703A3D</item>
+        <item name="evAccentTrack">#5E3436</item>
+    </style>
+    <!-- Volcano Orange -->
+    <style name="ThemeOverlay.EV.Accent.VolcanoOrange" parent="">
+        <item name="evAccent">#F2762E</item>
+        <item name="evOnAccent">#1F0E04</item>
+        <item name="evAccentLight">#FFB68A</item>
+        <item name="evAccentDeep">#3D1E0C</item>
+        <item name="evAccentSurface">#2B190F</item>
+        <item name="evAccentStroke">#80774A2E</item>
+        <item name="evAccentTrack">#6A4430</item>
+    </style>
+    <!-- Holborn Blue -->
+    <style name="ThemeOverlay.EV.Accent.HolbornBlue" parent="">
+        <item name="evAccent">#4A86E0</item>
+        <item name="evOnAccent">#04101F</item>
+        <item name="evAccentLight">#A6C8FF</item>
+        <item name="evAccentDeep">#10233F</item>
+        <item name="evAccentSurface">#141C2A</item>
+        <item name="evAccentStroke">#80354E70</item>
+        <item name="evAccentTrack">#34486A</item>
+    </style>
+    <!-- Racing Green -->
+    <style name="ThemeOverlay.EV.Accent.RacingGreen" parent="">
+        <item name="evAccent">#3FA66A</item>
+        <item name="evOnAccent">#04140B</item>
+        <item name="evAccentLight">#9EDDB6</item>
+        <item name="evAccentDeep">#0F2C1B</item>
+        <item name="evAccentSurface">#132118</item>
+        <item name="evAccentStroke">#80305C42</item>
+        <item name="evAccentTrack">#2F5A42</item>
+    </style>
+    <!-- Camden Grey -->
+    <style name="ThemeOverlay.EV.Accent.CamdenGrey" parent="">
+        <item name="evAccent">#8C959C</item>
+        <item name="evOnAccent">#0E1113</item>
+        <item name="evAccentLight">#C9D0D5</item>
+        <item name="evAccentDeep">#23282C</item>
+        <item name="evAccentSurface">#1C1F21</item>
+        <item name="evAccentStroke">#80505860</item>
+        <item name="evAccentTrack">#454C52</item>
+    </style>
+    <!-- Monument Silver -->
+    <style name="ThemeOverlay.EV.Accent.MonumentSilver" parent="">
+        <item name="evAccent">#B8C0C7</item>
+        <item name="evOnAccent">#121516</item>
+        <item name="evAccentLight">#E3E8EC</item>
+        <item name="evAccentDeep">#2A2F33</item>
+        <item name="evAccentSurface">#1E2124</item>
+        <item name="evAccentStroke">#80646B72</item>
+        <item name="evAccentTrack">#565D63</item>
+    </style>
+    <!-- Arctic White -->
+    <style name="ThemeOverlay.EV.Accent.ArcticWhite" parent="">
+        <item name="evAccent">#ECEEF0</item>
+        <item name="evOnAccent">#121314</item>
+        <item name="evAccentLight">#FFFFFF</item>
+        <item name="evAccentDeep">#2E3033</item>
+        <item name="evAccentSurface">#202224</item>
+        <item name="evAccentStroke">#80767A7E</item>
+        <item name="evAccentTrack">#62666A</item>
+    </style>
+    <!-- Black Pearl -->
+    <style name="ThemeOverlay.EV.Accent.BlackPearl" parent="">
+        <item name="evAccent">#7D88A0</item>
+        <item name="evOnAccent">#0B0E13</item>
+        <item name="evAccentLight">#BCC5D6</item>
+        <item name="evAccentDeep">#1C212A</item>
+        <item name="evAccentSurface">#171A20</item>
+        <item name="evAccentStroke">#804A5263</item>
+        <item name="evAccentTrack">#3E4656</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/attrs_accent.xml b/app/src/main/res/values/attrs_accent.xml
new file mode 100644
index 0000000..518aa16
--- /dev/null
+++ b/app/src/main/res/values/attrs_accent.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- The accent palette, a theme attribute each so it can follow the chosen MG4 paint colour
+     (values/accents.xml, AccentColor.java). Layouts, colour lists and drawables use ?attr/… for
+     these; the fixed neutrals stay in colors.xml. -->
+<resources>
+    <attr name="evAccent" format="color" />
+    <attr name="evOnAccent" format="color" />
+    <attr name="evAccentLight" format="color" />
+    <attr name="evAccentDeep" format="color" />
+    <attr name="evAccentSurface" format="color" />
+    <attr name="evAccentStroke" format="color" />
+    <attr name="evAccentTrack" format="color" />
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c5f6be3..6fdc37f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- User-requested app-specific OLED palette. The accent is MG red (#E0424C, the red of the
-     launcher icon); it replaced upstream's muted gold on 2026-10-17. ev_gold_surface keeps its
-     name but is now the dark red tint that goes with it. ev_cyan / ev_cyan_deep likewise keep
-     their names but are the light and the deep red of the same palette (no turquoise left). -->
+<!-- User-requested app-specific OLED palette: the fixed neutrals. The accent colours are theme
+     attributes (values/attrs_accent.xml) that follow the chosen MG4 paint colour
+     (values/accents.xml); Dynamic Red, the red of the launcher icon, is the default. -->
 <resources>
   <color name="ev_background">#000000</color>
   <color name="ev_surface">#121212</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e6e7459..15ab486 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -39,6 +39,11 @@
     <string name="power_kw">%1$.1f kW</string>
     <string name="power_waiting">needs a minute of data</string>
     <string name="label_tire_unit">Tyre pressure unit</string>
+    <string name="label_accent">Accent colour</string>
+    <string name="label_car_color">CAR COLOUR</string>
+    <string name="hint_car_color">Lists the head unit\'s settings that mention a colour, paint or car model, to find out whether the car\'s colour can be read. A photo of this list helps.</string>
+    <string name="btn_car_color">Look for the car colour</string>
+    <string name="car_color_none">Nothing colour-related found</string>
     <string name="energy_kwh">%1$.1f kWh</string>
     <string name="energy_trip_note">net, after recuperation</string>
     <string name="energy_trip_waiting">once the car is on</string>
diff --git a/app/src/main/res/values/styles_app.xml b/app/src/main/res/values/styles_app.xml
index cfeef15..1b39cf5 100644
--- a/app/src/main/res/values/styles_app.xml
+++ b/app/src/main/res/values/styles_app.xml
@@ -39,19 +39,19 @@
     <item name="boxCornerRadiusTopEnd">16dp</item>
     <item name="boxCornerRadiusBottomStart">16dp</item>
     <item name="boxCornerRadiusBottomEnd">16dp</item>
-    <item name="hintTextColor">@color/ev_accent</item>
+    <item name="hintTextColor">?attr/evAccent</item>
     <item name="endIconTint">@color/ev_text_secondary</item>
     <item name="helperTextTextAppearance">@style/Text.EV.Secondary</item>
   </style>
   <style name="Text.EV.Eyebrow" parent="Text.EV.SectionHeader">
     <item name="android:textSize">16sp</item>
-    <item name="android:textColor">@color/ev_accent</item>
+    <item name="android:textColor">?attr/evAccent</item>
     <item name="android:fontFamily">sans-serif-medium</item>
     <item name="android:letterSpacing">0.12</item>
   </style>
   <style name="Text.EV.VersionBadge" parent="Text.EV.Secondary">
     <item name="android:background">@drawable/bg_version_badge</item>
-    <item name="android:textColor">@color/ev_cyan</item>
+    <item name="android:textColor">?attr/evAccentLight</item>
     <item name="android:textSize">13sp</item>
     <item name="android:fontFamily">sans-serif-medium</item>
     <item name="android:paddingStart">10dp</item>
diff --git a/app/src/main/res/values/styles_ev.xml b/app/src/main/res/values/styles_ev.xml
index 5506109..0defd39 100644
--- a/app/src/main/res/values/styles_ev.xml
+++ b/app/src/main/res/values/styles_ev.xml
@@ -22,8 +22,8 @@
         <item name="android:textAllCaps">false</item>
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:letterSpacing">0.01</item>
-        <item name="backgroundTint">@color/ev_accent</item>
-        <item name="android:textColor">@color/ev_on_accent</item>
+        <item name="backgroundTint">?attr/evAccent</item>
+        <item name="android:textColor">?attr/evOnAccent</item>
         <item name="elevation">0dp</item>
         <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.EV.Button</item>
         <item name="android:minHeight">@dimen/touch_target</item>
@@ -65,7 +65,7 @@
          16sp floor without shouting. -->
     <style name="Text.EV.SectionHeader" parent="TextAppearance.Material3.LabelLarge">
         <item name="android:textSize">@dimen/text_label</item>
-        <item name="android:textColor">@color/ev_accent</item>
+        <item name="android:textColor">?attr/evAccent</item>
         <item name="android:letterSpacing">0.12</item>
         <item name="android:textStyle">bold</item>
     </style>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index d6cc7f8..9432ab5 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,15 +3,23 @@
 
     <!-- User-requested OLED theme. MainActivity fixes night mode for system widgets too. -->
     <style name="Theme.EVABRPUploader" parent="Theme.Material3.DayNight.NoActionBar">
-        <item name="colorPrimary">@color/ev_accent</item>
-        <item name="colorSecondary">@color/ev_cyan</item>
-        <item name="colorControlActivated">@color/ev_cyan</item>
+        <!-- Dynamic Red; MainActivity lays the chosen accent over these (values/accents.xml). -->
+        <item name="evAccent">#E0424C</item>
+        <item name="evOnAccent">#1A0B0C</item>
+        <item name="evAccentLight">#FF9A9E</item>
+        <item name="evAccentDeep">#3A1215</item>
+        <item name="evAccentSurface">#2A1416</item>
+        <item name="evAccentStroke">#80703A3D</item>
+        <item name="evAccentTrack">#5E3436</item>
+        <item name="colorPrimary">?attr/evAccent</item>
+        <item name="colorSecondary">?attr/evAccentLight</item>
+        <item name="colorControlActivated">?attr/evAccentLight</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:windowLightNavigationBar">false</item>
         <item name="android:navigationBarColor">@color/ev_background</item>
         <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
-        <item name="colorOnPrimary">@color/ev_on_accent</item>
+        <item name="colorOnPrimary">?attr/evOnAccent</item>
         <item name="colorSurface">@color/ev_surface</item>
         <item name="colorSurfaceContainer">@color/ev_surface_raised</item>
         <item name="android:colorBackground">@color/ev_background</item>
diff --git a/app/src/test/java/com/evsuite/abrp/AccentColorTest.java b/app/src/test/java/com/evsuite/abrp/AccentColorTest.java
new file mode 100644
index 0000000..2229a9d
--- /dev/null
+++ b/app/src/test/java/com/evsuite/abrp/AccentColorTest.java
@@ -0,0 +1,22 @@
+package com.evsuite.abrp;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+/** The accent colour choice — pure JVM. */
+public class AccentColorTest {
+
+    @Test
+    public void dynamicRedUnlessAnotherWasChosen() {
+        assertEquals(AccentColor.DYNAMIC_RED, AccentColor.fromPref(null));
+        assertEquals(AccentColor.DYNAMIC_RED, AccentColor.fromPref("PINK"));
+        assertEquals(AccentColor.VOLCANO_ORANGE, AccentColor.fromPref("VOLCANO_ORANGE"));
+    }
+
+    @Test
+    public void alphaIsReplacedNotMixed() {
+        assertEquals(0x55A6C8FF, AccentColor.withAlpha(0xFFA6C8FF, 0x55));
+        assertEquals(0x00123456, AccentColor.withAlpha(0x80123456, 0));
+    }
+}
diff --git a/app/src/test/java/com/evsuite/abrp/CarColorProbeTest.java b/app/src/test/java/com/evsuite/abrp/CarColorProbeTest.java
new file mode 100644
index 0000000..7ac9479
--- /dev/null
+++ b/app/src/test/java/com/evsuite/abrp/CarColorProbeTest.java
@@ -0,0 +1,24 @@
+package com.evsuite.abrp;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+
+/** Picking colour-related system properties out of getprop's output — pure JVM. */
+public class CarColorProbeTest {
+
+    @Test
+    public void onlyColourOrModelRelatedPropertiesAreListed() {
+        String getprop = "[ro.build.version.sdk]: [28]\n"
+                + "[persist.saic.vehicle.color]: [3]\n"
+                + "[ro.product.model]: [EH32]\n"
+                + "[persist.car.bodyCol]: [RED]\n"
+                + "[sys.launcher.car_model]: [mg4_red.glb]\n"
+                + "garbage line\n";
+        assertEquals(Arrays.asList("persist.saic.vehicle.color = 3", "persist.car.bodyCol = RED",
+                "sys.launcher.car_model = mg4_red.glb"), CarColorProbe.filter(getprop, 50));
+        assertEquals(1, CarColorProbe.filter(getprop, 1).size());
+    }
+}

From 010a0cd50d00c9fb082d33e9d7444816e5c1d13e Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 17:22:22 +0200
Subject: [PATCH 56/79] App 2.14.1: right-aligned values with equal-width
 digits

The Overview tiles' values (and the notes under them) are right-aligned
and use tabular figures, so a value going from 9 to 10 to 100 grows to
the left instead of shifting the whole text, and digits no longer
change width as they tick. The labels stay left; tyre pressures stay
centred but use tabular figures too.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                      |  2 +
 app/build.gradle                              |  4 +-
 .../main/res/layout-w1000dp/pane_vehicle.xml  | 42 +++++++++----------
 app/src/main/res/layout/pane_vehicle.xml      | 42 +++++++++----------
 4 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index 7692eb7..20f14d8 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -113,6 +113,8 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.14.1: Overview values and their notes right-aligned, with tabular
+  (equal-width) digits, so 9 → 10 → 100 no longer shifts the text; labels stay left.
 - 2026-10-18 — App 2.14.0: accent colour selectable after the MG4 paints (Settings → Display):
   Dynamic Red (default), Volcano Orange, Holborn Blue, Racing Green, Camden Grey, Monument Silver,
   Arctic White, Black Pearl; white, silver and black become light greys and a pearl blue-grey,
diff --git a/app/build.gradle b/app/build.gradle
index 03d0b55..aa1d813 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 78
-        versionName "2.14.0"
+        versionCode 79
+        versionName "2.14.1"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/res/layout-w1000dp/pane_vehicle.xml b/app/src/main/res/layout-w1000dp/pane_vehicle.xml
index c588ec7..6357b56 100644
--- a/app/src/main/res/layout-w1000dp/pane_vehicle.xml
+++ b/app/src/main/res/layout-w1000dp/pane_vehicle.xml
@@ -4,53 +4,53 @@
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:baselineAligned="false">
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_battery_card" android:layout_weight="1" android:layout_marginEnd="10dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_short" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_soc" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_charging" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_soc" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_charging" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_weight="1" android:layout_marginEnd="10dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_trip" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_range_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_range_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range_trip_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_average" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_range_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_range_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range_average_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_weight="1" android:layout_marginEnd="10dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_weight="1" android:layout_marginEnd="10dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_speed" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_speed" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_speed" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
             </LinearLayout>
         </LinearLayout>
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:orientation="horizontal" android:baselineAligned="false">
             <Space android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" android:layout_marginEnd="10dp" />
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_energy_trip" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_energy_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_energy_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_energy_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_energy_trip_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_usage_trip" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_usage_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_usage_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_usage_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_usage_trip_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_usage_average" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_usage_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_usage_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_usage_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_usage_average_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power_average" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_power_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_power_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_power_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_power_average_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <Space android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" android:layout_marginEnd="10dp" />
         </LinearLayout>
@@ -74,18 +74,18 @@
                 <LinearLayout android:layout_width="match_parent" android:layout_height="224dp" android:orientation="horizontal" android:gravity="center_vertical">
                     <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:orientation="vertical" android:gravity="center">
                         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_fl" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                        <TextView android:id="@+id/vehicle_tire_fl" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
+                        <TextView android:id="@+id/vehicle_tire_fl" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                         <Space android:layout_width="1dp" android:layout_height="44dp" />
                         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_rl" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                        <TextView android:id="@+id/vehicle_tire_rl" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
+                        <TextView android:id="@+id/vehicle_tire_rl" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                     </LinearLayout>
                     <ImageView android:layout_width="92dp" android:layout_height="180dp" android:src="@drawable/ic_vehicle_outline" android:contentDescription="@string/design_car_desc" />
                     <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:orientation="vertical" android:gravity="center">
                         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_fr" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                        <TextView android:id="@+id/vehicle_tire_fr" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
+                        <TextView android:id="@+id/vehicle_tire_fr" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                         <Space android:layout_width="1dp" android:layout_height="44dp" />
                         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_rr" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                        <TextView android:id="@+id/vehicle_tire_rr" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
+                        <TextView android:id="@+id/vehicle_tire_rr" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                     </LinearLayout>
                 </LinearLayout>
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_no_data" android:textAppearance="@style/Text.EV.Secondary" />
diff --git a/app/src/main/res/layout/pane_vehicle.xml b/app/src/main/res/layout/pane_vehicle.xml
index 3a27579..5bc5918 100644
--- a/app/src/main/res/layout/pane_vehicle.xml
+++ b/app/src/main/res/layout/pane_vehicle.xml
@@ -4,50 +4,50 @@
         <GridLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:columnCount="2">
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_battery_card" android:layout_columnWeight="1" android:layout_margin="4dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_short" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_soc" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_charging" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_soc" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_charging" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_columnWeight="1" android:layout_margin="4dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_trip" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_range_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_range_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range_trip_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_average" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_range_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_range_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range_average_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_energy_trip" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_energy_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_energy_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_energy_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_energy_trip_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_usage_trip" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_usage_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_usage_trip_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_usage_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_usage_trip_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_usage_average" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_usage_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_usage_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_usage_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_usage_average_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_columnWeight="1" android:layout_margin="4dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power_average" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_power_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_power_average_note" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_power_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_power_average_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_columnWeight="1" android:layout_margin="4dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_speed" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_speed" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_speed" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
             </LinearLayout>
         </GridLayout>
         <Space android:layout_width="1dp" android:layout_height="16dp" />
@@ -69,18 +69,18 @@
             <LinearLayout android:layout_width="match_parent" android:layout_height="224dp" android:orientation="horizontal" android:gravity="center_vertical">
                 <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:orientation="vertical" android:gravity="center">
                     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_fl" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                    <TextView android:id="@+id/vehicle_tire_fl" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
+                    <TextView android:id="@+id/vehicle_tire_fl" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                     <Space android:layout_width="1dp" android:layout_height="44dp" />
                     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_rl" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                    <TextView android:id="@+id/vehicle_tire_rl" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
+                    <TextView android:id="@+id/vehicle_tire_rl" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                 </LinearLayout>
                 <ImageView android:layout_width="92dp" android:layout_height="180dp" android:src="@drawable/ic_vehicle_outline" android:contentDescription="@string/design_car_desc" />
                 <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:orientation="vertical" android:gravity="center">
                     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_fr" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                    <TextView android:id="@+id/vehicle_tire_fr" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
+                    <TextView android:id="@+id/vehicle_tire_fr" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                     <Space android:layout_width="1dp" android:layout_height="44dp" />
                     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_rr" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                    <TextView android:id="@+id/vehicle_tire_rr" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
+                    <TextView android:id="@+id/vehicle_tire_rr" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                 </LinearLayout>
             </LinearLayout>
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_no_data" android:textAppearance="@style/Text.EV.Secondary" />

From 727da51a3c5ece2af737c3c7ad6b01208bdd1e17 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 17:25:35 +0200
Subject: [PATCH 57/79] App 2.14.2: "Range, 5-min average"

Same form as "Usage, 5-min average" and "Power, 5-min average".

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                            | 1 +
 app/build.gradle                    | 4 ++--
 app/src/main/res/values/strings.xml | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index 20f14d8..e03021b 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -113,6 +113,7 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.14.2: "Range, 5-min average", like the usage and power cards (was "Range at 5-min average").
 - 2026-10-18 — App 2.14.1: Overview values and their notes right-aligned, with tabular
   (equal-width) digits, so 9 → 10 → 100 no longer shifts the text; labels stay left.
 - 2026-10-18 — App 2.14.0: accent colour selectable after the MG4 paints (Settings → Display):
diff --git a/app/build.gradle b/app/build.gradle
index aa1d813..da384c1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 79
-        versionName "2.14.1"
+        versionCode 80
+        versionName "2.14.2"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 15ab486..ab25183 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,7 +32,7 @@
     <string name="vehicle_row_range">Range</string>
     <string name="vehicle_row_power">Power</string>
     <string name="vehicle_row_range_trip">Range since start</string>
-    <string name="vehicle_row_range_average">Range at 5-min average</string>
+    <string name="vehicle_row_range_average">Range, 5-min average</string>
     <string name="vehicle_row_usage_trip">Usage since start</string>
     <string name="vehicle_row_energy_trip">Energy since start</string>
     <string name="vehicle_row_power_average">Power, 5-min average</string>

From 5e2e354bdd2a161cafbc057552b5d4ef634ede28 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 17:42:54 +0200
Subject: [PATCH 58/79] About dialog points to our repository; SPECS status
 refreshed

The About dialog's link and QR code open
https://git.stinnesbeck.com/nils/mg4 instead of Fatih's GitHub
repository (the credits to upstream stay). SPECS.md: the Status section
describes the current versions and what has and has not been tried on
the car; the architecture notes list the current tabs and data paths.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                      | 39 +++++++++++--------
 app/build.gradle                              |  4 +-
 .../java/com/evsuite/abrp/MainActivity.java   |  2 +-
 app/src/main/res/values/strings.xml           |  2 +-
 4 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index e03021b..8185669 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -23,27 +23,34 @@ car ──live telemetry───▶ car.k8s.stinnesbeck.com (Go)
 
 - **Server:** `server/`, Go 1.26, API only — see `server/README.md` for endpoints, configuration
   and the storage layout. Replaced the Next.js app from upstream (`web/`, removed 2026-10-17).
-- **Dashboards:** Grafana, provisioned from `k8s/grafana/`: Live (stats, SoC/range, power/speed,
-  route map, temperatures, tyres), Consumption (period totals, lifetime, SoH, per-day energy,
+- **Dashboards:** Grafana, provisioned from `k8s/grafana/`, reading with a read-only token: Live
+  (stats, SoC/range, power/speed, route map, temperatures, tyres), Consumption (period totals, lifetime, SoH, per-day energy,
   distance and efficiency) and Charging (totals, session table, curves). Prices in euro.
 - **Pairing:** the car shows a QR code, a phone approves it with the approval password, and the car
-  gets its own token (RFC 8628-style; `server/README.md`). The shared `INGEST_TOKEN` still works.
-- **Car app:** Server tab (URL, pairing by QR, ingest token, installation id, config import); live telemetry
-  every 15 s while driving or charging; consumption chunks and charging sessions as before.
+  gets its own token, bound to its installation id (RFC 8628-style; `server/README.md`). The
+  shared `INGEST_TOKEN` still works. The same QR flow carries settings typed on the phone.
+- **Car app:** tabs Overview, Consumption, Charging, Live data (on/off, ABRP credentials,
+  frequency), Server (URL, pairing, token, installation id, config import), Settings (display,
+  voice key, tyre unit, accent colour, battery, charging price, Wi-Fi), Logs. Live telemetry every
+  15 s while driving or charging, to the server and straight to ABRP; consumption chunks and
+  charging sessions to the server.
 - **Deployment:** `k8s/`, plain manifests. **Nothing is ever applied to the cluster by us** —
   Nils applies them (`k8s/README.md`). TLS comes from Traefik's default certificate.
 
 ### Status
 
-- [x] Go server 2.0.0: tests and govulncheck clean; image builds (about 11 MB).
-- [x] End-to-end in podman (server + InfluxDB 2.7.12 + Grafana 13.2.3): every endpoint, retry
-      idempotency, all 25 dashboard queries return data, dashboards rendered and checked.
-- [x] Manifests validated offline (including Traefik CRDs). **Not applied.**
-- [x] Car app 2.4.0 (pairing by QR): unit tests pass; **not yet tried on the car**.
-- [x] Image `mg4-server:2.1.0` (with pairing) pushed to git.stinnesbeck.com (public; pinned by
-      digest `sha256:e5f6e2d2…` in `k8s/server.yaml`).
+Current: app 2.14.2, server 2.5.0 (pinned by digest in `k8s/server.yaml`).
+
+- [x] On the car: QR pairing, values on the Overview, voice-key double press, full screen
+      without black bands.
+- [x] Go server: tests and govulncheck clean; end to end in podman against InfluxDB 2.7.12
+      (telemetry, consumption, charging, pairing, settings from the phone) and Grafana 13.2.3 (all
+      dashboard queries return data).
+- [x] Manifests validated offline (kubeconform, with Traefik CRDs). **Applied by Nils only.**
 - [ ] Check Grafana's host in `k8s/ingress.yaml` (placeholder `car-grafana.k8s.stinnesbeck.com`).
-- [ ] First pairing and drive with 2.4.0: telemetry arrives in InfluxDB, Grafana and ABRP.
+- [ ] Not yet tried on the car: live data straight to ABRP (2.11), Enter on phone (2.12), accent
+      colours and the car-colour probe on the Logs tab (2.14; a photo of its list decides whether
+      the accent can follow the paint automatically), right-aligned values (2.14.1).
 
 ### Signals the car does not provide
 
@@ -63,10 +70,6 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
 
 ## To do
 
-- [ ] **About dialog link and QR code → https://git.stinnesbeck.com/nils/mg4.**
-      Both come from `REPOSITORY_URL` in `app/src/main/java/com/evsuite/abrp/MainActivity.java`
-      and `about_repository` in `app/src/main/res/values/strings.xml`. They still point to Fatih's
-      GitHub repository.
 - [ ] **Re-enable OTA updates against our own releases.** `RELEASES_API` in
       `app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java` points at `updates.invalid` on purpose,
       so checks fail. The updater speaks the GitHub releases API and only allows GitHub hosts
@@ -113,6 +116,8 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — About dialog: link and QR code point to https://git.stinnesbeck.com/nils/mg4
+  (were Fatih's GitHub). Status section brought up to date.
 - 2026-10-18 — App 2.14.2: "Range, 5-min average", like the usage and power cards (was "Range at 5-min average").
 - 2026-10-18 — App 2.14.1: Overview values and their notes right-aligned, with tabular
   (equal-width) digits, so 9 → 10 → 100 no longer shifts the text; labels stay left.
diff --git a/app/build.gradle b/app/build.gradle
index da384c1..e9e9959 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 80
-        versionName "2.14.2"
+        versionCode 81
+        versionName "2.14.3"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index d86d2ce..2e21606 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -37,7 +37,7 @@ public class MainActivity extends AppCompatActivity {
 
     /** Shared with {@link AbrpUploadService}, which reads it on every tick. */
     static final String WIFI_AUTO_KEY = "wifi_auto_connect";
-    private static final String REPOSITORY_URL = "https://github.com/fatihdonmezdev/FatihsMG4";
+    private static final String REPOSITORY_URL = "https://git.stinnesbeck.com/nils/mg4";
 
     /** Navigation destinations in page order. Parallel to {@link #panes}. */
     private static final int[] TAB_IDS =
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ab25183..dfeaeef 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -208,7 +208,7 @@
     <string name="about_title">About Nils\' MG4</string>
     <string name="about_version">Version %1$s</string>
     <string name="about_attribution">Fork of fatihdonmezdev / FatihsMG4,\nmalys / EVABRPUploader\nand Leon Kernan / ABRP_Uploader</string>
-    <string name="about_repository">github.com/fatihdonmezdev/FatihsMG4</string>
+    <string name="about_repository">git.stinnesbeck.com/nils/mg4</string>
     <string name="about_made_with_love">MG4 EH32 · SWI69</string>
     <string name="about_logo_description">Nils\' MG4 logo</string>
     <string name="about_qr_description">QR code for the project repository</string>

From 29064cf8db87f7b06b94224b5a7312537228630f Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 17:45:56 +0200
Subject: [PATCH 59/79] Translate the remaining French and Turkish

mise.toml, the comments in app/build.gradle (corrected where they no
longer described the build: the car build is signed by build-car, and
the updater reads the version from build-car's file name), OTA.md's
message table (now the updater's current English messages), the Turkish
messages quoted in CHANGELOG.md and OTA.md (glossed in English), two
test assertion messages, an icon comment, and the ignition-state comment
in EVHardware.kt. The vendored EVHardware library still has about 120
half-French comment lines; noted in SPECS.md.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 CHANGELOG.md                                  |   4 +-
 .../java/com/evsuite/hardware/EVHardware.kt   |  20 +--
 OTA.md                                        |  20 +--
 SPECS.md                                      |   9 +-
 app/build.gradle                              |  35 ++---
 app/src/main/res/drawable/ic_tab_log.xml      |   2 +-
 .../evsuite/abrp/TelemetryPayloadTest.java    |   4 +-
 mise.toml                                     | 139 +++++++++---------
 8 files changed, 116 insertions(+), 117 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcb90af..106465e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,7 +39,7 @@
 
 - Charging sessions are now metered on DC only (10 kW and above). An AC charge is an
   overnight affair the head unit sleeps through, so its curve, duration and energy were
-  guesses; the charging screen labels one as `AC şarj (ölçülmüyor)` rather than showing
+  guesses; the charging screen labels one as `AC şarj (ölçülmüyor)` ("AC charging (not metered)") rather than showing
   the previous DC session's figures next to it.
 
 ### Fixed
@@ -246,7 +246,7 @@ All notable changes to this project are documented here. Format follows
 - OTA installs now go through the platform `PackageInstaller` instead of shelling out to
   `pm install -r`. The old path handed the package manager service a file inside the app's
   private cache, which it cannot read from its own process, and every such failure was
-  reported as `Kurulum reddedildi (imza uyuşmuyor?)` — a signature verdict on a correctly
+  reported as `Kurulum reddedildi (imza uyuşmuyor?)` ("installation refused (signature mismatch?)") — a signature verdict on a correctly
   signed build. A session streams the archive from this process, so no second process has
   to reach our cache. Approach taken from merthankaraman/DriveHub_Dort, which solved the
   same problem on the same head unit.
diff --git a/EVHardware/lib/src/main/java/com/evsuite/hardware/EVHardware.kt b/EVHardware/lib/src/main/java/com/evsuite/hardware/EVHardware.kt
index f6e50c6..9ce7fb5 100644
--- a/EVHardware/lib/src/main/java/com/evsuite/hardware/EVHardware.kt
+++ b/EVHardware/lib/src/main/java/com/evsuite/hardware/EVHardware.kt
@@ -335,18 +335,18 @@ object EVHardware {
     }
 
     /**
-     * État d'ignition courant, en valeurs [IgnitionState] (AAOS).
+     * Current ignition state, as [IgnitionState] (AAOS) values.
      *
-     * CarPropertyManager d'abord. Mais SWI68 n'expose pas IGNITION_STATE via CPM : la
-     * property revient vide, et l'état d'allumage passait pour illisible alors que Katman5
-     * le rapporte correctement — le log le montre (`Katman5: state initial = 2 (RUN/READY)`)
-     * pendant que le diagnostic classait IGNITION_STATE en NOT_READABLE.
+     * CarPropertyManager first. But SWI68 does not expose IGNITION_STATE through CPM: the
+     * property comes back empty, and the ignition state looked unreadable although Katman5
+     * reports it correctly — the log shows it (`Katman5: state initial = 2 (RUN/READY)`) while
+     * the diagnostics classed IGNITION_STATE as NOT_READABLE.
      *
-     * D'où le repli sur le dernier état livré par IVehicleConditionService, converti :
-     * Katman5 parle en [CarIgnitionItem], cette fonction rend du [IgnitionState], et les
-     * deux échelles ne coïncident pas (RUN vaut 2 chez l'un, OFF vaut 2 chez l'autre).
+     * Hence the fallback to the last state delivered by IVehicleConditionService, converted:
+     * Katman5 speaks [CarIgnitionItem], this function returns [IgnitionState], and the two
+     * scales do not line up (RUN is 2 in one, OFF is 2 in the other).
      *
-     * Returns -1 si rien n'est lisible, 0 si la property existe mais ne dit rien.
+     * Returns -1 if nothing is readable, 0 if the property exists but says nothing.
      */
     fun getCurrentIgnitionState(): Int {
         val v0 = getIntPropertyCPM(PROP_IGNITION_STATE, 0)
@@ -356,7 +356,7 @@ object EVHardware {
         return vcmIgnitionAsAaos() ?: global
     }
 
-    /** Le dernier état Katman5 traduit en [IgnitionState], ou null s'il n'y en a pas eu. */
+    /** The last Katman5 state translated into [IgnitionState], or null if there was none. */
     private fun vcmIgnitionAsAaos(): Int? = when (sLastVcmIgnitionState) {
         CarIgnitionItem.OFF       -> IgnitionState.OFF
         CarIgnitionItem.ACCESSORY -> IgnitionState.ACC
diff --git a/OTA.md b/OTA.md
index 79d4c66..240b6c7 100644
--- a/OTA.md
+++ b/OTA.md
@@ -39,7 +39,7 @@ release is a candidate only if all of these hold:
 | Marked **pre-release** | `release.optBoolean("prerelease")` | Skipped entirely |
 | Asset name contains `unstable` | `name.contains("unstable")` | Asset ignored |
 | Asset name ends `-<version>.apk` | `ASSET_VERSION` regex | No version, asset ignored |
-| Version strictly higher than installed | `isNewer()` | Nothing to do, reports "Güncel" |
+| Version strictly higher than installed | `isNewer()` | Nothing to do, reports "Up to date" |
 | Download host on the allowlist | `isAllowedUrl()` | Refused and logged |
 | APK signed with the **same certificate** as the running app | Android `PackageInstaller` | Installation is rejected by the platform |
 | Matching `.sha256` asset or `SHA256SUMS` entry | `fetchExpectedSha256()` | Update ignored/refused |
@@ -115,17 +115,13 @@ The version comes from the **asset filename**, not the git tag. The tag can stay
 
 ## When it says something else
 
-| Toast | Meaning |
+| Message | Meaning |
 |---|---|
-| `Güncel (2.2.2.0-unstable)` | No release beat the installed version. Check the pre-release tick and the asset filename. |
-| `Güncelleme reddedildi: SHA-256 doğrulaması yok` | APK has no matching sidecar, or the sidecar is invalid/unreachable. |
-| `İndirme veya SHA-256 doğrulaması başarısız` | Download failed or its bytes do not match the published hash. |
-| `Kuruluyor: 2.2.3 — ekrandaki onayı bekleyin` | The session was committed. Not done yet: watch for the platform's own toast, or a confirmation dialog to accept. |
-| `Kurulum reddedildi: imza uyuşmuyor` | Genuinely the wrong key — rebuild and re-sign with `platform.pk8`. Unlike the old catch-all, this one means what it says. |
-| `Kurulum reddedildi: APK okunamadı` | The archive does not parse, or it is built for another package. |
-| `Kurulum başlatılamadı … Log sayfasına bakın` | The session could not be created or committed. `adb logcat -s EVABRP.Update`. |
-| `Kurulum başarısız: INSTALL_FAILED_…` | From `OtaInstallResultReceiver` — the package manager's own words for why it refused. |
-| `Güncelleme kontrolü başarısız` | The check threw. `adb logcat -s EVABRP.Update OtaUpdater` if a cable is available; otherwise the in-app Log page. |
+| `Up to date (2.14.2-unstable)` | No release beat the installed version. Check the pre-release tick and the asset filename. |
+| `Update refused: no SHA-256 verification` | The APK has no matching sidecar, or the sidecar is invalid or unreachable. |
+| `Download or SHA-256 verification failed (…)` | The download failed, or its bytes do not match the published hash. |
+| `Update check failed` | The check threw. `adb logcat -s UpdateHook OtaUpdater` if a cable is available; otherwise the in-app Logs tab. |
+| `Update check already in progress` | A check is still running; wait for its result. |
 
 ## How the install works, and why it is not `pm install`
 
@@ -137,7 +133,7 @@ The downloaded APK lives in `context.getCacheDir()`. `pm` does not install the f
 — it passes the path to the package manager service, which opens it from *its* process and
 SELinux context, where an app's private cache is not readable. The install failed, and
 because `install()` returned a bare boolean, the caller reported the only failure it knew
-how to name: `Kurulum reddedildi (imza uyuşmuyor?)`. A correctly signed build, refused with
+how to name: `Kurulum reddedildi (imza uyuşmuyor?)` ("installation refused (signature mismatch?)"). A correctly signed build, refused with
 a signature error it had not earned. The `pm` output that would have said so was captured
 and thrown away.
 
diff --git a/SPECS.md b/SPECS.md
index 8185669..e2155c8 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -84,8 +84,9 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
       (`GF_DATABASE_TYPE`, `GF_DATABASE_HOST`, …); the replicas then share that database instead
       of a volume. The car data itself is in InfluxDB and unaffected.
 - [ ] **Telemetry queue survives restarts.** Unsent live samples are kept in memory only.
-- [ ] **Translate the rest.** The docs (`CHANGELOG.md`, `OTA.md`'s
-      message table, comments in `mise.toml`/`app/build.gradle`) are still Turkish or French.
+- [ ] **EVHardware's comments are partly French.** About 120 comment lines in the vendored
+      `EVHardware/` library (mostly `EVHardware.kt`, some tests), half-translated upstream. The
+      app, the docs and the build files are English.
 - [ ] **Move hardcoded UI strings into `strings.xml`.** Many are inline in Java and layouts.
 
 ## Done
@@ -116,6 +117,10 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — Translated the rest: `mise.toml`, the comments in `app/build.gradle`, `OTA.md`'s
+  message table (now the updater's current English messages), the Turkish messages quoted in
+  `CHANGELOG.md` and `OTA.md` (glossed), two test messages, the ignition-state comment in
+  `EVHardware.kt`.
 - 2026-10-18 — About dialog: link and QR code point to https://git.stinnesbeck.com/nils/mg4
   (were Fatih's GitHub). Status section brought up to date.
 - 2026-10-18 — App 2.14.2: "Range, 5-min average", like the usage and power cards (was "Range at 5-min average").
diff --git a/app/build.gradle b/app/build.gradle
index e9e9959..3122615 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,14 +10,14 @@ android {
         }
     }
 
-    // Signature de l'APK — rien à voir avec la clé d'API ABRP de l'utilisateur.
-    // Ces valeurs servent UNIQUEMENT au build : elles prouvent que l'APK vient bien de
-    // nous et n'entrent jamais dans l'application. La clé d'API et le token ABRP, eux,
-    // sont saisis dans l'app et stockés chiffrés sur l'appareil (voir SecurePrefs).
+    // APK signing — nothing to do with the user's ABRP credentials. These values are ONLY for
+    // the build: they prove the APK comes from us and never enter the app. The ABRP API key and
+    // token are entered in the app and stored encrypted on the device (see SecurePrefs).
+    // The car build is signed by build-car (flake.nix) with the AOSP platform key instead.
     //
-    // Un keystore contient plusieurs clés : SIGNING_STORE_PASSWORD ouvre le conteneur,
-    // SIGNING_KEY_ALIAS choisit la clé, SIGNING_KEY_PASSWORD ouvre cette clé-là.
-    // Lues depuis l'environnement (CI) ou gradle.properties local — JAMAIS commitées.
+    // A keystore holds several keys: SIGNING_STORE_PASSWORD opens the container,
+    // SIGNING_KEY_ALIAS picks the key, SIGNING_KEY_PASSWORD opens that key.
+    // Read from the environment (CI) or a local gradle.properties — NEVER committed.
     def keystorePath = System.getenv("SIGNING_KEYSTORE") ?: project.findProperty("signing.keystore")
     signingConfigs {
         if (keystorePath != null && file(keystorePath).exists()) {
@@ -43,15 +43,15 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    // null quand aucun keystore n'est configuré : le build reste possible sur une
-    // machine sans secrets (APK non signé), au lieu d'échouer.
+    // null when no keystore is configured: the build still works on a machine without
+    // secrets (unsigned APK) instead of failing.
     def platformSigning = signingConfigs.findByName("platform")
 
-    // Deux canaux de distribution :
-    //  - stable  : diffusé en release taguée, AUCUN auto-update. L'utilisateur installe
-    //              lui-même ; rien dans l'app ne va chercher un APK.
-    //  - unstable : pré-releases publiées à chaque push sur master, avec OTA pour que les testeurs
-    //              soient à jour sans manipulation. Installable à côté du stable.
+    // Two distribution channels:
+    //  - stable:   no self-update at all. The user installs it; nothing in the app fetches an
+    //              APK (the updater is not even in this APK).
+    //  - unstable: the car build (system UID, platform-signed), with the OTA updater, so the
+    //              car can update itself from published pre-releases. Installs next to stable.
     flavorDimensions += "channel"
     productFlavors {
         stable {
@@ -111,13 +111,14 @@ tasks.register('printUnstableVersion') {
     }
 }
 
-// Nomme les APK par canal pour que les artefacts de release soient lisibles.
+// Names the APKs by channel so the build outputs are readable.
 androidComponents {
     onVariants(selector().all()) { variant ->
         variant.outputs.each { output ->
             if (variant.buildType == "release") {
-                // Le canal unstable garde un nom de fichier stable : l'updater identifie
-                // la version par le tag de la pré-release, jamais par le nom d'APK.
+                // A fixed name for the unstable release output. What is published for the car
+                // comes from build-car, named NilsMG4-unstable-<version>.apk: that file name is
+                // where the updater reads a release's version from.
                 output.outputFileName.set(variant.flavorName == "unstable"
                         ? "NilsMG4-unstable.apk"
                         : "NilsMG4-${variant.flavorName}-${output.versionName.get()}.apk")
diff --git a/app/src/main/res/drawable/ic_tab_log.xml b/app/src/main/res/drawable/ic_tab_log.xml
index 67ce1ca..feb44c6 100644
--- a/app/src/main/res/drawable/ic_tab_log.xml
+++ b/app/src/main/res/drawable/ic_tab_log.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Terminal : onglet Log. Teinté par @color/nav_tab_foreground. -->
+<!-- Terminal: the Logs tab. Tinted by @color/nav_tab_foreground. -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/app/src/test/java/com/evsuite/abrp/TelemetryPayloadTest.java b/app/src/test/java/com/evsuite/abrp/TelemetryPayloadTest.java
index f91af99..d19934a 100644
--- a/app/src/test/java/com/evsuite/abrp/TelemetryPayloadTest.java
+++ b/app/src/test/java/com/evsuite/abrp/TelemetryPayloadTest.java
@@ -50,7 +50,7 @@ public class TelemetryPayloadTest {
                 "batt_temp", "capacity", "odometer", "hvac_setpoint",
                 "tire_pressure_fl", "tire_pressure_fr",
                 "tire_pressure_rl", "tire_pressure_rr"}) {
-            assertFalse("le champ " + field + " aurait dû être omis", json.contains(field));
+            assertFalse("field " + field + " should have been omitted", json.contains(field));
         }
     }
 
@@ -60,7 +60,7 @@ public class TelemetryPayloadTest {
         TelemetryPayload t = new TelemetryPayload(1L);
         t.speedKmh = 48.4f;
         JSONObject json = new JSONObject(t.build());
-        assertFalse("soc illisible aurait dû être omis", json.has("soc"));
+        assertFalse("an unreadable soc should have been omitted", json.has("soc"));
         assertEquals(48, json.getInt("speed"));
     }
 
diff --git a/mise.toml b/mise.toml
index dcd9206..fc2daa3 100644
--- a/mise.toml
+++ b/mise.toml
@@ -1,17 +1,16 @@
-# Environnement de développement — EVABRPUploader.
+# Development environment with mise (the Nix flake, `nix develop`, is the other way in).
 #
-# Commité volontairement : il décrit comment construire le projet, pas la machine de
-# quelqu'un. Les chemins passent par {{env.HOME}} / JAVA_HOME, jamais en dur.
-# Pour une surcharge locale (chemin de keystore, SDK ailleurs), créer un mise.local.toml
-# — celui-là reste ignoré par git.
+# Committed on purpose: it describes how to build the project, not someone's machine. Paths
+# go through {{env.HOME}} / JAVA_HOME, never hard-coded. For a local override (keystore path,
+# SDK elsewhere), create a mise.local.toml — that one stays ignored by git.
 #
-#   mise install       installe le JDK
-#   mise run bootstrap installe le SDK Android si absent
-#   mise run test      tests unitaires
-#   mise tasks         liste tout
+#   mise install       installs the JDK
+#   mise run bootstrap installs the Android SDK if missing
+#   mise run test      unit tests
+#   mise tasks         lists everything
 #
-# Pourquoi épingler le JDK : le JDK par défaut de la machine (26) n'est pas supporté
-# par AGP et fait échouer le build avec une erreur de version de classe peu parlante.
+# Why the JDK is pinned: the machine's default JDK (26) is not supported by AGP and fails the
+# build with an unhelpful class-version error.
 
 [tools]
 java = "17"
@@ -24,42 +23,40 @@ _.path = [
     "{{env.HOME}}/Android/Sdk/cmdline-tools/latest/bin",
 ]
 
-# Version du SDK requise par app/build.gradle (compileSdk = 36).
+# SDK version app/build.gradle needs (compileSdk = 36).
 COMPILE_SDK = "36"
 BUILD_TOOLS = "36.0.0"
 
-# Secrets de SIGNATURE D'APK — sans rapport avec la clé d'API ABRP, qui se saisit dans
-# l'application. À définir hors du dépôt : décommenter dans un mise.local.toml (ignoré
-# par git) et pointer vers un keystore local, JAMAIS vers un fichier du dépôt.
+# APK SIGNING secrets — nothing to do with the ABRP API key, which is entered in the app.
+# Set them outside the repository: uncomment in a mise.local.toml (ignored by git) and point
+# at a local keystore, NEVER at a file in the repository. The car build is signed by
+# `build-car` (flake.nix) instead.
 # SIGNING_KEYSTORE = "{{env.HOME}}/.keystores/signing.keystore"
 # SIGNING_STORE_PASSWORD = "…"
 # SIGNING_KEY_ALIAS = "platform"
 # SIGNING_KEY_PASSWORD = "…"
 
-# Gradle doit tourner sur le JDK que mise vient d'installer. Sans -Dorg.gradle.java.home,
-# Gradle peut réutiliser un daemon lancé par un autre JDK — typiquement celui embarqué par
-# l'extension Java de VS Code, un JRE 21 sans jlink : le build échoue alors sur
-# JdkImageTransform, avec un message qui n'a rien à voir avec le code.
-# JAVA_HOME est posé par [tools] ci-dessus : $JAVA_HOME est résolu par le shell au moment
-# de l'exécution, donc ceci reste portable d'une machine à l'autre.
-# ── Émulateur ────────────────────────────────────────────────────────────────────
+# Gradle must run on the JDK mise just installed. Without -Dorg.gradle.java.home, Gradle may
+# reuse a daemon started by another JDK — typically the one bundled with VS Code's Java
+# extension, a JRE 21 without jlink: the build then fails in JdkImageTransform, with a message
+# that has nothing to do with the code. JAVA_HOME is set by [tools] above; $JAVA_HOME is
+# resolved by the shell at run time, so this stays portable between machines.
+# ── Emulator ─────────────────────────────────────────────────────────────────────
 #
-# ATTENTION sur la fidélité : le véhicule tourne en AAOS 9 (API 28). Google ne publie
-# AUCUNE image système Automotive en dessous d'API 33 — vérifié avec sdkmanager --list.
-# Il n'existe donc pas d'émulateur qui reproduise à la fois l'OS et l'API voiture du MG4.
-# D'où deux profils, chacun fidèle sur un axe :
+# A WORD on fidelity: the car runs AAOS 9 (API 28). Google publishes NO Automotive system
+# image below API 33 — checked with sdkmanager --list. So no emulator reproduces both the OS
+# and the car API of the MG4. Hence two profiles, each faithful on one axis:
 #
-#   emulator-car     API 33 Automotive — a bien un CarPropertyManager, mauvaise version
-#                    d'OS. Pour tester le cycle de vie du service et le chemin voiture.
-#                    Les propriétés VENDEUR SAIC (0x216xxxxx : SOC, autonomie) n'existent
-#                    pas dans l'émulateur : ces lectures échoueront, c'est normal.
-#   emulator-screen  API 28 tablette — bonne version d'OS et bon écran (1920x720 @ 160dpi,
-#                    12,8" HD comme le MG4), mais AUCUN service voiture.
-#                    Pour l'UI, les layouts et la densité.
+#   emulator-car     API 33 Automotive — has a CarPropertyManager, wrong OS version. For the
+#                    service lifecycle and the car path. SAIC VENDOR properties (0x216xxxxx:
+#                    SOC, range) do not exist in the emulator: those reads fail, as expected.
+#   emulator-screen  API 28 tablet — right OS version and right screen (1920x720 @ 160 dpi,
+#                    12.8" HD like the MG4), but NO car services. For the UI, layouts and
+#                    density. (The AOSP API 28 image also shares the car's platform key, so the
+#                    car build installs there as the system user.)
 #
-# Rien de tout cela ne remplace un essai sur le véhicule.
-# Densité cible du projet : 160 dpi.
-# Écran 12,8" 1920x720. Firmware de référence : SWI68-29958-1300R69.
+# None of this replaces a test on the car.
+# Target density: 160 dpi. Screen 12.8" 1920x720. Reference firmware: SWI68-29958-1300R69.
 
 EMU_CAR_AVD = "evabrp-car"
 EMU_CAR_IMAGE = "system-images;android-33;android-automotive;x86_64"
@@ -70,16 +67,16 @@ EMU_HEIGHT = "720"
 EMU_DENSITY = "160"
 
 [tasks.bootstrap]
-description = "Installe le SDK Android (platform + build-tools) s'il manque"
+description = "Installs the Android SDK (platform + build-tools) if missing"
 run = """
 set -e
 if [ -d "$ANDROID_HOME/platforms/android-$COMPILE_SDK" ]; then
-  echo "SDK $COMPILE_SDK déjà présent → rien à faire"
+  echo "SDK $COMPILE_SDK already present, nothing to do"
   exit 0
 fi
 mkdir -p "$ANDROID_HOME"
 if [ ! -x "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" ]; then
-  echo "Téléchargement des commandline-tools…"
+  echo "Downloading the command-line tools…"
   tmp=$(mktemp -d)
   curl -sSL -o "$tmp/tools.zip" \
     https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip
@@ -92,59 +89,59 @@ yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --sdk_root="$ANDROID_H
 "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --sdk_root="$ANDROID_HOME" \
   "platform-tools" "platforms;android-$COMPILE_SDK" "build-tools;$BUILD_TOOLS"
 echo "sdk.dir=$ANDROID_HOME" > local.properties
-echo "SDK installé, local.properties écrit"
+echo "SDK installed, local.properties written"
 """
 
 [tasks.build]
-description = "Compile l'APK debug"
+description = "Builds the debug APK"
 run = './gradlew -Dorg.gradle.java.home=$JAVA_HOME assembleStableDebug'
 
 [tasks.test]
-description = "Tests unitaires JVM"
+description = "JVM unit tests"
 run = './gradlew -Dorg.gradle.java.home=$JAVA_HOME testStableDebugUnitTest testUnstableDebugUnitTest'
 
 [tasks.lint]
-description = "Analyse lint Android"
+description = "Android lint"
 run = './gradlew -Dorg.gradle.java.home=$JAVA_HOME lintStableDebug lintUnstableDebug'
 
 [tasks.permissions]
-description = "Contrôle de dérive des permissions (le même que la CI)"
+description = "Permission drift check (the same as CI)"
 run = "bash .github/security/check-permissions.sh"
 
 [tasks.check]
-description = "Ce que la CI exécute : permissions + lint + tests"
+description = "What CI runs: permissions + lint + tests"
 depends = ["permissions", "lint", "test"]
 
 [tasks.install]
-description = "Installe l'APK debug sur le véhicule connecté en ADB"
+description = "Installs the debug APK on the car connected over ADB"
 run = './gradlew -Dorg.gradle.java.home=$JAVA_HOME installStableDebug'
 
 [tasks.logs]
-description = "Suit les logs de l'app sur le véhicule"
+description = "Follows the app's logs on the car"
 run = "adb logcat -s AbrpUploadService:V CarPropertyAdapter:V VhalProbe:V SecurePrefs:V OtaUpdater:V UpdateHook:V NilsMG4.Telemetry:V NilsMG4.Mongo:V NilsMG4.SteeringKey:V EVABRP.Boot:V EVABRP.Wifi:V"
 
 [tasks.release]
-description = "APK release des deux canaux (stable sans OTA, unstable avec OTA)"
+description = "Release APKs of both channels (stable without OTA, unstable with OTA)"
 run = './gradlew -Dorg.gradle.java.home=$JAVA_HOME assembleStableRelease assembleUnstableRelease'
 
 [tasks.clean]
 run = './gradlew -Dorg.gradle.java.home=$JAVA_HOME clean'
 
 [tasks.emulator-setup]
-description = "Installe l'émulateur + les images système et crée les deux AVD"
+description = "Installs the emulator and system images and creates both AVDs"
 run = '''
 set -e
 SDK="$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager"
 AVDM="$ANDROID_HOME/cmdline-tools/latest/bin/avdmanager"
 
 if [ ! -e /dev/kvm ]; then
-  echo "ERREUR : /dev/kvm absent — pas d'accélération matérielle, l'émulateur sera inutilisable." >&2
-  echo "Sous WSL2 : activer la virtualisation imbriquée côté Windows." >&2
+  echo "ERROR: /dev/kvm missing — no hardware acceleration, the emulator would be unusable." >&2
+  echo "On WSL2: enable nested virtualisation on the Windows side." >&2
   exit 1
 fi
 if ! id -nG | tr ' ' '\n' | grep -qx kvm; then
-  echo "ATTENTION : utilisateur absent du groupe kvm. Corriger avec :" >&2
-  echo "  sudo usermod -aG kvm $USER   # puis se reconnecter" >&2
+  echo "WARNING: user is not in the kvm group. Fix with:" >&2
+  echo "  sudo usermod -aG kvm $USER   # then log in again" >&2
 fi
 
 yes | "$SDK" --sdk_root="$ANDROID_HOME" --licenses > /dev/null
@@ -153,13 +150,13 @@ yes | "$SDK" --sdk_root="$ANDROID_HOME" --licenses > /dev/null
 create_avd() {
   name="$1"; image="$2"; device="$3"
   if "$AVDM" list avd 2>/dev/null | grep -q "Name: $name"; then
-    echo "AVD $name déjà présent"
+    echo "AVD $name already exists"
   else
     echo no | "$AVDM" create avd -n "$name" -k "$image" -d "$device" --force
   fi
   cfg="$HOME/.android/avd/$name.avd/config.ini"
-  # Écran du MG4. Sans ça l'AVD garde la densité du profil générique et les layouts
-  # ne ressemblent pas à ce que voit le conducteur.
+  # The MG4's screen. Without this the AVD keeps the generic profile's density and the
+  # layouts do not look like what the driver sees.
   sed -i '/^hw.lcd/d;/^disk.dataPartition.size/d' "$cfg"
   {
     echo "hw.lcd.width=$EMU_WIDTH"
@@ -167,55 +164,55 @@ create_avd() {
     echo "hw.lcd.density=$EMU_DENSITY"
     echo "disk.dataPartition.size=4G"
   } >> "$cfg"
-  echo "AVD $name configuré en ${EMU_WIDTH}x${EMU_HEIGHT} @ ${EMU_DENSITY}dpi"
+  echo "AVD $name set to ${EMU_WIDTH}x${EMU_HEIGHT} @ ${EMU_DENSITY}dpi"
 }
 
 create_avd "$EMU_CAR_AVD" "$EMU_CAR_IMAGE" "automotive_1024p_landscape"
 create_avd "$EMU_SCREEN_AVD" "$EMU_SCREEN_IMAGE" "pixel_c"
 '''
 
-# swiftshader_indirect, pas « host » : WSL2 n'expose aucun GPU réel (uniquement Mesa
-# llvmpipe). Avec -gpu host l'émulateur meurt au démarrage sur « Your GPU cannot be used
-# for hardware rendering », avant qu'aucune fenêtre n'apparaisse — d'où l'icône de tray
-# sans émulateur visible. Le rendu logiciel est plus lent, mais il démarre.
+# swiftshader_indirect, not "host": WSL2 exposes no real GPU (only Mesa llvmpipe). With
+# -gpu host the emulator dies at start-up on "Your GPU cannot be used for hardware
+# rendering", before any window appears — hence a tray icon and no visible emulator.
+# Software rendering is slower, but it starts.
 [tasks.emulator-car]
-description = "Lance l'émulateur Automotive (API 33 — a un CarPropertyManager)"
+description = "Starts the Automotive emulator (API 33 — has a CarPropertyManager)"
 run = '''
 set -e
 "$ANDROID_HOME/emulator/emulator" -avd "$EMU_CAR_AVD" \
   -gpu swiftshader_indirect -no-snapshot-save -no-boot-anim &
 "$ANDROID_HOME/platform-tools/adb" wait-for-device
-echo "Émulateur voiture prêt."
+echo "Car emulator ready."
 '''
 
 [tasks.emulator-screen]
-description = "Lance l'émulateur écran MG4 (API 28, 1920x720 @ 160dpi — pas de service voiture)"
+description = "Starts the MG4 screen emulator (API 28, 1920x720 @ 160dpi — no car services)"
 run = '''
 set -e
 "$ANDROID_HOME/emulator/emulator" -avd "$EMU_SCREEN_AVD" \
   -gpu swiftshader_indirect -no-snapshot-save -no-boot-anim &
 "$ANDROID_HOME/platform-tools/adb" wait-for-device
-echo "Émulateur écran prêt."
+echo "Screen emulator ready."
 '''
 
 [tasks.emulator-stop]
-description = "Arrête l'émulateur en cours"
+description = "Stops the running emulator"
 run = '"$ANDROID_HOME/platform-tools/adb" emu kill || true'
 
 [tasks.run]
-description = "Compile, installe et lance l'APK sur l'émulateur ou le véhicule connecté"
+description = "Builds, installs and starts the APK on the emulator or the connected car"
 depends = ["build"]
 run = '''
 set -e
 ADB="$ANDROID_HOME/platform-tools/adb"
 if [ -z "$($ADB devices | sed '1d' | grep -w device || true)" ]; then
-  echo "Aucun appareil connecté. Lancer d'abord 'mise run emulator-car' ou 'mise run emulator-screen'," >&2
-  echo "ou brancher le véhicule en ADB." >&2
+  echo "No device connected. Start 'mise run emulator-car' or 'mise run emulator-screen' first," >&2
+  echo "or connect the car over ADB." >&2
   exit 1
 fi
 APK=$(ls -t app/build/outputs/apk/stable/debug/*.apk | head -1)
-echo "Installation de $APK"
+echo "Installing $APK"
 $ADB install -r -g "$APK"
 $ADB shell am start -n "com.stinnesbeck.nilsmg4/com.evsuite.abrp.MainActivity"
-echo "Lancé. Logs : mise run logs"
+echo "Started. Logs: mise run logs"
 '''

From f63f48131ec00bd0fda33118969735cabcbb7004 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 17:50:55 +0200
Subject: [PATCH 60/79] App 2.14.4: all UI text in strings.xml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Charging, Consumption and Settings labels, toasts, the trip-reset
dialog, the charging and Wi-Fi states, the daily summary and the "—"
placeholder move from layouts and code into strings.xml; lint now
reports no hard-coded text. Upload-log entries stay in code, as log
text. No visible change.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                      |  4 +-
 app/build.gradle                              |  4 +-
 .../java/com/evsuite/abrp/MainActivity.java   | 54 +++++++--------
 .../main/res/layout-w1000dp/pane_settings.xml | 16 ++---
 .../main/res/layout-w1000dp/pane_vehicle.xml  | 30 ++++-----
 app/src/main/res/layout/pane_charging.xml     | 24 +++----
 app/src/main/res/layout/pane_consumption.xml  | 36 +++++-----
 app/src/main/res/layout/pane_settings.xml     | 16 ++---
 app/src/main/res/layout/pane_vehicle.xml      | 30 ++++-----
 app/src/main/res/values/strings.xml           | 65 +++++++++++++++++++
 10 files changed, 173 insertions(+), 106 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index e2155c8..a642041 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -87,7 +87,6 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
 - [ ] **EVHardware's comments are partly French.** About 120 comment lines in the vendored
       `EVHardware/` library (mostly `EVHardware.kt`, some tests), half-translated upstream. The
       app, the docs and the build files are English.
-- [ ] **Move hardcoded UI strings into `strings.xml`.** Many are inline in Java and layouts.
 
 ## Done
 
@@ -117,6 +116,9 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.14.4: every UI text is in `strings.xml` (Charging, Consumption and Settings
+  labels, toasts, the trip-reset dialog, charging and Wi-Fi states, the daily summary, the "—"
+  placeholder); lint reports no hard-coded text. Upload-log entries stay in code as log text.
 - 2026-10-18 — Translated the rest: `mise.toml`, the comments in `app/build.gradle`, `OTA.md`'s
   message table (now the updater's current English messages), the Turkish messages quoted in
   `CHANGELOG.md` and `OTA.md` (glossed), two test messages, the ignition-state comment in
diff --git a/app/build.gradle b/app/build.gradle
index 3122615..53d4044 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 81
-        versionName "2.14.3"
+        versionCode 82
+        versionName "2.14.4"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 2e21606..e84325a 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -1218,9 +1218,9 @@ public class MainActivity extends AppCompatActivity {
         String ssid = wifi.currentSsid();
         wifiSsid.setText(ssid == null ? getString(R.string.wifi_not_connected) : ssid);
         if (ssid != null) {
-            wifiState.setText("Connected ♥");
+            wifiState.setText(R.string.wifi_connected);
         } else if (!wifi.isWifiEnabled()) {
-            wifiState.setText("Wi-Fi off");
+            wifiState.setText(R.string.wifi_off);
         }
         // Left alone otherwise: a message the button just set says more about what is
         // happening than "not connected" would.
@@ -1378,11 +1378,12 @@ public class MainActivity extends AppCompatActivity {
         selectPeriodButton(R.id.consumption_lifetime);
         consumptionReset.setOnClickListener(v -> {
             if (consumptionPeriod != ConsumptionTracker.Period.TRIP_A && consumptionPeriod != ConsumptionTracker.Period.TRIP_B) return;
-            String name = consumptionPeriod == ConsumptionTracker.Period.TRIP_A ? "Trip A" : "Trip B";
-            new MaterialAlertDialogBuilder(this).setTitle("Reset " + name + "?")
-                    .setMessage("This counter's recorded consumption history will be permanently deleted.")
-                    .setNegativeButton("Cancel", null)
-                    .setPositiveButton("Reset", (d, w) -> {
+            String name = getString(consumptionPeriod == ConsumptionTracker.Period.TRIP_A
+                    ? R.string.consumption_trip_a : R.string.consumption_trip_b);
+            new MaterialAlertDialogBuilder(this).setTitle(getString(R.string.trip_reset_title, name))
+                    .setMessage(R.string.trip_reset_message)
+                    .setNegativeButton(R.string.pair_cancel, null)
+                    .setPositiveButton(R.string.trip_reset_confirm, (d, w) -> {
                         consumptionTracker.reset(consumptionPeriod);
                         refreshConsumption();
                     }).show();
@@ -1409,9 +1410,9 @@ public class MainActivity extends AppCompatActivity {
             if (!consumptionTracker.setSohPercent(value)) throw new NumberFormatException();
             consumptionSohLayout.setError(null);
             consumptionSohInput.setText(String.format(java.util.Locale.US, "%.1f", value));
-            Toast.makeText(this, "SoH saved", Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, R.string.soh_saved, Toast.LENGTH_SHORT).show();
         } catch (NumberFormatException e) {
-            consumptionSohLayout.setError("Enter a value between 1 and 100");
+            consumptionSohLayout.setError(getString(R.string.soh_invalid));
         }
     }
 
@@ -1469,9 +1470,9 @@ public class MainActivity extends AppCompatActivity {
             if (!chargeSessionTracker.setPricePerKwh(value)) throw new NumberFormatException();
             chargePriceLayout.setError(null);
             chargePriceInput.setText(String.format(java.util.Locale.US, "%.2f", value));
-            Toast.makeText(this, "Charging price saved", Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, R.string.price_saved, Toast.LENGTH_SHORT).show();
         } catch (NumberFormatException e) {
-            chargePriceLayout.setError("Enter a valid €/kWh value");
+            chargePriceLayout.setError(getString(R.string.price_invalid));
         }
     }
 
@@ -1486,9 +1487,9 @@ public class MainActivity extends AppCompatActivity {
         // below — which then describe the previous DC session — be read as this charge.
         boolean dc = ChargingState.isDcCharging(
                 code, s.getChargePortConnected(), s.getBatteryPowerKw(), s.getSpeedKmh());
-        chargeStatus.setText(dc ? "DC fast charging"
-                : charging ? "AC charging (not metered)"
-                : (session.startedAtMs > 0 ? "Last charge" : "Not charging"));
+        chargeStatus.setText(dc ? R.string.charge_dc
+                : charging ? R.string.charge_ac_not_metered
+                : (session.startedAtMs > 0 ? R.string.charge_last : R.string.charging_not_charging));
         chargeSoc.setText(fmt(s.getSocPercent(), "%.1f %%"));
         chargeStartSoc.setText(fmt(session.startSocPercent, "%.1f %%"));
         chargeVoltage.setText(fmt(s.getBatteryVoltageV(), "%.1f V"));
@@ -1529,13 +1530,12 @@ public class MainActivity extends AppCompatActivity {
         ConsumptionTracker.Totals day = cloudDay(selectedConsumptionDate);
         if (day == null) day = consumptionTracker.totalsForDay(selectedConsumptionDate);
         if (day.km == 0 && day.kwh == 0 && day.hours == 0 && day.soc == 0) {
-            consumptionDailyHistory.setText("No records for this date");
+            consumptionDailyHistory.setText(R.string.consumption_no_records);
         } else {
             String average = day.km < 0.1 ? "—" : String.format(java.util.Locale.getDefault(),
                     "%.1f kWh/100 km", day.kwh * 100d / day.km);
             long dayMinutes = Math.round(day.hours * 60d);
-            consumptionDailyHistory.setText(String.format(java.util.Locale.getDefault(),
-                    "Distance     %.1f km\nEnergy       %.2f kWh\nAverage      %s\nDuration     %d h %02d min\nSOC change   %.1f %%",
+            consumptionDailyHistory.setText(getString(R.string.consumption_day_summary,
                     day.km, day.kwh, average, dayMinutes / 60, dayMinutes % 60, day.soc));
         }
     }
@@ -1598,21 +1598,21 @@ public class MainActivity extends AppCompatActivity {
      * The codes are the vehicle's own — see EVHardware.PROP_VENDOR_CHARGE_STATUS. An
      * unrecognised code is shown as itself rather than guessed at.
      */
-    private static String chargingLabel(EnergySnapshot s) {
+    private String chargingLabel(EnergySnapshot s) {
         Integer status = s.getChargingStatus();
         if (status != null) {
             switch (status) {
-                case 1:  return "AC charging ♥";
-                case 10: return "DC fast charging ♥";
-                case 5:  return "Connecting…";
-                case 7:  return "Plugged in, not charging";
-                case 8:  return "Stopped";
-                case 0:  return "Not charging";
-                default: return "Status " + status;
+                case 1:  return getString(R.string.charge_status_ac);
+                case 10: return getString(R.string.charge_status_dc);
+                case 5:  return getString(R.string.charge_status_connecting);
+                case 7:  return getString(R.string.charge_status_plugged);
+                case 8:  return getString(R.string.charge_status_stopped);
+                case 0:  return getString(R.string.charging_not_charging);
+                default: return getString(R.string.charge_status_code, status);
             }
         }
         Boolean plugged = s.getChargePortConnected();
-        if (plugged != null) return plugged ? "Connected ♥" : "Not connected";
+        if (plugged != null) return getString(plugged ? R.string.charge_status_connected : R.string.charge_status_unplugged);
         return "—";
     }
 
@@ -1652,7 +1652,7 @@ public class MainActivity extends AppCompatActivity {
             consumptionCloudClient.invalidateHistory();
             runOnUiThread(() -> {
                 refreshConsumption();
-                Toast.makeText(this, "Consumption refreshed", Toast.LENGTH_SHORT).show();
+                Toast.makeText(this, R.string.consumption_refreshed, Toast.LENGTH_SHORT).show();
             });
         }, "cloud-refresh").start();
     }
diff --git a/app/src/main/res/layout-w1000dp/pane_settings.xml b/app/src/main/res/layout-w1000dp/pane_settings.xml
index 12005cd..6e9df62 100644
--- a/app/src/main/res/layout-w1000dp/pane_settings.xml
+++ b/app/src/main/res/layout-w1000dp/pane_settings.xml
@@ -15,12 +15,12 @@
             </LinearLayout>
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_settings_title" android:textAppearance="@style/Text.EV.Eyebrow" />
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/consumption_soh_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="Manual SoH (%)" app:suffixText="%">
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/consumption_soh_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="@string/settings_manual_soh" app:suffixText="@string/unit_percent">
                     <com.google.android.material.textfield.TextInputEditText android:id="@+id/consumption_soh_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="5" android:minHeight="72dp"/>
                 </com.google.android.material.textfield.TextInputLayout>
-                <com.google.android.material.button.MaterialButton android:id="@+id/consumption_soh_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="Save SoH value"/>
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="This manual value is stored on the device and sent to your server with the daily totals." android:textAppearance="@style/Text.EV.Secondary"/>
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/usable_capacity_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:hint="@string/hint_usable_capacity" app:suffixText="kWh">
+                <com.google.android.material.button.MaterialButton android:id="@+id/consumption_soh_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="@string/settings_save_soh_value"/>
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/settings_soh_note" android:textAppearance="@style/Text.EV.Secondary"/>
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/usable_capacity_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:hint="@string/hint_usable_capacity" app:suffixText="@string/unit_kwh">
                     <com.google.android.material.textfield.TextInputEditText android:id="@+id/usable_capacity_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="5" android:minHeight="72dp"/>
                 </com.google.android.material.textfield.TextInputLayout>
                 <com.google.android.material.button.MaterialButton android:id="@+id/usable_capacity_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="@string/btn_save_capacity"/>
@@ -28,10 +28,10 @@
             </LinearLayout>
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_price_title" android:textAppearance="@style/Text.EV.Eyebrow" />
-                <com.google.android.material.textfield.TextInputLayout android:id="@+id/charge_price_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="Unit price" app:suffixText="€/kWh">
+                <com.google.android.material.textfield.TextInputLayout android:id="@+id/charge_price_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="@string/settings_unit_price" app:suffixText="@string/unit_eur_per_kwh">
                     <com.google.android.material.textfield.TextInputEditText android:id="@+id/charge_price_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="10" android:minHeight="72dp"/>
                 </com.google.android.material.textfield.TextInputLayout>
-                <com.google.android.material.button.MaterialButton android:id="@+id/charge_price_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="Save price"/>
+                <com.google.android.material.button.MaterialButton android:id="@+id/charge_price_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="@string/settings_save_price"/>
                 <com.google.android.material.button.MaterialButton android:id="@+id/settings_phone_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_phone_settings" android:layout_marginTop="8dp" />
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/hint_phone_settings" android:textAppearance="@style/Text.EV.Secondary" />
             </LinearLayout>
@@ -39,8 +39,8 @@
         <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical">
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_card_title" android:textAppearance="@style/Text.EV.Eyebrow" />
-                <TextView android:id="@+id/wifi_ssid" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Metric" android:layout_marginTop="20dp" />
-                <TextView android:id="@+id/wifi_state" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="12dp" />
+                <TextView android:id="@+id/wifi_ssid" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Metric" android:layout_marginTop="20dp" />
+                <TextView android:id="@+id/wifi_state" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="12dp" />
                 <com.google.android.material.button.MaterialButton android:id="@+id/wifi_connect_button" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_connect_now" android:layout_marginTop="24dp" />
                 <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/wifi_auto_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/wifi_auto_label" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_auto_hint" android:textAppearance="@style/Text.EV.Secondary" />
diff --git a/app/src/main/res/layout-w1000dp/pane_vehicle.xml b/app/src/main/res/layout-w1000dp/pane_vehicle.xml
index 6357b56..24acbed 100644
--- a/app/src/main/res/layout-w1000dp/pane_vehicle.xml
+++ b/app/src/main/res/layout-w1000dp/pane_vehicle.xml
@@ -4,52 +4,52 @@
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:baselineAligned="false">
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_battery_card" android:layout_weight="1" android:layout_marginEnd="10dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_short" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_soc" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_charging" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_soc" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_charging" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_weight="1" android:layout_marginEnd="10dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_trip" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
                 <TextView android:id="@+id/vehicle_range_trip_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_average" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
                 <TextView android:id="@+id/vehicle_range_average_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_weight="1" android:layout_marginEnd="10dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_weight="1" android:layout_marginEnd="10dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_speed" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_speed" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_speed" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
             </LinearLayout>
         </LinearLayout>
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:orientation="horizontal" android:baselineAligned="false">
             <Space android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" android:layout_marginEnd="10dp" />
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_energy_trip" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_energy_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_energy_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
                 <TextView android:id="@+id/vehicle_energy_trip_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_usage_trip" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_usage_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_usage_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
                 <TextView android:id="@+id/vehicle_usage_trip_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_usage_average" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_usage_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_usage_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
                 <TextView android:id="@+id/vehicle_usage_average_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power_average" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_power_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_power_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
                 <TextView android:id="@+id/vehicle_power_average_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <Space android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" android:layout_marginEnd="10dp" />
@@ -74,18 +74,18 @@
                 <LinearLayout android:layout_width="match_parent" android:layout_height="224dp" android:orientation="horizontal" android:gravity="center_vertical">
                     <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:orientation="vertical" android:gravity="center">
                         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_fl" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                        <TextView android:id="@+id/vehicle_tire_fl" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
+                        <TextView android:id="@+id/vehicle_tire_fl" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                         <Space android:layout_width="1dp" android:layout_height="44dp" />
                         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_rl" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                        <TextView android:id="@+id/vehicle_tire_rl" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
+                        <TextView android:id="@+id/vehicle_tire_rl" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                     </LinearLayout>
                     <ImageView android:layout_width="92dp" android:layout_height="180dp" android:src="@drawable/ic_vehicle_outline" android:contentDescription="@string/design_car_desc" />
                     <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:orientation="vertical" android:gravity="center">
                         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_fr" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                        <TextView android:id="@+id/vehicle_tire_fr" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
+                        <TextView android:id="@+id/vehicle_tire_fr" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                         <Space android:layout_width="1dp" android:layout_height="44dp" />
                         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_rr" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                        <TextView android:id="@+id/vehicle_tire_rr" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
+                        <TextView android:id="@+id/vehicle_tire_rr" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                     </LinearLayout>
                 </LinearLayout>
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_no_data" android:textAppearance="@style/Text.EV.Secondary" />
diff --git a/app/src/main/res/layout/pane_charging.xml b/app/src/main/res/layout/pane_charging.xml
index 43c34d0..02e6819 100644
--- a/app/src/main/res/layout/pane_charging.xml
+++ b/app/src/main/res/layout/pane_charging.xml
@@ -2,23 +2,23 @@
 <com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true">
  <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp">
   <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:background="@drawable/bg_glass">
-   <TextView android:id="@+id/charge_status" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="Not charging" android:textAppearance="@style/Text.EV.Title" android:textColor="?attr/evAccentLight"/>
+   <TextView android:id="@+id/charge_status" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/charging_not_charging" android:textAppearance="@style/Text.EV.Title" android:textColor="?attr/evAccentLight"/>
    <GridLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:columnCount="2" android:layout_marginTop="12dp">
-    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="SOC" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_soc" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
-    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Start SOC" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_start_soc" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
-    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Battery voltage" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_voltage" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
-    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Battery current" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_current" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
-    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Charging power" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_power" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
-    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Net energy into battery" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_energy" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
-    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Drawn from grid (+10%)" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_grid_energy" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
-    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Charging time" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_duration" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
-    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="Total cost" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_total_cost" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="—" android:textAppearance="@style/DataValue"/>
+    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="@string/charging_soc" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_soc" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="@string/no_value" android:textAppearance="@style/DataValue"/>
+    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="@string/charging_start_soc" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_start_soc" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="@string/no_value" android:textAppearance="@style/DataValue"/>
+    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="@string/charging_battery_voltage" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_voltage" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="@string/no_value" android:textAppearance="@style/DataValue"/>
+    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="@string/charging_battery_current" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_current" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="@string/no_value" android:textAppearance="@style/DataValue"/>
+    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="@string/charging_power_label" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_power" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="@string/no_value" android:textAppearance="@style/DataValue"/>
+    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="@string/charging_net_energy_into_battery" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_energy" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="@string/no_value" android:textAppearance="@style/DataValue"/>
+    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="@string/charging_drawn_from_grid" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_grid_energy" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="@string/no_value" android:textAppearance="@style/DataValue"/>
+    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="@string/charging_time_label" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_duration" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="@string/no_value" android:textAppearance="@style/DataValue"/>
+    <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="@string/charging_total_cost" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/charge_total_cost" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="10dp" android:text="@string/no_value" android:textAppearance="@style/DataValue"/>
    </GridLayout>
   </LinearLayout>
   <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:layout_marginTop="16dp" android:background="@drawable/bg_glass">
-   <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="CHARGING CURVE" android:textAppearance="@style/Text.EV.Eyebrow"/>
+   <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/charging_curve_title" android:textAppearance="@style/Text.EV.Eyebrow"/>
    <com.evsuite.abrp.ChargingGraphView android:id="@+id/charge_graph" android:layout_width="match_parent" android:layout_height="280dp" android:layout_marginTop="12dp"/>
-   <TextView android:id="@+id/charge_curve_table" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:fontFamily="monospace" android:text="No charging measurements yet" android:textAppearance="@style/Text.EV.Body" android:textColor="?attr/evAccentLight"/>
+   <TextView android:id="@+id/charge_curve_table" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:fontFamily="monospace" android:text="@string/charging_no_charging_measurements_yet" android:textAppearance="@style/Text.EV.Body" android:textColor="?attr/evAccentLight"/>
   </LinearLayout>
  </LinearLayout>
 </com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout/pane_consumption.xml b/app/src/main/res/layout/pane_consumption.xml
index 3f19a5a..1d59919 100644
--- a/app/src/main/res/layout/pane_consumption.xml
+++ b/app/src/main/res/layout/pane_consumption.xml
@@ -3,33 +3,33 @@
   <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp">
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:background="@drawable/bg_glass">
       <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical">
-        <TextView android:layout_width="0dp" android:layout_weight="1" android:layout_height="wrap_content" android:text="CONSUMPTION PERIOD" android:textAppearance="@style/Text.EV.Eyebrow"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_refresh" style="@style/Widget.EV.Button.Outlined" android:layout_width="48dp" android:layout_height="48dp" android:minWidth="0dp" android:padding="0dp" android:contentDescription="Refresh" app:icon="@drawable/ic_refresh" app:iconGravity="textStart" app:iconPadding="0dp" app:iconTint="?attr/evAccent"/>
+        <TextView android:layout_width="0dp" android:layout_weight="1" android:layout_height="wrap_content" android:text="@string/consumption_period_title" android:textAppearance="@style/Text.EV.Eyebrow"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_refresh" style="@style/Widget.EV.Button.Outlined" android:layout_width="48dp" android:layout_height="48dp" android:minWidth="0dp" android:padding="0dp" android:contentDescription="@string/btn_refresh" app:icon="@drawable/ic_refresh" app:iconGravity="textStart" app:iconPadding="0dp" app:iconTint="?attr/evAccent"/>
       </LinearLayout>
       <HorizontalScrollView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:scrollbars="none">
        <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal">
-        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_lifetime" style="@style/Widget.EV.Button.Outlined" android:layout_width="wrap_content" android:layout_height="56dp" android:text="Lifetime"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_week" style="@style/Widget.EV.Button.Outlined" android:layout_width="wrap_content" android:layout_height="56dp" android:layout_marginStart="8dp" android:text="Last 7 days"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_month" style="@style/Widget.EV.Button.Outlined" android:layout_width="wrap_content" android:layout_height="56dp" android:layout_marginStart="8dp" android:text="Last 30 days"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_trip_a" style="@style/Widget.EV.Button.Outlined" android:layout_width="wrap_content" android:layout_height="56dp" android:layout_marginStart="8dp" android:text="Trip A"/>
-        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_trip_b" style="@style/Widget.EV.Button.Outlined" android:layout_width="wrap_content" android:layout_height="56dp" android:layout_marginStart="8dp" android:text="Trip B"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_lifetime" style="@style/Widget.EV.Button.Outlined" android:layout_width="wrap_content" android:layout_height="56dp" android:text="@string/consumption_lifetime"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_week" style="@style/Widget.EV.Button.Outlined" android:layout_width="wrap_content" android:layout_height="56dp" android:layout_marginStart="8dp" android:text="@string/consumption_last_7_days"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_month" style="@style/Widget.EV.Button.Outlined" android:layout_width="wrap_content" android:layout_height="56dp" android:layout_marginStart="8dp" android:text="@string/consumption_last_30_days"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_trip_a" style="@style/Widget.EV.Button.Outlined" android:layout_width="wrap_content" android:layout_height="56dp" android:layout_marginStart="8dp" android:text="@string/consumption_trip_a"/>
+        <com.google.android.material.button.MaterialButton android:id="@+id/consumption_trip_b" style="@style/Widget.EV.Button.Outlined" android:layout_width="wrap_content" android:layout_height="56dp" android:layout_marginStart="8dp" android:text="@string/consumption_trip_b"/>
        </LinearLayout>
       </HorizontalScrollView>
       <GridLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:columnCount="2">
-        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="Distance" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_distance" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="—" android:textAppearance="@style/DataValue"/>
-        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="Net energy" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_energy" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="—" android:textAppearance="@style/DataValue"/>
-        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="Average consumption" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_average" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="—" android:textAppearance="@style/DataValue"/>
-        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="Average speed" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_speed" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="—" android:textAppearance="@style/DataValue"/>
-        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="Duration" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_time" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="—" android:textAppearance="@style/DataValue"/>
-        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="SOC change" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_soc" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="—" android:textAppearance="@style/DataValue"/>
+        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="@string/consumption_distance" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_distance" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="@string/no_value" android:textAppearance="@style/DataValue"/>
+        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="@string/consumption_net_energy" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_energy" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="@string/no_value" android:textAppearance="@style/DataValue"/>
+        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="@string/consumption_average_consumption" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_average" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="@string/no_value" android:textAppearance="@style/DataValue"/>
+        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="@string/consumption_average_speed" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_speed" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="@string/no_value" android:textAppearance="@style/DataValue"/>
+        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="@string/consumption_duration" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_time" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="@string/no_value" android:textAppearance="@style/DataValue"/>
+        <TextView android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="@string/consumption_soc_change" android:textAppearance="@style/DataLabel"/><TextView android:id="@+id/consumption_soc" android:layout_width="0dp" android:layout_columnWeight="1" android:padding="12dp" android:text="@string/no_value" android:textAppearance="@style/DataValue"/>
       </GridLayout>
-      <com.google.android.material.button.MaterialButton android:id="@+id/consumption_reset" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginTop="12dp" android:text="Reset selected trip" android:visibility="gone"/>
+      <com.google.android.material.button.MaterialButton android:id="@+id/consumption_reset" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="64dp" android:layout_marginTop="12dp" android:text="@string/consumption_reset_selected_trip" android:visibility="gone"/>
     </LinearLayout>
-    <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:text="Last 7/30 days, lifetime and Trip A/B are stored permanently on the device; app and OTA updates do not erase them." android:textAppearance="@style/Text.EV.Secondary"/>
+    <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:text="@string/consumption_stored_note" android:textAppearance="@style/Text.EV.Secondary"/>
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:layout_marginTop="16dp" android:background="@drawable/bg_glass">
-      <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="DAILY LOG · LAST 4 MONTHS" android:textAppearance="@style/Text.EV.Eyebrow"/>
-      <com.google.android.material.button.MaterialButton android:id="@+id/consumption_date_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="56dp" android:layout_marginTop="12dp" android:text="Pick a date"/>
-      <TextView android:id="@+id/consumption_daily_history" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:fontFamily="monospace" android:text="No daily data yet" android:textAppearance="@style/Text.EV.Body" android:textColor="?attr/evAccentLight"/>
+      <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/consumption_daily_log_title" android:textAppearance="@style/Text.EV.Eyebrow"/>
+      <com.google.android.material.button.MaterialButton android:id="@+id/consumption_date_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="56dp" android:layout_marginTop="12dp" android:text="@string/consumption_pick_a_date"/>
+      <TextView android:id="@+id/consumption_daily_history" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:fontFamily="monospace" android:text="@string/consumption_no_daily_data_yet" android:textAppearance="@style/Text.EV.Body" android:textColor="?attr/evAccentLight"/>
     </LinearLayout>
   </LinearLayout>
 </com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout/pane_settings.xml b/app/src/main/res/layout/pane_settings.xml
index 943732d..978fbd8 100644
--- a/app/src/main/res/layout/pane_settings.xml
+++ b/app/src/main/res/layout/pane_settings.xml
@@ -14,12 +14,12 @@
         </LinearLayout>
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_settings_title" android:textAppearance="@style/Text.EV.Eyebrow" />
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/consumption_soh_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="Manual SoH (%)" app:suffixText="%">
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/consumption_soh_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="@string/settings_manual_soh" app:suffixText="@string/unit_percent">
                 <com.google.android.material.textfield.TextInputEditText android:id="@+id/consumption_soh_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="5" android:minHeight="72dp"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.button.MaterialButton android:id="@+id/consumption_soh_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="Save SoH value"/>
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="This manual value is stored on the device and sent to your server with the daily totals." android:textAppearance="@style/Text.EV.Secondary"/>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/usable_capacity_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:hint="@string/hint_usable_capacity" app:suffixText="kWh">
+            <com.google.android.material.button.MaterialButton android:id="@+id/consumption_soh_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="@string/settings_save_soh_value"/>
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/settings_soh_note" android:textAppearance="@style/Text.EV.Secondary"/>
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/usable_capacity_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:hint="@string/hint_usable_capacity" app:suffixText="@string/unit_kwh">
                 <com.google.android.material.textfield.TextInputEditText android:id="@+id/usable_capacity_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="5" android:minHeight="72dp"/>
             </com.google.android.material.textfield.TextInputLayout>
             <com.google.android.material.button.MaterialButton android:id="@+id/usable_capacity_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="@string/btn_save_capacity"/>
@@ -27,17 +27,17 @@
         </LinearLayout>
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_price_title" android:textAppearance="@style/Text.EV.Eyebrow" />
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/charge_price_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="Unit price" app:suffixText="€/kWh">
+            <com.google.android.material.textfield.TextInputLayout android:id="@+id/charge_price_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="@string/settings_unit_price" app:suffixText="@string/unit_eur_per_kwh">
                 <com.google.android.material.textfield.TextInputEditText android:id="@+id/charge_price_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="10" android:minHeight="72dp"/>
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.button.MaterialButton android:id="@+id/charge_price_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="Save price"/>
+            <com.google.android.material.button.MaterialButton android:id="@+id/charge_price_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="@string/settings_save_price"/>
             <com.google.android.material.button.MaterialButton android:id="@+id/settings_phone_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_phone_settings" android:layout_marginTop="8dp" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/hint_phone_settings" android:textAppearance="@style/Text.EV.Secondary" />
         </LinearLayout>
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_card_title" android:textAppearance="@style/Text.EV.Eyebrow" />
-            <TextView android:id="@+id/wifi_ssid" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Metric" android:layout_marginTop="20dp" />
-            <TextView android:id="@+id/wifi_state" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="12dp" />
+            <TextView android:id="@+id/wifi_ssid" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Metric" android:layout_marginTop="20dp" />
+            <TextView android:id="@+id/wifi_state" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="12dp" />
             <com.google.android.material.button.MaterialButton android:id="@+id/wifi_connect_button" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_connect_now" android:layout_marginTop="24dp" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/wifi_auto_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/wifi_auto_label" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_auto_hint" android:textAppearance="@style/Text.EV.Secondary" />
diff --git a/app/src/main/res/layout/pane_vehicle.xml b/app/src/main/res/layout/pane_vehicle.xml
index 5bc5918..009564c 100644
--- a/app/src/main/res/layout/pane_vehicle.xml
+++ b/app/src/main/res/layout/pane_vehicle.xml
@@ -4,50 +4,50 @@
         <GridLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:columnCount="2">
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_battery_card" android:layout_columnWeight="1" android:layout_margin="4dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_short" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_soc" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
-                <TextView android:id="@+id/vehicle_charging" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+                <TextView android:id="@+id/vehicle_soc" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_charging" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_columnWeight="1" android:layout_margin="4dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_trip" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
                 <TextView android:id="@+id/vehicle_range_trip_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_range_average" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_range_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_range_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
                 <TextView android:id="@+id/vehicle_range_average_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_energy_trip" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_energy_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_energy_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
                 <TextView android:id="@+id/vehicle_energy_trip_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_usage_trip" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_usage_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_usage_trip" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
                 <TextView android:id="@+id/vehicle_usage_trip_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_usage_average" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_usage_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_usage_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
                 <TextView android:id="@+id/vehicle_usage_average_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_columnWeight="1" android:layout_margin="4dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_power" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_power_average" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_power_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_power_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
                 <TextView android:id="@+id/vehicle_power_average_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass" android:layout_columnWeight="1" android:layout_margin="4dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_speed" android:textAppearance="@style/Text.EV.Secondary" />
-                <TextView android:id="@+id/vehicle_speed" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_speed" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
             </LinearLayout>
         </GridLayout>
         <Space android:layout_width="1dp" android:layout_height="16dp" />
@@ -69,18 +69,18 @@
             <LinearLayout android:layout_width="match_parent" android:layout_height="224dp" android:orientation="horizontal" android:gravity="center_vertical">
                 <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:orientation="vertical" android:gravity="center">
                     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_fl" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                    <TextView android:id="@+id/vehicle_tire_fl" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
+                    <TextView android:id="@+id/vehicle_tire_fl" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                     <Space android:layout_width="1dp" android:layout_height="44dp" />
                     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_rl" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                    <TextView android:id="@+id/vehicle_tire_rl" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
+                    <TextView android:id="@+id/vehicle_tire_rl" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                 </LinearLayout>
                 <ImageView android:layout_width="92dp" android:layout_height="180dp" android:src="@drawable/ic_vehicle_outline" android:contentDescription="@string/design_car_desc" />
                 <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:orientation="vertical" android:gravity="center">
                     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_fr" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                    <TextView android:id="@+id/vehicle_tire_fr" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
+                    <TextView android:id="@+id/vehicle_tire_fr" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                     <Space android:layout_width="1dp" android:layout_height="44dp" />
                     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_rr" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
-                    <TextView android:id="@+id/vehicle_tire_rr" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="—" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
+                    <TextView android:id="@+id/vehicle_tire_rr" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
                 </LinearLayout>
             </LinearLayout>
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_no_data" android:textAppearance="@style/Text.EV.Secondary" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dfeaeef..288bf29 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -214,4 +214,69 @@
     <string name="about_qr_description">QR code for the project repository</string>
     <string name="about_version_unknown">unknown</string>
     <string name="about_close">Close</string>
+
+    <!-- Charging, Consumption and Settings texts, moved here from the layouts (2.14.4) -->
+    <string name="charging_not_charging">Not charging</string>
+    <string name="charging_soc">SOC</string>
+    <string name="charging_start_soc">Start SOC</string>
+    <string name="charging_battery_voltage">Battery voltage</string>
+    <string name="charging_battery_current">Battery current</string>
+    <string name="charging_power_label">Charging power</string>
+    <string name="charging_net_energy_into_battery">Net energy into battery</string>
+    <string name="charging_drawn_from_grid" formatted="false">Drawn from grid (+10%)</string>
+    <string name="charging_time_label">Charging time</string>
+    <string name="charging_total_cost">Total cost</string>
+    <string name="charging_curve_title">CHARGING CURVE</string>
+    <string name="charging_no_charging_measurements_yet">No charging measurements yet</string>
+    <string name="consumption_period_title">CONSUMPTION PERIOD</string>
+    <string name="consumption_lifetime">Lifetime</string>
+    <string name="consumption_last_7_days">Last 7 days</string>
+    <string name="consumption_last_30_days">Last 30 days</string>
+    <string name="consumption_trip_a">Trip A</string>
+    <string name="consumption_trip_b">Trip B</string>
+    <string name="consumption_distance">Distance</string>
+    <string name="consumption_net_energy">Net energy</string>
+    <string name="consumption_average_consumption">Average consumption</string>
+    <string name="consumption_average_speed">Average speed</string>
+    <string name="consumption_duration">Duration</string>
+    <string name="consumption_soc_change">SOC change</string>
+    <string name="consumption_reset_selected_trip">Reset selected trip</string>
+    <string name="consumption_stored_note">Last 7/30 days, lifetime and Trip A/B are stored permanently on the device; app and OTA updates do not erase them.</string>
+    <string name="consumption_daily_log_title">DAILY LOG · LAST 4 MONTHS</string>
+    <string name="consumption_pick_a_date">Pick a date</string>
+    <string name="consumption_no_daily_data_yet">No daily data yet</string>
+    <string name="settings_manual_soh" formatted="false">Manual SoH (%)</string>
+    <string name="unit_percent" formatted="false">%</string>
+    <string name="settings_save_soh_value">Save SoH value</string>
+    <string name="settings_soh_note">This manual value is stored on the device and sent to your server with the daily totals.</string>
+    <string name="unit_kwh">kWh</string>
+    <string name="settings_unit_price">Unit price</string>
+    <string name="unit_eur_per_kwh">€/kWh</string>
+    <string name="settings_save_price">Save price</string>
+    <string name="wifi_connected">Connected ♥</string>
+    <string name="wifi_off">Wi-Fi off</string>
+    <string name="trip_reset_title">Reset %1$s?</string>
+    <string name="trip_reset_message">This counter\'s recorded consumption history will be permanently deleted.</string>
+    <string name="trip_reset_confirm">Reset</string>
+    <string name="soh_saved">SoH saved</string>
+    <string name="soh_invalid">Enter a value between 1 and 100</string>
+    <string name="price_saved">Charging price saved</string>
+    <string name="price_invalid">Enter a valid €/kWh value</string>
+    <string name="charge_dc">DC fast charging</string>
+    <string name="charge_ac_not_metered">AC charging (not metered)</string>
+    <string name="charge_last">Last charge</string>
+    <string name="consumption_no_records">No records for this date</string>
+    <string name="consumption_day_summary">Distance     %1$.1f km\nEnergy       %2$.2f kWh\nAverage      %3$s\nDuration     %4$d h %5$02d min\nSOC change   %6$.1f %%</string>
+    <string name="consumption_refreshed">Consumption refreshed</string>
+    <string name="charge_status_ac">AC charging ♥</string>
+    <string name="charge_status_dc">DC fast charging ♥</string>
+    <string name="charge_status_connecting">Connecting…</string>
+    <string name="charge_status_plugged">Plugged in, not charging</string>
+    <string name="charge_status_stopped">Stopped</string>
+    <string name="charge_status_code">Status %1$d</string>
+    <string name="charge_status_connected">Connected ♥</string>
+    <string name="charge_status_unplugged">Not connected</string>
+    <!-- A value that cannot be read: never 0 (AGENTS.md). -->
+    <string name="no_value" translatable="false">—</string>
+    <string name="btn_refresh">Refresh</string>
 </resources>

From f88249427f86f4df75bd5ca9daa9508c21b5f3ed Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 17:56:25 +0200
Subject: [PATCH 61/79] App 2.15.0: queued live data survives restarts

Unsent live samples were kept in memory only, so a reboot or a killed
process during a dead spot lost them. The queue is now saved to
files/telemetry_queue.json with AtomicFile, at most every 5 minutes and
only after a change (the flash is not written every 15 s), and at once
when the service stops; it is restored, oldest first and within the
2000-sample cap, when the service starts. A damaged file restores
nothing rather than failing. Tested on the emulator across a reboot.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                      |  6 +-
 app/build.gradle                              |  4 +-
 .../com/evsuite/abrp/AbrpUploadService.java   |  5 +-
 .../java/com/evsuite/abrp/TelemetryQueue.java | 54 ++++++++++++++++-
 .../com/evsuite/abrp/TelemetryUploader.java   | 59 ++++++++++++++++++-
 .../com/evsuite/abrp/TelemetryQueueTest.java  | 43 ++++++++++++++
 6 files changed, 164 insertions(+), 7 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index a642041..80820fe 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -83,7 +83,6 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
       write the file. To run more than one replica, first move Grafana to PostgreSQL or MySQL
       (`GF_DATABASE_TYPE`, `GF_DATABASE_HOST`, …); the replicas then share that database instead
       of a volume. The car data itself is in InfluxDB and unaffected.
-- [ ] **Telemetry queue survives restarts.** Unsent live samples are kept in memory only.
 - [ ] **EVHardware's comments are partly French.** About 120 comment lines in the vendored
       `EVHardware/` library (mostly `EVHardware.kt`, some tests), half-translated upstream. The
       app, the docs and the build files are English.
@@ -116,6 +115,11 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.15.0: unsent live samples survive a restart. The queue is saved to
+  `files/telemetry_queue.json` (AtomicFile) at most every 5 minutes and only after a change, and
+  at once when the service stops; it is restored, in order and within its 2000-sample cap, when
+  the service starts. A killed process loses at most 5 minutes. Tested on the emulator across a
+  reboot (6 queued samples back).
 - 2026-10-18 — App 2.14.4: every UI text is in `strings.xml` (Charging, Consumption and Settings
   labels, toasts, the trip-reset dialog, charging and Wi-Fi states, the daily summary, the "—"
   placeholder); lint reports no hard-coded text. Upload-log entries stay in code as log text.
diff --git a/app/build.gradle b/app/build.gradle
index 53d4044..c85119b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 82
-        versionName "2.14.4"
+        versionCode 83
+        versionName "2.15.0"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
index 5b3e351..63892dc 100644
--- a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
+++ b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
@@ -141,7 +141,10 @@ public class AbrpUploadService extends Service {
         running = false;
         prefs.edit().putBoolean("service_running", false).apply();
         if (scheduler != null) scheduler.shutdownNow();
-        if (telemetryUploader != null) telemetryUploader.stop();
+        if (telemetryUploader != null) {
+            telemetryUploader.persist(); // what is still queued survives the restart
+            telemetryUploader.stop();
+        }
         if (steeringKeys != null) steeringKeys.unregister();
         Log.i(TAG, "Service stopped");
     }
diff --git a/app/src/main/java/com/evsuite/abrp/TelemetryQueue.java b/app/src/main/java/com/evsuite/abrp/TelemetryQueue.java
index 50883d7..a93d827 100644
--- a/app/src/main/java/com/evsuite/abrp/TelemetryQueue.java
+++ b/app/src/main/java/com/evsuite/abrp/TelemetryQueue.java
@@ -9,8 +9,9 @@ import java.util.List;
  *
  * Bounded: while the car is offline the oldest samples are dropped once {@link #capacity}
  * is reached, so a long dead spot costs the start of the gap, never the head unit's memory.
- * Held in memory only — a process restart loses what is queued, which is the price of not
- * writing to flash every 15 seconds.
+ * Kept in memory and saved to a file now and then (TelemetryUploader), so a reboot or a
+ * killed process on the way through a dead spot does not lose the drive. {@link #encode} and
+ * {@link #decode} are the file format: a JSON array of the samples as they are sent.
  *
  * Free of Android types so the policy is unit-tested on the JVM.
  */
@@ -29,7 +30,11 @@ final class TelemetryQueue {
 
     TelemetryQueue(int capacity) { this.capacity = capacity; }
 
+    /** Counts every change, so the owner can tell whether there is anything new to save. */
+    private long version;
+
     synchronized void add(String sampleJson) {
+        version++;
         if (samples.size() >= capacity) {
             samples.removeFirst();
             dropped++;
@@ -49,6 +54,7 @@ final class TelemetryQueue {
 
     /** Drops the oldest {@code count} samples once the server has confirmed them. */
     synchronized void remove(int count) {
+        if (count > 0) version++;
         for (int i = 0; i < count && !samples.isEmpty(); i++) samples.removeFirst();
     }
 
@@ -57,6 +63,50 @@ final class TelemetryQueue {
 
     synchronized int size() { return samples.size(); }
 
+    synchronized long version() { return version; }
+
+    /** Every queued sample, oldest first, as {@link #encode} writes them. */
+    synchronized String encode() {
+        org.json.JSONArray array = new org.json.JSONArray();
+        for (String sample : samples) array.put(sample);
+        return array.toString();
+    }
+
+    /**
+     * Puts saved samples back in front of anything queued since, oldest first and within the
+     * capacity. Unreadable input restores nothing: a damaged file costs the backlog, never
+     * the app.
+     */
+    synchronized int restore(String saved) {
+        List<String> restored = decode(saved);
+        if (restored.isEmpty()) return 0;
+        ArrayDeque<String> merged = new ArrayDeque<>(restored);
+        merged.addAll(samples);
+        while (merged.size() > capacity) {
+            merged.removeFirst();
+            dropped++;
+        }
+        samples.clear();
+        samples.addAll(merged);
+        version++;
+        return restored.size();
+    }
+
+    static List<String> decode(String saved) {
+        List<String> out = new ArrayList<>();
+        if (saved == null || saved.isEmpty()) return out;
+        try {
+            org.json.JSONArray array = new org.json.JSONArray(saved);
+            for (int i = 0; i < array.length(); i++) {
+                String sample = array.optString(i, null);
+                if (sample != null && sample.startsWith("{")) out.add(sample);
+            }
+        } catch (org.json.JSONException e) {
+            out.clear();
+        }
+        return out;
+    }
+
     /** Samples lost to the capacity limit since the queue was created. */
     synchronized int dropped() { return dropped; }
 }
diff --git a/app/src/main/java/com/evsuite/abrp/TelemetryUploader.java b/app/src/main/java/com/evsuite/abrp/TelemetryUploader.java
index 8fbd144..f4f558c 100644
--- a/app/src/main/java/com/evsuite/abrp/TelemetryUploader.java
+++ b/app/src/main/java/com/evsuite/abrp/TelemetryUploader.java
@@ -59,6 +59,59 @@ final class TelemetryUploader {
 
     TelemetryUploader(Context context) {
         this.context = context.getApplicationContext();
+        load();
+    }
+
+    // ---------- Keeping the queue across restarts ----------
+
+    private static final String QUEUE_FILE = "telemetry_queue.json";
+    /**
+     * At most this often, and only after a change: the flash is not written every 15 s, and a
+     * killed process loses at most this much. A clean stop saves at once ({@link #persist}).
+     */
+    private static final long SAVE_INTERVAL_MS = 5 * 60_000L;
+
+    private long savedVersion;
+    private long lastSaveMs;
+
+    private android.util.AtomicFile queueFile() {
+        return new android.util.AtomicFile(new java.io.File(context.getFilesDir(), QUEUE_FILE));
+    }
+
+    private synchronized void load() {
+        try {
+            byte[] bytes = queueFile().readFully();
+            int restored = queue.restore(new String(bytes, java.nio.charset.StandardCharsets.UTF_8));
+            if (restored > 0) Log.i(TAG, restored + " queued sample(s) restored");
+        } catch (java.io.FileNotFoundException e) {
+            // nothing saved yet
+        } catch (Exception e) {
+            Log.w(TAG, "Saved queue not read: " + e.getClass().getSimpleName());
+        }
+        savedVersion = queue.version();
+        lastSaveMs = SystemClock.elapsedRealtime();
+    }
+
+    private void maybeSave() {
+        if (SystemClock.elapsedRealtime() - lastSaveMs >= SAVE_INTERVAL_MS) persist();
+    }
+
+    /** Saves the queue if it changed since the last save. Atomic: a crash keeps the old file. */
+    synchronized void persist() {
+        long version = queue.version();
+        lastSaveMs = SystemClock.elapsedRealtime();
+        if (version == savedVersion) return;
+        android.util.AtomicFile file = queueFile();
+        java.io.FileOutputStream out = null;
+        try {
+            out = file.startWrite();
+            out.write(queue.encode().getBytes(java.nio.charset.StandardCharsets.UTF_8));
+            file.finishWrite(out);
+            savedVersion = version;
+        } catch (Exception e) {
+            if (out != null) file.failWrite(out);
+            Log.w(TAG, "Queue not saved: " + e.getClass().getSimpleName());
+        }
     }
 
     // ---------- Tick ----------
@@ -101,11 +154,15 @@ final class TelemetryUploader {
         if (clockSet && (!idle || uploadDue)) {
             queue.add(buildSample(nowMs, vehicle, session, settings, soc, charging, dcfc, parked, idle));
         }
-        if (!uploadDue) return;
+        if (!uploadDue) {
+            maybeSave();
+            return;
+        }
         // Cadence counts attempts, not successes: retrying every tick while offline would
         // spend power exactly when it buys nothing.
         lastUploadAttemptMs = nowMs;
         flush();
+        maybeSave();
     }
 
     int queued() { return queue.size(); }
diff --git a/app/src/test/java/com/evsuite/abrp/TelemetryQueueTest.java b/app/src/test/java/com/evsuite/abrp/TelemetryQueueTest.java
index 823a491..76bee73 100644
--- a/app/src/test/java/com/evsuite/abrp/TelemetryQueueTest.java
+++ b/app/src/test/java/com/evsuite/abrp/TelemetryQueueTest.java
@@ -1,6 +1,7 @@
 package com.evsuite.abrp;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 
@@ -37,4 +38,46 @@ public class TelemetryQueueTest {
         assertEquals(List.of("c", "d", "e"), queue.peekBatch());
         assertEquals(2, queue.dropped());
     }
+
+    @Test
+    public void aSavedQueueComesBackInOrder() {
+        TelemetryQueue q = new TelemetryQueue(10);
+        q.add("{\"utc\":1}");
+        q.add("{\"utc\":2}");
+        TelemetryQueue restarted = new TelemetryQueue(10);
+        restarted.add("{\"utc\":3}");                 // taken after the restart
+        assertEquals(2, restarted.restore(q.encode()));
+        assertEquals(java.util.Arrays.asList("{\"utc\":1}", "{\"utc\":2}", "{\"utc\":3}"), restarted.peekBatch());
+    }
+
+    @Test
+    public void restoringKeepsTheCapacityByDroppingTheOldest() {
+        TelemetryQueue q = new TelemetryQueue(10);
+        for (int i = 1; i <= 4; i++) q.add("{\"utc\":" + i + "}");
+        TelemetryQueue small = new TelemetryQueue(3);
+        small.restore(q.encode());
+        assertEquals(java.util.Arrays.asList("{\"utc\":2}", "{\"utc\":3}", "{\"utc\":4}"), small.peekBatch());
+        assertEquals(1, small.dropped());
+    }
+
+    @Test
+    public void aDamagedFileRestoresNothing() {
+        TelemetryQueue q = new TelemetryQueue(10);
+        assertEquals(0, q.restore("[\"{\\\"utc\\\":1}\", trunc"));
+        assertEquals(0, q.restore(""));
+        assertEquals(0, q.restore(null));
+        assertEquals(0, q.size());
+    }
+
+    @Test
+    public void everyChangeMovesTheVersion() {
+        TelemetryQueue q = new TelemetryQueue(10);
+        long v0 = q.version();
+        q.add("{\"utc\":1}");
+        long v1 = q.version();
+        q.remove(0);
+        assertEquals(v1, q.version());                     // nothing removed, nothing to save
+        q.remove(1);
+        assertTrue(q.version() > v1 && v1 > v0);
+    }
 }

From e5549dddb0416cc6ea9185579282cdf7f59691a1 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 18:08:08 +0200
Subject: [PATCH 62/79] App 2.16.0, server 2.6.0: over-the-air updates from our
 own repository

The car updates itself again, from this fork's own releases, while the
repository stays private:

- publish-car (flake) creates the pre-release car-<version> on the
  forge and attaches the APK and its .sha256. It needs a forge token
  that may write releases, from ~/.config/nilsmg4/forge-token or
  $FORGE_TOKEN; it is sent in a header and never printed.
- The server relays releases and attachments (/v1/app/releases,
  /v1/app/assets/...), read with a read-only FORGE_TOKEN from its
  Secret, GitHub-shaped with download URLs back at itself. Redirects
  away from the forge are not followed; off (404) without a token.
- The app asks its server with its own paired token, allows exactly
  the server's host, downloads the APK itself instead of through the
  DownloadManager (so the token stays in the app), verifies SHA-256 and
  package name, and tries a PackageInstaller session (it may install
  silently as the system user) before falling back to Downloads.

OTA.md is rewritten for this flow; the k8s and server READMEs explain
the new token.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 OTA.md                                        | 209 ++++++------------
 README.md                                     |   5 +-
 SPECS.md                                      |  13 +-
 app/build.gradle                              |   4 +-
 app/src/main/res/values/strings.xml           |   2 +-
 .../java/com/evsuite/abrp/OtaUpdaterTest.java |  71 +++---
 .../java/com/evsuite/abrp/OtaUpdater.java     | 205 +++++++++--------
 .../java/com/evsuite/abrp/UpdateHook.java     |  41 +++-
 flake.nix                                     |  55 ++++-
 k8s/README.md                                 |   8 +
 k8s/secrets/secrets.example.yaml              |   4 +
 k8s/server.yaml                               |  12 +-
 server/README.md                              |   9 +
 server/api.go                                 |   4 +
 server/main.go                                |  17 +-
 server/releases.go                            | 209 ++++++++++++++++++
 server/releases_test.go                       | 115 ++++++++++
 17 files changed, 677 insertions(+), 306 deletions(-)
 create mode 100644 server/releases.go
 create mode 100644 server/releases_test.go

diff --git a/OTA.md b/OTA.md
index 240b6c7..cb2de3e 100644
--- a/OTA.md
+++ b/OTA.md
@@ -1,164 +1,93 @@
-# Publishing an OTA release
+# Updating the car app over the air
 
-How to ship an update the car will install by itself. Written for whoever does this
-next — probably me, having forgotten the details.
+How a new car build reaches the head unit without the Bluetooth-settings detour, and what to
+check when it does not.
 
-## First upgrade from 2.2.3 or older
+```
+build-car ─▶ publish-car ─▶ forge pre-release (private repo, git.stinnesbeck.com/nils/mg4)
+                                   │  read with FORGE_TOKEN (read-only, server Secret)
+                                   ▼
+                           car server  /v1/app/releases, /v1/app/assets/…
+                                   │  the car's own paired token
+                                   ▼
+                    app: refresh button → check → SHA-256 → install
+```
 
-Install the platform-signed 2.2.7 APK manually once if the car still runs 2.2.3 or older.
-Those builds use the old `pm install` path; publishing a newer APK does not repair the
-installer already running on the car. Builds from 2.2.4 use `PackageInstaller` sessions.
-Keep the unstable package ID, system shared UID and signing certificate when upgrading.
+The repository stays private and the forge token stays on the server: the car asks its own
+server, with its own token, and never holds a forge credential. The server only relays
+bytes. Every check that decides whether code gets installed is in the app.
 
-The 2.2.5 build removes window automation. It also distinguishes failed release checks
-from a successful check with no newer release. On 2026-09-29, GitHub still published only
-2.2.3 at the last live check. The local 2.2.7 build includes these fixes and the redesigned
-UI; it becomes available to OTA only after publication as a pre-release asset named
-`FatihsMG4-unstable-2.2.7.apk`, together with
-`FatihsMG4-unstable-2.2.7.apk.sha256`.
+## Publishing a release
 
-The vehicle artifact uses `com.stinnesbeck.nilsmg4.unstable` (upstream: `com.evsuite.abrp.unstable`),
-`android.uid.system`, and the
-DriveHub_Kamera platform key. Its certificate SHA-256 must be
-`c8a2e9bccf597c2fb6dc66bee293fc13f2fc47ec77bc6b2b0d52c11f51192ab8`.
-The stable build used for a Samsung UI preview is a separate package without OTA or the
-vehicle's shared UID; do not use that preview APK for the MG4 upgrade.
+1. **Raise the version** in `app/build.gradle` (`versionCode` must increase; `versionName`
+   is three-part, e.g. `2.16.0`). The car build reports it as `2.16.0-unstable`.
+2. **Build:** `nix develop`, then `build-car`. It signs with the AOSP platform key the head
+   unit trusts, checks the signer, and writes `build/car/NilsMG4-unstable-<version>.apk` and
+   its `.sha256`.
+3. **Publish:** `publish-car`. It creates the pre-release `car-<version>` on the current
+   commit and attaches the APK and the `.sha256`. It needs a forge token that may write the
+   repository's releases, in `~/.config/nilsmg4/forge-token` (or `$FORGE_TOKEN`); the token is
+   only sent in a header, never printed. It refuses a version that is already published.
 
-## What the updater actually looks for
+By hand, the same: in the forge's web UI create a release with tag `car-<version>`, tick
+**pre-release**, and attach both files with exactly their names.
 
-> **Switched off in Nils' MG4.** `RELEASES_API` points at `updates.invalid`, so every check
-> fails. To re-enable it, point it at this repository's releases and add the host to
-> `ALLOWED_HOSTS` (see `SPECS.md`). The steps below are upstream's GitHub process.
+## What the updater accepts
 
-`OtaUpdater.check()` reads the `RELEASES_API` URL (upstream:
-`https://api.github.com/repos/fatihdonmezdev/FatihsMG4/releases`) and walks **every** entry, keeping the highest version rather than the first match. A
-release is a candidate only if all of these hold:
+The app asks the car server for the releases (`GET /v1/app/releases`) and walks every one,
+keeping the highest version:
 
-| Requirement | Where it is enforced | What happens otherwise |
+| Requirement | Where it is enforced | Otherwise |
 |---|---|---|
-| Marked **pre-release** | `release.optBoolean("prerelease")` | Skipped entirely |
-| Asset name contains `unstable` | `name.contains("unstable")` | Asset ignored |
-| Asset name ends `-<version>.apk` | `ASSET_VERSION` regex | No version, asset ignored |
-| Version strictly higher than installed | `isNewer()` | Nothing to do, reports "Up to date" |
-| Download host on the allowlist | `isAllowedUrl()` | Refused and logged |
-| APK signed with the **same certificate** as the running app | Android `PackageInstaller` | Installation is rejected by the platform |
-| Matching `.sha256` asset or `SHA256SUMS` entry | `fetchExpectedSha256()` | Update ignored/refused |
+| Marked **pre-release**, not a draft | `selectUpdate` | Skipped |
+| Asset name contains `unstable` and ends `-<version>.apk` | `ASSET_VERSION` regex | Ignored |
+| Version strictly higher than installed | `isNewer()` | "Up to date" |
+| Every URL https and **exactly** the configured server's host | `isAllowedUrl()` | Refused |
+| A matching `.sha256` (or `SHA256SUMS`) asset, and the APK's bytes match it | `fetchExpectedSha256()`, `download()` | Refused, file deleted |
+| The archive is this app's package | `archiveIsThisPackage()` | Refused |
+| Signed with the **same certificate** as the installed app | Android's installer | Not installed |
 
-The last one is the one that bites. The car runs a platform-signed build; an APK signed
-with a debug key — or anyone else's key — is downloaded, rejected and deleted. Sign every
-release with the same platform key or the update silently never lands.
+The version comes from the **asset file name**, not the tag.
 
-The version comes from the **asset filename**, not the git tag. The tag can stay
-`unstable` forever and be moved; the filename is what identifies a build.
+## Installing
 
-## Release checklist
+Press the refresh button in the app's top bar. The app checks, downloads the APK into
+**Downloads** (with progress), verifies its SHA-256, and hands it to a `PackageInstaller`
+session. As the system user it may install without asking; if the platform wants a
+confirmation, the confirmation screen opens. When a session cannot start at all, the file
+manager opens in Downloads (or, where the head unit has none, open the APK there with the
+Files app). The verified APK stays in Downloads either way.
 
-1. **Raise the version.** `app/build.gradle`, `defaultConfig`:
-
-   ```gradle
-   versionCode 24          // must increase — Android orders updates by this, not by name
-   versionName "2.2.7"
-   ```
-
-   The unstable flavour appends its own suffix, so `2.2.7` becomes `2.2.7-unstable`.
-   Check what the installed build reports before picking a number: the app's About
-   dialog shows it, and `isNewer` compares numerically segment by segment.
-
-2. **Build.**
-
-   ```bash
-   ./gradlew :app:assembleUnstableDebug
-   ```
-
-3. **Sign with the platform key.** Options come *before* the input APK — apksigner
-   rejects the other order.
-
-   ```bash
-   BT=~/Android/Sdk/build-tools/35.0.0
-   # Local copies from DriveHub_Kamera/tools; private and gitignored.
-   KEYS="$PWD/tools"
-
-   "$BT/zipalign" -f 4 \
-     app/build/outputs/apk/unstable/debug/app-unstable-debug.apk aligned.apk
-
-   "$BT/apksigner" sign \
-     --key  "$KEYS/platform.pk8" \
-     --cert "$KEYS/platform.x509.pem" \
-     --out  NilsMG4-unstable-2.2.7.apk \
-     aligned.apk
-
-   rm aligned.apk
-   ```
-
-   The output filename **is** the version the updater reads. Name it
-   `NilsMG4-unstable-<version>.apk` (`build-car` does steps 2 to 4 and names it so), then create its required integrity sidecar:
-
-   ```bash
-   shasum -a 256 NilsMG4-unstable-2.2.7.apk \
-     > NilsMG4-unstable-2.2.7.apk.sha256
-   ```
-
-4. **Verify the signer** before uploading. It must say `CN=Android`:
-
-   ```bash
-   "$BT/apksigner" verify --print-certs NilsMG4-unstable-2.2.7.apk
-   ```
-
-5. **Publish.** On github.com/fatihdonmezdev/FatihsMG4 → Releases → Draft a new release:
-   - tag: `unstable` (reuse it; the rolling tag is the design)
-   - **tick "Set as a pre-release"** ← the whole thing is inert without this
-   - attach the signed APK and its `.sha256` sidecar
-
-6. **Install it.** Open the app on the head unit and press the refresh button in the top
-   bar. The dialog shows download progress, verifies SHA-256, then reports that the
-   PackageInstaller session has started.
+At start the app only checks, and shows "Update available" when there is one. It never
+downloads or installs on its own, and the upload service never checks: installing restarts
+the app, which must not happen mid-drive on its own.
 
 ## When it says something else
 
 | Message | Meaning |
 |---|---|
-| `Up to date (2.14.2-unstable)` | No release beat the installed version. Check the pre-release tick and the asset filename. |
-| `Update refused: no SHA-256 verification` | The APK has no matching sidecar, or the sidecar is invalid or unreachable. |
-| `Download or SHA-256 verification failed (…)` | The download failed, or its bytes do not match the published hash. |
-| `Update check failed` | The check threw. `adb logcat -s UpdateHook OtaUpdater` if a cable is available; otherwise the in-app Logs tab. |
-| `Update check already in progress` | A check is still running; wait for its result. |
+| `Up to date (2.16.0-unstable)` | No published pre-release is newer. Check the pre-release tick and the asset name. |
+| `Set up the server first (Server tab): updates come through it` | The app has no server URL and token. |
+| `Update check failed` | The server could not be reached, or answered with an error: 404 when updates are off on the server (no `FORGE_TOKEN`), 502 when the forge refused the server's token. |
+| `Update refused: no SHA-256 verification` | The release has no matching `.sha256`, or it is unreadable. |
+| `Download or SHA-256 verification failed (…)` | The download broke off, or the bytes do not match the published hash. |
+| `Update refused: the downloaded file is not this app` | The archive does not parse, or it is another package. |
+| `Installing 2.16.0… the app restarts when it is done` | The session was committed; the result follows as its own toast. |
+| `Installation failed: INSTALL_FAILED_… The APK is in Downloads.` | The package manager's own words. A signature error means the APK was not signed by `build-car`. |
+| `… is in Downloads — tap the file to install` | A session could not start; install from Downloads by hand. |
 
-## How the install works, and why it is not `pm install`
+On the car's Logs tab, or with a cable: `adb logcat -s EVABRP.Update OtaUpdater`.
 
-`OtaUpdater.install()` used to shell out to `/system/bin/pm install -r`. On this head unit
-that fails every time, and the reason is worth writing down because the symptom pointed
-somewhere else entirely.
+## Why a PackageInstaller session, not `pm install`
 
-The downloaded APK lives in `context.getCacheDir()`. `pm` does not install the file itself
-— it passes the path to the package manager service, which opens it from *its* process and
-SELinux context, where an app's private cache is not readable. The install failed, and
-because `install()` returned a bare boolean, the caller reported the only failure it knew
-how to name: `Kurulum reddedildi (imza uyuşmuyor?)` ("installation refused (signature mismatch?)"). A correctly signed build, refused with
-a signature error it had not earned. The `pm` output that would have said so was captured
-and thrown away.
-
-It now uses the platform `PackageInstaller`: we open the archive ourselves and stream it
-into a session, so no second process ever has to read our cache. The approach is taken from
+Upstream first shelled out to `/system/bin/pm install -r` with the APK in the app's private
+cache. That fails on this head unit: `pm` hands the path to the package manager service,
+which opens it from its own process and SELinux context, where an app's private cache is not
+readable — and the failure surfaced as a signature error it never was. A session takes no
+path: the app opens the archive itself and streams it in. The approach comes from
 [merthankaraman/DriveHub_Dort](https://github.com/merthankaraman/DriveHub_Dort), which hit
-the same wall on the same hardware.
+the same wall on the same hardware. Upstream later fell back to "download to Downloads and
+tap it"; this fork tries the session first and keeps that as the fallback.
 
-Two consequences for anyone reading a failure:
-
-- **Committing a session is not installing.** `commit()` is asynchronous. The refresh button
-  can only report that an install *started*; the verdict arrives at
-  `OtaInstallResultReceiver` and appears as its own toast.
-- **`STATUS_PENDING_USER_ACTION` is not an error.** The platform is asking the driver to
-  confirm. The receiver launches the confirmation activity the platform hands it.
-
-Still unverified on the car: whether this build installs silently or raises that
-confirmation. Either way it installs, which the old path did not.
-
-## Why installation is manual
-
-`UpdateHook.checkInBackground(this)` performs an availability-only check at app start and
-shows a notification toast when a complete APK + hash pair exists. It never downloads or
-installs. The refresh button is the only trigger for download, verification and installation.
-
-The upload service does **not** check for updates on its tick. Installing a new APK
-restarts the process, and doing that mid-drive would interrupt the telemetry the service
-exists to send.
+**Not yet tried on this car:** whether the session installs silently as the system user, or
+asks for a confirmation.
diff --git a/README.md b/README.md
index fdf9000..7e45237 100644
--- a/README.md
+++ b/README.md
@@ -106,8 +106,9 @@ adb shell "pm install -r -f -d -t /data/local/tmp/update.apk"
 
 > ⚠️ Do this **parked**, and only with an APK you trust. See [DISCLAIMER.md](DISCLAIMER.md).
 
-Self-updating (OTA) is switched off: the updater points at an unresolvable host until it is
-pointed at this repository's releases (see `SPECS.md`).
+After that first install, the app updates itself: publish a build with `publish-car`, then
+press the refresh button in the app's top bar (`OTA.md`). The car fetches it through your car
+server, so the repository stays private.
 
 ## Setup
 
diff --git a/SPECS.md b/SPECS.md
index 80820fe..c03218d 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -70,12 +70,6 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
 
 ## To do
 
-- [ ] **Re-enable OTA updates against our own releases.** `RELEASES_API` in
-      `app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java` points at `updates.invalid` on purpose,
-      so checks fail. The updater speaks the GitHub releases API and only allows GitHub hosts
-      (`ALLOWED_HOSTS`). For git.stinnesbeck.com it needs the host on the allowlist, and the
-      response parsing checked against that server's releases API. Release assets must be named
-      `NilsMG4-unstable-<version>.apk` with a `.sha256` sidecar (`build-car` writes both).
 - [ ] **Grafana high availability needs another database.** Grafana keeps its own state (users,
       sessions, preferences, provisioned-dashboard records, alerting state) in SQLite at
       `/var/lib/grafana/grafana.db` on the `grafana-data` PVC. That is fine for one replica, and is
@@ -115,6 +109,13 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.16.0, server 2.6.0: over-the-air updates from this repository. `publish-car`
+  creates the pre-release `car-<version>` on the private forge with the APK and its `.sha256`;
+  the server relays releases and attachments to the car (`/v1/app/…`, read with a read-only
+  `FORGE_TOKEN`); the app checks them through its server with its own token, allows exactly the
+  server's host, downloads itself (no DownloadManager, so the token stays in the app), verifies
+  SHA-256 and package, and tries a PackageInstaller session before falling back to Downloads.
+  `OTA.md` rewritten for this flow. Not yet tried on the car.
 - 2026-10-18 — App 2.15.0: unsent live samples survive a restart. The queue is saved to
   `files/telemetry_queue.json` (AtomicFile) at most every 5 minutes and only after a change, and
   at once when the service stops; it is restored, in order and within its 2000-sample cap, when
diff --git a/app/build.gradle b/app/build.gradle
index c85119b..97cbc52 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 83
-        versionName "2.15.0"
+        versionCode 84
+        versionName "2.16.0"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 288bf29..d17bf14 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -198,7 +198,7 @@
     <string name="notif_title">ABRP Uploader</string>
     <string name="notif_action_stop">Stop</string>
     <string name="ota_install_success">Update installed — restart the app</string>
-    <string name="ota_install_failed">Installation failed: %1$s</string>
+    <string name="ota_install_failed">Installation failed: %1$s. The APK is in Downloads.</string>
     <string name="update_check">Check for updates</string>
     <string name="update_checking">Checking for a new OTA version…</string>
     <string name="update_dialog_title">Software update</string>
diff --git a/app/src/testUnstable/java/com/evsuite/abrp/OtaUpdaterTest.java b/app/src/testUnstable/java/com/evsuite/abrp/OtaUpdaterTest.java
index e318cfd..89839e4 100644
--- a/app/src/testUnstable/java/com/evsuite/abrp/OtaUpdaterTest.java
+++ b/app/src/testUnstable/java/com/evsuite/abrp/OtaUpdaterTest.java
@@ -24,46 +24,55 @@ import java.nio.charset.StandardCharsets;
  */
 public class OtaUpdaterTest {
 
-    // ---- URL allowlist ----
+    // ---- URL allowlist: exactly the configured car server ----
+
+    private static final String HOST = "car.example.com";
 
     @Test
-    public void httpsFromAnAllowedHostIsAccepted() {
-        assertTrue(OtaUpdater.isAllowedUrl(
-                "https://github.com/malys/EVABRPUploader/releases/download/v1.2.0/app.apk"));
-        assertTrue(OtaUpdater.isAllowedUrl(
-                "https://objects.githubusercontent.com/github-production-release-asset/x.apk"));
+    public void httpsFromTheServerIsAccepted() {
+        assertTrue(OtaUpdater.isAllowedUrl("https://car.example.com/v1/app/assets/7/11/app.apk", HOST));
     }
 
     @Test
-    public void httpIsRejectedEvenOnAnAllowedHost() {
-        assertFalse(OtaUpdater.isAllowedUrl("http://github.com/malys/app.apk"));
+    public void httpIsRejectedEvenFromTheServer() {
+        assertFalse(OtaUpdater.isAllowedUrl("http://car.example.com/v1/app/assets/7/11/app.apk", HOST));
     }
 
     @Test
     public void foreignHostsAreRejected() {
-        assertFalse(OtaUpdater.isAllowedUrl("https://evil.example.com/app.apk"));
+        assertFalse(OtaUpdater.isAllowedUrl("https://evil.example.com/app.apk", HOST));
+        assertFalse(OtaUpdater.isAllowedUrl("https://github.com/fatihdonmezdev/FatihsMG4/app.apk", HOST));
     }
 
     @Test
     public void lookalikeHostsAreRejected() {
         // Exact match, never a suffix test.
-        assertFalse(OtaUpdater.isAllowedUrl("https://github.com.attacker.net/app.apk"));
-        assertFalse(OtaUpdater.isAllowedUrl("https://evil-github.com/app.apk"));
-        assertFalse(OtaUpdater.isAllowedUrl("https://notgithub.com/app.apk"));
+        assertFalse(OtaUpdater.isAllowedUrl("https://car.example.com.attacker.net/app.apk", HOST));
+        assertFalse(OtaUpdater.isAllowedUrl("https://evil-car.example.com/app.apk", HOST));
+        assertFalse(OtaUpdater.isAllowedUrl("https://example.com/app.apk", HOST));
     }
 
     @Test
     public void unparsableOrNonHttpUrlsAreRejected() {
-        assertFalse(OtaUpdater.isAllowedUrl(""));
-        assertFalse(OtaUpdater.isAllowedUrl("not a url"));
-        assertFalse(OtaUpdater.isAllowedUrl("ftp://github.com/app.apk"));
-        assertFalse(OtaUpdater.isAllowedUrl("file:///sdcard/Download/app.apk"));
+        assertFalse(OtaUpdater.isAllowedUrl("", HOST));
+        assertFalse(OtaUpdater.isAllowedUrl(null, HOST));
+        assertFalse(OtaUpdater.isAllowedUrl("not a url", HOST));
+        assertFalse(OtaUpdater.isAllowedUrl("ftp://car.example.com/app.apk", HOST));
+        assertFalse(OtaUpdater.isAllowedUrl("file:///sdcard/Download/app.apk", HOST));
+        assertFalse(OtaUpdater.isAllowedUrl("https://car.example.com/app.apk", null)); // no server set up
     }
 
     @Test
     public void hostMatchingIgnoresCase() {
-        assertTrue(OtaUpdater.isAllowedUrl("https://GitHub.com/malys/app.apk"));
-        assertTrue(OtaUpdater.isAllowedUrl("HTTPS://github.com/malys/app.apk"));
+        assertTrue(OtaUpdater.isAllowedUrl("https://Car.Example.com/app.apk", HOST));
+        assertTrue(OtaUpdater.isAllowedUrl("HTTPS://car.example.com/app.apk", HOST));
+    }
+
+    @Test
+    public void theAllowedHostIsTheConfiguredServers() {
+        assertEquals("car.example.com", OtaUpdater.allowedHost(new ServerConfig("https://Car.Example.com", "t", "i")));
+        assertEquals("https://car.example.com/v1/app/releases",
+                OtaUpdater.releasesUrl(new ServerConfig("https://car.example.com", "t", "i")));
     }
 
     // ---- Version comparison ----
@@ -138,7 +147,7 @@ public class OtaUpdaterTest {
     @Test
     public void updateWithoutHashSidecarIsReportedButCannotBeVerified() throws Exception {
         JSONArray releases = new JSONArray().put(releaseWithoutHashes(true, asset("2.2.7")));
-        OtaUpdater.Update update = OtaUpdater.selectUpdate(releases, "2.2.6.0-unstable");
+        OtaUpdater.Update update = OtaUpdater.selectUpdate(releases, "2.2.6.0-unstable", HOST);
         assertEquals("2.2.7", update.versionName);
         assertNull(update.hashUrl);
     }
@@ -148,7 +157,7 @@ public class OtaUpdaterTest {
         JSONArray releases = new JSONArray().put(release(true,
                 asset("2.2.3"), asset("2.2.6"), asset("2.2.4")))
                 .put(release(true, asset("2.2.5")));
-        OtaUpdater.Update update = OtaUpdater.selectUpdate(releases, "2.2.2.0-unstable");
+        OtaUpdater.Update update = OtaUpdater.selectUpdate(releases, "2.2.2.0-unstable", HOST);
         assertEquals("2.2.6", update.versionName);
         assertTrue(update.apkUrl.endsWith("NilsMG4-unstable-2.2.6.apk"));
     }
@@ -162,14 +171,14 @@ public class OtaUpdaterTest {
                 .put(release(false, asset("9.0.0")))
                 .put(release(true, asset("9.0.0")).put("draft", true))
                 .put(release(true, foreign, unversioned, stableName, asset("2.2.5")));
-        assertEquals("2.2.5", OtaUpdater.selectUpdate(releases, "2.2.4.0-unstable").versionName);
+        assertEquals("2.2.5", OtaUpdater.selectUpdate(releases, "2.2.4.0-unstable", HOST).versionName);
     }
 
     @Test
     public void successfulCheckFindsUpdateAndDisconnects() throws Exception {
         Response response = new Response(200,
                 new JSONArray().put(release(true, asset("2.2.5"))).toString());
-        assertEquals("2.2.5", OtaUpdater.check("2.2.4.0-unstable", response).versionName);
+        assertEquals("2.2.5", OtaUpdater.check("2.2.4.0-unstable", response, HOST).versionName);
         assertTrue(response.disconnected);
     }
 
@@ -177,7 +186,7 @@ public class OtaUpdaterTest {
     public void successfulCheckWithOnlyOlderOrEqualVersionsIsCurrent() throws Exception {
         Response response = new Response(200,
                 new JSONArray().put(release(true, asset("2.2.3"), asset("2.2.5"))).toString());
-        assertNull(OtaUpdater.check("2.2.5.0-unstable", response));
+        assertNull(OtaUpdater.check("2.2.5.0-unstable", response, HOST));
         assertTrue(response.disconnected);
     }
 
@@ -185,7 +194,7 @@ public class OtaUpdaterTest {
     public void rateLimitMustNotBeReportedAsCurrent() throws Exception {
         Response response = new Response(403, "{}");
         try {
-            OtaUpdater.check("2.2.4.0-unstable", response);
+            OtaUpdater.check("2.2.4.0-unstable", response, HOST);
         } finally {
             assertTrue(response.disconnected);
         }
@@ -195,7 +204,7 @@ public class OtaUpdaterTest {
     public void malformedResponseMustNotBeReportedAsCurrent() throws Exception {
         Response response = new Response(200, "<html>unavailable</html>");
         try {
-            OtaUpdater.check("2.2.4.0-unstable", response);
+            OtaUpdater.check("2.2.4.0-unstable", response, HOST);
         } finally {
             assertTrue(response.disconnected);
         }
@@ -209,7 +218,7 @@ public class OtaUpdaterTest {
             }
         };
         try {
-            OtaUpdater.check("2.2.4.0-unstable", response);
+            OtaUpdater.check("2.2.4.0-unstable", response, HOST);
         } finally {
             assertTrue(response.disconnected);
         }
@@ -218,7 +227,7 @@ public class OtaUpdaterTest {
     private static JSONObject asset(String version) throws Exception {
         String name = "NilsMG4-unstable-" + version + ".apk";
         return new JSONObject().put("name", name).put("browser_download_url",
-                "https://github.com/fatihdonmezdev/FatihsMG4/releases/download/unstable/" + name);
+                "https://car.example.com/v1/app/assets/7/11/" + name);
     }
 
     private static JSONObject release(boolean prerelease, JSONObject... assets) throws Exception {
@@ -249,7 +258,7 @@ public class OtaUpdaterTest {
         boolean disconnected;
 
         Response(int status, String body) throws Exception {
-            super(new URL("https://api.github.com/repos/fatihdonmezdev/FatihsMG4/releases"));
+            super(new URL("https://car.example.com/v1/app/releases"));
             this.status = status;
             this.body = body;
         }
@@ -262,8 +271,6 @@ public class OtaUpdaterTest {
         @Override public void connect() { }
     }
 
-    // The `pm install -r` exit-code test that stood here is gone with the shell-out it
-    // covered. Installation is now a PackageInstaller session, whose every step needs a real
-    // PackageManager — there is no pure part of it left to exercise on the JVM. What used to
-    // be asserted here is now reported by OtaInstallResultReceiver, on the car.
+    // Installation is a PackageInstaller session, whose every step needs a real PackageManager
+    // — nothing of it can be exercised on the JVM. OtaInstallResultReceiver reports it on the car.
 }
diff --git a/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java b/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java
index 276f60f..528b61f 100644
--- a/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java
+++ b/app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java
@@ -1,17 +1,15 @@
 package com.evsuite.abrp;
 
-import android.app.PendingIntent;
 import android.app.DownloadManager;
+import android.app.PendingIntent;
 import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInstaller;
 import android.content.pm.ResolveInfo;
-import android.database.Cursor;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
-import android.os.ParcelFileDescriptor;
 import android.provider.Settings;
 import android.util.Log;
 
@@ -43,43 +41,34 @@ import java.security.MessageDigest;
  * stable build. Unstable testers get updates without manual work, and accept that channel's
  * risk.
  *
- * Security posture is the one EVProfile settled on in its own OTA work:
- *  - the APK URL comes from a remote JSON document and is never trusted: https only,
- *    exact-match host allowlist, checked again before it reaches the system downloader;
- *  - the downloaded APK must be signed by the same certificate as the running app, or it
- *    is deleted rather than offered for install;
- *  - both checks fail closed.
+ * Releases come from the car server (server/releases.go), which relays them from the private
+ * forge repository: the car asks with its own paired token and never holds a forge
+ * credential. The server only carries bytes; the checks are all here:
+ *  - every URL in the release list is untrusted: https only, and exactly the configured
+ *    server's host (no suffix match), checked again before anything is fetched;
+ *  - the APK must match the SHA-256 published next to it, or it is deleted;
+ *  - it must be this app's package, and the installer refuses any other signing key;
+ *  - every check fails closed.
  */
 final class OtaUpdater {
 
     private static final String TAG = "OtaUpdater";
     private static final String CACHE_PREFIX = "NilsMG4-ota-";
 
-    /**
-     * Pre-releases live here; the unstable channel tracks them.
-     *
-     * This fork's own repository, deliberately: an update pulled from upstream would be
-     * signed with a different key, and Android refuses to install over a platform-signed
-     * build with anything but the same signature. Pointing here means the check finds
-     * nothing until this repository publishes a release, which is the intended quiet.
-     *
-     * Disabled for now: the .invalid TLD (RFC 2606) never resolves, so every check fails
-     * with "Update check failed" instead of offering upstream's builds over this one. To
-     * re-enable, point this at a fork's releases API, e.g.
-     * "https://api.github.com/repos/<owner>/<repo>/releases".
-     */
-    private static final String RELEASES_API =
-            "https://updates.invalid/repos/fatihdonmezdev/FatihsMG4/releases";
+    /** The release list on the car server, for the server configured in the app. */
+    static String releasesUrl(ServerConfig config) {
+        return config.url + "/v1/app/releases";
+    }
 
-    /**
-     * Hosts an update may come from. The githubusercontent entries are the CDNs GitHub
-     * redirects release-asset downloads to; without them the download fails.
-     */
-    private static final List<String> ALLOWED_HOSTS = Arrays.asList(
-            "api.github.com",
-            "github.com",
-            "objects.githubusercontent.com",
-            "release-assets.githubusercontent.com");
+    /** The one host updates may come from: the configured server's. Null if unusable. */
+    static String allowedHost(ServerConfig config) {
+        try {
+            String host = new URI(config.url).getHost();
+            return host == null ? null : host.toLowerCase(Locale.US);
+        } catch (Exception e) {
+            return null;
+        }
+    }
 
     private static final java.util.regex.Pattern ASSET_VERSION =
             java.util.regex.Pattern.compile("-(\\d[0-9.]*?)\\.apk$",
@@ -87,6 +76,7 @@ final class OtaUpdater {
 
     private static final int TIMEOUT_MS = 10_000;
     private static final int MAX_HASH_BYTES = 16 * 1024;
+    private static final long MAX_APK_BYTES = 64L * 1024 * 1024;
 
     private OtaUpdater() { }
 
@@ -119,13 +109,14 @@ final class OtaUpdater {
     }
 
     /**
-     * True if [url] is https and points at an allowed host.
+     * True if [url] is https and points at exactly [allowedHost].
      *
-     * Rejects http (including an https -> http downgrade), unknown hosts, unparsable
-     * URLs, and lookalikes such as "github.com.attacker.net" — the host match is exact,
-     * never a suffix test.
+     * Rejects http (including an https -> http downgrade), other hosts, unparsable URLs, and
+     * lookalikes such as "car.example.com.attacker.net" — the host match is exact, never a
+     * suffix test.
      */
-    static boolean isAllowedUrl(String url) {
+    static boolean isAllowedUrl(String url, String allowedHost) {
+        if (url == null || allowedHost == null) return false;
         URI uri;
         try {
             uri = new URI(url);
@@ -134,7 +125,7 @@ final class OtaUpdater {
         }
         if (uri.getScheme() == null || !uri.getScheme().equalsIgnoreCase("https")) return false;
         String host = uri.getHost();
-        return host != null && ALLOWED_HOSTS.contains(host.toLowerCase(java.util.Locale.US));
+        return host != null && host.toLowerCase(Locale.US).equals(allowedHost.toLowerCase(Locale.US));
     }
 
     /**
@@ -191,18 +182,21 @@ final class OtaUpdater {
     }
 
     /**
-     * Asks GitHub for the newest pre-release and returns it if it beats [currentVersion].
-     * Runs on the caller's thread — never call from the main thread.
+     * Asks the car server for the newest pre-release and returns it if it beats
+     * [currentVersion]. Runs on the caller's thread — never call from the main thread.
      */
-    static Update check(String currentVersion) throws IOException {
-        return check(currentVersion, (HttpURLConnection) new URL(RELEASES_API).openConnection());
+    static Update check(ServerConfig config, String currentVersion) throws IOException {
+        HttpURLConnection conn = (HttpURLConnection) new URL(releasesUrl(config)).openConnection();
+        // The car's own token, in a header; never in a URL or a log line.
+        conn.setRequestProperty("Authorization", "Bearer " + config.token);
+        return check(currentVersion, conn, allowedHost(config));
     }
 
     /** Connection seam for exercising real response handling without a device or network. */
-    static Update check(String currentVersion, HttpURLConnection conn) throws IOException {
+    static Update check(String currentVersion, HttpURLConnection conn, String allowedHost) throws IOException {
         try {
             conn.setInstanceFollowRedirects(false);
-            conn.setRequestProperty("Accept", "application/vnd.github.v3+json");
+            conn.setRequestProperty("Accept", "application/json");
             conn.setRequestProperty("User-Agent", "NilsMG4-Android");
             conn.setConnectTimeout(TIMEOUT_MS);
             conn.setReadTimeout(TIMEOUT_MS);
@@ -217,7 +211,7 @@ final class OtaUpdater {
                 while ((line = br.readLine()) != null) body.append(line);
             }
 
-            return selectUpdate(new JSONArray(body.toString()), currentVersion);
+            return selectUpdate(new JSONArray(body.toString()), currentVersion, allowedHost);
         } catch (JSONException e) {
             throw new IOException("Invalid release response", e);
         } finally {
@@ -226,7 +220,7 @@ final class OtaUpdater {
     }
 
     /** Scan every asset of every pre-release; asset ordering does not imply version order. */
-    static Update selectUpdate(JSONArray releases, String currentVersion) throws JSONException {
+    static Update selectUpdate(JSONArray releases, String currentVersion, String allowedHost) throws JSONException {
         Update best = null;
         for (int i = 0; i < releases.length(); i++) {
             JSONObject release = releases.getJSONObject(i);
@@ -241,24 +235,24 @@ final class OtaUpdater {
                 if (version == null || !isNewer(version, currentVersion)) continue;
                 if (best != null && !isNewer(version, best.versionName)) continue;
                 String url = asset.optString("browser_download_url", "");
-                String hashUrl = findHashUrl(assets, name);
+                String hashUrl = findHashUrl(assets, name, allowedHost);
                 // Keep the candidate even when the sidecar is absent so the UI can report
                 // a broken release instead of incorrectly saying the app is current.
                 // fetchExpectedSha256 still fails closed before any APK is downloaded.
-                if (isAllowedUrl(url)) best = new Update(version, url, name, hashUrl);
+                if (isAllowedUrl(url, allowedHost)) best = new Update(version, url, name, hashUrl);
             }
         }
         return best;
     }
 
-    private static String findHashUrl(JSONArray assets, String apkName) throws JSONException {
+    private static String findHashUrl(JSONArray assets, String apkName, String allowedHost) throws JSONException {
         String exact = apkName + ".sha256";
         String sums = null;
         for (int i = 0; i < assets.length(); i++) {
             JSONObject asset = assets.getJSONObject(i);
             String name = asset.optString("name", "");
             String url = asset.optString("browser_download_url", "");
-            if (!isAllowedUrl(url)) continue;
+            if (!isAllowedUrl(url, allowedHost)) continue;
             if (exact.equalsIgnoreCase(name)) return url;
             if ("SHA256SUMS".equalsIgnoreCase(name)) sums = url;
         }
@@ -285,20 +279,21 @@ final class OtaUpdater {
         return value != null && value.matches("(?i)[a-f0-9]{64}");
     }
 
-    static String fetchExpectedSha256(Update update) throws IOException {
-        if (update == null || !isAllowedUrl(update.hashUrl))
+    static String fetchExpectedSha256(Update update, ServerConfig config) throws IOException {
+        if (update == null || !isAllowedUrl(update.hashUrl, allowedHost(config)))
             throw new IOException("Missing SHA-256 sidecar");
-        String body = readSmallText(update.hashUrl);
+        String body = readSmallText(update.hashUrl, config);
         String hash = parseExpectedSha256(body, update.apkName);
         if (hash == null) throw new IOException("Invalid SHA-256 sidecar");
         return hash;
     }
 
-    private static String readSmallText(String initialUrl) throws IOException {
+    private static String readSmallText(String initialUrl, ServerConfig config) throws IOException {
         URL current = new URL(initialUrl);
         for (int redirects = 0; redirects <= 5; redirects++) {
-            if (!isAllowedUrl(current.toString())) throw new IOException("Hash URL refused");
+            if (!isAllowedUrl(current.toString(), allowedHost(config))) throw new IOException("Hash URL refused");
             HttpURLConnection connection = (HttpURLConnection) current.openConnection();
+            connection.setRequestProperty("Authorization", "Bearer " + config.token);
             connection.setInstanceFollowRedirects(false);
             connection.setConnectTimeout(TIMEOUT_MS);
             connection.setReadTimeout(TIMEOUT_MS);
@@ -346,64 +341,64 @@ final class OtaUpdater {
     }
 
     /**
-     * Downloads into private cache. Every redirect URL is validated before it is followed.
+     * Downloads the APK from the car server into the public Downloads folder, hashing it on
+     * the way. Done here rather than with the system DownloadManager, so the car's token stays
+     * in this app instead of another app's download database. A wrong hash deletes the file.
+     * No redirects: the server streams the file itself.
      */
-    static File download(Context context, Update update, String expectedSha256,
+    static File download(Update update, String expectedSha256, ServerConfig config,
                          ProgressListener listener) {
-        if (!isAllowedUrl(update.apkUrl)) {
-            Log.w(TAG, "Refusing to download from " + update.apkUrl);
+        if (!isAllowedUrl(update.apkUrl, allowedHost(config))) {
+            Log.w(TAG, "Refusing to download from an unexpected host");
             return null;
         }
-        DownloadManager manager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-        if (manager == null) return null;
-        String publicName = downloadFileName(update.versionName);
-        File publicFile = new File(Environment.getExternalStoragePublicDirectory(
-                Environment.DIRECTORY_DOWNLOADS), publicName);
-        if (publicFile.exists() && !publicFile.delete()) return null;
-        long downloadId = -1L;
+        File downloads = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+        if (downloads == null || (!downloads.isDirectory() && !downloads.mkdirs())) return null;
+        File target = new File(downloads, downloadFileName(update.versionName));
+        HttpURLConnection connection = null;
+        boolean ok = false;
         try {
-            DownloadManager.Request request = new DownloadManager.Request(Uri.parse(update.apkUrl))
-                    .setTitle("Nils' MG4 " + update.versionName)
-                    .setDescription("Downloading update")
-                    .setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
-                    .setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, publicName)
-                    .setAllowedOverMetered(true)
-                    .setAllowedOverRoaming(true);
-            downloadId = manager.enqueue(request);
-            while (true) {
-                try (Cursor cursor = manager.query(new DownloadManager.Query().setFilterById(downloadId))) {
-                    if (cursor == null || !cursor.moveToFirst()) return null;
-                    int status = cursor.getInt(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_STATUS));
-                    long received = cursor.getLong(cursor.getColumnIndexOrThrow(
-                            DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR));
-                    long total = cursor.getLong(cursor.getColumnIndexOrThrow(
-                            DownloadManager.COLUMN_TOTAL_SIZE_BYTES));
-                    if (listener != null) listener.onProgress(total > 0
-                            ? (int) Math.min(100, received * 100 / total) : -1);
-                    if (status == DownloadManager.STATUS_SUCCESSFUL) break;
-                    if (status == DownloadManager.STATUS_FAILED) return null;
-                }
-                Thread.sleep(250L);
-            }
-
-            MessageDigest digest = MessageDigest.getInstance("SHA-256");
-            try (ParcelFileDescriptor descriptor = manager.openDownloadedFile(downloadId);
-                 java.io.InputStream input = new ParcelFileDescriptor.AutoCloseInputStream(descriptor)) {
-                byte[] buffer = new byte[64 * 1024];
-                int count;
-                while ((count = input.read(buffer)) != -1) {
-                    digest.update(buffer, 0, count);
-                }
-            }
-            if (!hex(digest.digest()).equalsIgnoreCase(expectedSha256)) {
-                if (!publicFile.delete()) Log.w(TAG, "Could not remove invalid OTA file");
+            connection = (HttpURLConnection) new URL(update.apkUrl).openConnection();
+            connection.setInstanceFollowRedirects(false);
+            connection.setConnectTimeout(TIMEOUT_MS);
+            connection.setReadTimeout(30_000);
+            connection.setRequestProperty("Authorization", "Bearer " + config.token);
+            connection.setRequestProperty("User-Agent", "NilsMG4-Android");
+            if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) {
+                Log.w(TAG, "Update download returned " + connection.getResponseCode());
                 return null;
             }
-            return publicFile;
+            long total = connection.getContentLengthLong();
+            MessageDigest digest = MessageDigest.getInstance("SHA-256");
+            long received = 0;
+            int lastPercent = -2;
+            try (java.io.InputStream in = connection.getInputStream();
+                 FileOutputStream out = new FileOutputStream(target, false)) {
+                byte[] buffer = new byte[64 * 1024];
+                int count;
+                while ((count = in.read(buffer)) != -1) {
+                    out.write(buffer, 0, count);
+                    digest.update(buffer, 0, count);
+                    received += count;
+                    if (received > MAX_APK_BYTES) throw new IOException("APK too large");
+                    int percent = total > 0 ? (int) Math.min(100, received * 100 / total) : -1;
+                    if (listener != null && percent != lastPercent) {
+                        listener.onProgress(percent);
+                        lastPercent = percent;
+                    }
+                }
+                out.getFD().sync();
+            }
+            ok = hex(digest.digest()).equalsIgnoreCase(expectedSha256);
+            if (!ok) Log.w(TAG, "Update APK does not match its SHA-256");
+            return ok ? target : null;
         } catch (Exception e) {
-            Log.w(TAG, "Update download failed", e);
+            Log.w(TAG, "Update download failed: " + e.getClass().getSimpleName());
+            return null;
+        } finally {
+            if (connection != null) connection.disconnect();
+            if (!ok && target.exists() && !target.delete()) Log.w(TAG, "Could not remove a bad update file");
         }
-        return null;
     }
 
     private static String hex(byte[] bytes) {
diff --git a/app/src/unstable/java/com/evsuite/abrp/UpdateHook.java b/app/src/unstable/java/com/evsuite/abrp/UpdateHook.java
index a335a1e..e57833c 100644
--- a/app/src/unstable/java/com/evsuite/abrp/UpdateHook.java
+++ b/app/src/unstable/java/com/evsuite/abrp/UpdateHook.java
@@ -10,9 +10,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
 /**
  * Drives {@link OtaUpdater} — UNSTABLE BUILDS ONLY.
  *
- * Upstream keeps this seam inert pending a safety and legal audit of the published suite.
- * This fork publishes its own builds from its own repository, signed with the platform key
- * the head unit already trusts, so that audit does not govern here and the seam is live.
+ * Releases are this fork's own car builds, published as pre-releases on the private forge and
+ * relayed by the car server (OtaUpdater); they are signed with the platform key the head unit
+ * already trusts.
  *
  * Installation goes through the platform {@link android.content.pm.PackageInstaller}, not
  * {@code pm install -r}: that shelled out with a path inside our private cache, which the
@@ -21,8 +21,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * authority for signing-certificate compatibility; the app verifies SHA-256 and package name
  * before handing it the archive.
  *
- * Committing a session is asynchronous, so the message this returns says an install has been
- * started, never that one finished. {@link OtaInstallResultReceiver} has the verdict.
+ * The verified APK stays in Downloads either way. The app first offers it to a PackageInstaller
+ * session — as the system user it may install without asking — and only if that cannot start
+ * does it open the file manager there, to tap the file. Committing a session is asynchronous,
+ * so the message says an install has started, never that one finished;
+ * {@link OtaInstallResultReceiver} has the verdict.
  */
 final class UpdateHook {
 
@@ -44,9 +47,11 @@ final class UpdateHook {
         Context app = context.getApplicationContext();
         new Thread(() -> {
             try {
+                ServerConfig config = ServerConfig.get(app);
+                if (!config.isConfigured()) return;
                 String current = app.getPackageManager()
                         .getPackageInfo(app.getPackageName(), 0).versionName;
-                OtaUpdater.Update update = OtaUpdater.check(current);
+                OtaUpdater.Update update = OtaUpdater.check(config, current);
                 if (update != null && update.hashUrl != null)
                     new android.os.Handler(android.os.Looper.getMainLooper())
                             .post(() -> android.widget.Toast.makeText(app,
@@ -100,25 +105,37 @@ final class UpdateHook {
             return "Could not read version";
         }
 
-        OtaUpdater.Update update = OtaUpdater.check(current);
+        ServerConfig config = ServerConfig.get(app);
+        if (!config.isConfigured()) return "Set up the server first (Server tab): updates come through it";
+        OtaUpdater.Update update = OtaUpdater.check(config, current);
         if (update == null) return "Up to date (" + current + ")";
 
         Log.i(TAG, "Update available: " + update.versionName);
         String expectedHash;
         try {
-            expectedHash = OtaUpdater.fetchExpectedSha256(update);
+            expectedHash = OtaUpdater.fetchExpectedSha256(update, config);
         } catch (IOException e) {
-            Log.w(TAG, "OTA hash unavailable", e);
+            Log.w(TAG, "OTA hash unavailable: " + e.getMessage());
             return "Update refused: no SHA-256 verification";
         }
-        File apk = OtaUpdater.download(app, update, expectedHash, percent -> {
+        File apk = OtaUpdater.download(update, expectedHash, config, percent -> {
             if (listener != null) main.post(() -> listener.onProgress(percent));
         });
         if (apk == null) return "Download or SHA-256 verification failed ("
                 + update.versionName + ")";
 
+        switch (OtaUpdater.install(app, apk)) {
+            case SESSION_STARTED:
+                return "Installing " + update.versionName + "… the app restarts when it is done";
+            case INSTALL_UI_STARTED:
+                return "Confirm the installation of " + update.versionName + " on the screen";
+            case UNREADABLE_ARCHIVE:
+                return "Update refused: the downloaded file is not this app";
+            default:
+                break;
+        }
         if (!OtaUpdater.openDownloads(app))
-            return "APK downloaded to Downloads; could not open the file manager";
-        return update.versionName + ".apk downloaded to Downloads — tap the file to install";
+            return update.versionName + " is in Downloads; open it with the Files app to install";
+        return update.versionName + ".apk is in Downloads — tap the file to install";
     }
 }
diff --git a/flake.nix b/flake.nix
index a371adf..1b7b9d5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -109,10 +109,62 @@
               echo "  adb shell \"pm install -r -f -d -t /data/local/tmp/update.apk\""
             '';
           };
+
+          # Publishes the current car build as a pre-release on the forge, where the car
+          # server relays it to the in-app updater (server/releases.go, OTA.md). Needs a forge
+          # token with write access to the repository's releases, from $FORGE_TOKEN or
+          # ~/.config/nilsmg4/forge-token; it is sent in a header and never printed.
+          publishCar = pkgs.writeShellApplication {
+            name = "publish-car";
+            runtimeInputs = [ pkgs.curl pkgs.jq pkgs.coreutils pkgs.git ];
+            text = ''
+              forge=''${FORGE_URL:-https://git.stinnesbeck.com}
+              repo=''${FORGE_REPO:-nils/mg4}
+              token=''${FORGE_TOKEN:-}
+              if [ -z "$token" ] && [ -f "$HOME/.config/nilsmg4/forge-token" ]; then
+                token=$(tr -d '[:space:]' < "$HOME/.config/nilsmg4/forge-token")
+              fi
+              if [ -z "$token" ]; then
+                echo "publish-car: no token. Put one in ~/.config/nilsmg4/forge-token (or \$FORGE_TOKEN)." >&2
+                exit 1
+              fi
+              root=$(git rev-parse --show-toplevel)
+              cd "$root"
+              version=$(grep -m1 'versionName "' app/build.gradle | sed 's/.*versionName "\(.*\)".*/\1/')
+              apk="build/car/NilsMG4-unstable-$version.apk"
+              if [ ! -f "$apk" ] || [ ! -f "$apk.sha256" ]; then
+                echo "publish-car: $apk (and .sha256) not found; run build-car first" >&2
+                exit 1
+              fi
+              if [ "$(sha256sum "$apk" | cut -d' ' -f1)" != "$(cat "$apk.sha256")" ]; then
+                echo "publish-car: $apk does not match its .sha256" >&2
+                exit 1
+              fi
+              tag="car-$version"
+              commit=$(git rev-parse HEAD)
+              api="$forge/api/v1/repos/$repo"
+              auth=(-H "Authorization: token $token")
+
+              if curl -sSf "''${auth[@]}" "$api/releases/tags/$tag" >/dev/null 2>&1; then
+                echo "publish-car: $tag already exists; bump the version before publishing again" >&2
+                exit 1
+              fi
+              body=$(jq -n --arg tag "$tag" --arg commit "$commit" --arg name "Car build $version" \
+                '{tag_name: $tag, target_commitish: $commit, name: $name, prerelease: true,
+                  body: "Platform-signed car build, installed by the in-app updater."}')
+              id=$(curl -sSf "''${auth[@]}" -H "Content-Type: application/json" -d "$body" \
+                "$api/releases" | jq -r .id)
+              for f in "$apk" "$apk.sha256"; do
+                curl -sSf "''${auth[@]}" -F "attachment=@$f" \
+                  "$api/releases/$id/assets?name=$(basename "$f")" >/dev/null
+              done
+              echo "Published $tag ($(basename "$apk") and .sha256) at $forge/$repo/releases/tag/$tag"
+            '';
+          };
         in
         {
           default = pkgs.mkShell {
-            packages = [ jdk android.androidsdk buildCar pkgs.go pkgs.gopls pkgs.govulncheck pkgs.influxdb2-server pkgs.influxdb2-cli ];
+            packages = [ jdk android.androidsdk buildCar publishCar pkgs.go pkgs.gopls pkgs.govulncheck pkgs.influxdb2-server pkgs.influxdb2-cli ];
 
             ANDROID_HOME = sdk;
             ANDROID_SDK_ROOT = sdk;
@@ -126,6 +178,7 @@
               echo "  ./gradlew assembleStableDebug     # debug APK"
               echo "  ./gradlew assembleUnstableDebug   # build that can update itself (OTA)"
               echo "  build-car                         # unstable build signed for the car"
+              echo "  publish-car                       # publish it for the in-app updater"
             '';
           };
         });
diff --git a/k8s/README.md b/k8s/README.md
index 15c87ed..fbad856 100644
--- a/k8s/README.md
+++ b/k8s/README.md
@@ -60,6 +60,14 @@ Until the Secret exists, Grafana does not start (the container waits for the mis
 On a fresh install, apply everything once without Grafana working, create the token, then
 apply the Secret.
 
+## App updates
+
+The server relays the app's releases from the private repository to the car's updater
+(`OTA.md`). It reads them with `FORGE_TOKEN` from the `mg4-server` Secret: create a token in
+the forge that can only **read** the `nils/mg4` repository, put it there, apply the Secret and
+restart the server. Without it, updates are off (the car's updater gets a 404). `FORGE_URL`
+and `FORGE_REPO` are set in `server.yaml`.
+
 ## Notes
 
 - InfluxDB's setup mode runs only on an empty volume. Changing `admin-token` in the Secret later
diff --git a/k8s/secrets/secrets.example.yaml b/k8s/secrets/secrets.example.yaml
index 9a9e853..b47a58d 100644
--- a/k8s/secrets/secrets.example.yaml
+++ b/k8s/secrets/secrets.example.yaml
@@ -26,6 +26,10 @@ stringData:
   # Approves a car on your phone when it pairs by QR code (at least 12 characters). Leave it
   # empty to switch pairing off; then only the INGEST_TOKEN above works.
   APPROVAL_PASSWORD: CHANGE-ME-at-least-12-characters
+  # A forge token that can only READ the nils/mg4 repository, for app updates (the server
+  # relays the releases to the car; k8s/README.md, "App updates"). Leave it empty to switch
+  # updates off.
+  FORGE_TOKEN: CHANGE-ME-read-only-forge-token
 ---
 apiVersion: v1
 kind: Secret
diff --git a/k8s/server.yaml b/k8s/server.yaml
index b848271..e9912a6 100644
--- a/k8s/server.yaml
+++ b/k8s/server.yaml
@@ -29,8 +29,8 @@ spec:
           type: RuntimeDefault
       containers:
         - name: server
-          # 2.5.0, pinned by digest so a re-pushed tag cannot change what runs.
-          image: git.stinnesbeck.com/nils/mg4-server@sha256:93b82b24a649c7b8b6fb7c0d4ef0bfda5694689808991a211e22ddeb257a39e2
+          # 2.6.0, pinned by digest so a re-pushed tag cannot change what runs.
+          image: git.stinnesbeck.com/nils/mg4-server@sha256:35ff5973836620c1e69f06b00163cf95183f938cb9830355452d4161c6c46e33
           ports:
             - name: http
               containerPort: 8080
@@ -44,12 +44,18 @@ spec:
             # Where a phone reaches the server; the pairing QR code points here.
             - name: PUBLIC_URL
               value: https://car.k8s.stinnesbeck.com
+            # App updates: the releases of this repository, relayed to the car. Read with
+            # FORGE_TOKEN from the mg4-server Secret; leave that empty to switch updates off.
+            - name: FORGE_URL
+              value: https://git.stinnesbeck.com
+            - name: FORGE_REPO
+              value: nils/mg4
             - name: INFLUX_TOKEN
               valueFrom:
                 secretKeyRef:
                   name: influxdb-auth
                   key: admin-token
-          # INGEST_TOKEN, APPROVAL_PASSWORD.
+          # INGEST_TOKEN, APPROVAL_PASSWORD, FORGE_TOKEN.
           envFrom:
             - secretRef:
                 name: mg4-server
diff --git a/server/README.md b/server/README.md
index 5eecc00..ba23ee7 100644
--- a/server/README.md
+++ b/server/README.md
@@ -22,6 +22,7 @@ Environment only; the server refuses to start when a required value is missing.
 | `INGEST_TOKEN` | required, at least 24 characters: `openssl rand -hex 32` |
 | `APPROVAL_PASSWORD` | optional, at least 12 characters; switches pairing on (see below) |
 | `PUBLIC_URL` | the address a phone uses, for the pairing QR code; derived from the request if empty |
+| `FORGE_URL`, `FORGE_REPO`, `FORGE_TOKEN` | optional; app updates (below). The token only needs to read the repository |
 | `LISTEN_ADDR` | default `:8080` |
 
 ## Endpoints
@@ -43,6 +44,14 @@ with (403 otherwise); the shared token works for any.
 
 A malformed request is a 400 naming the field; a database failure is a 500 without detail.
 
+## App updates
+
+`GET /v1/app/releases` and `GET /v1/app/assets/{release}/{asset}/{name}`, with the car's token:
+the repository's releases, read from the forge with `FORGE_TOKEN`, in GitHub's field names
+with download URLs pointing back at this server, and their attachments streamed through. The
+repository stays private and the forge token never reaches the car; redirects away from the
+forge are not followed. The car verifies everything itself (`OTA.md`). 404 when unset.
+
 ## Settings from a phone
 
 The ABRP credentials are long to type on the car. With pairing on, the car (with its own token)
diff --git a/server/api.go b/server/api.go
index 0fcdf89..a9d380e 100644
--- a/server/api.go
+++ b/server/api.go
@@ -19,6 +19,7 @@ import (
 //	GET  /v1/consumption/history/{installationId} the car reads its own totals back
 //	GET  /v1/health                              unauthenticated liveness probe
 //	     /v1/settings/…, /settings                settings typed on a phone (handoff_http.go)
+//	GET  /v1/app/…                               app updates from the forge (releases.go)
 //
 // A car authenticates with the shared INGEST_TOKEN or with its own token from pairing
 // (pairing_http.go).
@@ -28,6 +29,8 @@ type API struct {
 	Pairing     *Pairing
 	// Handoff carries settings typed on a phone to the car (handoff.go).
 	Handoff *Handoff
+	// Releases relays the app's releases from the private forge to the car (releases.go).
+	Releases *Releases
 	// PublicURL is the server's address as a phone reaches it, for the pairing QR code;
 	// derived from the request when empty.
 	PublicURL string
@@ -46,6 +49,7 @@ func (a *API) Routes() http.Handler {
 	mux.HandleFunc("GET /v1/consumption/history/{installationId}", a.ingest(a.history))
 	a.pairingRoutes(mux)
 	a.handoffRoutes(mux)
+	a.releaseRoutes(mux)
 	return mux
 }
 
diff --git a/server/main.go b/server/main.go
index be65222..521d7a4 100644
--- a/server/main.go
+++ b/server/main.go
@@ -12,6 +12,7 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
+	"strings"
 	"syscall"
 	"time"
 )
@@ -30,6 +31,9 @@ type config struct {
 	ingestToken  string
 	approvalPass string
 	publicURL    string
+	forgeURL     string
+	forgeRepo    string
+	forgeToken   string
 }
 
 // loadConfig reads the environment and fails closed: a missing InfluxDB setting or a
@@ -44,6 +48,9 @@ func loadConfig(getenv func(string) string) (config, error) {
 		ingestToken:  getenv("INGEST_TOKEN"),
 		approvalPass: getenv("APPROVAL_PASSWORD"),
 		publicURL:    getenv("PUBLIC_URL"),
+		forgeURL:     getenv("FORGE_URL"),
+		forgeRepo:    getenv("FORGE_REPO"),
+		forgeToken:   getenv("FORGE_TOKEN"),
 	}
 	if c.listenAddr == "" {
 		c.listenAddr = ":8080"
@@ -61,6 +68,11 @@ func loadConfig(getenv func(string) string) (config, error) {
 	}
 	// Pairing is optional; when it is on, its password guards token issuance and must not
 	// be guessable.
+	// App updates are optional; when the forge is named it must be https, so the token
+	// never crosses the network in the clear.
+	if c.forgeURL != "" && !strings.HasPrefix(c.forgeURL, "https://") {
+		return config{}, errors.New("FORGE_URL must be an https URL")
+	}
 	if c.approvalPass != "" && len(c.approvalPass) < minApprovalPasswordLength {
 		return config{}, fmt.Errorf("APPROVAL_PASSWORD must be at least %d characters", minApprovalPasswordLength)
 	}
@@ -87,8 +99,9 @@ func main() {
 		os.Exit(1)
 	}
 	pairing := NewPairing(cfg.approvalPass, devices)
+	releases := &Releases{ForgeURL: cfg.forgeURL, Repo: cfg.forgeRepo, Token: cfg.forgeToken}
 	api := &API{Store: store, IngestToken: cfg.ingestToken, Pairing: pairing, Handoff: NewHandoff(),
-		PublicURL: cfg.publicURL}
+		Releases: releases, PublicURL: cfg.publicURL}
 
 	srv := &http.Server{
 		Addr:              cfg.listenAddr,
@@ -103,7 +116,7 @@ func main() {
 	defer stop()
 	go func() {
 		slog.Info("listening", "addr", cfg.listenAddr, "bucket", cfg.influxBucket,
-			"pairing", pairing.Enabled(), "pairedDevices", len(devices))
+			"pairing", pairing.Enabled(), "pairedDevices", len(devices), "appUpdates", releases.enabled())
 		if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
 			slog.Error("server failed", "error", err)
 			os.Exit(1)
diff --git a/server/releases.go b/server/releases.go
new file mode 100644
index 0000000..ce3d356
--- /dev/null
+++ b/server/releases.go
@@ -0,0 +1,209 @@
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"log/slog"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// Releases relays the app's own releases from the private forge repository to the car, for
+// the in-app updater. The repository stays private and the forge token stays here: the car
+// asks this server with its own token and never holds a forge credential.
+//
+//	GET /v1/app/releases                           the repo's releases, GitHub-shaped
+//	GET /v1/app/assets/{release}/{asset}/{name}    one attachment, streamed through
+//
+// The car still checks everything itself (SHA-256 sidecar, package name, signature by the
+// installer); this only carries bytes. Off unless FORGE_URL, FORGE_REPO and FORGE_TOKEN are set.
+type Releases struct {
+	ForgeURL string // e.g. https://git.stinnesbeck.com
+	Repo     string // owner/name
+	Token    string // read-only on the repository
+	Client   *http.Client
+}
+
+const (
+	maxReleaseListBytes = 1 << 20
+	maxAssetBytes       = 64 << 20
+	// An APK over a slow mobile link takes longer than the server's general write timeout.
+	assetWriteTimeout = 10 * time.Minute
+)
+
+func (rel *Releases) enabled() bool {
+	return rel != nil && rel.ForgeURL != "" && rel.Repo != "" && rel.Token != ""
+}
+
+func (rel *Releases) client() *http.Client {
+	if rel.Client != nil {
+		return rel.Client
+	}
+	return &http.Client{Timeout: 5 * time.Minute, CheckRedirect: rel.sameHostOnly}
+}
+
+// sameHostOnly keeps the token on the forge: a redirect elsewhere is refused, not followed
+// with the Authorization header.
+func (rel *Releases) sameHostOnly(req *http.Request, via []*http.Request) error {
+	forge, err := url.Parse(rel.ForgeURL)
+	if err != nil || req.URL.Host != forge.Host || req.URL.Scheme != forge.Scheme {
+		return errors.New("redirect away from the forge refused")
+	}
+	if len(via) > 5 {
+		return errors.New("too many redirects")
+	}
+	return nil
+}
+
+func (rel *Releases) get(ctx context.Context, path string) (*http.Response, error) {
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, strings.TrimRight(rel.ForgeURL, "/")+path, nil)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Set("Authorization", "token "+rel.Token)
+	req.Header.Set("Accept", "application/json")
+	return rel.client().Do(req)
+}
+
+type forgeAsset struct {
+	ID   int64  `json:"id"`
+	Name string `json:"name"`
+	Size int64  `json:"size"`
+}
+
+type forgeRelease struct {
+	ID         int64        `json:"id"`
+	TagName    string       `json:"tag_name"`
+	Prerelease bool         `json:"prerelease"`
+	Draft      bool         `json:"draft"`
+	Assets     []forgeAsset `json:"assets"`
+}
+
+// carRelease is what the car's updater reads: GitHub's field names, with download URLs that
+// point back at this server.
+type carRelease struct {
+	TagName    string     `json:"tag_name"`
+	Prerelease bool       `json:"prerelease"`
+	Draft      bool       `json:"draft"`
+	Assets     []carAsset `json:"assets"`
+}
+
+type carAsset struct {
+	Name               string `json:"name"`
+	Size               int64  `json:"size"`
+	BrowserDownloadURL string `json:"browser_download_url"`
+}
+
+func (a *API) releaseRoutes(mux *http.ServeMux) {
+	mux.HandleFunc("GET /v1/app/releases", a.ingest(a.appReleases))
+	mux.HandleFunc("GET /v1/app/assets/{release}/{asset}/{name}", a.ingest(a.appAsset))
+}
+
+func (a *API) releasesOff(w http.ResponseWriter) bool {
+	if a.Releases.enabled() {
+		return false
+	}
+	writeJSON(w, http.StatusNotFound, map[string]string{"error": "app updates are not enabled"})
+	return true
+}
+
+func (a *API) appReleases(w http.ResponseWriter, r *http.Request, _ caller, _ []byte) error {
+	if a.releasesOff(w) {
+		return nil
+	}
+	resp, err := a.Releases.get(r.Context(), "/api/v1/repos/"+a.Releases.Repo+"/releases?limit=20")
+	if err != nil {
+		return fmt.Errorf("forge releases: %w", err)
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		slog.Warn("forge refused the release list", "status", resp.StatusCode)
+		writeJSON(w, http.StatusBadGateway, map[string]string{"error": "the forge did not answer"})
+		return nil
+	}
+	var releases []forgeRelease
+	if err := json.NewDecoder(io.LimitReader(resp.Body, maxReleaseListBytes)).Decode(&releases); err != nil {
+		return fmt.Errorf("forge releases: %w", err)
+	}
+	base := a.publicURL(r) + "/v1/app/assets/"
+	out := make([]carRelease, 0, len(releases))
+	for _, rel := range releases {
+		cr := carRelease{TagName: rel.TagName, Prerelease: rel.Prerelease, Draft: rel.Draft, Assets: []carAsset{}}
+		for _, as := range rel.Assets {
+			cr.Assets = append(cr.Assets, carAsset{Name: as.Name, Size: as.Size,
+				BrowserDownloadURL: base + strconv.FormatInt(rel.ID, 10) + "/" + strconv.FormatInt(as.ID, 10) +
+					"/" + url.PathEscape(as.Name)})
+		}
+		out = append(out, cr)
+	}
+	writeJSON(w, http.StatusOK, out)
+	return nil
+}
+
+// appAsset streams one release attachment. The forge's own metadata names the file, so a car
+// cannot ask for anything but an attachment of this repository's releases.
+func (a *API) appAsset(w http.ResponseWriter, r *http.Request, _ caller, _ []byte) error {
+	if a.releasesOff(w) {
+		return nil
+	}
+	releaseID, err1 := strconv.ParseInt(r.PathValue("release"), 10, 64)
+	assetID, err2 := strconv.ParseInt(r.PathValue("asset"), 10, 64)
+	if err1 != nil || err2 != nil || releaseID <= 0 || assetID <= 0 {
+		return invalid("release or asset is invalid")
+	}
+	meta, err := a.Releases.get(r.Context(), fmt.Sprintf("/api/v1/repos/%s/releases/%d/assets/%d",
+		a.Releases.Repo, releaseID, assetID))
+	if err != nil {
+		return fmt.Errorf("forge asset: %w", err)
+	}
+	var asset struct {
+		Name string `json:"name"`
+		UUID string `json:"uuid"`
+	}
+	decodeErr := json.NewDecoder(io.LimitReader(meta.Body, 64<<10)).Decode(&asset)
+	meta.Body.Close()
+	if meta.StatusCode == http.StatusNotFound {
+		writeJSON(w, http.StatusNotFound, map[string]string{"error": "no such asset"})
+		return nil
+	}
+	if meta.StatusCode != http.StatusOK || decodeErr != nil || asset.UUID == "" {
+		slog.Warn("forge refused the asset", "status", meta.StatusCode)
+		writeJSON(w, http.StatusBadGateway, map[string]string{"error": "the forge did not answer"})
+		return nil
+	}
+	if asset.Name != r.PathValue("name") {
+		writeJSON(w, http.StatusNotFound, map[string]string{"error": "no such asset"})
+		return nil
+	}
+	file, err := a.Releases.get(r.Context(), "/attachments/"+url.PathEscape(asset.UUID))
+	if err != nil {
+		return fmt.Errorf("forge download: %w", err)
+	}
+	defer file.Body.Close()
+	if file.StatusCode != http.StatusOK {
+		slog.Warn("forge refused the download", "status", file.StatusCode)
+		writeJSON(w, http.StatusBadGateway, map[string]string{"error": "the forge did not answer"})
+		return nil
+	}
+	if err := http.NewResponseController(w).SetWriteDeadline(time.Now().Add(assetWriteTimeout)); err != nil {
+		slog.Warn("asset write deadline not extended", "error", err)
+	}
+	h := w.Header()
+	h.Set("Content-Type", "application/octet-stream")
+	h.Set("Content-Disposition", `attachment; filename="`+strings.ReplaceAll(asset.Name, `"`, "")+`"`)
+	h.Set("Cache-Control", "no-store")
+	if file.ContentLength > 0 && file.ContentLength <= maxAssetBytes {
+		h.Set("Content-Length", strconv.FormatInt(file.ContentLength, 10))
+	}
+	w.WriteHeader(http.StatusOK)
+	if _, err := io.Copy(w, io.LimitReader(file.Body, maxAssetBytes)); err != nil {
+		slog.Warn("asset transfer cut short", "asset", asset.Name, "error", err)
+	}
+	return nil
+}
diff --git a/server/releases_test.go b/server/releases_test.go
new file mode 100644
index 0000000..4c0c7e0
--- /dev/null
+++ b/server/releases_test.go
@@ -0,0 +1,115 @@
+package main
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+)
+
+const testForgeToken = "forge-read-token-0123456789"
+
+// fakeForge answers like Gitea for one pre-release with an APK and its sidecar, and only to
+// the right token.
+func fakeForge(t *testing.T) *httptest.Server {
+	t.Helper()
+	mux := http.NewServeMux()
+	auth := func(h http.HandlerFunc) http.HandlerFunc {
+		return func(w http.ResponseWriter, r *http.Request) {
+			if r.Header.Get("Authorization") != "token "+testForgeToken {
+				http.NotFound(w, r) // a private repository looks absent without a login
+				return
+			}
+			h(w, r)
+		}
+	}
+	mux.HandleFunc("GET /api/v1/repos/nils/mg4/releases", auth(func(w http.ResponseWriter, r *http.Request) {
+		_, _ = w.Write([]byte(`[{"id":7,"tag_name":"car-2.16.0","prerelease":true,"draft":false,"assets":[
+			{"id":11,"name":"NilsMG4-unstable-2.16.0.apk","size":4},
+			{"id":12,"name":"NilsMG4-unstable-2.16.0.apk.sha256","size":64}]}]`))
+	}))
+	mux.HandleFunc("GET /api/v1/repos/nils/mg4/releases/7/assets/11", auth(func(w http.ResponseWriter, r *http.Request) {
+		_, _ = w.Write([]byte(`{"id":11,"name":"NilsMG4-unstable-2.16.0.apk","uuid":"abc-uuid"}`))
+	}))
+	mux.HandleFunc("GET /attachments/abc-uuid", auth(func(w http.ResponseWriter, r *http.Request) {
+		_, _ = w.Write([]byte("APK!"))
+	}))
+	return httptest.NewTLSServer(mux)
+}
+
+func releasesAPI(t *testing.T, forge *httptest.Server) http.Handler {
+	t.Helper()
+	api, _ := newTestAPI()
+	api.Releases = &Releases{ForgeURL: forge.URL, Repo: "nils/mg4", Token: testForgeToken, Client: forge.Client()}
+	return api.Routes()
+}
+
+func TestReleasesAreRelayedWithDownloadsThroughTheServer(t *testing.T) {
+	forge := fakeForge(t)
+	defer forge.Close()
+	h := releasesAPI(t, forge)
+	if rec := do(t, h, "GET", "/v1/app/releases", "", ""); rec.Code != 401 {
+		t.Fatalf("without the car's token: %d", rec.Code)
+	}
+	rec := do(t, h, "GET", "/v1/app/releases", testToken, "")
+	if rec.Code != 200 {
+		t.Fatalf("%d %s", rec.Code, rec.Body)
+	}
+	var got []carRelease
+	if err := json.Unmarshal(rec.Body.Bytes(), &got); err != nil {
+		t.Fatal(err)
+	}
+	if len(got) != 1 || !got[0].Prerelease || len(got[0].Assets) != 2 ||
+		got[0].Assets[0].BrowserDownloadURL != "https://car.example.com/v1/app/assets/7/11/NilsMG4-unstable-2.16.0.apk" {
+		t.Fatalf("releases %+v", got)
+	}
+	if strings.Contains(rec.Body.String(), testForgeToken) || strings.Contains(rec.Body.String(), forge.URL) {
+		t.Fatal("the forge or its token leaked to the car")
+	}
+	file := do(t, h, "GET", "/v1/app/assets/7/11/NilsMG4-unstable-2.16.0.apk", testToken, "")
+	if file.Code != 200 || file.Body.String() != "APK!" {
+		t.Fatalf("download %d %q", file.Code, file.Body)
+	}
+	// The name must be the asset's own: no asking for one file under another's name.
+	if rec := do(t, h, "GET", "/v1/app/assets/7/11/other.apk", testToken, ""); rec.Code != 404 {
+		t.Fatalf("wrong name: %d", rec.Code)
+	}
+}
+
+func TestAWrongForgeTokenIsABadGatewayNotALeak(t *testing.T) {
+	forge := fakeForge(t)
+	defer forge.Close()
+	api, _ := newTestAPI()
+	api.Releases = &Releases{ForgeURL: forge.URL, Repo: "nils/mg4", Token: "wrong", Client: forge.Client()}
+	if rec := do(t, api.Routes(), "GET", "/v1/app/releases", testToken, ""); rec.Code != 502 {
+		t.Fatalf("%d", rec.Code)
+	}
+}
+
+func TestAppUpdatesAreOffWithoutAForge(t *testing.T) {
+	api, _ := newTestAPI()
+	if rec := do(t, api.Routes(), "GET", "/v1/app/releases", testToken, ""); rec.Code != 404 {
+		t.Fatalf("%d", rec.Code)
+	}
+}
+
+func TestRedirectsAwayFromTheForgeAreRefused(t *testing.T) {
+	rel := &Releases{ForgeURL: "https://git.example.com"}
+	away, _ := http.NewRequest("GET", "https://elsewhere.example.com/x", nil)
+	if rel.sameHostOnly(away, nil) == nil {
+		t.Fatal("redirect to another host followed")
+	}
+	same, _ := http.NewRequest("GET", "https://git.example.com/attachments/x", nil)
+	if err := rel.sameHostOnly(same, nil); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestForgeURLMustBeHTTPS(t *testing.T) {
+	env := map[string]string{"INFLUX_URL": "u", "INFLUX_TOKEN": "t", "INFLUX_ORG": "o",
+		"INGEST_TOKEN": "0123456789abcdef01234567", "FORGE_URL": "http://git.example.com"}
+	if _, err := loadConfig(func(k string) string { return env[k] }); err == nil {
+		t.Fatal("plain http forge accepted")
+	}
+}

From 92266162613241965aef984caa6ac0af732f9386 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 19:05:58 +0200
Subject: [PATCH 63/79] Grafana's read-only InfluxDB token is made
 automatically

The read-only token for Grafana needed a manual influx command and a
Secret. InfluxDB generates every token but the admin one and ignores a
chosen value (tested on 2.7.12), so it cannot be preset in a Secret.

Instead an init container in the Grafana pod creates it at every start
with the admin token, deletes the one from the previous start, and
writes only the read-only token to a memory-backed volume; the
provisioned datasource reads it with $__file{/run/influx/token}. The
Grafana process never sees the admin token. The grafana-influx Secret
is gone from the template and the README.

Tested in podman: InfluxDB 2.7.12, the script run twice as the Grafana
user (the old token is replaced, not piled up), and Grafana 13.2.3
reporting the datasource healthy with the file-based token.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                         |  6 +++
 k8s/README.md                    | 30 ++++-----------
 k8s/grafana.yaml                 | 63 ++++++++++++++++++++++++++++----
 k8s/grafana/datasources.yaml     |  7 ++--
 k8s/secrets/secrets.example.yaml | 11 ------
 5 files changed, 73 insertions(+), 44 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index c03218d..3eb0e69 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -109,6 +109,12 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — Grafana's read-only InfluxDB token without a manual step: an init container in
+  the Grafana pod creates it with the admin token at every start, deletes the previous one and
+  leaves only the read-only token in a memory volume; the datasource reads it with
+  `$__file{/run/influx/token}`. InfluxDB ignores chosen token values (tested), so it cannot come
+  from the Secret. The `grafana-influx` Secret is gone. Tested in podman: InfluxDB 2.7.12, the
+  script as the Grafana user (twice: rotates, no pile-up), Grafana 13.2.3 datasource healthy.
 - 2026-10-18 — App 2.16.0, server 2.6.0: over-the-air updates from this repository. `publish-car`
   creates the pre-release `car-<version>` on the private forge with the APK and its `.sha256`;
   the server relays releases and attachments to the car (`/v1/app/…`, read with a read-only
diff --git a/k8s/README.md b/k8s/README.md
index fbad856..cefdaa7 100644
--- a/k8s/README.md
+++ b/k8s/README.md
@@ -22,8 +22,8 @@ is applied automatically. Apply them yourself.
    covered by Traefik's default certificate.
 2. **Create the Secrets.** `cp k8s/secrets/secrets.example.yaml k8s/secrets/secrets.yaml` (gitignored), replace
    every `CHANGE-ME` there (`openssl rand -hex 32`): `influxdb-auth`, `mg4-server` (ingest token,
-   approval password for pairing), `grafana-admin` and
-   `grafana-influx` (see below). Keep the template itself on placeholders only.
+   approval password for pairing, the forge token for app updates) and `grafana-admin`.
+   Keep the template itself on placeholders only.
 3. **Registry access.** The `mg4-server` package on git.stinnesbeck.com is public, so no pull
    secret is needed. If you make it private, add an `imagePullSecrets` entry to `server.yaml`.
 
@@ -40,25 +40,11 @@ ConfigMaps (datasource and dashboards) are never created and Grafana does not st
 
 ## Grafana's InfluxDB token
 
-Grafana reads InfluxDB with a token that can only read the `mg4` bucket, from the
-`grafana-influx` Secret. InfluxDB has to create that token, so it is a step of its own:
-
-1. With InfluxDB running, create the token. The `influx` CLI in the pod is already signed in
-   as admin:
-
-   ```sh
-   kubectl -n mg4 exec influxdb-0 -- sh -c \
-     'influx auth create --org mg4 --description grafana-read-only --json \
-        --read-bucket "$(influx bucket find --name mg4 --hide-headers | cut -f1)"'
-   ```
-
-2. Copy the `"token"` value from the output into `grafana-influx` → `token` in
-   `k8s/secrets/secrets.yaml`, apply that file, and restart Grafana:
-   `kubectl -n mg4 rollout restart deployment/grafana`.
-
-Until the Secret exists, Grafana does not start (the container waits for the missing Secret).
-On a fresh install, apply everything once without Grafana working, create the token, then
-apply the Secret.
+Grafana reads InfluxDB with a token that can only read the `mg4` bucket. Nothing to do: an init
+container in the Grafana pod creates it at every start with the admin token, deletes the one
+from the previous start, and hands Grafana only the read-only token (in a memory-backed volume).
+The Grafana process itself never sees the admin token. InfluxDB generates every token but the
+admin one itself, which is why this cannot be a value in the Secret.
 
 ## App updates
 
@@ -73,7 +59,7 @@ and `FORGE_REPO` are set in `server.yaml`.
 - InfluxDB's setup mode runs only on an empty volume. Changing `admin-token` in the Secret later
   does not change the token inside InfluxDB.
 - The server uses the InfluxDB admin token; a token scoped to read/write on the `mg4` bucket can
-  replace it later. Grafana has its own read-only token (below).
+  replace it later. Grafana has its own read-only token (above).
 - The dashboards are read-only in Grafana's UI. Change the JSON in `grafana/dashboards/`; the
   ConfigMap name changes with its content, which rolls Grafana.
 - The server image is pinned by digest in `server.yaml`. To upgrade, push a new tag and put its
diff --git a/k8s/grafana.yaml b/k8s/grafana.yaml
index 0cc1911..6c8a9d7 100644
--- a/k8s/grafana.yaml
+++ b/k8s/grafana.yaml
@@ -1,6 +1,12 @@
 # Grafana for the dashboards. The InfluxDB datasource and the three MG4 dashboards are
 # provisioned from k8s/grafana/ (ConfigMaps generated by kustomization.yaml); the dashboards
 # are read-only in the UI — change the JSON in git instead.
+#
+# Grafana reads InfluxDB with a token that can only read the mg4 bucket. InfluxDB generates
+# every token but the admin one (a chosen value is ignored), so the init container makes it at
+# each start: it alone gets the admin token, creates a fresh read-only token, deletes the one
+# from the previous start, and leaves only the read-only token in a memory-backed volume for
+# Grafana. Nothing to do by hand, and the Grafana process never sees the admin token.
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -44,6 +50,46 @@ spec:
         fsGroup: 472
         seccompProfile:
           type: RuntimeDefault
+      initContainers:
+        - name: influx-read-token
+          image: docker.io/library/influxdb:2.7.12-alpine
+          command:
+            - sh
+            - -c
+            - |
+              set -eu
+              desc="grafana read-only (made by the Grafana pod at start)"
+              export INFLUX_CONFIGS_PATH=/tmp/influx-configs
+              bucket=$(influx bucket find --name mg4 --hide-headers | cut -f1)
+              old=$(influx auth list --hide-headers | awk -F'\t' -v d="$desc" '$2 == d { print $1 }')
+              token=$(influx auth create --description "$desc" --read-bucket "$bucket" --hide-headers | cut -f3)
+              [ -n "$token" ] || { echo "no token created" >&2; exit 1; }
+              printf '%s' "$token" > /run/influx/token
+              for id in $old; do influx auth delete --id "$id" > /dev/null; done
+              echo "read-only token for Grafana ready"
+          env:
+            - name: INFLUX_HOST
+              value: http://influxdb.mg4.svc:8086
+            - name: INFLUX_ORG
+              value: mg4
+            - name: INFLUX_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: influxdb-auth
+                  key: admin-token
+          volumeMounts:
+            - name: influx-token
+              mountPath: /run/influx
+          resources:
+            requests:
+              cpu: 10m
+              memory: 32Mi
+            limits:
+              memory: 128Mi
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
       containers:
         - name: grafana
           image: docker.io/grafana/grafana:13.2.3
@@ -68,16 +114,9 @@ spec:
               value: "false"
             - name: GF_ANALYTICS_CHECK_FOR_UPDATES
               value: "false"
-            # Read by datasources.yaml.
+            # Read by datasources.yaml; the token is the file the init container wrote.
             - name: INFLUX_URL
               value: http://influxdb.mg4.svc:8086
-            # Read-only on the mg4 bucket; the dashboards never write (README, "Grafana's
-            # InfluxDB token").
-            - name: INFLUX_TOKEN
-              valueFrom:
-                secretKeyRef:
-                  name: grafana-influx
-                  key: token
           volumeMounts:
             - name: data
               mountPath: /var/lib/grafana
@@ -87,6 +126,9 @@ spec:
               mountPath: /etc/grafana/provisioning/dashboards
             - name: dashboards
               mountPath: /var/lib/grafana/dashboards/mg4
+            - name: influx-token
+              mountPath: /run/influx
+              readOnly: true
           # The first start creates and migrates Grafana's database: measured 44 s at 0.5 CPU
           # and 3 minutes at 0.1 CPU. The startup probe allows up to 10 minutes for that, and
           # liveness/readiness only begin once it succeeded, so a slow first start is never
@@ -136,6 +178,11 @@ spec:
         - name: dashboards
           configMap:
             name: grafana-dashboards
+        # The read-only InfluxDB token, in memory only; made anew at every start.
+        - name: influx-token
+          emptyDir:
+            medium: Memory
+            sizeLimit: 1Mi
 ---
 apiVersion: v1
 kind: Service
diff --git a/k8s/grafana/datasources.yaml b/k8s/grafana/datasources.yaml
index 5d83a9a..cf0094e 100644
--- a/k8s/grafana/datasources.yaml
+++ b/k8s/grafana/datasources.yaml
@@ -1,5 +1,6 @@
-# Provisioned InfluxDB datasource. URL and token come from the Grafana container's
-# environment (INFLUX_URL, INFLUX_TOKEN), so no credential is stored in this file.
+# Provisioned InfluxDB datasource. The URL comes from the environment (INFLUX_URL); the token is
+# a read-only one the Grafana pod's init container writes to /run/influx/token at each start
+# (grafana.yaml). No credential is stored in this file.
 apiVersion: 1
 datasources:
   - name: InfluxDB (mg4)
@@ -14,4 +15,4 @@ datasources:
       organization: mg4
       defaultBucket: mg4
     secureJsonData:
-      token: $INFLUX_TOKEN
+      token: $__file{/run/influx/token}
diff --git a/k8s/secrets/secrets.example.yaml b/k8s/secrets/secrets.example.yaml
index b47a58d..1d20e10 100644
--- a/k8s/secrets/secrets.example.yaml
+++ b/k8s/secrets/secrets.example.yaml
@@ -41,14 +41,3 @@ stringData:
   # Grafana's admin login (user "admin"). Only read on first start: change it in Grafana
   # afterwards, or reset it with grafana cli.
   admin-password: CHANGE-ME
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: grafana-influx
-  namespace: mg4
-type: Opaque
-stringData:
-  # A read-only InfluxDB token for the mg4 bucket, not the admin token. InfluxDB makes it;
-  # the command is in k8s/README.md ("Grafana's InfluxDB token").
-  token: CHANGE-ME-read-only-token-from-influx-auth-create

From c71fa4504e941ef72a18bde882f92ccbd71da2c7 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 19:32:50 +0200
Subject: [PATCH 64/79] App 2.16.1: Overview values every half second

The Overview read the car every 2 s, on the main thread. It now reads
every 0.5 s on a background thread (one reader; a read still running
makes the next tick skip rather than queue) and shows the values on the
main thread. The consumption and charging trackers stay on the 2-second
tick with the newest reading: they integrate over time, and the
charging tracker writes its session to storage on every sample.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                      |  5 ++
 app/build.gradle                              |  4 +-
 .../java/com/evsuite/abrp/MainActivity.java   | 80 +++++++++++++++++--
 3 files changed, 80 insertions(+), 9 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index 3eb0e69..a1c48a3 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -109,6 +109,11 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.16.1: the Overview reads the car every 0.5 s (was 2 s), on a background
+  thread; the consumption and charging trackers stay on the 2-second tick (they integrate over
+  time, and the charging tracker writes its session to storage on every sample). Note for
+  emulator tests: uiautomator can no longer dump the screen while the Overview is open, since
+  the UI is never idle.
 - 2026-10-18 — Grafana's read-only InfluxDB token without a manual step: an init container in
   the Grafana pod creates it with the admin token at every start, deletes the previous one and
   leaves only the read-only token in a memory volume; the datasource reads it with
diff --git a/app/build.gradle b/app/build.gradle
index 97cbc52..ada442d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 84
-        versionName "2.16.0"
+        versionCode 85
+        versionName "2.16.1"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index e84325a..721c725 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -87,6 +87,7 @@ public class MainActivity extends AppCompatActivity {
      * page shows what the car reports, whether or not the upload service is running, and a
      * signal the vehicle does not publish must show a dash rather than a zero.
      */
+    /** Used only on the overview-read thread. */
     private EnergyTelemetryReader vehicleReader;
     private TextView vehSoc, vehRange, vehPower, vehSpeed, vehOdometer,
             vehCharging, vehHvac,
@@ -214,7 +215,7 @@ public class MainActivity extends AppCompatActivity {
             refreshStatus();
             refreshCallLog();
             refreshSteeringKeys();
-            refreshVehicle();
+            sampleTrackers();
             refreshConsumption();
             refreshWifi();
             uiHandler.postDelayed(this, 2_000L);
@@ -330,6 +331,7 @@ public class MainActivity extends AppCompatActivity {
         super.onResume();
         // Poll state and log only while the screen is up; onPause cancels it.
         uiHandler.post(uiRefresh);
+        uiHandler.post(overviewRefresh);
     }
 
     @Override
@@ -376,6 +378,13 @@ public class MainActivity extends AppCompatActivity {
         super.onPause();
         // Stop polling off-screen: this activity has no reason to spend cycles then.
         uiHandler.removeCallbacks(uiRefresh);
+        uiHandler.removeCallbacks(overviewRefresh);
+    }
+
+    @Override
+    protected void onDestroy() {
+        carReader.shutdownNow();
+        super.onDestroy();
     }
 
     // ---------- Update check ----------
@@ -1315,16 +1324,73 @@ public class MainActivity extends AppCompatActivity {
      * is not work to repeat every two seconds. A read that throws leaves the cells as they
      * were rather than blanking the page — a transient miss is not news worth showing.
      */
-    private void refreshVehicle() {
+    // ---------- Overview: read every half second, off the main thread ----------
+
+    /** How often the Overview reads the car while it is on screen. */
+    private static final long OVERVIEW_REFRESH_MS = 500L;
+
+    /** One reader thread; a read that is still running makes the next tick skip, not queue. */
+    private final java.util.concurrent.ExecutorService carReader =
+            java.util.concurrent.Executors.newSingleThreadExecutor(r -> new Thread(r, "overview-read"));
+    private final java.util.concurrent.atomic.AtomicBoolean reading =
+            new java.util.concurrent.atomic.AtomicBoolean();
+    /** The newest reading, for the slower work on the 2-second tick. */
+    private volatile EnergySnapshot latestSnapshot;
+
+    private final Runnable overviewRefresh = new Runnable() {
+        @Override public void run() {
+            readVehicle();
+            uiHandler.postDelayed(this, OVERVIEW_REFRESH_MS);
+        }
+    };
+
+    /**
+     * About twenty calls into the car's services: on a background thread, so the screen never
+     * waits for them; the values are shown on the main thread once they are in.
+     */
+    private void readVehicle() {
+        if (!reading.compareAndSet(false, true)) return;
+        try {
+            carReader.execute(() -> {
+                try {
+                    if (vehicleReader == null) {
+                        vehicleReader = new EnergyTelemetryReader(getApplicationContext());
+                    }
+                    // The timestamp is passed explicitly: its Kotlin default is not visible from Java.
+                    EnergySnapshot s = vehicleReader.read(System.currentTimeMillis());
+                    latestSnapshot = s;
+                    runOnUiThread(() -> {
+                        if (!isDestroyed()) showVehicle(s);
+                    });
+                } catch (Throwable ignored) {
+                    // Leave the last good reading on screen.
+                } finally {
+                    reading.set(false);
+                }
+            });
+        } catch (java.util.concurrent.RejectedExecutionException e) {
+            reading.set(false); // the activity is going away
+        }
+    }
+
+    /**
+     * The consumption and charging trackers stay on the 2-second tick: they integrate over
+     * time, so a faster rate adds nothing, and the charging tracker writes its session to
+     * storage on every sample while charging.
+     */
+    private void sampleTrackers() {
+        EnergySnapshot s = latestSnapshot;
+        if (s == null) return;
         try {
-            if (vehicleReader == null) {
-                vehicleReader = new EnergyTelemetryReader(getApplicationContext());
-            }
-            // The timestamp is passed explicitly: its Kotlin default is not visible from Java.
-            EnergySnapshot s = vehicleReader.read(System.currentTimeMillis());
             ConsumptionTracker.get(this).sample(s);
             refreshCharging(s);
+        } catch (Throwable ignored) {
+            // A tracker failure must not stop the page.
+        }
+    }
 
+    private void showVehicle(EnergySnapshot s) {
+        try {
             vehSoc.setText(fmt(s.getSocPercent(), "%.0f %%"));
             vehRange.setText(fmt(s.getRangeKm(), "%.0f km"));
             vehPower.setText(fmt(s.getBatteryPowerKw(), "%.1f kW"));

From a293a0fa9424a768395e1be5e89d0a4b57950551 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 19:38:21 +0200
Subject: [PATCH 65/79] Licence: the original is MIT; EVHardware is
 noncommercial

Leon Kernan's ABRP_Uploader has carried the MIT Licence since
2026-07-29 (lkernan/ABRP_Uploader commit 75d8f2bc), so the inherited
"no licence upstream, status unresolved" notes no longer hold.

- LICENSE: MIT, now naming every copyright holder in the fork chain
  (Leon Kernan, EVABRPUploader contributors, FatihsMG4 contributors,
  Nils Stinnesbeck).
- LICENSE.md: rewritten. The repository is MIT except EVHardware/,
  which is PolyForm Noncommercial 1.0.0; the app links it into the APK,
  so the built app is non-commercial. EVHardware's own caveat about
  EVProfile stays with it.
- README, AGENTS.md, CONTRIBUTING.md and SPECS.md say the same.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 AGENTS.md       |  5 +++--
 CONTRIBUTING.md |  5 ++---
 LICENSE         |  2 ++
 LICENSE.md      | 40 +++++++++++++++++++++++++++++-----------
 README.md       |  7 ++++---
 SPECS.md        |  4 ++++
 6 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index 7eb7106..07ecc5f 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -21,8 +21,9 @@ Wide layouts start at 1000dp; narrower windows use a bottom navigation bar.
 An Android Automotive app for the **MG4 (SAIC eh32)** that reads vehicle telemetry and
 pushes it to A Better Route Planner. It runs on the car's head unit (AAOS 9, MT2712).
 
-Fork of Leon Kernan's `ABRP_Uploader`. See `LICENSE.md` — the licence status is
-**unresolved** and that is a real constraint, not paperwork.
+Fork of Leon Kernan's `ABRP_Uploader` (MIT, like every fork after it). See `LICENSE.md`: the
+repository is MIT except `EVHardware/`, which is PolyForm Noncommercial — so the built APK may
+only be used and shared non-commercially. Keep every copyright line in `LICENSE`.
 
 ## Non-negotiables
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 89949b1..1d0eb65 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -91,6 +91,5 @@ say what the failure looked like, so the next person recognises it.
 
 ## Licensing
 
-Read [`LICENSE.md`](LICENSE.md) first. The project's licence status is unresolved because
-the upstream fork source has none. Contributions are accepted on the understanding that
-they are offered under MIT once that is settled.
+Read [`LICENSE.md`](LICENSE.md) first. Contributions are accepted under the MIT Licence,
+except changes to `EVHardware/`, which fall under its PolyForm Noncommercial licence.
diff --git a/LICENSE b/LICENSE
index 0ab7a2a..12629f3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2,6 +2,8 @@ MIT License
 
 Copyright (c) 2026 Leon Kernan (original ABRP_Uploader)
 Copyright (c) 2026 EVABRPUploader contributors
+Copyright (c) 2026 FatihsMG4 contributors
+Copyright (c) 2026 Nils Stinnesbeck (Nils' MG4)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/LICENSE.md b/LICENSE.md
index b97edd5..f532c21 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,19 +1,37 @@
 # Licence
 
-This project is released under the **MIT Licence** — see [`LICENSE`](LICENSE).
+Everything in this repository is released under the **MIT Licence** — see
+[`LICENSE`](LICENSE) — **except the `EVHardware/` library**, which has its own licence (below).
 
-## Attribution
+## Where it comes from
 
-EVABRPUploader is a fork of Leon Kernan's `ABRP_Uploader`, and a meaningful part of
-the original work survives in it. The copyright line names both him and this fork's
-contributors, and MIT requires that notice to travel with any copy or substantial portion
-of the software. Keep it.
+Nils' MG4 is a fork of a chain of forks, all MIT:
 
-The upstream repository carried no licence file of its own. Applying MIT here is the
-project owner's decision; if Leon Kernan ever objects, the right response is to honour
-that rather than argue about it.
+- [Leon Kernan's `ABRP_Uploader`](https://github.com/lkernan/ABRP_Uploader), the original. It
+  carries the MIT Licence since 2026-07-29
+  ([its LICENSE](https://github.com/lkernan/ABRP_Uploader/blob/master/LICENSE), commit
+  `75d8f2bc`). Upstream's note that it had no licence predates that.
+- malys' EVABRPUploader, then
+  [fatihdonmezdev/FatihsMG4](https://github.com/fatihdonmezdev/FatihsMG4), both under MIT.
+- This fork, under MIT as well.
+
+MIT requires the copyright notice to travel with any copy or substantial portion of the
+software. `LICENSE` names all of them; keep every line.
+
+## The EVHardware library
+
+`EVHardware/` (the shared vehicle layer from EVSuite) is source-available under the
+**PolyForm Noncommercial License 1.0.0** — see [`EVHardware/LICENSE`](EVHardware/LICENSE) and
+[`EVHardware/LICENSE.md`](EVHardware/LICENSE.md). Commercial use is not permitted, and its
+`Required Notice: Copyright (c) 2026 EVHardware contributors` must go with any copy.
+
+The car app links EVHardware into its APK, so the **built app** may only be used and passed on
+non-commercially, whatever the MIT parts would allow on their own. The server, the Kubernetes
+manifests and the docs do not contain EVHardware and are plain MIT. EVHardware's own notes say
+that parts of it come from EVProfile, whose upstream licence situation it calls unresolved;
+that caveat is EVHardware's and stays with it.
 
 ## No warranty
 
-MIT disclaims all warranty and liability, and this software runs on a **vehicle** — see
-[`DISCLAIMER.md`](DISCLAIMER.md) for what that means concretely.
+Both licences disclaim all warranty and liability, and this software runs on a **vehicle** —
+see [`DISCLAIMER.md`](DISCLAIMER.md) for what that means concretely.
diff --git a/README.md b/README.md
index 7e45237..ca21320 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,9 @@ APIs.
 > [`DISCLAIMER.md`](DISCLAIMER.md). Not affiliated with SAIC, MG Motor or Iternio.
 > MG and MG4 are third-party marks used only to identify compatibility.
 
-> **Licence.** The original `ABRP_Uploader` carries no licence, which limits what may legally
-> be published. Read [`LICENSE.md`](LICENSE.md) before redistributing anything.
+> **Licence.** MIT, like Leon Kernan's original `ABRP_Uploader` and the forks in between —
+> except the bundled `EVHardware/` library, which is PolyForm Noncommercial, so the built app
+> may only be used and shared non-commercially. See [`LICENSE.md`](LICENSE.md).
 
 ---
 
@@ -224,7 +225,7 @@ flake.nix         dev shell and build-car
 | [SECURITY.md](SECURITY.md) | Threat model |
 | [DISCLAIMER.md](DISCLAIMER.md) | Vehicle-safety disclaimer; read before installing |
 | [CHANGELOG.md](CHANGELOG.md) | Upstream release history |
-| [LICENSE.md](LICENSE.md) | Licence status |
+| [LICENSE.md](LICENSE.md) | Licences: MIT, and PolyForm Noncommercial for `EVHardware/` |
 
 ## Credits
 
diff --git a/SPECS.md b/SPECS.md
index a1c48a3..583c106 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -109,6 +109,10 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — Licence: Leon Kernan's `ABRP_Uploader` has been MIT since 2026-07-29 (its commit
+  `75d8f2bc`), so the "unresolved" notes are gone. `LICENSE` names every copyright holder in the
+  fork chain; `LICENSE.md` explains that `EVHardware/` is PolyForm Noncommercial, which makes the
+  built APK non-commercial. README, AGENTS.md and CONTRIBUTING.md updated.
 - 2026-10-18 — App 2.16.1: the Overview reads the car every 0.5 s (was 2 s), on a background
   thread; the consumption and charging trackers stay on the 2-second tick (they integrate over
   time, and the charging tracker writes its session to storage on every sample). Note for

From c2c0640672431a02fee29fa2f2a7439e971d966e Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 19:41:12 +0200
Subject: [PATCH 66/79] LICENSE.md: EVProfile's upstream licence is settled

EVHardware's notes call the licence of EVProfile's upstream unresolved.
Checked: malys/EVProfile is MIT, forked from SliDeeN/MG4Control and last
merged from it on 2026-08-02. MG4Control is MIT up to 2.6.5
(2026-08-05) and GPL v3 from 2.6.6 (2026-09-02), with the earlier
versions staying MIT, so the code EVProfile took is from the MIT
period. Recorded with links; not an audit of every EVHardware line.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 LICENSE.md | 18 +++++++++++++++---
 SPECS.md   |  4 ++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/LICENSE.md b/LICENSE.md
index f532c21..4c7c54b 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -27,9 +27,21 @@ software. `LICENSE` names all of them; keep every line.
 
 The car app links EVHardware into its APK, so the **built app** may only be used and passed on
 non-commercially, whatever the MIT parts would allow on their own. The server, the Kubernetes
-manifests and the docs do not contain EVHardware and are plain MIT. EVHardware's own notes say
-that parts of it come from EVProfile, whose upstream licence situation it calls unresolved;
-that caveat is EVHardware's and stays with it.
+manifests and the docs do not contain EVHardware and are plain MIT.
+
+EVHardware's own notes say parts of it come from EVProfile, "itself a fork whose upstream
+licence situation is unresolved". Checked on 2026-10-18, that is settled for the code in
+question:
+
+- [malys/EVProfile](https://github.com/malys/EVProfile) is MIT. It is a fork of
+  [SliDeeN/MG4Control](https://github.com/SliDeeN/MG4Control), and its last merge from
+  MG4Control is a commit of 2026-08-02.
+- MG4Control is MIT up to and including 2.6.5 (released 2026-08-05; its licence file dates
+  from 2026-06-24) and GPL v3 or later from 2.6.6 (2026-09-02). Its `LICENCE.md` states that
+  the earlier versions stay MIT for good.
+
+So what EVProfile took from MG4Control dates from MG4Control's MIT period. This covers the
+lineage EVHardware names; it is not an audit of every line in EVHardware.
 
 ## No warranty
 
diff --git a/SPECS.md b/SPECS.md
index 583c106..832d46f 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -109,6 +109,10 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — EVProfile's licence checked: MIT, forked from SliDeeN/MG4Control and last merged
+  from it on 2026-08-02, inside MG4Control's MIT period (MIT up to 2.6.5 of 2026-08-05, GPL v3
+  from 2.6.6 of 2026-09-02). Recorded in `LICENSE.md`. History scanned for secrets before the
+  repository went public: none.
 - 2026-10-18 — Licence: Leon Kernan's `ABRP_Uploader` has been MIT since 2026-07-29 (its commit
   `75d8f2bc`), so the "unresolved" notes are gone. `LICENSE` names every copyright holder in the
   fork chain; `LICENSE.md` explains that `EVHardware/` is PolyForm Noncommercial, which makes the

From bfa33d51bd1009b26c035d87f5a7b65e7c7afc75 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 19:50:24 +0200
Subject: [PATCH 67/79] App 2.16.2: show the car's screen size; display figures
 documented

The MG4's display is given as 1920x720 (this project), 1280x480
(EVProfile's README) and a 1778x720 app window (upstream). 1280x480 is
exactly 1920x720 px at 240 dpi expressed in dp, so the figures may
describe one panel at different densities, which this platform lets be
changed per app.

The Logs tab's new SCREEN line shows the panel's pixels and density and
the app window in px and dp, to settle it from the car. FIRMWARE.md
lists the three figures and what the emulator shows at 240 dpi;
mise.toml, README and SPECS.md no longer state 160 dpi as fact for the
car.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 FIRMWARE.md                                   | 19 +++++++++++++++++--
 README.md                                     |  2 +-
 SPECS.md                                      |  5 +++++
 app/build.gradle                              |  4 ++--
 .../java/com/evsuite/abrp/MainActivity.java   | 16 ++++++++++++++++
 app/src/main/res/layout/pane_log.xml          |  2 ++
 app/src/main/res/values/strings.xml           |  2 ++
 mise.toml                                     |  3 ++-
 8 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/FIRMWARE.md b/FIRMWARE.md
index 5339fca..99bd678 100644
--- a/FIRMWARE.md
+++ b/FIRMWARE.md
@@ -11,9 +11,24 @@ development. It must not be treated as a vendor specification.
 | Android | 9 (Pie) — **API 28** |
 | Chipset | MediaTek **MT2712** |
 | Device | `mt2712_saic_eh32` (eh32 = MG4) |
-| Display | **1920×720 @ 160 dpi** (the car's sidebar takes part of the width; an app window has been reported at 1778×720) |
+| Display | Sources disagree, see below. The Logs tab's **SCREEN** line shows what the car reports. |
 | Emulator display profile | **1920×720 @ 160 dpi** |
 
+**Display, unconfirmed.** Three figures are in circulation:
+
+- **1920×720 px**, the figure this project has used (emulator profile, layouts).
+- **1280×480**, from [EVProfile's README](https://github.com/malys/EVProfile) ("forced
+  landscape"). That is exactly 1920×720 px at 240 dpi expressed in dp, the unit layouts use —
+  so it may be the same panel at a higher density. EVProfile also notes that this platform lets
+  the density be changed per app.
+- An app window of **1778×720**, reported upstream: the car's own sidebar taking part of the
+  width.
+
+The app has worked on the car with layouts designed at 1920×720 dp, which fits 160 dpi better
+than 240 (checked on the emulator: at 240 dpi the sidebar needs scrolling and the Overview's
+cards no longer fit). Since 2.16.2 the Logs tab shows the panel's pixels and density and the
+app window in px and dp; a photo of that line settles it.
+
 ## Signing caveat
 
 Certificate equality alone does not prove an APK came from this project. The nightly OTA
@@ -43,5 +58,5 @@ follow the same path. See `AGENTS.md` for the full per-signal split.
 ## Emulator fidelity
 
 The `mise` emulator tasks use an API 33 automotive AVD for the car service and an API 28
-AVD at **1920×720 @ 160 dpi** for the screen. Neither exposes the SAIC vendor properties,
+AVD at **1920×720 @ 160 dpi** for the screen (see "Display, unconfirmed" above). Neither exposes the SAIC vendor properties,
 so vehicle-specific behaviour still requires on-vehicle validation.
diff --git a/README.md b/README.md
index ca21320..e222ac5 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ APIs.
 
 ## Screenshot
 
-Version 2.8.2 on the head unit's 1920x720 screen, in full screen (Android 9 emulator; no
+Version 2.8.2 at the head unit's 1920x720 pixels and 160 dpi, in full screen (Android 9 emulator; no
 vehicle there, so every value shows as a dash).
 
 <p align="center">
diff --git a/SPECS.md b/SPECS.md
index 832d46f..e4e28a9 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -48,6 +48,7 @@ Current: app 2.14.2, server 2.5.0 (pinned by digest in `k8s/server.yaml`).
       dashboard queries return data).
 - [x] Manifests validated offline (kubeconform, with Traefik CRDs). **Applied by Nils only.**
 - [ ] Check Grafana's host in `k8s/ingress.yaml` (placeholder `car-grafana.k8s.stinnesbeck.com`).
+- [ ] Screen size and density on the car: Logs → SCREEN (2.16.2), see FIRMWARE.md.
 - [ ] Not yet tried on the car: live data straight to ABRP (2.11), Enter on phone (2.12), accent
       colours and the car-colour probe on the Logs tab (2.14; a photo of its list decides whether
       the accent can follow the paint automatically), right-aligned values (2.14.1).
@@ -109,6 +110,10 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.16.2: Logs → SCREEN shows the panel's pixels and density and the app
+  window in px and dp. The MG4's display figures disagree (1920×720 px used here; EVProfile lists
+  1280×480, which is 1920×720 at 240 dpi in dp; upstream reported a 1778×720 window); FIRMWARE.md
+  lists all three until a photo of that line settles it.
 - 2026-10-18 — EVProfile's licence checked: MIT, forked from SliDeeN/MG4Control and last merged
   from it on 2026-08-02, inside MG4Control's MIT period (MIT up to 2.6.5 of 2026-08-05, GPL v3
   from 2.6.6 of 2026-09-02). Recorded in `LICENSE.md`. History scanned for secrets before the
diff --git a/app/build.gradle b/app/build.gradle
index ada442d..c1329a4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 85
-        versionName "2.16.1"
+        versionCode 86
+        versionName "2.16.2"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 721c725..ff4e99f 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -263,6 +263,7 @@ public class MainActivity extends AppCompatActivity {
         callLogText = logPane.findViewById(R.id.call_log_text);
         steeringKeysText = logPane.findViewById(R.id.steering_keys_text);
         TextView carColorText = logPane.findViewById(R.id.car_color_text);
+        showScreenInfo(logPane.findViewById(R.id.screen_text));
         logPane.findViewById(R.id.car_color_button).setOnClickListener(v -> new Thread(() -> {
             java.util.List<String> found = CarColorProbe.run(60);
             String shown = found.isEmpty() ? getString(R.string.car_color_none)
@@ -289,6 +290,21 @@ public class MainActivity extends AppCompatActivity {
         startForegroundService(new Intent(this, AbrpUploadService.class));
     }
 
+    /**
+     * What the head unit reports about its screen, for the Logs tab: the panel in pixels and its
+     * density, and this app's window in pixels and in dp, which is what layouts are chosen by.
+     * Sources disagree on the MG4's numbers (1920×720, 1280×480, a 1778×720 window).
+     */
+    @SuppressWarnings("deprecation") // getRealMetrics: the WindowMetrics API starts at 30; this is 28
+    private void showScreenInfo(TextView view) {
+        android.util.DisplayMetrics panel = new android.util.DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getRealMetrics(panel);
+        android.util.DisplayMetrics window = getResources().getDisplayMetrics();
+        android.content.res.Configuration config = getResources().getConfiguration();
+        view.setText(getString(R.string.screen_info, panel.widthPixels, panel.heightPixels, panel.densityDpi,
+                window.widthPixels, window.heightPixels, config.screenWidthDp, config.screenHeightDp));
+    }
+
     private static final String STATE_PAGE = "page";
 
     @Override
diff --git a/app/src/main/res/layout/pane_log.xml b/app/src/main/res/layout/pane_log.xml
index b6ba2e1..95f2da8 100644
--- a/app/src/main/res/layout/pane_log.xml
+++ b/app/src/main/res/layout/pane_log.xml
@@ -11,5 +11,7 @@
         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/hint_car_color" android:textAppearance="@style/Text.EV.Secondary" />
         <com.google.android.material.button.MaterialButton android:id="@+id/car_color_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:text="@string/btn_car_color" />
         <TextView android:id="@+id/car_color_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:textAppearance="@style/Text.EV.Body" android:fontFamily="monospace" android:textSize="14sp" android:lineSpacingExtra="4dp" android:textIsSelectable="true" />
+        <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/label_screen" android:textAppearance="@style/Text.EV.Eyebrow" />
+        <TextView android:id="@+id/screen_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Body" android:fontFamily="monospace" android:textSize="14sp" android:textIsSelectable="true" />
     </LinearLayout>
 </com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d17bf14..567cc44 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -40,6 +40,8 @@
     <string name="power_waiting">needs a minute of data</string>
     <string name="label_tire_unit">Tyre pressure unit</string>
     <string name="label_accent">Accent colour</string>
+    <string name="label_screen">SCREEN</string>
+    <string name="screen_info">Panel %1$d × %2$d px at %3$d dpi\nApp window %4$d × %5$d px = %6$d × %7$d dp</string>
     <string name="label_car_color">CAR COLOUR</string>
     <string name="hint_car_color">Lists the head unit\'s settings that mention a colour, paint or car model, to find out whether the car\'s colour can be read. A photo of this list helps.</string>
     <string name="btn_car_color">Look for the car colour</string>
diff --git a/mise.toml b/mise.toml
index fc2daa3..89865a6 100644
--- a/mise.toml
+++ b/mise.toml
@@ -56,7 +56,8 @@ BUILD_TOOLS = "36.0.0"
 #                    car build installs there as the system user.)
 #
 # None of this replaces a test on the car.
-# Target density: 160 dpi. Screen 12.8" 1920x720. Reference firmware: SWI68-29958-1300R69.
+# Target density: 160 dpi. Screen 1920x720 px; the density on the car is not confirmed
+# (FIRMWARE.md, "Display, unconfirmed"). Reference firmware: SWI68-29958-1300R69.
 
 EMU_CAR_AVD = "evabrp-car"
 EMU_CAR_IMAGE = "system-images;android-33;android-automotive;x86_64"

From 98ec3f3fcf525272aad31e760dc97e25b7310648 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 19:56:57 +0200
Subject: [PATCH 68/79] Docs: the car's screen is 1920x720 at 160 dpi; no
 colour property

Read on the car with 2.16.2: panel 1920x720 px at 160 dpi, app window
1778x720 px (the car's own sidebar takes the rest), so EVProfile's
1280x480 (1920x720 at 240 dpi, in dp) does not apply here. The colour
probe found only ro.build.mtk2712.vehicle_type = AS28: the paint colour
is not among the system properties. FIRMWARE.md, mise.toml and
SPECS.md updated.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 FIRMWARE.md | 21 +++++----------------
 SPECS.md    | 11 ++++++++---
 mise.toml   |  4 ++--
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/FIRMWARE.md b/FIRMWARE.md
index 99bd678..c74c5a0 100644
--- a/FIRMWARE.md
+++ b/FIRMWARE.md
@@ -11,23 +11,12 @@ development. It must not be treated as a vendor specification.
 | Android | 9 (Pie) — **API 28** |
 | Chipset | MediaTek **MT2712** |
 | Device | `mt2712_saic_eh32` (eh32 = MG4) |
-| Display | Sources disagree, see below. The Logs tab's **SCREEN** line shows what the car reports. |
+| Display | **1920×720 px @ 160 dpi**; the app window is **1778×720 px** (≈1778×640 dp for layouts), the car's own sidebar taking the rest. Confirmed on the car 2026-10-18 (Logs → SCREEN, `SWI68`). |
 | Emulator display profile | **1920×720 @ 160 dpi** |
+| `ro.build.mtk2712.vehicle_type` | `AS28` (a vehicle type code; the paint colour is not among the system properties) |
 
-**Display, unconfirmed.** Three figures are in circulation:
-
-- **1920×720 px**, the figure this project has used (emulator profile, layouts).
-- **1280×480**, from [EVProfile's README](https://github.com/malys/EVProfile) ("forced
-  landscape"). That is exactly 1920×720 px at 240 dpi expressed in dp, the unit layouts use —
-  so it may be the same panel at a higher density. EVProfile also notes that this platform lets
-  the density be changed per app.
-- An app window of **1778×720**, reported upstream: the car's own sidebar taking part of the
-  width.
-
-The app has worked on the car with layouts designed at 1920×720 dp, which fits 160 dpi better
-than 240 (checked on the emulator: at 240 dpi the sidebar needs scrolling and the Overview's
-cards no longer fit). Since 2.16.2 the Logs tab shows the panel's pixels and density and the
-app window in px and dp; a photo of that line settles it.
+EVProfile's README gives the display as 1280×480. That is 1920×720 px at 240 dpi expressed in
+dp; on this car the density is 160 dpi, so it does not apply here.
 
 ## Signing caveat
 
@@ -58,5 +47,5 @@ follow the same path. See `AGENTS.md` for the full per-signal split.
 ## Emulator fidelity
 
 The `mise` emulator tasks use an API 33 automotive AVD for the car service and an API 28
-AVD at **1920×720 @ 160 dpi** for the screen (see "Display, unconfirmed" above). Neither exposes the SAIC vendor properties,
+AVD at **1920×720 @ 160 dpi** for the screen, as on the car. Neither exposes the SAIC vendor properties,
 so vehicle-specific behaviour still requires on-vehicle validation.
diff --git a/SPECS.md b/SPECS.md
index e4e28a9..af3ee3e 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -48,10 +48,12 @@ Current: app 2.14.2, server 2.5.0 (pinned by digest in `k8s/server.yaml`).
       dashboard queries return data).
 - [x] Manifests validated offline (kubeconform, with Traefik CRDs). **Applied by Nils only.**
 - [ ] Check Grafana's host in `k8s/ingress.yaml` (placeholder `car-grafana.k8s.stinnesbeck.com`).
-- [ ] Screen size and density on the car: Logs → SCREEN (2.16.2), see FIRMWARE.md.
+- [x] Screen on the car: 1920×720 px at 160 dpi, app window 1778×720 px (Logs → SCREEN).
+- [x] Car-colour probe on the car: only `ro.build.mtk2712.vehicle_type = AS28`; the paint colour
+      is not in the system properties. It may be in the VHAL (a debug-build VhalProbe listing
+      would tell); until then the accent is chosen by hand.
 - [ ] Not yet tried on the car: live data straight to ABRP (2.11), Enter on phone (2.12), accent
-      colours and the car-colour probe on the Logs tab (2.14; a photo of its list decides whether
-      the accent can follow the paint automatically), right-aligned values (2.14.1).
+      colours (2.14), right-aligned values (2.14.1).
 
 ### Signals the car does not provide
 
@@ -110,6 +112,9 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — From the car (2.16.2): screen 1920×720 px at 160 dpi with a 1778×720 px app
+  window, so EVProfile's 1280×480 does not apply; colour probe found only `vehicle_type = AS28`.
+  FIRMWARE.md, mise.toml and SPECS.md say so.
 - 2026-10-18 — App 2.16.2: Logs → SCREEN shows the panel's pixels and density and the app
   window in px and dp. The MG4's display figures disagree (1920×720 px used here; EVProfile lists
   1280×480, which is 1920×720 at 240 dpi in dp; upstream reported a 1778×720 window); FIRMWARE.md
diff --git a/mise.toml b/mise.toml
index 89865a6..b9e8889 100644
--- a/mise.toml
+++ b/mise.toml
@@ -56,8 +56,8 @@ BUILD_TOOLS = "36.0.0"
 #                    car build installs there as the system user.)
 #
 # None of this replaces a test on the car.
-# Target density: 160 dpi. Screen 1920x720 px; the density on the car is not confirmed
-# (FIRMWARE.md, "Display, unconfirmed"). Reference firmware: SWI68-29958-1300R69.
+# Screen 1920x720 px at 160 dpi, as on the car (app window 1778x720). Reference firmware:
+# SWI68-29958-1300R69.
 
 EMU_CAR_AVD = "evabrp-car"
 EMU_CAR_IMAGE = "system-images;android-33;android-automotive;x86_64"

From f614ab08beb1467b8f5f5034512358cfd774c8bc Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 20:05:26 +0200
Subject: [PATCH 69/79] App 2.16.3: full screen stays with drop-downs and
 dialogs

Opening a drop-down or a dialog brought the car's bars back until it
closed: each is a window of its own, and the system shows the bars when
a window without the full-screen flags takes focus.

- The drop-downs (upload frequency, tyre pressure unit, accent colour)
  are now single-choice buttons on the page: no extra window, one tap
  instead of two, full touch targets, the choice in the accent colour.
- Dialogs (About, update, pairing, phone settings, trip reset, date
  picker) are shown unfocusable, given the activity's full-screen
  flags, and only then allowed focus. None of them takes typing, which
  an unfocusable window would block.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                      |   5 +
 app/build.gradle                              |   4 +-
 .../java/com/evsuite/abrp/MainActivity.java   | 114 ++++++++++--------
 app/src/main/res/color/choice_background.xml  |   5 +
 app/src/main/res/color/choice_stroke.xml      |   5 +
 app/src/main/res/color/choice_text.xml        |   5 +
 .../main/res/layout-w1000dp/pane_service.xml  |   2 +-
 .../main/res/layout-w1000dp/pane_settings.xml |   4 +-
 app/src/main/res/layout/choice_chip.xml       |   8 ++
 app/src/main/res/layout/pane_service.xml      |   2 +-
 app/src/main/res/layout/pane_settings.xml     |   4 +-
 app/src/main/res/layout/spinner_dropdown.xml  |   8 --
 app/src/main/res/layout/spinner_value.xml     |   8 --
 app/src/main/res/values/styles_ev.xml         |  16 +++
 14 files changed, 117 insertions(+), 73 deletions(-)
 create mode 100644 app/src/main/res/color/choice_background.xml
 create mode 100644 app/src/main/res/color/choice_stroke.xml
 create mode 100644 app/src/main/res/color/choice_text.xml
 create mode 100644 app/src/main/res/layout/choice_chip.xml
 delete mode 100644 app/src/main/res/layout/spinner_dropdown.xml
 delete mode 100644 app/src/main/res/layout/spinner_value.xml

diff --git a/SPECS.md b/SPECS.md
index af3ee3e..410abca 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -112,6 +112,11 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.16.3: full screen stays while choosing or reading a dialog. Drop-downs (upload
+  frequency, tyre unit, accent colour) are now buttons on the page: a drop-down is a window of its
+  own without the full-screen flags, so the car showed its bars while it was open. Dialogs are
+  shown unfocusable, given the activity's full-screen flags, then allowed focus
+  (`showKeepingFullScreen`); none of them takes typing.
 - 2026-10-18 — From the car (2.16.2): screen 1920×720 px at 160 dpi with a 1778×720 px app
   window, so EVProfile's 1280×480 does not apply; colour probe found only `vehicle_type = AS28`.
   FIRMWARE.md, mise.toml and SPECS.md say so.
diff --git a/app/build.gradle b/app/build.gradle
index c1329a4..baed5bc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 86
-        versionName "2.16.2"
+        versionCode 87
+        versionName "2.16.3"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index ff4e99f..eb48a7b 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -126,7 +126,7 @@ public class MainActivity extends AppCompatActivity {
     /** Upload page: live telemetry switch and cadence. */
     private SwitchMaterial liveTelemetrySwitch, boostSwitch, voiceKeySwitch, fullScreenSwitch;
     private TextView steeringKeysText;
-    private android.widget.Spinner intervalSpinner;
+    private com.google.android.material.chip.ChipGroup intervalChoices;
     private TextInputLayout lowSocLayout;
     private TextInputEditText lowSocInput;
 
@@ -305,6 +305,26 @@ public class MainActivity extends AppCompatActivity {
                 window.widthPixels, window.heightPixels, config.screenWidthDp, config.screenHeightDp));
     }
 
+    /**
+     * Shows a dialog without bringing the car's bars back. A dialog is a window of its own, and
+     * the system shows the bars when a window without the full-screen flags takes focus. So it
+     * is shown unfocusable, given the activity's flags, and only then allowed focus. None of the
+     * dialogs here take typing, which an unfocusable window would block.
+     */
+    @SuppressWarnings("deprecation") // the WindowInsetsController API starts at 30; this is 28
+    private void showKeepingFullScreen(android.app.Dialog dialog) {
+        android.view.Window window = dialog.getWindow();
+        if (window == null || !UploadSettings.fullScreen(prefs)) {
+            dialog.show();
+            return;
+        }
+        window.setFlags(android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+                android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE);
+        dialog.show();
+        window.getDecorView().setSystemUiVisibility(getWindow().getDecorView().getSystemUiVisibility());
+        window.clearFlags(android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE);
+    }
+
     private static final String STATE_PAGE = "page";
 
     @Override
@@ -332,7 +352,7 @@ public class MainActivity extends AppCompatActivity {
                 .setView(content)
                 .create();
         content.<MaterialButton>findViewById(R.id.about_close).setOnClickListener(v -> dialog.dismiss());
-        dialog.show();
+        showKeepingFullScreen(dialog);
         if (dialog.getWindow() != null) {
             dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
             android.util.DisplayMetrics metrics = getResources().getDisplayMetrics();
@@ -440,7 +460,7 @@ public class MainActivity extends AppCompatActivity {
                 .setView(panel)
                 .setCancelable(false)
                 .create();
-        dialog.show();
+        showKeepingFullScreen(dialog);
         UpdateHook.checkInBackground(this, new UpdateHook.Listener() {
             @Override public void onProgress(int percent) {
                 if (percent < 0) {
@@ -457,11 +477,11 @@ public class MainActivity extends AppCompatActivity {
             @Override public void onResult(String message) {
                 button.setEnabled(true);
                 dialog.dismiss();
-                new MaterialAlertDialogBuilder(MainActivity.this)
+                showKeepingFullScreen(new MaterialAlertDialogBuilder(MainActivity.this)
                         .setTitle(R.string.update_dialog_title)
                         .setMessage(message)
                         .setPositiveButton(android.R.string.ok, null)
-                        .show();
+                        .create());
             }
         });
     }
@@ -796,7 +816,7 @@ public class MainActivity extends AppCompatActivity {
             qr.setVisibility(View.GONE);
             code.setVisibility(View.GONE);
             dialog.setOnDismissListener(d -> cancelled[0] = true);
-            dialog.show();
+            showKeepingFullScreen(dialog);
         }
 
         /** Shows the request: QR code, the code in the sentence and below it. UI thread. */
@@ -1032,7 +1052,7 @@ public class MainActivity extends AppCompatActivity {
             applyFullScreen();
         });
         liveTelemetrySwitch = servicePane.findViewById(R.id.abrp_upload_switch);
-        intervalSpinner = servicePane.findViewById(R.id.interval_spinner);
+        intervalChoices = servicePane.findViewById(R.id.interval_choices);
         boostSwitch = servicePane.findViewById(R.id.boost_switch);
         lowSocInput = servicePane.findViewById(R.id.low_soc_input);
         lowSocLayout = servicePane.findViewById(R.id.low_soc_layout);
@@ -1105,47 +1125,52 @@ public class MainActivity extends AppCompatActivity {
         }, "abrp-test").start();
     }
 
+    /**
+     * A single choice as buttons on the page (choice_chip.xml), in place of a drop-down: a
+     * drop-down opens a window of its own that is not full screen, and the car's bars came back
+     * while it was open. Rebinding replaces the buttons, so it may be called again.
+     */
+    private void bindChoices(com.google.android.material.chip.ChipGroup group, String[] labels, int selected,
+                             java.util.function.IntConsumer onPick) {
+        group.setOnCheckedStateChangeListener(null);
+        group.removeAllViews();
+        for (int i = 0; i < labels.length; i++) {
+            com.google.android.material.chip.Chip chip = (com.google.android.material.chip.Chip)
+                    getLayoutInflater().inflate(R.layout.choice_chip, group, false);
+            chip.setId(View.generateViewId());
+            chip.setText(labels[i]);
+            chip.setTag(i);
+            group.addView(chip);
+            if (i == selected) chip.setChecked(true);
+        }
+        group.setOnCheckedStateChangeListener((g, checkedIds) -> {
+            if (checkedIds.isEmpty()) return;
+            View chosen = g.findViewById(checkedIds.get(0));
+            if (chosen != null) onPick.accept((Integer) chosen.getTag());
+        });
+    }
+
     /** The accent colour; a change recreates the activity so every view takes it. */
     private void bindAccentColor() {
-        android.widget.Spinner spinner = settingsPane.findViewById(R.id.accent_spinner);
         AccentColor[] colors = AccentColor.values();
         String[] labels = new String[colors.length];
         for (int i = 0; i < colors.length; i++) labels[i] = colors[i].label;
-        android.widget.ArrayAdapter<String> adapter = new android.widget.ArrayAdapter<>(
-                this, R.layout.spinner_value, labels);
-        adapter.setDropDownViewResource(R.layout.spinner_dropdown);
-        spinner.setAdapter(adapter);
         AccentColor current = AccentColor.fromPref(prefs.getString(AccentColor.PREF_KEY, null));
-        spinner.setSelection(current.ordinal());
-        spinner.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(android.widget.AdapterView<?> parent, View view, int position, long id) {
-                if (colors[position] == current) return;
-                prefs.edit().putString(AccentColor.PREF_KEY, colors[position].name()).apply();
-                recreate();
-            }
-            @Override public void onNothingSelected(android.widget.AdapterView<?> parent) { }
+        bindChoices(settingsPane.findViewById(R.id.accent_choices), labels, current.ordinal(), position -> {
+            if (colors[position] == current) return;
+            prefs.edit().putString(AccentColor.PREF_KEY, colors[position].name()).apply();
+            recreate();
         });
     }
 
     /** Tyre pressure unit: display only, read on every refresh of the Overview. */
     private void bindTireUnit() {
-        android.widget.Spinner spinner = settingsPane.findViewById(R.id.tire_unit_spinner);
         PressureUnit[] units = PressureUnit.values();
         String[] labels = new String[units.length];
         for (int i = 0; i < units.length; i++) labels[i] = units[i].label;
-        android.widget.ArrayAdapter<String> adapter = new android.widget.ArrayAdapter<>(
-                this, R.layout.spinner_value, labels);
-        adapter.setDropDownViewResource(R.layout.spinner_dropdown);
-        spinner.setAdapter(adapter);
-        spinner.setSelection(PressureUnit.fromPref(prefs.getString(PressureUnit.PREF_KEY, null)).ordinal());
-        spinner.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(android.widget.AdapterView<?> parent, View view, int position, long id) {
-                prefs.edit().putString(PressureUnit.PREF_KEY, units[position].name()).apply();
-            }
-            @Override public void onNothingSelected(android.widget.AdapterView<?> parent) { }
-        });
+        int current = PressureUnit.fromPref(prefs.getString(PressureUnit.PREF_KEY, null)).ordinal();
+        bindChoices(settingsPane.findViewById(R.id.tire_unit_choices), labels, current, position ->
+                prefs.edit().putString(PressureUnit.PREF_KEY, units[position].name()).apply());
     }
 
     /** The service reads these settings on every tick, so a change applies without a restart. */
@@ -1161,19 +1186,9 @@ public class MainActivity extends AppCompatActivity {
                     : getResources().getQuantityString(R.plurals.interval_seconds, sec, sec);
             if (sec == current.intervalSec) selected = i;
         }
-        android.widget.ArrayAdapter<String> adapter = new android.widget.ArrayAdapter<>(
-                this, R.layout.spinner_value, labels);
-        adapter.setDropDownViewResource(R.layout.spinner_dropdown);
-        intervalSpinner.setAdapter(adapter);
-        intervalSpinner.setSelection(selected);
-        intervalSpinner.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(android.widget.AdapterView<?> parent, View view, int position, long id) {
+        bindChoices(intervalChoices, labels, selected, position ->
                 prefs.edit().putInt(UploadSettings.KEY_INTERVAL_SEC,
-                        UploadSettings.INTERVAL_CHOICES_SEC[position]).apply();
-            }
-            @Override public void onNothingSelected(android.widget.AdapterView<?> parent) { }
-        });
+                        UploadSettings.INTERVAL_CHOICES_SEC[position]).apply());
 
         boostSwitch.setOnCheckedChangeListener(null);
         boostSwitch.setChecked(current.boostLowSoc);
@@ -1462,13 +1477,14 @@ public class MainActivity extends AppCompatActivity {
             if (consumptionPeriod != ConsumptionTracker.Period.TRIP_A && consumptionPeriod != ConsumptionTracker.Period.TRIP_B) return;
             String name = getString(consumptionPeriod == ConsumptionTracker.Period.TRIP_A
                     ? R.string.consumption_trip_a : R.string.consumption_trip_b);
-            new MaterialAlertDialogBuilder(this).setTitle(getString(R.string.trip_reset_title, name))
+            showKeepingFullScreen(new MaterialAlertDialogBuilder(this)
+                    .setTitle(getString(R.string.trip_reset_title, name))
                     .setMessage(R.string.trip_reset_message)
                     .setNegativeButton(R.string.pair_cancel, null)
                     .setPositiveButton(R.string.trip_reset_confirm, (d, w) -> {
                         consumptionTracker.reset(consumptionPeriod);
                         refreshConsumption();
-                    }).show();
+                    }).create());
         });
     }
 
@@ -1671,7 +1687,7 @@ public class MainActivity extends AppCompatActivity {
         dialog.getDatePicker().setMaxDate(System.currentTimeMillis());
         dialog.getDatePicker().setMinDate(java.time.LocalDate.now().minusMonths(4)
                 .atStartOfDay(zone).toInstant().toEpochMilli());
-        dialog.show();
+        showKeepingFullScreen(dialog);
     }
 
     /**
diff --git a/app/src/main/res/color/choice_background.xml b/app/src/main/res/color/choice_background.xml
new file mode 100644
index 0000000..c941703
--- /dev/null
+++ b/app/src/main/res/color/choice_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="?attr/evAccentSurface" />
+    <item android:color="@color/ev_surface_raised" />
+</selector>
diff --git a/app/src/main/res/color/choice_stroke.xml b/app/src/main/res/color/choice_stroke.xml
new file mode 100644
index 0000000..c0e21ef
--- /dev/null
+++ b/app/src/main/res/color/choice_stroke.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="?attr/evAccent" />
+    <item android:color="@color/ev_outline" />
+</selector>
diff --git a/app/src/main/res/color/choice_text.xml b/app/src/main/res/color/choice_text.xml
new file mode 100644
index 0000000..60b46ae
--- /dev/null
+++ b/app/src/main/res/color/choice_text.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="?attr/evAccent" />
+    <item android:color="@color/ev_text_primary" />
+</selector>
diff --git a/app/src/main/res/layout-w1000dp/pane_service.xml b/app/src/main/res/layout-w1000dp/pane_service.xml
index c4dee5b..bdff841 100644
--- a/app/src/main/res/layout-w1000dp/pane_service.xml
+++ b/app/src/main/res/layout-w1000dp/pane_service.xml
@@ -27,7 +27,7 @@
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_service_timing" android:textAppearance="@style/Text.EV.Eyebrow" />
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_frequency" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
-                <Spinner android:id="@+id/interval_spinner" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:layout_marginTop="12dp" android:background="@drawable/bg_input_panel" android:popupBackground="@color/ev_surface_raised" android:contentDescription="@string/label_frequency" android:spinnerMode="dropdown" />
+                <com.google.android.material.chip.ChipGroup android:id="@+id/interval_choices" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" app:singleSelection="true" app:selectionRequired="true" app:chipSpacingHorizontal="12dp" app:chipSpacingVertical="8dp" />
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_frequency" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="12dp" />
                 <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/boost_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_boost_low_soc" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
                 <com.google.android.material.textfield.TextInputLayout android:id="@+id/low_soc_layout" style="@style/Widget.EV.Input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="@string/label_low_soc_threshold">
diff --git a/app/src/main/res/layout-w1000dp/pane_settings.xml b/app/src/main/res/layout-w1000dp/pane_settings.xml
index 6e9df62..a096c71 100644
--- a/app/src/main/res/layout-w1000dp/pane_settings.xml
+++ b/app/src/main/res/layout-w1000dp/pane_settings.xml
@@ -9,9 +9,9 @@
                 <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_key_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_voice_key" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_voice_key" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_tire_unit" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
-                <Spinner android:id="@+id/tire_unit_spinner" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:layout_marginTop="12dp" android:background="@drawable/bg_input_panel" android:popupBackground="@color/ev_surface_raised" android:contentDescription="@string/label_tire_unit" android:spinnerMode="dropdown" />
+                <com.google.android.material.chip.ChipGroup android:id="@+id/tire_unit_choices" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" app:singleSelection="true" app:selectionRequired="true" app:chipSpacingHorizontal="12dp" app:chipSpacingVertical="8dp" />
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_accent" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
-                <Spinner android:id="@+id/accent_spinner" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:layout_marginTop="12dp" android:background="@drawable/bg_input_panel" android:popupBackground="@color/ev_surface_raised" android:contentDescription="@string/label_accent" android:spinnerMode="dropdown" />
+                <com.google.android.material.chip.ChipGroup android:id="@+id/accent_choices" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" app:singleSelection="true" app:selectionRequired="true" app:chipSpacingHorizontal="12dp" app:chipSpacingVertical="8dp" />
             </LinearLayout>
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_settings_title" android:textAppearance="@style/Text.EV.Eyebrow" />
diff --git a/app/src/main/res/layout/choice_chip.xml b/app/src/main/res/layout/choice_chip.xml
new file mode 100644
index 0000000..f0f8440
--- /dev/null
+++ b/app/src/main/res/layout/choice_chip.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- One option of an on-page choice (MainActivity.bindChoices). Chips rather than a drop-down:
+     a drop-down opens its own window, which is not full screen, so the car's bars came back
+     while it was open; and one tap is easier than two while driving. -->
+<com.google.android.material.chip.Chip xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/Widget.EV.Choice"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/pane_service.xml b/app/src/main/res/layout/pane_service.xml
index d1b1d05..d29a516 100644
--- a/app/src/main/res/layout/pane_service.xml
+++ b/app/src/main/res/layout/pane_service.xml
@@ -24,7 +24,7 @@
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_service_timing" android:textAppearance="@style/Text.EV.Eyebrow" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_frequency" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
-            <Spinner android:id="@+id/interval_spinner" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:layout_marginTop="12dp" android:background="@drawable/bg_input_panel" android:popupBackground="@color/ev_surface_raised" android:contentDescription="@string/label_frequency" android:spinnerMode="dropdown" />
+            <com.google.android.material.chip.ChipGroup android:id="@+id/interval_choices" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" app:singleSelection="true" app:selectionRequired="true" app:chipSpacingHorizontal="12dp" app:chipSpacingVertical="8dp" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_frequency" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="12dp" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/boost_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_boost_low_soc" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <com.google.android.material.textfield.TextInputLayout android:id="@+id/low_soc_layout" style="@style/Widget.EV.Input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="@string/label_low_soc_threshold">
diff --git a/app/src/main/res/layout/pane_settings.xml b/app/src/main/res/layout/pane_settings.xml
index 978fbd8..0a5b350 100644
--- a/app/src/main/res/layout/pane_settings.xml
+++ b/app/src/main/res/layout/pane_settings.xml
@@ -8,9 +8,9 @@
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_key_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_voice_key" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_voice_key" android:textAppearance="@style/Text.EV.Secondary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_tire_unit" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
-            <Spinner android:id="@+id/tire_unit_spinner" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:layout_marginTop="12dp" android:background="@drawable/bg_input_panel" android:popupBackground="@color/ev_surface_raised" android:contentDescription="@string/label_tire_unit" android:spinnerMode="dropdown" />
+            <com.google.android.material.chip.ChipGroup android:id="@+id/tire_unit_choices" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" app:singleSelection="true" app:selectionRequired="true" app:chipSpacingHorizontal="12dp" app:chipSpacingVertical="8dp" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_accent" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
-            <Spinner android:id="@+id/accent_spinner" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:layout_marginTop="12dp" android:background="@drawable/bg_input_panel" android:popupBackground="@color/ev_surface_raised" android:contentDescription="@string/label_accent" android:spinnerMode="dropdown" />
+            <com.google.android.material.chip.ChipGroup android:id="@+id/accent_choices" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" app:singleSelection="true" app:selectionRequired="true" app:chipSpacingHorizontal="12dp" app:chipSpacingVertical="8dp" />
         </LinearLayout>
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_settings_title" android:textAppearance="@style/Text.EV.Eyebrow" />
diff --git a/app/src/main/res/layout/spinner_dropdown.xml b/app/src/main/res/layout/spinner_dropdown.xml
deleted file mode 100644
index 562c36f..0000000
--- a/app/src/main/res/layout/spinner_dropdown.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent" android:layout_height="wrap_content"
-    android:minHeight="72dp" android:gravity="center_vertical"
-    android:paddingStart="20dp" android:paddingEnd="20dp"
-    android:paddingTop="12dp" android:paddingBottom="12dp"
-    android:background="?attr/selectableItemBackground"
-    android:textAppearance="@style/Text.EV.Body" />
diff --git a/app/src/main/res/layout/spinner_value.xml b/app/src/main/res/layout/spinner_value.xml
deleted file mode 100644
index 59ab3bf..0000000
--- a/app/src/main/res/layout/spinner_value.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent" android:layout_height="wrap_content"
-    android:minHeight="72dp" android:gravity="center_vertical"
-    android:paddingStart="20dp" android:paddingEnd="20dp"
-    android:paddingTop="12dp" android:paddingBottom="12dp"
-    android:drawableEnd="@drawable/ic_chevron_down" android:drawablePadding="16dp"
-    android:textAppearance="@style/Text.EV.Body" />
diff --git a/app/src/main/res/values/styles_ev.xml b/app/src/main/res/values/styles_ev.xml
index 0defd39..97533f0 100644
--- a/app/src/main/res/values/styles_ev.xml
+++ b/app/src/main/res/values/styles_ev.xml
@@ -96,4 +96,20 @@
     <style name="ShapeAppearanceOverlay.EV.Button" parent="">
         <item name="cornerSize">18dp</item>
     </style>
+
+    <!-- On-page single choice (choice_chip.xml): a full touch target, the accent when chosen. -->
+    <style name="Widget.EV.Choice" parent="Widget.Material3.Chip.Filter">
+        <item name="android:checkable">true</item>
+        <item name="checkedIconVisible">false</item>
+        <item name="chipMinHeight">@dimen/touch_target</item>
+        <item name="chipMinTouchTargetSize">@dimen/touch_target</item>
+        <item name="android:textSize">@dimen/text_body</item>
+        <item name="android:textColor">@color/choice_text</item>
+        <item name="chipBackgroundColor">@color/choice_background</item>
+        <item name="chipStrokeColor">@color/choice_stroke</item>
+        <item name="chipStrokeWidth">1dp</item>
+        <item name="chipStartPadding">16dp</item>
+        <item name="chipEndPadding">16dp</item>
+        <item name="ensureMinTouchTargetSize">false</item>
+    </style>
 </resources>

From 79bcfa05f61efa6d5d202b71b16caa32fa337a1c Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 20:11:25 +0200
Subject: [PATCH 70/79] App 2.16.4: drop-downs that keep full screen

Back to drop-downs for upload frequency, tyre pressure unit and accent
colour, as Material exposed dropdown menus instead of Spinners. A
Spinner's list is a focusable window of its own without the
full-screen flags, so the car showed its bars while it was open; an
exposed dropdown's list leaves the focus with the activity, so the app
stays full screen. Styled like the other input fields, with full-height
rows. Replaces the buttons of 2.16.3.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                      |  5 ++-
 app/build.gradle                              |  4 +--
 .../java/com/evsuite/abrp/MainActivity.java   | 34 +++++++------------
 app/src/main/res/color/choice_background.xml  |  5 ---
 app/src/main/res/color/choice_stroke.xml      |  5 ---
 app/src/main/res/color/choice_text.xml        |  5 ---
 .../main/res/layout-w1000dp/pane_service.xml  |  4 ++-
 .../main/res/layout-w1000dp/pane_settings.xml |  8 +++--
 app/src/main/res/layout/choice_chip.xml       |  8 -----
 app/src/main/res/layout/dropdown_item.xml     | 13 +++++++
 app/src/main/res/layout/pane_service.xml      |  4 ++-
 app/src/main/res/layout/pane_settings.xml     |  8 +++--
 app/src/main/res/values/styles_app.xml        | 13 +++++++
 app/src/main/res/values/styles_ev.xml         | 15 --------
 14 files changed, 62 insertions(+), 69 deletions(-)
 delete mode 100644 app/src/main/res/color/choice_background.xml
 delete mode 100644 app/src/main/res/color/choice_stroke.xml
 delete mode 100644 app/src/main/res/color/choice_text.xml
 delete mode 100644 app/src/main/res/layout/choice_chip.xml
 create mode 100644 app/src/main/res/layout/dropdown_item.xml

diff --git a/SPECS.md b/SPECS.md
index 410abca..85c5a6f 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -112,8 +112,11 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.16.4: drop-downs again, as Material exposed dropdown menus: their list leaves
+  the focus with the activity, so full screen stays (a Spinner's list is a focusable window of its
+  own without the full-screen flags). 2.16.3 had replaced them with buttons.
 - 2026-10-18 — App 2.16.3: full screen stays while choosing or reading a dialog. Drop-downs (upload
-  frequency, tyre unit, accent colour) are now buttons on the page: a drop-down is a window of its
+  frequency, tyre unit, accent colour) became buttons on the page: a drop-down is a window of its
   own without the full-screen flags, so the car showed its bars while it was open. Dialogs are
   shown unfocusable, given the activity's full-screen flags, then allowed focus
   (`showKeepingFullScreen`); none of them takes typing.
diff --git a/app/build.gradle b/app/build.gradle
index baed5bc..cb04d10 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 87
-        versionName "2.16.3"
+        versionCode 88
+        versionName "2.16.4"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index eb48a7b..3ddcdf4 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -126,7 +126,7 @@ public class MainActivity extends AppCompatActivity {
     /** Upload page: live telemetry switch and cadence. */
     private SwitchMaterial liveTelemetrySwitch, boostSwitch, voiceKeySwitch, fullScreenSwitch;
     private TextView steeringKeysText;
-    private com.google.android.material.chip.ChipGroup intervalChoices;
+    private com.google.android.material.textfield.MaterialAutoCompleteTextView intervalChoices;
     private TextInputLayout lowSocLayout;
     private TextInputEditText lowSocInput;
 
@@ -1126,28 +1126,18 @@ public class MainActivity extends AppCompatActivity {
     }
 
     /**
-     * A single choice as buttons on the page (choice_chip.xml), in place of a drop-down: a
-     * drop-down opens a window of its own that is not full screen, and the car's bars came back
-     * while it was open. Rebinding replaces the buttons, so it may be called again.
+     * A single choice as a drop-down (Widget.EV.Dropdown). An exposed dropdown menu rather than
+     * a Spinner: a Spinner's list is a focusable window of its own without the full-screen
+     * flags, and the car showed its bars while it was open; this list leaves the focus with
+     * the activity. setSimpleItems keeps every option listed (a plain adapter would filter the
+     * list down to the current text). Rebinding is safe.
      */
-    private void bindChoices(com.google.android.material.chip.ChipGroup group, String[] labels, int selected,
-                             java.util.function.IntConsumer onPick) {
-        group.setOnCheckedStateChangeListener(null);
-        group.removeAllViews();
-        for (int i = 0; i < labels.length; i++) {
-            com.google.android.material.chip.Chip chip = (com.google.android.material.chip.Chip)
-                    getLayoutInflater().inflate(R.layout.choice_chip, group, false);
-            chip.setId(View.generateViewId());
-            chip.setText(labels[i]);
-            chip.setTag(i);
-            group.addView(chip);
-            if (i == selected) chip.setChecked(true);
-        }
-        group.setOnCheckedStateChangeListener((g, checkedIds) -> {
-            if (checkedIds.isEmpty()) return;
-            View chosen = g.findViewById(checkedIds.get(0));
-            if (chosen != null) onPick.accept((Integer) chosen.getTag());
-        });
+    private void bindChoices(com.google.android.material.textfield.MaterialAutoCompleteTextView view,
+                             String[] labels, int selected, java.util.function.IntConsumer onPick) {
+        view.setOnItemClickListener(null);
+        view.setSimpleItems(labels);
+        view.setText(labels[selected], false);
+        view.setOnItemClickListener((parent, item, position, id) -> onPick.accept(position));
     }
 
     /** The accent colour; a change recreates the activity so every view takes it. */
diff --git a/app/src/main/res/color/choice_background.xml b/app/src/main/res/color/choice_background.xml
deleted file mode 100644
index c941703..0000000
--- a/app/src/main/res/color/choice_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:color="?attr/evAccentSurface" />
-    <item android:color="@color/ev_surface_raised" />
-</selector>
diff --git a/app/src/main/res/color/choice_stroke.xml b/app/src/main/res/color/choice_stroke.xml
deleted file mode 100644
index c0e21ef..0000000
--- a/app/src/main/res/color/choice_stroke.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:color="?attr/evAccent" />
-    <item android:color="@color/ev_outline" />
-</selector>
diff --git a/app/src/main/res/color/choice_text.xml b/app/src/main/res/color/choice_text.xml
deleted file mode 100644
index 60b46ae..0000000
--- a/app/src/main/res/color/choice_text.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:color="?attr/evAccent" />
-    <item android:color="@color/ev_text_primary" />
-</selector>
diff --git a/app/src/main/res/layout-w1000dp/pane_service.xml b/app/src/main/res/layout-w1000dp/pane_service.xml
index bdff841..1298c51 100644
--- a/app/src/main/res/layout-w1000dp/pane_service.xml
+++ b/app/src/main/res/layout-w1000dp/pane_service.xml
@@ -27,7 +27,9 @@
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_service_timing" android:textAppearance="@style/Text.EV.Eyebrow" />
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_frequency" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
-                <com.google.android.material.chip.ChipGroup android:id="@+id/interval_choices" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" app:singleSelection="true" app:selectionRequired="true" app:chipSpacingHorizontal="12dp" app:chipSpacingVertical="8dp" />
+                <com.google.android.material.textfield.TextInputLayout style="@style/Widget.EV.Dropdown" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp">
+                    <com.google.android.material.textfield.MaterialAutoCompleteTextView android:id="@+id/interval_choices" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="none" android:textSize="20sp" app:simpleItemLayout="@layout/dropdown_item" />
+                </com.google.android.material.textfield.TextInputLayout>
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_frequency" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="12dp" />
                 <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/boost_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_boost_low_soc" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
                 <com.google.android.material.textfield.TextInputLayout android:id="@+id/low_soc_layout" style="@style/Widget.EV.Input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="@string/label_low_soc_threshold">
diff --git a/app/src/main/res/layout-w1000dp/pane_settings.xml b/app/src/main/res/layout-w1000dp/pane_settings.xml
index a096c71..113c246 100644
--- a/app/src/main/res/layout-w1000dp/pane_settings.xml
+++ b/app/src/main/res/layout-w1000dp/pane_settings.xml
@@ -9,9 +9,13 @@
                 <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_key_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_voice_key" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_voice_key" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_tire_unit" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
-                <com.google.android.material.chip.ChipGroup android:id="@+id/tire_unit_choices" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" app:singleSelection="true" app:selectionRequired="true" app:chipSpacingHorizontal="12dp" app:chipSpacingVertical="8dp" />
+                <com.google.android.material.textfield.TextInputLayout style="@style/Widget.EV.Dropdown" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp">
+                    <com.google.android.material.textfield.MaterialAutoCompleteTextView android:id="@+id/tire_unit_choices" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="none" android:textSize="20sp" app:simpleItemLayout="@layout/dropdown_item" />
+                </com.google.android.material.textfield.TextInputLayout>
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_accent" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
-                <com.google.android.material.chip.ChipGroup android:id="@+id/accent_choices" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" app:singleSelection="true" app:selectionRequired="true" app:chipSpacingHorizontal="12dp" app:chipSpacingVertical="8dp" />
+                <com.google.android.material.textfield.TextInputLayout style="@style/Widget.EV.Dropdown" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp">
+                    <com.google.android.material.textfield.MaterialAutoCompleteTextView android:id="@+id/accent_choices" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="none" android:textSize="20sp" app:simpleItemLayout="@layout/dropdown_item" />
+                </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_settings_title" android:textAppearance="@style/Text.EV.Eyebrow" />
diff --git a/app/src/main/res/layout/choice_chip.xml b/app/src/main/res/layout/choice_chip.xml
deleted file mode 100644
index f0f8440..0000000
--- a/app/src/main/res/layout/choice_chip.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- One option of an on-page choice (MainActivity.bindChoices). Chips rather than a drop-down:
-     a drop-down opens its own window, which is not full screen, so the car's bars came back
-     while it was open; and one tap is easier than two while driving. -->
-<com.google.android.material.chip.Chip xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/Widget.EV.Choice"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/dropdown_item.xml b/app/src/main/res/layout/dropdown_item.xml
new file mode 100644
index 0000000..623a16f
--- /dev/null
+++ b/app/src/main/res/layout/dropdown_item.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- One row of a drop-down list (Widget.EV.Dropdown): a full touch target, body text size. -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="@dimen/touch_target"
+    android:gravity="center_vertical"
+    android:paddingStart="20dp"
+    android:paddingEnd="20dp"
+    android:textAppearance="@style/Text.EV.Body"
+    android:textColor="@color/ev_text_primary"
+    android:maxLines="1"
+    android:ellipsize="end" />
diff --git a/app/src/main/res/layout/pane_service.xml b/app/src/main/res/layout/pane_service.xml
index d29a516..b53b64f 100644
--- a/app/src/main/res/layout/pane_service.xml
+++ b/app/src/main/res/layout/pane_service.xml
@@ -24,7 +24,9 @@
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_service_timing" android:textAppearance="@style/Text.EV.Eyebrow" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_frequency" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
-            <com.google.android.material.chip.ChipGroup android:id="@+id/interval_choices" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" app:singleSelection="true" app:selectionRequired="true" app:chipSpacingHorizontal="12dp" app:chipSpacingVertical="8dp" />
+            <com.google.android.material.textfield.TextInputLayout style="@style/Widget.EV.Dropdown" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp">
+                <com.google.android.material.textfield.MaterialAutoCompleteTextView android:id="@+id/interval_choices" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="none" android:textSize="20sp" app:simpleItemLayout="@layout/dropdown_item" />
+            </com.google.android.material.textfield.TextInputLayout>
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_frequency" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="12dp" />
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/boost_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_boost_low_soc" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <com.google.android.material.textfield.TextInputLayout android:id="@+id/low_soc_layout" style="@style/Widget.EV.Input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="@string/label_low_soc_threshold">
diff --git a/app/src/main/res/layout/pane_settings.xml b/app/src/main/res/layout/pane_settings.xml
index 0a5b350..ced79f4 100644
--- a/app/src/main/res/layout/pane_settings.xml
+++ b/app/src/main/res/layout/pane_settings.xml
@@ -8,9 +8,13 @@
             <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/voice_key_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/label_voice_key" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hint_voice_key" android:textAppearance="@style/Text.EV.Secondary" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_tire_unit" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
-            <com.google.android.material.chip.ChipGroup android:id="@+id/tire_unit_choices" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" app:singleSelection="true" app:selectionRequired="true" app:chipSpacingHorizontal="12dp" app:chipSpacingVertical="8dp" />
+            <com.google.android.material.textfield.TextInputLayout style="@style/Widget.EV.Dropdown" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp">
+                <com.google.android.material.textfield.MaterialAutoCompleteTextView android:id="@+id/tire_unit_choices" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="none" android:textSize="20sp" app:simpleItemLayout="@layout/dropdown_item" />
+            </com.google.android.material.textfield.TextInputLayout>
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_accent" android:textAppearance="@style/Text.EV.Body" android:layout_marginTop="20dp" />
-            <com.google.android.material.chip.ChipGroup android:id="@+id/accent_choices" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" app:singleSelection="true" app:selectionRequired="true" app:chipSpacingHorizontal="12dp" app:chipSpacingVertical="8dp" />
+            <com.google.android.material.textfield.TextInputLayout style="@style/Widget.EV.Dropdown" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp">
+                <com.google.android.material.textfield.MaterialAutoCompleteTextView android:id="@+id/accent_choices" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="none" android:textSize="20sp" app:simpleItemLayout="@layout/dropdown_item" />
+            </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_settings_title" android:textAppearance="@style/Text.EV.Eyebrow" />
diff --git a/app/src/main/res/values/styles_app.xml b/app/src/main/res/values/styles_app.xml
index 1b39cf5..7c74ff9 100644
--- a/app/src/main/res/values/styles_app.xml
+++ b/app/src/main/res/values/styles_app.xml
@@ -43,6 +43,19 @@
     <item name="endIconTint">@color/ev_text_secondary</item>
     <item name="helperTextTextAppearance">@style/Text.EV.Secondary</item>
   </style>
+  <!-- A drop-down that keeps the app full screen: an exposed dropdown menu's list does not take
+       focus from the activity's window, unlike a Spinner's, so the car's bars stay hidden. -->
+  <style name="Widget.EV.Dropdown" parent="Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
+    <item name="boxBackgroundColor">@color/ev_background</item>
+    <item name="boxStrokeColor">@color/input_stroke</item>
+    <item name="boxStrokeWidth">1dp</item>
+    <item name="boxStrokeWidthFocused">2dp</item>
+    <item name="boxCornerRadiusTopStart">16dp</item>
+    <item name="boxCornerRadiusTopEnd">16dp</item>
+    <item name="boxCornerRadiusBottomStart">16dp</item>
+    <item name="boxCornerRadiusBottomEnd">16dp</item>
+    <item name="endIconTint">?attr/evAccent</item>
+  </style>
   <style name="Text.EV.Eyebrow" parent="Text.EV.SectionHeader">
     <item name="android:textSize">16sp</item>
     <item name="android:textColor">?attr/evAccent</item>
diff --git a/app/src/main/res/values/styles_ev.xml b/app/src/main/res/values/styles_ev.xml
index 97533f0..fcafe9a 100644
--- a/app/src/main/res/values/styles_ev.xml
+++ b/app/src/main/res/values/styles_ev.xml
@@ -97,19 +97,4 @@
         <item name="cornerSize">18dp</item>
     </style>
 
-    <!-- On-page single choice (choice_chip.xml): a full touch target, the accent when chosen. -->
-    <style name="Widget.EV.Choice" parent="Widget.Material3.Chip.Filter">
-        <item name="android:checkable">true</item>
-        <item name="checkedIconVisible">false</item>
-        <item name="chipMinHeight">@dimen/touch_target</item>
-        <item name="chipMinTouchTargetSize">@dimen/touch_target</item>
-        <item name="android:textSize">@dimen/text_body</item>
-        <item name="android:textColor">@color/choice_text</item>
-        <item name="chipBackgroundColor">@color/choice_background</item>
-        <item name="chipStrokeColor">@color/choice_stroke</item>
-        <item name="chipStrokeWidth">1dp</item>
-        <item name="chipStartPadding">16dp</item>
-        <item name="chipEndPadding">16dp</item>
-        <item name="ensureMinTouchTargetSize">false</item>
-    </style>
 </resources>

From 8d3eb80f6630abe772ef562df65282c542d15717 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 20:26:02 +0200
Subject: [PATCH 71/79] App 2.17.0: speed average, compact top bar, About in
 Settings

- "Speed, 5-min average" card under Speed: time-weighted mean speed,
  standing included, from the same samples as the other averages.
- The top bar is one compact line (title and subtitle side by side).
  Version, update check and About moved from it to an App card on the
  Settings tab.
- The Overview no longer scrolls in the car's window: checked on the
  emulator at 1778x640, the layout height the car reports, after
  trimming the page's padding and the tyre card's height.
- The capacity hint says "Overview" instead of "Vehicle tab".

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                      |  4 ++++
 app/build.gradle                              |  4 ++--
 .../java/com/evsuite/abrp/MainActivity.java   | 15 ++++++++++----
 .../java/com/evsuite/abrp/RangeEstimator.java | 20 +++++++++++++++++++
 .../main/res/layout-w1000dp/activity_main.xml | 13 +++++-------
 .../main/res/layout-w1000dp/pane_settings.xml |  6 ++++++
 .../main/res/layout-w1000dp/pane_vehicle.xml  | 10 +++++++---
 app/src/main/res/layout/activity_main.xml     | 13 +++++-------
 app/src/main/res/layout/pane_settings.xml     |  6 ++++++
 app/src/main/res/layout/pane_vehicle.xml      |  9 +++++++--
 app/src/main/res/values/strings.xml           |  7 ++++++-
 app/src/main/res/values/strings_design.xml    |  3 ++-
 .../com/evsuite/abrp/RangeEstimatorTest.java  | 12 +++++++++++
 13 files changed, 93 insertions(+), 29 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index 85c5a6f..0c16d2e 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -112,6 +112,10 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.17.0: "Speed, 5-min average" card under Speed. The top bar is one compact line
+  (title and subtitle); version, update check and About moved to an App card on the Settings tab.
+  The Overview fits the car's window without scrolling: checked on the emulator at 1778×640, the
+  layout height the car reports (less page padding, a lower tyre card).
 - 2026-10-18 — App 2.16.4: drop-downs again, as Material exposed dropdown menus: their list leaves
   the focus with the activity, so full screen stays (a Spinner's list is a focusable window of its
   own without the full-screen flags). 2.16.3 had replaced them with buttons.
diff --git a/app/build.gradle b/app/build.gradle
index cb04d10..2ffdddb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 88
-        versionName "2.16.4"
+        versionCode 89
+        versionName "2.17.0"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 3ddcdf4..0d5b314 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -94,7 +94,8 @@ public class MainActivity extends AppCompatActivity {
             vehTireFl, vehTireFr, vehTireRl, vehTireRr,
             vehRangeTrip, vehRangeTripNote, vehRangeAverage, vehRangeAverageNote,
             vehUsageTrip, vehUsageTripNote, vehUsageAverage, vehUsageAverageNote,
-            vehEnergyTrip, vehEnergyTripNote, vehPowerAverage, vehPowerAverageNote;
+            vehEnergyTrip, vehEnergyTripNote, vehPowerAverage, vehPowerAverageNote,
+            vehSpeedAverage, vehSpeedAverageNote;
 
     /** Usable pack capacity for the range estimates; the car does not publish it. */
     static final String USABLE_KWH_KEY = "usable_kwh";
@@ -233,7 +234,6 @@ public class MainActivity extends AppCompatActivity {
         getTheme().applyStyle(AccentColor.fromPref(prefs.getString(AccentColor.PREF_KEY, null)).overlay, true);
         setContentView(R.layout.activity_main);
 
-        ((TextView) findViewById(R.id.version_badge)).setText("v" + BuildConfig.VERSION_NAME);
 
 
         // The pages are inflated here, once, and handed to the pager as fixed,
@@ -277,8 +277,10 @@ public class MainActivity extends AppCompatActivity {
         if (savedInstanceState != null) {
             ((ViewPager2) findViewById(R.id.content)).setCurrentItem(savedInstanceState.getInt(STATE_PAGE, 0), false);
         }
-        findViewById(R.id.about_button).setOnClickListener(v -> showAbout());
-        findViewById(R.id.update_button).setOnClickListener(v -> checkForUpdate(v));
+        ((TextView) settingsPane.findViewById(R.id.settings_version))
+                .setText(getString(R.string.settings_version, BuildConfig.VERSION_NAME));
+        settingsPane.findViewById(R.id.settings_about_button).setOnClickListener(v -> showAbout());
+        settingsPane.findViewById(R.id.settings_update_button).setOnClickListener(v -> checkForUpdate(v));
 
         // Unstable builds check for a newer pre-release; the stable flavor's UpdateHook is
         // a no-op and does not even contain the updater.
@@ -1288,6 +1290,8 @@ public class MainActivity extends AppCompatActivity {
         vehEnergyTripNote   = vehiclePane.findViewById(R.id.vehicle_energy_trip_note);
         vehPowerAverage     = vehiclePane.findViewById(R.id.vehicle_power_average);
         vehPowerAverageNote = vehiclePane.findViewById(R.id.vehicle_power_average_note);
+        vehSpeedAverage     = vehiclePane.findViewById(R.id.vehicle_speed_average);
+        vehSpeedAverageNote = vehiclePane.findViewById(R.id.vehicle_speed_average_note);
     }
 
     private double usableKwh() {
@@ -1308,6 +1312,9 @@ public class MainActivity extends AppCompatActivity {
         Double power = estimator.averagePowerKw(monotonicMs);
         vehPowerAverage.setText(power == null ? "—" : getString(R.string.power_kw, power));
         vehPowerAverageNote.setText(power == null ? R.string.power_waiting : R.string.usage_last_5_min);
+        Double speed = estimator.averageSpeedKmh(monotonicMs);
+        vehSpeedAverage.setText(speed == null ? "—" : getString(R.string.speed_kmh, speed));
+        vehSpeedAverageNote.setText(speed == null ? R.string.power_waiting : R.string.usage_last_5_min);
         Double energy = estimator.energySinceStart();
         vehEnergyTrip.setText(energy == null ? "—" : getString(R.string.energy_kwh, energy));
         vehEnergyTripNote.setText(energy == null ? R.string.energy_trip_waiting : R.string.energy_trip_note);
diff --git a/app/src/main/java/com/evsuite/abrp/RangeEstimator.java b/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
index b982760..956fa97 100644
--- a/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
+++ b/app/src/main/java/com/evsuite/abrp/RangeEstimator.java
@@ -177,6 +177,26 @@ final class RangeEstimator {
         return energyKwh / (covered / 3_600_000.0);
     }
 
+    /** Mean speed over the last five minutes, time-weighted, standing included; null below a minute. */
+    synchronized Double averageSpeedKmh(long nowMs) {
+        double distanceKm = 0;
+        long covered = 0;
+        Sample previous = null;
+        for (Sample s : samples) {
+            if (s.timeMs < nowMs - WINDOW_MS) continue;
+            if (previous != null) {
+                long dt = s.timeMs - previous.timeMs;
+                if (dt > 0 && dt <= MAX_GAP_MS) {
+                    distanceKm += (previous.speedKmh + s.speedKmh) / 2 * (dt / 3_600_000.0);
+                    covered += dt;
+                }
+            }
+            previous = s;
+        }
+        if (covered < MIN_WINDOW_MS) return null;
+        return distanceKm / (covered / 3_600_000.0);
+    }
+
     synchronized void clear() {
         samples.clear();
         tripEnergyKwh = 0;
diff --git a/app/src/main/res/layout-w1000dp/activity_main.xml b/app/src/main/res/layout-w1000dp/activity_main.xml
index 9c564a4..ccf2bf9 100644
--- a/app/src/main/res/layout-w1000dp/activity_main.xml
+++ b/app/src/main/res/layout-w1000dp/activity_main.xml
@@ -16,14 +16,11 @@
             </LinearLayout>
         </ScrollView>
         <LinearLayout android:layout_width="0dp" android:layout_weight="1" android:layout_height="match_parent" android:orientation="vertical">
-            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" android:paddingStart="24dp" android:paddingEnd="24dp" android:paddingTop="16dp" android:paddingBottom="8dp">
-                <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical">
-                    <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_overview_title" android:textAppearance="@style/Text.EV.Title" android:id="@+id/header_title" android:textSize="32sp" />
-                    <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_overview_subtitle" android:textAppearance="@style/Text.EV.Secondary" android:id="@+id/header_subtitle" android:layout_marginTop="6dp" />
-                </LinearLayout>
-                <TextView android:id="@+id/version_badge" style="@style/Text.EV.VersionBadge" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="8dp" />
-                <com.google.android.material.button.MaterialButton android:id="@+id/update_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="72dp" android:layout_height="72dp" android:minWidth="0dp" android:padding="0dp" android:contentDescription="@string/update_check" app:icon="@drawable/ic_refresh" app:iconGravity="textStart" app:iconPadding="0dp" app:iconTint="?attr/evAccent" />
-                <com.google.android.material.button.MaterialButton android:id="@+id/about_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="72dp" android:layout_height="72dp" android:layout_marginStart="8dp" android:minWidth="0dp" android:padding="0dp" android:contentDescription="@string/about_action" app:icon="@drawable/ic_info" app:iconGravity="textStart" app:iconPadding="0dp" />
+            <!-- One compact line: the Overview has to fit the car's 1778×720 px window (about 640 dp for
+                 layouts). Version, update check and About are on the Settings tab. -->
+            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" android:baselineAligned="true" android:paddingStart="24dp" android:paddingEnd="24dp" android:paddingTop="10dp" android:paddingBottom="2dp">
+                <TextView android:id="@+id/header_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/design_overview_title" android:textAppearance="@style/Text.EV.Title" android:textSize="24sp" android:maxLines="1" />
+                <TextView android:id="@+id/header_subtitle" android:layout_width="0dp" android:layout_weight="1" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:text="@string/design_overview_subtitle" android:textAppearance="@style/Text.EV.Secondary" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
             <androidx.viewpager2.widget.ViewPager2 android:id="@+id/content" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" />
         </LinearLayout>
diff --git a/app/src/main/res/layout-w1000dp/pane_settings.xml b/app/src/main/res/layout-w1000dp/pane_settings.xml
index 113c246..a07fd8e 100644
--- a/app/src/main/res/layout-w1000dp/pane_settings.xml
+++ b/app/src/main/res/layout-w1000dp/pane_settings.xml
@@ -53,6 +53,12 @@
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_saved_title" android:textAppearance="@style/Text.EV.Eyebrow" />
                 <TextView android:id="@+id/wifi_saved_list" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:textAppearance="@style/Text.EV.Body" android:lineSpacingExtra="16dp" />
             </LinearLayout>
+            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_app_title" android:textAppearance="@style/Text.EV.Eyebrow" />
+                <TextView android:id="@+id/settings_version" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:textAppearance="@style/Text.EV.Body" />
+                <com.google.android.material.button.MaterialButton android:id="@+id/settings_update_button" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/btn_check_update" app:icon="@drawable/ic_refresh" />
+                <com.google.android.material.button.MaterialButton android:id="@+id/settings_about_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/btn_about" app:icon="@drawable/ic_info" />
+            </LinearLayout>
         </LinearLayout>
     </LinearLayout>
 </com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout-w1000dp/pane_vehicle.xml b/app/src/main/res/layout-w1000dp/pane_vehicle.xml
index 24acbed..ea5ac85 100644
--- a/app/src/main/res/layout-w1000dp/pane_vehicle.xml
+++ b/app/src/main/res/layout-w1000dp/pane_vehicle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
-    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp">
+    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:paddingStart="24dp" android:paddingEnd="24dp" android:paddingTop="12dp" android:paddingBottom="12dp">
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:baselineAligned="false">
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_battery_card" android:layout_weight="1" android:layout_marginEnd="10dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_short" android:textAppearance="@style/Text.EV.Secondary" />
@@ -52,7 +52,11 @@
                 <TextView android:id="@+id/vehicle_power_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
                 <TextView android:id="@+id/vehicle_power_average_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
             </LinearLayout>
-            <Space android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1" android:layout_marginEnd="10dp" />
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="10dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_speed_average" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_speed_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_speed_average_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
         </LinearLayout>
         <Space android:layout_width="1dp" android:layout_height="16dp" />
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:baselineAligned="false">
@@ -71,7 +75,7 @@
             </LinearLayout>
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:padding="20dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_tires" android:textAppearance="@style/Text.EV.Eyebrow" />
-                <LinearLayout android:layout_width="match_parent" android:layout_height="224dp" android:orientation="horizontal" android:gravity="center_vertical">
+                <LinearLayout android:layout_width="match_parent" android:layout_height="196dp" android:orientation="horizontal" android:gravity="center_vertical">
                     <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:orientation="vertical" android:gravity="center">
                         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_fl" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
                         <TextView android:id="@+id/vehicle_tire_fl" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 376a9f8..1a8270b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -2,14 +2,11 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/app_root" android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" android:background="@color/ev_background">
   <com.evsuite.abrp.PremiumBackdropView android:layout_width="match_parent" android:layout_height="match_parent"/>
   <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical">
-    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" android:paddingStart="24dp" android:paddingEnd="24dp" android:paddingTop="16dp" android:paddingBottom="8dp">
-      <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical">
-        <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_overview_title" android:textAppearance="@style/Text.EV.Title" android:id="@+id/header_title" android:textSize="24sp"/>
-        <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_overview_subtitle" android:textAppearance="@style/Text.EV.Secondary" android:id="@+id/header_subtitle" android:layout_marginTop="6dp"/>
-      </LinearLayout>
-      <TextView android:id="@+id/version_badge" style="@style/Text.EV.VersionBadge" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="8dp"/>
-      <com.google.android.material.button.MaterialButton android:id="@+id/update_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="72dp" android:layout_height="72dp" android:minWidth="0dp" android:padding="0dp" android:contentDescription="@string/update_check" app:icon="@drawable/ic_refresh" app:iconGravity="textStart" app:iconPadding="0dp" app:iconTint="?attr/evAccent"/>
-      <com.google.android.material.button.MaterialButton android:id="@+id/about_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="72dp" android:layout_height="72dp" android:layout_marginStart="8dp" android:minWidth="0dp" android:padding="0dp" android:contentDescription="@string/about_action" app:icon="@drawable/ic_info" app:iconGravity="textStart" app:iconPadding="0dp"/>
+    <!-- One compact line: the Overview has to fit the car's 1778×720 px window (about 640 dp for
+         layouts). Version, update check and About are on the Settings tab. -->
+    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" android:baselineAligned="true" android:paddingStart="24dp" android:paddingEnd="24dp" android:paddingTop="10dp" android:paddingBottom="2dp">
+        <TextView android:id="@+id/header_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/design_overview_title" android:textAppearance="@style/Text.EV.Title" android:textSize="24sp" android:maxLines="1" />
+        <TextView android:id="@+id/header_subtitle" android:layout_width="0dp" android:layout_weight="1" android:layout_height="wrap_content" android:layout_marginStart="16dp" android:text="@string/design_overview_subtitle" android:textAppearance="@style/Text.EV.Secondary" android:maxLines="1" android:ellipsize="end" />
     </LinearLayout>
     <androidx.viewpager2.widget.ViewPager2 android:id="@+id/content" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1"/>
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:padding="8dp" android:background="@drawable/bg_sidebar">
diff --git a/app/src/main/res/layout/pane_settings.xml b/app/src/main/res/layout/pane_settings.xml
index ced79f4..e76fcec 100644
--- a/app/src/main/res/layout/pane_settings.xml
+++ b/app/src/main/res/layout/pane_settings.xml
@@ -50,5 +50,11 @@
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_saved_title" android:textAppearance="@style/Text.EV.Eyebrow" />
             <TextView android:id="@+id/wifi_saved_list" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:textAppearance="@style/Text.EV.Body" android:lineSpacingExtra="16dp" />
         </LinearLayout>
+        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
+            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_app_title" android:textAppearance="@style/Text.EV.Eyebrow" />
+            <TextView android:id="@+id/settings_version" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:textAppearance="@style/Text.EV.Body" />
+            <com.google.android.material.button.MaterialButton android:id="@+id/settings_update_button" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/btn_check_update" app:icon="@drawable/ic_refresh" />
+            <com.google.android.material.button.MaterialButton android:id="@+id/settings_about_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/btn_about" app:icon="@drawable/ic_info" />
+        </LinearLayout>
     </LinearLayout>
 </com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout/pane_vehicle.xml b/app/src/main/res/layout/pane_vehicle.xml
index 009564c..5993153 100644
--- a/app/src/main/res/layout/pane_vehicle.xml
+++ b/app/src/main/res/layout/pane_vehicle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
-    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp">
+    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:paddingStart="24dp" android:paddingEnd="24dp" android:paddingTop="12dp" android:paddingBottom="12dp">
         <GridLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:columnCount="2">
             <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_battery_card" android:layout_columnWeight="1" android:layout_margin="4dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_short" android:textAppearance="@style/Text.EV.Secondary" />
@@ -49,6 +49,11 @@
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_speed" android:textAppearance="@style/Text.EV.Secondary" />
                 <TextView android:id="@+id/vehicle_speed" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
             </LinearLayout>
+            <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_columnWeight="1" android:layout_margin="4dp" android:orientation="vertical" android:minHeight="112dp" android:padding="16dp" android:background="@drawable/bg_glass">
+                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_row_speed_average" android:textAppearance="@style/Text.EV.Secondary" />
+                <TextView android:id="@+id/vehicle_speed_average" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:layout_marginTop="6dp" android:textAppearance="@style/Text.EV.Metric.Compact" android:gravity="end" android:fontFeatureSettings="tnum" android:maxLines="1" android:autoSizeTextType="uniform" android:autoSizeMinTextSize="18sp" android:autoSizeMaxTextSize="28sp" android:autoSizeStepGranularity="1sp" />
+                <TextView android:id="@+id/vehicle_speed_average_note" android:gravity="end" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="" android:textAppearance="@style/Text.EV.Secondary" android:textColor="?attr/evAccentLight" android:textSize="16sp" android:maxLines="1" android:ellipsize="end" />
+            </LinearLayout>
         </GridLayout>
         <Space android:layout_width="1dp" android:layout_height="16dp" />
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:background="@drawable/bg_glass">
@@ -66,7 +71,7 @@
         </LinearLayout>
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="20dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_tires" android:textAppearance="@style/Text.EV.Eyebrow" />
-            <LinearLayout android:layout_width="match_parent" android:layout_height="224dp" android:orientation="horizontal" android:gravity="center_vertical">
+            <LinearLayout android:layout_width="match_parent" android:layout_height="196dp" android:orientation="horizontal" android:gravity="center_vertical">
                 <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:orientation="vertical" android:gravity="center">
                     <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/vehicle_tire_fl" android:textAppearance="@style/Text.EV.Secondary" android:gravity="center" />
                     <TextView android:id="@+id/vehicle_tire_fl" android:fontFeatureSettings="tnum" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Body" android:gravity="center" android:layout_marginTop="8dp" android:textColor="?attr/evAccentLight" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 567cc44..f54eb17 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,7 +59,7 @@
     <string name="usage_last_5_min">over the last 5 minutes</string>
     <string name="hint_usable_capacity">Usable battery capacity</string>
     <string name="btn_save_capacity">Save capacity</string>
-    <string name="helper_usable_capacity">Used for the range estimates on the Vehicle tab. The 51 kWh MG4 battery has 50.8 kWh usable, the 64 kWh one 61.7, the 77 kWh one 74.4.</string>
+    <string name="helper_usable_capacity">Used for the range estimates on the Overview. The 51 kWh MG4 battery has 50.8 kWh usable, the 64 kWh one 61.7, the 77 kWh one 74.4.</string>
     <string name="usable_capacity_saved">Usable capacity saved</string>
     <string name="usable_capacity_invalid">Enter a value between 10 and 150 kWh</string>
     <string name="vehicle_row_speed">Speed</string>
@@ -204,6 +204,11 @@
     <string name="update_check">Check for updates</string>
     <string name="update_checking">Checking for a new OTA version…</string>
     <string name="update_dialog_title">Software update</string>
+    <string name="btn_check_update">Check for updates</string>
+    <string name="btn_about">About Nils\' MG4</string>
+    <string name="settings_version">Version %1$s</string>
+    <string name="vehicle_row_speed_average">Speed, 5-min average</string>
+    <string name="speed_kmh">%1$.0f km/h</string>
     <string name="update_downloading">Downloading and verifying…</string>
     <string name="update_downloading_percent">Downloading… %1$d%%</string>
     <string name="about_action">About</string>
diff --git a/app/src/main/res/values/strings_design.xml b/app/src/main/res/values/strings_design.xml
index d21a79c..99507ca 100644
--- a/app/src/main/res/values/strings_design.xml
+++ b/app/src/main/res/values/strings_design.xml
@@ -12,7 +12,7 @@
   <string name="design_service_title">Live data.</string>
   <string name="design_service_subtitle">Where your car\'s live data goes, and how often.</string>
   <string name="design_settings_title">Settings.</string>
-  <string name="design_settings_subtitle">Display, battery, charging price and Wi-Fi.</string>
+  <string name="design_settings_subtitle">Display, battery, charging price, Wi-Fi and updates.</string>
   <string name="design_log_title">Every upload, right here.</string>
   <string name="design_log_subtitle">Status and details of recent uploads.</string>
   <string name="design_battery">BATTERY</string>
@@ -26,6 +26,7 @@
   <string name="design_abrp_title">ABRP, DIRECTLY FROM THE CAR</string>
   <string name="design_display_title">DISPLAY AND STEERING WHEEL</string>
   <string name="design_battery_settings_title">BATTERY</string>
+  <string name="design_app_title">APP</string>
   <string name="design_price_title">CHARGING PRICE</string>
   <string name="design_service_timing">UPDATE FREQUENCY</string>
   <string name="design_car_desc">Tire pressure positions on the vehicle</string>
diff --git a/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java b/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java
index b5f4a62..47834ea 100644
--- a/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java
+++ b/app/src/test/java/com/evsuite/abrp/RangeEstimatorTest.java
@@ -140,4 +140,16 @@ public class RangeEstimatorTest {
         for (long t = 315_000; t <= 450_000; t += 15_000) r.add(t, 2f, 0f);
         assertEquals(11.0, r.averagePowerKw(450_000), 1.0);
     }
+
+    @Test
+    public void averageSpeedOverTheLastFiveMinutes() {
+        RangeEstimator r = new RangeEstimator();
+        r.add(0, 10f, 60f);
+        assertNull(r.averageSpeedKmh(0));
+        for (long t = 15_000; t <= 300_000; t += 15_000) r.add(t, 10f, 60f);
+        assertEquals(60.0, r.averageSpeedKmh(300_000), 1e-6);
+        // Half the window standing at lights halves the average.
+        for (long t = 315_000; t <= 450_000; t += 15_000) r.add(t, 1f, 0f);
+        assertEquals(30.0, r.averageSpeedKmh(450_000), 4.0);
+    }
 }

From 851a4a34d4b70e36980ebfb6507a6301f22fdc85 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 20:32:01 +0200
Subject: [PATCH 72/79] App 2.17.1: tidier Settings and Logs

- Settings: the Wi-Fi and saved-networks cards are gone, and the rest
  sits in three columns (display and steering wheel | battery |
  charging price and app) instead of one tall column. The background
  Wi-Fi auto-connect stays on, without a switch.
- Logs: only the upload log. The steering-key reports, the car-colour
  probe and the screen line answered their questions and are removed,
  with their code (CarColorProbe, the key-report log) and strings.
- README lists the current tabs.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 FIRMWARE.md                                   |  2 +-
 README.md                                     |  6 +-
 SPECS.md                                      |  4 +
 app/build.gradle                              |  4 +-
 .../java/com/evsuite/abrp/CarColorProbe.java  | 59 -------------
 .../java/com/evsuite/abrp/MainActivity.java   | 85 ++-----------------
 .../com/evsuite/abrp/SteeringKeyListener.java | 43 +---------
 .../com/evsuite/abrp/WifiAutoConnect.java     | 28 ------
 .../main/res/layout-w1000dp/pane_settings.xml | 23 ++---
 app/src/main/res/layout/pane_log.xml          |  9 --
 app/src/main/res/layout/pane_settings.xml     | 12 ---
 app/src/main/res/values/strings.xml           | 21 -----
 app/src/main/res/values/strings_design.xml    |  2 +-
 .../com/evsuite/abrp/CarColorProbeTest.java   | 24 ------
 14 files changed, 24 insertions(+), 298 deletions(-)
 delete mode 100644 app/src/main/java/com/evsuite/abrp/CarColorProbe.java
 delete mode 100644 app/src/test/java/com/evsuite/abrp/CarColorProbeTest.java

diff --git a/FIRMWARE.md b/FIRMWARE.md
index c74c5a0..ae2cea7 100644
--- a/FIRMWARE.md
+++ b/FIRMWARE.md
@@ -11,7 +11,7 @@ development. It must not be treated as a vendor specification.
 | Android | 9 (Pie) — **API 28** |
 | Chipset | MediaTek **MT2712** |
 | Device | `mt2712_saic_eh32` (eh32 = MG4) |
-| Display | **1920×720 px @ 160 dpi**; the app window is **1778×720 px** (≈1778×640 dp for layouts), the car's own sidebar taking the rest. Confirmed on the car 2026-10-18 (Logs → SCREEN, `SWI68`). |
+| Display | **1920×720 px @ 160 dpi**; the app window is **1778×720 px** (≈1778×640 dp for layouts), the car's own sidebar taking the rest. Confirmed on the car 2026-10-18 (read with app 2.16.2, `SWI68`). |
 | Emulator display profile | **1920×720 @ 160 dpi** |
 | `ro.build.mtk2712.vehicle_type` | `AS28` (a vehicle type code; the paint colour is not among the system properties) |
 
diff --git a/README.md b/README.md
index e222ac5..2c122bd 100644
--- a/README.md
+++ b/README.md
@@ -63,13 +63,13 @@ with the server using a token of its own, obtained by pairing with a phone (belo
 
 | Tab | What it shows |
 |---|---|
-| **Overview** | Battery, range, range since start and at the 5-minute average with their usage, power, speed; odometer, climate setpoint and tyre pressures |
+| **Overview** | Battery, range, range since start and at the 5-minute average with their usage, energy since start, power and speed with their 5-minute averages; odometer, climate setpoint and tyre pressures |
 | **Consumption** | Daily and period consumption, efficiency |
 | **Charging** | Charging sessions and curves, cost in euro |
 | **Live data** | Live data on/off, ABRP credentials for sending directly from the car, upload frequency |
 | **Server** | Server URL, pairing by QR code, ingest token, installation ID, config import |
-| **Settings** | Full screen, voice key, battery (usable capacity, manual SoH), charging price, Wi-Fi |
-| **Logs** | Upload log and the last steering-wheel key reports |
+| **Settings** | Full screen, voice key, tyre pressure unit, accent colour, battery (usable capacity, manual SoH), charging price, version, update check, About |
+| **Logs** | Upload log |
 
 - **Opening the app:** the MG4 launcher does not list third-party apps. **Double-press the
   voice key** on the steering wheel and the app comes to the front (switch on the Settings
diff --git a/SPECS.md b/SPECS.md
index 0c16d2e..7da3875 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -112,6 +112,10 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.17.1: Settings without the Wi-Fi and saved-networks cards, in three columns
+  (display and steering wheel | battery | charging price and app). The background Wi-Fi
+  auto-connect stays on, now without a switch. Logs keeps only the upload log: the steering-key
+  reports, the car-colour probe and the screen line are gone, their questions answered.
 - 2026-10-18 — App 2.17.0: "Speed, 5-min average" card under Speed. The top bar is one compact line
   (title and subtitle); version, update check and About moved to an App card on the Settings tab.
   The Overview fits the car's window without scrolling: checked on the emulator at 1778×640, the
diff --git a/app/build.gradle b/app/build.gradle
index 2ffdddb..b6db3a4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 89
-        versionName "2.17.0"
+        versionCode 90
+        versionName "2.17.1"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/CarColorProbe.java b/app/src/main/java/com/evsuite/abrp/CarColorProbe.java
deleted file mode 100644
index 3800e07..0000000
--- a/app/src/main/java/com/evsuite/abrp/CarColorProbe.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.evsuite.abrp;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Looks for the car's paint colour among the head unit's system properties, for the Logs tab.
- *
- * The MG launcher draws the car in its own colour, so the head unit knows it somewhere; where is
- * not documented. This lists every property whose name or value mentions a colour or paint, so
- * a photo of the Logs tab shows whether (and how) it can be read. Read-only: it runs the
- * platform's own getprop, which only reads.
- */
-final class CarColorProbe {
-
-    private static final Pattern LINE = Pattern.compile("^\\[([^\\]]*)\\]: \\[(.*)\\]$");
-    private static final Pattern INTERESTING = Pattern.compile(
-            "(?i)colou?r|paint|body_?col|exterior|car_?model|vehicle_?(config|type|model)");
-
-    private CarColorProbe() { }
-
-    /** getprop's output, filtered; at most {@code max} lines. Never throws. */
-    static List<String> run(int max) {
-        try {
-            Process p = new ProcessBuilder("getprop").redirectErrorStream(true).start();
-            StringBuilder out = new StringBuilder();
-            try (BufferedReader r = new BufferedReader(new InputStreamReader(p.getInputStream(), StandardCharsets.UTF_8))) {
-                String line;
-                while ((line = r.readLine()) != null && out.length() < 512 * 1024) out.append(line).append('\n');
-            }
-            p.waitFor();
-            return filter(out.toString(), max);
-        } catch (Exception e) {
-            List<String> failed = new ArrayList<>();
-            failed.add("getprop failed: " + e.getClass().getSimpleName());
-            return failed;
-        }
-    }
-
-    /** The "name = value" lines whose name or value looks colour- or model-related. Pure. */
-    static List<String> filter(String getpropOutput, int max) {
-        List<String> found = new ArrayList<>();
-        for (String line : getpropOutput.split("\n")) {
-            Matcher m = LINE.matcher(line.trim());
-            if (!m.matches()) continue;
-            String name = m.group(1), value = m.group(2);
-            if (INTERESTING.matcher(name).find() || INTERESTING.matcher(value).find()) {
-                found.add(name + " = " + value);
-                if (found.size() >= max) break;
-            }
-        }
-        return found;
-    }
-}
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 0d5b314..a532bb6 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -35,7 +35,11 @@ import com.evsuite.hardware.telemetry.EnergyTelemetryReader;
 
 public class MainActivity extends AppCompatActivity {
 
-    /** Shared with {@link AbrpUploadService}, which reads it on every tick. */
+    /**
+     * Rejoin a saved network (the phone hotspot) in the background; read by
+     * {@link AbrpUploadService} on every tick. On by default; the Wi-Fi card with its switch was
+     * removed from Settings (2.17.1), so it now stays on.
+     */
     static final String WIFI_AUTO_KEY = "wifi_auto_connect";
     private static final String REPOSITORY_URL = "https://git.stinnesbeck.com/nils/mg4";
 
@@ -76,9 +80,6 @@ public class MainActivity extends AppCompatActivity {
     /** The pages in navigation order. Parallel to {@link #TAB_IDS}. */
     private View[] panes;
 
-    /** Wi-Fi page. The helper is the same one the upload service uses on its own tick. */
-    private WifiAutoConnect wifi;
-    private TextView wifiSsid, wifiState, wifiSavedList;
 
     /**
      * Value cells of the Vehicle page, looked up once and refreshed on the UI tick.
@@ -126,7 +127,6 @@ public class MainActivity extends AppCompatActivity {
 
     /** Upload page: live telemetry switch and cadence. */
     private SwitchMaterial liveTelemetrySwitch, boostSwitch, voiceKeySwitch, fullScreenSwitch;
-    private TextView steeringKeysText;
     private com.google.android.material.textfield.MaterialAutoCompleteTextView intervalChoices;
     private TextInputLayout lowSocLayout;
     private TextInputEditText lowSocInput;
@@ -215,10 +215,8 @@ public class MainActivity extends AppCompatActivity {
         @Override public void run() {
             refreshStatus();
             refreshCallLog();
-            refreshSteeringKeys();
             sampleTrackers();
             refreshConsumption();
-            refreshWifi();
             uiHandler.postDelayed(this, 2_000L);
         }
     };
@@ -254,22 +252,12 @@ public class MainActivity extends AppCompatActivity {
         bindVehiclePane();
         bindConsumptionPane();
         bindChargingPane();
-        bindWifiPane();
         bindServerPane();
         bindServicePane();
         requestLocationPermissionIfNeeded();
 
         statusText          = servicePane.findViewById(R.id.status_text);
         callLogText = logPane.findViewById(R.id.call_log_text);
-        steeringKeysText = logPane.findViewById(R.id.steering_keys_text);
-        TextView carColorText = logPane.findViewById(R.id.car_color_text);
-        showScreenInfo(logPane.findViewById(R.id.screen_text));
-        logPane.findViewById(R.id.car_color_button).setOnClickListener(v -> new Thread(() -> {
-            java.util.List<String> found = CarColorProbe.run(60);
-            String shown = found.isEmpty() ? getString(R.string.car_color_none)
-                    : android.text.TextUtils.join("\n", found);
-            runOnUiThread(() -> carColorText.setText(shown));
-        }, "car-color-probe").start());
         logPane.findViewById(R.id.flush_now_button).setOnClickListener(v -> manualFlush());
 
         setUpPager();
@@ -292,21 +280,6 @@ public class MainActivity extends AppCompatActivity {
         startForegroundService(new Intent(this, AbrpUploadService.class));
     }
 
-    /**
-     * What the head unit reports about its screen, for the Logs tab: the panel in pixels and its
-     * density, and this app's window in pixels and in dp, which is what layouts are chosen by.
-     * Sources disagree on the MG4's numbers (1920×720, 1280×480, a 1778×720 window).
-     */
-    @SuppressWarnings("deprecation") // getRealMetrics: the WindowMetrics API starts at 30; this is 28
-    private void showScreenInfo(TextView view) {
-        android.util.DisplayMetrics panel = new android.util.DisplayMetrics();
-        getWindowManager().getDefaultDisplay().getRealMetrics(panel);
-        android.util.DisplayMetrics window = getResources().getDisplayMetrics();
-        android.content.res.Configuration config = getResources().getConfiguration();
-        view.setText(getString(R.string.screen_info, panel.widthPixels, panel.heightPixels, panel.densityDpi,
-                window.widthPixels, window.heightPixels, config.screenWidthDp, config.screenHeightDp));
-    }
-
     /**
      * Shows a dialog without bringing the car's bars back. A dialog is a window of its own, and
      * the system shows the bars when a window without the full-screen flags takes focus. So it
@@ -1224,45 +1197,6 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
-    // ---------- Wi-Fi page ----------
-
-    private void bindWifiPane() {
-        wifi = new WifiAutoConnect(getApplicationContext());
-        wifiSsid      = settingsPane.findViewById(R.id.wifi_ssid);
-        wifiState     = settingsPane.findViewById(R.id.wifi_state);
-        wifiSavedList = settingsPane.findViewById(R.id.wifi_saved_list);
-
-        SwitchMaterial auto = settingsPane.findViewById(R.id.wifi_auto_switch);
-        auto.setChecked(prefs.getBoolean(WIFI_AUTO_KEY, true));
-        auto.setOnCheckedChangeListener((btn, checked) ->
-                prefs.edit().putBoolean(WIFI_AUTO_KEY, checked).apply());
-
-        settingsPane.findViewById(R.id.wifi_connect_button).setOnClickListener(v -> {
-            // force: the driver is asking now, so the rate limit does not apply.
-            WifiAutoConnect.Result r = wifi.ensureConnected(true);
-            wifiState.setText(r.message);
-            refreshWifi();
-        });
-    }
-
-    private void refreshWifi() {
-        if (wifi == null) return;
-        String ssid = wifi.currentSsid();
-        wifiSsid.setText(ssid == null ? getString(R.string.wifi_not_connected) : ssid);
-        if (ssid != null) {
-            wifiState.setText(R.string.wifi_connected);
-        } else if (!wifi.isWifiEnabled()) {
-            wifiState.setText(R.string.wifi_off);
-        }
-        // Left alone otherwise: a message the button just set says more about what is
-        // happening than "not connected" would.
-
-        java.util.List<String> saved = wifi.savedNetworkNames();
-        wifiSavedList.setText(saved.isEmpty()
-                ? getString(R.string.wifi_saved_empty)
-                : android.text.TextUtils.join("\n", saved));
-    }
-
     // ---------- Vehicle page ----------
 
     /** Looks up the value cells once; the labels are static and never touched from code. */
@@ -1752,15 +1686,6 @@ public class MainActivity extends AppCompatActivity {
         }, "cloud-refresh").start();
     }
 
-    /** What the car's steering-wheel key broadcasts looked like, newest first. */
-    private void refreshSteeringKeys() {
-        if (steeringKeysText == null) return;
-        java.util.List<String> keys = SteeringKeyListener.recent();
-        String text = keys.isEmpty() ? getString(R.string.steering_keys_empty)
-                : android.text.TextUtils.join("\n", keys);
-        if (!text.contentEquals(steeringKeysText.getText())) steeringKeysText.setText(text);
-    }
-
     private void refreshCallLog() {
         java.util.List<UploadLog.Entry> entries = AbrpUploadService.log().recent();
         if (entries.isEmpty()) {
diff --git a/app/src/main/java/com/evsuite/abrp/SteeringKeyListener.java b/app/src/main/java/com/evsuite/abrp/SteeringKeyListener.java
index ec377f6..080955b 100644
--- a/app/src/main/java/com/evsuite/abrp/SteeringKeyListener.java
+++ b/app/src/main/java/com/evsuite/abrp/SteeringKeyListener.java
@@ -9,20 +9,12 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-
 /**
  * Opens the app on a double press of the steering wheel's voice key.
  *
  * The head unit reports steering-wheel keys as the broadcast {@link #ACTION}; code 287 is the
  * voice key (see EVHardware's PhysicalButtonEventDecoder). The extras' format was read off the
- * car (see {@link SteeringKeyReport}); every report is still kept raw for the Logs tab, in case
- * another firmware sends them differently.
+ * car (see {@link SteeringKeyReport}).
  *
  * Registered by the always-on service on the main thread; never throws into the head unit.
  */
@@ -31,9 +23,6 @@ final class SteeringKeyListener {
     static final String ACTION = "com.saic.keyevent.hardkey.report";
     static final int VOICE_KEY = 287;
     private static final String TAG = "NilsMG4.SteeringKey";
-    private static final int MAX_LOG = 20;
-
-    private static final ArrayDeque<String> RECENT = new ArrayDeque<>();
 
     private final Context context;
     private final SharedPreferences prefs;
@@ -79,18 +68,6 @@ final class SteeringKeyListener {
         registered = false;
     }
 
-    /** The last broadcasts, newest first, for the Logs tab. */
-    static synchronized List<String> recent() {
-        List<String> out = new ArrayList<>(RECENT);
-        java.util.Collections.reverse(out);
-        return out;
-    }
-
-    private static synchronized void remember(String line) {
-        if (RECENT.size() >= MAX_LOG) RECENT.removeFirst();
-        RECENT.addLast(line);
-    }
-
     private void handle(Intent intent) {
         Bundle extras = intent.getExtras();
         SteeringKeyReport key = read(extras);
@@ -98,11 +75,6 @@ final class SteeringKeyListener {
         if (key.code != null && UploadSettings.voiceKeyOpensApp(prefs)) {
             opens = detector.accept(key.code, key.down, key.longPress, android.os.SystemClock.elapsedRealtime());
         }
-        remember(new SimpleDateFormat("HH:mm:ss.SSS", Locale.US).format(new Date())
-                + "  " + describe(extras)
-                + "\n    -> code " + (key.code == null ? "?" : key.code)
-                + ", down " + (key.down == null ? "?" : key.down)
-                + ", long " + key.longPress + (opens ? "  OPENS APP" : ""));
         if (opens) {
             try {
                 context.startActivity(new Intent(context, MainActivity.class)
@@ -129,17 +101,4 @@ final class SteeringKeyListener {
         }
         return SteeringKeyReport.parse(values);
     }
-
-    /** All extras as name=value(type), so the Logs tab shows the real format. */
-    static String describe(Bundle extras) {
-        if (extras == null || extras.isEmpty()) return "(no extras)";
-        StringBuilder sb = new StringBuilder();
-        for (String k : extras.keySet()) {
-            Object v = extras.get(k);
-            if (sb.length() > 0) sb.append(", ");
-            sb.append(k).append('=').append(v).append(" (")
-              .append(v == null ? "null" : v.getClass().getSimpleName()).append(')');
-        }
-        return sb.toString();
-    }
 }
diff --git a/app/src/main/java/com/evsuite/abrp/WifiAutoConnect.java b/app/src/main/java/com/evsuite/abrp/WifiAutoConnect.java
index ea2bfcc..2661d36 100644
--- a/app/src/main/java/com/evsuite/abrp/WifiAutoConnect.java
+++ b/app/src/main/java/com/evsuite/abrp/WifiAutoConnect.java
@@ -58,34 +58,6 @@ final class WifiAutoConnect {
         }
     }
 
-    boolean isWifiEnabled() {
-        try {
-            return wifi != null && wifi.isWifiEnabled();
-        } catch (Throwable t) {
-            return false;
-        }
-    }
-
-    /** Saved network names, for the UI to show what it can reach. Empty if the OS refuses. */
-    List<String> savedNetworkNames() {
-        java.util.List<String> names = new java.util.ArrayList<>();
-        try {
-            if (wifi == null) return names;
-            List<WifiConfiguration> saved = wifi.getConfiguredNetworks();
-            if (saved == null) return names;
-            for (WifiConfiguration c : saved) {
-                if (c == null || c.SSID == null) continue;
-                String name = c.SSID.replace("\"", "").trim();
-                if (!name.isEmpty() && !names.contains(name)) names.add(name);
-            }
-        } catch (SecurityException e) {
-            Log.w(TAG, "Saved networks unavailable: permission denied");
-        } catch (Throwable t) {
-            Log.w(TAG, "getConfiguredNetworks refused: " + t.getMessage());
-        }
-        return names;
-    }
-
     /**
      * One attempt to get onto a saved network, rate-limited.
      *
diff --git a/app/src/main/res/layout-w1000dp/pane_settings.xml b/app/src/main/res/layout-w1000dp/pane_settings.xml
index a07fd8e..2c54b3c 100644
--- a/app/src/main/res/layout-w1000dp/pane_settings.xml
+++ b/app/src/main/res/layout-w1000dp/pane_settings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
+    <!-- Three columns: display and steering wheel | battery | charging price and the app. -->
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:padding="24dp" android:baselineAligned="false">
         <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:layout_marginEnd="16dp">
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
@@ -17,7 +18,9 @@
                     <com.google.android.material.textfield.MaterialAutoCompleteTextView android:id="@+id/accent_choices" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="none" android:textSize="20sp" app:simpleItemLayout="@layout/dropdown_item" />
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
-            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
+        </LinearLayout>
+        <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" android:layout_marginEnd="16dp">
+            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_battery_settings_title" android:textAppearance="@style/Text.EV.Eyebrow" />
                 <com.google.android.material.textfield.TextInputLayout android:id="@+id/consumption_soh_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="@string/settings_manual_soh" app:suffixText="@string/unit_percent">
                     <com.google.android.material.textfield.TextInputEditText android:id="@+id/consumption_soh_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="5" android:minHeight="72dp"/>
@@ -30,7 +33,9 @@
                 <com.google.android.material.button.MaterialButton android:id="@+id/usable_capacity_save" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="72dp" android:layout_marginTop="8dp" android:text="@string/btn_save_capacity"/>
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/helper_usable_capacity" android:textAppearance="@style/Text.EV.Secondary"/>
             </LinearLayout>
-            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
+        </LinearLayout>
+        <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical">
+            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_price_title" android:textAppearance="@style/Text.EV.Eyebrow" />
                 <com.google.android.material.textfield.TextInputLayout android:id="@+id/charge_price_layout" style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:hint="@string/settings_unit_price" app:suffixText="@string/unit_eur_per_kwh">
                     <com.google.android.material.textfield.TextInputEditText android:id="@+id/charge_price_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="numberDecimal" android:maxLength="10" android:minHeight="72dp"/>
@@ -39,20 +44,6 @@
                 <com.google.android.material.button.MaterialButton android:id="@+id/settings_phone_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_phone_settings" android:layout_marginTop="8dp" />
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/hint_phone_settings" android:textAppearance="@style/Text.EV.Secondary" />
             </LinearLayout>
-        </LinearLayout>
-        <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical">
-            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_card_title" android:textAppearance="@style/Text.EV.Eyebrow" />
-                <TextView android:id="@+id/wifi_ssid" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Metric" android:layout_marginTop="20dp" />
-                <TextView android:id="@+id/wifi_state" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="12dp" />
-                <com.google.android.material.button.MaterialButton android:id="@+id/wifi_connect_button" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_connect_now" android:layout_marginTop="24dp" />
-                <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/wifi_auto_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/wifi_auto_label" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_auto_hint" android:textAppearance="@style/Text.EV.Secondary" />
-            </LinearLayout>
-            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
-                <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_saved_title" android:textAppearance="@style/Text.EV.Eyebrow" />
-                <TextView android:id="@+id/wifi_saved_list" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:textAppearance="@style/Text.EV.Body" android:lineSpacingExtra="16dp" />
-            </LinearLayout>
             <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_app_title" android:textAppearance="@style/Text.EV.Eyebrow" />
                 <TextView android:id="@+id/settings_version" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:textAppearance="@style/Text.EV.Body" />
diff --git a/app/src/main/res/layout/pane_log.xml b/app/src/main/res/layout/pane_log.xml
index 95f2da8..7bfc7fc 100644
--- a/app/src/main/res/layout/pane_log.xml
+++ b/app/src/main/res/layout/pane_log.xml
@@ -4,14 +4,5 @@
         <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/label_call_log" android:textAppearance="@style/Text.EV.Eyebrow" />
         <com.google.android.material.button.MaterialButton android:id="@+id/flush_now_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/btn_flush_now" app:icon="@drawable/ic_refresh" app:iconGravity="textStart" style="@style/Widget.EV.Button.Outlined" xmlns:app="http://schemas.android.com/apk/res-auto" />
         <TextView android:id="@+id/call_log_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:minHeight="180dp" android:text="@string/call_log_empty" android:textAppearance="@style/Text.EV.Body" android:fontFamily="monospace" android:textSize="17sp" android:lineSpacingExtra="12dp" android:textIsSelectable="true" />
-        <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/label_steering_keys" android:textAppearance="@style/Text.EV.Eyebrow" />
-        <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/hint_steering_keys" android:textAppearance="@style/Text.EV.Secondary" />
-        <TextView android:id="@+id/steering_keys_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:text="@string/steering_keys_empty" android:textAppearance="@style/Text.EV.Body" android:fontFamily="monospace" android:textSize="14sp" android:lineSpacingExtra="4dp" />
-        <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/label_car_color" android:textAppearance="@style/Text.EV.Eyebrow" />
-        <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/hint_car_color" android:textAppearance="@style/Text.EV.Secondary" />
-        <com.google.android.material.button.MaterialButton android:id="@+id/car_color_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:text="@string/btn_car_color" />
-        <TextView android:id="@+id/car_color_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:textAppearance="@style/Text.EV.Body" android:fontFamily="monospace" android:textSize="14sp" android:lineSpacingExtra="4dp" android:textIsSelectable="true" />
-        <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="32dp" android:text="@string/label_screen" android:textAppearance="@style/Text.EV.Eyebrow" />
-        <TextView android:id="@+id/screen_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Body" android:fontFamily="monospace" android:textSize="14sp" android:textIsSelectable="true" />
     </LinearLayout>
 </com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/layout/pane_settings.xml b/app/src/main/res/layout/pane_settings.xml
index e76fcec..eea34d5 100644
--- a/app/src/main/res/layout/pane_settings.xml
+++ b/app/src/main/res/layout/pane_settings.xml
@@ -38,18 +38,6 @@
             <com.google.android.material.button.MaterialButton android:id="@+id/settings_phone_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_phone_settings" android:layout_marginTop="8dp" />
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/hint_phone_settings" android:textAppearance="@style/Text.EV.Secondary" />
         </LinearLayout>
-        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_card_title" android:textAppearance="@style/Text.EV.Eyebrow" />
-            <TextView android:id="@+id/wifi_ssid" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Metric" android:layout_marginTop="20dp" />
-            <TextView android:id="@+id/wifi_state" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/no_value" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="12dp" />
-            <com.google.android.material.button.MaterialButton android:id="@+id/wifi_connect_button" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_connect_now" android:layout_marginTop="24dp" />
-            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@+id/wifi_auto_switch" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:text="@string/wifi_auto_label" android:textAppearance="@style/Text.EV.Body" android:paddingTop="8dp" android:paddingBottom="8dp" app:useMaterialThemeColors="true" app:thumbTint="@color/switch_thumb" app:trackTint="@color/switch_track" android:textColor="@color/ev_text_primary" />
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_auto_hint" android:textAppearance="@style/Text.EV.Secondary" />
-        </LinearLayout>
-        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/wifi_saved_title" android:textAppearance="@style/Text.EV.Eyebrow" />
-            <TextView android:id="@+id/wifi_saved_list" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" android:textAppearance="@style/Text.EV.Body" android:lineSpacingExtra="16dp" />
-        </LinearLayout>
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass" android:layout_marginTop="16dp">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_app_title" android:textAppearance="@style/Text.EV.Eyebrow" />
             <TextView android:id="@+id/settings_version" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:textAppearance="@style/Text.EV.Body" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f54eb17..6380df6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,16 +14,6 @@
     <string name="tab_settings">Settings</string>
     <string name="tab_log">Logs</string>
 
-    <!-- Wi-Fi page -->
-    <string name="wifi_card_title">WI-FI</string>
-    <string name="wifi_current">Connected network</string>
-    <string name="wifi_state">Status</string>
-    <string name="wifi_connect_now">Connect Now</string>
-    <string name="wifi_auto_label">Auto-connect in the background</string>
-    <string name="wifi_auto_hint">While the upload service is running, it tries to reconnect to saved networks on its own when the connection drops.</string>
-    <string name="wifi_saved_title">SAVED NETWORKS</string>
-    <string name="wifi_saved_empty">Could not read saved networks</string>
-    <string name="wifi_not_connected">Not connected</string>
 
     <!-- Vehicle page -->
     <string name="vehicle_live_data">Live Vehicle Data</string>
@@ -40,12 +30,6 @@
     <string name="power_waiting">needs a minute of data</string>
     <string name="label_tire_unit">Tyre pressure unit</string>
     <string name="label_accent">Accent colour</string>
-    <string name="label_screen">SCREEN</string>
-    <string name="screen_info">Panel %1$d × %2$d px at %3$d dpi\nApp window %4$d × %5$d px = %6$d × %7$d dp</string>
-    <string name="label_car_color">CAR COLOUR</string>
-    <string name="hint_car_color">Lists the head unit\'s settings that mention a colour, paint or car model, to find out whether the car\'s colour can be read. A photo of this list helps.</string>
-    <string name="btn_car_color">Look for the car colour</string>
-    <string name="car_color_none">Nothing colour-related found</string>
     <string name="energy_kwh">%1$.1f kWh</string>
     <string name="energy_trip_note">net, after recuperation</string>
     <string name="energy_trip_waiting">once the car is on</string>
@@ -134,9 +118,6 @@
     <string name="hint_full_screen">Hides the car\'s top and bottom bars while this app is open. Swipe in from the top or bottom edge to show them briefly, e.g. for the climate controls.</string>
     <string name="label_voice_key">Double-press the voice key to open this app</string>
     <string name="hint_voice_key">Press the voice key on the steering wheel twice quickly. The voice assistant may still react to the presses.</string>
-    <string name="label_steering_keys">Steering-wheel keys</string>
-    <string name="hint_steering_keys">The last key reports the car sent, newest first. If double-pressing the voice key does not open the app, a photo of this list shows how the car reports it.</string>
-    <string name="steering_keys_empty">No key reports received yet. Press a steering-wheel key.</string>
     <string name="label_abrp_upload_enabled">Send live data</string>
     <string name="hint_abrp_upload_enabled">To your server, which stores it, and straight to ABRP when the ABRP credentials below are set. Consumption and charging tracking keep running when this is off.</string>
     <string name="hint_abrp_direct">The car sends live data to ABRP itself with your ABRP API key and user token. Without them, ABRP gets no live data; your server only stores it.</string>
@@ -260,8 +241,6 @@
     <string name="settings_unit_price">Unit price</string>
     <string name="unit_eur_per_kwh">€/kWh</string>
     <string name="settings_save_price">Save price</string>
-    <string name="wifi_connected">Connected ♥</string>
-    <string name="wifi_off">Wi-Fi off</string>
     <string name="trip_reset_title">Reset %1$s?</string>
     <string name="trip_reset_message">This counter\'s recorded consumption history will be permanently deleted.</string>
     <string name="trip_reset_confirm">Reset</string>
diff --git a/app/src/main/res/values/strings_design.xml b/app/src/main/res/values/strings_design.xml
index 99507ca..22d31ec 100644
--- a/app/src/main/res/values/strings_design.xml
+++ b/app/src/main/res/values/strings_design.xml
@@ -12,7 +12,7 @@
   <string name="design_service_title">Live data.</string>
   <string name="design_service_subtitle">Where your car\'s live data goes, and how often.</string>
   <string name="design_settings_title">Settings.</string>
-  <string name="design_settings_subtitle">Display, battery, charging price, Wi-Fi and updates.</string>
+  <string name="design_settings_subtitle">Display, battery, charging price and updates.</string>
   <string name="design_log_title">Every upload, right here.</string>
   <string name="design_log_subtitle">Status and details of recent uploads.</string>
   <string name="design_battery">BATTERY</string>
diff --git a/app/src/test/java/com/evsuite/abrp/CarColorProbeTest.java b/app/src/test/java/com/evsuite/abrp/CarColorProbeTest.java
deleted file mode 100644
index 7ac9479..0000000
--- a/app/src/test/java/com/evsuite/abrp/CarColorProbeTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.evsuite.abrp;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-
-import org.junit.Test;
-
-/** Picking colour-related system properties out of getprop's output — pure JVM. */
-public class CarColorProbeTest {
-
-    @Test
-    public void onlyColourOrModelRelatedPropertiesAreListed() {
-        String getprop = "[ro.build.version.sdk]: [28]\n"
-                + "[persist.saic.vehicle.color]: [3]\n"
-                + "[ro.product.model]: [EH32]\n"
-                + "[persist.car.bodyCol]: [RED]\n"
-                + "[sys.launcher.car_model]: [mg4_red.glb]\n"
-                + "garbage line\n";
-        assertEquals(Arrays.asList("persist.saic.vehicle.color = 3", "persist.car.bodyCol = RED",
-                "sys.launcher.car_model = mg4_red.glb"), CarColorProbe.filter(getprop, 50));
-        assertEquals(1, CarColorProbe.filter(getprop, 1).size());
-    }
-}

From d4bb502026a1b5657aeb635f6ef904be19f7e5cd Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 20:34:05 +0200
Subject: [PATCH 73/79] App 2.17.2: Wi-Fi auto-connect removed

Upstream kept the head unit on the driver's phone hotspot by re-joining
a saved network every few minutes. This car's head unit has its own
connection and the Wi-Fi is not used, so the feature goes entirely:
WifiAutoConnect, its call on the service tick, the preference key, and
the ACCESS_WIFI_STATE / CHANGE_WIFI_STATE permissions.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                      |   6 +-
 app/build.gradle                              |   4 +-
 app/src/main/AndroidManifest.xml              |   6 -
 .../com/evsuite/abrp/AbrpUploadService.java   |   8 --
 .../java/com/evsuite/abrp/MainActivity.java   |   6 -
 .../com/evsuite/abrp/WifiAutoConnect.java     | 135 ------------------
 mise.toml                                     |   2 +-
 7 files changed, 7 insertions(+), 160 deletions(-)
 delete mode 100644 app/src/main/java/com/evsuite/abrp/WifiAutoConnect.java

diff --git a/SPECS.md b/SPECS.md
index 7da3875..ac42c20 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -112,9 +112,11 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.17.2: Wi-Fi auto-connect removed with its two permissions (ACCESS_ and
+  CHANGE_WIFI_STATE). Upstream used it to keep the head unit on a phone hotspot; this car's head
+  unit has its own connection.
 - 2026-10-18 — App 2.17.1: Settings without the Wi-Fi and saved-networks cards, in three columns
-  (display and steering wheel | battery | charging price and app). The background Wi-Fi
-  auto-connect stays on, now without a switch. Logs keeps only the upload log: the steering-key
+  (display and steering wheel | battery | charging price and app). Logs keeps only the upload log: the steering-key
   reports, the car-colour probe and the screen line are gone, their questions answered.
 - 2026-10-18 — App 2.17.0: "Speed, 5-min average" card under Speed. The top bar is one compact line
   (title and subtitle); version, update check and About moved to an App card on the Settings tab.
diff --git a/app/build.gradle b/app/build.gradle
index b6db3a4..fa4b9b8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 90
-        versionName "2.17.1"
+        versionCode 91
+        versionName "2.17.2"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 36b8413..68f3033 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,12 +14,6 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 
-    <!-- Wi-Fi auto-join. CHANGE_WIFI_STATE covers enabling the radio and asking the
-         supplicant to join a network the unit already has saved; ACCESS_WIFI_STATE covers
-         reading which one it landed on. No password is ever handled here — see
-         WifiAutoConnect for why this works on this Android 9 unit and not on a newer one. -->
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
 
     <!-- Android Automotive / CarPropertyManager permissions -->
     <uses-permission android:name="android.car.permission.CAR_SPEED" />
diff --git a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
index 63892dc..78da357 100644
--- a/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
+++ b/app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
@@ -68,7 +68,6 @@ public class AbrpUploadService extends Service {
     private ChargeSessionTracker chargeSessionTracker;
     private TelemetryUploader telemetryUploader;
     private SteeringKeyListener steeringKeys;
-    private WifiAutoConnect wifi;
     private ScheduledExecutorService scheduler;
     private SharedPreferences prefs;
 
@@ -97,7 +96,6 @@ public class AbrpUploadService extends Service {
         consumptionTracker = ConsumptionTracker.get(this);
         consumptionCloudClient = new ConsumptionCloudClient(getApplicationContext());
         chargeSessionTracker = ChargeSessionTracker.get(getApplicationContext());
-        wifi = new WifiAutoConnect(getApplicationContext());
         telemetryUploader = new TelemetryUploader(getApplicationContext());
         steeringKeys = new SteeringKeyListener(this, prefs);
         steeringKeys.register();
@@ -169,12 +167,6 @@ public class AbrpUploadService extends Service {
         chargeSessionTracker.sample(vehicle);
         consumptionCloudClient.syncIfDue(consumptionTracker, chargeSessionTracker, sampleMs);
 
-        // Keep the head unit on the phone hotspot — the sync needs a network, and this is
-        // exactly when being offline costs something. Rate-limited internally.
-        if (wifi != null && prefs.getBoolean(MainActivity.WIFI_AUTO_KEY, true)) {
-            wifi.ensureConnected(false);
-        }
-
         UploadSettings settings = UploadSettings.from(prefs);
         // Live data goes to the server, to ABRP directly, or both; with neither set up there is
         // nowhere to send it.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index a532bb6..00efca0 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -35,12 +35,6 @@ import com.evsuite.hardware.telemetry.EnergyTelemetryReader;
 
 public class MainActivity extends AppCompatActivity {
 
-    /**
-     * Rejoin a saved network (the phone hotspot) in the background; read by
-     * {@link AbrpUploadService} on every tick. On by default; the Wi-Fi card with its switch was
-     * removed from Settings (2.17.1), so it now stays on.
-     */
-    static final String WIFI_AUTO_KEY = "wifi_auto_connect";
     private static final String REPOSITORY_URL = "https://git.stinnesbeck.com/nils/mg4";
 
     /** Navigation destinations in page order. Parallel to {@link #panes}. */
diff --git a/app/src/main/java/com/evsuite/abrp/WifiAutoConnect.java b/app/src/main/java/com/evsuite/abrp/WifiAutoConnect.java
deleted file mode 100644
index 2661d36..0000000
--- a/app/src/main/java/com/evsuite/abrp/WifiAutoConnect.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.evsuite.abrp;
-
-import android.content.Context;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.util.Log;
-
-import java.util.List;
-
-/**
- * Brings Wi-Fi up and joins a network the head unit already knows.
- *
- * The point is the phone hotspot: the car has the credentials saved, but the driver still
- * has to walk into Settings and tap the network every time. This does that tap.
- *
- * <b>Why this works here and would not on a newer phone.</b> {@code getConfiguredNetworks}
- * and {@code enableNetwork} were deprecated in API 29 and, from that release, return an
- * empty list and refuse the call for ordinary apps — Android handed network choice to the
- * user through a system picker. This head unit runs Android 9 (API 28), where both are
- * still honoured, and the build is platform-signed, so it is the same UID family the
- * Settings app itself uses. Neither fact is portable: on a Pixel this class would find
- * nothing and change nothing. It is deliberately written to fail quietly if so.
- *
- * Nothing here creates or edits a network. It only enables one the unit was already
- * configured with, which is why no password ever passes through this app.
- */
-final class WifiAutoConnect {
-
-    private static final String TAG = "EVABRP.Wifi";
-
-    /** Re-checking faster than this achieves nothing: a join takes seconds to settle. */
-    private static final long MIN_ATTEMPT_INTERVAL_MS = 30_000L;
-
-    private final WifiManager wifi;
-    private long lastAttemptMs;
-
-    WifiAutoConnect(Context context) {
-        this.wifi = (WifiManager) context.getApplicationContext()
-                .getSystemService(Context.WIFI_SERVICE);
-    }
-
-    /** The SSID the unit is associated with, or null when it is not on Wi-Fi. */
-    String currentSsid() {
-        try {
-            if (wifi == null || !wifi.isWifiEnabled()) return null;
-            WifiInfo info = wifi.getConnectionInfo();
-            if (info == null) return null;
-            String ssid = info.getSSID();
-            if (ssid == null) return null;
-            // The framework quotes the SSID and reports this placeholder when it will not
-            // say — usually because location is off. Neither is a network name.
-            ssid = ssid.replace("\"", "").trim();
-            if (ssid.isEmpty() || "<unknown ssid>".equals(ssid) || "0x".equals(ssid)) return null;
-            return ssid;
-        } catch (Throwable t) {
-            return null;
-        }
-    }
-
-    /**
-     * One attempt to get onto a saved network, rate-limited.
-     *
-     * @param force ignore the rate limit — for the button, which a driver only presses
-     *              because the automatic attempt has not worked yet.
-     * @return what happened, for the log and the UI. Never null.
-     */
-    Result ensureConnected(boolean force) {
-        if (wifi == null) return Result.UNSUPPORTED;
-
-        String ssid = currentSsid();
-        if (ssid != null) return Result.alreadyOn(ssid);
-
-        long now = System.currentTimeMillis();
-        if (!force && now - lastAttemptMs < MIN_ATTEMPT_INTERVAL_MS) return Result.WAITING;
-        lastAttemptMs = now;
-
-        try {
-            if (!wifi.isWifiEnabled()) {
-                // Also gone for ordinary apps from API 29, and also still honoured here.
-                if (!wifi.setWifiEnabled(true)) return Result.CANNOT_ENABLE;
-                // The radio needs a moment before it will associate; the next tick retries.
-                return Result.ENABLING;
-            }
-
-            List<WifiConfiguration> saved = wifi.getConfiguredNetworks();
-            if (saved == null || saved.isEmpty()) return Result.NO_SAVED_NETWORKS;
-
-            // A scan would let us prefer a network that is actually in range, but the results
-            // are themselves throttled and location-gated. Asking the supplicant to pick from
-            // what it knows is both simpler and what the Settings screen effectively does.
-            wifi.reconnect();
-            for (WifiConfiguration c : saved) {
-                if (c == null) continue;
-                // Second argument true: disable the others for this attempt, so the
-                // supplicant commits to this one rather than drifting between them.
-                if (wifi.enableNetwork(c.networkId, true)) {
-                    String name = c.SSID == null ? "?" : c.SSID.replace("\"", "").trim();
-                    Log.i(TAG, "enableNetwork accepted for " + name);
-                    return Result.attempting(name);
-                }
-            }
-            return Result.REFUSED;
-        } catch (SecurityException e) {
-            Log.w(TAG, "Wi-Fi connection refused: permission denied");
-            return Result.REFUSED;
-        } catch (Throwable t) {
-            Log.w(TAG, "connect attempt failed: " + t.getMessage());
-            return Result.REFUSED;
-        }
-    }
-
-    /** Outcome of one attempt. {@link #connected} is the only one that means we are online. */
-    static final class Result {
-        final boolean connected;
-        final String ssid;
-        final String message;
-
-        private Result(boolean connected, String ssid, String message) {
-            this.connected = connected;
-            this.ssid = ssid;
-            this.message = message;
-        }
-
-        static Result alreadyOn(String ssid) { return new Result(true, ssid, "Connected: " + ssid); }
-        static Result attempting(String ssid) { return new Result(false, ssid, "Connecting: " + ssid); }
-
-        static final Result UNSUPPORTED = new Result(false, null, "Wi-Fi cannot be managed");
-        static final Result WAITING = new Result(false, null, "Waiting…");
-        static final Result ENABLING = new Result(false, null, "Turning Wi-Fi on…");
-        static final Result CANNOT_ENABLE = new Result(false, null, "Could not turn Wi-Fi on");
-        static final Result NO_SAVED_NETWORKS = new Result(false, null, "No saved networks");
-        static final Result REFUSED = new Result(false, null, "The system refused");
-    }
-}
diff --git a/mise.toml b/mise.toml
index b9e8889..9e312ff 100644
--- a/mise.toml
+++ b/mise.toml
@@ -119,7 +119,7 @@ run = './gradlew -Dorg.gradle.java.home=$JAVA_HOME installStableDebug'
 
 [tasks.logs]
 description = "Follows the app's logs on the car"
-run = "adb logcat -s AbrpUploadService:V CarPropertyAdapter:V VhalProbe:V SecurePrefs:V OtaUpdater:V UpdateHook:V NilsMG4.Telemetry:V NilsMG4.Mongo:V NilsMG4.SteeringKey:V EVABRP.Boot:V EVABRP.Wifi:V"
+run = "adb logcat -s AbrpUploadService:V CarPropertyAdapter:V VhalProbe:V SecurePrefs:V OtaUpdater:V UpdateHook:V NilsMG4.Telemetry:V NilsMG4.Mongo:V NilsMG4.SteeringKey:V EVABRP.Boot:V"
 
 [tasks.release]
 description = "Release APKs of both channels (stable without OTA, unstable with OTA)"

From 224840bde23aacd5f9a263112f108bc218ced038 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 20:35:43 +0200
Subject: [PATCH 74/79] App 2.17.3: "Odometer and climate" instead of "Energy
 and temperature"

The Overview panel's title came from upstream, where it also showed
pack energy and temperatures. The MG4 publishes none of those, so the
panel only holds the odometer and the climate setpoint; its title now
says so.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                   | 2 ++
 app/build.gradle                           | 4 ++--
 app/src/main/res/values/strings_design.xml | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index ac42c20..f32c099 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -112,6 +112,8 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.17.3: the Overview panel "Energy and temperature" is "Odometer and climate":
+  it only holds those two, since the car publishes no pack energy or temperatures.
 - 2026-10-18 — App 2.17.2: Wi-Fi auto-connect removed with its two permissions (ACCESS_ and
   CHANGE_WIFI_STATE). Upstream used it to keep the head unit on a phone hotspot; this car's head
   unit has its own connection.
diff --git a/app/build.gradle b/app/build.gradle
index fa4b9b8..a0715a5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 91
-        versionName "2.17.2"
+        versionCode 92
+        versionName "2.17.3"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/res/values/strings_design.xml b/app/src/main/res/values/strings_design.xml
index 22d31ec..47c4210 100644
--- a/app/src/main/res/values/strings_design.xml
+++ b/app/src/main/res/values/strings_design.xml
@@ -16,7 +16,7 @@
   <string name="design_log_title">Every upload, right here.</string>
   <string name="design_log_subtitle">Status and details of recent uploads.</string>
   <string name="design_battery">BATTERY</string>
-  <string name="design_energy">ENERGY AND TEMPERATURE</string>
+  <string name="design_energy">ODOMETER AND CLIMATE</string>
   <string name="design_tires">TIRE PRESSURES</string>
   <string name="design_account">SERVER LINK</string>
   <string name="design_private_title">Your private connection.</string>

From 5ead905e5fb9beb09d4c48506bac7d4c244e1d6e Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 20:37:16 +0200
Subject: [PATCH 75/79] App 2.17.4: the panel is called "Vehicle info"

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md                                   | 2 +-
 app/build.gradle                           | 4 ++--
 app/src/main/res/values/strings_design.xml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SPECS.md b/SPECS.md
index f32c099..9e292e1 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -112,7 +112,7 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
-- 2026-10-18 — App 2.17.3: the Overview panel "Energy and temperature" is "Odometer and climate":
+- 2026-10-18 — App 2.17.3: the Overview panel "Energy and temperature" is "Vehicle info" (2.17.4; "Odometer and climate" in 2.17.3):
   it only holds those two, since the car publishes no pack energy or temperatures.
 - 2026-10-18 — App 2.17.2: Wi-Fi auto-connect removed with its two permissions (ACCESS_ and
   CHANGE_WIFI_STATE). Upstream used it to keep the head unit on a phone hotspot; this car's head
diff --git a/app/build.gradle b/app/build.gradle
index a0715a5..c54e60a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 92
-        versionName "2.17.3"
+        versionCode 93
+        versionName "2.17.4"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/res/values/strings_design.xml b/app/src/main/res/values/strings_design.xml
index 47c4210..9f4d9e0 100644
--- a/app/src/main/res/values/strings_design.xml
+++ b/app/src/main/res/values/strings_design.xml
@@ -16,7 +16,7 @@
   <string name="design_log_title">Every upload, right here.</string>
   <string name="design_log_subtitle">Status and details of recent uploads.</string>
   <string name="design_battery">BATTERY</string>
-  <string name="design_energy">ODOMETER AND CLIMATE</string>
+  <string name="design_energy">VEHICLE INFO</string>
   <string name="design_tires">TIRE PRESSURES</string>
   <string name="design_account">SERVER LINK</string>
   <string name="design_private_title">Your private connection.</string>

From 5a82fe3dc1d338454e5597a936fc2df54690fef9 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 20:53:05 +0200
Subject: [PATCH 76/79] App 2.17.5: Server tab fits; installation ID is
 read-only

- The "Your private connection" card is gone; its text was out of date
  (the ABRP credentials are no longer on the server).
- Import from file moved next to Save and Test, in one row.
- The installation ID is shown as text instead of an editable field:
  it is derived from the head unit, and changing it by hand only risked
  splitting the history. A config file can still carry an older one
  over, as before.
- The page fits the car's 1778x640 window without scrolling (checked
  on the emulator), and the subtitle no longer says the server passes
  data on to ABRP.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 app/build.gradle                              |  4 +--
 .../java/com/evsuite/abrp/MainActivity.java   | 36 +++++++++----------
 app/src/main/res/layout/pane_server.xml       | 20 ++++-------
 app/src/main/res/values/strings.xml           |  4 +--
 app/src/main/res/values/strings_design.xml    |  4 +--
 5 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c54e60a..396a0e6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 93
-        versionName "2.17.4"
+        versionCode 94
+        versionName "2.17.5"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index 00efca0..afffebc 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -114,8 +114,10 @@ public class MainActivity extends AppCompatActivity {
     private ChargingGraphView chargeGraph;
 
     /** Server page. */
-    private TextInputLayout serverUrlLayout, serverTokenLayout, installationIdLayout;
-    private TextInputEditText serverUrlInput, serverTokenInput, installationIdInput;
+    private TextInputLayout serverUrlLayout, serverTokenLayout;
+    private TextInputEditText serverUrlInput, serverTokenInput;
+    /** Shown, not edited: derived from the head unit (ServerConfig.installationIdFor). */
+    private TextView installationIdText;
     private View connectionStatusRow, connectionIndicator;
     private TextView connectionStatusText;
 
@@ -460,19 +462,17 @@ public class MainActivity extends AppCompatActivity {
     private void bindServerPane() {
         serverUrlLayout      = serverPane.findViewById(R.id.server_url_layout);
         serverTokenLayout    = serverPane.findViewById(R.id.server_token_layout);
-        installationIdLayout = serverPane.findViewById(R.id.installation_id_layout);
         serverUrlInput       = serverPane.findViewById(R.id.server_url_input);
         serverTokenInput     = serverPane.findViewById(R.id.server_token_input);
-        installationIdInput  = serverPane.findViewById(R.id.installation_id_input);
+        installationIdText   = serverPane.findViewById(R.id.installation_id_text);
         connectionStatusRow  = serverPane.findViewById(R.id.connection_status_row);
         connectionIndicator  = serverPane.findViewById(R.id.connection_indicator);
         connectionStatusText = serverPane.findViewById(R.id.connection_status_text);
         showServerConfig();
-        ((TextView) serverPane.findViewById(R.id.import_hint))
-                .setText(getString(R.string.import_hint, configDirHint()));
 
         serverPane.findViewById(R.id.server_save_button).setOnClickListener(v -> {
-            if (saveServerConfig(textOf(serverUrlInput), textOf(serverTokenInput), textOf(installationIdInput))) {
+            if (saveServerConfig(textOf(serverUrlInput), textOf(serverTokenInput),
+                    ServerConfig.get(this).installationId)) {
                 setConnectionStatus(COLOR_OK, getString(R.string.server_saved));
             }
         });
@@ -485,7 +485,7 @@ public class MainActivity extends AppCompatActivity {
         ServerConfig config = ServerConfig.get(this);
         serverUrlInput.setText(config.url);
         serverTokenInput.setText(config.token);
-        installationIdInput.setText(config.installationId);
+        installationIdText.setText(getString(R.string.installation_id_info, config.installationId));
     }
 
     /** Validates, marks the bad fields, and saves only when all three are good. */
@@ -495,9 +495,12 @@ public class MainActivity extends AppCompatActivity {
         String id = rawId == null ? "" : rawId.trim().toLowerCase(java.util.Locale.US);
         serverUrlLayout.setError(url == null ? getString(R.string.server_err_url) : null);
         serverTokenLayout.setError(ServerConfig.isValidToken(token) ? null : getString(R.string.server_err_token));
-        installationIdLayout.setError(ServerConfig.isValidInstallationId(id)
-                ? null : getString(R.string.server_err_installation_id));
-        if (url == null || !ServerConfig.isValidToken(token) || !ServerConfig.isValidInstallationId(id)) return false;
+        // Only an imported config file can bring a different id; the field is not editable.
+        if (!ServerConfig.isValidInstallationId(id)) {
+            setConnectionStatus(COLOR_ERROR, getString(R.string.server_err_installation_id));
+            return false;
+        }
+        if (url == null || !ServerConfig.isValidToken(token)) return false;
         ServerConfig.save(this, url, token, id);
         if (consumptionCloudClient != null) consumptionCloudClient.invalidateHistory();
         showServerConfig();
@@ -513,15 +516,11 @@ public class MainActivity extends AppCompatActivity {
     private void testConnection() {
         String url = ServerConfig.normalizeUrl(textOf(serverUrlInput));
         String token = textOf(serverTokenInput);
-        String id = textOf(installationIdInput).toLowerCase(java.util.Locale.US);
+        String id = ServerConfig.get(this).installationId;
         if (url == null) {
             serverUrlLayout.setError(getString(R.string.server_err_url));
             return;
         }
-        if (!ServerConfig.isValidInstallationId(id)) {
-            installationIdLayout.setError(getString(R.string.server_err_installation_id));
-            return;
-        }
         setConnectionStatus(COLOR_PENDING, getString(R.string.conn_testing));
         new Thread(() -> {
             String message;
@@ -563,9 +562,7 @@ public class MainActivity extends AppCompatActivity {
             return;
         }
         serverUrlLayout.setError(null);
-        String typedId = textOf(installationIdInput).toLowerCase(java.util.Locale.US);
-        String installationId = ServerConfig.isValidInstallationId(typedId)
-                ? typedId : ServerConfig.get(this).installationId;
+        String installationId = ServerConfig.get(this).installationId;
 
         PhoneQrDialog ui = new PhoneQrDialog(R.string.pair_title, R.string.pair_starting);
         final boolean[] cancelled = ui.cancelled;
@@ -973,7 +970,6 @@ public class MainActivity extends AppCompatActivity {
                 // Show what the file said, so the marked field is the one to fix in the file.
                 if (config.serverUrl != null) serverUrlInput.setText(config.serverUrl);
                 if (config.token != null) serverTokenInput.setText(config.token);
-                if (config.installationId != null) installationIdInput.setText(config.installationId);
                 return false;
             }
         }
diff --git a/app/src/main/res/layout/pane_server.xml b/app/src/main/res/layout/pane_server.xml
index 850ed83..51b5762 100644
--- a/app/src/main/res/layout/pane_server.xml
+++ b/app/src/main/res/layout/pane_server.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.evsuite.abrp.StableScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:clipToPadding="false">
-    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp">
+    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:paddingStart="24dp" android:paddingEnd="24dp" android:paddingTop="12dp" android:paddingBottom="12dp">
         <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/server_card_title" android:textAppearance="@style/Text.EV.Eyebrow" />
             <com.google.android.material.textfield.TextInputLayout android:id="@+id/server_url_layout" style="@style/Widget.EV.Input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="18dp" android:hint="@string/hint_server_url" app:helperText="@string/helper_server_url">
@@ -11,22 +11,16 @@
             <com.google.android.material.textfield.TextInputLayout android:id="@+id/server_token_layout" style="@style/Widget.EV.Input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="18dp" android:hint="@string/hint_server_token" app:endIconMode="password_toggle" app:endIconMinSize="72dp" app:helperText="@string/helper_server_token">
                 <com.google.android.material.textfield.TextInputEditText android:id="@+id/server_token_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="textPassword" android:singleLine="true" android:textSize="20sp" />
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout android:id="@+id/installation_id_layout" style="@style/Widget.EV.Input" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="18dp" android:hint="@string/hint_installation_id" app:helperText="@string/helper_installation_id">
-                <com.google.android.material.textfield.TextInputEditText android:id="@+id/installation_id_input" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="72dp" android:inputType="text" android:singleLine="true" android:textSize="18sp" android:fontFamily="monospace" />
-            </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.button.MaterialButton android:id="@+id/server_save_button" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_save" android:layout_marginTop="20dp" />
-            <com.google.android.material.button.MaterialButton android:id="@+id/server_test_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_test" android:layout_marginTop="8dp" />
+            <TextView android:id="@+id/installation_id_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="14dp" android:textAppearance="@style/Text.EV.Secondary" android:textIsSelectable="true" />
+            <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:orientation="horizontal">
+                <com.google.android.material.button.MaterialButton android:id="@+id/server_save_button" style="@style/Widget.EV.Button" android:layout_width="0dp" android:layout_weight="1" android:layout_height="wrap_content" android:text="@string/btn_save" android:layout_marginEnd="12dp" />
+                <com.google.android.material.button.MaterialButton android:id="@+id/server_test_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="0dp" android:layout_weight="1" android:layout_height="wrap_content" android:text="@string/btn_test" android:layout_marginEnd="12dp" />
+                <com.google.android.material.button.MaterialButton android:id="@+id/import_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="0dp" android:layout_weight="1" android:layout_height="wrap_content" android:text="@string/btn_import" />
+            </LinearLayout>
             <LinearLayout android:id="@+id/connection_status_row" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:gravity="center_vertical" android:orientation="horizontal" android:visibility="gone">
                 <View android:id="@+id/connection_indicator" android:layout_width="10dp" android:layout_height="10dp" android:layout_marginEnd="12dp" android:background="@drawable/circle_indicator" />
                 <TextView android:id="@+id/connection_status_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="@style/Text.EV.Body" />
             </LinearLayout>
         </LinearLayout>
-        <Space android:layout_width="1dp" android:layout_height="20dp" />
-        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="24dp" android:background="@drawable/bg_glass">
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_private_title" android:textAppearance="@style/Text.EV.Title" />
-            <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_private_body" android:textAppearance="@style/Text.EV.Secondary" android:layout_marginTop="16dp" android:lineSpacingMultiplier="1.3" />
-            <com.google.android.material.button.MaterialButton android:id="@+id/import_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btn_import" android:layout_marginTop="24dp" />
-            <TextView android:id="@+id/import_hint" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:textAppearance="@style/Text.EV.Secondary" android:textIsSelectable="true" />
-        </LinearLayout>
     </LinearLayout>
 </com.evsuite.abrp.StableScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6380df6..0bf61cb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -60,6 +60,7 @@
     <string name="btn_save">Save</string>
     <string name="btn_test">Test connection</string>
     <string name="btn_import">Import from file</string>
+    <string name="installation_id_info">Installation ID %1$s · derived from the head unit; your data is stored under it</string>
 
     <!-- Server page -->
     <string name="server_card_title">Car server</string>
@@ -67,8 +68,6 @@
     <string name="helper_server_url">For example https://car.k8s.stinnesbeck.com</string>
     <string name="hint_server_token">Ingest token</string>
     <string name="helper_server_token">The server\'s INGEST_TOKEN, at least 24 characters</string>
-    <string name="hint_installation_id">Installation ID</string>
-    <string name="helper_installation_id">Your data is stored under this ID. Keep it when reinstalling.</string>
     <string name="server_err_url">Enter an https:// URL</string>
     <string name="btn_pair">Pair with phone</string>
     <string name="pair_hint">Shows a QR code: scan it with your phone and approve with the approval password. The token below is then filled in for you.</string>
@@ -92,7 +91,6 @@
     <string name="server_err_installation_id">Not a valid ID (UUID)</string>
     <string name="server_saved">Server settings saved</string>
     <string name="server_not_configured">Server not configured — open the Server tab</string>
-    <string name="import_hint">Put a text file with server_url and token in %1$s (on the head unit or a USB stick in the same folder), then press Import.</string>
 
     <!-- Config file import -->
     <string name="import_ok">Config imported and saved — press Test to verify</string>
diff --git a/app/src/main/res/values/strings_design.xml b/app/src/main/res/values/strings_design.xml
index 9f4d9e0..1c8dc16 100644
--- a/app/src/main/res/values/strings_design.xml
+++ b/app/src/main/res/values/strings_design.xml
@@ -8,7 +8,7 @@
   <string name="design_overview_title">Your drive at a glance.</string>
   <string name="design_overview_subtitle">Data from your car, all in one place.</string>
   <string name="design_server_title">Where your data goes.</string>
-  <string name="design_server_subtitle">Your own server stores it and passes it on to ABRP.</string>
+  <string name="design_server_subtitle">Your own server stores it; the car sends live data to ABRP itself.</string>
   <string name="design_service_title">Live data.</string>
   <string name="design_service_subtitle">Where your car\'s live data goes, and how often.</string>
   <string name="design_settings_title">Settings.</string>
@@ -19,8 +19,6 @@
   <string name="design_energy">VEHICLE INFO</string>
   <string name="design_tires">TIRE PRESSURES</string>
   <string name="design_account">SERVER LINK</string>
-  <string name="design_private_title">Your private connection.</string>
-  <string name="design_private_body">The token lets the car write to your server. It is stored encrypted on this device; your ABRP credentials stay on the server.</string>
   <string name="design_no_data">Values that cannot be read are shown as &#x2014;.</string>
   <string name="design_service_controls">LIVE DATA</string>
   <string name="design_abrp_title">ABRP, DIRECTLY FROM THE CAR</string>

From 0fd024cc2e6e46e83b2751d7bcfae5ba84c5f912 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 20:53:21 +0200
Subject: [PATCH 77/79] SPECS: done-log entry for app 2.17.5

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 SPECS.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/SPECS.md b/SPECS.md
index 9e292e1..73bd8c5 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -112,6 +112,10 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.17.5: Server tab fits the car's window. The "Your private connection" card is
+  gone (its text was out of date); Import from file sits with Save and Test in one row; the
+  installation ID is shown as text, not edited, since it is derived from the head unit (a config
+  file can still carry another one over). The subtitle no longer says the server forwards to ABRP.
 - 2026-10-18 — App 2.17.3: the Overview panel "Energy and temperature" is "Vehicle info" (2.17.4; "Odometer and climate" in 2.17.3):
   it only holds those two, since the car publishes no pack energy or temperatures.
 - 2026-10-18 — App 2.17.2: Wi-Fi auto-connect removed with its two permissions (ACCESS_ and

From 69d284f81bb3fe1be3f8cf923fecefca079186f5 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 20:59:45 +0200
Subject: [PATCH 78/79] App 2.18.0: install from a USB stick

Settings -> App -> "Install from USB stick" (car build only). It looks
in the top folder of every mounted volume (found from the app's own
folder on it, since the head unit has no file picker) for
NilsMG4-unstable-<version>.apk, takes the newest one newer than the
installed version, checks it against its .sha256 sidecar and the
package name, and installs it with the same PackageInstaller session
as the over-the-air update. The stable build gets a stub and no button.

Tested on the emulator: 2.18.0 installed a 2.18.1 from the storage's
top folder without a confirmation, as the system user, so the OTA
install step should not need one either.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 OTA.md                                        | 11 +++
 SPECS.md                                      |  5 ++
 app/build.gradle                              |  4 +-
 .../java/com/evsuite/abrp/MainActivity.java   | 19 ++++-
 .../main/res/layout-w1000dp/pane_settings.xml |  1 +
 app/src/main/res/layout/pane_settings.xml     |  1 +
 app/src/main/res/values/strings.xml           |  2 +
 .../java/com/evsuite/abrp/UpdateHook.java     |  5 ++
 .../java/com/evsuite/abrp/UsbUpdateTest.java  | 38 ++++++++++
 .../java/com/evsuite/abrp/UpdateHook.java     | 75 +++++++++++++++++++
 .../java/com/evsuite/abrp/UsbUpdate.java      | 52 +++++++++++++
 11 files changed, 209 insertions(+), 4 deletions(-)
 create mode 100644 app/src/testUnstable/java/com/evsuite/abrp/UsbUpdateTest.java
 create mode 100644 app/src/unstable/java/com/evsuite/abrp/UsbUpdate.java

diff --git a/OTA.md b/OTA.md
index cb2de3e..6a0c41f 100644
--- a/OTA.md
+++ b/OTA.md
@@ -62,6 +62,17 @@ At start the app only checks, and shows "Update available" when there is one. It
 downloads or installs on its own, and the upload service never checks: installing restarts
 the app, which must not happen mid-drive on its own.
 
+## Installing from a USB stick
+
+For development, without the forge: copy `NilsMG4-unstable-<version>.apk` **and** its `.sha256`
+from `build/car/` to the top folder of a USB stick, plug it in, and press **Install from USB
+stick** on the Settings tab. The app takes the newest such file that is newer than the installed
+version, checks it against the `.sha256`, checks the package, and installs it with the same
+installer session as an over-the-air update. The car build only; the stable build has no button.
+
+On the Android 9 emulator (car build, system user) this installed without asking, from the
+storage's top folder; on the car the stick's top folder is used the same way.
+
 ## When it says something else
 
 | Message | Meaning |
diff --git a/SPECS.md b/SPECS.md
index 73bd8c5..3234c6c 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -112,6 +112,11 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — App 2.18.0: Settings → App → "Install from USB stick" (car build only): the newest
+  `NilsMG4-unstable-<version>.apk` newer than the installed one in a stick's top folder, checked
+  against its `.sha256` and the package, installed with the OTA installer session. Tested on the
+  emulator: 2.18.0 installed a 2.18.1 from the storage's top folder silently, as the system user —
+  so the OTA install step should not need a confirmation either.
 - 2026-10-18 — App 2.17.5: Server tab fits the car's window. The "Your private connection" card is
   gone (its text was out of date); Import from file sits with Save and Test in one row; the
   installation ID is shown as text, not edited, since it is derived from the head unit (a config
diff --git a/app/build.gradle b/app/build.gradle
index 396a0e6..1e21cdd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId "com.stinnesbeck.nilsmg4"
         minSdk 27
         targetSdk 36
-        versionCode 94
-        versionName "2.17.5"
+        versionCode 95
+        versionName "2.18.0"
 
         // Nothing about the server ships in the APK: its URL and ingest token are entered in
         // the app's Server tab (ServerConfig), and the database is only reachable by the server.
diff --git a/app/src/main/java/com/evsuite/abrp/MainActivity.java b/app/src/main/java/com/evsuite/abrp/MainActivity.java
index afffebc..4034672 100644
--- a/app/src/main/java/com/evsuite/abrp/MainActivity.java
+++ b/app/src/main/java/com/evsuite/abrp/MainActivity.java
@@ -265,6 +265,10 @@ public class MainActivity extends AppCompatActivity {
                 .setText(getString(R.string.settings_version, BuildConfig.VERSION_NAME));
         settingsPane.findViewById(R.id.settings_about_button).setOnClickListener(v -> showAbout());
         settingsPane.findViewById(R.id.settings_update_button).setOnClickListener(v -> checkForUpdate(v));
+        View usbButton = settingsPane.findViewById(R.id.settings_usb_button);
+        usbButton.setOnClickListener(v -> installFromUsb(v));
+        // The stable build installs nothing itself, so it has no use for the button.
+        if (!UpdateHook.isSupported()) usbButton.setVisibility(View.GONE);
 
         // Unstable builds check for a newer pre-release; the stable flavor's UpdateHook is
         // a no-op and does not even contain the updater.
@@ -408,13 +412,24 @@ public class MainActivity extends AppCompatActivity {
      * SHA-256 verified; the final result remains visible until dismissed.
      */
     private void checkForUpdate(View button) {
+        runUpdate(button, R.string.update_checking, listener -> UpdateHook.checkInBackground(this, listener));
+    }
+
+    /** Installs the newest car build from the top folder of a USB stick (unstable builds). */
+    private void installFromUsb(View button) {
+        runUpdate(button, R.string.update_usb_looking, listener -> UpdateHook.installFromUsbInBackground(this, listener));
+    }
+
+    /** The update dialog: progress while [start] runs, then its result. */
+    private void runUpdate(View button, int startText,
+                           java.util.function.Consumer<UpdateHook.Listener> start) {
         button.setEnabled(false);
         android.widget.LinearLayout panel = new android.widget.LinearLayout(this);
         panel.setOrientation(android.widget.LinearLayout.VERTICAL);
         int padding = (int) (24 * getResources().getDisplayMetrics().density);
         panel.setPadding(padding, padding, padding, padding);
         TextView status = new TextView(this);
-        status.setText(R.string.update_checking);
+        status.setText(startText);
         status.setTextAppearance(R.style.Text_EV_Body);
         android.widget.ProgressBar progress = new android.widget.ProgressBar(this, null,
                 android.R.attr.progressBarStyleHorizontal);
@@ -432,7 +447,7 @@ public class MainActivity extends AppCompatActivity {
                 .setCancelable(false)
                 .create();
         showKeepingFullScreen(dialog);
-        UpdateHook.checkInBackground(this, new UpdateHook.Listener() {
+        start.accept(new UpdateHook.Listener() {
             @Override public void onProgress(int percent) {
                 if (percent < 0) {
                     progress.setIndeterminate(true);
diff --git a/app/src/main/res/layout-w1000dp/pane_settings.xml b/app/src/main/res/layout-w1000dp/pane_settings.xml
index 2c54b3c..92822d7 100644
--- a/app/src/main/res/layout-w1000dp/pane_settings.xml
+++ b/app/src/main/res/layout-w1000dp/pane_settings.xml
@@ -48,6 +48,7 @@
                 <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_app_title" android:textAppearance="@style/Text.EV.Eyebrow" />
                 <TextView android:id="@+id/settings_version" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:textAppearance="@style/Text.EV.Body" />
                 <com.google.android.material.button.MaterialButton android:id="@+id/settings_update_button" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/btn_check_update" app:icon="@drawable/ic_refresh" />
+                <com.google.android.material.button.MaterialButton android:id="@+id/settings_usb_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/btn_usb_update" />
                 <com.google.android.material.button.MaterialButton android:id="@+id/settings_about_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/btn_about" app:icon="@drawable/ic_info" />
             </LinearLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout/pane_settings.xml b/app/src/main/res/layout/pane_settings.xml
index eea34d5..437f3e5 100644
--- a/app/src/main/res/layout/pane_settings.xml
+++ b/app/src/main/res/layout/pane_settings.xml
@@ -42,6 +42,7 @@
             <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/design_app_title" android:textAppearance="@style/Text.EV.Eyebrow" />
             <TextView android:id="@+id/settings_version" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:textAppearance="@style/Text.EV.Body" />
             <com.google.android.material.button.MaterialButton android:id="@+id/settings_update_button" style="@style/Widget.EV.Button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/btn_check_update" app:icon="@drawable/ic_refresh" />
+            <com.google.android.material.button.MaterialButton android:id="@+id/settings_usb_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/btn_usb_update" />
             <com.google.android.material.button.MaterialButton android:id="@+id/settings_about_button" style="@style/Widget.EV.Button.Outlined" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/btn_about" app:icon="@drawable/ic_info" />
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0bf61cb..5ea54dc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -182,6 +182,8 @@
     <string name="ota_install_failed">Installation failed: %1$s. The APK is in Downloads.</string>
     <string name="update_check">Check for updates</string>
     <string name="update_checking">Checking for a new OTA version…</string>
+    <string name="update_usb_looking">Looking on the USB stick…</string>
+    <string name="btn_usb_update">Install from USB stick</string>
     <string name="update_dialog_title">Software update</string>
     <string name="btn_check_update">Check for updates</string>
     <string name="btn_about">About Nils\' MG4</string>
diff --git a/app/src/stable/java/com/evsuite/abrp/UpdateHook.java b/app/src/stable/java/com/evsuite/abrp/UpdateHook.java
index c6745a2..67824a6 100644
--- a/app/src/stable/java/com/evsuite/abrp/UpdateHook.java
+++ b/app/src/stable/java/com/evsuite/abrp/UpdateHook.java
@@ -30,5 +30,10 @@ final class UpdateHook {
         if (listener != null) listener.onResult("This build has no automatic updates");
     }
 
+    /** Answers immediately that this channel does not install updates. */
+    static void installFromUsbInBackground(Context context, Listener listener) {
+        if (listener != null) listener.onResult("This build does not install updates");
+    }
+
     static boolean isSupported() { return false; }
 }
diff --git a/app/src/testUnstable/java/com/evsuite/abrp/UsbUpdateTest.java b/app/src/testUnstable/java/com/evsuite/abrp/UsbUpdateTest.java
new file mode 100644
index 0000000..abef740
--- /dev/null
+++ b/app/src/testUnstable/java/com/evsuite/abrp/UsbUpdateTest.java
@@ -0,0 +1,38 @@
+package com.evsuite.abrp;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.io.File;
+
+import org.junit.Test;
+
+/** Finding a car build on a USB stick — pure JVM. */
+public class UsbUpdateTest {
+
+    @Test
+    public void theStickRootIsFourLevelsAboveTheAppFolder() {
+        assertEquals(new File("/storage/1234-ABCD"), UsbUpdate.volumeRoot(
+                new File("/storage/1234-ABCD/Android/data/com.stinnesbeck.nilsmg4.unstable/files")));
+        assertEquals(new File("/storage/emulated/0"), UsbUpdate.volumeRoot(
+                new File("/storage/emulated/0/Android/data/com.stinnesbeck.nilsmg4.unstable/files")));
+        assertNull(UsbUpdate.volumeRoot(new File("/data/user/0/com.stinnesbeck.nilsmg4.unstable/files")));
+        assertNull(UsbUpdate.volumeRoot(null));
+    }
+
+    @Test
+    public void theNewestNewerCarBuildIsPicked() {
+        String[] names = {"NilsMG4-unstable-2.17.4.apk", "NilsMG4-unstable-2.18.0.apk", "NilsMG4-unstable-2.18.0.apk.sha256",
+                "NilsMG4-unstable-2.17.10.apk", "NilsMG4-stable-9.0.0.apk", "FatihsMG4-unstable-9.9.9.apk", "notes.txt"};
+        assertEquals("NilsMG4-unstable-2.18.0.apk", UsbUpdate.pickNewest(names, "2.17.5-unstable"));
+        assertEquals("NilsMG4-unstable-2.17.10.apk", UsbUpdate.pickNewest(
+                new String[]{"NilsMG4-unstable-2.17.4.apk", "NilsMG4-unstable-2.17.10.apk"}, "2.17.5-unstable"));
+    }
+
+    @Test
+    public void nothingNewerMeansNothing() {
+        assertNull(UsbUpdate.pickNewest(new String[]{"NilsMG4-unstable-2.17.5.apk"}, "2.17.5-unstable"));
+        assertNull(UsbUpdate.pickNewest(new String[0], "2.17.5-unstable"));
+        assertNull(UsbUpdate.pickNewest(null, "2.17.5-unstable"));
+    }
+}
diff --git a/app/src/unstable/java/com/evsuite/abrp/UpdateHook.java b/app/src/unstable/java/com/evsuite/abrp/UpdateHook.java
index e57833c..f4ba4b4 100644
--- a/app/src/unstable/java/com/evsuite/abrp/UpdateHook.java
+++ b/app/src/unstable/java/com/evsuite/abrp/UpdateHook.java
@@ -94,6 +94,81 @@ final class UpdateHook {
         }, "ota-check").start();
     }
 
+    /**
+     * Installs the newest car build from the top folder of a USB stick (UsbUpdate), with the
+     * same checks as the over-the-air update except the server. Background thread; [listener]
+     * is called on the main thread.
+     */
+    static void installFromUsbInBackground(Context context, Listener listener) {
+        Context app = context.getApplicationContext();
+        android.os.Handler main = new android.os.Handler(android.os.Looper.getMainLooper());
+        if (!checking.compareAndSet(false, true)) {
+            if (listener != null) main.post(() -> listener.onResult("Update check already in progress"));
+            return;
+        }
+        new Thread(() -> {
+            String message;
+            try {
+                message = runUsbInstall(app);
+            } catch (Throwable t) {
+                Log.w(TAG, "USB install threw", t);
+                message = "Installing from USB failed";
+            } finally {
+                checking.set(false);
+            }
+            if (listener != null) {
+                final String result = message;
+                main.post(() -> listener.onResult(result));
+            }
+        }, "usb-install").start();
+    }
+
+    private static String runUsbInstall(Context app) throws Exception {
+        String current = app.getPackageManager().getPackageInfo(app.getPackageName(), 0).versionName;
+        File best = null;
+        String bestName = null;
+        for (File dir : app.getExternalFilesDirs(null)) {
+            File root = UsbUpdate.volumeRoot(dir);
+            if (root == null) continue;
+            String[] names = root.list();
+            String name = UsbUpdate.pickNewest(names, bestName == null ? current
+                    : OtaUpdater.versionFromAssetName(bestName));
+            if (name != null) {
+                best = new File(root, name);
+                bestName = name;
+            }
+        }
+        if (best == null) {
+            return "No newer NilsMG4-unstable-<version>.apk on a USB stick (installed: " + current + ")";
+        }
+        File sidecar = new File(best.getPath() + ".sha256");
+        String expected = sidecar.isFile() && sidecar.length() < 16 * 1024
+                ? OtaUpdater.parseExpectedSha256(new String(java.nio.file.Files.readAllBytes(sidecar.toPath()),
+                        java.nio.charset.StandardCharsets.UTF_8), best.getName())
+                : null;
+        if (expected == null) return "Not installed: " + best.getName() + ".sha256 is missing or unreadable";
+        java.security.MessageDigest digest = java.security.MessageDigest.getInstance("SHA-256");
+        try (java.io.InputStream in = new java.io.FileInputStream(best)) {
+            byte[] buffer = new byte[64 * 1024];
+            int count;
+            while ((count = in.read(buffer)) != -1) digest.update(buffer, 0, count);
+        }
+        StringBuilder hex = new StringBuilder();
+        for (byte b : digest.digest()) hex.append(String.format(java.util.Locale.US, "%02x", b));
+        if (!hex.toString().equalsIgnoreCase(expected)) return "Not installed: " + best.getName() + " does not match its SHA-256";
+        String version = OtaUpdater.versionFromAssetName(best.getName());
+        switch (OtaUpdater.install(app, best)) {
+            case SESSION_STARTED:
+                return "Installing " + version + " from USB… the app restarts when it is done";
+            case INSTALL_UI_STARTED:
+                return "Confirm the installation of " + version + " on the screen";
+            case UNREADABLE_ARCHIVE:
+                return "Not installed: " + best.getName() + " is not this app";
+            default:
+                return "Not installed: the installer could not start";
+        }
+    }
+
     /** The blocking part. Returns a line describing what happened, for the UI. */
     private static String runCheck(Context app, Listener listener,
                                    android.os.Handler main) throws IOException {
diff --git a/app/src/unstable/java/com/evsuite/abrp/UsbUpdate.java b/app/src/unstable/java/com/evsuite/abrp/UsbUpdate.java
new file mode 100644
index 0000000..5697180
--- /dev/null
+++ b/app/src/unstable/java/com/evsuite/abrp/UsbUpdate.java
@@ -0,0 +1,52 @@
+package com.evsuite.abrp;
+
+import java.io.File;
+import java.util.Locale;
+
+/**
+ * Installing a car build from a USB stick — UNSTABLE BUILDS ONLY. For development: copy
+ * {@code NilsMG4-unstable-<version>.apk} and its {@code .sha256} (both from build-car) to the top
+ * folder of a stick, plug it in, press the button on the Settings tab.
+ *
+ * The same checks as the over-the-air update apply, minus the server: the newest such file that
+ * is newer than the installed version, a matching SHA-256 sidecar, this app's package, and the
+ * installer's own signature check. The pure parts are here, unit-tested; UpdateHook does the IO.
+ */
+final class UsbUpdate {
+
+    private UsbUpdate() { }
+
+    /**
+     * The top folder of the volume an app-specific folder lives on:
+     * /storage/1234-ABCD/Android/data/<package>/files → /storage/1234-ABCD. Null when the path
+     * does not have that shape. This is how a stick is found without a file picker, which the
+     * head unit does not have.
+     */
+    static File volumeRoot(File appFilesDir) {
+        if (appFilesDir == null) return null;
+        File data = appFilesDir.getParentFile() == null ? null : appFilesDir.getParentFile().getParentFile();
+        File android = data == null ? null : data.getParentFile();
+        if (!"files".equals(appFilesDir.getName()) || data == null || !"data".equals(data.getName())
+                || android == null || !"Android".equals(android.getName())) return null;
+        return android.getParentFile();
+    }
+
+    /**
+     * The car-build APK to install among [names]: the highest version that is newer than
+     * [currentVersion], or null. Only names build-car writes count.
+     */
+    static String pickNewest(String[] names, String currentVersion) {
+        String best = null, bestVersion = null;
+        if (names == null) return null;
+        for (String name : names) {
+            if (name == null || !name.toLowerCase(Locale.US).startsWith("nilsmg4-unstable-")) continue;
+            String version = OtaUpdater.versionFromAssetName(name);
+            if (version == null || !OtaUpdater.isNewer(version, currentVersion)) continue;
+            if (bestVersion == null || OtaUpdater.isNewer(version, bestVersion)) {
+                best = name;
+                bestVersion = version;
+            }
+        }
+        return best;
+    }
+}

From 253c7687819a9d11594511f23f988ee3960703c2 Mon Sep 17 00:00:00 2001
From: Nils Stinnesbeck <git@stinnesbeck.com>
Date: Sun, 18 Oct 2026 21:12:41 +0200
Subject: [PATCH 79/79] AGENTS.md: an overview for agents; car-emulator in the
 flake

AGENTS.md still described upstream's EVABRPUploader (GitHub updates,
the old architecture and tabs). It is now the entry point for agents:
what the project is (app, Go server, k8s, EVHardware), the rules
(nothing touches the cluster, secrets, read-only telemetry, null is not
zero, fail closed, honesty), the facts confirmed on the car, the app's
structure and UI conventions, how to build, test, publish and install,
and which document holds what. SPECS.md stays the journal.

The Android 9 test emulator, so far a file under the ignored build/,
is now reproducible: nix run .#car-emulator creates an AVD at
1920x720/160 dpi with the AOSP image that shares the car's platform key
and starts it on port 5560. Checked from scratch: the car build
installs as the system user.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QLJfZQZeAKAwSqViTmLzki
---
 AGENTS.md | 209 ++++++++++++++++++++++++++++--------------------------
 SPECS.md  |   4 ++
 flake.nix |  53 ++++++++++++++
 3 files changed, 164 insertions(+), 102 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index 07ecc5f..36401e6 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,125 +1,130 @@
-# AGENTS.md — EVABRPUploader
+# AGENTS.md — Nils' MG4
 
-Context for AI agents and new contributors working in this repository.
-
-EVABRPUploader is part of **EVSuite**. The workspace `AGENTS.md` and normative
-workspace `DESIGN.md` apply; this file contains only telemetry-specific additions.
-
-## App-specific visual direction (2.2.6)
-
-The user explicitly requested a permanent OLED-black theme, charcoal glass-like cards,
-an accent the user picks from the MG4 paint colours (Dynamic Red #E0424C by default; the palette
-is theme attributes in `res/values/attrs_accent.xml` and `accents.xml` — use `?attr/evAccent…`,
-never a hard-coded accent hex). These app resources intentionally override the shared
-DESIGN.md palette, DayNight preference and flat-surface rules. Do not overwrite them
-with the shared token generator. Use static gradients rather than continuous effects;
-keep large touch targets, readable text and null telemetry shown as a dash.
-Wide layouts start at 1000dp; narrower windows use a bottom navigation bar.
+Start here. What this repository is, how its parts fit, how to build, test and ship, and the
+rules for changing it. Details live in the documents linked below; `SPECS.md` is the journal
+(status, to-dos, a dated log of every change) and is updated with each change.
 
 ## What this is
 
-An Android Automotive app for the **MG4 (SAIC eh32)** that reads vehicle telemetry and
-pushes it to A Better Route Planner. It runs on the car's head unit (AAOS 9, MT2712).
-
-Fork of Leon Kernan's `ABRP_Uploader` (MIT, like every fork after it). See `LICENSE.md`: the
-repository is MIT except `EVHardware/`, which is PolyForm Noncommercial — so the built APK may
-only be used and shared non-commercially. Keep every copyright line in `LICENSE`.
-
-## Non-negotiables
-
-1. **Telemetry is read-only.** No vehicle settings may be written. Window automation
-   was removed in 2.2.5 at the user's request, including its service and door listener.
-2. **A failed read is not a zero.** Getters return `Integer`/`Float`/`Boolean` and `null`
-   means "could not read". Null fields are omitted from the payload. Sending 0 for SOC
-   tells ABRP the battery is empty and wrecks a live route plan.
-3. **Fail closed.** Update origin, APK signature, unknown vehicle state — refuse rather
-   than assume.
-4. **Never let a credential reach a URL, a log line, or a crash report.**
-5. **AAOS 9 must stay stable.** A third-party app crashing the head unit is unacceptable.
-   Every car call goes through reflection with try/catch; keep it that way.
-6. **Power matters.** The head unit is awake whenever the car is on. No wake locks, no
-   alarms. The GPS subscription and the upload tick both cost power — keep them in step.
-
-## Architecture
+An app for the **MG4 (SAIC eh32)** head unit plus the backend it talks to:
 
 ```
-AbrpUploadService   foreground service; scheduler thread does all IPC and HTTP
-CarPropertyAdapter  reflection bridge to android.car (not on the compile classpath)
-TelemetryPayload    pure JSON building — no Android types, unit-tested
-UploadCadence       when a tick actually uploads — pure, unit-tested
-UploadSettings      user cadence configuration
-UploadLog           last 20 attempts + derived service state — pure, unit-tested
-SecurePrefs         credentials in EncryptedSharedPreferences, migrates plaintext
-AbrpApi             HTTP; credentials in the POST body, never the query string
-MainActivity        configuration, service state, upload log
+MG4 head unit (Android 9, AAOS, MT2712)
+  app/  "Nils' MG4" ──live data, consumption, charging──▶ server/ (Go) ──▶ InfluxDB 2 ◀── Grafana
+        │                                                   │ relays app releases from the forge
+        └──live data, straight, with the driver's own key──▶ ABRP (A Better Route Planner)
 ```
 
-**Put logic in the pure classes.** Anything Android-free can be unit-tested on the JVM;
-anything inside the service effectively cannot be tested without a car.
+- **app/** — Android app (Java, minSdk 27, runs on API 28). Reads the car through the
+  `EVHardware/` library, shows it (Overview, Consumption, Charging), sends live data to the
+  server and to ABRP, and updates itself.
+- **server/** — Go 1.26 API at `https://car.k8s.stinnesbeck.com`: stores telemetry, consumption
+  and charging in InfluxDB, pairs cars by QR code, carries settings typed on a phone, relays
+  app releases from the private forge. It does **not** talk to ABRP. See `server/README.md`.
+- **k8s/** — plain Kubernetes manifests (InfluxDB, server, Grafana with three provisioned
+  dashboards, Traefik routes). See `k8s/README.md`.
+- **EVHardware/** — vendored shared vehicle layer (PolyForm Noncommercial, see `LICENSE.md`).
 
-## Source sets
+Repository: `ssh://git@git.stinnesbeck.com:2222/nils/mg4.git` (remote `origin`), work branch
+`english-translation`. Upstream fork: `fatih` → github.com/fatihdonmezdev/FatihsMG4.
 
-| Set | Contents | Ships in |
-|---|---|---|
-| `main` | everything shared | all builds |
-| `stable` | `UpdateHook` no-op | stable channel |
-| `unstable` | active GitHub pre-release updater and PackageInstaller result receiver | unstable channel |
-| `debug` | `VhalProbe` — enumerates the whole VHAL | debug builds only |
-| `testUnstable` | OTA policy tests | test only |
+## Rules
 
-The stable channel does not merely disable self-update — the updater is **not in the
-APK**.
+1. **Nothing touches the Kubernetes cluster.** Write and validate manifests only; the owner
+   applies them. No `kubectl` against the cluster, not even read-only, unless asked.
+2. **Secrets.** Filled-in values only in `k8s/secrets/secrets.yaml` (gitignored);
+   `secrets.example.yaml` holds `CHANGE-ME` placeholders only. Stage files explicitly, check the
+   index for changes that are not yours (the owner works in parallel), and scan the staged diff
+   for secrets before every commit. Never print a token.
+3. **Telemetry is read-only.** The app never writes a vehicle setting.
+4. **A failed read is not a zero.** Unreadable values are `null`, omitted from payloads and
+   shown as "—". Sending 0 for SOC tells ABRP the battery is empty.
+5. **Fail closed.** Updates (origin, SHA-256, package, signature), credentials, unknown state.
+6. **No credential in a URL, a log line or a crash report.** Tokens go in headers or bodies.
+7. **The head unit must stay stable.** Every car call is reflection with try/catch; no
+   blocking car reads on the main thread.
+8. **Power.** No wake locks or alarms; GPS pauses while parked and idle.
+9. **Honesty.** Most behaviour cannot be verified off the car. Say what was tested (unit tests,
+   emulator, podman) and what was not. "Not tried on the car" is an acceptable answer.
 
-## Firmware generations
+## The car (confirmed on the owner's car, firmware `SWI68-29958-1300R69`)
 
-MG4 infotainment ships as SWI68 / SWI69 / SWI131 / SWI132 / SWI133 / SWI165, and they
-differ. Property IDs confirmed on one generation are not universal. Anything vehicle-facing
-must tolerate a property simply not existing.
+- Display 1920×720 px at **160 dpi**; the app window is **1778×720 px** (the car's own sidebar),
+  about **1778×640 dp** for layouts. Pages must fit that without scrolling where possible.
+- Signed with the public **AOSP test platform key**; the car build runs as `android.uid.system`.
+- Steering-wheel keys arrive as the broadcast `com.saic.keyevent.hardkey.report`
+  (`android.intent.extra.hardkey.keycode` / `.down` / `.longpress`); the voice key is **287**.
+- Not published by the car: battery, cabin and outside temperature, pack energy and capacity,
+  paint colour (only `ro.build.mtk2712.vehicle_type = AS28`). See `SPECS.md`, `FIRMWARE.md`.
+- No third-party apps in the MG launcher: the app opens by a double press of the voice key.
+- Its internet comes from the car itself (no Wi-Fi needed).
 
-**Two read paths, split by whether the signal is firmware-agnostic:**
+## The app
 
-| Signal | Read path | Firmwares |
-|---|---|---|
-| Speed, outside temp, park | `EVHardware` getters (`getVehicleSpeedKmh`, `getOutsideTempCelsius`, `isVehicleInPark`) | all six — EVHardware branches per generation internally |
-| SOC, range | `CarPropertyAdapter` vendor IDs (`0x2160F404`, `0x2140F41C`) | **SWI68 only** |
-| Charge rate/port, cabin temp | `CarPropertyAdapter` standard-AAOS IDs | wherever the VHAL implements them |
+| Tab | Contents |
+|---|---|
+| Overview | value tiles (battery, range, range/usage/energy since start, 5-min averages of range, usage, power, speed), vehicle info, tyre pressures; read every 0.5 s on a background thread |
+| Consumption / Charging | period totals, daily log, charging sessions and curve |
+| Live data | on/off, ABRP API key and user token, upload frequency |
+| Server | URL, pairing by QR, ingest token, installation ID (read-only), config import |
+| Settings | full screen, voice key, tyre unit, accent colour, battery, charging price, version, update check, install from USB, About |
+| Logs | upload log |
 
-`EVHardware.init()` is called in `AbrpUploadService.onCreate()` (idempotent); it detects
-the generation and picks the right underlying API. Fields it covers therefore work on every
-supported firmware.
+Key classes (`app/src/main/java/com/evsuite/abrp/`): `AbrpUploadService` (foreground service,
+15 s tick), `TelemetryUploader` (+ `TelemetryQueue`, persisted), `TelemetryPayload` (server
+limits), `AbrpApi`/`AbrpConfig`, `ServerHttp`/`ServerConfig`/`PairingClient`/
+`PhoneSettingsClient`, `ConsumptionTracker`/`ConsumptionCloudClient`, `ChargeSessionTracker`,
+`RangeEstimator`, `SecurePrefs`, `ConfigImport`, `SteeringKeyListener`, `MainActivity` (UI).
+Updater (car build only): `app/src/unstable/` `OtaUpdater`, `UpdateHook`, `UsbUpdate`.
 
-**Reference firmware: `SWI68-29958-1300R69`.** The vendor EV IDs still in
-`CarPropertyAdapter` are supported only on SWI68 firmware. EVHardware
-has **no EV-battery abstraction for any generation**, so SOC and range cannot go through it;
-until those vendor IDs are confirmed on the other generations they stay SWI68-only, and on
-another firmware they may silently return nothing (handled safely — the field is omitted, but
-SOC/range would be missing). Re-confirm with `VhalProbe` before trusting the vendor IDs on any
-other generation.
+**Put logic in pure, unit-tested classes** (no Android types); the service and activity are
+hard to test without a car.
 
-## Working here
+**UI conventions:** OLED black, glass cards, an accent the user picks from the MG4 paints —
+always `?attr/evAccent…` (`res/values/attrs_accent.xml`, overlays in `accents.xml`), never a
+hard-coded accent hex. All UI text in `strings.xml`. 72 dp touch targets. Values right-aligned
+with tabular digits. Drop-downs are Material exposed dropdown menus and dialogs go through
+`showKeepingFullScreen` — a Spinner or a plain dialog brings the car's bars back. Android 9
+crashes on gradients with theme colours: use layers.
 
-```bash
-mise run check      # what CI runs: permission gate + lint + unit tests
-mise run build
-mise run logs       # adb logcat, filtered to this app
+**Flavours:** `stable` (no updater at all) and `unstable` (the car build: system UID, OTA and USB
+install). The car always gets `unstable`.
+
+## Build, test, ship
+
+```sh
+nix develop                                   # JDK 21, Android SDK, Go
+./gradlew testStableDebugUnitTest testUnstableDebugUnitTest lintStableDebug
+build-car                                     # build/car/NilsMG4-unstable-<version>.apk + .sha256
+publish-car                                   # pre-release car-<version> on the forge (needs a token)
+cd server && go vet ./... && go test ./... && govulncheck ./...
 ```
 
-Gradle needs JDK 17. If a build fails in `JdkImageTransform` complaining about `jlink`,
-a stale Gradle daemon started by VS Code's Java extension is being reused —
-`pkill -f GradleDaemon` and retry.
+- **Versions:** three-part `versionName` in `app/build.gradle`; raise `versionCode` by one with
+  every build that goes to the car (a lower code is refused as a downgrade).
+- **Getting it to the car:** in-app update (Settings → Check for updates, via the server), or
+  Install from USB stick (APK + `.sha256` in the stick's top folder), or the first time through
+  the Bluetooth-settings file manager (`README.md`). `OTA.md` has the whole flow.
+- **Server image:** `podman build` in `server/`, push to `git.stinnesbeck.com/nils/mg4-server:<v>`,
+  pin the pushed digest in `k8s/server.yaml`. Validate manifests offline with
+  `kustomize build k8s | kubeconform` (see `k8s/README.md`).
+- **Emulator:** `nix run .#car-emulator` (add `-no-window` for headless) starts an Android 9 AOSP
+  emulator at 1920×720, 160 dpi on port 5560 (state in `build/emulator/`). Its image shares the
+  car's platform key, so the car build installs as the system user. `adb shell wm size 1778x640`
+  gives the car's app window (taps then use those coordinates; screenshots stay 1920×720). It has
+  no car data (every value is "—"). While the app is open, `uiautomator dump` never sees an idle
+  screen; use screenshots.
+- **After each change:** a `SPECS.md` done-log entry, docs that the change affects, explicit
+  staging, commit, push.
 
-## Things that will bite you
+## Documents
 
-- **`android.car` is not on the compile classpath.** Everything car-related is reflection.
-  R8 cannot see those uses, so `proguard-rules.pro` keeps them by name.
-- **Unit tests get a stub `org.json`** from `android.jar` that returns null. The real
-  implementation is added as a test dependency; do not remove it.
-- **`service_running` in preferences goes stale-true** after a force-kill. Use
-  `AbrpUploadService.isRunning()`.
-- **Permission changes fail CI** until allowlisted with a justification.
-
-## Honesty requirements
-
-Most of this cannot be verified off a vehicle. When reporting work, state plainly what was
-tested and what was not. "Unit tests pass, not tried on the car" is the expected and
-acceptable answer. Do not imply road-testing that did not happen.
+| File | What |
+|---|---|
+| `SPECS.md` | journal: architecture, status, signals the car lacks, to-dos, dated done-log |
+| `README.md` | user-facing overview, install, setup, config file |
+| `OTA.md` | releases, the updater's checks, USB install |
+| `FIRMWARE.md` | the head unit, firmware generations, display |
+| `server/README.md`, `k8s/README.md` | API, configuration, deployment |
+| `LICENSE.md` | MIT, EVHardware's PolyForm Noncommercial, the fork chain |
+| `DESIGN.md`, `CHANGELOG.md` | upstream's design system and release history |
diff --git a/SPECS.md b/SPECS.md
index 3234c6c..aa47a41 100644
--- a/SPECS.md
+++ b/SPECS.md
@@ -112,6 +112,10 @@ tyre pressures, GPS (lat, lon, elevation, heading) and the is_* flags. It does *
   INGEST_TOKEN) into git and pushed it. Commit amended and force-pushed; both values regenerated in
   the now gitignored `k8s/secrets.yaml` (since moved to `k8s/secrets/secrets.yaml`, outside
   `kubectl apply -f k8s/`). Filled-in secrets live only there from now on.
+- 2026-10-18 — AGENTS.md rewritten as the entry point for agents: what the project is, rules,
+  confirmed car facts, app structure, UI conventions, build/test/ship, documents. It replaces
+  upstream's EVABRPUploader text. The test emulator is now in the flake: `nix run .#car-emulator`
+  (Android 9 AOSP at 1920×720, 160 dpi; the car build installs as the system user — checked).
 - 2026-10-18 — App 2.18.0: Settings → App → "Install from USB stick" (car build only): the newest
   `NilsMG4-unstable-<version>.apk` newer than the installed one in a stick's top folder, checked
   against its `.sha256` and the package, installed with the OTA installer session. Tested on the
diff --git a/flake.nix b/flake.nix
index 1b7b9d5..6a9d01d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -182,5 +182,58 @@
             '';
           };
         });
+
+      # An Android 9 emulator shaped like the head unit, for testing the car build: the AOSP
+      # "default" image is signed with the same public platform key, so the car APK installs
+      # there as the system user too. 1920x720 at 160 dpi; `adb shell wm size 1778x640` gives
+      # the app window the car leaves. No vehicle data: every value shows "—". Not in the dev
+      # shell, because the emulator and its image are a large download.
+      #   nix run .#car-emulator        (from the checkout; state in build/emulator/)
+      packages.x86_64-linux.car-emulator =
+        let
+          pkgs = import nixpkgs {
+            system = "x86_64-linux";
+            config = { allowUnfree = true; android_sdk.accept_license = true; };
+          };
+          emu = (pkgs.androidenv.composeAndroidPackages {
+            platformVersions = [ "28" ];
+            includeEmulator = true;
+            includeSystemImages = true;
+            systemImageTypes = [ "default" ];
+            abiVersions = [ "x86_64" ];
+            includeNDK = false;
+          }).androidsdk;
+        in
+        pkgs.writeShellApplication {
+          name = "car-emulator";
+          runtimeInputs = [ pkgs.coreutils pkgs.gnugrep ];
+          text = ''
+            root=$(git rev-parse --show-toplevel 2>/dev/null || pwd)
+            state="$root/build/emulator"
+            mkdir -p "$state/avd" "$state/home"
+            export ANDROID_HOME=${emu}/libexec/android-sdk ANDROID_SDK_ROOT=${emu}/libexec/android-sdk
+            export ANDROID_AVD_HOME="$state/avd" ANDROID_EMULATOR_HOME="$state/home" ANDROID_USER_HOME="$state/home"
+            avd="$state/avd/mg4test.avd"
+            if [ ! -d "$avd" ]; then
+              echo no | ${emu}/bin/avdmanager create avd -n mg4test \
+                -k "system-images;android-28;default;x86_64" --force -p "$avd"
+              {
+                echo "hw.lcd.width=1920"
+                echo "hw.lcd.height=720"
+                echo "hw.lcd.density=160"
+                echo "hw.ramSize=2G"
+                echo "disk.dataPartition.size=10G"
+              } >> "$avd/config.ini"
+            fi
+            echo "Starting the MG4-shaped emulator on port 5560 (adb: emulator-5560); Ctrl-C stops it."
+            echo "adb: ${emu}/bin/adb -s emulator-5560"
+            exec "$ANDROID_HOME/emulator/emulator" -avd mg4test -no-audio -no-boot-anim \
+              -gpu swiftshader_indirect -no-snapshot -port 5560 "$@"
+          '';
+        };
+      apps.x86_64-linux.car-emulator = {
+        type = "app";
+        program = "${self.packages.x86_64-linux.car-emulator}/bin/car-emulator";
+      };
     };
 }