1.增加命令别名;2.同步曝光时间;3.调整log;4.修改mcd;
This commit is contained in:
parent
082f6dcc5c
commit
f0c3bf0889
|
@ -22,3 +22,6 @@ export HOSTNAME=`/bin/hostname`
|
||||||
export PS1='\u@\h:\w$ '
|
export PS1='\u@\h:\w$ '
|
||||||
|
|
||||||
echo "$HOSTNAME Linux shell..."
|
echo "$HOSTNAME Linux shell..."
|
||||||
|
|
||||||
|
alias mcupara='cardv sys mcupara'
|
||||||
|
alias imgsize='cardv sys imgsize'
|
||||||
|
|
|
@ -910,6 +910,8 @@
|
||||||
#define MOVIE_AI_DEMO DISABLE
|
#define MOVIE_AI_DEMO DISABLE
|
||||||
|
|
||||||
#define HUNTING_CAMERA_SYS_PARTITION_NAME sys
|
#define HUNTING_CAMERA_SYS_PARTITION_NAME sys
|
||||||
|
|
||||||
|
///////////////sf st//////////////////////
|
||||||
#define HUNTING_CAMERA_MCU ENABLE
|
#define HUNTING_CAMERA_MCU ENABLE
|
||||||
#define HUNTING_CAMERA_4G ENABLE//DISABLE
|
#define HUNTING_CAMERA_4G ENABLE//DISABLE
|
||||||
#define PHOTO_PREVIEW_SLICE_ENC_FUNC ENABLE
|
#define PHOTO_PREVIEW_SLICE_ENC_FUNC ENABLE
|
||||||
|
@ -957,7 +959,7 @@
|
||||||
#define SF_TEST_OTA_FTP 0
|
#define SF_TEST_OTA_FTP 0
|
||||||
#define CUSTOM_TEST_OTA_FTP 0
|
#define CUSTOM_TEST_OTA_FTP 0
|
||||||
|
|
||||||
|
//////////////////////sf end///////////////////////////////
|
||||||
|
|
||||||
/*******************************************************************************************
|
/*******************************************************************************************
|
||||||
* LVGL UI Style config
|
* LVGL UI Style config
|
||||||
|
|
|
@ -196,7 +196,8 @@ if (OnOff){
|
||||||
}
|
}
|
||||||
INT32 Set_Cur_Day_Night_Status(BOOL OnOff, UINT8 isSnapVideo)
|
INT32 Set_Cur_Day_Night_Status(BOOL OnOff, UINT8 isSnapVideo)
|
||||||
{
|
{
|
||||||
AET_STATUS_INFO ae_status_info = {0};
|
static AET_STATUS_INFO ae_status_info = {0};
|
||||||
|
AET_MANUAL ae_manual = {0};
|
||||||
IQT_NIGHT_MODE night_mode = {0};
|
IQT_NIGHT_MODE night_mode = {0};
|
||||||
AWBT_MANUAL awb_manual = {0};
|
AWBT_MANUAL awb_manual = {0};
|
||||||
HD_RESULT hd_ret;
|
HD_RESULT hd_ret;
|
||||||
|
@ -214,6 +215,8 @@ INT32 Set_Cur_Day_Night_Status(BOOL OnOff, UINT8 isSnapVideo)
|
||||||
vendor_isp_get_ae(AET_ITEM_STATUS, &ae_status_info);
|
vendor_isp_get_ae(AET_ITEM_STATUS, &ae_status_info);
|
||||||
//DBG_ERR(">> aet status lv %d lv_base %d\r\n",ae_status_info.status_info.lv,ae_status_info.status_info.lv_base);
|
//DBG_ERR(">> aet status lv %d lv_base %d\r\n",ae_status_info.status_info.lv,ae_status_info.status_info.lv_base);
|
||||||
//DBG_ERR(">> aet status ev %d ev_base %d\r\n",ae_status_info.status_info.ev,ae_status_info.status_info.ev_base);
|
//DBG_ERR(">> aet status ev %d ev_base %d\r\n",ae_status_info.status_info.ev,ae_status_info.status_info.ev_base);
|
||||||
|
ae_manual.id = 0;
|
||||||
|
vendor_isp_get_ae(AET_ITEM_MANUAL, &ae_manual);
|
||||||
if (((ae_status_info.status_info.lv / 1000000) < 7)&&(OnOff))
|
if (((ae_status_info.status_info.lv / 1000000) < 7)&&(OnOff))
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -228,12 +231,29 @@ INT32 Set_Cur_Day_Night_Status(BOOL OnOff, UINT8 isSnapVideo)
|
||||||
#if HUNTING_CAMERA_MCU == ENABLE
|
#if HUNTING_CAMERA_MCU == ENABLE
|
||||||
sf_set_ae_night_mode(1);
|
sf_set_ae_night_mode(1);
|
||||||
sf_ir_led_set(((2 == puiPara->NightMode) ? 2 : 1),puiPara->FlashLed, puiPara->NightMode,isSnapVideo);
|
sf_ir_led_set(((2 == puiPara->NightMode) ? 2 : 1),puiPara->FlashLed, puiPara->NightMode,isSnapVideo);
|
||||||
|
if (OnOff){
|
||||||
|
vos_util_delay_ms(330);
|
||||||
|
}
|
||||||
|
ae_manual.manual.mode = 1;
|
||||||
|
if (puiPara->NightMode == 0) {
|
||||||
|
ae_manual.manual.expotime = 125000;//ae_status.status_info.expotime[0];
|
||||||
|
ae_manual.manual.iso_gain = ae_status_info.status_info.iso_gain[0]*ae_status_info.status_info.expotime[0]/125000;
|
||||||
|
}
|
||||||
|
else if (puiPara->NightMode == 1) {
|
||||||
|
ae_manual.manual.expotime = 66666;//ae_status.status_info.expotime[0];
|
||||||
|
ae_manual.manual.iso_gain = ae_status_info.status_info.iso_gain[0]*ae_status_info.status_info.expotime[0]/66666;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
ae_manual.manual.expotime = ae_status_info.status_info.expotime[0];
|
||||||
|
ae_manual.manual.iso_gain = ae_status_info.status_info.iso_gain[0];
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
night_mode.mode = 0;
|
night_mode.mode = 0;
|
||||||
awb_manual.manual.en = 0;
|
awb_manual.manual.en = 0;
|
||||||
|
ae_manual.manual.mode = 0;
|
||||||
GOIO_Turn_Onoff_IRCUT(1);
|
GOIO_Turn_Onoff_IRCUT(1);
|
||||||
//GPIO_IRLed_Turn_Onoff(0);
|
//GPIO_IRLed_Turn_Onoff(0);
|
||||||
#if HUNTING_CAMERA_MCU == ENABLE
|
#if HUNTING_CAMERA_MCU == ENABLE
|
||||||
|
@ -243,10 +263,9 @@ INT32 Set_Cur_Day_Night_Status(BOOL OnOff, UINT8 isSnapVideo)
|
||||||
}
|
}
|
||||||
vendor_isp_set_awb(AWBT_ITEM_MANUAL, &awb_manual);
|
vendor_isp_set_awb(AWBT_ITEM_MANUAL, &awb_manual);
|
||||||
|
|
||||||
vendor_isp_set_iq(IQT_ITEM_NIGHT_MODE, &night_mode);
|
vendor_isp_set_iq(IQT_ITEM_NIGHT_MODE, &night_mode);
|
||||||
if (OnOff){
|
vendor_isp_set_ae(AET_ITEM_MANUAL, &ae_manual);
|
||||||
vos_util_delay_ms(330);
|
|
||||||
}
|
|
||||||
if ((hd_ret = vendor_isp_uninit()) != HD_OK) {
|
if ((hd_ret = vendor_isp_uninit()) != HD_OK) {
|
||||||
DBG_ERR("vendor_isp_uninit() fail(%d)\r\n", hd_ret);
|
DBG_ERR("vendor_isp_uninit() fail(%d)\r\n", hd_ret);
|
||||||
}
|
}
|
||||||
|
|
|
@ -431,19 +431,16 @@ static UINT32 PhotoExe_GetScreenNailSize(void)
|
||||||
UINT32 uiImageSize, ScreenNailSize;
|
UINT32 uiImageSize, ScreenNailSize;
|
||||||
UINT32 BitStreamSize;
|
UINT32 BitStreamSize;
|
||||||
|
|
||||||
#if HUNTING_CAMERA_MCU
|
|
||||||
UIMenuStoreInfo *puiPara = sf_ui_para_get();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ScreenNailSize = CFG_SCREENNAIL_SIZE;
|
ScreenNailSize = CFG_SCREENNAIL_SIZE;
|
||||||
uiImageSize = UI_GetData(FL_PHOTO_SIZE);
|
uiImageSize = UI_GetData(FL_PHOTO_SIZE);
|
||||||
if (uiImageSize < ScreenNailSize) {
|
if (uiImageSize < ScreenNailSize) {
|
||||||
#if HUNTING_CAMERA_MCU
|
#if HUNTING_CAMERA_MCU == ENABLE
|
||||||
|
UIMenuStoreInfo *puiPara = sf_ui_para_get();
|
||||||
BitStreamSize = (sf_get_screen_nail_width(puiPara->SendPicSize)) * (sf_get_screen_nail_height(puiPara->SendPicSize)) / 2;
|
BitStreamSize = (sf_get_screen_nail_width(puiPara->SendPicSize)) * (sf_get_screen_nail_height(puiPara->SendPicSize)) / 2;
|
||||||
#else
|
#else
|
||||||
BitStreamSize = CFG_SCREENNAIL_W * CFG_SCREENNAIL_H / 2;
|
BitStreamSize = CFG_SCREENNAIL_W * CFG_SCREENNAIL_H / 2;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
BitStreamSize = 0;
|
BitStreamSize = 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// Date Time
|
// Date Time
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#define THIS_DBGLVL 2 // 0=FATAL, 1=ERR, 2=WRN, 3=UNIT, 4=FUNC, 5=IND, 6=MSG, 7=VALUE, 8=USER
|
#define THIS_DBGLVL 5 // 0=FATAL, 1=ERR, 2=WRN, 3=UNIT, 4=FUNC, 5=IND, 6=MSG, 7=VALUE, 8=USER
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
#define __MODULE__ DateTimeInfo
|
#define __MODULE__ DateTimeInfo
|
||||||
#define __DBGLVL__ ((THIS_DBGLVL>=PRJ_DBG_LVL)?THIS_DBGLVL:PRJ_DBG_LVL)
|
#define __DBGLVL__ ((THIS_DBGLVL>=PRJ_DBG_LVL)?THIS_DBGLVL:PRJ_DBG_LVL)
|
||||||
|
@ -60,14 +60,14 @@ void DateTime_Load(void)
|
||||||
gUITimeHour = cUIDateTime.tm_hour;
|
gUITimeHour = cUIDateTime.tm_hour;
|
||||||
gUITimeMinute = cUIDateTime.tm_min;
|
gUITimeMinute = cUIDateTime.tm_min;
|
||||||
gUITimeSecond = cUIDateTime.tm_sec;
|
gUITimeSecond = cUIDateTime.tm_sec;
|
||||||
DbgMsg_UISetDate(("Curr Date:Y=%d,M=%d,D=%d\r\n", gUIDateYear, gUIDateMonth, gUIDateDay));
|
DbgMsg_UISetDate("Curr Date:Y=%d,M=%d,D=%d\r\n", gUIDateYear, gUIDateMonth, gUIDateDay);
|
||||||
DbgMsg_UISetDate(("Curr Time:H=%d,M=%d,S=%d\r\n", gUITimeHour, gUITimeMinute, gUITimeSecond));
|
DbgMsg_UISetDate("Curr Time:H=%d,M=%d,S=%d\r\n", gUITimeHour, gUITimeMinute, gUITimeSecond);
|
||||||
|
|
||||||
//load format
|
//load format
|
||||||
gUIDateSetFmt = UI_GetData(FL_DateFormatIndex);
|
gUIDateSetFmt = UI_GetData(FL_DateFormatIndex);
|
||||||
gUITimeSetFmt = UI_GetData(FL_TimeFormatIndex);
|
gUITimeSetFmt = UI_GetData(FL_TimeFormatIndex);
|
||||||
DbgMsg_UISetDate(("Curr DateFmt:%d\r\n", gUIDateSetFmt));
|
DbgMsg_UISetDate("Curr DateFmt:%d\r\n", gUIDateSetFmt);
|
||||||
DbgMsg_UISetDate(("Curr TimeFmt:%d\r\n", gUITimeSetFmt));
|
DbgMsg_UISetDate("Curr TimeFmt:%d\r\n", gUITimeSetFmt);
|
||||||
|
|
||||||
//validate date
|
//validate date
|
||||||
{
|
{
|
||||||
|
@ -92,8 +92,8 @@ void DateTime_Save(void)
|
||||||
{
|
{
|
||||||
struct tm cUIDateTime = {0};
|
struct tm cUIDateTime = {0};
|
||||||
|
|
||||||
DbgMsg_UISetDate(("Save Date:Y=%d,M=%d,D=%d\r\n", gUIDateYear, gUIDateMonth, gUIDateDay));
|
DbgMsg_UISetDate("Save Date:Y=%d,M=%d,D=%d\r\n", gUIDateYear, gUIDateMonth, gUIDateDay);
|
||||||
DbgMsg_UISetDate(("Save Time:H=%d,M=%d\r\n", gUITimeHour, gUITimeMinute));
|
DbgMsg_UISetDate("Save Time:H=%d,M=%d\r\n", gUITimeHour, gUITimeMinute);
|
||||||
//save date-time
|
//save date-time
|
||||||
cUIDateTime.tm_year = gUIDateYear;
|
cUIDateTime.tm_year = gUIDateYear;
|
||||||
cUIDateTime.tm_mon = gUIDateMonth;
|
cUIDateTime.tm_mon = gUIDateMonth;
|
||||||
|
@ -103,8 +103,8 @@ void DateTime_Save(void)
|
||||||
cUIDateTime.tm_sec = gUITimeSecond;
|
cUIDateTime.tm_sec = gUITimeSecond;
|
||||||
hwclock_set_time(TIME_ID_CURRENT, cUIDateTime, 0);
|
hwclock_set_time(TIME_ID_CURRENT, cUIDateTime, 0);
|
||||||
|
|
||||||
DbgMsg_UISetDate(("Save DateFmt:%d\r\n", gUIDateSetFmt));
|
DbgMsg_UISetDate("Save DateFmt:%d\r\n", gUIDateSetFmt);
|
||||||
DbgMsg_UISetDate(("Save TimeFmt:%d\r\n", gUITimeSetFmt));
|
DbgMsg_UISetDate("Save TimeFmt:%d\r\n", gUITimeSetFmt);
|
||||||
//save format
|
//save format
|
||||||
UI_SetData(FL_DateFormatIndex, gUIDateSetFmt);
|
UI_SetData(FL_DateFormatIndex, gUIDateSetFmt);
|
||||||
UI_SetData(FL_TimeFormatIndex, gUITimeSetFmt);
|
UI_SetData(FL_TimeFormatIndex, gUITimeSetFmt);
|
||||||
|
@ -471,21 +471,21 @@ void _TimeRecord_AddTimeDiff(INT32 iTid, INT32 TimeDiff)
|
||||||
{
|
{
|
||||||
TIME_RECORD *ti = &(gTimeRecord[iTid]);
|
TIME_RECORD *ti = &(gTimeRecord[iTid]);
|
||||||
struct tm cUIDateTime = hwclock_get_time(TIME_ID_CURRENT);
|
struct tm cUIDateTime = hwclock_get_time(TIME_ID_CURRENT);
|
||||||
DbgMsg_UISetDate(("Old Date:Y=%ld,M=%ld,D=%ld\r\n", cUIDateTime.tm_year, cUIDateTime.tm_mon, cUIDateTime.tm_mday));
|
DbgMsg_UISetDate("Old Date:Y=%ld,M=%ld,D=%ld\r\n", cUIDateTime.tm_year, cUIDateTime.tm_mon, cUIDateTime.tm_mday);
|
||||||
DbgMsg_UISetDate(("Old Time:H=%ld,M=%ld\r\n", cUIDateTime.tm_hour, cUIDateTime.tm_min));
|
DbgMsg_UISetDate("Old Time:H=%ld,M=%ld\r\n", cUIDateTime.tm_hour, cUIDateTime.tm_min);
|
||||||
|
|
||||||
DbgMsg_UISetDate(("TimeDiff=%ld\r\n", TimeDiff));
|
DbgMsg_UISetDate("TimeDiff=%ld\r\n", TimeDiff);
|
||||||
if (cUIDateTime.tm_hour + TimeDiff < 0) {
|
if (cUIDateTime.tm_hour + TimeDiff < 0) {
|
||||||
INT32 TmpDays;
|
INT32 TmpDays;
|
||||||
if (cUIDateTime.tm_year >= 2000) {
|
if (cUIDateTime.tm_year >= 2000) {
|
||||||
TmpDays = timeutil_tm_to_days(cUIDateTime);
|
TmpDays = timeutil_tm_to_days(cUIDateTime);
|
||||||
//DbgMsg_UISetDate(("Days=%ld\r\n",TmpDays));
|
//DbgMsg_UISetDate("Days=%ld\r\n",TmpDays);
|
||||||
TmpDays--;
|
TmpDays--;
|
||||||
//DbgMsg_UISetDate(("Days-1=%ld\r\n",TmpDays));
|
//DbgMsg_UISetDate("Days-1=%ld\r\n",TmpDays);
|
||||||
ti->Curr_DateTime = timeutil_days_to_tm(TmpDays);
|
ti->Curr_DateTime = timeutil_days_to_tm(TmpDays);
|
||||||
//DbgMsg_UISetDate(("Convert Time:H=%ld,M=%ld\r\n",ti->Curr_DateTime.tm_hour,ti->Curr_DateTime.tm_min));
|
//DbgMsg_UISetDate("Convert Time:H=%ld,M=%ld\r\n",ti->Curr_DateTime.tm_hour,ti->Curr_DateTime.tm_min);
|
||||||
ti->Curr_DateTime.tm_hour = cUIDateTime.tm_hour + TimeDiff + 24;
|
ti->Curr_DateTime.tm_hour = cUIDateTime.tm_hour + TimeDiff + 24;
|
||||||
//DbgMsg_UISetDate(("New H = %ld +%ld + 24 = %ld\r\n",cUIDateTime.tm_hour, TimeDiff, ti->Curr_DateTime.tm_hour));
|
//DbgMsg_UISetDate("New H = %ld +%ld + 24 = %ld\r\n",cUIDateTime.tm_hour, TimeDiff, ti->Curr_DateTime.tm_hour);
|
||||||
} else {
|
} else {
|
||||||
DBG_ERR("^RZone Calc Error!! Date can not before 2000/1/1\r\n");
|
DBG_ERR("^RZone Calc Error!! Date can not before 2000/1/1\r\n");
|
||||||
}
|
}
|
||||||
|
@ -493,25 +493,25 @@ void _TimeRecord_AddTimeDiff(INT32 iTid, INT32 TimeDiff)
|
||||||
INT32 TmpDays;
|
INT32 TmpDays;
|
||||||
if (cUIDateTime.tm_year < 2099) {
|
if (cUIDateTime.tm_year < 2099) {
|
||||||
TmpDays = timeutil_tm_to_days(cUIDateTime);
|
TmpDays = timeutil_tm_to_days(cUIDateTime);
|
||||||
//DbgMsg_UISetDate(("Days=%ld\r\n",TmpDays));
|
//DbgMsg_UISetDate("Days=%ld\r\n",TmpDays);
|
||||||
TmpDays++;
|
TmpDays++;
|
||||||
//DbgMsg_UISetDate(("Days+1=%ld\r\n",TmpDays));
|
//DbgMsg_UISetDate("Days+1=%ld\r\n",TmpDays);
|
||||||
ti->Curr_DateTime = timeutil_days_to_tm(TmpDays);
|
ti->Curr_DateTime = timeutil_days_to_tm(TmpDays);
|
||||||
//DbgMsg_UISetDate(("Convert Time:H=%ld,M=%ld\r\n",ti->Curr_DateTime.tm_hour,ti->Curr_DateTime.tm_min));
|
//DbgMsg_UISetDate("Convert Time:H=%ld,M=%ld\r\n",ti->Curr_DateTime.tm_hour,ti->Curr_DateTime.tm_min);
|
||||||
ti->Curr_DateTime.tm_hour = cUIDateTime.tm_hour + TimeDiff - 24;
|
ti->Curr_DateTime.tm_hour = cUIDateTime.tm_hour + TimeDiff - 24;
|
||||||
//DbgMsg_UISetDate(("New H = %ld +%ld - 24 = %ld\r\n",cUIDateTime.tm_hour, TimeDiff, ti->Curr_DateTime.tm_hour));
|
//DbgMsg_UISetDate("New H = %ld +%ld - 24 = %ld\r\n",cUIDateTime.tm_hour, TimeDiff, ti->Curr_DateTime.tm_hour);
|
||||||
} else {
|
} else {
|
||||||
DBG_ERR("^RZone Calc Error!! Date can not after 2099/1/1\r\n");
|
DBG_ERR("^RZone Calc Error!! Date can not after 2099/1/1\r\n");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
ti->Curr_DateTime.tm_hour = cUIDateTime.tm_hour + TimeDiff;
|
ti->Curr_DateTime.tm_hour = cUIDateTime.tm_hour + TimeDiff;
|
||||||
//DbgMsg_UISetDate(("New H = %ld +%ld = %ld\r\n",cUIDateTime.tm_hour, TimeDiff, ti->Curr_DateTime.tm_hour));
|
//DbgMsg_UISetDate("New H = %ld +%ld = %ld\r\n",cUIDateTime.tm_hour, TimeDiff, ti->Curr_DateTime.tm_hour);
|
||||||
}
|
}
|
||||||
|
|
||||||
ti->Curr_DateTime.tm_min = cUIDateTime.tm_min;
|
ti->Curr_DateTime.tm_min = cUIDateTime.tm_min;
|
||||||
ti->Curr_DateTime.tm_sec = cUIDateTime.tm_sec;
|
ti->Curr_DateTime.tm_sec = cUIDateTime.tm_sec;
|
||||||
DbgMsg_UISetDate(("New Date:Y=%ld,M=%ld,D=%ld\r\n", ti->Curr_DateTime.tm_year, ti->Curr_DateTime.tm_mon, ti->Curr_DateTime.tm_mday));
|
DbgMsg_UISetDate("New Date:Y=%ld,M=%ld,D=%ld\r\n", ti->Curr_DateTime.tm_year, ti->Curr_DateTime.tm_mon, ti->Curr_DateTime.tm_mday);
|
||||||
DbgMsg_UISetDate(("New Time:H=%ld,M=%ld\r\n", ti->Curr_DateTime.tm_hour, ti->Curr_DateTime.tm_min));
|
DbgMsg_UISetDate("New Time:H=%ld,M=%ld\r\n", ti->Curr_DateTime.tm_hour, ti->Curr_DateTime.tm_min);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TimeRecord_BeginChange(INT32 iOldTid)
|
void TimeRecord_BeginChange(INT32 iOldTid)
|
||||||
|
@ -539,13 +539,13 @@ void TimeRecord_EndChange(INT32 iNewTid)
|
||||||
INT32 TimeDiff = 0;
|
INT32 TimeDiff = 0;
|
||||||
INT32 iOldTid = g_iTid;
|
INT32 iOldTid = g_iTid;
|
||||||
if (iNewTid != iOldTid) {
|
if (iNewTid != iOldTid) {
|
||||||
DbgMsg_UISetDate(("(OLD) LOCALE=%s, ZONE=%ld\r\n", (iOldTid == 0) ? "HOME" : "TRAVAL", gTimeRecord[iOldTid].TimeZone));
|
DbgMsg_UISetDate("(OLD) LOCALE=%s, ZONE=%ld\r\n", (iOldTid == 0) ? "HOME" : "TRAVAL", gTimeRecord[iOldTid].TimeZone);
|
||||||
DbgMsg_UISetDate(("(NEW) LOCALE=%s, ZONE=%ld\r\n", (iNewTid == 0) ? "HOME" : "TRAVAL", gTimeRecord[iNewTid].new_TimeZone));
|
DbgMsg_UISetDate("(NEW) LOCALE=%s, ZONE=%ld\r\n", (iNewTid == 0) ? "HOME" : "TRAVAL", gTimeRecord[iNewTid].new_TimeZone);
|
||||||
TimeDiff = _TimeRecord_CalcTimeDiff
|
TimeDiff = _TimeRecord_CalcTimeDiff
|
||||||
(gTimeRecord[iNewTid].new_TimeZone, gTimeRecord[iOldTid].TimeZone);
|
(gTimeRecord[iNewTid].new_TimeZone, gTimeRecord[iOldTid].TimeZone);
|
||||||
} else { //if equal tid
|
} else { //if equal tid
|
||||||
DbgMsg_UISetDate(("(OLD) LOCALE=%s, ZONE=%ld\r\n", (iNewTid == 0) ? "HOME" : "TRAVAL", gTimeRecord[iNewTid].TimeZone));
|
DbgMsg_UISetDate("(OLD) LOCALE=%s, ZONE=%ld\r\n", (iNewTid == 0) ? "HOME" : "TRAVAL", gTimeRecord[iNewTid].TimeZone);
|
||||||
DbgMsg_UISetDate(("(NEW) LOCALE=%s, ZONE=%ld\r\n", (iNewTid == 0) ? "HOME" : "TRAVAL", gTimeRecord[iNewTid].new_TimeZone));
|
DbgMsg_UISetDate("(NEW) LOCALE=%s, ZONE=%ld\r\n", (iNewTid == 0) ? "HOME" : "TRAVAL", gTimeRecord[iNewTid].new_TimeZone);
|
||||||
TimeDiff = _TimeRecord_CalcTimeDiff
|
TimeDiff = _TimeRecord_CalcTimeDiff
|
||||||
(gTimeRecord[iNewTid].new_TimeZone, gTimeRecord[iNewTid].TimeZone);
|
(gTimeRecord[iNewTid].new_TimeZone, gTimeRecord[iNewTid].TimeZone);
|
||||||
if (iNewTid == 0) { //when chage Home Zone, but not change Locale
|
if (iNewTid == 0) { //when chage Home Zone, but not change Locale
|
||||||
|
@ -553,7 +553,7 @@ void TimeRecord_EndChange(INT32 iNewTid)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
DbgMsg_UISetDate((">>> DIFF=%ld\r\n", TimeDiff));
|
DbgMsg_UISetDate(">>> DIFF=%ld\r\n", TimeDiff);
|
||||||
_TimeRecord_AddTimeDiff(iNewTid, TimeDiff);
|
_TimeRecord_AddTimeDiff(iNewTid, TimeDiff);
|
||||||
|
|
||||||
_TimeRecord_Save(iNewTid);
|
_TimeRecord_Save(iNewTid);
|
||||||
|
|
|
@ -201,7 +201,7 @@ SINT32 sf_sys_rtc_time_set(SF_PARA_TIME_S* pstDateTime)
|
||||||
MLOGE("[ERR]ioctl get rtc time error:%d\n", ret);
|
MLOGE("[ERR]ioctl get rtc time error:%d\n", ret);
|
||||||
}
|
}
|
||||||
close(fdRtc);
|
close(fdRtc);
|
||||||
|
system("hwclock -s");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -248,7 +248,8 @@ SINT32 sf_sys_rtc_time_reset(void)
|
||||||
MLOGE("[ERR]ioctl get rtc time error:%d\n", ret);
|
MLOGE("[ERR]ioctl get rtc time error:%d\n", ret);
|
||||||
}
|
}
|
||||||
close(fdRtc);
|
close(fdRtc);
|
||||||
sf_set_mcu_rtc_flag(1);
|
sf_set_mcu_rtc_flag(1);
|
||||||
|
system("hwclock -s");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
BIN
code/hdal/vendor/output/libvendor_ai2_pub.a
vendored
BIN
code/hdal/vendor/output/libvendor_ai2_pub.a
vendored
Binary file not shown.
BIN
code/hdal/vendor/output/libvendor_ai2_pub2.a
vendored
BIN
code/hdal/vendor/output/libvendor_ai2_pub2.a
vendored
Binary file not shown.
|
@ -1167,7 +1167,11 @@ BOOL sf_cmd_reset(unsigned char argc, char **argv)
|
||||||
BOOL sf_cmd_mcu_power_on_para_get(unsigned char argc, char **argv)
|
BOOL sf_cmd_mcu_power_on_para_get(unsigned char argc, char **argv)
|
||||||
{
|
{
|
||||||
printf("[%s:%d] s\n", __FUNCTION__, __LINE__);
|
printf("[%s:%d] s\n", __FUNCTION__, __LINE__);
|
||||||
sf_mcu_power_on_para_get(SF_MCU_POWERON);
|
//sf_mcu_power_on_para_get(SF_MCU_POWERON);
|
||||||
|
SF_MESSAGE_BUF_S stMessageBuf = {0};
|
||||||
|
stMessageBuf.arg1 = SF_MCU_CMD_POWERON;
|
||||||
|
stMessageBuf.cmdId = CMD_MCU;
|
||||||
|
sf_com_message_send_to_cardv(&stMessageBuf);
|
||||||
printf("[%s:%d] e\n", __FUNCTION__, __LINE__);
|
printf("[%s:%d] e\n", __FUNCTION__, __LINE__);
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
|
@ -1,63 +0,0 @@
|
||||||
#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
||||||
#!automatically-generated file. do not edit!!
|
|
||||||
#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
||||||
|
|
||||||
BOARD_DRAM_ADDR = 0x00000000
|
|
||||||
BOARD_DRAM_SIZE = 0x08000000
|
|
||||||
BOARD_SHMEM_ADDR = 0x00007E00
|
|
||||||
BOARD_SHMEM_SIZE = 0x00000200
|
|
||||||
BOARD_LOADER_ADDR = 0x01000000
|
|
||||||
BOARD_LOADER_SIZE = 0x00080000
|
|
||||||
BOARD_FDT_ADDR = 0x01800000
|
|
||||||
BOARD_FDT_SIZE = 0x00040000
|
|
||||||
BOARD_RTOS_ADDR = 0x01840000
|
|
||||||
BOARD_RTOS_SIZE = 0x00FC0000
|
|
||||||
BOARD_LINUXTMP_ADDR = 0x02800000
|
|
||||||
BOARD_LINUXTMP_SIZE = 0x04000000
|
|
||||||
BOARD_UBOOT_ADDR = 0x06800000
|
|
||||||
BOARD_UBOOT_SIZE = 0x01640000
|
|
||||||
BOARD_LOGO-FB_ADDR = 0x07E40000
|
|
||||||
BOARD_LOGO-FB_SIZE = 0x001C0000
|
|
||||||
BOARD_LINUX_ADDR = 0x00000000
|
|
||||||
BOARD_LINUX_SIZE = 0x01800000
|
|
||||||
BOARD_LINUX_MAXBLK_ADDR = 0x00000000
|
|
||||||
BOARD_LINUX_MAXBLK_SIZE = 0x01800000
|
|
||||||
BOARD_MEDIA_ADDR = 0x03600000
|
|
||||||
BOARD_MEDIA_SIZE = 0x04A00000
|
|
||||||
BIN_NAME = FW98565A
|
|
||||||
BIN_NAME_T = FW98565T
|
|
||||||
RTOS_APP_MAIN = cardv
|
|
||||||
EMBMEM_BLK_SIZE = 0x10000
|
|
||||||
EMBMEM = EMBMEM_SPI_NOR
|
|
||||||
FW_TYPE = FW_TYPE_PARTIAL
|
|
||||||
UI_STYLE = UI_STYLE_LVGL
|
|
||||||
NVT_CFG_APP_EXTERNAL = hostapd wireless_tool iperf-3 wpa_supplicant dhd_priv
|
|
||||||
NVT_CFG_APP = mem cardv memcpy isp_demon sf_app
|
|
||||||
NVT_ROOTFS_ETC =
|
|
||||||
NVT_BINARY_FILE_STRIP = yes
|
|
||||||
NVT_CFG_KERNEL_CFG = na51089_evb_cardv_defconfig_release
|
|
||||||
NVT_MAKE_POST = make_post.sh
|
|
||||||
NVT_SAMPLES_INSTALL = DISABLE
|
|
||||||
NVT_CFG_UBOOT_CFG =
|
|
||||||
NVT_LINUX_SMP = NVT_LINUX_SMP_OFF
|
|
||||||
NVT_CHIP_ID = CHIP_NA51089
|
|
||||||
NVT_LINUX_COMPRESS = NVT_LINUX_COMPRESS_GZ
|
|
||||||
NVT_DEFAULT_NETWORK_BOOT_PROTOCOL = NVT_DEFAULT_NETWORK_BOOT_PROTOCOL_STATIC_IP
|
|
||||||
NVT_ROOTFS_TYPE = NVT_ROOTFS_TYPE_RAMDISK
|
|
||||||
LCD1 = disp_if8b_lcd1_psd200_st7789v
|
|
||||||
SENSOR1 = sen_os05b10
|
|
||||||
SENSOR1_CFG = sen_os05b10_565
|
|
||||||
SENSOR2 = sen_off
|
|
||||||
SENSOR2_CFG = sen_off
|
|
||||||
NVT_ROOTFS_RW_PART_EN = NVT_ROOTFS_RW_PART_EN_ON
|
|
||||||
NVT_ETHERNET = NVT_ETHERNET_NONE
|
|
||||||
NVT_SDIO_WIFI = NVT_SDIO_WIFI_RTK
|
|
||||||
NVT_USB_WIFI = NVT_USB_WIFI_NONE
|
|
||||||
NVT_USB_4G = NVT_USB_4G_NONE
|
|
||||||
WIFI_RTK_MDL = WIFI_RTK_MDL_8189
|
|
||||||
WIFI_BRCM_MDL = WIFI_BRCM_MDL_43456c5_ampk6256c5
|
|
||||||
WIFI_NVT_MDL = WIFI_NVT_MDL_18211
|
|
||||||
NVT_CURL_SSL = NVT_CURL_SSL_OPENSSL
|
|
||||||
NVT_UBOOT_ENV_IN_STORG_SUPPORT = NVT_UBOOT_ENV_IN_STORG_SUPPORT_OFF
|
|
||||||
TOUCH = TOUCH_OFF
|
|
||||||
UBOOT_ONLY_LOAD_LINUX = UBOOT_ONLY_LOAD_LINUX_ON
|
|
|
@ -1 +0,0 @@
|
||||||
Linux/cfg_565_HUNTING_EVB_LINUX_4G_S530
|
|
Loading…
Reference in New Issue
Block a user