diff --git a/code/application/source/cardv/SrcCode/UIApp/Network/UIAppNetwork.c b/code/application/source/cardv/SrcCode/UIApp/Network/UIAppNetwork.c index 0a0f6724f..6ec83c52e 100644 --- a/code/application/source/cardv/SrcCode/UIApp/Network/UIAppNetwork.c +++ b/code/application/source/cardv/SrcCode/UIApp/Network/UIAppNetwork.c @@ -1622,10 +1622,10 @@ INT32 sf_net_wifi_init(UINT32 mode, UINT32 security) nvt_wifi_settings *pwifi = &wifiConfig; DBG_IND("set wifi %d %d \r\n", mode, security); - system("modprobe 8189fs"); + //system("modprobe 8189fs"); //usleep(2); - system("ifconfig lo 127.0.0.1"); - DBG_IND("ifconfig\r\n"); + //system("ifconfig lo 127.0.0.1"); + //DBG_IND("ifconfig\r\n"); memset(pwifi, 0, sizeof(nvt_wifi_settings)); diff --git a/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c b/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c index ec9222f20..a5e2136d9 100755 --- a/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c +++ b/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c @@ -2021,12 +2021,13 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8 *pAppData, UINT16 dataLen) if(puiPara->DebugMode) { //sf_led_flash_start(SF_LED_FAST_FLAH, Sf_LED_SD_G); + sf_sys_status_led_set(SF_LED_SYS_STATE_DEBUG_ON); } else { //sf_led_flash_stop(Sf_LED_SD_G); //sf_set_sd_led_status(); - + sf_sys_status_led_set(SF_LED_SYS_STATE_DEBUG_OFF); } paramSaveFlag = 1; respFlag = 2; diff --git a/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/DxHunting.c b/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/DxHunting.c index ca9827b0c..dee40df9c 100755 --- a/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/DxHunting.c +++ b/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/DxHunting.c @@ -31,6 +31,7 @@ #define IRLED_CTRL_BY_PWM ENABLE//DISABLE// #define IRLED_PWMID PWMID_3 /* P_GPIO3 */ #include "pwm.h" +#include "flow_preview.h" /////////////////////////////////////////////////////////////////////////////// #define __MODULE__ DxHunting #define __DBGLVL__ 2 // 0=FATAL, 1=ERR, 2=WRN, 3=UNIT, 4=FUNC, 5=IND, 6=MSG, 7=VALUE, 8=USER @@ -164,7 +165,12 @@ UINT32 DrvGPIO_GetPhotoMovieModeFromMonitor(void) switch(value) { case PWR_OFF: - sf_mcu_reg_set(SF_MCU_POWEROFF,0); + printf("%s:%d\n", __FUNCTION__, __LINE__); + sf_set_power_off_flag(APP_POWER_OFF_BATT_EMPTY); + flow_preview_set_stop_flag(TRUE); + //sf_mcu_reg_set(SF_MCU_POWEROFF,0); + g_uiBootMode = DX_HUNTING_MODE_OTHER; + printf("%s:%d\n", __FUNCTION__, __LINE__); break; case PWR_ON_SETUP: #if SF_IQ_TEST == DISABLE diff --git a/rtos/code/application/source/cardv/SrcCode/PrjCfg_Default.h b/rtos/code/application/source/cardv/SrcCode/PrjCfg_Default.h index e7b091356..473647725 100755 --- a/rtos/code/application/source/cardv/SrcCode/PrjCfg_Default.h +++ b/rtos/code/application/source/cardv/SrcCode/PrjCfg_Default.h @@ -150,7 +150,7 @@ #endif #ifndef ANR_FUNC -#define ANR_FUNC DISABLE +#define ANR_FUNC ENABLE #endif #ifndef USER_SPI_NOR_TABLE diff --git a/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h b/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h index c22b2b314..8b93bc82c 100755 --- a/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h +++ b/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h @@ -948,7 +948,6 @@ #define HUNTING_IR_LED_940 ENABLE #define SF_EXIF_MN_BUF_SIZE 256 #define SF_BASE_VERSION "7MD4RCwD901" -#define HW_S530 1 #define DCF_DIR_NAME "MEDIA" /* 100MEDIA */ #define DCF_FILE_NAME "SYFW" /* SYFW0001.JPG */ #define PHOTO_THUMB_PATH "A:\\THUMB\\" @@ -984,6 +983,10 @@ #define SF_BATTERY_TEST_FILE "A:\\BATTERY.TXT" #define SF_HW_TEST_FILE "A:\\HW.TXT" #define SF_HW_TEST DISABLE + +#ifndef ANR_FUNC +#define ANR_FUNC ENABLE +#endif ////////////////////sf end////////////////////////////////