合并

diff --git a/code/sdk/drivers/peripheral/utils/custom_save_runtime.h b/code/sdk/drivers/peripheral/utils/custom_save_runtime.h
index 799d398..3176bda 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_save_runtime.h
+++ b/code/sdk/drivers/peripheral/utils/custom_save_runtime.h
@@ -27,29 +27,29 @@ extern "C" {
 
 typedef enum {
   //开机关机
-  RUNTIME_LOG_POWER_MIN = 0x0000,
-  RUNTIME_LOG_POWER_ON,      // 0x0001 开机
-  RUNTIME_LOG_POWER_OFF,     // 0x0002 关机
-  RUNTIME_LOG_REBOOT,        // 0x0003 重启
-  RUNTIME_LOG_OTA,           // 0x0004 ota升级
-  RUNTIME_LOG_FACTORY_RESET, // 0x0005 恢复出厂设置
+    RUNTIME_LOG_POWER_MIN = 0x0000,
+    RUNTIME_LOG_POWER_ON,      // 0x0001 开机
+    RUNTIME_LOG_POWER_OFF,     // 0x0002 关机
+    RUNTIME_LOG_REBOOT,        // 0x0003 重启
+    RUNTIME_LOG_OTA,           // 0x0004 ota升级
+    RUNTIME_LOG_FACTORY_RESET, // 0x0005 恢复出厂设置
 
-  //蓝牙
-  RUNTIME_LOG_BLE_MIN = 0x0100,
+    //蓝牙
+    RUNTIME_LOG_BLE_MIN = 0x0100,
 
-  RUNTIME_LOG_BLE_BROADCAST_ON,
-  RUNTIME_LOG_BLE_BROADCAST_OFF,
-  RUNTIME_LOG_BLE_CONNECT,
-  RUNTIME_LOG_BLE_DISCONNECT,
+    RUNTIME_LOG_BLE_BROADCAST_ON,
+    RUNTIME_LOG_BLE_BROADCAST_OFF,
+    RUNTIME_LOG_BLE_CONNECT,
+    RUNTIME_LOG_BLE_DISCONNECT,
 
-  RUNTIME_LOG_BLE_CONNECT_UPDATE_50, //连接参数更新 0x0105
-  RUNTIME_LOG_BLE_CONNECT_UPDATE_12,
+    RUNTIME_LOG_BLE_CONNECT_UPDATE_50, //连接参数更新 0x0105
+    RUNTIME_LOG_BLE_CONNECT_UPDATE_12,
 
-  RUNTIME_LOG_BLE_APP_CMD, // APP下发命令
-  RUNTIME_LOG_BLE_ALIPAY_CMD,
-  RUNTIME_LOG_BLE_WATCH_REPLY, //手表回复
+    RUNTIME_LOG_BLE_APP_CMD, // APP下发命令
+    RUNTIME_LOG_BLE_ALIPAY_CMD,
+    RUNTIME_LOG_BLE_WATCH_REPLY, //手表回复
 
-  RUNTIME_LOG_BLE_APP_SYN_END, //同步结束
+    RUNTIME_LOG_BLE_APP_SYN_END, //同步结束
 
     RUNTIME_LOG_BR_CONNECT_HFP,
     RUNTIME_LOG_BR_DISCONNECT_HFP,
@@ -58,37 +58,46 @@ typedef enum {
     RUNTIME_LOG_BR_A2DP_SNK_START_STREAM,
     RUNTIME_LOG_BR_A2DP_SNK_NOT_PLAYING,
     RUNTIME_LOG_BR_A2DP_SNK_PLAYING,
-  RUNTIME_LOG_BR_CONNECT_HFP,
-  RUNTIME_LOG_BR_DISCONNECT_HFP,
-  RUNTIME_LOG_BR_CONNECT_A2DP,
-  RUNTIME_LOG_BR_DISCONNECT_A2DP,
-
-  RUNTIME_LOG_BR_CONNECT_A2DP_HEADSET,
-  RUNTIME_LOG_BR_DISCONNECT_A2DP_HEADSET,
-  //电话
-  RUNTIME_LOG_PHONE_MIN = 0x0200,
-  RUNTIME_LOG_PHONE_HFP_ACTIVE,
-  RUNTIME_LOG_PHONE_HFP_HELD,
-  RUNTIME_LOG_PHONE_HFP_DIALING,
-  RUNTIME_LOG_PHONE_HFP_ALERTING,
-  RUNTIME_LOG_PHONE_HFP_INCOMING,
-  RUNTIME_LOG_PHONE_HFP_WAITING,
-  RUNTIME_LOG_PHONE_HFP_FINISHED,
-  RUNTIME_LOG_PHONE_HFP_TO_MOBILE_PHONE,
-
-  RUNTIME_LOG_PHONE_CAT1_DIALING,
-  RUNTIME_LOG_PHONE_CAT1_INCOMING,
-  RUNTIME_LOG_PHONE_CAT1_WAITING,
-  RUNTIME_LOG_PHONE_CAT1_ACTIVE,
-  RUNTIME_LOG_PHONE_CAT1_FINISH,
-  RUNTIME_LOG_PHONE_CAT1_REJECT,
-
-  RUNTIME_LOG_PHONE_RESET, //状态复位
-
-  // cat1
-  RUNTIME_LOG_CAT1_MIN = 0x0300,
-
-  /*运动*/
+
+
+    RUNTIME_LOG_BR_CONNECT_A2DP_HEADSET,
+    RUNTIME_LOG_BR_DISCONNECT_A2DP_HEADSET,
+    //电话
+    RUNTIME_LOG_PHONE_MIN = 0x0200,
+    RUNTIME_LOG_PHONE_HFP_ACTIVE,
+    RUNTIME_LOG_PHONE_HFP_HELD,
+    RUNTIME_LOG_PHONE_HFP_DIALING,
+    RUNTIME_LOG_PHONE_HFP_ALERTING,
+    RUNTIME_LOG_PHONE_HFP_INCOMING,
+    RUNTIME_LOG_PHONE_HFP_WAITING,
+    RUNTIME_LOG_PHONE_HFP_FINISHED,
+    RUNTIME_LOG_PHONE_HFP_TO_MOBILE_PHONE,
+
+    RUNTIME_LOG_PHONE_CAT1_DIALING,
+    RUNTIME_LOG_PHONE_CAT1_INCOMING,
+    RUNTIME_LOG_PHONE_CAT1_WAITING,
+    RUNTIME_LOG_PHONE_CAT1_ACTIVE,
+    RUNTIME_LOG_PHONE_CAT1_FINISH,
+    RUNTIME_LOG_PHONE_CAT1_REJECT,
+    RUNTIME_LOG_PHONE_RESET, //状态复位
+
+    // cat1
+    RUNTIME_LOG_CAT1_MIN=0x0300,
+    RUNTIME_LOG_CAT1_UDP_MSG_COMMING,
+    RUNTIME_LOG_CAT1_UDP_MSG_NETWORKSTAT,
+    RUNTIME_LOG_CAT1_UDP_MSG_TIME,
+    RUNTIME_LOG_CAT1_UDP_MSG_CONNECTED,
+    RUNTIME_LOG_CAT1_UDP_MSG_DISCONNECTED,
+    RUNTIME_LOG_CAT1_UDP_MSG_OTA_UPDATE,
+    RUNTIME_LOG_CAT1_UDP_MSG_REPLY,
+    RUNTIME_LOG_CAT1_UDP_MSG_DMP_CM_ADDRESS,
+    RUNTIME_LOG_CAT1_UDP_GET_CAT1VER,
+    RUNTIME_LOG_CAT1_UDP_MSG_ATCMD,
+    RUNTIME_LOG_CAT1_UDP_MSG_RECV_DMP,
+    RUNTIME_LOG_CAT1_UDP_MSG_SMS,
+
+
+    /*运动*/
   RUNTIME_LOG_SPORT_MIN = 0x0400,
   //手表发起运动
   RUNTIME_LOG_DIAL_SPORT_LAUNCH,