drv/bluetooth: hard code char_handle for Mario hub

characteristics handle of LEGO Mario are not properly found by GATT_DiscCharsByUUID() remote_lwp3_char_handle for mario is hard coded for now
pybricks · Aug 9, 2021 · 1235b35 · 1235b35
1 parent 450ab15
commit 1235b35
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/lib/pbio/drv/bluetooth/bluetooth_stm32_bluenrg.c b/lib/pbio/drv/bluetooth/bluetooth_stm32_bluenrg.c
@@ -470,12 +470,18 @@ static PT_THREAD(scan_and_connect_task(struct pt *pt, pbio_task_t *task)) {
     PT_WAIT_UNTIL(pt, hci_command_status);
     context->status = aci_gatt_disc_charac_by_uuid_end();
 
-    PT_WAIT_UNTIL(pt, {
-        if (task->cancel) {
-            goto cancel_disconnect;
-        }
-        remote_lwp3_char_handle;
-    });
+    // HACK: Characteristics of LEGO Mario are not properly found by aci_gatt_disc_charac_by_uuid_begin().
+    // remote_lwp3_char_handle for mario is hard coded for now
+    if (context->hub_kind == LWP3_HUB_KIND_MARIO) {
+        remote_lwp3_char_handle = 0x0011;
+    } else {
+        PT_WAIT_UNTIL(pt, {
+            if (task->cancel) {
+                goto cancel_disconnect;
+            }
+            remote_lwp3_char_handle;
+        });
+    }
 
     // enable notifications
 

diff --git a/lib/pbio/drv/bluetooth/bluetooth_stm32_cc2640.c b/lib/pbio/drv/bluetooth/bluetooth_stm32_cc2640.c
@@ -494,14 +494,20 @@ static PT_THREAD(scan_and_connect_task(struct pt *pt, pbio_task_t *task)) {
 
     context->status = read_buf[8]; // debug
 
-    // Assuming that we only ever get successful ATT_ReadByTypeRsp and failed
-    // ATT_ReadByTypeRsp or ATT_ErrorRsp.
-    PT_WAIT_UNTIL(pt, {
-        if (task->cancel) {
-            goto cancel_disconnect;
-        }
-        remote_lwp3_char_handle != NO_CONNECTION;
-    });
+    // HACK: Characteristics of LEGO Mario are not properly found by GATT_DiscCharsByUUID().
+    // remote_lwp3_char_handle for mario is hard coded for now
+    if (context->hub_kind == LWP3_HUB_KIND_MARIO) {
+        remote_lwp3_char_handle = 0x0011;
+    } else {
+        // Assuming that we only ever get successful ATT_ReadByTypeRsp and failed
+        // ATT_ReadByTypeRsp or ATT_ErrorRsp.
+        PT_WAIT_UNTIL(pt, {
+            if (task->cancel) {
+                goto cancel_disconnect;
+            }
+            remote_lwp3_char_handle != NO_CONNECTION;
+        });
+    }
 
     // enable notifications