patch/app_ble.c.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21

--- sdk/driver/ble/ble_pub/modules/app/src/app_ble.c	2021-08-16 11:59:34.000000000 -0500
+++ ../sdk/driver/ble/ble_pub/modules/app/src/app_ble.c	2023-07-11 09:46:34.035353420 -0500
@@ -316,6 +316,7 @@
  * FUNCTION DEFINITIONS
  ****************************************************************************************
  */
+void appm_ll_scan_init(void);// fix an annoying compiler warning
 
 void appm_init()
 {
@@ -328,6 +329,10 @@
     // Reset the application manager environment
     memset(&app_env, 0, sizeof(app_env));
 
+    // copy the name set by ble_main()
+    memcpy(app_env.dev_name, app_dflt_dev_name, APP_DFLT_DEVICE_NAME_LEN);
+    app_env.dev_name_len = strlen((const char *)app_env.dev_name); //ble_activate() should have made sure this is safe
+
     // Create APP task
     kernel_task_create(TASK_APP, &TASK_DESC_APP);