diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c index c1c13814e..0a38d3093 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c @@ -2,7 +2,9 @@ #include "UIMovieMapping.h" //#include "media_def.h" #include "ImageApp/ImageApp_MovieMulti.h" - +#if HUNTING_CAMERA_MCU == ENABLE +#include "sf_mcu.h" +#endif /////////////////////////////////////////////////////////////////////////////// #define __MODULE__ UIMovieMapping #define __DBGLVL__ 2 // 0=FATAL, 1=ERR, 2=WRN, 3=UNIT, 4=FUNC, 5=IND, 6=MSG, 7=VALUE, 8=USER @@ -563,6 +565,13 @@ UINT32 MovieMapping_GetHeight(UINT32 uiSizeIdx, UINT32 uiIplId) UINT32 MovieMapping_GetFrameRate(UINT32 uiSizeIdx, UINT32 uiIplId) { UINT32 movie_size = g_MovieRecMappingTable[uiSizeIdx].SizeIdx[uiIplId]; + #if 0//HUNTING_CAMERA_MCU == ENABLE + if(sf_is_night_mode(0) == TRUE) + { + printf("[%s:%d] VidFrameRate 15\n", __FUNCTION__, __LINE__); + return 15; + } + #endif return g_MovieSizeTable[movie_size].SizeInfo.uiVidFrameRate; } @@ -618,6 +627,13 @@ UINT32 MovieMapping_GetCloneHeight(UINT32 uiSizeIdx, UINT32 uiIplId) UINT32 MovieMapping_GetCloneFrameRate(UINT32 uiSizeIdx, UINT32 uiIplId) { UINT32 movie_size = g_MovieRecMappingTable[uiSizeIdx].SizeIdxClone[uiIplId]; + #if 0//HUNTING_CAMERA_MCU == ENABLE + if(sf_is_night_mode(0) == TRUE) + { + printf("[%s:%d] VidFrameRate 15\n", __FUNCTION__, __LINE__); + return 15; + } + #endif return g_MovieSizeTable[movie_size].SizeInfo.uiVidFrameRate; } diff --git a/code/application/source/sf_app/code/source/battery/sf_battery.c b/code/application/source/sf_app/code/source/battery/sf_battery.c index 387428f55..2a9321864 100755 --- a/code/application/source/sf_app/code/source/battery/sf_battery.c +++ b/code/application/source/sf_app/code/source/battery/sf_battery.c @@ -1177,9 +1177,9 @@ UINT8 sf_battery_value_get(UINT8 nightMode) { batteryVal = LiPolymerVoltageVal; - if(batteryVal < 65) + if(batteryVal < 66) { - if(nightMode && (batteryVal >= 43)) + if(nightMode && (batteryVal >= 45)) value = 1; else value = 0; @@ -1235,9 +1235,9 @@ UINT8 sf_battery_value_get(UINT8 nightMode) if(puiPara->BatteryType == SF_BATT_ALKALINE) //ALK { - if(batteryVal < 62) + if(batteryVal < 63) { - if(nightMode && (batteryVal >= 43)) + if(nightMode && (batteryVal >= 45)) value = 1; else value = 0; @@ -1289,18 +1289,18 @@ UINT8 sf_battery_value_get(UINT8 nightMode) } else if(puiPara->BatteryType == SF_BATT_NI_MH) //NIH { - if(batteryVal < 60) + if(batteryVal < 61) { - if(nightMode && (batteryVal >= 43)) + if(nightMode && (batteryVal >= 45)) value = 1; else value = 0; } - else if(batteryVal < 61) + else if(batteryVal < 62) { value = 1; } - else if(batteryVal < 62) + else if(batteryVal < 63) { value = 10; } @@ -1343,9 +1343,9 @@ UINT8 sf_battery_value_get(UINT8 nightMode) } else { - if(batteryVal < 62) + if(batteryVal < 63) { - if(nightMode && (batteryVal >= 43)) + if(nightMode && (batteryVal >= 45)) value = 1; else value = 0; diff --git a/code/lib/source/sifar/code/include/sf_mcu.h b/code/lib/source/sifar/code/include/sf_mcu.h index 93b14f808..ee55375ae 100644 --- a/code/lib/source/sifar/code/include/sf_mcu.h +++ b/code/lib/source/sifar/code/include/sf_mcu.h @@ -412,5 +412,6 @@ SINT32 sf_sys_rtc_time_set(SF_PARA_TIME_S* pstDateTime); void sf_set_ae_night_mode(UINT8 isNightMode); UINT32 sf_get_send_pic_sieze(void); void sf_mcu_version_get(UINT8 *mcuVer); +BOOL sf_is_night_mode(BOOL isRefresh); #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 ce9f94567..6fbba0dbe 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -2595,7 +2595,7 @@ BOOL sf_is_flash_voltage_abnormal(void) printf("powerVal=%d batteryType=%d \n", powerVal, batteryType); - if((/*SF_POWER_TYPE_DC*/1 != batteryType) && (powerVal < 55) ) + if((/*SF_POWER_TYPE_DC*/1 != batteryType) && (powerVal < 56) ) { printf("low battery no write flash\n"); return TRUE; diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c index e6392d1a7..5c604cb3e 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c @@ -2,7 +2,9 @@ #include "UIMovieMapping.h" //#include "media_def.h" #include "ImageApp/ImageApp_MovieMulti.h" - +#if HUNTING_CAMERA_MCU == ENABLE +#include "sf_mcu.h" +#endif /////////////////////////////////////////////////////////////////////////////// #define __MODULE__ UIMovieMapping #define __DBGLVL__ 2 // 0=FATAL, 1=ERR, 2=WRN, 3=UNIT, 4=FUNC, 5=IND, 6=MSG, 7=VALUE, 8=USER @@ -618,6 +620,13 @@ UINT32 MovieMapping_GetHeight(UINT32 uiSizeIdx, UINT32 uiIplId) UINT32 MovieMapping_GetFrameRate(UINT32 uiSizeIdx, UINT32 uiIplId) { UINT32 movie_size = g_MovieRecMappingTable[uiSizeIdx].SizeIdx[uiIplId]; + #if 0//HUNTING_CAMERA_MCU == ENABLE + if(sf_is_night_mode(0) == TRUE) + { + printf("[%s:%d] VidFrameRate 15\n", __FUNCTION__, __LINE__); + return 15; + } + #endif return g_MovieSizeTable[movie_size].SizeInfo.uiVidFrameRate; } @@ -673,6 +682,13 @@ UINT32 MovieMapping_GetCloneHeight(UINT32 uiSizeIdx, UINT32 uiIplId) UINT32 MovieMapping_GetCloneFrameRate(UINT32 uiSizeIdx, UINT32 uiIplId) { UINT32 movie_size = g_MovieRecMappingTable[uiSizeIdx].SizeIdxClone[uiIplId]; + #if 0//HUNTING_CAMERA_MCU == ENABLE + if(sf_is_night_mode(0) == TRUE) + { + printf("[%s:%d] VidFrameRate 15\n", __FUNCTION__, __LINE__); + return 15; + } + #endif return g_MovieSizeTable[movie_size].SizeInfo.uiVidFrameRate; } diff --git a/rtos/code/driver/na51089/source/mcu/sf_battery.c b/rtos/code/driver/na51089/source/mcu/sf_battery.c index 4be6f2fa4..20ec89584 100755 --- a/rtos/code/driver/na51089/source/mcu/sf_battery.c +++ b/rtos/code/driver/na51089/source/mcu/sf_battery.c @@ -1049,9 +1049,9 @@ UINT8 sf_battery_value_get(UINT8 nightMode) { batteryVal = LiPolymerVoltageVal; - if(batteryVal < 65) + if(batteryVal < 66) { - if(nightMode && (batteryVal >= 43)) + if(nightMode && (batteryVal >= 45)) value = 1; else value = 0; @@ -1107,9 +1107,9 @@ UINT8 sf_battery_value_get(UINT8 nightMode) if(puiPara->BatteryType == SF_BATT_ALKALINE) //ALK { - if(batteryVal < 62) + if(batteryVal < 63) { - if(nightMode && (batteryVal >= 43)) + if(nightMode && (batteryVal >= 45)) value = 1; else value = 0; @@ -1161,18 +1161,18 @@ UINT8 sf_battery_value_get(UINT8 nightMode) } else if(puiPara->BatteryType == SF_BATT_NI_MH) //NIH { - if(batteryVal < 60) + if(batteryVal < 61) { - if(nightMode && (batteryVal >= 43)) + if(nightMode && (batteryVal >= 45)) value = 1; else value = 0; } - else if(batteryVal < 61) + else if(batteryVal < 62) { value = 1; } - else if(batteryVal < 62) + else if(batteryVal < 63) { value = 10; } @@ -1215,9 +1215,9 @@ UINT8 sf_battery_value_get(UINT8 nightMode) } else { - if(batteryVal < 62) + if(batteryVal < 63) { - if(nightMode && (batteryVal >= 43)) + if(nightMode && (batteryVal >= 45)) value = 1; else value = 0; diff --git a/rtos/code/driver/na51089/source/mcu/sf_mcu.c b/rtos/code/driver/na51089/source/mcu/sf_mcu.c index 299dc350b..1c93a4fa9 100755 --- a/rtos/code/driver/na51089/source/mcu/sf_mcu.c +++ b/rtos/code/driver/na51089/source/mcu/sf_mcu.c @@ -1770,6 +1770,9 @@ UINT8 sf_mcu_reg_set(MCUParam_t attrId, UINT8 val) mcuData[i++] = puiPara->TimeSend4.Min; }else if(attrId == SF_MCU_CTRL_MODULE_PIR){ + mcuReg[i] = FUNCTION_SWTICH2;//dbg test + mcuData[i++] = 2; + mcuReg[i] = WDT_TIME; mcuData[i++] = 5;//sf_mcu_wdg_set(5);