From e95f585e74b9f5ef44f7537f84be7b2470d7b6c5 Mon Sep 17 00:00:00 2001 From: penglei <1624952103@qq.com> Date: Sat, 21 Sep 2024 18:01:46 +0800 Subject: [PATCH] =?utf8?q?=E6=B7=BB=E5=8A=A0=E5=BD=95=E9=9F=B3=E5=9B=9E?= =?utf8?q?=E7=8E=AF=E6=B5=8B=E8=AF=95=EF=BC=88=E8=A1=A5=E4=BA=A4=EF=BC=89?= =?utf8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E7=9D=A1=E7=9C=A0=E6=95=B0=E6=8D=AE?= =?utf8?q?=E6=97=B6=E9=97=B4=E6=88=B3=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../audio/sample_ai/sample_ai_aenc.c | 18 +++++++++++- code/sdk/application/audio/sample_audio_api.h | 2 +- .../msg_center/src/msg_center_customer.cpp | 29 +++++++++---------- .../drivers/peripheral/utils/custom_utils.c | 18 ++++++++++++ .../drivers/peripheral/utils/custom_utils.h | 2 +- 5 files changed, 51 insertions(+), 18 deletions(-) diff --git a/code/sdk/application/audio/sample_ai/sample_ai_aenc.c b/code/sdk/application/audio/sample_ai/sample_ai_aenc.c index 14d258529..76bbfb8a9 100755 --- a/code/sdk/application/audio/sample_ai/sample_ai_aenc.c +++ b/code/sdk/application/audio/sample_ai/sample_ai_aenc.c @@ -305,6 +305,13 @@ static td_void sample_ai_aenc_close_sea(sample_ai_aenc_inst *inst) inst->h_sea = 0; } +static uint32_t audio_param[48] = {0, 0, 0, 0, 16843009, 33620225, 16000, 16000, + 1024, 100, 1985229328, 1985229328, 16842753, 257, 257, 512, + 33555332, 16844032, 4, 0, 458824, 11796580, 327946, 1310720005, + 65576964, 1000, 21499085, 67108874, 327680, 655367, 2126009683, 654734439, + 1, 0, 0, 0, 0, 0, 5308396, 655336, + 4286447619, 64536, 500, 16384, 3277, 0, 66049, 0}; + static td_s32 sample_ai_aenc_open_sea(sample_ai_aenc_inst *inst) { td_s32 ret; @@ -348,6 +355,13 @@ static td_s32 sample_ai_aenc_open_sea(sample_ai_aenc_inst *inst) goto out; } + ret = uapi_sea_set_param(inst->h_sea,UAPI_SEA_AFE_SEE,(const void *)audio_param,sizeof(audio_param)); + printf("uapi_sea_set_param ret = %d\r\n", ret); + if (ret != AUDIO_SUCCESS) { + sap_err_log_fun(uapi_sea_set_param, ret); + return ret; + } + ret = uapi_sea_attach_output(inst->h_sea, UAPI_SEA_OUTPUT_ASR_SRC, inst->h_aenc); if (ret != EXT_SUCCESS) { sap_err_log_fun(uapi_sea_attach_output, ret); @@ -395,7 +409,9 @@ static td_void sample_ai_aenc_set_port_attr(const sample_ai_aenc_inst *inst, uap return; } - ai_attr->ref_attr.enable = TD_FALSE; + //ai_attr->ref_attr.enable = TD_FALSE; + ai_attr->ref_attr.enable = TD_TRUE; + ai_attr->ref_attr.port = SND_OUT_PORT_DEFAULT; switch (inst->ai_port) { case UAPI_AI_PORT_PDM0: diff --git a/code/sdk/application/audio/sample_audio_api.h b/code/sdk/application/audio/sample_audio_api.h index 53263d51b..8d8b6be3e 100755 --- a/code/sdk/application/audio/sample_audio_api.h +++ b/code/sdk/application/audio/sample_audio_api.h @@ -94,7 +94,7 @@ #define BT_SCO_FRAME_SIZE 57 #if (SAP_CHIP_TYPE == brandy) -#define SND_OUT_PORT_DEFAULT UAPI_SND_OUT_PORT_I2S2 /* Out port for SmartPA SPK output */ +#define SND_OUT_PORT_DEFAULT UAPI_SND_OUT_PORT_I2S0 /* Out port for SmartPA SPK output */ #else #define SND_OUT_PORT_DEFAULT UAPI_SND_OUT_PORT_DAC0 #endif diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp index d457d074f..3973e4f5c 100644 --- a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp @@ -502,8 +502,7 @@ void MsgCenterNotifyLowPowerAlarmProc(const Topic topic, Request* req) static SLEEP_T sleep_data = {0}; static NAP_T nap_data = {0}; static int state_num = 0; -static uint32_t day_timestamp = 0; -static uint32_t current_day = 0; +static int current_year = 0; static uint8_t fall_asleep_state_num = 0; #endif @@ -513,7 +512,7 @@ void MsgCenterNotifyNextDayProc(const Topic topic, Request *req) unused(topic); unused(req); AlarmClockModel::GetInstance()->NextDayNotify(); - day_timestamp = 0; + current_year = 0; #ifdef FD230 printf("******nextday is begin******\r\n"); /* ----------------------------------- 睡眠相关 ----------------------------------- */ @@ -1228,15 +1227,14 @@ void MsgCenterNotifyInactivityProc(const Topic topic, Request *req) //unused(topic); #ifdef FD230 uint32_t timestamp = 0; - if(day_timestamp == 0) + if(current_year == 0) { time_t rawtime; struct tm* timeinfo; time(&rawtime); timeinfo = localtime(&rawtime); - uapi_get_timestampe_ss(×tamp); - day_timestamp = timestamp - (timeinfo->tm_hour * 60 * 60 + timeinfo->tm_min * 60 + timeinfo->tm_sec); - current_day = timeinfo->tm_mday; + current_year = timeinfo->tm_year + 1900; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "timeinfo->tm_year : %d",timeinfo->tm_year); } #endif OHOS::SLEEP_STATE_T state_data = {0}; @@ -1295,13 +1293,12 @@ void MsgCenterNotifyInactivityProc(const Topic topic, Request *req) // } if(state_num < SLEEP_STATUS_LENGTH) { - sleep_data.sleep_status[state_num].timestamp = day_timestamp + cywee_Inactivity_Info->hour * 60 * 60 + cywee_Inactivity_Info->minute * 60; - if(current_day != cywee_Inactivity_Info->day) - { - sleep_data.sleep_status[state_num].timestamp -= 24 * 60 * 60; - } + uapi_get_timestampe_ss_extend(×tamp,current_year,cywee_Inactivity_Info->month,cywee_Inactivity_Info->day,cywee_Inactivity_Info->hour,cywee_Inactivity_Info->minute,0); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "timestamp : %d ",timestamp); + sleep_data.sleep_status[state_num].timestamp = timestamp; sleep_data.sleep_status[state_num].stat = cywee_Inactivity_Info->status; - if(sleep_data.sleep_status[state_num].stat == 7 || sleep_data.sleep_status[state_num].stat == 13) + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "stat : %d , timestamp : %d ", sleep_data.sleep_status[state_num].stat,sleep_data.sleep_status[state_num].timestamp); + if(sleep_data.sleep_status[state_num].stat == 7 || sleep_data.sleep_status[state_num].stat == 9 || sleep_data.sleep_status[state_num].stat == 13) { uapi_get_timestampe_ss(×tamp); sleep_data.sleep_status[state_num].timestamp = timestamp; @@ -1325,13 +1322,15 @@ void MsgCenterNotifyInactivityProc(const Topic topic, Request *req) if(cywee_Inactivity_Info->status == 0) //0进入睡眠 1潜睡 2深睡 3清醒 4结束睡眠 6入睡 7出睡最后一笔输出 8未出睡最后一笔输出 12快速动眼 13取消入睡 { #ifdef FD230 - nap_data.fall_asleep_timestamp = day_timestamp + cywee_Inactivity_Info->hour * 60 * 60 + cywee_Inactivity_Info->minute * 60; + uapi_get_timestampe_ss_extend(×tamp,current_year,cywee_Inactivity_Info->month,cywee_Inactivity_Info->day,cywee_Inactivity_Info->hour,cywee_Inactivity_Info->minute,0); + nap_data.fall_asleep_timestamp = timestamp; #endif } else if(cywee_Inactivity_Info->status == 14) { #ifdef FD230 - nap_data.wake_up_timestamp = day_timestamp + cywee_Inactivity_Info->hour * 60 * 60 + cywee_Inactivity_Info->minute * 60; + uapi_get_timestampe_ss_extend(×tamp,current_year,cywee_Inactivity_Info->month,cywee_Inactivity_Info->day,cywee_Inactivity_Info->hour,cywee_Inactivity_Info->minute,0); + nap_data.wake_up_timestamp = timestamp; #endif } break; diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c index 59539301b..f4edea0cf 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils.c +++ b/code/sdk/drivers/peripheral/utils/custom_utils.c @@ -490,6 +490,24 @@ errcode_t uapi_get_timestampe_ss(uint32_t *tm) return ERRCODE_SUCC; } +errcode_t uapi_get_timestampe_ss_extend(uint32_t *tm,int year, int month, int day, int hour, int minute, int second) +{ + if (tm == NULL) { + return ERRCODE_FAIL; + } + PRINT("year[%d],mon[%d],day[%d],hour[%d],min[%d],sec[%d] \n",year,month,day,hour,minute,second); + struct tm timeinfo; + timeinfo.tm_year = year - 1900; + timeinfo.tm_mon = month - 1; + timeinfo.tm_mday = day; + timeinfo.tm_hour = hour; + timeinfo.tm_min = minute; + timeinfo.tm_sec = second; + timeinfo.tm_isdst = -1; + *tm = mktime(&timeinfo); + return ERRCODE_SUCC; +} + errcode_t uaip_set_time_utc_zone(uint32_t seconds,int16_t zone_quarters) { return sync_time_utc(seconds,zone_quarters); diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.h b/code/sdk/drivers/peripheral/utils/custom_utils.h index ae607ed03..a9ff72de0 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils.h +++ b/code/sdk/drivers/peripheral/utils/custom_utils.h @@ -44,7 +44,7 @@ errcode_t uaip_cmd_update_request(void); errcode_t uapi_get_timestampe_ms(uint32_t *tm); /*获取单位秒的时间戳*/ errcode_t uapi_get_timestampe_ss(uint32_t *tm); - +errcode_t uapi_get_timestampe_ss_extend(uint32_t *tm,int year, int month, int day, int hour, int minute, int second); /**返回timezone quarters*/ uint16_t uapi_get_timezone(void); /**set timezone quarters*/ -- 2.17.1