kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* removed magic number

Browse source 
* removed temporary string
This commit is contained in:
Percentnineteen 2022-03-15 11:29:36 -05:00
parent 5c602a7ec7
commit fa2c76b3f1
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/ble.c
View file

@ -77,8 +77,9 @@ static uint8_t active_profile;
#define DEVICE_NAME CONFIG_BT_DEVICE_NAME #define DEVICE_NAME CONFIG_BT_DEVICE_NAME
#define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1)
#define DEVICE_NAME_ARRAY_MAX_SIZE 17
static uint8_t device_name[17] = DEVICE_NAME; static uint8_t device_name[DEVICE_NAME_ARRAY_MAX_SIZE] = DEVICE_NAME;
BUILD_ASSERT(DEVICE_NAME_LEN <= 16, "ERROR: BLE device name is too long. Max length: 16"); BUILD_ASSERT(DEVICE_NAME_LEN <= 16, "ERROR: BLE device name is too long. Max length: 16");
@ -186,10 +187,11 @@ int update_advertising() {
enum advertising_type desired_adv = ZMK_ADV_NONE; enum advertising_type desired_adv = ZMK_ADV_NONE;
uint8_t max_device_name_length = (active_profile > 9) ? 13 : 14; uint8_t max_device_name_length = (active_profile > 9) ? 13 : 14;
// need to store the temporary device name because Zephyr *printf doesn't support string precision if (max_device_name_length > strlen(DEVICE_NAME)) {
char temp_device_name[14]; max_device_name_length = DEVICE_NAME_LEN;
snprintf(temp_device_name, max_device_name_length, "%s", DEVICE_NAME); }
snprintf(device_name, 16, "%s~%d", temp_device_name, active_profile); snprintf(device_name, max_device_name_length + 1, "%s", DEVICE_NAME);
sprintf(device_name + max_device_name_length, "~%d", active_profile);
if (zmk_ble_active_profile_is_open()) { if (zmk_ble_active_profile_is_open()) {
desired_adv = ZMK_ADV_CONN; desired_adv = ZMK_ADV_CONN;