From 9eefddeda767a6e2b53385b8dd5b871ecd7cccf9 Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 26 Jan 2024 18:28:38 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=93=9D=E7=89=99WiFi=E4=B8=8A=E7=94=B5?= =?UTF-8?q?=E6=8F=90=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/cardv/SrcCode/System/main.c | 1 + .../lib/source/sifar/code/include/sf_common.h | 4 ++ .../sifar/code/source/common/sf_common.c | 67 +++++++++++++++++++ 3 files changed, 72 insertions(+) diff --git a/code/application/source/cardv/SrcCode/System/main.c b/code/application/source/cardv/SrcCode/System/main.c index 293f7f5b0..247b6b35f 100755 --- a/code/application/source/cardv/SrcCode/System/main.c +++ b/code/application/source/cardv/SrcCode/System/main.c @@ -478,6 +478,7 @@ int NvtMain(void) stMessageBuf.arg1 = SF_DEV_CMD_TEMPER; stMessageBuf.cmdId = CMD_DEV; sf_com_message_send_to_app(&stMessageBuf); + sf_dev_en(); } #else sf_mcu_init(); diff --git a/code/lib/source/sifar/code/include/sf_common.h b/code/lib/source/sifar/code/include/sf_common.h index 8de407da7..2a9928ef3 100755 --- a/code/lib/source/sifar/code/include/sf_common.h +++ b/code/lib/source/sifar/code/include/sf_common.h @@ -194,6 +194,7 @@ BOOL sf_ota_result(void); SF_BLE_STATUS_E sf_get_ble_status(void); void sf_set_ble_status(SF_BLE_STATUS_E enStatus); BOOL cmd_wifi_switch(unsigned char argc, char **argv); +BOOL sf_cmd_sd_file_switch(unsigned char argc, char **argv); void sf_set_msdc_clk(void); void sf_send_message_to_create_qrcode(void); UINT8 sf_get_rtsp_flag(void); @@ -210,4 +211,7 @@ void sf_cardv_battery_level_set(UINT32 val); void sf_cardv_statistics_param_reset(void); void sf_cardv_set_wifi_en(UINT32 cnt); INT32 sf_mem_write_photo(UINT32 buf, UINT32 size); +void sf_set_wifi_en(UINT32 cnt); +void sf_set_bt_en(UINT32 cnt); +void sf_dev_en(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 9724c0a24..9247552eb 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -3390,6 +3390,11 @@ BOOL sf_cmd_para_printf(unsigned char argc, char **argv) printf("FileKey:%d\n", puiPara->FileKey); printf("BluSsid:%s\n", puiPara->BluSsid); printf("BluSwitch:%d\n", puiPara->BluSwitch); + printf("SimIccidV:%s\n", puiPara->SimIccidV); + printf("SimIccidA:%s\n", puiPara->SimIccidA); + printf("SdFailCount:%d\n", puiPara->SdFailCount); + printf("LiBatteryType:%d\n", puiPara->LiBatteryType); + printf("SdFileSwitch:%d\n", puiPara->SdFileSwitch); MLOGD(" sf Parameter end\n"); MLOGD(" end\n"); @@ -3423,7 +3428,19 @@ BOOL cmd_wifi_switch(unsigned char argc, char **argv) printf("[%s:%d] WifiSwitch:%d\n", __FUNCTION__, __LINE__,puiPara->WifiSwitch); return TRUE; } +BOOL sf_cmd_sd_file_switch(unsigned char argc, char **argv) +{ + UINT32 value; + UIMenuStoreInfo *puiPara = sf_ui_para_get(); + sscanf_s(argv[0],"%d", &value); + if(value < SF_ON_OFF_MAX){ + puiPara->SdFileSwitch = value; + Save_MenuInfo(); + } + printf("[%s:%d] SdFileSwitch:%d SdFailCount:%d\n", __FUNCTION__, __LINE__, puiPara->SdFileSwitch, puiPara->SdFailCount); + return TRUE; +} SF_BLE_STATUS_E sf_get_ble_status(void) { return BleStatus; @@ -3595,4 +3612,54 @@ INT32 sf_mem_write_photo(UINT32 buf, UINT32 size) MLOGE("MEMPHOTO.JPG size:%ld\n", size); } return 1; +} + +void sf_set_wifi_en(UINT32 cnt) +{ + static UINT8 state = 0; + if(0 == state) + { + state = 1; + gpio_direction_output(SF_WIFI_EN, 1); + } + gpio_set_value(SF_WIFI_EN, cnt); + printf("[%s:%d] e cnt:%d\n", __FUNCTION__, __LINE__,cnt); +} +void sf_set_bt_en(UINT32 cnt) +{ + static UINT8 state = 0; + if(0 == state) + { + state = 1; + gpio_direction_output(SF_BT_EN, 1); + } + gpio_set_value(SF_BT_EN, cnt); + printf("[%s:%d] e cnt:%d\n", __FUNCTION__, __LINE__,cnt); +} + +void sf_dev_en(void) +{ + UIMenuStoreInfo *puiPara = sf_ui_para_get(); + UINT8 startup = sf_cardv_convert_power_on_mode(); + printf("[%s:%d] s\n", __FUNCTION__, __LINE__); + + if(SF_MCU_STARTUP_ONKEY == startup) + { + if(puiPara->WifiSwitch) + { + sf_set_wifi_en(1); + } + if(puiPara->BluSwitch) + { + sf_set_bt_en(1); + } + } + + if((SF_MCU_STARTUP_NORMAL != startup) && (SF_MCU_STARTUP_OFF != startup)) + { + if(puiPara->GprsSwitch) + { + sf_usb_mux_s(1); + } + } } \ No newline at end of file