From 4e2a9a46bf34a77db7bcc322fffbd78ecb3f030d Mon Sep 17 00:00:00 2001 From: SnickerSun Date: Sun, 3 Mar 2024 02:09:18 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E5=A4=8Dtimer=E5=8F=91=E9=80=81AT?= =?utf8?q?=E6=8C=87=E4=BB=A4=EF=BC=8Cuart=E4=B8=8D=E6=8E=A5=E6=94=B6?= =?utf8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../peripheral/slip/cat1Service/cat1_ctl.cpp | 2 +- .../peripheral/slip/cat1Service/cat1_ctl.h | 1 + .../slip/cat1Service/cat1_server.cpp | 18 ++++++++++++++---- ...VOLTE_OCPU_QPY_BETA0228_20240303-0207.zip} | Bin 11541012 -> 11541009 bytes .../slip/cat1Service/pyscript/cat1Service.py | 14 ++++++-------- .../drivers/peripheral/utils/custom_utils.c | 4 +--- 6 files changed, 23 insertions(+), 16 deletions(-) rename code/sdk/drivers/peripheral/slip/cat1Service/pyscript/{EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228_20240303-0107.zip => EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228_20240303-0207.zip} (99%) diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ctl.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ctl.cpp index 04765f904..ccf20b416 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ctl.cpp +++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ctl.cpp @@ -114,7 +114,7 @@ void uapi_cat1_wakeup_cat1(uint8_t wakeup) void uapi_cat1_pre_init(void) { - char *argv[]={"setvolume","100"}; + char *argv[]={"setvolume","90"}; VoiceCallVolteSample(2,(const char**)argv); } diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ctl.h b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ctl.h index 72a97d60f..36efbfec2 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ctl.h +++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ctl.h @@ -17,6 +17,7 @@ void uapi_cat1_start_volte_voice(void); void uapi_cat1_stop_volte_voice(void); void uapi_cat1_remove_audio_vote(void); void uapi_cat1_add_audio_vote(void); +void uapi_cat1_wakeup_cat1(uint8_t wakeup); #ifdef __cplusplus #if __cplusplus diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp index 484f4ad07..0bea9ecf5 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp +++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp @@ -146,9 +146,13 @@ static void udp_send_response(char *tx_buffer, char *head, char *content) printf("Error occured unkown send data\n"); } } - +#include "uart_porting.h" void udp_send_msg_toCat1(char cmd,char *content) { + uapi_cat1_wakeup_cat1(1); + + uart_port_register_irq(UART_BUS_0); + char station_tx_buffer[256] = {0}; char station_head[2] = {0}; if( sourceAddr.sin_port != 0 ) { @@ -156,6 +160,7 @@ void udp_send_msg_toCat1(char cmd,char *content) station_head[1] = cmd; udp_send_response(station_tx_buffer, station_head, content); } + uapi_cat1_wakeup_cat1(0); } @@ -185,7 +190,9 @@ void cat1_getsignal(void) } void cat1_gettime(void) { + printf("UDP_CMD_GET_TIME\n"); udp_send_msg_toCat1(UDP_CMD_GET_TIME,"0"); + } void cat1_getver(void) { @@ -255,6 +262,7 @@ int cat1_handle_timesync(struct tcp_msg_t *msg) static void time_sync_func(void) { + printf("time_sync_func\n"); cat1_gettime(); if(osTimerIsRunning(g_timer_time_sync)==1 && g_time_synced == 1 ) @@ -273,7 +281,7 @@ void restart_time_sync(void) if(osTimerIsRunning(g_timer_time_sync)==0 ) { WEARABLE_LOGI(WEARABLE_LOG_MODULE_MAIN_SERVICE,"cat1 restart_time_sync timer \n"); - osTimerStart(g_timer_time_sync,20000); //20秒后重试同步时间 + osTimerStart(g_timer_time_sync,5000); //20秒后重试同步时间 } } @@ -451,8 +459,10 @@ errcode_t cat1_server_init(void) g_timer_time_sync = osTimerNew((osTimerFunc_t)time_sync_func, osTimerPeriodic, NULL, NULL); - restart_time_sync(); - + if (g_timer_time_sync != NULL) + restart_time_sync(); + else + printf("g_timer_time_sync create failed\n"); return ERRCODE_SUCC; } diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/pyscript/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228_20240303-0107.zip b/code/sdk/drivers/peripheral/slip/cat1Service/pyscript/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228_20240303-0207.zip similarity index 99% rename from code/sdk/drivers/peripheral/slip/cat1Service/pyscript/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228_20240303-0107.zip rename to code/sdk/drivers/peripheral/slip/cat1Service/pyscript/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228_20240303-0207.zip index 79ffb49321b94a876bfe983dadf9cad534451fe1..f22b277fe4c014ef2ec3792976b1e9f0b2350a01 100644 GIT binary patch delta 7510 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 delta 7671 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 diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/pyscript/cat1Service.py b/code/sdk/drivers/peripheral/slip/cat1Service/pyscript/cat1Service.py index 23912192e..bef0625e7 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/pyscript/cat1Service.py +++ b/code/sdk/drivers/peripheral/slip/cat1Service/pyscript/cat1Service.py @@ -167,8 +167,8 @@ class Cat1Service: __head = 'FC' self.__message = str(incomming_numb) self.__Socket_UDP(__head, self.__message) - if self.__err == 1 or self.__value[2] != 'OK': - return -1 + # if self.__err == 1 or self.__value[2] != 'OK': + # return -1 return 0 # 电话接听消息 @@ -177,8 +177,8 @@ class Cat1Service: __head = 'FA' self.__message = '0' self.__Socket_UDP(__head, self.__message) - if self.__err == 1 or self.__value[2] != 'OK': - return -1 + # if self.__err == 1 or self.__value[2] != 'OK': + # return -1 return 0 # 电话拒接消息 @@ -187,8 +187,8 @@ class Cat1Service: __head = 'FB' self.__message = '0' self.__Socket_UDP(__head, self.__message) - if self.__err == 1 or self.__value[2] != 'OK': - return -1 + # if self.__err == 1 or self.__value[2] != 'OK': + # return -1 return 0 @@ -198,8 +198,6 @@ class Cat1Service: self.clear_remain() self.__message = str(_timesync) self.__Socket_UDP('FD', self.__message) - if self.__err == 1 or self.__value[2] != 'OK': - return -1 return 0 # 查询网卡版本信息 diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c index dac39dae6..a7acc5496 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils.c +++ b/code/sdk/drivers/peripheral/utils/custom_utils.c @@ -266,15 +266,13 @@ errcode_t uapi_set_time_from_cat1(char* cat1time) time(&rawtime); timeinfo = localtime(&rawtime); - printf("%04d-%02d-%02d %02d:%02d:%02d %d\n", + printf("set time success %04d-%02d-%02d %02d:%02d:%02d %d\n", timeinfo->tm_year + 1900, timeinfo->tm_mon + 1, timeinfo->tm_mday, timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec,zone); - - printf("set time success %s !\n",cat1time); }else{ printf("convert to time failed ret %d!\n",ret); -- 2.17.1