Skip to content

Bluetooth#518

Open
Shadowtrance wants to merge 12 commits intoTactilityProject:mainfrom
Shadowtrance:bluetooth
Open

Bluetooth#518
Shadowtrance wants to merge 12 commits intoTactilityProject:mainfrom
Shadowtrance:bluetooth

Conversation

@Shadowtrance
Copy link
Copy Markdown
Contributor

@Shadowtrance Shadowtrance commented Apr 3, 2026

Bluetooth Host, Device, HID, Midi, SPP
Ahhhhhhhhhhhhhhhhhh!

Summary by CodeRabbit

  • New Features
    • Bluetooth radio control with enable/disable and "enable on boot" default set to off
    • Device discovery, scanning, pairing, and per-profile connect/disconnect (SPP, MIDI, HID)
    • BLE HID (keyboard/mouse/gamepad), BLE Serial and BLE MIDI support with auto-start options
    • New Bluetooth Management app and per-device settings UI (connect, forget, auto-connect)
    • Bluetooth status icons added to the system status bar and icon font glyphs updated

helps a little on S3 (t-deck)
Fixes external app start/stop server (child devices)
Fixes BtManage causing a full system hang upon disabling bt when a device is connected to the host.
This reverts commit d369436.
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 3, 2026

📝 Walkthrough

Walkthrough

Adds comprehensive Bluetooth support centered on an ESP32 NimBLE implementation. New platform drivers (radio, SPP/serial, MIDI, HID device, HID host, scan/resolution) and kernel C APIs expose radio control, scanning, pairing, profile connect/disconnect, and event callbacks. Persistent settings and per-device paired-device files are introduced, plus enable-on-boot/spp/midi flags. Build and device configuration are updated to conditionally include Bluetooth. LVGL fonts/icons and status-bar integration were added. Two new UI apps (BtManage, BtPeerSettings) provide management and per-device settings.

🚥 Pre-merge checks | ✅ 1 | ❌ 2

❌ Failed checks (1 warning, 1 inconclusive)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 20.87% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
Title check ❓ Inconclusive The PR title 'Bluetooth' is vague and generic. While it broadly relates to the changeset, it does not convey meaningful information about the specific implementation. Rename the title to be more specific and descriptive, such as 'Add Bluetooth Host, Device, HID, MIDI, and SPP drivers with management UI' or 'Implement complete Bluetooth stack with NimBLE integration'.
✅ Passed checks (1 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Copy link
Copy Markdown

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

Note

Due to the large number of review comments, Critical severity comments were prioritized as inline comments.

🟠 Major comments (20)
Tactility/Source/lvgl/Keyboard.cpp-35-35 (1)

35-35: ⚠️ Potential issue | 🟠 Major

Add software_keyboard_deactivate() before deleting keyboard group in GuiService.

At Keyboard.cpp lines 56-57, pending_keyboard_group is reused without validation when hardware keyboard reconnects. If GuiService deletes the keyboard group (GuiService.cpp line 215) without first calling software_keyboard_deactivate(), the pointer becomes stale, causing a crash on hardware reconnect.

The group lifecycle is not protected by widget cleanup alone—the group itself can be deleted while pending_keyboard_group still references it. Ensure software_keyboard_deactivate() is called before lv_group_delete(keyboardGroup) in GuiService::stop().

Also applies to: 56-57

Tactility/Source/Tactility.cpp-161-162 (1)

161-162: ⚠️ Potential issue | 🟠 Major

Gate the Bluetooth-only apps like the other optional hardware apps.

These manifests are registered unconditionally, unlike the USB/screenshot/chat/GPS entries around them. On builds where the Bluetooth stack is off, they will still be exposed from the app registry even though the feature is unavailable.

🛠️ Suggested fix
+#if defined(CONFIG_BT_NIMBLE_ENABLED)
     addAppManifest(app::btmanage::manifest);
     addAppManifest(app::btpeersettings::manifest);
+#endif
Tactility/Source/bluetooth/BluetoothMidi.cpp-22-26 (1)

22-26: ⚠️ Potential issue | 🟠 Major

Persist the MIDI disable request before checking for the child device.

Line 24 returns before setMidiAutoStart(false) runs. If the device is already absent, the user can disable MIDI and still have it auto-start again when Bluetooth comes back.

🛠️ Suggested fix
 void midiStop() {
-    struct Device* dev = bluetooth_midi_get_device();
-    if (dev == nullptr) return;
     settings::setMidiAutoStart(false);
+    struct Device* dev = bluetooth_midi_get_device();
+    if (dev == nullptr) return;
     bluetooth_midi_stop(dev);
 }
Tactility/Source/bluetooth/BluetoothSpp.cpp-22-26 (1)

22-26: ⚠️ Potential issue | 🟠 Major

Persist the disable action even when the SPP child device is already gone.

Line 24 returns before setSppAutoStart(false) runs. If the device disappears first, a user can still disable SPP and then have it auto-start again on the next Bluetooth restart.

🛠️ Suggested fix
 void sppStop() {
-    struct Device* dev = bluetooth_serial_get_device();
-    if (dev == nullptr) return;
     settings::setSppAutoStart(false);
+    struct Device* dev = bluetooth_serial_get_device();
+    if (dev == nullptr) return;
     bluetooth_serial_stop(dev);
 }
Tactility/Source/service/statusbar/Statusbar.cpp-164-167 (1)

164-167: ⚠️ Potential issue | 🟠 Major

Include HID links in the Bluetooth “connected” state.

connected is derived only from SPP and MIDI here. HID host/device sessions added in this PR can be active while the status bar still shows the idle/searching icon, so the Bluetooth indicator becomes misleading. Prefer a profile-agnostic “any Bluetooth connection up” check in this path.

Tactility/Source/bluetooth/BluetoothSettings.cpp-67-72 (1)

67-72: ⚠️ Potential issue | 🟠 Major

Save a snapshot taken under the mutex, not the unlocked global cache.

Each setter releases settings_mutex and then calls save(cached). Another thread can modify cached between those two steps, so the persisted flags can come from a different update than the caller just made.

🔒 Suggested fix
 void setEnableOnBoot(bool enable) {
+    BluetoothSettings snapshot;
     settings_mutex.lock();
     cached.enableOnBoot = enable;
     cached_valid = true;
+    snapshot = cached;
     settings_mutex.unlock();
-    if (!save(cached)) LOGGER.error("Failed to save");
+    if (!save(snapshot)) LOGGER.error("Failed to save");
 }
 
 void setSppAutoStart(bool enable) {
+    BluetoothSettings snapshot;
     settings_mutex.lock();
     cached.sppAutoStart = enable;
     cached_valid = true;
+    snapshot = cached;
     settings_mutex.unlock();
-    if (!save(cached)) LOGGER.error("Failed to save (setSppAutoStart)");
+    if (!save(snapshot)) LOGGER.error("Failed to save (setSppAutoStart)");
 }
 
 void setMidiAutoStart(bool enable) {
+    BluetoothSettings snapshot;
     settings_mutex.lock();
     cached.midiAutoStart = enable;
     cached_valid = true;
+    snapshot = cached;
     settings_mutex.unlock();
-    if (!save(cached)) LOGGER.error("Failed to save (setMidiAutoStart)");
+    if (!save(snapshot)) LOGGER.error("Failed to save (setMidiAutoStart)");
 }

Also applies to: 79-84, 91-96

Tactility/Source/bluetooth/BluetoothSettings.cpp-33-35 (1)

33-35: ⚠️ Potential issue | 🟠 Major

Don’t make the new enableOnBoot key mandatory when loading old settings.

enableOnBoot is introduced in this PR. Returning false when it is absent makes older /data/service/bluetooth/settings.properties files unreadable, so existing SPP/MIDI preferences get reset during migration instead of being preserved.

♻️ Suggested fix
-    auto it = map.find(KEY_ENABLE_ON_BOOT);
-    if (it == map.end()) return false;
-    out.enableOnBoot = (it->second == "true");
+    auto it = map.find(KEY_ENABLE_ON_BOOT);
+    out.enableOnBoot = (it != map.end() && it->second == "true");
Tactility/Source/app/btpeersettings/BtPeerSettings.cpp-71-80 (1)

71-80: ⚠️ Potential issue | 🟠 Major

Fail closed when the paired-device record cannot be loaded.

If bluetooth::settings::load(addrHex, device) fails, addr stays 00:00:00:00:00:00 and profileId stays BT_PROFILE_HID_HOST, but the screen still enables connect/disconnect/forget and the auto-connect toggle. That can target the wrong peer and also persist a replacement record with the wrong profile. Either rebuild the state from a trusted source (e.g. parsed addrHex plus peer metadata), or stop/disable this screen until the record is valid.

Also applies to: 108-119

Tactility/Source/bluetooth/BluetoothPairedDevice.cpp-8-13 (1)

8-13: ⚠️ Potential issue | 🟠 Major

Make the settings parser failure-safe.

load() returns false for most malformed properties, but std::stoi on profileId at line 73 can throw exceptions instead, breaking this error-handling contract. Corrupt .device.properties files could crash the caller. Switch to a non-throwing parse routine to maintain consistency—std::from_chars is already used elsewhere in the codebase and fully supported by the C++23 standard.

🛠️ Suggested change
 `#include` <dirent.h>
+#include <charconv>
 `#include` <format>
 `#include` <iomanip>
 `#include` <sstream>
 `#include` <string>
 `#include` <cstdio>
@@
 static bool hexToAddr(const std::string& hex, std::array<uint8_t, 6>& addr) {
     if (hex.size() != 12) {
         LOGGER.error("hexToAddr() length mismatch: expected 12, got {}", hex.size());
         return false;
     }
-    char buf[3] = { 0 };
     for (int i = 0; i < 6; ++i) {
-        buf[0] = hex[i * 2];
-        buf[1] = hex[i * 2 + 1];
-        char* endptr = nullptr;
-        addr[i] = static_cast<uint8_t>(strtoul(buf, &endptr, 16));
-        if (endptr != buf + 2) {
-            LOGGER.error("hexToAddr() invalid hex at byte {}: '{}{}'", i, buf[0], buf[1]);
+        const char* begin = hex.data() + (i * 2);
+        const char* end   = begin + 2;
+        unsigned    value = 0;
+        const auto [ptr, ec] = std::from_chars(begin, end, value, 16);
+        if (ec != std::errc{} || ptr != end || value > 0xFF) {
+            LOGGER.error("hexToAddr() invalid hex at byte {}: '{}{}'", i, begin[0], begin[1]);
             return false;
         }
+        addr[i] = static_cast<uint8_t>(value);
     }
     return true;
 }
@@
     if (map.contains(KEY_PROFILE_ID)) {
-        device.profileId = std::stoi(map[KEY_PROFILE_ID]);
+        const auto& raw = map[KEY_PROFILE_ID];
+        int         value = 0;
+        const auto [ptr, ec] = std::from_chars(raw.data(), raw.data() + raw.size(), value);
+        if (ec != std::errc{} || ptr != raw.data() + raw.size()) {
+            LOGGER.error("Invalid profileId '{}'", raw);
+            return false;
+        }
+        device.profileId = value;
     }

Also applies to: 35–51

Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble_spp.cpp-174-177 (1)

174-177: ⚠️ Potential issue | 🟠 Major

Don't drop the unread tail on partial SPP reads.

If max_len is smaller than the queued packet, this pops the whole frame after copying only the prefix. Any larger NUS packet gets truncated permanently.

Possible fix
     auto& front = sctx->rx_queue.front();
     size_t copy_len = std::min(front.size(), max_len);
     memcpy(data, front.data(), copy_len);
-    sctx->rx_queue.pop_front();
+    if (copy_len == front.size()) {
+        sctx->rx_queue.pop_front();
+    } else {
+        front.erase(front.begin(), front.begin() + copy_len);
+    }
Tactility/Source/bluetooth/Bluetooth.cpp-124-134 (1)

124-134: ⚠️ Potential issue | 🟠 Major

Don't make the radio-on auto-start branches mutually exclusive.

Right now only the first matching branch runs. A user with an auto-connect HID host peer and SPP/MIDI auto-start enabled will never get the peripheral servers started after radio-on.

Possible fix
                         if (has_hid_auto) {
                             LOGGER.info("HID host auto-connect peer found — starting scan");
                             if (struct Device* dev = findFirstDevice()) {
                                 bluetooth_scan_start(dev);
                             }
-                        } else if (settings::shouldSppAutoStart()) {
+                        }
+                        if (settings::shouldSppAutoStart()) {
                             LOGGER.info("Auto-starting SPP server");
                             sppStart();
-                        } else if (settings::shouldMidiAutoStart()) {
+                        }
+                        if (settings::shouldMidiAutoStart()) {
                             LOGGER.info("Auto-starting MIDI server");
                             midiStart();
                         }
Tactility/Source/app/btmanage/View.cpp-194-199 (1)

194-199: ⚠️ Potential issue | 🟠 Major

Filter paired peers out of the "Available" section.

Already-paired devices can render twice here. The duplicate row is wired as an unpaired scan result, so tapping it will try to pair again instead of opening peer settings.

Possible fix
         auto scan_results = state->getScanResults();
+        bool has_available = false;
+        for (const auto& record : scan_results) {
+            bool already_paired = false;
+            for (const auto& peer : paired) {
+                if (peer.addr == record.addr) {
+                    already_paired = true;
+                    break;
+                }
+            }
+            if (!already_paired) {
+                has_available = true;
+                break;
+            }
+        }
         lv_list_add_text(peers_list, "Available");
-        if (!scan_results.empty()) {
+        if (has_available) {
             for (size_t i = 0; i < scan_results.size(); ++i) {
+                bool already_paired = false;
+                for (const auto& peer : paired) {
+                    if (peer.addr == scan_results[i].addr) {
+                        already_paired = true;
+                        break;
+                    }
+                }
+                if (already_paired) continue;
                 createPeerListItem(scan_results[i], false, i);
             }
         } else if (!state->isScanning()) {
Tactility/Source/bluetooth/BluetoothHidHost.cpp-144-165 (1)

144-165: ⚠️ Potential issue | 🟠 Major

Release events need to reuse the translated key from the original press.

Line 150 remaps releases with mod == 0, so shifted letters and Shift+Tab release as a different LVGL key than they pressed ('A''a', LV_KEY_PREVLV_KEY_NEXT). That can leave keys stuck or drive the wrong navigation path.

Possible fix
 static QueueHandle_t hid_host_key_queue = nullptr;
 static uint8_t hid_host_prev_keys[6] = {};
+static std::array<uint32_t, 256> hid_host_pressed_lv_keys = {};
 ...
     for (int i = 0; i < 6; i++) {
         uint8_t kc = hid_host_prev_keys[i];
         if (kc == 0) continue;
         bool still = false;
         for (int j = 0; j < nkeys; j++) { if (curr[j] == kc) { still = true; break; } }
         if (!still) {
-            uint32_t lv = hidHostMapKeycode(0, kc);
-            if (lv) { HidHostKeyEvt e{lv, false}; xQueueSend(hid_host_key_queue, &e, 0); }
+            uint32_t lv = hid_host_pressed_lv_keys[kc];
+            if (lv) {
+                HidHostKeyEvt e{lv, false};
+                xQueueSend(hid_host_key_queue, &e, 0);
+                hid_host_pressed_lv_keys[kc] = 0;
+            }
         }
     }
     for (int i = 0; i < nkeys; i++) {
         uint8_t kc = curr[i];
         if (kc == 0) continue;
         bool had = false;
         for (int j = 0; j < 6; j++) { if (hid_host_prev_keys[j] == kc) { had = true; break; } }
         if (!had) {
             uint32_t lv = hidHostMapKeycode(mod, kc);
-            if (lv) { HidHostKeyEvt e{lv, true}; xQueueSend(hid_host_key_queue, &e, 0); }
+            if (lv) {
+                hid_host_pressed_lv_keys[kc] = lv;
+                HidHostKeyEvt e{lv, true};
+                xQueueSend(hid_host_key_queue, &e, 0);
+            }
         }
     }

Also clear hid_host_pressed_lv_keys in the connection reset/disconnect path.

Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble_scan.cpp-243-248 (1)

243-248: ⚠️ Potential issue | 🟠 Major

Check the return value of ble_hs_id_infer_auto() before using own_addr_type.

According to Apache NimBLE documentation, the output parameter is only valid when ble_hs_id_infer_auto() returns 0. A non-zero return leaves own_addr_type undefined, yet Line 247 passes it to ble_gap_connect(), causing undefined behavior. Initialize a safe default and check the return value, or skip name resolution for this peer on failure.

Possible fix
-        uint8_t own_addr_type;
-        ble_hs_id_infer_auto(0, &own_addr_type);
+        uint8_t own_addr_type = BLE_OWN_ADDR_PUBLIC;
+        if (ble_hs_id_infer_auto(0, &own_addr_type) != 0) {
+            LOG_W(TAG, "Name resolution: own addr inference failed, skipping idx=%u", (unsigned)i);
+            ++i;
+            continue;
+        }

         void* idx_arg = (void*)(uintptr_t)i;
         int rc = ble_gap_connect(own_addr_type, &addr, 1500, nullptr,
                                  name_res_gap_callback, idx_arg);
Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble_hid.cpp-403-407 (1)

403-407: ⚠️ Potential issue | 🟠 Major

BleHidDeviceCtx leaks after stop-on-connected sessions.

The connected branch in hid_device_stop() intentionally keeps hid_ctx around for the disconnect handler, but nothing releases it once that disconnect completes. A later start then overwrites device_get_driver_data() with a new allocation and the previous session context is leaked.

Also applies to: 437-457

Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble_hid.cpp-343-363 (1)

343-363: ⚠️ Potential issue | 🟠 Major

Fail HID startup when the profile switch fails.

ble_hid_switch_profile() has several early-return failure paths, but hid_device_start() still sets hid_active and starts HID advertising afterward. That can leave the advertised role out of sync with the live GATT database.

Also applies to: 430-434

TactilityKernel/include/tactility/drivers/bluetooth.h-44-52 (1)

44-52: ⚠️ Potential issue | 🟠 Major

Carry BLE address type through the public API.

BtPeerRecord keeps addr_type, but the operational APIs and pairing/profile event payloads drop it and only expose the raw 6-byte address. The ESP32 backend already has to guess BLE_ADDR_PUBLIC when unpairing, so random-address peers cannot be matched or removed reliably.

Also applies to: 107-124, 184-219, 293-296

Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble.cpp-828-853 (1)

828-853: ⚠️ Potential issue | 🟠 Major

Reject profile operations until the radio is fully on.

api_connect() and api_disconnect() jump straight into advertising/GATT helpers even when the radio is OFF, ON_PENDING, or already shutting down. A caller that races enable/disable can end up touching NimBLE before init or after deinit.

Suggested guard
 static error_t api_connect(struct Device* device, const BtAddr addr, enum BtProfileId profile) {
     BleCtx* ctx = (BleCtx*)device_get_driver_data(device);
     if (!ctx) return ERROR_INVALID_STATE;
+    if (ctx->radio_state.load() != BT_RADIO_STATE_ON) return ERROR_INVALID_STATE;
     if (profile == BT_PROFILE_HID_DEVICE) {
         return nimble_hid_device_api.start(ctx->hid_device_child, BT_HID_DEVICE_MODE_KEYBOARD);
     } else if (profile == BT_PROFILE_SPP) {
         return ble_spp_start_internal(ctx->serial_child);
     } else if (profile == BT_PROFILE_MIDI) {
@@
 static error_t api_disconnect(struct Device* device, const BtAddr addr, enum BtProfileId profile) {
     BleCtx* ctx = (BleCtx*)device_get_driver_data(device);
     if (!ctx) return ERROR_INVALID_STATE;
+    if (ctx->radio_state.load() != BT_RADIO_STATE_ON) return ERROR_INVALID_STATE;
     if (profile == BT_PROFILE_HID_DEVICE) {
         return nimble_hid_device_api.stop(ctx->hid_device_child);
     } else if (profile == BT_PROFILE_SPP) {
         return nimble_serial_api.stop(ctx->serial_child);
     } else if (profile == BT_PROFILE_MIDI) {
Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble.cpp-543-544 (1)

543-544: ⚠️ Potential issue | 🟠 Major

Use the inferred own-address type when starting advertising.

Both advertising helpers hardcode BLE_OWN_ADDR_PUBLIC in ble_gap_adv_start() calls (lines 543-544 and 606-607), while the codebase already uses ble_hs_id_infer_auto() elsewhere (e.g., in the discovery code). This hardcoding breaks targets/configurations that advertise with a random or static identity address, and contradicts Apache NimBLE best practices which require inferring the address type based on the device's configured identity addresses. Replace the hardcoded BLE_OWN_ADDR_PUBLIC with own_addr_type obtained from ble_hs_id_infer_auto(0, &own_addr_type).

Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble.cpp-744-750 (1)

744-750: ⚠️ Potential issue | 🟠 Major

Use the recursive mutex API consistently for radio_mutex.

Line 1062 creates a recursive mutex with xSemaphoreCreateRecursiveMutex(), but all call sites use xSemaphoreTake() / xSemaphoreGive(). FreeRTOS requires that recursive mutexes use xSemaphoreTakeRecursive() / xSemaphoreGiveRecursive() instead; using the non-recursive API on a recursive mutex violates the API contract and will cause ownership tracking failures or assertions.

Affected locations:

  • Lines 744–750
  • Lines 893–902
  • Lines 909–912
Suggested fix

Replace all instances:

-    xSemaphoreTake(ctx->radio_mutex, portMAX_DELAY);
+    xSemaphoreTakeRecursive(ctx->radio_mutex, portMAX_DELAY);
...
-    xSemaphoreGive(ctx->radio_mutex);
+    xSemaphoreGiveRecursive(ctx->radio_mutex);
🟡 Minor comments (4)
device.py-318-319 (1)

318-319: ⚠️ Potential issue | 🟡 Minor

Remove the unnecessary f prefixes.

Lines 318-319 use f-string literals without any placeholders, triggering Ruff's F541 rule. These should be plain string literals.

Suggested fix
-            output_file.write(f"CONFIG_BT_NIMBLE_TRANSPORT_UART=n\n")
-            output_file.write(f"CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y\n")
+            output_file.write("CONFIG_BT_NIMBLE_TRANSPORT_UART=n\n")
+            output_file.write("CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y\n")
Tactility/Source/bluetooth/README.md-17-19 (1)

17-19: ⚠️ Potential issue | 🟡 Minor

Fix the kernel header path in the architecture block.

Line 18 uses TactilityKernel/drivers/bluetooth.h, which is inconsistent with the include path used elsewhere (tactility/drivers/bluetooth.h / TactilityKernel/include/tactility/drivers/bluetooth.h). Keeping this exact avoids confusion during integration.

Suggested doc fix
-      │  (TactilityKernel/drivers/bluetooth.h + bluetooth_serial/midi/hid_device.h)
+      │  (TactilityKernel/include/tactility/drivers/bluetooth.h +
+      │   tactility/drivers/bluetooth_serial.h, tactility/drivers/bluetooth_midi.h,
+      │   tactility/drivers/bluetooth_hid_device.h)
Tactility/Include/Tactility/bluetooth/BluetoothPairedDevice.h-14-16 (1)

14-16: ⚠️ Potential issue | 🟡 Minor

Use BT_PROFILE_SPP constant instead of magic number 2.

The literal default value 2 is brittle and duplicates the enum value. Use the BT_PROFILE_SPP constant for clarity and forward compatibility. The int type is intentional here—the Tactility wrapper layer uses int profileId consistently across all bluetooth APIs and for serialization/deserialization support (see BluetoothPairedDevice.cpp where profileId is parsed/saved as an integer string).

Suggested direction
-    /** Profile used to pair (BtProfileId value). Defaults to BT_PROFILE_SPP=2. */
-    int profileId = 2;
+    /** Profile used to pair (BtProfileId value). Defaults to BT_PROFILE_SPP. */
+    int profileId = BT_PROFILE_SPP;
Tactility/Source/app/btmanage/BtManage.cpp-90-92 (1)

90-92: ⚠️ Potential issue | 🟡 Minor

Clear the app-state scan list when a new scan starts.

The driver cache is reset on BT_EVENT_SCAN_STARTED, but the app state is not. The view therefore keeps showing the previous scan's devices until the first new BT_EVENT_PEER_FOUND or scan completion.

Possible fix
         case BT_EVENT_SCAN_STARTED:
             getState().setScanning(true);
+            getState().updateScanResults();
             break;
🧹 Nitpick comments (2)
Tactility/Private/Tactility/app/btmanage/Bindings.h (1)

15-22: Add in-class initialization to callback members to prevent misuse.

The Bindings struct definition lacks default initialization for function pointer members. While current instantiations in BtManagePrivate.h, WifiManagePrivate.h, and WifiConnect.h use aggregate initialization (= { }), which safely zero-initializes pointers, explicitly initializing struct members to nullptr would prevent accidental misuse if the struct is ever instantiated without proper initialization in the future.

Proposed fix
 struct Bindings {
-    OnBtToggled onBtToggled;
-    OnScanToggled onScanToggled;
-    OnConnectPeer onConnectPeer;
-    OnDisconnectPeer onDisconnectPeer;
-    OnPairPeer onPairPeer;
-    OnForgetPeer onForgetPeer;
+    OnBtToggled onBtToggled = nullptr;
+    OnScanToggled onScanToggled = nullptr;
+    OnConnectPeer onConnectPeer = nullptr;
+    OnDisconnectPeer onDisconnectPeer = nullptr;
+    OnPairPeer onPairPeer = nullptr;
+    OnForgetPeer onForgetPeer = nullptr;
 };
Platforms/platform-esp32/source/module.cpp (1)

1-3: Remove the #ifdef ESP_PLATFORM guard around sdkconfig.h.

The Platforms/platform-esp32 directory is compiled only for ESP targets by the build system, so this guard is redundant and creates an unnecessary alternate preprocessing path around a required ESP-IDF header.


ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: c0ecf1bb-a02e-4cd5-b69a-e20569c6d9fe

📥 Commits

Reviewing files that changed from the base of the PR and between e64f4ff and 3bf177c.

📒 Files selected for processing (73)
  • Data/data/service/bluetooth/settings.properties
  • Devices/lilygo-tdeck/device.properties
  • Devices/lilygo-tdeck/lilygo,tdeck.dts
  • Devices/m5stack-tab5/device.properties
  • Devices/m5stack-tab5/m5stack,tab5.dts
  • Firmware/CMakeLists.txt
  • Modules/lvgl-module/assets/generate-all.py
  • Modules/lvgl-module/include/tactility/lvgl_icon_shared.h
  • Modules/lvgl-module/include/tactility/lvgl_icon_statusbar.h
  • Modules/lvgl-module/source-fonts/material_symbols_shared_12.c
  • Modules/lvgl-module/source-fonts/material_symbols_shared_16.c
  • Modules/lvgl-module/source-fonts/material_symbols_shared_20.c
  • Modules/lvgl-module/source-fonts/material_symbols_shared_24.c
  • Modules/lvgl-module/source-fonts/material_symbols_shared_32.c
  • Modules/lvgl-module/source-fonts/material_symbols_statusbar_12.c
  • Modules/lvgl-module/source-fonts/material_symbols_statusbar_16.c
  • Modules/lvgl-module/source-fonts/material_symbols_statusbar_20.c
  • Modules/lvgl-module/source-fonts/material_symbols_statusbar_30.c
  • Modules/lvgl-module/source/symbols.c
  • Platforms/platform-esp32/CMakeLists.txt
  • Platforms/platform-esp32/bindings/esp32,ble-nimble.yaml
  • Platforms/platform-esp32/include/tactility/bindings/esp32_ble_nimble.h
  • Platforms/platform-esp32/include/tactility/drivers/esp32_ble_nimble.h
  • Platforms/platform-esp32/private/bluetooth/esp32_ble_hid.h
  • Platforms/platform-esp32/private/bluetooth/esp32_ble_internal.h
  • Platforms/platform-esp32/private/bluetooth/esp32_ble_midi.h
  • Platforms/platform-esp32/private/bluetooth/esp32_ble_spp.h
  • Platforms/platform-esp32/source/drivers/bluetooth/README.md
  • Platforms/platform-esp32/source/drivers/bluetooth/bluetooth.puml
  • Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble.cpp
  • Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble_hid.cpp
  • Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble_midi.cpp
  • Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble_scan.cpp
  • Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble_spp.cpp
  • Platforms/platform-esp32/source/module.cpp
  • Tactility/CMakeLists.txt
  • Tactility/Include/Tactility/app/btmanage/BtManage.h
  • Tactility/Include/Tactility/bluetooth/Bluetooth.h
  • Tactility/Include/Tactility/bluetooth/BluetoothPairedDevice.h
  • Tactility/Include/Tactility/bluetooth/BluetoothSettings.h
  • Tactility/Private/Tactility/app/btmanage/Bindings.h
  • Tactility/Private/Tactility/app/btmanage/BtManagePrivate.h
  • Tactility/Private/Tactility/app/btmanage/State.h
  • Tactility/Private/Tactility/app/btmanage/View.h
  • Tactility/Private/Tactility/app/btpeersettings/BtPeerSettings.h
  • Tactility/Private/Tactility/bluetooth/BluetoothPrivate.h
  • Tactility/Source/Tactility.cpp
  • Tactility/Source/app/btmanage/BtManage.cpp
  • Tactility/Source/app/btmanage/State.cpp
  • Tactility/Source/app/btmanage/View.cpp
  • Tactility/Source/app/btpeersettings/BtPeerSettings.cpp
  • Tactility/Source/bluetooth/Bluetooth.cpp
  • Tactility/Source/bluetooth/BluetoothHidDevice.cpp
  • Tactility/Source/bluetooth/BluetoothHidHost.cpp
  • Tactility/Source/bluetooth/BluetoothMidi.cpp
  • Tactility/Source/bluetooth/BluetoothMock.cpp
  • Tactility/Source/bluetooth/BluetoothPairedDevice.cpp
  • Tactility/Source/bluetooth/BluetoothSettings.cpp
  • Tactility/Source/bluetooth/BluetoothSpp.cpp
  • Tactility/Source/bluetooth/README.md
  • Tactility/Source/lvgl/Keyboard.cpp
  • Tactility/Source/service/statusbar/Statusbar.cpp
  • TactilityC/Source/tt_init.cpp
  • TactilityKernel/include/tactility/drivers/bluetooth.h
  • TactilityKernel/include/tactility/drivers/bluetooth_hid_device.h
  • TactilityKernel/include/tactility/drivers/bluetooth_midi.h
  • TactilityKernel/include/tactility/drivers/bluetooth_serial.h
  • TactilityKernel/source/drivers/bluetooth.cpp
  • TactilityKernel/source/drivers/bluetooth_hid_device.cpp
  • TactilityKernel/source/drivers/bluetooth_midi.cpp
  • TactilityKernel/source/drivers/bluetooth_serial.cpp
  • TactilityKernel/source/kernel_symbols.c
  • device.py

Comment on lines +1 to +2
#include <format>
#include <string>
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🌐 Web query:

Does the GCC/libstdc++ toolchain typically used by ESP-IDF on ESP32 fully support C++20 /std::format?

💡 Result:

No, the GCC/libstdc++ toolchain typically used by ESP-IDF on ESP32 does not fully support C++20 <format> / std::format.

Citations:


Remove #include <format> and std::format usage—incompatible with ESP-IDF's libstdc++ toolchain.

The ESP-IDF GCC/libstdc++ toolchain does not support C++20 <format> library. Replace with snprintf() or std::to_string() to ensure the code compiles.

Also applies to: 96-101

🧰 Tools
🪛 Clang (14.0.6)

[error] 1-1: 'format' file not found

(clang-diagnostic-error)

Copy link
Copy Markdown
Contributor

@KenVanHoeylandt KenVanHoeylandt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great job! I've finished my feedback.

if (device_properties_content MATCHES "bluetooth=true")
list(APPEND REQUIRES_LIST bt)
endif()
endif()
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can probably be removed as bt is already included by platform-esp32 (if not, it should be added there)

properties:
_unused:
type: int
default: 0
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like to rename all -nimble.* and _nimble.* files to remove the nimble part.

#include <atomic>
#include <cstdint>

enum class BleHidProfile { None, KbConsumer, Mouse, KbMouse, Gamepad };
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

enum class is not valid C code.

enum class BleHidProfile { None, KbConsumer, Mouse, KbMouse, Gamepad };

struct BleHidDeviceCtx {
std::atomic<uint16_t> hid_conn_handle;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't use std:: in C code.
Can we move this struct to the cpp file?
(I don't want a C array)

@@ -0,0 +1,153 @@
#pragma once
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just as a note: There's unwanted C code here too, but I'll fix that when I move the struct to the cpp file myself.

return std::format(DEVICE_SETTINGS_FORMAT, DATA_DIR, addr_hex);
}

bool contains(const std::string& addr_hex) {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's rename this to hasFileForDevice() or something similar.

if (bluetooth_serial_start(dev) != ERROR_NONE) return false;
settings::setSppAutoStart(true);
return true;
}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here: can be removed and settings can be called in-place.

if (dev == nullptr) return;
settings::setSppAutoStart(false);
bluetooth_serial_stop(dev);
}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here: can be removed and settings can be called in-place.

@@ -0,0 +1,52 @@
# Bluetooth Bridge (Tactility Layer)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

File can be removed


// ---- Device lookup ----

struct Device* bluetooth_get_device() {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's rename this to bluetooth_find_first_ready_device()

Copy link
Copy Markdown

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 4


ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 6ca15668-7dd7-4de1-86e8-25bfe74e78c4

📥 Commits

Reviewing files that changed from the base of the PR and between 3bf177c and da4200b.

📒 Files selected for processing (15)
  • Devices/lilygo-tdeck/lilygo,tdeck.dts
  • Devices/m5stack-tab5/m5stack,tab5.dts
  • Firmware/CMakeLists.txt
  • Platforms/platform-esp32/bindings/esp32,ble.yaml
  • Platforms/platform-esp32/include/tactility/bindings/esp32_ble.h
  • Platforms/platform-esp32/include/tactility/drivers/esp32_ble.h
  • Platforms/platform-esp32/private/bluetooth/esp32_ble_hid.h
  • Platforms/platform-esp32/private/bluetooth/esp32_ble_internal.h
  • Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble.cpp
  • Tactility/Include/Tactility/bluetooth/BluetoothPairedDevice.h
  • Tactility/Source/bluetooth/Bluetooth.cpp
  • Tactility/Source/bluetooth/BluetoothPairedDevice.cpp
  • TactilityKernel/include/tactility/drivers/bluetooth.h
  • TactilityKernel/source/drivers/bluetooth.cpp
  • TactilityKernel/source/kernel_symbols.c
✅ Files skipped from review due to trivial changes (6)
  • Platforms/platform-esp32/bindings/esp32,ble.yaml
  • Devices/m5stack-tab5/m5stack,tab5.dts
  • Platforms/platform-esp32/include/tactility/drivers/esp32_ble.h
  • Firmware/CMakeLists.txt
  • Platforms/platform-esp32/private/bluetooth/esp32_ble_hid.h
  • Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble.cpp
🚧 Files skipped from review as they are similar to previous changes (4)
  • Devices/lilygo-tdeck/lilygo,tdeck.dts
  • Tactility/Source/bluetooth/Bluetooth.cpp
  • TactilityKernel/source/kernel_symbols.c
  • Platforms/platform-esp32/private/bluetooth/esp32_ble_internal.h


device.name = map.contains(KEY_NAME) ? map[KEY_NAME] : "";

device.autoConnect = !map.contains(KEY_AUTO_CONNECT) || (map[KEY_AUTO_CONNECT] == "true");
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Missing autoConnect key currently enables auto-connect unexpectedly.

Line 70 treats absent autoConnect as true, which contradicts PairedDevice.autoConnect = false and can silently change behavior for legacy/incomplete files.

Proposed fix
-    device.autoConnect = !map.contains(KEY_AUTO_CONNECT) || (map[KEY_AUTO_CONNECT] == "true");
+    device.autoConnect = map.contains(KEY_AUTO_CONNECT) && (map[KEY_AUTO_CONNECT] == "true");
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
device.autoConnect = !map.contains(KEY_AUTO_CONNECT) || (map[KEY_AUTO_CONNECT] == "true");
device.autoConnect = map.contains(KEY_AUTO_CONNECT) && (map[KEY_AUTO_CONNECT] == "true");

Comment on lines +72 to +74
if (map.contains(KEY_PROFILE_ID)) {
device.profileId = std::stoi(map[KEY_PROFILE_ID]);
}
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Guard profileId parsing from invalid persisted values.

Line 73 uses std::stoi without validation. A malformed properties value can throw and break loading flow.

Proposed fix
     if (map.contains(KEY_PROFILE_ID)) {
-        device.profileId = std::stoi(map[KEY_PROFILE_ID]);
+        try {
+            device.profileId = std::stoi(map[KEY_PROFILE_ID]);
+        } catch (...) {
+            LOGGER.error("Invalid profileId '{}'", map[KEY_PROFILE_ID]);
+            return false;
+        }
     }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
if (map.contains(KEY_PROFILE_ID)) {
device.profileId = std::stoi(map[KEY_PROFILE_ID]);
}
if (map.contains(KEY_PROFILE_ID)) {
try {
device.profileId = std::stoi(map[KEY_PROFILE_ID]);
} catch (...) {
LOGGER.error("Invalid profileId '{}'", map[KEY_PROFILE_ID]);
return false;
}
}

Comment on lines +93 to +97
/** Data was received on the BLE SPP (NUS) RX characteristic */
BT_EVENT_SPP_DATA_RECEIVED,
/** Data was received on the BLE MIDI I/O characteristic */
BT_EVENT_MIDI_DATA_RECEIVED,
};
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

SPP/MIDI “data received” events have no payload contract.

BT_EVENT_SPP_DATA_RECEIVED and BT_EVENT_MIDI_DATA_RECEIVED are declared, but struct BtEvent has no corresponding payload fields. As-is, handlers cannot access received bytes safely/portably through this API. Add explicit payload structs (data pointer/length + source context) or provide dedicated read APIs and document ownership/lifetime.

Also applies to: 126-135

Comment on lines +201 to +202
error_t (*get_paired_peers)(struct Device* device, struct BtPeerRecord* out, size_t* count);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

get_paired_peers exists internally but is missing from the public C API.

struct BluetoothApi exposes get_paired_peers, but there is no corresponding public wrapper declaration, which leaves paired-peer enumeration inaccessible through the documented external API surface. Please either expose bluetooth_get_paired_peers(...) publicly (and export it) or remove this from the internal contract if intentionally private.

Suggested API completion
--- a/TactilityKernel/include/tactility/drivers/bluetooth.h
+++ b/TactilityKernel/include/tactility/drivers/bluetooth.h
@@
 error_t bluetooth_pair(struct Device* device, const BtAddr addr);
 error_t bluetooth_unpair(struct Device* device, const BtAddr addr);
+error_t bluetooth_get_paired_peers(struct Device* device, struct BtPeerRecord* out, size_t* count);
 error_t bluetooth_connect(struct Device* device, const BtAddr addr, enum BtProfileId profile);
--- a/TactilityKernel/source/drivers/bluetooth.cpp
+++ b/TactilityKernel/source/drivers/bluetooth.cpp
@@
 error_t bluetooth_unpair(struct Device* device, const BtAddr addr) {
     return BT_API(device)->unpair(device, addr);
 }
+
+error_t bluetooth_get_paired_peers(struct Device* device, struct BtPeerRecord* out, size_t* count) {
+    return BT_API(device)->get_paired_peers(device, out, count);
+}

Also applies to: 286-303

Copy link
Copy Markdown

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 3

♻️ Duplicate comments (1)
Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble.cpp (1)

1028-1037: ⚠️ Potential issue | 🔴 Critical

Stop NimBLE before destroying child devices to prevent use-after-free.

The child Device* pointers (serial_child, midi_child, hid_device_child) are stored in GATT callback args (e.g., nus_chars_with_handle[].arg) and timer payloads. Destroying children while NimBLE is still running creates a race where callbacks can dereference freed memory.

Suggested fix: move dispatch_disable before child destruction
 static error_t esp32_ble_stop_device(struct Device* device) {
     BleCtx* ctx = (BleCtx*)device_get_driver_data(device);
     if (!ctx) return ERROR_NONE;

-    // Destroy child devices before stopping the radio and freeing the context.
-    // device_stop() on each child will invoke stop_device (for serial/midi/hid)
-    // which frees their driver data.
-    destroy_child_device(ctx->hid_device_child);
-    destroy_child_device(ctx->midi_child);
-    destroy_child_device(ctx->serial_child);
-
     if (ctx->radio_state.load() != BT_RADIO_STATE_OFF) {
         dispatch_disable(ctx);
     }

+    // Once NimBLE is stopped, no late GATT/timer callback can dereference child pointers.
+    destroy_child_device(ctx->hid_device_child);
+    destroy_child_device(ctx->midi_child);
+    destroy_child_device(ctx->serial_child);
+
     if (ctx->scan_mutex != nullptr) {
🧹 Nitpick comments (1)
Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble.cpp (1)

86-99: Consider removing the null check on ctx in internal event publishing.

Per the codebase's Linux kernel style guideline, internal APIs should assume valid pointers. The ble_publish_event function is called from contexts where device and thus ctx should always be valid. The check at line 88 could mask bugs during development.

Based on learnings: "Adopt Linux kernel style: do not add null pointer guards in internal APIs. Assume callers pass valid pointers; crashes on invalid pointers are bugs detected during development."


ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 784955cf-06e2-460c-8ae0-b16a384de123

📥 Commits

Reviewing files that changed from the base of the PR and between da4200b and 87277b5.

📒 Files selected for processing (16)
  • Platforms/platform-esp32/private/bluetooth/esp32_ble_hid.h
  • Platforms/platform-esp32/private/bluetooth/esp32_ble_internal.h
  • Platforms/platform-esp32/private/bluetooth/esp32_ble_midi.h
  • Platforms/platform-esp32/private/bluetooth/esp32_ble_spp.h
  • Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble.cpp
  • Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble_hid.cpp
  • Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble_midi.cpp
  • Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble_scan.cpp
  • Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble_spp.cpp
  • Platforms/platform-esp32/source/module.cpp
  • Tactility/Include/Tactility/bluetooth/Bluetooth.h
  • Tactility/Source/bluetooth/Bluetooth.cpp
  • Tactility/Source/bluetooth/BluetoothHidDevice.cpp
  • Tactility/Source/bluetooth/BluetoothMidi.cpp
  • Tactility/Source/bluetooth/BluetoothMock.cpp
  • Tactility/Source/bluetooth/BluetoothSpp.cpp
✅ Files skipped from review due to trivial changes (3)
  • Tactility/Source/bluetooth/BluetoothHidDevice.cpp
  • Tactility/Source/bluetooth/BluetoothMidi.cpp
  • Tactility/Source/bluetooth/BluetoothSpp.cpp
🚧 Files skipped from review as they are similar to previous changes (3)
  • Platforms/platform-esp32/private/bluetooth/esp32_ble_spp.h
  • Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble_midi.cpp
  • Platforms/platform-esp32/source/drivers/bluetooth/esp32_ble_hid.cpp

Comment on lines +132 to +141
} else if (settings::shouldSppAutoStart()) {
LOGGER.info("Auto-starting SPP server");
if (struct Device* dev = bluetooth_serial_get_device()) {
bluetooth_serial_start(dev);
}
} else if (settings::shouldMidiAutoStart()) {
LOGGER.info("Auto-starting MIDI server");
if (struct Device* dev = bluetooth_midi_get_device()) {
bluetooth_midi_start(dev);
}
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Start SPP and MIDI independently after radio-up.

These preferences are persisted independently, but this else if chain restores only one of them. If both were enabled, MIDI never comes back after Bluetooth is turned on.

Suggested fix
-                        } else if (settings::shouldSppAutoStart()) {
-                            LOGGER.info("Auto-starting SPP server");
-                            if (struct Device* dev = bluetooth_serial_get_device()) {
-                                bluetooth_serial_start(dev);
-                            }
-                        } else if (settings::shouldMidiAutoStart()) {
-                            LOGGER.info("Auto-starting MIDI server");
-                            if (struct Device* dev = bluetooth_midi_get_device()) {
-                                bluetooth_midi_start(dev);
-                            }
+                        } else {
+                            if (settings::shouldSppAutoStart()) {
+                                LOGGER.info("Auto-starting SPP server");
+                                if (struct Device* dev = bluetooth_serial_get_device()) {
+                                    bluetooth_serial_start(dev);
+                                }
+                            }
+                            if (settings::shouldMidiAutoStart()) {
+                                LOGGER.info("Auto-starting MIDI server");
+                                if (struct Device* dev = bluetooth_midi_get_device()) {
+                                    bluetooth_midi_start(dev);
+                                }
+                            }
                         }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
} else if (settings::shouldSppAutoStart()) {
LOGGER.info("Auto-starting SPP server");
if (struct Device* dev = bluetooth_serial_get_device()) {
bluetooth_serial_start(dev);
}
} else if (settings::shouldMidiAutoStart()) {
LOGGER.info("Auto-starting MIDI server");
if (struct Device* dev = bluetooth_midi_get_device()) {
bluetooth_midi_start(dev);
}
} else {
if (settings::shouldSppAutoStart()) {
LOGGER.info("Auto-starting SPP server");
if (struct Device* dev = bluetooth_serial_get_device()) {
bluetooth_serial_start(dev);
}
}
if (settings::shouldMidiAutoStart()) {
LOGGER.info("Auto-starting MIDI server");
if (struct Device* dev = bluetooth_midi_get_device()) {
bluetooth_midi_start(dev);
}
}
}

Comment on lines +187 to +194
} else if (event.pair_result.result == BT_PAIR_RESULT_BOND_LOST) {
uint8_t addr_buf[6];
memcpy(addr_buf, event.pair_result.addr, 6);
getMainDispatcher().dispatch([addr_buf]() mutable {
std::array<uint8_t, 6> peer_addr;
memcpy(peer_addr.data(), addr_buf, 6);
settings::remove(settings::addrToHex(peer_addr));
});
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Preserve peer settings across BT_PAIR_RESULT_BOND_LOST.

BT_PAIR_RESULT_BOND_LOST is the stale-bond repair path, not an explicit unpair. Removing the settings file here wipes the saved profile/name/auto-connect state, and the later success path recreates the entry with defaults. The explicit unpair path already clears persistence.

Suggested fix
-            } else if (event.pair_result.result == BT_PAIR_RESULT_BOND_LOST) {
-                uint8_t addr_buf[6];
-                memcpy(addr_buf, event.pair_result.addr, 6);
-                getMainDispatcher().dispatch([addr_buf]() mutable {
-                    std::array<uint8_t, 6> peer_addr;
-                    memcpy(peer_addr.data(), addr_buf, 6);
-                    settings::remove(settings::addrToHex(peer_addr));
-                });
+            } else if (event.pair_result.result == BT_PAIR_RESULT_BOND_LOST) {
+                // Keep persisted peer settings; a fresh pairing will follow.
             }

Comment on lines +213 to +233
} else if (event.profile_state.state == BT_PROFILE_STATE_IDLE &&
event.profile_state.profile == BT_PROFILE_HID_HOST) {
// HID host disconnected — check if any peer has autoConnect and re-scan
// so that autoConnectHidHost() fires when the scan finishes.
getMainDispatcher().dispatch([] {
auto peers = settings::loadAll();
bool has_auto = false;
for (const auto& p : peers) {
if (p.autoConnect && p.profileId == BT_PROFILE_HID_HOST) {
has_auto = true;
break;
}
}
if (has_auto) {
if (struct Device* dev = findFirstDevice()) {
if (!bluetooth_is_scanning(dev)) {
bluetooth_scan_start(dev);
}
}
}
});
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Manual HID disconnects will immediately reconnect.

disconnect(..., BT_PROFILE_HID_HOST) drives the profile back to BT_PROFILE_STATE_IDLE, which lands here and starts a new scan whenever any HID-host peer still has autoConnect enabled. That makes “disconnect” non-sticky for auto-connect peers. Please gate this branch on disconnect reason or a one-shot suppression flag.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants