From 38840befb668766880f1240aed27a8705b83fbcc Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 24 Nov 2023 16:56:17 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=90=8C=E6=AD=A5DS05=20IQ=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.c | 8 +- .../sf_app/code/include/sf_commu_mcu_reg.h | 2 +- code/lib/source/sifar/code/include/sf_mcu.h | 2 +- .../565_HUNTING_EVB_LINUX_4G_S550/DxHunting.c | 8 +- .../cardv/SrcCode/FastFlow/flow_preview.c | 79 ++++++++++--------- .../cardv/SrcCode/UIApp/MovieFast/MovieFast.c | 2 +- .../cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c | 6 +- rtos/code/driver/na51089/include/sf_mcu.h | 2 +- 8 files changed, 55 insertions(+), 54 deletions(-) diff --git a/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.c b/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.c index a2961ce4b..9c0d76197 100755 --- a/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.c +++ b/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.c @@ -460,22 +460,22 @@ void sf_ir_led_set(UINT8 mode, UINT8 flashLed, UINT8 stillExp, UINT8 isSnapVideo { if(flashLed == 0) { - ui_rise = 25;//75% + ui_rise = 30;//70% } else { - ui_rise = 55;//45% + ui_rise = 60;//40% } } else { if(flashLed == 0) { - ui_rise = 10;//90% + ui_rise = 15;//85% } else { - ui_rise = 45;//55% + ui_rise = 55;//45% } } #else diff --git a/code/application/source/sf_app/code/include/sf_commu_mcu_reg.h b/code/application/source/sf_app/code/include/sf_commu_mcu_reg.h index 3f255f7e7..768231d66 100755 --- a/code/application/source/sf_app/code/include/sf_commu_mcu_reg.h +++ b/code/application/source/sf_app/code/include/sf_commu_mcu_reg.h @@ -31,7 +31,7 @@ #define REG_SIZE 91 -#define SF_MCU_NIGHT_MODE_LUMINANCE 600 +#define SF_MCU_NIGHT_MODE_LUMINANCE 160 #define SF_BATT_RECOVERY 72 //S530 /*REG POWER_OFFON*/ diff --git a/code/lib/source/sifar/code/include/sf_mcu.h b/code/lib/source/sifar/code/include/sf_mcu.h index 38761f30c..7d3f6d01e 100644 --- a/code/lib/source/sifar/code/include/sf_mcu.h +++ b/code/lib/source/sifar/code/include/sf_mcu.h @@ -26,7 +26,7 @@ #define SUCCESS 0 #define FAIL 1 -#define SF_MCU_NIGHT_MODE_LUMINANCE 600 +#define SF_MCU_NIGHT_MODE_LUMINANCE 160 #define DIGITAL_PIR 1 #define SF_LI_BATT_RECOVERY 99 diff --git a/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxHunting.c b/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxHunting.c index 548f86166..96577e6b4 100755 --- a/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxHunting.c +++ b/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxHunting.c @@ -461,22 +461,22 @@ void sf_ir_led_set(UINT8 mode, UINT8 flashLed, UINT8 stillExp, UINT8 isSnapVideo { if(flashLed == 0) { - ui_rise = 25;//75% + ui_rise = 30;//70% } else { - ui_rise = 55;//45% + ui_rise = 60;//40% } } else { if(flashLed == 0) { - ui_rise = 10;//90% + ui_rise = 15;//85% } else { - ui_rise = 45;//55% + ui_rise = 55;//45% } } #else diff --git a/rtos/code/application/source/cardv/SrcCode/FastFlow/flow_preview.c b/rtos/code/application/source/cardv/SrcCode/FastFlow/flow_preview.c index f1f5a6d3a..6c118481d 100755 --- a/rtos/code/application/source/cardv/SrcCode/FastFlow/flow_preview.c +++ b/rtos/code/application/source/cardv/SrcCode/FastFlow/flow_preview.c @@ -1167,31 +1167,31 @@ static UINT32 ae_adc_tbl[57][3] = { #else // 100K RSS new phototransistor {710, 44, 1000}, {708, 73, 1000}, - {707, 88, 1000}, - {705, 99, 1130}, - {704, 103, 1130}, - {703, 126, 1000}, - {702, 203, 1070}, - {701, 267, 1070}, - {700, 301, 1010}, - {699, 333, 1020}, - {698, 386, 1000}, - {697, 423, 1000},// 524 - {696, 502, 1000}, - {695, 560, 1000}, - {694, 828, 1000}, - {693, 991, 1000}, - {691, 1192, 1000}, - {689, 1325, 1000}, - {687, 1620, 1000}, - {684, 1999, 1000},//8333, 2150}, - {681, 3808, 1000},//8333, 2550}, - {679, 8333, 1070}, - {669, 8333, 3030}, - {645, 8333, 3160}, - {617, 8333, 3400}, - {591, 8333, 3600}, - {566, 8333, 3890}, + {707, 77, 1000}, + {705, 80, 1130}, + {704, 80, 1130}, + {703, 87, 1000}, + {702, 87, 1070}, + {701, 99, 1070}, + {700, 99, 1010}, + {699, 103, 1020}, + {698, 126, 1000}, + {697, 203, 1000},// 524 + {696, 267, 1000}, + {695, 333, 1000}, + {694, 423, 1000}, + {693, 560, 1000}, + {691, 991, 1000}, + {689, 1192, 1000}, + {687, 3808, 1000}, + {684, 4270, 1000},//8333, 2150}, + {681, 6187, 1000},//8333, 2550}, + {679, 8333, 1000}, + {669, 8333, 1000}, + {645, 8333, 1000}, + {617, 8333, 1000}, + {591, 16666, 1000}, + {566, 16666, 1000}, {546, 16666, 2050}, {526, 16666, 2270}, {507, 16666, 2310}, @@ -1208,20 +1208,20 @@ static UINT32 ae_adc_tbl[57][3] = { {264, 16666, 4500}, //45770}, {242, 16666, 4740}, {220, 16666, 5100}, - {161, 16666, 6280}, + {161, 16666, 6860}, {142, 16666, 6860}, - {126, 16666, 7060}, - {113, 16666, 7200}, - {96, 16666, 8000}, - {80, 16666, 10000}, - {62, 16666, 12000}, - {48, 16666, 14000}, - {35, 16666, 16000}, - {26, 16666, 16000}, - {19, 16666, 16000}, - {13, 16666, 16000}, - {10, 16666, 16000}, - {8, 16666, 16000}, + {126, 16666, 1000}, + {113, 16666, 1000}, + {96, 16666, 1000}, + {80, 16666, 1000}, + {62, 16666, 8000}, + {48, 16666, 8000}, + {35, 16666, 8000}, + {26, 16666, 8000}, + {19, 16666, 8000}, + {13, 16666, 8000}, + {10, 16666, 8000}, + {8, 16666, 8000}, #endif }; @@ -1256,7 +1256,8 @@ void ae_adc_get_exp_photo(UINT16 adc_value, UINT32 *exptime, UINT32 *isogain) //adc_ev = ((ev1 - ev0) * (ae_adc_tbl[idx1][0]-adc_value))/(ae_adc_tbl[idx1][0]-ae_adc_tbl[idx0][0]) + ev0; adc_ev = ((ev1 - ev0) * (adc_value - ae_adc_tbl[idx1][0]))/(ae_adc_tbl[idx0][0] - ae_adc_tbl[idx1][0]) + ev0; - if(adc_value>35)// 200 for old phototransistor + //if(adc_value>35)// 200 for old phototransistor + if(1) { *exptime = exptime0; *isogain = (adc_ev / exptime0); diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c b/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c index b5dc89692..dde420c62 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c @@ -1332,7 +1332,7 @@ THREAD_RETTYPE MovieFast_InitMovieModeThread(void *arg) //UI_SetData(FL_MOVIE_SIZE, MOVIE_SIZE_CLONE_1920x1080P30_1280x720P30); Set_NIGHTMODE(0, 0); - nvt_cmdsys_runcmd("ae set_speed 0 128 700 700 100 "); + nvt_cmdsys_runcmd("ae set_speed 0 128 200 200 100"); } else{ Set_NIGHTMODE(0, 1); diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c index d751c8135..ae6c92d9f 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c @@ -1491,7 +1491,7 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg) DBG_DUMP("period = %lu ms, max_cnt = %lu\n", period, max_cnt); PhotoFast_SliceEncode2_Open(vprc_path, max_cnt); - nvt_cmdsys_runcmd("ae set_speed 0 128 700 700 100 "); + nvt_cmdsys_runcmd("ae set_speed 0 128 200 200 100"); #endif #if (FASTCAPTURE_AE_DEBUG == 1) @@ -1686,7 +1686,7 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg) * * 2. third frame since ae preset ******************************************************************************************/ - if(((g_vcap_frm_cnt >= PHOTOFAST_START_CAP_FRAME_CNT) || (g_ae_preset_flag == TRUE && g_vprc_frm_cnt >= (g_vprc_frm_cnt_ae_preset + 4))) && (start_cap == FALSE)){ + if(((g_vcap_frm_cnt >= PHOTOFAST_START_CAP_FRAME_CNT) || (g_ae_preset_flag == TRUE && g_vprc_frm_cnt >= (g_vprc_frm_cnt_ae_preset + 3))) && (start_cap == FALSE)){ if(g_vcap_frm_cnt >= PHOTOFAST_START_CAP_FRAME_CNT){ DBG_DUMP("triggered by PHOTOFAST_START_CAP_FRAME_CNT\n"); @@ -2117,7 +2117,7 @@ void Set_AEMODE(UINT32 id) total.id = 0; total.gain = 1600; vendor_isp_set_common(ISPT_ITEM_TOTAL_GAIN, &total);*/ - nvt_cmdsys_runcmd("ae dbg 0 0 0 "); + //nvt_cmdsys_runcmd("ae dbg 0 0 0 "); } else { ae_manual.manual.mode = 0; diff --git a/rtos/code/driver/na51089/include/sf_mcu.h b/rtos/code/driver/na51089/include/sf_mcu.h index 16a54f268..3af70a914 100755 --- a/rtos/code/driver/na51089/include/sf_mcu.h +++ b/rtos/code/driver/na51089/include/sf_mcu.h @@ -28,7 +28,7 @@ #define SF_SEND_LIST_ITEM_LENGTH 15 -#define SF_MCU_NIGHT_MODE_LUMINANCE 100// old phototransistor:600 +#define SF_MCU_NIGHT_MODE_LUMINANCE 160// old phototransistor:600 #define DIGITAL_PIR 1