fix(eucstats-meta): split wheel serial out of the model name

The InMotion P6 adapter was concatenating its serial into the model
name ("InMotion P6 (SN12345)") as a temporary workaround until a
proper P6 parser landed. The KingSong 0xB3 sub-cmd was doing the
same thing — emitting a ModelName whose `name` was the bare serial,
which overwrote the model set by the earlier 0xBB sub-cmd.

Both made the eucstats upload meta non-uniform across riders: V14
uploads as `model = "InMotion V14"`, P6 was uploading as `model =
"InMotion P6 (SN12345)"`, KingSong as `model = "SN98765432"`.

Add a proper DecodeResult.Serial slot, lift the serial out of both
adapters into it, route it through WheelRepository.wheelSerial, and
populate the eucstats meta's existing `serial` JSON field that was
previously hardcoded to null.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Author: eried

app/src/main/java/com/eried/eucplanet/ble/InMotionV2Adapter.kt

@@ -421,15 +421,16 @@ class InMotionV2Adapter @Inject constructor() : WheelAdapter {
                 } ?: DecodeResult.Unknown
             }
             0x06 -> {
-                // info bundle: skip `02 86 01 00`, then ASCII serial follows the
-                // 0x01 record marker. We surface the serial as the model name so
-                // the dashboard has *something* to identify the wheel until a
-                // proper P6 parser lands.
+                // info bundle: skip `02 86 01 00`, then ASCII serial follows
+                // the 0x01 record marker. Emit the serial in its own decode
+                // result so the eucstats upload meta gets `model = "InMotion
+                // P6"` (uniform with V14 / V12) and `serial = "..."` in a
+                // separate JSON field. The dashboard label was already set
+                // earlier from notifyConnectingTo (line 72), so we don't need
+                // to re-emit a ModelName here.
                 if (data.size < 4) return DecodeResult.Unknown
                 val serial = InMotionV2Parser.parseP6Serial(data.copyOfRange(4, data.size))
-                if (serial != null) {
-                    DecodeResult.ModelName("InMotion P6 ($serial)", InMotionV2Model.P6)
-                } else DecodeResult.Unknown
+                if (serial != null) DecodeResult.Serial(serial) else DecodeResult.Unknown
             }
             0x20 -> {
                 // settings page A: `02 a0 [body]`. The body starts with a 0x20

app/src/main/java/com/eried/eucplanet/ble/KingsongAdapter.kt

@@ -191,8 +191,13 @@ class KingsongAdapter @Inject constructor() : WheelAdapter {
                 results
             }
             0xB3 -> {
+                // Serial reply from the 0xB3 sub-cmd. Was previously
+                // overwriting the model name (set earlier by the 0xBB
+                // sub-cmd) so the dashboard label and eucstats upload meta
+                // ended up showing the bare serial instead of "KingSong
+                // S22" / etc. Emit it in its own slot so model stays clean.
                 val serial = KingsongParser.parseSerial(rawBytes) ?: return emptyList()
-                listOf(DecodeResult.ModelName(serial, detectedModel))
+                listOf(DecodeResult.Serial(serial))
             }
             0xF5 -> {
                 val cpu = KingsongParser.parseCpuPwm(rawBytes) ?: return emptyList()

app/src/main/java/com/eried/eucplanet/ble/WheelAdapter.kt

@@ -308,6 +308,11 @@ sealed class DecodeResult {
      * for display.
      */
     data class ModelName(val name: String, val model: Any? = null) : DecodeResult()
+    /** Wheel-reported serial number. Stays out of [ModelName.name] so the
+     *  eucstats upload meta keeps `model` uniform across families (e.g.
+     *  "InMotion P6", never "InMotion P6 (SN12345)") and the `serial` slot
+     *  carries the per-unit identifier separately. */
+    data class Serial(val serial: String) : DecodeResult()
     data class Firmware(val display: String, val mainBoard: String, val driverBoard: String, val ble: String) : DecodeResult()
     data class TotalDistance(val km: Float) : DecodeResult()
     data class AuthKey(val encryptedKey: ByteArray) : DecodeResult() {

app/src/main/java/com/eried/eucplanet/data/repository/TripRepository.kt

@@ -393,7 +393,7 @@ class TripRepository @Inject constructor(
         val wheelMeta = buildWheelMetaJson(
             brand = wheelRepository.connectedBrand.value,
             model = wheelRepository.modelName.value,
-            serial = null,
+            serial = wheelRepository.wheelSerial.value,
             bleMac = settingsRepository.get().lastDeviceAddress,
             bleName = wheelRepository.connectedDeviceName.value,
             firmware = wheelRepository.firmwareVersion.value,

app/src/main/java/com/eried/eucplanet/data/repository/WheelRepository.kt

@@ -248,6 +248,13 @@ class WheelRepository @Inject constructor(
     private val _modelName = MutableStateFlow<String?>(null)
     val modelName: StateFlow<String?> = _modelName.asStateFlow()
 
+    // Wheel serial number reported by the firmware (currently emitted by the
+    // KingSong 0xB3 sub-cmd and the InMotion P6 0x06 info bundle). Separate
+    // from modelName so eucstats meta carries them in different JSON fields
+    // and the dashboard's model label stays uniform across riders.
+    private val _wheelSerial = MutableStateFlow<String?>(null)
+    val wheelSerial: StateFlow<String?> = _wheelSerial.asStateFlow()
+
     private val _firmwareVersion = MutableStateFlow<String?>(null)
     val firmwareVersion: StateFlow<String?> = _firmwareVersion.asStateFlow()
 
@@ -557,6 +564,7 @@ class WheelRepository @Inject constructor(
                         chargeTempHist.clear()
                         _chargingSnapshot.value = ChargingSnapshot()
                         _modelName.value = null
+                        _wheelSerial.value = null
                         _firmwareVersion.value = null
                         _maxSpeedCap.value = DEFAULT_MAX_SPEED_KMH
                         _wheelData.value =
@@ -1302,6 +1310,10 @@ class WheelRepository @Inject constructor(
                 _firmwareVersion.value = result.display
                 Log.i(TAG, "Firmware: Main=${result.mainBoard} Drv=${result.driverBoard} BLE=${result.ble}")
             }
+            is DecodeResult.Serial -> {
+                _wheelSerial.value = result.serial
+                Log.i(TAG, "Wheel serial: ${result.serial}")
+            }
             is DecodeResult.AuthKey -> {
                 Log.i(TAG, "Auth key received: ${result.encryptedKey.joinToString(" ") { "%02X".format(it) }}")
                 pendingAuthKeyDeferred?.complete(result.encryptedKey)