Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...

diff --cc cat1modem/src/cat1Service.py
Simple merge

diff --cc cat1modem/src/checkota.py
Simple merge

diff --cc code/sdk/application/brandy/brandy_standard/thread_pri_init.c
Simple merge

diff --cc code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.h
Simple merge

diff --cc code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c
index 9635977,0ec208d..60322f0
--- 1/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c
--- 2/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c
@@@ -884,19 -906,10 +907,18 @@@ static uint32_t custom_get_aging_data(u
  
      uint8_t aging_data[4] = {0};
      uapi_get_file_data("user/userdata/aging_test.bin",aging_data,4);
-     wstp_print("aging_test fail_num[%d], display_error_num[%d] ,microhone_error_num[%d] ,ppg_error_num[%d] \n",aging_data[0],aging_data[1],aging_data[2],aging_data[3]);
      return ERRCODE_SUCC;
  }
 -
 -
 +static uint32_t custom_cat1_start_ota_pyupdate(uint8_t *para, uint32_t paraLen, char *strCommonCmd)
 +{
 +    Cat1_OTA(BLE_START_OTA);
 +    return ERRCODE_SUCC;
 +}
 +static uint32_t custom_cat1_stop_ota_pyupdate(uint8_t *para, uint32_t paraLen, char *strCommonCmd)
 +{
 +    Cat1_OTA(BLE_STOP_OTA);
 +    return ERRCODE_SUCC;
 +}
  #ifdef SUPPORT_A5133_SERVICE
  
  
@@@ -996,14 -1171,19 +1180,22 @@@ static const at_cmd_table_t g_custom_ut
      {(char *)"AT^GETCYWEEACTIVE", custom_get_cywee_active_state, (char *)" "},
      {(char *)"AT^AGINGTEST", custom_aging_test, (char *)" "},
      {(char *)"AT^GETAGING", custom_get_aging_data, (char *)" "},
- 
++    
 +    {(char *)"AT^CAT1STARTOTAPY", custom_cat1_start_ota_pyupdate, (char *)" "},
 +    {(char *)"AT^CAT1STOPOTAPY", custom_cat1_stop_ota_pyupdate, (char *)" "},
+     {(char *)"AT^VIBTEST", custom_vibrator_test, (char *)" "},
  #ifdef SUPPORT_A5133_SERVICE
      {(char *)"AT^A5133SENDDATA", custom_a5133_send_msg, (char *)" "},
      {(char *)"AT^A5133RSSI", custom_a5133_rssi, (char *)" "},
+    
      
  #endif
 -      { (char *)"AT^CALL_BT_ENTRY_ADRESSBOOK",      PBAP_ENTRY_ADDRESS, (char *)" " },
++    { (char *)"AT^CALL_BT_ENTRY_ADRESSBOOK",      PBAP_ENTRY_ADDRESS, (char *)" " },
+     { (char *)"AT^CALL_BT_CONNECT_PBAP",      PBAP_CONNECT, (char *)" " },
+     { (char *)"AT^PBAP_PULL",      PBAP_PULL, (char *)" " },
+     { (char *)"AT^PBAP_LS",      PBAP_LS, (char *)" " },
+     { (char *)"AT^BLE_TEST",      BLE_TEST, (char *)" " },
+     { (char *)"AT^SETVOLUME",      custom_volume_test, (char *)" " },
  };