mac地址全改成大写显示

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 822d119..a05fb2b 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
@@ -893,7 +893,7 @@ int uart_send_bt_state(u8 bt_state) //蓝牙向4G发送蓝牙耳机的状态
     // BT_CONN_STATE_NOT_FOUND = 4
     char s_mac[18];
     memset(s_mac,0,18);
-    sprintf(s_mac,"%02x:%02x:%02x:%02x:%02x:%02x",maddr[0],maddr[1],maddr[2],maddr[3],maddr[4],maddr[5]);
+    sprintf(s_mac,"%02x:%02X:%02X:%02X:%02X:%02X",maddr[0],maddr[1],maddr[2],maddr[3],maddr[4],maddr[5]);
     // cJSON_AddStringToObject(data, "name", (char *)userremote_name);
     cJSON_AddStringToObject(data, "mac", (char *)s_mac);
     if(bt_state == 1){
@@ -1026,6 +1026,7 @@ int uart_send_clear_earphoneok(void)
 ////*************解析****************//////
 extern u8 is_bredr_close(void);
 extern void bt_init_bredr();
+extern void app_audio_volume_set(u8 value);
 int ota_data_len = 0;
 int parse_uart_data(char *json_string)
 {
@@ -1286,6 +1287,18 @@ int parse_uart_data(char *json_string)
 
             clear_earphone_record();
         }
+        if(!strcmp(event->valuestring,"adjust_volume")) {
+            printf("调节音量");
+            cJSON *data = cJSON_GetObjectItemCaseSensitive(root, "data");
+            if (cJSON_IsString(data) && (data->valuestring != NULL)) {
+                // printf("volume: %s\n", data->valuestring);
+                int volume = atoi(data->valuestring);
+                int volume_tmp = (volume*31)/100;
+                printf("volume:%d %d",volume,volume_tmp);
+                app_audio_volume_set(volume_tmp);
+            }
+        }
+        
         if(error_flag == 0 && ack_flag == 1)
         {
             ack_flag = 0;

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 80b6ef6..b962f00 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
@@ -274,7 +274,6 @@ void bt_scan_list(void) //扫描完成发送设备列表->小程序
     //         }
     //     ]
     // }
-    scan_state = 0;
     cJSON *root = cJSON_CreateObject();
     if(root ==NULL){
         clear_dev_list();
@@ -305,7 +304,7 @@ void bt_scan_list(void) //扫描完成发送设备列表->小程序
             }
             printf("addr: %s rssi:%d\n", remote1->addr, 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]);
+            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);
             cJSON_AddStringToObject(device1, "mac", addr_tmp);