From: hcj <1224667075@qq.com>
Date: Thu, 19 Dec 2024 08:30:17 +0000 (+0800)
Subject: 合并
X-Git-Tag: v1.3.113-repair_tp~18^2~40
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=54b31b1df924348e8ae1f22e0bb3bd3064b8487e;p=mirrors%2FFD230.git

合并
---

54b31b1df924348e8ae1f22e0bb3bd3064b8487e
diff --cc code/sdk/drivers/peripheral/utils/custom_save_runtime.h
index cd5a32f27,0325c7942..799d39893
--- a/code/sdk/drivers/peripheral/utils/custom_save_runtime.h
+++ b/code/sdk/drivers/peripheral/utils/custom_save_runtime.h
@@@ -21,129 -22,165 +22,172 @@@
  #ifdef __cplusplus
  #if __cplusplus
  extern "C" {
- #endif /* __cplusplus */
- #endif /* __cplusplus */
+ #endif /*__cplusplus*/
+ #endif /*__cplusplus*/
  
+ 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 恢复出厂设置
  
- 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_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,
 +    RUNTIME_LOG_BR_CONNECT_A2DP,
 +    RUNTIME_LOG_BR_DISCONNECT_A2DP,
 +    RUNTIME_LOG_BR_A2DP_SNK_START_STREAM,
 +    RUNTIME_LOG_BR_A2DP_SNK_NOT_PLAYING,
 +    RUNTIME_LOG_BR_A2DP_SNK_PLAYING,
- 
-     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_HEART_MIN=0x0500,
-     //佩戴
-     RUNTIME_LOG_WEAR_MIN=0x0600,
-     //血氧
-     RUNTIME_LOG_OXTGEN_MIN= 0x0700,
-     //LCD
-     RUNTIME_LOG_LCD_MIN=0x0800,
-     RUNTIME_LOG_LCD_ON,                                     //0x0801 屏幕亮
-     RUNTIME_LOG_LCD_OFF,                                    //0x0802 屏幕灭
-     //抬腕
-     RUNTIME_LOG_RAISE_MIN=0x0900,
-     //充电
-     RUNTIME_LOG_CHARGE_MIN=0x0A00,
-     RUNTIME_LOG_CHARGE_START,                               //0x0A01 充电开始
-     RUNTIME_LOG_CHARGE_STOP,                                //0x0A02 充电停止
-     //电池电量变化
-     RUNTIME_LOG_BATTERY_MIN=0x0B00,
-     //马达
-     RUNTIME_LOG_MOTOR_MIN=0x0C00,
-     RUNTIME_LOG_MOTOR_START,                                //0x0C01 马达开始转动
-     RUNTIME_LOG_MOTOR_STOP,                                 //0x0C02 马达停止转动
-     //表盘
-     RUNTIME_LOG_DIAL_MIN=0x0D00,
-     //音乐
-     RUNTIME_LOG_MUSIC_MIN=0x0E00,
-     RUNTIME_LOG_LOCAL_MUSIC_PLAY_START,                     //0x0E01 本地音乐开始播放
-     RUNTIME_LOG_LOCAL_MUSIC_PLAY_PAUSE,                     //0x0E02 本地音乐开始暂停
-     RUNTIME_LOG_LOCAL_MUSIC_PLAY_STOP,                      //0x0E03 本地音乐播放停止
-     //铃声
-     RUNTIME_LOG_RING_MIN=0x0F00,
-     RUNTIME_LOG_RING_PLAY_START_ALARM,                      //0x0F01 闹钟铃声开始播放
-     RUNTIME_LOG_RING_PLAY_STOP_ALARM,                       //0x0F02 闹钟铃声播放停止
-     RUNTIME_LOG_RING_PLAY_START_COUNTDOWN,                  //0x0F03 倒计时铃声开始播放
-     RUNTIME_LOG_RING_PLAY_STOP_COUNTDOWN,                   //0x0F04 倒计时铃声播放停止
-     RUNTIME_LOG_RING_PLAY_START_FINDWATCH,                  //0x0F05 查找手表铃声开始播放
-     RUNTIME_LOG_RING_PLAY_STOP_FINDWATCH,                   //0x0F06 查找手表铃声播放停止
-     //低功耗记录
-     RUNTIME_LOG_lOW_POWER_MIN=0x1000,
-     //录音
-     RUNTIME_LOG_RECORD_MIN=0x1100,
-     RUNTIME_LOG_RECORD_START,                               //0x1101 录音开始
-     RUNTIME_LOG_RECORD_STOP,                                //0x1102 录音停止
-     RUNTIME_LOG_RECORD_START_AI,                            //0x1103 AI录音开始
-     RUNTIME_LOG_RECORD_STOP_AI,                             //0x1104 AI录音停止
- 
+   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_SPORT_MIN = 0x0400,
+   //手表发起运动
+   RUNTIME_LOG_DIAL_SPORT_LAUNCH,
+   // App发起运动
+   RUNTIME_LOG_APP_SPORT_LAUNCH,
+   //开始特殊运动（跑步，走路，跑步机，漫步机）
+   RUNTIME_LOG_SPORT_SPECIAL_START,
+   //开始普通运动
+   RUNTIME_LOG_SPORT_NORMAL_START,
+   //暂停运动
+   RUNTIME_LOG_SPORT_PAUSE,
+   //恢复运动
+   RUNTIME_LOG_SPORT_RESUME,
+   //结束运动
+   RUNTIME_LOG_SPORT_END,
+   /*******************************/
+ 
+   /*******************************/
+   //心率
+   RUNTIME_LOG_HEART_MIN = 0x0500,
+   //主动测量心率
+   RUNTIME_LOG_HEART_MEASURE,
+   //测量心率结束
+   RUNTIME_LOG_HEART_MEASURE_END,
+   //被动测量心率
+   RUNTIME_LOG_HEART_PASSIVE_MEASURE,
+   //被动测量心率结束
+   RUNTIME_LOG_OXYGEN_PASSIVE_MEASURE_END,
+   /*******************************/
+ 
+   //佩戴
+   RUNTIME_LOG_WEAR_MIN = 0x0600,
+ 
+   /*******************************/
+   //血氧
+   RUNTIME_LOG_OXYGEN_MIN = 0x0700,
+   //主动测量血氧
+   RUNTIME_LOG_OXYGEN_MEASURE,
+   //测量血氧结束
+   RUNTIME_LOG_OXYGEN_MEASURE_END,
+   /*******************************/
+ 
+   // LCD
+   RUNTIME_LOG_LCD_MIN = 0x0800,
+   RUNTIME_LOG_LCD_ON,  // 0x0801 屏幕亮
+   RUNTIME_LOG_LCD_OFF, // 0x0802 屏幕灭
+   //抬腕
+   RUNTIME_LOG_RAISE_MIN = 0x0900,
+ 
+   //充电
+   RUNTIME_LOG_CHARGE_MIN = 0x0A00,
+   RUNTIME_LOG_CHARGE_START, // 0x0A01 充电开始
+   RUNTIME_LOG_CHARGE_STOP,  // 0x0A02 充电停止
+ 
+   //电池电量变化
+   RUNTIME_LOG_BATTERY_MIN = 0x0B00,
+ 
+   //马达
+   RUNTIME_LOG_MOTOR_MIN = 0x0C00,
+   RUNTIME_LOG_MOTOR_START, // 0x0C01 马达开始转动
+   RUNTIME_LOG_MOTOR_STOP,  // 0x0C02 马达停止转动
+ 
+   /*******************************/
+   //表盘
+   RUNTIME_LOG_DIAL_MIN = 0x0D00,
+   //表盘切换视频表盘(后续增加该类型，目前不好判断)
+   RUNTIME_LOG_DIAL_VIDEO_START,
+   //表盘切换指针表盘
+   RUNTIME_LOG_DIAL_POINTER_START,
+   //表盘切换序列帧表盘
+   RUNTIME_LOG_DIAL_SEQUENCE_START,
+   //表盘切换数码表盘
+   RUNTIME_LOG_DIAL_DIGITAL_START,
+   /*******************************/
+ 
+   //音乐
+   RUNTIME_LOG_MUSIC_MIN = 0x0E00,
+   RUNTIME_LOG_LOCAL_MUSIC_PLAY_START, // 0x0E01 本地音乐开始播放
+   RUNTIME_LOG_LOCAL_MUSIC_PLAY_PAUSE, // 0x0E02 本地音乐开始暂停
+   RUNTIME_LOG_LOCAL_MUSIC_PLAY_STOP,  // 0x0E03 本地音乐播放停止
+ 
+   //铃声
+   RUNTIME_LOG_RING_MIN = 0x0F00,
+   RUNTIME_LOG_RING_PLAY_START_ALARM,     // 0x0F01 闹钟铃声开始播放
+   RUNTIME_LOG_RING_PLAY_STOP_ALARM,      // 0x0F02 闹钟铃声播放停止
+   RUNTIME_LOG_RING_PLAY_START_COUNTDOWN, // 0x0F03 倒计时铃声开始播放
+   RUNTIME_LOG_RING_PLAY_STOP_COUNTDOWN,  // 0x0F04 倒计时铃声播放停止
+   RUNTIME_LOG_RING_PLAY_START_FINDWATCH, // 0x0F05 查找手表铃声开始播放
+   RUNTIME_LOG_RING_PLAY_STOP_FINDWATCH, // 0x0F06 查找手表铃声播放停止
+ 
+   //低功耗记录
+   RUNTIME_LOG_lOW_POWER_MIN = 0x1000,
+ 
+   //录音
+   RUNTIME_LOG_RECORD_MIN = 0x1100,
+   RUNTIME_LOG_RECORD_START,    // 0x1101 录音开始
+   RUNTIME_LOG_RECORD_STOP,     // 0x1102 录音停止
+   RUNTIME_LOG_RECORD_START_AI, // 0x1103 AI录音开始
+   RUNTIME_LOG_RECORD_STOP_AI,  // 0x1104 AI录音停止
  
  } runtime_log_cmd_Id;