payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into S550_Base

Browse Source
This commit is contained in:
xiehongyan 2024-01-19 22:39:08 +08:00
commit 44af9a8dd6
7 changed files with 59 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c
View File

@ -2,7 +2,9 @@
#include "UIMovieMapping.h" #include "UIMovieMapping.h"
//#include "media_def.h" //#include "media_def.h"
#include "ImageApp/ImageApp_MovieMulti.h" #include "ImageApp/ImageApp_MovieMulti.h"
#if HUNTING_CAMERA_MCU == ENABLE
#include "sf_mcu.h"
#endif
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#define __MODULE__ UIMovieMapping #define __MODULE__ UIMovieMapping
#define __DBGLVL__ 2 // 0=FATAL, 1=ERR, 2=WRN, 3=UNIT, 4=FUNC, 5=IND, 6=MSG, 7=VALUE, 8=USER #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 MovieMapping_GetFrameRate(UINT32 uiSizeIdx, UINT32 uiIplId)
{ {
UINT32 movie_size = g_MovieRecMappingTable[uiSizeIdx].SizeIdx[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; 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 MovieMapping_GetCloneFrameRate(UINT32 uiSizeIdx, UINT32 uiIplId)
{ {
UINT32 movie_size = g_MovieRecMappingTable[uiSizeIdx].SizeIdxClone[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; return g_MovieSizeTable[movie_size].SizeInfo.uiVidFrameRate;
} }

20
code/application/source/sf_app/code/source/battery/sf_battery.c
View File

@ -1177,9 +1177,9 @@ UINT8 sf_battery_value_get(UINT8 nightMode)
{ {
batteryVal = LiPolymerVoltageVal; batteryVal = LiPolymerVoltageVal;
if(batteryVal < 65) if(batteryVal < 66)
{ {
if(nightMode && (batteryVal >= 43)) if(nightMode && (batteryVal >= 45))
value = 1; value = 1;
else else
value = 0; value = 0;
@ -1235,9 +1235,9 @@ UINT8 sf_battery_value_get(UINT8 nightMode)
if(puiPara->BatteryType == SF_BATT_ALKALINE) //ALK if(puiPara->BatteryType == SF_BATT_ALKALINE) //ALK
{ {
if(batteryVal < 62) if(batteryVal < 63)
{ {
if(nightMode && (batteryVal >= 43)) if(nightMode && (batteryVal >= 45))
value = 1; value = 1;
else else
value = 0; value = 0;
@ -1289,18 +1289,18 @@ UINT8 sf_battery_value_get(UINT8 nightMode)
} }
else if(puiPara->BatteryType == SF_BATT_NI_MH) //NIH 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; value = 1;
else else
value = 0; value = 0;
} }
else if(batteryVal < 61) else if(batteryVal < 62)
{ {
value = 1; value = 1;
} }
else if(batteryVal < 62) else if(batteryVal < 63)
{ {
value = 10; value = 10;
} }
@ -1343,9 +1343,9 @@ UINT8 sf_battery_value_get(UINT8 nightMode)
} }
else else
{ {
if(batteryVal < 62) if(batteryVal < 63)
{ {
if(nightMode && (batteryVal >= 43)) if(nightMode && (batteryVal >= 45))
value = 1; value = 1;
else else
value = 0; value = 0;

1
code/lib/source/sifar/code/include/sf_mcu.h
View File

@ -412,5 +412,6 @@ SINT32 sf_sys_rtc_time_set(SF_PARA_TIME_S* pstDateTime);
void sf_set_ae_night_mode(UINT8 isNightMode); void sf_set_ae_night_mode(UINT8 isNightMode);
UINT32 sf_get_send_pic_sieze(void); UINT32 sf_get_send_pic_sieze(void);
void sf_mcu_version_get(UINT8 *mcuVer); void sf_mcu_version_get(UINT8 *mcuVer);
BOOL sf_is_night_mode(BOOL isRefresh);
#endif #endif

2
code/lib/source/sifar/code/source/common/sf_common.c
View File

@ -2595,7 +2595,7 @@ BOOL sf_is_flash_voltage_abnormal(void)
printf("powerVal=%d batteryType=%d \n", powerVal, batteryType); 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"); printf("low battery no write flash\n");
return TRUE; return TRUE;

18
rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c
View File

@ -2,7 +2,9 @@
#include "UIMovieMapping.h" #include "UIMovieMapping.h"
//#include "media_def.h" //#include "media_def.h"
#include "ImageApp/ImageApp_MovieMulti.h" #include "ImageApp/ImageApp_MovieMulti.h"
#if HUNTING_CAMERA_MCU == ENABLE
#include "sf_mcu.h"
#endif
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#define __MODULE__ UIMovieMapping #define __MODULE__ UIMovieMapping
#define __DBGLVL__ 2 // 0=FATAL, 1=ERR, 2=WRN, 3=UNIT, 4=FUNC, 5=IND, 6=MSG, 7=VALUE, 8=USER #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 MovieMapping_GetFrameRate(UINT32 uiSizeIdx, UINT32 uiIplId)
{ {
UINT32 movie_size = g_MovieRecMappingTable[uiSizeIdx].SizeIdx[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; 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 MovieMapping_GetCloneFrameRate(UINT32 uiSizeIdx, UINT32 uiIplId)
{ {
UINT32 movie_size = g_MovieRecMappingTable[uiSizeIdx].SizeIdxClone[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; return g_MovieSizeTable[movie_size].SizeInfo.uiVidFrameRate;
} }

20
rtos/code/driver/na51089/source/mcu/sf_battery.c
View File

@ -1049,9 +1049,9 @@ UINT8 sf_battery_value_get(UINT8 nightMode)
{ {
batteryVal = LiPolymerVoltageVal; batteryVal = LiPolymerVoltageVal;
if(batteryVal < 65) if(batteryVal < 66)
{ {
if(nightMode && (batteryVal >= 43)) if(nightMode && (batteryVal >= 45))
value = 1; value = 1;
else else
value = 0; value = 0;
@ -1107,9 +1107,9 @@ UINT8 sf_battery_value_get(UINT8 nightMode)
if(puiPara->BatteryType == SF_BATT_ALKALINE) //ALK if(puiPara->BatteryType == SF_BATT_ALKALINE) //ALK
{ {
if(batteryVal < 62) if(batteryVal < 63)
{ {
if(nightMode && (batteryVal >= 43)) if(nightMode && (batteryVal >= 45))
value = 1; value = 1;
else else
value = 0; value = 0;
@ -1161,18 +1161,18 @@ UINT8 sf_battery_value_get(UINT8 nightMode)
} }
else if(puiPara->BatteryType == SF_BATT_NI_MH) //NIH 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; value = 1;
else else
value = 0; value = 0;
} }
else if(batteryVal < 61) else if(batteryVal < 62)
{ {
value = 1; value = 1;
} }
else if(batteryVal < 62) else if(batteryVal < 63)
{ {
value = 10; value = 10;
} }
@ -1215,9 +1215,9 @@ UINT8 sf_battery_value_get(UINT8 nightMode)
} }
else else
{ {
if(batteryVal < 62) if(batteryVal < 63)
{ {
if(nightMode && (batteryVal >= 43)) if(nightMode && (batteryVal >= 45))
value = 1; value = 1;
else else
value = 0; value = 0;

3
rtos/code/driver/na51089/source/mcu/sf_mcu.c
View File

@ -1770,6 +1770,9 @@ UINT8 sf_mcu_reg_set(MCUParam_t attrId, UINT8 val)
mcuData[i++] = puiPara->TimeSend4.Min; mcuData[i++] = puiPara->TimeSend4.Min;
}else if(attrId == SF_MCU_CTRL_MODULE_PIR){ }else if(attrId == SF_MCU_CTRL_MODULE_PIR){
mcuReg[i] = FUNCTION_SWTICH2;//dbg test
mcuData[i++] = 2;
mcuReg[i] = WDT_TIME; mcuReg[i] = WDT_TIME;
mcuData[i++] = 5;//sf_mcu_wdg_set(5); mcuData[i++] = 5;//sf_mcu_wdg_set(5);