diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastCapDateImprint.c b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastCapDateImprint.c index fe66bf15e..5d3c12691 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastCapDateImprint.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastCapDateImprint.c @@ -26,7 +26,7 @@ #include "UIInfo/UIInfo.h" #include "sf_battery.h" - +#include "sf_mcu.h" #if PHOTO_STAMP_ISP_STATUS == DISABLE char StampStr[256] = {0}; @@ -326,7 +326,9 @@ void PhotoStamp_get_isp_status(UINT32 id, char* Buf, UINT32 BufLen) Curr_gsDateTime.tm_hour, Curr_gsDateTime.tm_min, Curr_gsDateTime.tm_sec); - + #if SF_HW_TEST == ENABLE + sf_set_iso_exp_lv((ae_status.status_info.state_adj), (ae_status.status_info.iso_gain[0]),(ae_status.status_info.expotime[0]), (ae_status.status_info.lv/100000)); + #endif DBG_IND("%s:%d Buf=%s\r\n",__FUNCTION__,__LINE__,Buf); #endif vendor_isp_uninit(); diff --git a/rtos/code/driver/na51089/include/sf_mcu.h b/rtos/code/driver/na51089/include/sf_mcu.h index fcdda2447..65936ef5b 100644 --- a/rtos/code/driver/na51089/include/sf_mcu.h +++ b/rtos/code/driver/na51089/include/sf_mcu.h @@ -525,5 +525,6 @@ UINT32 sf_get_send_pic_sieze(void); void sf_para_print(void); UINT8 sf_convert_power_on_mode(void); void sf_hw_info_save(char *name); +void sf_set_iso_exp_lv(UINT32 adj, UINT32 iso, UINT32 exp, UINT32 lv); #endif diff --git a/rtos/code/driver/na51089/source/mcu/sf_mcu.c b/rtos/code/driver/na51089/source/mcu/sf_mcu.c index d6e3ff917..79ab064d8 100644 --- a/rtos/code/driver/na51089/source/mcu/sf_mcu.c +++ b/rtos/code/driver/na51089/source/mcu/sf_mcu.c @@ -10,6 +10,7 @@ */ +#include "kwrap/nvt_type.h" #include #include @@ -384,11 +385,11 @@ UINT8 sf_mcu_power_on_para_get(MCUParam_t attrId) startMode = dataTemp1 & 0xF; DailyReportStartMode = (dataTemp1 & 0xc0) >> 6; #if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) - if(startMode == PWR_ON_TIME_SYNC) + /*if(startMode == PWR_ON_TIME_SYNC) { startMode = PWR_ON_DAILY_REPORT; } - else + else */ #endif { if(startMode > PWR_ON_TIME_SEND) //if start mode err, USB IN default power on SETUP @@ -694,7 +695,7 @@ UINT8 sf_get_power_on_mode(void) else{ //PowerOnMode = sf_mcu_power_on_para_get(SF_MCU_POWERON); PowerOnMode = sf_mcu_power_on_para_get(SF_MCU_STARTMODE); - PowerOnMode &= 0x0f; + //PowerOnMode &= 0x0f; //sf_is_night_mode(1); if(1 == PowerOnMode) { @@ -2265,7 +2266,18 @@ void sf_para_print(void) } #if SF_HW_TEST == ENABLE +UINT32 testadj = 0; +UINT32 testiso = 0; +UINT32 testexp = 0; +UINT32 testlv = 0; +void sf_set_iso_exp_lv(UINT32 adj, UINT32 iso, UINT32 exp, UINT32 lv) +{ + testadj = adj; + testiso = iso; + testexp = exp; + testlv = lv; +} void sf_hw_info_save(char *name) { char *tmpBuf = NULL; @@ -2318,7 +2330,7 @@ void sf_hw_info_save(char *name) } - sprintf(tmpBuf, "%s %s IRSHTTER=%d TemperAdc=%lu\r\n", datestr, name, IRSHTTER, sf_get_temper_adc()); + sprintf(tmpBuf, "%s %s IRSHTTER=%d TemperAdc=%lu ae_adj=%lu iso=%lu exp=%lu lv=%lu\r\n", datestr, name, IRSHTTER, sf_get_temper_adc(), testadj, testiso, testexp, testlv); printf("%s\r", tmpBuf); if(fd)