Switch order of broadcasted characteristics

This solves an issue with BearChess where the wrong characteristics were used to read the board data when the order of the broadcast was different.
gkalab · Aug 11, 2023 · 31ae408 · 31ae408
1 parent 9595a6b
commit 31ae408
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/main/bleuart.cpp b/main/bleuart.cpp
@@ -62,6 +62,20 @@ static const ble_uuid128_t gatt_svr_chr_board_read_uuid =
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 const struct ble_gatt_svc_def gatt_svr_svcs[] = {
+    {
+        /* Service: board */
+        .type = BLE_GATT_SVC_TYPE_PRIMARY,
+        .uuid = &gatt_svr_svc_board_uuid.u,
+        .characteristics = (struct ble_gatt_chr_def[]){{
+                                                           .uuid = &gatt_svr_chr_board_read_uuid.u,
+                                                           .access_cb = BleUart::gatt_svr_chr_access_uart_write,
+                                                           .flags = BLE_GATT_CHR_F_NOTIFY,
+                                                           .val_handle = &BleUart::g_bleuart_attr_board_read_handle,
+                                                       },
+                                                       {
+                                                           .uuid = 0, /* No more characteristics in this service */
+                                                       }},
+    },
     {
         /* Service: main */
         .type = BLE_GATT_SVC_TYPE_PRIMARY,
@@ -83,20 +97,6 @@ const struct ble_gatt_svc_def gatt_svr_svcs[] = {
                                                            .uuid = 0, /* No more characteristics in this service */
                                                        }},
     },
-    {
-        /* Service: board */
-        .type = BLE_GATT_SVC_TYPE_PRIMARY,
-        .uuid = &gatt_svr_svc_board_uuid.u,
-        .characteristics = (struct ble_gatt_chr_def[]){{
-                                                           .uuid = &gatt_svr_chr_board_read_uuid.u,
-                                                           .access_cb = BleUart::gatt_svr_chr_access_uart_write,
-                                                           .flags = BLE_GATT_CHR_F_NOTIFY,
-                                                           .val_handle = &BleUart::g_bleuart_attr_board_read_handle,
-                                                       },
-                                                       {
-                                                           .uuid = 0, /* No more characteristics in this service */
-                                                       }},
-    },
     {
         0, /* No more services */
     },