Merge pull request #352 from UltimateHackingKeyboard/new_bt_commands

Clear bonds, fix scanning
UltimateHackingKeyboard · Nov 8, 2024 · 5bb746d · 5bb746d
2 parents 6dcaafa + 66f01c2
commit 5bb746d
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 20 deletions.
diff --git a/device/src/bt_pair.c b/device/src/bt_pair.c
@@ -11,6 +11,7 @@
 #include "zephyr/kernel.h"
 #include "bt_manager.h"
 #include "bt_advertise.h"
+#include "legacy/host_connection.h"
 
 bool BtPair_LastPairingSucceeded = true;
 bool BtPair_OobPairingInProgress = false;
@@ -94,21 +95,11 @@ struct delete_args_t {
     const bt_addr_le_t* addr;
 };
 
-static void bt_foreach_bond_cb_delete(const struct bt_bond_info *info, void *user_data)
-{
+static void deleteBond(const struct bt_bond_info *info) {
     int err;
 
     struct bt_conn* conn;
 
-    struct delete_args_t* args = (struct delete_args_t*)user_data;
-
-    if (!args->all && bt_addr_le_cmp(args->addr, &info->addr) != 0) {
-        char addr[32];
-        bt_addr_le_to_str(&info->addr, addr, sizeof(addr));
-        printk("Not deleting bond for %s\n", addr);
-        return;
-    }
-
     if (bt_addr_le_cmp(&Peers[PeerIdLeft].addr, &info->addr) == 0) {
         settings_delete("uhk/addr/left");
     }
@@ -139,6 +130,20 @@ static void bt_foreach_bond_cb_delete(const struct bt_bond_info *info, void *use
     }
 }
 
+static void bt_foreach_bond_cb_delete(const struct bt_bond_info *info, void *user_data)
+{
+    struct delete_args_t* args = (struct delete_args_t*)user_data;
+
+    if (!args->all && bt_addr_le_cmp(args->addr, &info->addr) != 0) {
+        char addr[32];
+        bt_addr_le_to_str(&info->addr, addr, sizeof(addr));
+        printk("Not deleting bond for %s\n", addr);
+        return;
+    }
+
+    deleteBond(info);
+}
+
 void BtPair_Unpair(const bt_addr_le_t addr) {
     bool deleteAll = true;
 
@@ -196,3 +201,14 @@ bool BtPair_IsDeviceBonded(const bt_addr_le_t *addr)
 
     return bonded;
 }
+
+void deleteBondIfUnknown(const struct bt_bond_info *info, void *user_data) {
+    if (!HostConnections_IsKnownBleAddress(&info->addr)) {
+        deleteBond(info);
+    }
+};
+
+
+void BtPair_ClearUnknownBonds() {
+    bt_foreach_bond(BT_ID_DEFAULT, deleteBondIfUnknown, NULL);
+}
diff --git a/device/src/bt_pair.h b/device/src/bt_pair.h
@@ -25,6 +25,7 @@
     void BtPair_Unpair(const bt_addr_le_t addr);
     bool BtPair_IsDeviceBonded(const bt_addr_le_t *addr);
     void BtManager_EnterPairingMode();
+    void BtPair_ClearUnknownBonds();
 
 // Variables
 

diff --git a/device/src/bt_scan.c b/device/src/bt_scan.c
@@ -33,15 +33,6 @@ static int scan_fill() {
     int err = 0;
 
     if (DEVICE_IS_UHK80_RIGHT) {
-        if (!BtPair_OobPairingInProgress) {
-            // iterate host connections and add all that are of type dongle
-            for (uint8_t i = 0; i < HOST_CONNECTION_COUNT_MAX; i++) {
-                if (HostConnections[i].type == HostConnectionType_Dongle) {
-                    addAddress(&err, &HostConnections[i].bleAddress);
-                }
-            }
-        }
-
         addAddress(&err, &Peers[PeerIdLeft].addr);
     }
     if (DEVICE_IS_UHK_DONGLE) {

diff --git a/right/src/config_parser/parse_config.c b/right/src/config_parser/parse_config.c
@@ -25,6 +25,7 @@
 #include "parse_host_connection.h"
 #include "error_reporting.h"
 #include "versioning.h"
+#include "stubs.h"
 
 version_t DataModelVersion = {0, 0, 0};
 
@@ -328,6 +329,7 @@ parser_error_t parseConfig(config_buffer_t *buffer)
 
         LedManager_RecalculateLedBrightness();
         LedManager_UpdateSleepModes();
+        BtPair_ClearUnknownBonds();
 
         // Update counts
 

diff --git a/right/src/stubs.h b/right/src/stubs.h
@@ -44,6 +44,7 @@
     ATTRS void BtPair_EndPairing(bool success, const char* msg) {};
     ATTRS void BtManager_RestartBt() {};
     ATTRS void DongleLeds_Update() {};
+    ATTRS void BtPair_ClearUnknownBonds() {};
 
 #if DEVICE_HAS_OLED
 #define WIDGET_REFRESH(W) Widget_Refresh(W)