Merge remote-tracking branch 'OFW/dev' into dev

targets/f7/api_symbols.csv

@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,60.5,,
+Version,+,60.6,,
 Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,

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,

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;

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,
     }};