From 5d26709d9c979eb84ddde070dd890dfbbd17bc15 Mon Sep 17 00:00:00 2001
From: MarcelineVPQ <marcyameliakuhn@outlook.com>
Date: Sun, 17 May 2026 08:00:28 -0600
Subject: [PATCH] =?UTF-8?q?rebase:=20Phase=20F=20=E2=80=94=20restore=200xF?=
 =?UTF-8?q?A=20/=200xFB=20feature=20reports=20for=20OLED=20emulator?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Same payload shapes as our prior 8bef1d2:
  0xFA — 28 bytes: 4 x bd_addr + 4 x occupied flag (Slots screen)
  0xFB — 18 bytes: uptime, usb_frames, bt_packets, peak_spk, peak_hap,
         hci_errs (Diagnostics + VU Meters screens)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 src/cmd.cpp | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/cmd.cpp b/src/cmd.cpp
index 8a2add8..a7ea06e 100644
--- a/src/cmd.cpp
+++ b/src/cmd.cpp
@@ -8,16 +8,20 @@
 #include <cstdio>
 #include <cstring>
 
+#include "audio.h"
 #include "bt.h"
 #include "config.h"
 #include "device/usbd.h"
 #include "pico/time.h"
+#include "slots.h"
 
 bool is_pico_cmd(uint8_t report_id) {
     if (report_id == 0xf6 ||
         report_id == 0xf7 ||
         report_id == 0xf8 ||
-        report_id == 0xf9
+        report_id == 0xf9 ||
+        report_id == 0xfa ||
+        report_id == 0xfb
     ) {
         return true;
     }
@@ -53,6 +57,42 @@ uint16_t pico_cmd_get(uint8_t report_id, uint8_t *buffer, uint16_t reqlen) {
 #endif
         return 1;
     }
+    if (report_id == 0xfa) {
+        // OLED Edition: 4 x bd_addr (6 bytes each) + 4 x occupied flag = 28 bytes.
+        constexpr uint16_t want = 28;
+        if (reqlen < want) {
+            printf("[HID] 0xfa reqlen=%u too small for slots payload (%u)\n", reqlen, want);
+            return 0;
+        }
+        for (int i = 0; i < 4; i++) {
+            uint8_t addr[6];
+            bt_slot_get_addr(i, addr);
+            memcpy(buffer + i * 6, addr, 6);
+        }
+        for (int i = 0; i < 4; i++) {
+            buffer[24 + i] = bt_slot_occupied(i) ? 1 : 0;
+        }
+        return want;
+    }
+    if (report_id == 0xfb) {
+        // OLED Edition: diagnostics + audio meters for the web emulator.
+        constexpr uint16_t want = 18;
+        if (reqlen < want) {
+            printf("[HID] 0xfb reqlen=%u too small for diag payload (%u)\n", reqlen, want);
+            return 0;
+        }
+        const uint32_t uptime_s   = time_us_32() / 1000000u;
+        const uint32_t usb_frames = audio_usb_frames();
+        const uint32_t bt_packets = audio_bt_packets();
+        const uint32_t hci_errs   = bt_hci_err_count();
+        memcpy(buffer + 0,  &uptime_s,   4);
+        memcpy(buffer + 4,  &usb_frames, 4);
+        memcpy(buffer + 8,  &bt_packets, 4);
+        buffer[12] = audio_peak_speaker();
+        buffer[13] = audio_peak_haptic();
+        memcpy(buffer + 14, &hci_errs,   4);
+        return want;
+    }
     return 0;
 }