From 4dd6c4e3b338fa02e1986d4e81ad186dfb9c4037 Mon Sep 17 00:00:00 2001 From: payton Date: Thu, 14 Sep 2023 09:51:08 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=86=B2=E7=AA=81=EF=BC=9B?= =?UTF-8?q?2.=E5=A2=9E=E5=8A=A0dbg=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DxInput_Key.c | 7 ++- .../lib/source/sifar/code/include/sf_common.h | 2 +- .../sifar/code/source/common/sf_common.c | 58 ++++++------------- 3 files changed, 25 insertions(+), 42 deletions(-) diff --git a/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/DxInput_Key.c b/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/DxInput_Key.c index 5b810b8ab..d98a3e066 100755 --- a/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/DxInput_Key.c +++ b/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/DxInput_Key.c @@ -262,7 +262,12 @@ UINT32 DrvKey_DetNormalKey(void) cmdflag = 1; //sf_set_card_statu(CMD_FORMAT_SD_STA); //BKG_PostEvent(NVTEVT_BKW_FORMAT_CARD); - }else if((!cmdflag) && (time >= 10000) && (FALSE == sf_check_net_work_flag()) && (!sf_get_pir_statu_flag())){ + }else if((!cmdflag) && (time >= 3000) && (retset_time >= 3000) && (!sf_get_pir_statu_flag())){ + printf("[%s:%d] SendKeyCnt:%d KeyTestPressCnt:%d time: %dms retset_time:%dms\n", __FUNCTION__, __LINE__, SendKeyCnt, KeyTestPressCnt, time, retset_time); + cmdflag = 1; + sf_set_debug_mode(); + } + else if((!cmdflag) && (time >= 10000) && (FALSE == sf_check_net_work_flag()) && (!sf_get_pir_statu_flag())){ printf("[%s:%d] SendKeyCnt:%d KeyTestPressCnt:%d time: %dms\n", __FUNCTION__, __LINE__, SendKeyCnt, KeyTestPressCnt, time); cmdflag = 1; sf_set_module_update(1); diff --git a/code/lib/source/sifar/code/include/sf_common.h b/code/lib/source/sifar/code/include/sf_common.h index e8e1c26d5..7eefe1c91 100755 --- a/code/lib/source/sifar/code/include/sf_common.h +++ b/code/lib/source/sifar/code/include/sf_common.h @@ -127,7 +127,7 @@ void sf_set_ui_para_flag(UINT8 flag); UINT8 sf_get_ui_para_flag(void); BOOL sf_cmd_ftp_ota(unsigned char argc, char **argv); BOOL sf_cmd_switch_esim(unsigned char argc, char **argv); - +void sf_set_debug_mode(void); #endif diff --git a/code/lib/source/sifar/code/source/common/sf_common.c b/code/lib/source/sifar/code/source/common/sf_common.c index d7d4c3bde..e2e4fc759 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -59,6 +59,7 @@ #include #include #include "UIAppNetwork.h" +#include "sf_common.h" #include "sf_mcu.h" #include "sf_4g_lpa.h" #include @@ -278,7 +279,7 @@ void sf_mode_detect(void) { #if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_) Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, APP_POWER_OFF_NORMAL); //shutdown start - #elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) + #elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_) Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, APP_POWER_OFF_APO); //shutdown start #endif } @@ -1701,45 +1702,6 @@ static SINT32 sf_cardv_proccess_cmd_gprs(SF_MESSAGE_BUF_S *pMessageBuf) return SF_SUCCESS; } -void sf_cardv_wifi_send() -{ - SINT32 fd = 0; - SINT32 sendBuffLen = 0; - SINT8 sendBuff[1024] = { 0 }; - SINT32 i = 0; - struct stat statBuf; - - if(SF_SUCCESS == sf_share_mem_hd_update()) - { - SF_REPORT_WIFI_ATTR_S* wifiCfg = sf_wifi_cfg_get(); - fd = sf_get_wifi_socket(); - - SF_CHAR filePath[64] = { 0 }; - SINT32 fdWifi = -1; - sprintf(filePath, "/tmp/wifiData.txt"); - printf("filePath:%s\n", filePath); - - fdWifi = open(filePath, O_RDWR, 0777); - if(fdWifi >= 0) - { - fstat(fdWifi, &statBuf); - sendBuffLen = statBuf.st_size; - printf("fSize=%d\n", sendBuffLen); - read(fdWifi, sendBuff, sendBuffLen); - close(fdWifi); - - for(i = 0; i < sendBuffLen; i++) - { - printf("[%x]-", sendBuff[i]); - } - printf("\n[cardv-sendBuff-1] e\n"); - - send(fd, sendBuff, sendBuffLen, 0); - remove("/tmp/wifiData.txt"); - } - } -} - static SINT32 sf_cardv_proccess_cmd_wifi(SF_MESSAGE_BUF_S *pMessageBuf) { MLOGI("ID = %#x\n",pMessageBuf->arg1); @@ -2733,3 +2695,19 @@ void sf_set_ui_para_flag(UINT8 flag) { UiparaFlag = flag; } + +void sf_set_debug_mode(void) +{ + UIMenuStoreInfo *puiPara = sf_ui_para_get(); + + if(1 == puiPara->DebugMode) + { + puiPara->DebugMode = 0; + sf_sys_status_led_set(SF_LED_SYS_STATE_DEBUG_OFF); + } + else + { + puiPara->DebugMode = 1; + sf_sys_status_led_set(SF_LED_SYS_STATE_DEBUG_ON); + } +} \ No newline at end of file