Merge pull request #1004 from LedgerHQ/spo-fix-flex-ble-uuid

[lib_ble]: Add Flex UUID's, keep LNX UUID's as default

Author: sportron-ledger

lib_blewbxx/src/ble_ledger_profile_apdu.c

@@ -97,15 +97,24 @@ static ledger_ble_profile_apdu_handle_t ledger_apdu_profile_handle;
 static uint8_t                          ble_ledger_protocol_chunk_buffer[BLE_ATT_MAX_MTU_SIZE];
 
 // clang-format off
+#ifdef TARGET_FLEX
+const uint8_t charUuidTX[BLE_UUID_SIZE]   = {0x72,0x65,0x67,0x64,0x65,0x4c,0x01,0x00,0x04,0x30,0x97,0x2c,0x00,0x34,0xd6,0x13};
+const uint8_t charUuidRX[BLE_UUID_SIZE]   = {0x72,0x65,0x67,0x64,0x65,0x4c,0x02,0x00,0x04,0x30,0x97,0x2c,0x00,0x34,0xd6,0x13};
+const uint8_t charUuidRX2[BLE_UUID_SIZE]  = {0x72,0x65,0x67,0x64,0x65,0x4c,0x03,0x00,0x04,0x30,0x97,0x2c,0x00,0x34,0xd6,0x13};
+#else // !TARGET_FLEX
+
 #ifdef TARGET_STAX
-const uint8_t charUuidTX[BLE_UUID_SIZE]   = {0x72,0x65,0x67,0x64,0x65,0x4c,0x01,0x00,0x04,0x60,0x97,0x2C,0x00,0x34,0xD6,0x13};
-const uint8_t charUuidRX[BLE_UUID_SIZE]   = {0x72,0x65,0x67,0x64,0x65,0x4c,0x02,0x00,0x04,0x60,0x97,0x2C,0x00,0x34,0xD6,0x13};
-const uint8_t charUuidRX2[BLE_UUID_SIZE]  = {0x72,0x65,0x67,0x64,0x65,0x4c,0x03,0x00,0x04,0x60,0x97,0x2C,0x00,0x34,0xD6,0x13};
-#else // ! TARGET_STAX
-const uint8_t charUuidTX[BLE_UUID_SIZE]   = {0x72,0x65,0x67,0x64,0x65,0x4c,0x01,0x00,0x04,0x00,0x97,0x2C,0x00,0x34,0xD6,0x13};
-const uint8_t charUuidRX[BLE_UUID_SIZE]   = {0x72,0x65,0x67,0x64,0x65,0x4c,0x02,0x00,0x04,0x00,0x97,0x2C,0x00,0x34,0xD6,0x13};
-const uint8_t charUuidRX2[BLE_UUID_SIZE]  = {0x72,0x65,0x67,0x64,0x65,0x4c,0x03,0x00,0x04,0x00,0x97,0x2C,0x00,0x34,0xD6,0x13};
+const uint8_t charUuidTX[BLE_UUID_SIZE]   = {0x72,0x65,0x67,0x64,0x65,0x4c,0x01,0x00,0x04,0x60,0x97,0x2c,0x00,0x34,0xd6,0x13};
+const uint8_t charUuidRX[BLE_UUID_SIZE]   = {0x72,0x65,0x67,0x64,0x65,0x4c,0x02,0x00,0x04,0x60,0x97,0x2c,0x00,0x34,0xd6,0x13};
+const uint8_t charUuidRX2[BLE_UUID_SIZE]  = {0x72,0x65,0x67,0x64,0x65,0x4c,0x03,0x00,0x04,0x60,0x97,0x2c,0x00,0x34,0xd6,0x13};
+#else // !TARGET_FLEX && !TARGET_STAX
+
+const uint8_t charUuidTX[BLE_UUID_SIZE]   = {0x72,0x65,0x67,0x64,0x65,0x4c,0x01,0x00,0x04,0x00,0x97,0x2c,0x00,0x34,0xd6,0x13};
+const uint8_t charUuidRX[BLE_UUID_SIZE]   = {0x72,0x65,0x67,0x64,0x65,0x4c,0x02,0x00,0x04,0x00,0x97,0x2c,0x00,0x34,0xd6,0x13};
+const uint8_t charUuidRX2[BLE_UUID_SIZE]  = {0x72,0x65,0x67,0x64,0x65,0x4c,0x03,0x00,0x04,0x00,0x97,0x2c,0x00,0x34,0xd6,0x13};
+
 #endif // ! TARGET_STAX
+#endif // ! TARGET_FLEX
 // clang-format on
 static uint8_t BLE_LEDGER_apdu_buffer[OS_IO_BUFFER_SIZE + 1];
 
@@ -116,11 +125,17 @@ const ble_profile_info_t BLE_LEDGER_PROFILE_apdu_info = {
     .service_uuid
     = {.type = BLE_GATT_UUID_TYPE_128,
 // clang-format off
+#ifdef TARGET_FLEX
+                     .value = {0x72,0x65,0x67,0x64,0x65,0x4c,0x00,0x00,0x04,0x30,0x97,0x2c,0x00,0x34,0xd6,0x13}},
+#else // !TARGET_FLEX
+
 #ifdef TARGET_STAX
-                     .value = {0x72,0x65,0x67,0x64,0x65,0x4c,0x00,0x00,0x04,0x60,0x97,0x2C,0x00,0x34,0xD6,0x13}},
-#else // ! TARGET_STAX
-                     .value = {0x72,0x65,0x67,0x64,0x65,0x4c,0x00,0x00,0x04,0x00,0x97,0x2C,0x00,0x34,0xD6,0x13}},
+                     .value = {0x72,0x65,0x67,0x64,0x65,0x4c,0x00,0x00,0x04,0x60,0x97,0x2c,0x00,0x34,0xd6,0x13}},
+#else // !TARGET_FLEX && !TARGET_STAX
+
+                     .value = {0x72,0x65,0x67,0x64,0x65,0x4c,0x00,0x00,0x04,0x00,0x97,0x2c,0x00,0x34,0xd6,0x13}},
 #endif // ! TARGET_STAX
+#endif // ! TARGET_FLEX
     // clang-format on
 
     .init            = BLE_LEDGER_PROFILE_apdu_init,
@@ -631,7 +646,7 @@ ble_profile_status_t BLE_LEDGER_PROFILE_apdu_send_packet(const uint8_t *packet,
 bool BLE_LEDGER_PROFILE_apdu_is_busy(void *cookie)
 {
     ledger_ble_profile_apdu_handle_t *handle = (ledger_ble_profile_apdu_handle_t *) PIC(cookie);
-    bool busy = false;
+    bool                              busy   = false;
 
     if (handle->state == LEDGER_BLE_PROFILE_APDU_BUSY) {
         busy = true;