修复手表重启后不进入睡眠、小睡或久坐模式的BUG

修复BUG #220 手表耳机模式音乐，音量调节跨度太大，最小三格几乎没有声音，最大三格一格的声音都很明显
修复BUG #617 手表，抬碗亮屏太灵敏，小幅度转腕也会亮屏
添加睡眠标志文件存储
优化chipinfo转mac的change函数

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
index 23b1888..f37c08f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -38,6 +38,7 @@
 #include "player/include/PlayersView.h"\r
 #include "record/include/RecordingPlayerView.h"\r
 #include "ppg_service.h"\r
+#include "custom_utils.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C"\r
@@ -449,8 +450,8 @@ extern "C"
                     // 设置状态为小睡\r
                     uapi_dev_runtime_set_nap_status(0);             // 清零小睡状态\r
                     uapi_dev_runtime_set_absolute_static_status(0); // 清零绝对静止状态\r
-                    uapi_dev_runtime_set_nap_monitoring_status(1);\r
-                    uapi_dev_runtime_set_sleep_monitoring_status(0);\r
+                    // uapi_dev_runtime_set_nap_monitoring_status(1);\r
+                    // uapi_dev_runtime_set_sleep_monitoring_status(0);\r
                     OHOS::SleepModel::GetInstance().ReInitData(); // 更新睡眠数据\r
                     set_keep_in_wear_det_mode(1);                 // 开启小睡佩戴监测\r
                     SendMsgToUIService(UI_UPDATE_SLEEP_DATA, 0, nullptr, 0);\r
@@ -464,8 +465,10 @@ extern "C"
                 uapi_dev_runtime_set_sleep_status(0);           // 清零睡眠状态\r
                 uapi_dev_runtime_set_absolute_static_status(0); // 清零绝对静止状态\r
                 OHOS::clean_sleep_data();                       // 清零睡眠文件存储数据\r
-                uapi_dev_runtime_set_sleep_monitoring_status(1);\r
-                uapi_dev_runtime_set_nap_monitoring_status(0);\r
+                // uapi_dev_runtime_set_sleep_monitoring_status(1);\r
+                // uapi_dev_runtime_set_nap_monitoring_status(0);\r
+                if(uapi_dev_runtime_get_nap_monitoring_status() == 1)\r
+                    uapi_clean_sleep_flag();                        // 清除睡眠标志文件\r
                 set_keep_in_wear_det_mode(0);                                       // 关闭小睡佩戴监测\r
                 do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, &cmd); // 强制获取小睡数据，结束小睡\r
                 // 睡眠弹窗\r
@@ -488,12 +491,10 @@ extern "C"
         {\r
             if (is_time_range(curTime, sedentary_start_hour, sedentary_start_min, sedentary_stop_hour, sedentary_stop_min) && (uapi_dev_runtime_get_sedentary_status() == 0))\r
             {\r
-                uapi_dev_runtime_set_sedentary_status(1);\r
                 do_cywee_service_check_msg(CYWEE_SERVICE_CMD_OPEN_SEDENTARY, NULL);\r
             }\r
             else if (!is_time_range(curTime, sedentary_start_hour, sedentary_start_min, sedentary_stop_hour, sedentary_stop_min) && (uapi_dev_runtime_get_sedentary_status() == 1))\r
             {\r
-                uapi_dev_runtime_set_sedentary_status(0);\r
                 do_cywee_service_check_msg(CYWEE_SERVICE_CMD_CLOSE_SEDENTARY, NULL);\r
             }\r
         }\r

diff --git a/code/sdk/drivers/peripheral/cywee/service/cywee_service.c b/code/sdk/drivers/peripheral/cywee/service/cywee_service.c
index ca12517..3fb420a 100644 (file)
--- a/code/sdk/drivers/peripheral/cywee/service/cywee_service.c
+++ b/code/sdk/drivers/peripheral/cywee/service/cywee_service.c
@@ -399,10 +399,12 @@ static void cywee_service_check_task(void const *arg)
 
             case CYWEE_SERVICE_CMD_OPEN_SEDENTARY:
                 cywee_set_sedentary_switch(1);
+                uapi_dev_runtime_set_sedentary_status(1);
             break;
 
             case CYWEE_SERVICE_CMD_CLOSE_SEDENTARY:
                 cywee_set_sedentary_switch(0);
+                uapi_dev_runtime_set_sedentary_status(0);
             break;
             case CYWEE_SERVICE_CMD_RESTART_ACC:
                 cywee_restart_acc();

diff --git a/code/sdk/drivers/peripheral/cywee/src/main_dml.c b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
index 4b2765f..40ec79d 100644 (file)
--- a/code/sdk/drivers/peripheral/cywee/src/main_dml.c
+++ b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
@@ -95,6 +95,13 @@ int cm__hs1__init(void);
 int cm__hs1__deinit(void);
 #endif
 
+typedef struct
+{
+    uint32_t timestamp; //
+    uint8_t stat;       // 状态
+
+} SLEEP_FLAG_T;
+
 void cywee_set_abs_static(void)
 {
     //int time = get_config_heart_from_config_model();
@@ -531,6 +538,8 @@ void cywee_inactivity_mode_change(int mode)
             scl.iData[0] = 1;
             scl.iData[1] = 2;
             CWM_SettingControl(SCL_SET_INACTIVITY_MODE, &scl);
+            uapi_dev_runtime_set_sleep_monitoring_status(1);
+            uapi_dev_runtime_set_nap_monitoring_status(0);
             break;
 
         //久坐、有效站立和小睡
@@ -540,6 +549,8 @@ void cywee_inactivity_mode_change(int mode)
             scl.iData[0] = 1;
             scl.iData[1] = 3;
             CWM_SettingControl(SCL_SET_INACTIVITY_MODE, &scl);
+            uapi_dev_runtime_set_sleep_monitoring_status(0);
+            uapi_dev_runtime_set_nap_monitoring_status(1);
             break;
 
         //小睡
@@ -830,6 +841,15 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
                 c_inactivity_result_t.hour = (int)sensorEVT->fData[5];
                 c_inactivity_result_t.minute = (int)sensorEVT->fData[6];
 
+                /*保存睡眠状态*/
+                if(c_inactivity_result_t.status >= 6 && c_inactivity_result_t.status <= 13)
+                {
+                    SLEEP_FLAG_T sleep_flag_t = {0,0};
+                    uapi_get_timestampe_ss(sleep_flag_t.timestamp);
+                    sleep_flag_t.stat = c_inactivity_result_t.status;
+                    uapi_save_sleep_flag(&sleep_flag_t,sizeof(SLEEP_FLAG_T));
+                }
+
                 //0进入睡眠  1潜睡 2深睡 3清醒 4结束睡眠 6入睡 7出睡最后一笔输出 8未出睡最后一笔输出 12快速动眼 13取消入睡
                 if(c_inactivity_result_t.status == 6)
                 {
@@ -1156,6 +1176,16 @@ int cywee_main_dml(void)
     uint32_t irqMask = 0;
     irqMask = osal_irq_lock();
 #ifdef CYWEE_MAC_ACTIVE
+
+    // /******************获取chipinfo 找到对应的btmac 并配置进去*************************/
+    // int chipinfolen = strlen((char*)chipInfo);
+    // if (chipinfolen >= 4)
+    // {
+        //uint32_t chipinfo_num= *(uint32_t*)(&chipInfo[chipinfolen - 4]);
+        //change_mac_from_chipinfo_map(chipinfo_num);
+    //}    
+
+    change_mac_from_chipinfo_map();
     //cm__hs1__mac_c0_init();//若mac_address的排列為正相時呼叫的api
     cm__hs1__mac_c0r_init();//若mac_address的排列為反相時呼叫的api
 #else
@@ -1190,17 +1220,6 @@ int cywee_main_dml(void)
     CWM_OS_dbgPrintf("chip_settings = %d, %d, %d\n", scl.iData[9], scl.iData[10], scl.iData[11]);
     //CWM_OS_dbgPrintf("[DBG] %s %d\n", __func__,__LINE__);
 
-
-#ifdef CYWEE_MAC_ACTIVE
-    /******************获取chipinfo 找到对应的btmac 并配置进去*************************/
-    int chipinfolen = strlen((char*)chipInfo);
-    if (chipinfolen >= 4)
-    {
-        uint32_t chipinfo_num= *(uint32_t*)(&chipInfo[chipinfolen - 4]);
-        change_mac_from_chipinfo_map(chipinfo_num);
-    }    
-    /*******************************************/
-#endif
     if(scl.iData[5] == 1)
     {
         cywee_is_active = 1;
@@ -1287,10 +1306,10 @@ int cywee_main_dml(void)
     //设置抬腕功能
     memset(&scl, 0, sizeof(scl));
     scl.iData[0] = 1;
-    // scl.iData[1] = 5;
-    // scl.iData[2] = 5;
-    // scl.iData[3] = 5;
-    // scl.iData[4] = 5;
+    scl.iData[1] = 6; //调小抬手反应范围
+    scl.iData[2] = 5;
+    scl.iData[3] = 5;
+    scl.iData[4] = 6; //调小抬手反应范围
     CWM_SettingControl(SCL_HAND_UPDOWN_CONFIG, &scl);
 
     //配置跑步机模式相关参数（进入跑步机模式自动生效）

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index 51b0176..e26e443 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -3097,285 +3097,296 @@ void start_save_file_thread(void)
 #if defined(CYWEE_MAC_ACTIVE)
 typedef struct 
 {
-    uint32_t chipinfo;
     uint16_t mac;
+    char uid[33];
 } chiinfo_mac_pair;
 
+
 static chiinfo_mac_pair g_chipinfo_map[]={
-{0xD9CC9E36,0x0001},
-{0x2D3BF936,0x0002},
-{0xC5337236,0x0003},
-{0xB0FCA736,0x0004},
-{0x35D07A36,0x0005},
-{0x1E976A36,0x0006},
-{0x8A57CD36,0x0007},
-{0x97F6A636,0x0008},
-{0x71758B36,0x0009},
-{0x8625E036,0x000A},
-{0xE0B06936,0x000B},
-{0x73A9B136,0x000C},
-{0x38B76936,0x000D},
-{0xE474F636,0x000E},
-{0xFA99DE36,0x000F},
-{0x41560A36,0x0010},
-{0xCA2CE836,0x0011},
-{0x4DF35936,0x0012},
-{0x1C748A36,0x0013},
-{0x3CEB5D36,0x0014},
-{0x4C4E6136,0x0015},
-{0x34608836,0x0016},
-{0xCDA7DE36,0x0017},
-{0xE4ED4436,0x0018},
-{0x3B9D7936,0x0019},
-{0xDA128D36,0x001A},
-{0xA62C7236,0x001B},
-{0x18855536,0x001C},
-{0x42088F36,0x001D},
-{0xC2752336,0x001E},
-{0x8D581636,0x001F},
-{0x0E5E9D36,0x0020},
-{0x06CA9E36,0x0021},
-{0x98368E36,0x0022},
-{0xF56EB836,0x0023},
-{0x0EF75536,0x0024},
-{0xBB293736,0x0025},
-{0x969CE636,0x0026},
-{0x00F66136,0x0027},
-{0x74F04336,0x0028},
-{0xDD54C136,0x0029},
-{0xD2EE8636,0x002A},
-{0xB80CF336,0x002B},
-{0xD5CC1E36,0x002C},
-{0xD05AC336,0x002D},
-{0x1AB93436,0x002E},
-{0x20DE5F36,0x002F},
-{0x49D9C136,0x0030},
-{0xFB5C0436,0x0031},
-{0x5141CC36,0x0032},
-{0xBEE9A436,0x0033},
-{0xDE575336,0x0034},
-{0xDE18CA36,0x0035},
-{0x371B2D36,0x0036},
-{0x484C3E36,0x0037},
-{0xBE8D1036,0x0038},
-{0xE0468A36,0x0039},
-{0xC341D936,0x003A},
-{0x3AF6B836,0x003B},
-{0x362CFA36,0x003C},
-{0xFBA6FC36,0x003D},
-{0xDDD75136,0x003E},
-{0xD9F9E736,0x003F},
-{0x0DBE0336,0x0040},
-{0xE344F636,0x0041},
-{0xE5824636,0x0042},
-{0x056C5536,0x0043},
-{0x81D3F736,0x0044},
-{0x24835636,0x0045},
-{0xEA520036,0x0046},
-{0xB8E0E936,0x0047},
-{0x5669CC36,0x0048},
-{0x2E370636,0x0049},
-{0x2C570E36,0x004A},
-{0x26E4E236,0x004B},
-{0xFD22F536,0x004C},
-{0x5C233536,0x004D},
-{0x80299236,0x004E},
-{0xF797EC36,0x004F},
-{0x76457736,0x0050},
-{0x8574B536,0x0051},
-{0xF5D1FC36,0x0052},
-{0x1BD70436,0x0053},
-{0x86164C36,0x0054},
-{0x56435B36,0x0055},
-{0x56E62D36,0x0056},
-{0x9B4FC136,0x0057},
-{0xDFEEAD36,0x0058},
-{0x85E2A736,0x0059},
-{0x61867A36,0x005A},
-{0xBBBC3436,0x005B},
-{0x3AD1F136,0x005C},
-{0xB76E9536,0x005D},
-{0x03C0FB36,0x005E},
-{0x1AAAA336,0x005F},
-{0x14182936,0x0060},
-{0xF371CB36,0x0061},
-{0xD6990336,0x0062},
-{0x54A90036,0x0063},
-{0x6323EC36,0x0064},
-{0xF33B0B36,0x0065},
-{0x873E3136,0x0066},
-{0x3E94FF36,0x0067},
-{0x29BAA436,0x0068},
-{0x275EAC36,0x0069},
-{0x361E5B36,0x006A},
-{0x34DF9A36,0x006B},
-{0x787F5236,0x006C},
-{0x38AD1536,0x006D},
-{0x6C5FDE36,0x006E},
-{0x32AF7536,0x006F},
-{0x0A8C0436,0x0070},
-{0x4F13F836,0x0071},
-{0xDDDB8736,0x0072},
-{0xF513B036,0x0073},
-{0x1F097036,0x0074},
-{0x82C55236,0x0075},
-{0x230EE636,0x0076},
-{0xFEFD8536,0x0077},
-{0xAAA17F36,0x0078},
-{0xDE56A136,0x0079},
-{0xCFF0CE36,0x007A},
-{0x15052136,0x007B},
-{0xCF823936,0x007C},
-{0x463B4236,0x007D},
-{0xC1527536,0x007E},
-{0x9F7C6636,0x007F},
-{0xCE48AF36,0x0080},
-{0xE5183C36,0x0081},
-{0x4DF6FC36,0x0082},
-{0x64B69536,0x0083},
-{0x23964D36,0x0084},
-{0x36ABA236,0x0085},
-{0x47294236,0x0086},
-{0x490F8C36,0x0087},
-{0xA575EB36,0x0088},
-{0x37BB9136,0x0089},
-{0x9BBFAF36,0x008A},
-{0x5A3E8136,0x008B},
-{0x2E9E7B36,0x008C},
-{0xDE290336,0x008D},
-{0x13B40436,0x008E},
-{0x183AEC36,0x008F},
-{0xA3A8A536,0x0090},
-{0x4E7B2336,0x0091},
-{0x6D3C7636,0x0092},
-{0x3F7A8336,0x0093},
-{0xCA623636,0x0094},
-{0x8AB9B736,0x0095},
-{0xC9C9D136,0x0096},
-{0x75092536,0x0097},
-{0x9E764C36,0x0098},
-{0x67B7B236,0x0099},
-{0x67D80A36,0x009A},
-{0xCF963F36,0x009B},
-{0x1F3FB336,0x009C},
-{0xB3FC7436,0x009D},
-{0xC78D3636,0x009E},
-{0x8A86ED36,0x009F},
-{0x0E06D236,0x00A0},
-{0x9F432436,0x00A1},
-{0x3AEA7A36,0x00A2},
-{0x26DF4536,0x00A3},
-{0xE3149D36,0x00A4},
-{0x3E21FF36,0x00A5},
-{0x7030FA36,0x00A6},
-{0x7AEFF236,0x00A7},
-{0x7427F636,0x00A8},
-{0x972ED936,0x00A9},
-{0x2466DE36,0x00AA},
-{0xE5991936,0x00AB},
-{0x73CAD736,0x00AC},
-{0x71A70736,0x00AD},
-{0x7EB80A36,0x00AE},
-{0x5F4B5B36,0x00AF},
-{0xEC798D36,0x00B0},
-{0x8483A936,0x00B1},
-{0xFAB54E36,0x00B2},
-{0x03489536,0x00B3},
-{0xC8315536,0x00B4},
-{0x92259336,0x00B5},
-{0xBE5D5536,0x00B6},
-{0xFDA26836,0x00B7},
-{0xBF9A6036,0x00B8},
-{0xF7B05B36,0x00B9},
-{0xA6318F36,0x00BA},
-{0x044DF436,0x00BB},
-{0xAEFC3836,0x00BC},
-{0xA16A7E36,0x00BD},
-{0x5124F636,0x00BE},
-{0x45E4F336,0x00BF},
-{0xCFCD5D36,0x00C0},
-{0x50E27A36,0x00C1},
-{0x4CF33C36,0x00C2},
-{0x609CC736,0x00C3},
-{0xEBB98436,0x00C4},
-{0x21FEDE36,0x00C5},
-{0xB3AA8436,0x00C6},
-{0xB6780E36,0x00C7},
-{0x326F9536,0x00C8},
-{0xA07E0536,0x00C9},
-{0x52070036,0x00CA},
-{0xBC720B36,0x00CB},
-{0xE4849136,0x00CC},
-{0xC9012536,0x00CD},
-{0x8A5B0F36,0x00CE},
-{0xEF572B36,0x00CF},
-{0x3F13A636,0x00D0},
-{0x0FF25636,0x00D1},
-{0x8A619A36,0x00D2},
-{0x6F6B6F36,0x00D3},
-{0xE7A99A36,0x00D4},
-{0x02461436,0x00D5},
-{0x39DC3236,0x00D6},
-{0xD7B84036,0x00D7},
-{0xB1B20C36,0x00D8},
-{0x8781EB36,0x00D9},
-{0x192D9236,0x00DA},
-{0xE0118136,0x00DB},
-{0xFE480B36,0x00DC},
-{0xC87B5F36,0x00DD},
-{0xA6D3CC36,0x00DE},
-{0xDB2A3036,0x00DF},
-{0x0F5EC636,0x00E0},
-{0xD4855D36,0x00E1},
-{0x9A0CD036,0x00E2},
-{0xF0BC3E36,0x00E3},
-{0x72093436,0x00E4},
-{0x8D575C36,0x00E5},
-{0xBC04DC36,0x00E6},
-{0x5A7B1736,0x00E7},
-{0x3EDF6536,0x00E8},
-{0xAAD3D436,0x00E9},
-{0x58444236,0x00EA},
-{0xAC162836,0x00EB},
-{0x45F3CB36,0x00EC},
-{0xB9CB1F36,0x00ED},
-{0x4FD58F36,0x00EE},
-{0x51EC8936,0x00EF},
-{0x7EC4A636,0x00F0},
-{0x7BBA1736,0x00F1},
-{0xE25A0936,0x00F2},
-{0x2772A636,0x00F3},
-{0xE0CD0736,0x00F4},
-{0x5C08DA36,0x00F5},
-{0x02759236,0x00F6},
-{0xE23B1C36,0x00F7},
-{0x7DB1C836,0x00F8},
-{0x84C9D636,0x00F9},
-{0x21F62E36,0x00FA},
-{0x24A81136,0x00FB},
-{0x53ADB336,0x00FC},
-{0x27B02E36,0x00FD},
-{0xEAA9FB36,0x00FE},
-{0x36356036,0x00FF},
-{0xA7351A36,0x0100},
-{0xA3EBBA36,0x0101},
-{0xBA8DBA36,0x0102},
-{0x87EDE936,0x0103},
-{0xD82F9A36,0x0104},
-{0xB1580B36,0x0105},
-{0x816E8D36,0x0106},
-{0x6598DC36,0x0107},
-{0x8EA98636,0x0108},
+{0x0001,"d45d90577478d5d30a03780fa9820100"},
+{0x0002,"d45d9057c36716c40a03780f8f820100"},
+{0x0003,"d45d90578b0a82a10a03780fa3820100"},
+{0x0004,"d45d9057d57f3f0f0a03780fa5820100"},
+{0x0005,"d45d9057474870030a03780f49820100"},
+{0x0006,"d45d9057fdd66dc30a03780f6b820100"},
+{0x0007,"d45d90574343bd3d0a03780f89820100"},
+{0x0008,"d45d9057b6c9317c0a03780f81820100"},
+{0x0009,"d45d9057ee4effd50a03780f6d820100"},
+{0x000A,"d45d9057234fe6760a03780f2d820100"},
+{0x000B,"d45d9057ede7b19d0a03780f47820100"},
+{0x000C,"d45d9057217e48f70a03780f87820100"},
+{0x000D,"d45d9057b31332dd0a03780f69820100"},
+{0x000E,"d45d9057932fa2a30a03780f83820100"},
+{0x000F,"d45d9057f7a1b99d0a03780f83820100"},
+{0x0010,"d45d9057f575cb620a03780f6f820100"},
+{0x0011,"d45d90572f41a8000a03780f83820100"},
+{0x0012,"d45d9057138d4d940a03780fa9820100"},
+{0x0013,"d45d90570f066d8e0a03780f41820100"},
+{0x0014,"d45d905773995ce80a03780fa3820100"},
+{0x0015,"d45d905798b5cbda0a03780f81820100"},
+{0x0016,"d45d9057c50ce74a0a03780f89820100"},
+{0x0017,"d45d905750a9b1e00a03780f6d820100"},
+{0x0018,"d45d90573115a7b10a03780f8d820100"},
+{0x0019,"d45d9057589b27330a03780fab820100"},
+{0x001A,"d45d905746ead0960a03780fc3820100"},
+{0x001B,"d45d905754ec9fdb0a03780fc5820100"},
+{0x001C,"d45d90579776d98c0a03780f89820100"},
+{0x001D,"d45d90570f0e21e20a03780fcf820100"},
+{0x001E,"d45d905769a75cc10a03780faf820100"},
+{0x001F,"d45d90574da75f820a03780f05820100"},
+{0x0020,"d45d905772a43a090a03780faf820100"},
+{0x0021,"d45d90578e67fb370a03780fa5820100"},
+{0x0022,"d45d905738c4b5180a03780fa3820100"},
+{0x0023,"d45d9057157462160a03780f8d820100"},
+{0x0024,"d45d9057068f32ba0a03780f67820100"},
+{0x0025,"d45d9057840177ce0a03780f85820100"},
+{0x0026,"d45d90575fceade10a03780f87820100"},
+{0x0027,"d45d9057ad6ce8b00a03780faf820100"},
+{0x0028,"d45d9057c3a3ce140a03780f05820100"},
+{0x0029,"d45d9057f465271f0a03780f47820100"},
+{0x002A,"d45d9057862198bf0a03780f81820100"},
+{0x002B,"d45d9057d0c4b8520a03780f6d820100"},
+{0x002C,"d45d9057f08174d60a03780f8f820100"},
+{0x002D,"d45d90570dd36d540a03780fad820100"},
+{0x002E,"d45d9057a6bf40810a03780f03820100"},
+{0x002F,"d45d905784b6ebe80a03780f69820100"},
+{0x0030,"d45d9057200285c60a03780f69820100"},
+{0x0031,"d45d9057c78d1e0f0a03780f8d820100"},
+{0x0032,"d45d9057ac04f00f0a03780fa3820100"},
+{0x0033,"d45d90574943528c0a03780f85820100"},
+{0x0034,"d45d9057db5ed6c40a03780f8f820100"},
+{0x0035,"d45d9057116234190a03780f63820100"},
+{0x0036,"d45d9057f4cfeb110a03780fab820100"},
+{0x0037,"d45d905733edd6ea0a03780f43820100"},
+{0x0038,"d45d905719571fe00a03780f81820100"},
+{0x0039,"d45d90575b5908270a03780f4b820100"},
+{0x003A,"d45d905757254ab00a03780f89820100"},
+{0x003B,"d45d90579f6d24e10a03780f6b820100"},
+{0x003C,"d45d90577aedece10a03780f8f820100"},
+{0x003D,"d45d9057b83e267c0a03780f65820100"},
+{0x003E,"d45d905749671ee90a03780fa1820100"},
+{0x003F,"d45d9057344198f40a03780f87820100"},
+{0x0040,"d45d90576c443db40a03780f63820100"},
+{0x0041,"d45d9057072242700a03780f67820100"},
+{0x0042,"d45d9057179b29750a03780f8f820100"},
+{0x0043,"d45d9057d9d3c1060a03780f4b820100"},
+{0x0044,"d45d90579b470faf0a03780fa9820100"},
+{0x0045,"d45d90570b8134c60a03780f65820100"},
+{0x0046,"d45d905717c47f3a0a03780fc3820100"},
+{0x0047,"d45d9057e97b8fd40a03780f65820100"},
+{0x0048,"d45d90571600216a0a03780f67820100"},
+{0x0049,"d45d9057c87995c60a03780f89820100"},
+{0x004A,"d45d9057442a312b0a03780f83820100"},
+{0x004B,"d45d9057d59746570a03780fa9820100"},
+{0x004C,"d45d9057407a8ce40a03780f83820100"},
+{0x004D,"d45d90575027d1bd0a03780f89820100"},
+{0x004E,"d45d9057197b923c0a03780f4b820100"},
+{0x004F,"d45d9057ecb5a9030a03780f8d820100"},
+{0x0050,"d45d9057efca39530a03780f85820100"},
+{0x0051,"d45d905719c34b820a03780f41820100"},
+{0x0052,"d45d90576d78157e0a03780f43820100"},
+{0x0053,"d45d9057c1b790d20a03780fad820100"},
+{0x0054,"d45d905709e8d4750a03780f4d820100"},
+{0x0055,"d45d90579c1337a40a03780f4f820100"},
+{0x0056,"d45d905768feb7b90a03780f61820100"},
+{0x0057,"d45d9057cad8f6360a03780f6b820100"},
+{0x0058,"d45d9057dc238f5c0a03780f67820100"},
+{0x0059,"d45d9057cded0d4a0a03780f8b820100"},
+{0x005A,"d45d905724d6b8f10a03780f67820100"},
+{0x005B,"d45d9057e00c80d80a03780f65820100"},
+{0x005C,"d45d90576dc25faa0a03780f89820100"},
+{0x005D,"d45d90576f8d7b3d0a03780f6f820100"},
+{0x005E,"d45d905763c973dc0a03780fab820100"},
+{0x005F,"d45d905740f8d12e0a03780f8d820100"},
+{0x0060,"d45d90577d517d990a03780f6b820100"},
+{0x0061,"d45d9057a469bc8e0a03780f87820100"},
+{0x0062,"d45d905797d5d3620a03780f6f820100"},
+{0x0063,"d45d9057b02436530a03780f65820100"},
+{0x0064,"d45d9057a64f802d0a03780f67820100"},
+{0x0065,"d45d90571cf8fb070a03780f07820100"},
+{0x0066,"d45d90575551c3af0a03780f2b820100"},
+{0x0067,"d45d9057f472220b0a03780f89820100"},
+{0x0068,"d45d90570dfab3730a03780fad820100"},
+{0x0069,"d45d9057c0c448470a03780f01820100"},
+{0x006A,"d45d905789ca99d00a03780f21820100"},
+{0x006B,"d45d905706a3f35e0a03780fa7820100"},
+{0x006C,"d45d9057404ba0200a03780f65820100"},
+{0x006D,"d45d905718dae5530a03780fab820100"},
+{0x006E,"d45d90579f33363e0a03780f8d820100"},
+{0x006F,"d45d905746d99a4a0a03780fa1820100"},
+{0x0070,"d45d9057f9a4d1140a03780f87820100"},
+{0x0071,"d45d9057549f3e1c0a03780f8d820100"},
+{0x0072,"d45d90578316be950a03780f85820100"},
+{0x0073,"d45d905779d95e7c0a03780fa1820100"},
+{0x0074,"d45d90571395bf770a03780f4f820100"},
+{0x0075,"d45d905797a738d50a03780f69820100"},
+{0x0076,"d45d90571bec56010a03780f6d820100"},
+{0x0077,"d45d905760c690ad0a03780f8b820100"},
+{0x0078,"d45d9057f4e3ea460a03780f63820100"},
+{0x0079,"d45d90577f88852d0a03780fa7820100"},
+{0x007A,"d45d9057fd7ea90d0a03780f6b820100"},
+{0x007B,"d45d9057e55f7a090a03780f65820100"},
+{0x007C,"d45d905790def00f0a03780f6f820100"},
+{0x007D,"d45d905792d4d8300a03780f89820100"},
+{0x007E,"d45d9057d04208b00a03780f67820100"},
+{0x007F,"d45d9057656a9d540a03780fab820100"},
+{0x0080,"d45d90577b1f494a0a03780f4f820100"},
+{0x0081,"d45d90578e3841d20a03780f6d820100"},
+{0x0082,"d45d9057c2dee2e00a03780fa9820100"},
+{0x0083,"d45d9057abad74aa0a03780f61820100"},
+{0x0084,"d45d9057c9790a9c0a03780f65820100"},
+{0x0085,"d45d90579d39a0640a03780fa1820100"},
+{0x0086,"d45d905753faaa4b0a03780f81820100"},
+{0x0087,"d45d90572be023130a03780f25820100"},
+{0x0088,"d45d905788c893de0a03780f29820100"},
+{0x0089,"d45d905732ba69ba0a03780f6f820100"},
+{0x008A,"d45d90576c60bfd40a03780f63820100"},
+{0x008B,"d45d9057f1f5e73b0a03780f6f820100"},
+{0x008C,"d45d9057d5d7d5eb0a03780fa7820100"},
+{0x008D,"d45d9057d04a7aae0a03780f89820100"},
+{0x008E,"d45d905703f918e60a03780f83820100"},
+{0x008F,"d45d9057cc7b16470a03780f85820100"},
+{0x0090,"d45d90578d0fcaec0a03780f47820100"},
+{0x0091,"d45d9057d47ae9bb0a03780fe7810100"},
+{0x0092,"d45d9057c6b225810a03780f65820100"},
+{0x0093,"d45d905716b3e70e0a03780f41820100"},
+{0x0094,"d45d9057618f1d390a03780f4f820100"},
+{0x0095,"d45d9057046e2f000a03780f6f820100"},
+{0x0096,"d45d9057eca93f460a03780f6d820100"},
+{0x0097,"d45d9057b20adda00a03780f8b820100"},
+{0x0098,"d45d90572247ab7b0a03780fcd820100"},
+{0x0099,"d45d9057f62117ae0a03780f63820100"},
+{0x009A,"d45d90572d18803a0a03780fab820100"},
+{0x009B,"d45d9057cbf185a50a03780f4f820100"},
+{0x009C,"d45d9057f46a62080a03780f07820100"},
+{0x009D,"d45d905718fe1cb60a03780fa1820100"},
+{0x009E,"d45d9057929537490a03780f63820100"},
+{0x009F,"d45d90571121ff600a03780f87820100"},
+{0x00A0,"d45d905711e0b0610a03780fcb820100"},
+{0x00A1,"d45d90571d0624a90a03780f01820100"},
+{0x00A2,"d45d90573baa474b0a03780fc5820100"},
+{0x00A3,"d45d9057d51cd9b00a03780f63820100"},
+{0x00A4,"d45d90578ba74a160a03780f4b820100"},
+{0x00A5,"d45d9057f29f0fc10a03780fa3820100"},
+{0x00A6,"d45d9057b4686a560a03780f8b820100"},
+{0x00A7,"d45d90576ac8333d0a03780f61820100"},
+{0x00A8,"d45d9057ae8915c60a03780f6f820100"},
+{0x00A9,"d45d9057827ead400a03780fcb820100"},
+{0x00AA,"d45d9057fed883df0a03780f8f820100"},
+{0x00AB,"d45d90574d7d3ee90a03780f8d820100"},
+{0x00AC,"d45d9057b17783eb0a03780f8b820100"},
+{0x00AD,"d45d90571aa843fa0a03780fa7820100"},
+{0x00AE,"d45d90572815d1a70a03780f6d820100"},
+{0x00AF,"d45d9057670b8bae0a03780fad820100"},
+{0x00B0,"d45d905757bfa12b0a03780f61820100"},
+{0x00B1,"d45d9057d7a1d3d50a03780fa9820100"},
+{0x00B2,"d45d9057a5eaa96c0a03780f8f820100"},
+{0x00B3,"d45d9057be667eb50a03780fa5820100"},
+{0x00B4,"d45d90577d9f5d710a03780fa1820100"},
+{0x00B5,"d45d9057d61757680a03780f41820100"},
+{0x00B6,"d45d90577ec8bd000a03780fa1820100"},
+{0x00B7,"d45d9057b210fc4d0a03780f6b820100"},
+{0x00B8,"d45d9057a861b6880a03780fe7820100"},
+{0x00B9,"d45d9057278b812c0a03780fa3820100"},
+{0x00BA,"d45d90570c9b513b0a03780f8d820100"},
+{0x00BB,"d45d9057e6f033750a03780f6b820100"},
+{0x00BC,"d45d9057d9b8aea30a03780f6f820100"},
+{0x00BD,"d45d9057959fde430a03780f87820100"},
+{0x00BE,"d45d9057a4a9f5880a03780f4d820100"},
+{0x00BF,"d45d905729bd1bad0a03780f8d820100"},
+{0x00C0,"d45d90571f1061410a03780fa7820100"},
+{0x00C1,"d45d905746bf7c9f0a03780f81820100"},
+{0x00C2,"d45d9057b19a479e0a03780f85820100"},
+{0x00C3,"d45d905743f17dc80a03780f85820100"},
+{0x00C4,"d45d9057698b63e40a03780f07820100"},
+{0x00C5,"d45d905727292d010a03780f85820100"},
+{0x00C6,"d45d9057cac8d8600a03780f67820100"},
+{0x00C7,"d45d9057cdc04b200a03780f61820100"},
+{0x00C8,"d45d9057c5b2d6de0a03780fa1820100"},
+{0x00C9,"d45d905712d05dbb0a03780f2f820100"},
+{0x00CA,"d45d9057c7b763030a03780fc9820100"},
+{0x00CB,"d45d9057d9c47eba0a03780f81820100"},
+{0x00CC,"d45d9057cf497d3c0a03780f6f820100"},
+{0x00CD,"d45d905776ec318c0a03780f41820100"},
+{0x00CE,"d45d90571ea387cb0a03780f63820100"},
+{0x00CF,"d45d90575f0e88430a03780f69820100"},
+{0x00D0,"d45d9057d1d095c70a03780fa3820100"},
+{0x00D1,"d45d905739c4e58f0a03780fa5820100"},
+{0x00D2,"d45d9057880e443a0a03780fa7820100"},
+{0x00D3,"d45d905746fb0d3a0a03780fab820100"},
+{0x00D4,"d45d9057fbe821cd0a03780f89820100"},
+{0x00D5,"d45d9057ea85dea30a03780f87820100"},
+{0x00D6,"d45d9057f9e102a60a03780fa9820100"},
+{0x00D7,"d45d9057fb3f07450a03780f8d820100"},
+{0x00D8,"d45d9057ef4769bb0a03780f6b820100"},
+{0x00D9,"d45d905758c236a30a03780fa3820100"},
+{0x00DA,"d45d9057be6226040a03780f85820100"},
+{0x00DB,"d45d9057452227720a03780f87820100"},
+{0x00DC,"d45d90571059d7be0a03780fa7820100"},
+{0x00DD,"d45d9057519cd07a0a03780f61820100"},
+{0x00DE,"d45d9057b90c22390a03780f83820100"},
+{0x00DF,"d45d9057ce967bce0a03780f69820100"},
+{0x00E0,"d45d90572e4526800a03780f8d820100"},
+{0x00E1,"d45d9057491300610a03780f8b820100"},
+{0x00E2,"d45d905725e16d3d0a03780fa7820100"},
+{0x00E3,"d45d9057ba066f890a03780f41820100"},
+{0x00E4,"d45d9057d9725a710a03780f87820100"},
+{0x00E5,"d45d90570b4eacc30a03780f45820100"},
+{0x00E6,"d45d905727cadc230a03780f8d820100"},
+{0x00E7,"d45d9057350788160a03780f63820100"},
+{0x00E8,"d45d90575b3c8eed0a03780f69820100"},
+{0x00E9,"d45d9057d853ddcc0a03780fc9820100"},
+{0x00EA,"d45d90575cbad1b10a03780f6f820100"},
+{0x00EB,"d45d90576d6d44130a03780f67820100"},
+{0x00EC,"d45d9057c1cf5d020a03780faf820100"},
+{0x00ED,"d45d9057d4322acf0a03780f81820100"},
+{0x00EE,"d45d905717f88ab20a03780f85820100"},
+{0x00EF,"d45d9057029aa5320a03780fad820100"},
+{0x00F0,"d45d9057d16f6e340a03780f6f820100"},
+{0x00F1,"d45d90573010bf7b0a03780fcf820100"},
+{0x00F2,"d45d9057e9a775410a03780fa3820100"},
+{0x00F3,"d45d9057170ef7140a03780f6d820100"},
+{0x00F4,"d45d9057f98e05390a03780f23820100"},
+{0x00F5,"d45d9057f19a65b60a03780f4f820100"},
+{0x00F6,"d45d9057d22304b20a03780f8d820100"},
+{0x00F7,"d45d90571dc2e2550a03780fa3820100"},
+{0x00F8,"d45d9057a041a9230a03780faf820100"},
+{0x00F9,"d45d905762bdb44d0a03780f85820100"},
+{0x00FA,"d45d9057a9639fe30a03780f83820100"},
+{0x00FB,"d45d90574872fc1e0a03780f8b820100"},
+{0x00FC,"d45d9057e0153dc10a03780f6b820100"},
+{0x00FD,"d45d9057f5daa16a0a03780fab820100"},
+{0x00FE,"d45d90576bd9a2540a03780f69820100"},
+{0x00FF,"d45d905756362ff20a03780f81820100"},
+{0x0100,"d409441782b5a8ca0a03787507820100"},
+{0x0101,"d40944175563517a0a03787521820100"},
+{0x0102,"d4094417231002070a03787505820100"},
+{0x0103,"d4094417f128ae310a03781d27820100"},
+{0x0104,"d45dd617267bc5070a03780f4f830100"},
+{0x0105,"d45dd6178656a6f10a03780f2d830100"},
+{0x0106,"d4094417cf5b57f10a03787521820100"},
+{0x0107,"d4094417ff4014470a0378750d820100"},
+{0x0108,"d4094417b9da89830a03787549820100"},
 };
-errcode_t change_mac_from_chipinfo_map(uint32_t chipinfo_num)
+
+errcode_t change_mac_from_chipinfo_map(void)
 {
     uint8_t bd_addr[BD_ADDR_LEN]={0};
+    uint8_t soc_id[20]={0};
+    uint8_t uid[16]={0};
+    char uid_str[33] = {0};
     errcode_t ret;
+
+    uapi_soc_read_id(soc_id,20);
+    sec_make_uid16(soc_id,20,uid);
+
+    for(int i = 0; i < 16; i++)
+        sprintf(uid_str + i * 2, "%02x", uid[i]);
+    uid_str[32] = '\0';
+
     for (int i=0 ; i< sizeof(g_chipinfo_map)/sizeof(chiinfo_mac_pair);i++)
     {
-
-       
-        if (g_chipinfo_map[i].chipinfo ==  chipinfo_num)
+        if(strcmp(uid_str, g_chipinfo_map[i].uid) == 0)
         {
             uint16_t btmac2 = g_chipinfo_map[i].mac;
             bd_addr[5] = (btmac2&0x00FF) ; 
@@ -3387,20 +3398,44 @@ errcode_t change_mac_from_chipinfo_map(uint32_t chipinfo_num)
             ret = uapi_set_nv_btaddr(bd_addr, sizeof(bd_addr));
             if (ret != ERRCODE_SUCC) { 
                 /* ERROR PROCESS */ 
-                printf("found chipinfo 0x%08X and change btmac to 0xXXXXXX01%04X failed! ret %d\n",
-                g_chipinfo_map[i].chipinfo,
+                // printf("found chipinfo 0x%08X and change btmac to 0xXXXXXX01%04X failed! ret %d\n",
+                // g_chipinfo_map[i].chipinfo,
+                // g_chipinfo_map[i].mac,
+                // ret);
+                printf("found uid %s and change btmac to 0xXXXXXX01%04X failed! ret %d\n",
+                g_chipinfo_map[i].uid,
                 g_chipinfo_map[i].mac,
                 ret);
                 return ERRCODE_FAIL; 
             } else{
-                printf("found chipinfo 0x%08X and change btmac to 0xXXXXXX01%04X success!\n",
-                g_chipinfo_map[i].chipinfo,
+                // printf("found chipinfo 0x%08X and change btmac to 0xXXXXXX01%04X success!\n",
+                // g_chipinfo_map[i].chipinfo,
+                // g_chipinfo_map[i].mac);
+                printf("found uid %s and change btmac to 0xXXXXXX01%04X success!\n",
+                g_chipinfo_map[i].uid,
                 g_chipinfo_map[i].mac);
                 return ERRCODE_SUCC;
             }
         }
+
     }
-    printf(" chipinfo 0x%08X not found !\n",chipinfo_num);
+    //printf(" chipinfo 0x%08X not found !\n",chipinfo_num);
     return ERRCODE_FAIL;
 }
-#endif
\ No newline at end of file
+#endif
+
+
+#define SLEEP_FLAG_PATH "/user/userdata/sleep_flag.bin"
+
+void uapi_save_sleep_flag(uint8_t *data,uint16_t len)
+{
+    if(access(SLEEP_FLAG_PATH, F_OK) == -1)
+        uapi_save_file_data(SLEEP_FLAG_PATH,data,len,"wb");
+    else
+        uapi_save_file_data(SLEEP_FLAG_PATH,data,len,"ab");
+}
+
+void uapi_clean_sleep_flag(void)
+{
+    uapi_delete_files(SLEEP_FLAG_PATH);
+}

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.h b/code/sdk/drivers/peripheral/utils/custom_utils.h
index b1b44ed..93ff881 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.h
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.h
@@ -130,7 +130,7 @@ errcode_t uapi_get_nv_btname(uint8_t *buf_btname, uint32_t *len_btname);
 cywee chipinfo 转换 btmac地址，确保之前被chipinfo激活的密钥，用bt mac仍然可以激活
 要在init_btaddr_btname之前执行
 */
-errcode_t change_mac_from_chipinfo_map(uint32_t chipinfo_num);
+errcode_t change_mac_from_chipinfo_map(void);
 
 
 errcode_t init_btaddr_btname(void);
@@ -281,6 +281,8 @@ uint32_t uapi_get_a5133_update_state1(void);
 errcode_t uapi_start_audio_test(int volume);
 errcode_t uapi_stop_audio_test(void);
 
+void uapi_save_sleep_flag(uint8_t *data,uint16_t len);
+void uapi_clean_sleep_flag(void);
 
 void start_save_file_thread(void);
 

diff --git a/code/sdk/middleware/services/media/foundation/audiomanager/frameworks/audiomanager/cpp/audio_manager.cpp b/code/sdk/middleware/services/media/foundation/audiomanager/frameworks/audiomanager/cpp/audio_manager.cpp
index 749c459..dc4e74b 100755 (executable)
--- a/code/sdk/middleware/services/media/foundation/audiomanager/frameworks/audiomanager/cpp/audio_manager.cpp
+++ b/code/sdk/middleware/services/media/foundation/audiomanager/frameworks/audiomanager/cpp/audio_manager.cpp
@@ -43,13 +43,31 @@ AudioSession AudioManager::MakeSessionId()
 bool AudioManager::SetVolume(AudioStreamType streamType, int32_t volume)
 {
     CHK_NULL_RETURN(impl_, false, "impl_ is nullptr");
+    
+    if(volume == 0) 
+        volume = 0;
+    else if(volume <= 1) 
+        volume = 30;
+    else if(volume > 100) 
+        volume = 70;
+    else 
+        volume = 30 + (volume - 1) * 40 / 99;
+
     return impl_->SetVolume(streamType, volume);
 }
 
 int32_t AudioManager::GetVolume(AudioStreamType streamType)
 {
     CHK_NULL_RETURN(impl_, AUDIO_ERROR, "impl_ is nullptr");
-    return impl_->GetVolume(streamType);
+    //return impl_->GetVolume(streamType);
+    int32_t volume = impl_->GetVolume(streamType);
+    if(volume == 0) 
+        return 0;
+    if(volume < 30) 
+        return 1;
+    if (volume > 70) 
+        return 100;
+    return ((volume - 30) * 99 / 40) + 1;
 }
 
 int32_t AudioManager::GetMinVolume(AudioStreamType streamType)