From 3e2e82948507013206799bfe083bb037b03801a4 Mon Sep 17 00:00:00 2001 From: payton Date: Tue, 2 Jan 2024 21:50:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E5=8F=82=E6=95=B0=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=8F=90=E5=89=8D=E5=88=B0ui=E6=98=BE=E7=A4=BA=E5=89=8D?= =?UTF-8?q?=EF=BC=9B2.=E5=A2=9E=E5=8A=A0dump=E6=89=93=E5=8D=B0=E6=97=B6?= =?UTF-8?q?=E5=BA=8Flog=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/cardv/SrcCode/System/SysMain_Exe.c | 18 ++++---- .../source/cardv/SrcCode/System/SysMain_cmd.c | 1 + .../source/cardv/SrcCode/System/main.c | 1 + .../lib/source/sifar/code/include/sf_common.h | 2 + .../sifar/code/source/common/sf_common.c | 44 +++++++++++++++++++ 5 files changed, 57 insertions(+), 9 deletions(-) diff --git a/code/application/source/cardv/SrcCode/System/SysMain_Exe.c b/code/application/source/cardv/SrcCode/System/SysMain_Exe.c index 0ec1eeb50..604baf7fa 100755 --- a/code/application/source/cardv/SrcCode/System/SysMain_Exe.c +++ b/code/application/source/cardv/SrcCode/System/SysMain_Exe.c @@ -227,15 +227,15 @@ INT32 System_OnBoot(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) Load_MenuInfo(); #endif #else -#if (BOOT_RESET_MENU_INFO == ENABLE) - //EMMC_AS_PSTORE - #if (defined(_CPU2_LINUX_) && defined(_EMBMEM_EMMC_)) - System_OnStrgInit_PS(); //because ps uses filesys in this case, so ps init was moved here. - Load_MenuInfo(); - #else - Load_MenuInfo(); //reset value cause the FL_FSStatus as '0', we do so before NVTEVT_STRG_ATTACH finish - #endif -#endif +// #if (BOOT_RESET_MENU_INFO == ENABLE) +// //EMMC_AS_PSTORE +// #if (defined(_CPU2_LINUX_) && defined(_EMBMEM_EMMC_)) +// System_OnStrgInit_PS(); //because ps uses filesys in this case, so ps init was moved here. +// Load_MenuInfo(); +// #else +// Load_MenuInfo(); //reset value cause the FL_FSStatus as '0', we do so before NVTEVT_STRG_ATTACH finish +// #endif +// #endif #endif //#NT#2016/12/14#Niven Cho -end #if (BOOT_RESET_MENU_INFO == ENABLE) diff --git a/code/application/source/cardv/SrcCode/System/SysMain_cmd.c b/code/application/source/cardv/SrcCode/System/SysMain_cmd.c index 814ef68dd..868b25067 100755 --- a/code/application/source/cardv/SrcCode/System/SysMain_cmd.c +++ b/code/application/source/cardv/SrcCode/System/SysMain_cmd.c @@ -281,6 +281,7 @@ SXCMD_ITEM("uiprint %", sf_cmd_para_printf, "uiprint") SXCMD_ITEM("blusw %", cmd_blu_switch, "blusw 0/1") SXCMD_ITEM("wifisw %", cmd_wifi_switch, "wifisw 0/1") SXCMD_ITEM("lcdbk %", sf_set_backlight_status, "lcdbk 0/1") +SXCMD_ITEM("sfdump %", sf_vos_perf_list_dump, "sfdump") #endif #if FS_MULTI_STRG_FUNC /* test cmd */ diff --git a/code/application/source/cardv/SrcCode/System/main.c b/code/application/source/cardv/SrcCode/System/main.c index 38f2c5cc8..8d94cf74d 100755 --- a/code/application/source/cardv/SrcCode/System/main.c +++ b/code/application/source/cardv/SrcCode/System/main.c @@ -388,6 +388,7 @@ int NvtMain(void) { #if HUNTING_CAMERA_MCU == ENABLE sf_cardv_check_power_on_mode(); + sf_cardv_load_menu_info_start(); #endif System_InstallID(); #if (USB_MODE==ENABLE) diff --git a/code/lib/source/sifar/code/include/sf_common.h b/code/lib/source/sifar/code/include/sf_common.h index 4694c25be..45c796223 100755 --- a/code/lib/source/sifar/code/include/sf_common.h +++ b/code/lib/source/sifar/code/include/sf_common.h @@ -202,4 +202,6 @@ void sf_set_cammode_statu(char is); BOOL sf_set_backlight_status(unsigned char argc, char **argv); UINT8 sf_get_net_generation(void); void sf_set_net_generation(UINT8 value); +UINT32 sf_cardv_load_menu_info_start(void); +BOOL sf_vos_perf_list_dump(unsigned char argc, char **argv); #endif diff --git a/code/lib/source/sifar/code/source/common/sf_common.c b/code/lib/source/sifar/code/source/common/sf_common.c index 668eb0c87..d235ece84 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -134,6 +134,12 @@ static SF_THREAD_S WaiParaTskCfg = .IsRun = 0, .TskId = -1, }; + +static SF_THREAD_S LoadParaTskCfg = +{ + .IsRun = 0, + .TskId = -1, +}; int sf_pir_statu_read(void) { static UINT8 state = 0; @@ -3453,4 +3459,42 @@ void sf_set_net_generation(UINT8 value) { printf("[%s:%d]value(%d) invalid,no set.\n", __FUNCTION__, __LINE__, value); } +} + +void* sf_cardv_load_menu_info_thread(void *arg) +{ + vos_perf_list_mark(__func__, __LINE__, 0); + SLOGI("thread run\n"); + LoadParaTskCfg.IsRun = 1; + Load_MenuInfo(); + SLOGI("thread end\n"); + + LoadParaTskCfg.IsRun = 0; + vos_perf_list_mark(__func__, __LINE__, 0); + return NULL; +} +UINT32 sf_cardv_load_menu_info_start(void) +{ + SINT32 ret = 1; + if(LoadParaTskCfg.IsRun) + { + SLOGE("thread has already run !!!\n"); + return 1; + } + ret = pthread_create(&LoadParaTskCfg.TskId, NULL, sf_cardv_load_menu_info_thread, NULL); + if(ret != SF_SUCCESS) + { + MLOGD("thread creat fail!\n"); + return ret; + } + return SF_SUCCESS; + +} + +BOOL sf_vos_perf_list_dump(unsigned char argc, char **argv) +{ + vos_perf_list_dump(); + sleep(1); + system("dmesg"); + return TRUE; } \ No newline at end of file From f8ef234da98272b7abf4522178ce21c3555eec73 Mon Sep 17 00:00:00 2001 From: payton Date: Wed, 3 Jan 2024 14:37:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=9B=9E=E6=94=BE?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=9C=89=E7=BA=A2=E6=9D=A1=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nvt-na51089/ide/ide_platform.c | 28 ++++++++--- .../disp_if8b_lcd1_psd200_st7789v/panel.c | 48 ++++++++++++++++++- .../disp_if8b_lcd1_psd200_st7789v/panel.c | 48 ++++++++++++++++++- .../nvt-top.dtsi | 2 +- .../cardv/SrcCode/FastFlow/flow_boot_logo.c | 18 +++---- .../disp_if8b_lcd1_psd200_st7789v/panel.c | 48 ++++++++++++++++++- 6 files changed, 169 insertions(+), 23 deletions(-) diff --git a/BSP/u-boot/drivers/video/novatek/drv_videoout/nvt-na51089/ide/ide_platform.c b/BSP/u-boot/drivers/video/novatek/drv_videoout/nvt-na51089/ide/ide_platform.c index c2992ed82..e57df4ca1 100755 --- a/BSP/u-boot/drivers/video/novatek/drv_videoout/nvt-na51089/ide/ide_platform.c +++ b/BSP/u-boot/drivers/video/novatek/drv_videoout/nvt-na51089/ide/ide_platform.c @@ -259,16 +259,30 @@ UINT32 pll_get_pll_freq(PLL_ID id) */ UINT32 pll_get_clock_rate(PLL_CLKSEL clk_sel) { - UINT32 ui_mask, ui_reg_offset; - REGVALUE reg_data; + UINT32 ui_mask, ui_reg_offset; + REGVALUE reg_data; - ui_reg_offset = 0x20; - ui_mask = (0x7<;}; ccnt{pinmux = <0x0>;}; audio{pinmux = <0x0>;}; - lcd{pinmux = <0x10000000>;}; + lcd{pinmux = <0x10000006>;};/* rgb through */ tv{pinmux = <0x0>;}; eth{pinmux = <0x0>;}; misc{pinmux = <0x0>;}; 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 b3d9d564f..18da2147c 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 @@ -405,20 +405,20 @@ static THREAD_RETTYPE thread_videoout(void *ptr) pxlfmt) != HD_OK){ goto exit; } - HD_URECT rect = (HD_URECT){0, 0, 720, 320}; +// HD_URECT rect = (HD_URECT){0, 0, 720, 320}; - //HD_URECT rect = (HD_URECT){0, 0, videoout_syscaps.output_dim.w, videoout_syscaps.output_dim.h}; - if(flow_boot_logo_videoout_set_param_in_win(path_id, rect) != HD_OK){ - goto exit; - } + HD_URECT rect = (HD_URECT){0, 0, videoout_syscaps.output_dim.w, videoout_syscaps.output_dim.h}; + if(flow_boot_logo_videoout_set_param_in_win(path_id, rect) != HD_OK){ + goto exit; + } - hd_videoout_start(path_id); + hd_videoout_start(path_id); exit: - vos_flag_set(task_param->flag, FLAG_VIDEOOUT_TASK_EXIT); + vos_flag_set(task_param->flag, FLAG_VIDEOOUT_TASK_EXIT); - LINUX_BOOT_MSG("%s exit\n", __func__); - THREAD_RETURN(0); + LINUX_BOOT_MSG("%s exit\n", __func__); + THREAD_RETURN(0); } static THREAD_RETTYPE thread_videodec(void *ptr) diff --git a/rtos/code/hdal/ext_devices/panel/display_panel/disp_if8b_lcd1_psd200_st7789v/panel.c b/rtos/code/hdal/ext_devices/panel/display_panel/disp_if8b_lcd1_psd200_st7789v/panel.c index 0bcdee274..194738662 100755 --- a/rtos/code/hdal/ext_devices/panel/display_panel/disp_if8b_lcd1_psd200_st7789v/panel.c +++ b/rtos/code/hdal/ext_devices/panel/display_panel/disp_if8b_lcd1_psd200_st7789v/panel.c @@ -237,7 +237,9 @@ const T_PANEL_CMD t_cmd_mode_rgb320[] = { const T_LCD_PARAM t_mode[] = { /*********** RGB Serial MODE *************/ { + // T_PANEL_PARAM +#if 0 { /* Old prototype */ PINMUX_LCDMODE_RGB_SERIAL, //!< LCDMode @@ -277,6 +279,48 @@ const T_LCD_PARAM t_mode[] = { 0x0A, //!< uiHSyncSYNCwidth 0x04, //!< uiVSyncSYNCwidth }, +#else + { + /* Old prototype */ + PINMUX_LCDMODE_RGB_THROUGH, //!< LCDMode +// 18000000 / 3 , //24.0f, //!< fDCLK + 5000000, +#if 1 + 1024 / 3,//PANELWIDTH + 69*2, //!< uiHSyncTotalPeriod + 720 / 3,//PANELWIDTH, //!< uiHSyncActivePeriod + 69 / 3, //!< uiHSyncBackPorch + 384,//PANELHEIGHT + 40, //!< uiVSyncTotalPeriod + 344, //!< uiVSyncActivePeriod + 2, //!< uiVSyncBackPorchOdd + 2, //!< uiVSyncBackPorchEven + 720 / 3,//320,//PANELWIDTH, //!< uiBufferWidth + 320,//720,//PANELHEIGHT, //!< uiBufferHeight + 720 / 3,//320,//PANELWIDTH, //!< uiWindowWidth + 320,//720,//PANELHEIGHT, //!< uiWindowHeight +#endif + +#if 0 + PANELWIDTH + 200, //!< uiHSyncTotalPeriod + PANELWIDTH, //!< uiHSyncActivePeriod + 10, //!< uiHSyncBackPorch + PANELHEIGHT + 140, //!< uiVSyncTotalPeriod + PANELHEIGHT, //!< uiVSyncActivePeriod + 4, //!< uiVSyncBackPorchOdd + 4, //!< uiVSyncBackPorchEven + PANELWIDTH, //!< uiBufferWidth + PANELHEIGHT, //!< uiBufferHeight + PANELWIDTH, //!< uiWindowWidth + PANELHEIGHT, //!< uiWindowHeight +#endif + + + FALSE, //!< bYCbCrFormat + + /* New added parameters */ + 0x0A, //!< uiHSyncSYNCwidth + 0x04, //!< uiVSyncSYNCwidth + }, +#endif // tIDE_PARAM { @@ -286,8 +330,8 @@ const T_LCD_PARAM t_mode[] = { {FALSE,FALSE}, //!< dithering[2]; DISPLAY_DEVICE_TOPPOLY, //!< **DONT-CARE** IDE_PDIR_RBG, //!< pdir; - IDE_LCD_G, //!< odd; - IDE_LCD_G, //!< even; + IDE_LCD_B, //!< odd; + IDE_LCD_B, //!< even; TRUE, //!< hsinv; TRUE, //!< vsinv; FALSE, //!< hvldinv; From 70dbaaad798bdd3f6241cfa230192d89049a5622 Mon Sep 17 00:00:00 2001 From: payton Date: Wed, 3 Jan 2024 14:38:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.rtos=E5=A2=9E=E5=8A=A0log=20cmd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/cardv/SrcCode/System/SysMain_cmd.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/rtos/code/application/source/cardv/SrcCode/System/SysMain_cmd.c b/rtos/code/application/source/cardv/SrcCode/System/SysMain_cmd.c index 67c32b4fc..b28800439 100644 --- a/rtos/code/application/source/cardv/SrcCode/System/SysMain_cmd.c +++ b/rtos/code/application/source/cardv/SrcCode/System/SysMain_cmd.c @@ -12,7 +12,9 @@ #endif #include #include "UIApp/AppDisp_PipView.h" - +#if HUNTING_CAMERA_MCU == ENABLE +#include "sys_fastboot.h" +#endif #define THIS_DBGLVL 2 // 0=FATAL, 1=ERR, 2=WRN, 3=UNIT, 4=FUNC, 5=IND, 6=MSG, 7=VALUE, 8=USER /////////////////////////////////////////////////////////////////////////////// #define __MODULE__ SysMainCmd @@ -201,6 +203,15 @@ static BOOL Cmd_PowerOff_Test(unsigned char argc, char **argv) return TRUE; } +#if HUNTING_CAMERA_MCU == ENABLE +static BOOL sf_log_fastboot_msg_en(unsigned char argc, char **argv) +{ + fastboot_msg_en(ENABLE); + DBG_DUMP("log ENABLE\r\n"); + return TRUE; +} +#endif + SXCMD_BEGIN(sys_cmd_tbl, "system command") SXCMD_ITEM("mem %", cmd_sys_mem, "system memory layout") SXCMD_ITEM("pip %", Cmd_user_pip, "pip view style") @@ -214,7 +225,9 @@ SXCMD_ITEM("curl", Cmd_user_CurlTest, "curl command test") #endif SXCMD_ITEM("power_off %", Cmd_PowerOff_Test, "flowpreview power off test") - +#if HUNTING_CAMERA_MCU == ENABLE +SXCMD_ITEM("log %", sf_log_fastboot_msg_en, "log on") +#endif SXCMD_END()