From 2d951769b3c5b6cb524cb816d95d286987475d2b Mon Sep 17 00:00:00 2001 From: payton Date: Sat, 7 Oct 2023 09:51:36 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=BC=80=E6=9C=BAlogo=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9B2.s550=E5=8F=AF=E8=83=BD=E8=AF=BB=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E5=BC=80=E6=9C=BA=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DxDisplay_LCD.c | 35 +++++++++++---- .../565_HUNTING_EVB_LINUX_4G_S550/DxHunting.c | 6 +-- .../Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.h | 2 +- .../cardv/SrcCode/FastFlow/flow_boot_linux.c | 14 ++++-- .../cardv/SrcCode/FastFlow/flow_boot_logo.c | 6 ++- .../cardv/SrcCode/System/SysVideo_Exe.c | 24 +++++++++-- .../source/cardv/SrcCode/System/rtos-main.c | 43 ++++++++++++------- .../cardv/SrcCode/System/sys_linuxboot.c | 16 ++++--- .../UIApp/Movie/UIAppMovie_CommPoolInit.c | 20 ++++++--- .../UIApp/Movie/UIAppMovie_RecSetting.c | 4 +- 10 files changed, 120 insertions(+), 50 deletions(-) mode change 100644 => 100755 rtos/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_CommPoolInit.c diff --git a/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxDisplay_LCD.c b/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxDisplay_LCD.c index f52ed80ec..6b527910e 100755 --- a/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxDisplay_LCD.c +++ b/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/DxDisplay_LCD.c @@ -13,7 +13,10 @@ #define __DBGFLT__ "*" //*=All, [mark]=CustomClass #include /////////////////////////////////////////////////////////////////////////////// - +#include "PrjCfg.h" +#if HUNTING_CAMERA_MCU == ENABLE +#include "sf_mcu.h" +#endif //EVB default is _Disp_IF8B_LCD1_PW35P00_HX8238D_ #define LCD_MAX_W ALIGN_CEIL_16(320) //device w of DISP_LCDMODE_xxx, to support rotate, it must align to 16 #define LCD_MAX_H ALIGN_CEIL_16(720) //device h of DISP_LCDMODE_xxx, to support rotate, it must align to 16 @@ -544,12 +547,17 @@ static void GPIOMap_LCDReset(void) { // Reset LCD #if 1 - gpio_setDir(GPIO_LCD_RESET, GPIO_DIR_OUTPUT); - gpio_setPin(GPIO_LCD_RESET); - SwTimer_DelayMs(10); - gpio_clearPin(GPIO_LCD_RESET); - SwTimer_DelayMs(10); - gpio_setPin(GPIO_LCD_RESET); +#if HUNTING_CAMERA_MCU == ENABLE + if(sf_get_mode_flag()) +#endif + { + gpio_setDir(GPIO_LCD_RESET, GPIO_DIR_OUTPUT); + gpio_setPin(GPIO_LCD_RESET); + SwTimer_DelayMs(10); + gpio_clearPin(GPIO_LCD_RESET); + SwTimer_DelayMs(10); + gpio_setPin(GPIO_LCD_RESET); + } #elif defined(_Disp_IFDSI_LCD1_BPB5017BFW_ILI9806E_) gpio_clearPin(GPIO_LCD_RESET); SwTimer_DelayMs(10); @@ -636,7 +644,13 @@ static void GPIOMap_TurnOnLCDBacklight(void) pwm_pwmConfig(PWMID_LCD_BLG_PCTL, &g_LCDBacklightPWMInfo); pwm_pwmEnable(PWMID_LCD_BLG_PCTL); #elif (LCD_BACKLIGHT_CTRL == LCD_BACKLIGHT_BY_GPIO) - gpio_setPin(GPIO_LCD_BLG_PCTL); +#if HUNTING_CAMERA_MCU == ENABLE + if(sf_get_mode_flag()) +#endif + { + gpio_setDir(GPIO_LCD_BLG_PCTL, GPIO_DIR_OUTPUT); + gpio_setPin(GPIO_LCD_BLG_PCTL); + } #else DrvLCD_TurnOn(); DrvLCD_TurnOn_WaitFinish(); @@ -681,7 +695,12 @@ static void GPIOMap_TurnOffLCDBacklight(void) pwm_pwmDisable(PWMID_LCD_BLG_PCTL); pwm_close(PWMID_BLG_PCTL, TRUE); #elif (LCD_BACKLIGHT_CTRL == LCD_BACKLIGHT_BY_GPIO) +#if HUNTING_CAMERA_MCU == ENABLE + if(sf_get_mode_flag()) +#endif + { gpio_clearPin(GPIO_LCD_BLG_PCTL); + } #else DrvLCD_TurnOff(); #endif 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 4a47d408b..dbdb1ff24 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 @@ -148,17 +148,17 @@ UINT32 DrvGPIO_GetPhotoMovieModeFromMonitor(void) //int ret = 1; UINT8 value; UIMenuStoreInfo *puiPara = sf_ui_para_get(); - + vos_perf_mark(&t1); + value = sf_get_power_on_mode(); + if(gpio_getIntStatus(GPIO_INT_USBPLUGIN) || FALSE == (gpio_getPin(GPIO_CARD_DETECT) == 0 ? TRUE : FALSE)) { g_uiBootMode = DX_HUNTING_MODE_OTHER; Save_MenuInfo(); return g_uiBootMode; } - vos_perf_mark(&t1); // ret = sf_mod_init(); // printf("%s:%d ret:%d\n", __FUNCTION__, __LINE__,ret); - value = sf_get_power_on_mode(); //sf_mcu_power_on_para_get(SF_MCU_POWERON); //sf_mcu_wdg_set(5); //sf_mcu_reg_set(SF_MCU_CTRL_MODULE_PIR, 1); diff --git a/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.h b/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.h index 09b82a59e..f12ca539c 100755 --- a/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.h +++ b/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.h @@ -247,7 +247,7 @@ extern BOOL GPIOMap_DetAudio(void); #define GPIO_KEY_MENU C_GPIO_21 // Key Menu (km) #define PAD_KEY_MENU PAD_PIN_CGPIO21 -#define GPIO_KEY_TEST S_GPIO_6 +#define GPIO_KEY_TEST P_GPIO_22 #define PAD_KEY_TEST PAD_PIN_SGPIO6 //#define ADC_CH_VOLDET_MS1 ADC_CHANNEL_1 diff --git a/rtos/code/application/source/cardv/SrcCode/FastFlow/flow_boot_linux.c b/rtos/code/application/source/cardv/SrcCode/FastFlow/flow_boot_linux.c index e5f6b65f6..f06df7f24 100755 --- a/rtos/code/application/source/cardv/SrcCode/FastFlow/flow_boot_linux.c +++ b/rtos/code/application/source/cardv/SrcCode/FastFlow/flow_boot_linux.c @@ -25,7 +25,9 @@ #include "sys_storage_partition.h" #include #include "DxHunting.h" - +#if HUNTING_CAMERA_MCU == ENABLE +#include "sf_mcu.h" +#endif static pthread_t handle_linux; #if POWERON_FAST_BOOT_MSG == ENABLE @@ -54,9 +56,13 @@ static void *thread_linux(void *ptr) fastboot_wait_done(BOOT_FLOW_BOOT); #if (_PACKAGE_BOOTLOGO_) - - LINUX_BOOT_MSG("wait boot logo\n"); - fastboot_wait_done(BOOT_INIT_BOOTLOGO); +#if HUNTING_CAMERA_MCU == ENABLE + if(sf_get_mode_flag()) +#endif + { + LINUX_BOOT_MSG("wait boot logo\n"); + fastboot_wait_done(BOOT_INIT_BOOTLOGO); + } #endif diff --git a/rtos/code/application/source/cardv/SrcCode/FastFlow/flow_boot_logo.c b/rtos/code/application/source/cardv/SrcCode/FastFlow/flow_boot_logo.c index dd7c05df7..b3d9d564f 100755 --- a/rtos/code/application/source/cardv/SrcCode/FastFlow/flow_boot_logo.c +++ b/rtos/code/application/source/cardv/SrcCode/FastFlow/flow_boot_logo.c @@ -85,6 +85,8 @@ static void flow_boot_logo_lcd_reset(void) static void flow_boot_logo_lcd_backlight(BOOL enabled) { if(enabled){ + DBG_ERR("GPIO_LCD_BLG_PCTL test\n"); + gpio_setDir(GPIO_LCD_BLG_PCTL, GPIO_DIR_OUTPUT); gpio_setPin(GPIO_LCD_BLG_PCTL); } else{ @@ -508,7 +510,7 @@ static THREAD_RETTYPE thread_videodec(void *ptr) goto exit; } - flow_boot_logo_lcd_backlight(TRUE); + // flow_boot_logo_lcd_backlight(TRUE); videoout_cfg.in_func = VENDOR_VIDEOOUT_INFUNC_KEEP_LAST; ret = vendor_videoout_set(task_param->vout_path_id, VENDOR_VIDEOOUT_ITEM_FUNC_CONFIG, &videoout_cfg); @@ -581,7 +583,7 @@ int flow_boot_logo(flow_boot_logo_mem_init_cb mem_init_cb) } // flow_boot_logo_mem_init(); - + flow_boot_logo_lcd_backlight(TRUE); flow_boot_logo_init_param(&flow_boot_logo_param); handle_videoout = vos_task_create(thread_videoout, &flow_boot_logo_param, "vout", 9, 8192); diff --git a/rtos/code/application/source/cardv/SrcCode/System/SysVideo_Exe.c b/rtos/code/application/source/cardv/SrcCode/System/SysVideo_Exe.c index 0fc01cf55..4b545f063 100755 --- a/rtos/code/application/source/cardv/SrcCode/System/SysVideo_Exe.c +++ b/rtos/code/application/source/cardv/SrcCode/System/SysVideo_Exe.c @@ -34,6 +34,9 @@ #if (OSD_USE_ROTATE_BUFFER == ENABLE) #include "UI/UIView.h" #endif +#if HUNTING_CAMERA_MCU == ENABLE +#include "sf_mcu.h" +#endif static DX_HANDLE gDispDev = 0; @@ -349,6 +352,9 @@ void System_OnVideoInit2(void) TM_BOOT_END("video", "init"); TM_BOOT_BEGIN("video", "show_logo"); #if (POWERONLOGO_FUNCTION == ENABLE) +#if HUNTING_CAMERA_MCU == ENABLE + if(sf_get_mode_flag()) +#endif { Display_ShowSplash(SPLASH_POWERON); Delay_DelayMs(30); // delay some time to avoid LCD flicker as power on @@ -749,8 +755,13 @@ void Display_ShowSplash(SPLASH_ID splash_id) //load default logo if (splash_id == SPLASH_POWERON) { #if (POWERONLOGO_FUNCTION == ENABLE) - p_gLogoJPG = (UINT32)g_ucBGOpening; - p_gLogoSize = Logo_getBGOpening_size(); +#if HUNTING_CAMERA_MCU == ENABLE + if(sf_get_mode_flag()) +#endif + { + p_gLogoJPG = (UINT32)g_ucBGOpening; + p_gLogoSize = Logo_getBGOpening_size(); + } #endif } else { #if (POWEROFFLOGO_FUNCTION == ENABLE) @@ -761,6 +772,7 @@ void Display_ShowSplash(SPLASH_ID splash_id) //show logo DBG_IND("Show Logo\r\n"); UI_ShowJPG(LOGO_DISP_LAYER, (UINT32)p_gLogoJPG, p_gLogoSize); + DBG_IND("Show Logo e\r\n"); } void Display_HideSplash(void) { @@ -776,7 +788,13 @@ void Display_ShowPreview(void) Display_SetEnable(LAYER_VDO1, TRUE); #if (POWERONLOGO_FUNCTION == ENABLE) - Display_HideSplash(); + #if HUNTING_CAMERA_MCU == ENABLE + if(sf_get_mode_flag()) + #endif + { + Display_HideSplash(); + } + #else GxVideo_SetDeviceCtrl(DOUT1, DISPLAY_DEVCTRL_BACKLIGHT, TRUE); #endif diff --git a/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c b/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c index bed6b3fec..024ddad97 100755 --- a/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c +++ b/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c @@ -555,10 +555,15 @@ static void insmod_display(void) /* display */ #if (_PACKAGE_DISPLAY_) || (_PACKAGE_BOOTLOGO_) - fwload_wait_done(CODE_SECTION_04); + #if HUNTING_CAMERA_MCU == ENABLE + if(sf_get_mode_flag()) + #endif + { + fwload_wait_done(CODE_SECTION_04); - kflow_videoout_init(); // video output - panel_init(); // panel + kflow_videoout_init(); // video output + panel_init(); // panel + } #endif vos_perf_list_mark(__func__, __LINE__, 1); @@ -659,8 +664,13 @@ static void insmod_decoder(void) } else{ #if (_PACKAGE_BOOTLOGO_) - fwload_wait_done(CODE_SECTION_04); - kflow_videodec_init(); + #if HUNTING_CAMERA_MCU == ENABLE + if(sf_get_mode_flag()) + #endif + { + fwload_wait_done(CODE_SECTION_04); + kflow_videodec_init(); + } #endif } @@ -940,10 +950,10 @@ static void fastboot(void) // linuxboot_set_extra_bootarg("hunt_boot_mode=4G_ONLY"); flow_boot_linux(); -#if (_PACKAGE_BOOTLOGO_) - fwload_wait_done(CODE_SECTION_04); - flow_boot_logo(NULL); -#endif +// #if (_PACKAGE_BOOTLOGO_) +// fwload_wait_done(CODE_SECTION_04); +// flow_boot_logo(NULL); +// #endif #endif // wait all text-code loaded @@ -968,10 +978,10 @@ static void fastboot(void) // linuxboot_set_extra_bootarg("hunt_boot_mode=4G_ONLY"); flow_boot_linux(); -#if (_PACKAGE_BOOTLOGO_) - fwload_wait_done(CODE_SECTION_04); - flow_boot_logo(NULL); -#endif +// #if (_PACKAGE_BOOTLOGO_) +// fwload_wait_done(CODE_SECTION_04); +// flow_boot_logo(NULL); +// #endif #endif // wait all text-code loaded @@ -1008,8 +1018,11 @@ static void fastboot(void) flow_boot_linux(); #if (_PACKAGE_BOOTLOGO_) - fwload_wait_done(CODE_SECTION_04); - flow_boot_logo(flow_boot_logo_mem_init); + if(sf_get_mode_flag()) + { + fwload_wait_done(CODE_SECTION_04); + flow_boot_logo(flow_boot_logo_mem_init); + } #endif fwload_wait_done(CODE_SECTION_10); diff --git a/rtos/code/application/source/cardv/SrcCode/System/sys_linuxboot.c b/rtos/code/application/source/cardv/SrcCode/System/sys_linuxboot.c index be3feb732..d3e3d7467 100755 --- a/rtos/code/application/source/cardv/SrcCode/System/sys_linuxboot.c +++ b/rtos/code/application/source/cardv/SrcCode/System/sys_linuxboot.c @@ -204,12 +204,16 @@ static int fdt_chosen(LINUXTMP_PARTITION *p_linuxtmp) } #if (((_PACKAGE_DISPLAY_) || (_PACKAGE_BOOTLOGO_)) && (!defined(_disp_off_))) - - nodeoffset = fdt_path_offset((const void*)fdt, "/logo"); - if (nodeoffset >= 0) { - value = cpu_to_fdt32(value); - fdt_setprop(fdt, nodeoffset, "enable", &value, sizeof(value)); - } + #if HUNTING_CAMERA_MCU == ENABLE + if(sf_get_mode_flag()) + #endif + { + nodeoffset = fdt_path_offset((const void*)fdt, "/logo"); + if (nodeoffset >= 0) { + value = cpu_to_fdt32(value); + fdt_setprop(fdt, nodeoffset, "enable", &value, sizeof(value)); + } + } #endif diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_CommPoolInit.c b/rtos/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_CommPoolInit.c old mode 100644 new mode 100755 index bffbd484c..9a269f582 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_CommPoolInit.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_CommPoolInit.c @@ -6,7 +6,9 @@ #include "SysSensor.h" #include #include "flow_boot_logo.h" - +#if HUNTING_CAMERA_MCU == ENABLE +#include "sf_mcu.h" +#endif //#define ENABLE 1 //#define DISABLE 0 @@ -209,11 +211,17 @@ void Movie_CommPoolInit(void) #endif // (_BOARD_DRAM_SIZE_ > 0x04000000) #if (_PACKAGE_BOOTLOGO_) - id ++; - mem_cfg.pool_info[id].type = HD_COMMON_MEM_COMMON_POOL; - mem_cfg.pool_info[id].blk_size = DBGINFO_BUFSIZE() + ((BOOT_LOGO_LCD_WIDTH * BOOT_LOGO_LCD_HEIGHT * 3) / 2); - mem_cfg.pool_info[id].blk_cnt = 2; - mem_cfg.pool_info[id].ddr_id = DDR_ID0; + #if HUNTING_CAMERA_MCU == ENABLE + if(sf_get_mode_flag()) + #endif + { + id ++; + mem_cfg.pool_info[id].type = HD_COMMON_MEM_COMMON_POOL; + mem_cfg.pool_info[id].blk_size = DBGINFO_BUFSIZE() + ((BOOT_LOGO_LCD_WIDTH * BOOT_LOGO_LCD_HEIGHT * 3) / 2); + mem_cfg.pool_info[id].blk_cnt = 2; + mem_cfg.pool_info[id].ddr_id = DDR_ID0; + } + #endif ImageApp_MovieMulti_Config(MOVIE_CONFIG_MEM_POOL_INFO, (UINT32)&mem_cfg); diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_RecSetting.c b/rtos/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_RecSetting.c index 5ecbd51e6..15a02f633 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_RecSetting.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_RecSetting.c @@ -184,7 +184,7 @@ MOVIE_RECODE_INFO gMovie_Clone_Info[SENSOR_MAX_NUM] = { MOVIE_STRM_INFO gMovie_Strm_Info = { _CFG_STRM_ID_1, //MOVIE_CFG_REC_ID _CFG_VID_IN_1, //MOVIE_CFG_VID_IN - {848,480}, //MOVIE_CFG_IMG_SIZE + {640,640}, //MOVIE_CFG_IMG_SIZE 30, //MOVIE_CFG_FRAME_RATE 350 * 1024, //MOVIE_CFG_TARGET_RATE _CFG_CODEC_H264, //MOVIE_CFG_CODEC @@ -206,7 +206,7 @@ MOVIE_ALG_INFO gMovie_Alg_Info[] = { #if (_BOARD_DRAM_SIZE_ == 0x04000000) {0, 0}, // image size #else - {848, 480}, // image size + {640, 480}, // image size #endif {0, 0, 0, 0}, // window size 30, // fps