From 88a686091398971850e831047dd08791c9763ad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=81=8F?= <alleteam@gmail.com>
Date: Tue, 9 Apr 2024 16:01:55 +0900
Subject: [PATCH] Update radio stack to v1.19.0 (#3545)

* Update radio stack to v1.19.0
* Ble: set max connection interal same as min, kinda speedups everything
---
 fbt_options.py                                | 2 +-
 lib/ble_profile/extra_profiles/hid_profile.c  | 4 ++--
 lib/stm32wb_copro                             | 2 +-
 targets/f7/ble_glue/ble_app.c                 | 4 ++--
 targets/f7/ble_glue/extra_beacon.c            | 3 ++-
 targets/f7/ble_glue/profiles/serial_profile.c | 4 ++--
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/fbt_options.py b/fbt_options.py
index 9e4d821a4..c4b841058 100644
--- a/fbt_options.py
+++ b/fbt_options.py
@@ -22,7 +22,7 @@ DIST_SUFFIX = "local"
 COPRO_OB_DATA = "scripts/ob.data"
 
 # Must match lib/stm32wb_copro version
-COPRO_CUBE_VERSION = "1.17.3"
+COPRO_CUBE_VERSION = "1.19.0"
 
 COPRO_CUBE_DIR = "lib/stm32wb_copro"
 
diff --git a/lib/ble_profile/extra_profiles/hid_profile.c b/lib/ble_profile/extra_profiles/hid_profile.c
index aaa66d960..7231fdb19 100644
--- a/lib/ble_profile/extra_profiles/hid_profile.c
+++ b/lib/ble_profile/extra_profiles/hid_profile.c
@@ -380,8 +380,8 @@ static GapConfig template_config = {
     .pairing_method = GapPairingPinCodeVerifyYesNo,
     .conn_param =
         {
-            .conn_int_min = 0x18, // 30 ms
-            .conn_int_max = 0x24, // 45 ms
+            .conn_int_min = 0x18, // AN5289: 4.7, we need at least 25ms + advertisement, which is 30 ms
+            .conn_int_max = 0x18, // 30 ms
             .slave_latency = 0,
             .supervisor_timeout = 0,
         },
diff --git a/lib/stm32wb_copro b/lib/stm32wb_copro
index d8a6f1feb..64a060d91 160000
--- a/lib/stm32wb_copro
+++ b/lib/stm32wb_copro
@@ -1 +1 @@
-Subproject commit d8a6f1feb0ebb6798c44162c6ae5ea743f90f3df
+Subproject commit 64a060d91f5cbf25d765cf23231876add006bcf4
diff --git a/targets/f7/ble_glue/ble_app.c b/targets/f7/ble_glue/ble_app.c
index 1f392529d..fd4e64c09 100644
--- a/targets/f7/ble_glue/ble_app.c
+++ b/targets/f7/ble_glue/ble_app.c
@@ -54,8 +54,8 @@ static const SHCI_C2_Ble_Init_Cmd_Packet_t ble_init_cmd_packet = {
         .PrWriteListSize = CFG_BLE_PREPARE_WRITE_LIST_SIZE,
         .MblockCount = CFG_BLE_MBLOCK_COUNT,
         .AttMtu = CFG_BLE_MAX_ATT_MTU,
-        .SlaveSca = CFG_BLE_SLAVE_SCA,
-        .MasterSca = CFG_BLE_MASTER_SCA,
+        .PeripheralSca = CFG_BLE_SLAVE_SCA,
+        .CentralSca = CFG_BLE_MASTER_SCA,
         .LsSource = CFG_BLE_LSE_SOURCE,
         .MaxConnEventLength = CFG_BLE_MAX_CONN_EVENT_LENGTH,
         .HsStartupTime = CFG_BLE_HSE_STARTUP_TIME,
diff --git a/targets/f7/ble_glue/extra_beacon.c b/targets/f7/ble_glue/extra_beacon.c
index 2ef3e056f..60338cb76 100644
--- a/targets/f7/ble_glue/extra_beacon.c
+++ b/targets/f7/ble_glue/extra_beacon.c
@@ -9,7 +9,8 @@
 #define GAP_MS_TO_SCAN_INTERVAL(x) ((uint16_t)((x) / 0.625))
 
 // Also used as an indicator of whether the beacon had ever been configured
-#define GAP_MIN_ADV_INTERVAL_MS (20)
+// AN5289: 4.7, we need at least 25ms + advertisement, which is 30 ms
+#define GAP_MIN_ADV_INTERVAL_MS (30u)
 
 typedef struct {
     GapExtraBeaconConfig last_config;
diff --git a/targets/f7/ble_glue/profiles/serial_profile.c b/targets/f7/ble_glue/profiles/serial_profile.c
index a3949abfc..165b81330 100644
--- a/targets/f7/ble_glue/profiles/serial_profile.c
+++ b/targets/f7/ble_glue/profiles/serial_profile.c
@@ -46,8 +46,8 @@ static GapConfig serial_template_config = {
     .bonding_mode = true,
     .pairing_method = GapPairingPinCodeShow,
     .conn_param = {
-        .conn_int_min = 0x18, // 30 ms
-        .conn_int_max = 0x24, // 45 ms
+        .conn_int_min = 0x18, // AN5289: 4.7, we need at least 25ms + advertisement, which is 30 ms
+        .conn_int_max = 0x18, // 30 ms
         .slave_latency = 0,
         .supervisor_timeout = 0,
     }};