Service Mode: wheel-family pickers in Commands and Inspect tabs

WheelAdapter gains familyDisplayName + inspectMessageTypes() so each
adapter declares what it contributes to Service Mode. CompositeWheelAdapter
exposes allFamilies so the ViewModel can browse every family's catalogue
without owning the wiring itself.

Inspect tab: family dropdown + message-type dropdown side-by-side.
Families with no inspect prefixes are filtered out. InMotion V2 currently
contributes V14 realtime / P6 realtime / P6 detailed.

Commands tab: family dropdown at the top. Empty families show "(empty)"
in the picker; selecting one shows a "no commands defined yet — use Raw"
message. As we author each family's catalogue (in follow-up commits),
the empty markers go away automatically.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: eried

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

@@ -25,6 +25,7 @@ import javax.inject.Singleton
 @Singleton
 class BegodeAdapter @Inject constructor() : WheelAdapter {
     override val familyId = "begode"
+    override val familyDisplayName = "Begode / Gotway"
     override val capabilities = WheelCapabilities.BEGODE
 
     @Volatile private var detectedModel: BegodeModel? = null

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

@@ -29,6 +29,16 @@ class CompositeWheelAdapter @Inject constructor(
 
     @Volatile private var active: WheelAdapter = inmotion
 
+    /**
+     * Every wheel-family adapter the Composite knows about, in the order
+     * they should appear in the Service Mode wheel-family picker. Exposed
+     * here so the diagnostics ViewModel can browse every family's command
+     * catalogue / inspect prefixes without owning its own wiring.
+     */
+    val allFamilies: List<WheelAdapter> = listOf(
+        inmotion, kingsong, veteran, begode, ninebot, inmotionV1
+    )
+
     override val familyId: String get() = active.familyId
     override val capabilities: WheelCapabilities get() = active.capabilities
 

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

@@ -23,6 +23,7 @@ import javax.inject.Singleton
 class InMotionV1Adapter @Inject constructor() : WheelAdapter {
 
     override val familyId = "inmotion_v1"
+    override val familyDisplayName = "InMotion V1 / V3 / V5 / V8"
     override val capabilities = WheelCapabilities.INMOTION_V1
 
     @Volatile private var detectedModel: InMotionV1Model? = null

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

@@ -21,8 +21,12 @@ import javax.inject.Singleton
 class InMotionV2Adapter @Inject constructor() : WheelAdapter {
 
     override val familyId: String = "inmotion_v2"
+    override val familyDisplayName: String = "InMotion V14 / V12 / P6"
     override val capabilities: WheelCapabilities = WheelCapabilities.INMOTION_V2
 
+    override fun inspectMessageTypes(): List<String> =
+        listOf("V14 realtime", "P6 realtime", "P6 detailed")
+
     /**
      * Detected model from the wheel's MainInfo response. Set the first time
      * [decode] sees a CarType packet on each connection.

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

@@ -19,6 +19,7 @@ import javax.inject.Singleton
 @Singleton
 class KingsongAdapter @Inject constructor() : WheelAdapter {
     override val familyId = "kingsong"
+    override val familyDisplayName = "KingSong"
     override val capabilities = WheelCapabilities.KINGSONG
 
     @Volatile private var detectedModel: KingsongModel? = null

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

@@ -68,6 +68,7 @@ class NinebotAdapter @Inject constructor() : WheelAdapter {
     @Volatile private var settingsCursor: Int = 0
 
     override val familyId = "ninebot"
+    override val familyDisplayName = "Ninebot"
     override val capabilities: WheelCapabilities
         get() = if (activeProtocol == NinebotProtocol.Z)
             WheelCapabilities.NINEBOT_Z

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

@@ -29,6 +29,7 @@ import javax.inject.Singleton
 @Singleton
 class VeteranAdapter @Inject constructor() : WheelAdapter {
     override val familyId = "veteran"
+    override val familyDisplayName = "Veteran"
     override val capabilities = WheelCapabilities.VETERAN
 
     @Volatile private var detectedModel: VeteranModel? = null

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

@@ -183,6 +183,21 @@ interface WheelAdapter {
      * the dialog; adapters override when they have hypotheses to test.
      */
     fun getDiagnosticCommands(): List<com.eried.eucplanet.diagnostics.DiagnosticCommand> = emptyList()
+
+    /**
+     * Friendly name for the wheel family. Used in Service Mode's wheel-family
+     * pickers so the user can browse any family's catalogue regardless of
+     * what's actually connected. Defaults to [familyId].
+     */
+    val familyDisplayName: String get() = familyId
+
+    /**
+     * Service Mode "Inspect" tab subscribes to NOTE entries whose text starts
+     * with one of these prefixes. Adapters that log realtime / detail bodies
+     * via DiagnosticsLogger.note() should list those prefixes here so the
+     * picker offers them. Default empty.
+     */
+    fun inspectMessageTypes(): List<String> = emptyList()
 }
 
 /**

app/src/main/java/com/eried/eucplanet/diagnostics/WheelDiagnosticsDialog.kt

@@ -436,61 +436,101 @@ private fun LogRow(e: DiagnosticsLogger.Entry) {
 
 @Composable
 private fun CommandsTab(vm: WheelDiagnosticsViewModel) {
-    // Re-fetch when the wheel reports its model — without this re-key, opening
-    // Service Mode before connecting freezes the list at empty even after the
-    // P6 identifies itself.
+    // Wheel-family picker at the top so the catalogue is browsable
+    // regardless of what's actually connected — useful when the user wants
+    // to research a different family than the one they're paired with.
     val model by vm.modelName.collectAsState()
-    val cmds = remember(model) { vm.diagnosticCommands() }
-    if (cmds.isEmpty()) {
-        Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-            Text(
-                if (model == null)
-                    "Connect to a wheel to see its diagnostic commands.\nMeanwhile use the Raw tab to send arbitrary bytes."
-                else
-                    "No diagnostic commands defined for ${model}.\nUse the Raw tab to send arbitrary bytes.",
-                style = MaterialTheme.typography.bodyMedium,
-                color = MaterialTheme.colorScheme.onSurfaceVariant
-            )
+    val families = remember(model) { vm.allWheelFamilies() }
+    var selectedFamily by remember(families) { mutableStateOf(families.firstOrNull()) }
+    var familyMenuExpanded by remember { mutableStateOf(false) }
+    val cmds = selectedFamily?.commands ?: emptyList()
+
+    Column(modifier = Modifier.fillMaxSize()) {
+        Box(modifier = Modifier.padding(top = 8.dp, start = 4.dp)) {
+            OutlinedButton(onClick = { familyMenuExpanded = true }) {
+                Text(selectedFamily?.displayName ?: "(no families)")
+                Spacer(Modifier.width(6.dp))
+                Icon(
+                    imageVector = Icons.Default.KeyboardArrowDown,
+                    contentDescription = null
+                )
+            }
+            androidx.compose.material3.DropdownMenu(
+                expanded = familyMenuExpanded,
+                onDismissRequest = { familyMenuExpanded = false }
+            ) {
+                families.forEach { f ->
+                    androidx.compose.material3.DropdownMenuItem(
+                        text = {
+                            Row(verticalAlignment = Alignment.CenterVertically) {
+                                Text(f.displayName)
+                                if (f.commands.isEmpty()) {
+                                    Spacer(Modifier.width(6.dp))
+                                    Text(
+                                        "(empty)",
+                                        style = MaterialTheme.typography.labelSmall,
+                                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                                    )
+                                }
+                            }
+                        },
+                        onClick = { selectedFamily = f; familyMenuExpanded = false }
+                    )
+                }
+            }
         }
-        return
-    }
-
-    val grouped = remember(cmds) { cmds.groupBy { it.category } }
 
-    LazyColumn(modifier = Modifier.fillMaxSize().padding(top = 8.dp)) {
-        grouped.forEach { (category, list) ->
-            item {
+        if (cmds.isEmpty()) {
+            Box(
+                modifier = Modifier.fillMaxSize(),
+                contentAlignment = Alignment.Center
+            ) {
                 Text(
-                    category.name,
-                    style = MaterialTheme.typography.labelMedium,
-                    color = MaterialTheme.colorScheme.primary,
-                    modifier = Modifier.padding(top = 12.dp, bottom = 4.dp)
+                    "No diagnostic commands defined for ${selectedFamily?.displayName ?: "this family"} yet.\nUse the Raw tab to send arbitrary bytes.",
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant
                 )
             }
-            item {
-                LazyVerticalGrid(
-                    columns = GridCells.Adaptive(110.dp),
-                    contentPadding = PaddingValues(2.dp),
-                    horizontalArrangement = Arrangement.spacedBy(6.dp),
-                    verticalArrangement = Arrangement.spacedBy(6.dp),
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .heightIn(max = (((list.size + 2) / 3) * 64 + 16).dp)
-                ) {
-                    items(list) { cmd ->
-                        OutlinedButton(
-                            onClick = { vm.fireCommand(cmd) },
-                            modifier = Modifier.fillMaxWidth()
-                        ) {
-                            Column {
-                                Text(cmd.label, style = MaterialTheme.typography.labelLarge)
-                                Text(
-                                    cmd.description,
-                                    style = MaterialTheme.typography.labelSmall,
-                                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                                    maxLines = 2,
-                                    overflow = TextOverflow.Ellipsis
-                                )
+            return@Column
+        }
+
+        val grouped = remember(cmds) { cmds.groupBy { it.category } }
+
+        LazyColumn(modifier = Modifier.fillMaxSize().padding(top = 8.dp)) {
+            grouped.forEach { (category, list) ->
+                item {
+                    Text(
+                        category.name,
+                        style = MaterialTheme.typography.labelMedium,
+                        color = MaterialTheme.colorScheme.primary,
+                        modifier = Modifier.padding(top = 12.dp, bottom = 4.dp)
+                    )
+                }
+                item {
+                    LazyVerticalGrid(
+                        columns = GridCells.Adaptive(110.dp),
+                        contentPadding = PaddingValues(2.dp),
+                        horizontalArrangement = Arrangement.spacedBy(6.dp),
+                        verticalArrangement = Arrangement.spacedBy(6.dp),
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .heightIn(max = (((list.size + 2) / 3) * 64 + 16).dp)
+                    ) {
+                        items(list) { cmd ->
+                            OutlinedButton(
+                                onClick = { vm.fireCommand(cmd) },
+                                modifier = Modifier.fillMaxWidth()
+                            ) {
+                                Column {
+                                    Text(cmd.label, style = MaterialTheme.typography.labelLarge)
+                                    Text(
+                                        cmd.description,
+                                        style = MaterialTheme.typography.labelSmall,
+                                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                                        maxLines = 2,
+                                        overflow = TextOverflow.Ellipsis
+                                    )
+                                }
                             }
                         }
                     }
@@ -511,9 +551,25 @@ private fun CommandsTab(vm: WheelDiagnosticsViewModel) {
 @Composable
 private fun InspectTab(vm: WheelDiagnosticsViewModel) {
     val entries by vm.entries.collectAsState()
-    val types = vm.inspectMessageTypes
-    var selected by remember { mutableStateOf(types.first()) }
+    // Folderized: pick a wheel family first, then a message type within it.
+    // Families with no inspect prefixes are filtered out so the picker only
+    // shows actionable rows.
+    val families = remember { vm.allWheelFamilies().filter { it.inspectPrefixes.isNotEmpty() } }
+    var selectedFamily by remember { mutableStateOf(families.firstOrNull()) }
+    val types = selectedFamily?.inspectPrefixes ?: emptyList()
+    var selected by remember(selectedFamily) {
+        mutableStateOf(types.firstOrNull() ?: "")
+    }
+    var familyMenuExpanded by remember { mutableStateOf(false) }
     var menuExpanded by remember { mutableStateOf(false) }
+    if (selectedFamily == null) {
+        Text(
+            "No wheel families publish realtime traces yet.",
+            style = MaterialTheme.typography.bodySmall,
+            modifier = Modifier.padding(16.dp)
+        )
+        return
+    }
 
     val latestBytes: List<Int> = remember(entries, selected) {
         val match = entries.lastOrNull {
@@ -525,27 +581,52 @@ private fun InspectTab(vm: WheelDiagnosticsViewModel) {
     }
 
     Column(modifier = Modifier.fillMaxSize().padding(8.dp)) {
-        // Type picker. Just one or two options today, so a tiny dropdown is
-        // sufficient — no need for the heavier SimpleDropdown helper.
-        Box {
-            OutlinedButton(onClick = { menuExpanded = true }) {
-                Text(selected)
-                Spacer(Modifier.width(6.dp))
-                Icon(
-                    imageVector = Icons.Default.KeyboardArrowDown,
-                    contentDescription = null
-                )
+        // Two dropdowns side-by-side: pick a wheel family, then pick a
+        // message type within it. Families with multiple prefixes show all
+        // their options; families with one prefix auto-pick it.
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            Box {
+                OutlinedButton(onClick = { familyMenuExpanded = true }) {
+                    Text(selectedFamily?.displayName ?: "")
+                    Spacer(Modifier.width(6.dp))
+                    Icon(
+                        imageVector = Icons.Default.KeyboardArrowDown,
+                        contentDescription = null
+                    )
+                }
+                androidx.compose.material3.DropdownMenu(
+                    expanded = familyMenuExpanded,
+                    onDismissRequest = { familyMenuExpanded = false }
+                ) {
+                    families.forEach { f ->
+                        androidx.compose.material3.DropdownMenuItem(
+                            text = { Text(f.displayName) },
+                            onClick = { selectedFamily = f; familyMenuExpanded = false }
+                        )
+                    }
+                }
             }
-            androidx.compose.material3.DropdownMenu(
-                expanded = menuExpanded,
-                onDismissRequest = { menuExpanded = false }
-            ) {
-                types.forEach { t ->
-                    androidx.compose.material3.DropdownMenuItem(
-                        text = { Text(t) },
-                        onClick = { selected = t; menuExpanded = false }
+            Spacer(Modifier.width(8.dp))
+            Box {
+                OutlinedButton(onClick = { menuExpanded = true }) {
+                    Text(selected.ifEmpty { "(message)" })
+                    Spacer(Modifier.width(6.dp))
+                    Icon(
+                        imageVector = Icons.Default.KeyboardArrowDown,
+                        contentDescription = null
                     )
                 }
+                androidx.compose.material3.DropdownMenu(
+                    expanded = menuExpanded,
+                    onDismissRequest = { menuExpanded = false }
+                ) {
+                    types.forEach { t ->
+                        androidx.compose.material3.DropdownMenuItem(
+                            text = { Text(t) },
+                            onClick = { selected = t; menuExpanded = false }
+                        )
+                    }
+                }
             }
         }
 

app/src/main/java/com/eried/eucplanet/diagnostics/WheelDiagnosticsViewModel.kt

@@ -159,6 +159,35 @@ class WheelDiagnosticsViewModel @Inject constructor(
 
     fun diagnosticCommands(): List<DiagnosticCommand> = wheelAdapter.getDiagnosticCommands()
 
+    /**
+     * Service Mode is research-grade: a user with a V14 in front of them
+     * still benefits from being able to browse the KingSong or Veteran
+     * command catalogue. We expose every family's catalogue keyed by its
+     * display name so the picker UI can show them all, regardless of what's
+     * actually connected.
+     */
+    data class WheelFamily(
+        val displayName: String,
+        val commands: List<DiagnosticCommand>,
+        val inspectPrefixes: List<String>
+    )
+
+    fun allWheelFamilies(): List<WheelFamily> {
+        val composite = wheelAdapter as? com.eried.eucplanet.ble.CompositeWheelAdapter
+            ?: return listOf(WheelFamily(
+                displayName = wheelAdapter.familyDisplayName,
+                commands = wheelAdapter.getDiagnosticCommands(),
+                inspectPrefixes = wheelAdapter.inspectMessageTypes()
+            ))
+        return composite.allFamilies.map {
+            WheelFamily(
+                displayName = it.familyDisplayName,
+                commands = it.getDiagnosticCommands(),
+                inspectPrefixes = it.inspectMessageTypes()
+            )
+        }
+    }
+
     fun fireCommand(cmd: DiagnosticCommand) {
         DiagnosticsLogger.cmd(cmd.label, cmd.bytes)
         bleManager.writeCommand(cmd.bytes)
@@ -264,7 +293,13 @@ class WheelDiagnosticsViewModel @Inject constructor(
 
     /** Message-type prefixes the Inspect tab can subscribe to. The strings
      *  must match the prefix the adapter writes via DiagnosticsLogger.note. */
-    val inspectMessageTypes: List<String> = listOf("V14 realtime", "P6 realtime", "P6 detailed")
+    /**
+     * Flat list of inspect prefixes across all wheel families. Kept for
+     * back-compat with the existing single-list dropdown until the UI
+     * fully migrates to the per-family picker via [allWheelFamilies].
+     */
+    val inspectMessageTypes: List<String>
+        get() = allWheelFamilies().flatMap { it.inspectPrefixes }
 
     /**
      * Categories the user can opt into when attaching extra context to the