Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-01 22:08:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

Proper BT custom name length handling

Browse Source
This commit is contained in:
Willy-JL
2023-04-08 00:54:02 +01:00
parent 525376df9e
commit 8aed004b7b
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmware/targets/f7/api_symbols.csv
+1 -1
View File
@@ -1124,7 +1124,7 @@ Function,+,furi_hal_bt_serial_start,void,
Function,+,furi_hal_bt_serial_stop,void,
Function,+,furi_hal_bt_serial_tx,_Bool,"uint8_t*, uint16_t"
Function,+,furi_hal_bt_set_key_storage_change_callback,void,"BleGlueKeyStorageChangedCallback, void*"
Function,+,furi_hal_bt_set_profile_adv_name,void,"FuriHalBtProfile, const char[( 1 + ( 8 + 1 ) ) + 9 - 1]"
Function,+,furi_hal_bt_set_profile_adv_name,void,"FuriHalBtProfile, const char[( 18 + 1 )]"
Function,+,furi_hal_bt_set_profile_mac_addr,void,"FuriHalBtProfile, const uint8_t[( 6 )]"
Function,+,furi_hal_bt_set_profile_pairing_method,void,"FuriHalBtProfile, GapPairing"
Function,+,furi_hal_bt_start_advertising,void,
1 entry status name type params
1124 Function + furi_hal_bt_serial_stop void
1125 Function + furi_hal_bt_serial_tx _Bool uint8_t*, uint16_t
1126 Function + furi_hal_bt_set_key_storage_change_callback void BleGlueKeyStorageChangedCallback, void*
1127 Function + furi_hal_bt_set_profile_adv_name void FuriHalBtProfile, const char[( 1 + ( 8 + 1 ) ) + 9 - 1] FuriHalBtProfile, const char[( 18 + 1 )]
1128 Function + furi_hal_bt_set_profile_mac_addr void FuriHalBtProfile, const uint8_t[( 6 )]
1129 Function + furi_hal_bt_set_profile_pairing_method void FuriHalBtProfile, GapPairing
1130 Function + furi_hal_bt_start_advertising void
firmware/targets/f7/furi_hal/furi_hal_bt.c
+2 -2
View File
@@ -477,7 +477,7 @@ bool furi_hal_bt_ensure_c2_mode(BleGlueC2Mode mode) {
void furi_hal_bt_set_profile_adv_name(
FuriHalBtProfile profile,
const char name[FURI_HAL_VERSION_DEVICE_NAME_LENGTH - 1]) {
const char name[FURI_HAL_BT_ADV_NAME_LENGTH]) {
furi_assert(profile < FuriHalBtProfileNumber);
furi_assert(name);
@@ -491,7 +491,7 @@ void furi_hal_bt_set_profile_adv_name(
memcpy(
&(profile_config[profile].config.adv_name[1]),
name,
FURI_HAL_VERSION_DEVICE_NAME_LENGTH - 1);
FURI_HAL_BT_ADV_NAME_LENGTH);
}
}
firmware/targets/furi_hal_include/furi_hal_bt.h
+1 -1
View File
@@ -230,7 +230,7 @@ bool furi_hal_bt_ensure_c2_mode(BleGlueC2Mode mode);
*/
void furi_hal_bt_set_profile_adv_name(
FuriHalBtProfile profile,
const char name[FURI_HAL_VERSION_DEVICE_NAME_LENGTH - 1]);
const char name[FURI_HAL_BT_ADV_NAME_LENGTH]);
const char* furi_hal_bt_get_profile_adv_name(FuriHalBtProfile profile);
firmware/targets/furi_hal_include/furi_hal_version.h
+2 -2
View File
@@ -16,9 +16,9 @@ extern "C" {
#define FURI_HAL_VERSION_NAME_LENGTH 8
#define FURI_HAL_VERSION_ARRAY_NAME_LENGTH (FURI_HAL_VERSION_NAME_LENGTH + 1)
/** BLE symbol + name */
#define FURI_HAL_BT_ADV_NAME_LENGTH (18 + 1) // 18 characters + null terminator
#define FURI_HAL_VERSION_DEVICE_NAME_LENGTH \
(1 + FURI_HAL_VERSION_ARRAY_NAME_LENGTH) + 9 // for bad kb custom name
(1 + FURI_HAL_BT_ADV_NAME_LENGTH) // Used for custom BT name, BLE symbol + name
/** OTP Versions enum */
typedef enum {