删除不必要的变量定义

diff --git a/2.code/1.sdk/apps/BK_app/BK_drive/bk_uart.c b/2.code/1.sdk/apps/BK_app/BK_drive/bk_uart.c
index dca613d..d0967dc 100644 (file)
--- a/2.code/1.sdk/apps/BK_app/BK_drive/bk_uart.c
+++ b/2.code/1.sdk/apps/BK_app/BK_drive/bk_uart.c
@@ -1402,7 +1402,7 @@ int parse_uart_data(char *json_string)
                         get_ble_switch=1;
                         ack_flag=1;
                         switch_ble_state=1;
                         get_ble_switch=1;
                         ack_flag=1;
                         switch_ble_state=1;

-                        bk_app_send_smg(SWITCH_BLE_STATE,(char *)&switch_ble_state,1);
+                        bk_app_send_smg(BLE_SWITCH_STATE,(char *)&switch_ble_state,1);

                         // set_adv_flag_fun(1) ;//开始蓝牙广播
                         
                     }else if (strcmp(switch_ble_js->valuestring, "0") == 0)
                         // set_adv_flag_fun(1) ;//开始蓝牙广播
                         
                     }else if (strcmp(switch_ble_js->valuestring, "0") == 0)


@@ -1410,7 +1410,7 @@ int parse_uart_data(char *json_string)
                         get_ble_switch = 1;
                         ack_flag=1;
                         switch_ble_state=0;
                         get_ble_switch = 1;
                         ack_flag=1;
                         switch_ble_state=0;

-                        bk_app_send_smg(SWITCH_BLE_STATE,(char *)&switch_ble_state,1);
+                        bk_app_send_smg(BLE_SWITCH_STATE,(char *)&switch_ble_state,1);

                         // set_adv_flag_fun(0); //关闭蓝牙广播
                         
                     }
                         // set_adv_flag_fun(0); //关闭蓝牙广播
                         
                     }

diff --git a/2.code/1.sdk/apps/BK_app/bk_app.c b/2.code/1.sdk/apps/BK_app/bk_app.c
index 95837fd..cab7f6f 100644 (file)
--- a/2.code/1.sdk/apps/BK_app/bk_app.c
+++ b/2.code/1.sdk/apps/BK_app/bk_app.c
@@ -335,9 +335,8 @@ void bk_app_task(void *p)
                     bt_close_bredr();
                 }
             }
                     bt_close_bredr();
                 }
             }

-            

             break;
             break;

-        case SWITCH_BLE_STATE:
+        case BLE_SWITCH_STATE:

             u8 switch_ble_value= data[0];
             printf("switch_ble_value:%d",switch_ble_value);
             if(switch_ble_value == 1){
             u8 switch_ble_value= data[0];
             printf("switch_ble_value:%d",switch_ble_value);
             if(switch_ble_value == 1){

diff --git a/2.code/1.sdk/apps/BK_app/bk_app.h b/2.code/1.sdk/apps/BK_app/bk_app.h
index efca3a9..f765216 100644 (file)
--- a/2.code/1.sdk/apps/BK_app/bk_app.h
+++ b/2.code/1.sdk/apps/BK_app/bk_app.h
@@ -26,7 +26,7 @@ typedef enum
     BT_ADJUST_VOLUME,
     CLOSE_BR,
     OPEN_BR,
     BT_ADJUST_VOLUME,
     CLOSE_BR,
     OPEN_BR,

-    SWITCH_BLE_STATE,
+    BLE_SWITCH_STATE,

     BT_SCAN_SWITCH,
     BT_GET_IMEI,
     RECV_DISCONNECT_BT,
     BT_SCAN_SWITCH,
     BT_GET_IMEI,
     RECV_DISCONNECT_BT,

diff --git a/2.code/1.sdk/apps/common/third_party_profile/jieli/trans_data_demo/le_trans_data.c b/2.code/1.sdk/apps/common/third_party_profile/jieli/trans_data_demo/le_trans_data.c
index a9a97ba..2be7164 100644 (file)
--- a/2.code/1.sdk/apps/common/third_party_profile/jieli/trans_data_demo/le_trans_data.c
+++ b/2.code/1.sdk/apps/common/third_party_profile/jieli/trans_data_demo/le_trans_data.c
@@ -306,16 +306,16 @@ void bt_scan_list(void) //扫描完成发送设备列表->小程序
     struct inquiry_noname_remote *remote1;
     if(!list_empty(&inquiry_noname_list)){
         char addr_tmp[18] = {0};//09:98:99:97:67:78
     struct inquiry_noname_remote *remote1;
     if(!list_empty(&inquiry_noname_list)){
         char addr_tmp[18] = {0};//09:98:99:97:67:78

-        char rssi_tmp[5] = {0};//-128-128
+        // char rssi_tmp[5] = {0};//-128-128

         list_for_each_entry(remote1, &inquiry_noname_list, entry) {
         list_for_each_entry(remote1, &inquiry_noname_list, entry) {

-            memset(addr_tmp,0,18);
-            memset(rssi_tmp,0,5);
+            // memset(addr_tmp,0,18);
+            // memset(rssi_tmp,0,5);

             cJSON *device1 = cJSON_CreateObject();
             if(device1 == NULL){
                 continue;
             }
             printf("addr: %s rssi:%d\n", remote1->addr, remote1->rssi);
             cJSON *device1 = cJSON_CreateObject();
             if(device1 == NULL){
                 continue;
             }
             printf("addr: %s rssi:%d\n", remote1->addr, remote1->rssi);

-            snprintf(rssi_tmp,4,"%d", remote1->rssi);
+            // snprintf(rssi_tmp,4,"%d", remote1->rssi);

             snprintf(addr_tmp,18,"%02X:%02X:%02X:%02X:%02X:%02X", remote1->addr[5], remote1->addr[4], remote1->addr[3], remote1->addr[2], remote1->addr[1], remote1->addr[0]);
             // cJSON_AddStringToObject(device1, "rssi", rssi_tmp);
             cJSON_AddNumberToObject(device1, "rssi", remote1->rssi);
             snprintf(addr_tmp,18,"%02X:%02X:%02X:%02X:%02X:%02X", remote1->addr[5], remote1->addr[4], remote1->addr[3], remote1->addr[2], remote1->addr[1], remote1->addr[0]);
             // cJSON_AddStringToObject(device1, "rssi", rssi_tmp);
             cJSON_AddNumberToObject(device1, "rssi", remote1->rssi);