From 86d43cbb8c16e5ecfaa1623ff4fabbb2317b4c19 Mon Sep 17 00:00:00 2001 From: payton Date: Tue, 2 Jan 2024 20:59:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E8=BF=98=E5=8E=9F=E5=BF=AB=E6=8D=B7?= =?UTF-8?q?=E5=85=B3=E6=9C=BA=EF=BC=8C=E4=BD=BF=E7=94=A8=E5=86=99mcu?= =?UTF-8?q?=E5=85=B3=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sf_app/code/source/systemMng/sf_commu_mcu.c | 12 +----------- .../lib/source/sifar/code/source/mcu/sf_mcu_client.c | 9 +-------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu.c b/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu.c index b9eca674a..bba817877 100755 --- a/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu.c +++ b/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu.c @@ -964,17 +964,7 @@ unsigned char sf_commu_parse_mcu_data(unsigned char * src, unsigned int len) { sf_set_pir_statu_flag(0); sf_set_module_sleep_flag(0); - if((PWR_ON_SETUP != sf_poweron_type_get()) && (PWR_ON_USB!= sf_poweron_type_get())) - { - printf("[power off] %s(%d)\n", __FUNCTION__, __LINE__); - sf_set_power_off_flag(1); - //sf_app_battery_stop(); - system("watchdog -T 1 -t 5 /dev/watchdog"); - } - else - { - sf_com_message_send_to_cardv(&stMessageBuf); - } + sf_com_message_send_to_cardv(&stMessageBuf); } else if(0 == stMessageBuf.arg3) //ON->OFF { diff --git a/code/lib/source/sifar/code/source/mcu/sf_mcu_client.c b/code/lib/source/sifar/code/source/mcu/sf_mcu_client.c index 6569e2daa..879629655 100644 --- a/code/lib/source/sifar/code/source/mcu/sf_mcu_client.c +++ b/code/lib/source/sifar/code/source/mcu/sf_mcu_client.c @@ -804,14 +804,7 @@ void sf_mcu_dataready_ck(UINT8 startMode) gModuleSleep = 0; //power off 4G module sf_set_power_off_flag(1); printf("[power off] %s(%d)\n", __FUNCTION__, __LINE__); - if((startMode == 1) && (PWR_ON_AUTO == sf_cardv_convert_power_on_mode())) - { - system("watchdog -T 1 -t 5 /dev/watchdog"); - } - else - { - Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, 0); //shutdown start - } + Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, 0); //shutdown start } } From 91b03b29f84fcfe7af7524f84a2b777e7705d1b1 Mon Sep 17 00:00:00 2001 From: payton Date: Tue, 2 Jan 2024 21:03:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E5=8E=BB=E6=8E=89tty=E7=AD=89=E5=BE=85?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E7=9A=84=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/sf_app/code/source/ttyusb/sf_hal_ttyusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/application/source/sf_app/code/source/ttyusb/sf_hal_ttyusb.c b/code/application/source/sf_app/code/source/ttyusb/sf_hal_ttyusb.c index d1626dcb0..72f74ab2b 100755 --- a/code/application/source/sf_app/code/source/ttyusb/sf_hal_ttyusb.c +++ b/code/application/source/sf_app/code/source/ttyusb/sf_hal_ttyusb.c @@ -449,7 +449,7 @@ SINT32 sf_hal_ttyusb2_read_buf(SF_TTY_DATA_TYPE_S *recv) } else if (0 == s32ret) { waitTime--; - MLOGW("FIFO select timeout [%d]\n",waitTime); + //MLOGW("FIFO select timeout [%d]\n",waitTime); continue; } }