1、修改up/down按键功能为调整亮度，source按键选择信号源和返回

2、修改快捷键调整音量后，返回菜单是空菜单显示的问题，仍存在一点小问题：如果先按出主菜单，然后退出菜单后，去按亮度快捷键调节，返回之后会弹出主菜单并定位到语言设置
3、CONFIG_HDMI_NUM配置为1，只有一路HDMI
4、目前还有两个问题待修改：不能全屏显示，上电后使用亮度快捷键调节时，进度条会显示在左上角，等调出主菜单后，再使用快捷键则进度条会居中显示

aps/application/s2tek/formal/atv/atv_app.c

@@ -9989,12 +9989,14 @@ void ATVApp_VolumeKeyHandler(UINT32 dMessage, UINT8 IsCECKey)
 			}
 			AL_Setting_Read(APP_Data_UserSetting_Handle(), SYS_SET_ID_FACTHOTEL, 0,
 					sizeof(APP_SETTING_FactoryHotel_t), &(g_stFactoryHotelData));
-			if ((g_stFactoryHotelData.MaxVolume < g_stVariationalData.Volume)
-				&&(g_stFactoryHotelData.HotelModeOnOff == 1))
-			{
-				g_stVariationalData.Volume = g_stFactoryHotelData.MaxVolume;
-			}
-			APP_Audio_SetVolume((UINT32)g_stVariationalData.Volume);
+			//if ((g_stFactoryHotelData.MaxVolume < g_stVariationalData.Volume)
+			//	&&(g_stFactoryHotelData.HotelModeOnOff == 1))
+			//{
+			//	g_stVariationalData.Volume = g_stFactoryHotelData.MaxVolume;
+			//}
+
+			APP_Video_OSD_PQSet(APP_VIDEO_OSD_ITEM_BRIGHTNESS, g_stVariationalData.Volume);  //robbin
+			//APP_Audio_SetVolume((UINT32)g_stVariationalData.Volume);
 			#ifdef SUPPORT_LINEOUT_AS_HP
 			APP_Audio_SetLineoutVol((UINT32)g_stVariationalData.Volume);
 			#endif
@@ -10006,7 +10008,7 @@ void ATVApp_VolumeKeyHandler(UINT32 dMessage, UINT8 IsCECKey)
 			AL_Setting_Store(APP_Data_UserSetting_Handle(), SYS_SET_ID_VARIATIONAL,
 							 ITEM_OFFSET(APP_SETTING_Variational_t, Volume), sizeof(g_stVariationalData.Volume));
 */
-			SYSAPP_GOBJ_CreateGUIObject_WithPara(SYS_APP_ATV, APP_GUIOBJ_ADJUST, ADJUST_VOLUME);
+			SYSAPP_GOBJ_CreateGUIObject_WithPara(SYS_APP_ATV, APP_GUIOBJ_ADJUST, ADJUST_BRIGHTNESS);  //robbin
 		}
 	}
 }

aps/application/s2tek/formal/sys_common_guiobj/app_guiobj_adjust.c

@@ -2879,8 +2879,10 @@ static INT32 _APP_GUIOBJ_Adjust_OnTimerUpdate(
 		{
 
 			case ADJUST_VOLUME:
+			case ADJUST_BRIGHTNESS:
 				if(SYSAPP_GOBJ_GetLastFocusedGUIObject(SYS_APP_ATV, &dCurObjID) == 0)
 				{
+					/*  robbin  修改快捷键调整音量后，返回菜单是空菜单显示的问题
 					if (dCurObjID == APP_GUIOBJ_MAINMENU)
 					{		
 						pPostEventData->dEventID = GUI_OBJECT_SWITCH;
@@ -2893,6 +2895,9 @@ static INT32 _APP_GUIOBJ_Adjust_OnTimerUpdate(
 						pPostEventData->dEventID = GUI_OBJECT_CLOSE;
 						return GUI_OBJECT_POST_EVENT;
 					}
+					*/	
+					pPostEventData->dEventID = GUI_OBJECT_CLOSE;
+					return GUI_OBJECT_POST_EVENT;
 				}
 #ifndef CONFIG_SUPPORT_MONITOR
 			case ADJUST_HDMICEC_AMPVOLUME:
@@ -3094,7 +3099,7 @@ static INT32 _APP_GUIOBJ_Adjust_OnTimerUpdate(
 				return GUI_OBJECT_POST_EVENT;
 #endif
 #else
-			case ADJUST_BRIGHTNESS:
+			//case ADJUST_BRIGHTNESS:
 			case ADJUST_CONTRAST:
 				pPostEventData->dEventID = GUI_OBJECT_SWITCH;
 				pPostEventData->dParam1 = APP_GUIOBJ_MAINMENU;
@@ -3384,7 +3389,7 @@ static INT32 _APP_GUIOBJ_Adjust_OnEvent(UINT32 dEventID,
 		case UI_EVENT_RETURN:
 		//case UI_EVENT_EXIT:
 		case UI_EVENT_ENTER:
-			g_bCloseAllFlag = FALSE;
+			g_bCloseAllFlag = TRUE;
 			switch (g_dPara)
 			{
 			#ifndef CONFIG_SUPPORT_MONITOR
@@ -3608,6 +3613,7 @@ static INT32 _APP_GUIOBJ_Adjust_OnEvent(UINT32 dEventID,
 #endif
 				#else
 				case ADJUST_VOLUME:
+				case ADJUST_BRIGHTNESS:
 					if(SYSAPP_GOBJ_GetLastFocusedGUIObject(SYS_APP_ATV, &dCurObjID) == 0)
 					{
 						if (dCurObjID == APP_GUIOBJ_MAINMENU)
@@ -3622,9 +3628,11 @@ static INT32 _APP_GUIOBJ_Adjust_OnEvent(UINT32 dEventID,
 							pPostEventData->dEventID = GUI_OBJECT_CLOSE;
 							return GUI_OBJECT_POST_EVENT;
 						}
+						pPostEventData->dEventID = GUI_OBJECT_CLOSE;
+						return GUI_OBJECT_POST_EVENT;
 					}
 					break;
-				case ADJUST_BRIGHTNESS:
+				//case ADJUST_BRIGHTNESS:
 				case ADJUST_CONTRAST:
 					pPostEventData->dEventID = GUI_OBJECT_SWITCH;
 					pPostEventData->dParam1 = APP_GUIOBJ_MAINMENU;
@@ -3667,12 +3675,16 @@ static INT32 _APP_GUIOBJ_Adjust_OnEvent(UINT32 dEventID,
 
 		case UI_EVENT_PIP_MENU:
 		case UI_EVENT_MENU:
-			g_bCloseAllFlag = FALSE;
+			//robbin  修改快捷键调整音量后，返回菜单是空菜单显示的问题
+			//g_bCloseAllFlag = FALSE;  
+			g_bCloseAllFlag = TRUE;
 			switch (g_dPara)
 			{
 				case ADJUST_VOLUME:
+				case ADJUST_BRIGHTNESS:
 					if(SYSAPP_GOBJ_GetLastFocusedGUIObject(SYS_APP_ATV, &dCurObjID) == 0)
 					{
+						/*  robbin  修改快捷键调整音量后，返回菜单是空菜单显示的问题
 						if (dCurObjID == APP_GUIOBJ_MAINMENU)
 						{		
 							pPostEventData->dEventID = GUI_OBJECT_SWITCH;
@@ -3685,6 +3697,9 @@ static INT32 _APP_GUIOBJ_Adjust_OnEvent(UINT32 dEventID,
 							pPostEventData->dEventID = GUI_OBJECT_CLOSE;
 							return GUI_OBJECT_POST_EVENT;
 						}
+						*/	
+						pPostEventData->dEventID = GUI_OBJECT_CLOSE;
+						return GUI_OBJECT_POST_EVENT;
 					}
 #ifndef CONFIG_SUPPORT_MONITOR
 				case ADJUST_HDMICEC_AMPVOLUME:
@@ -3883,7 +3898,7 @@ static INT32 _APP_GUIOBJ_Adjust_OnEvent(UINT32 dEventID,
 					return GUI_OBJECT_POST_EVENT;
 #endif
 #else
-				case ADJUST_BRIGHTNESS:
+				//case ADJUST_BRIGHTNESS:
 				case ADJUST_CONTRAST:
 					pPostEventData->dEventID = GUI_OBJECT_SWITCH;
 					pPostEventData->dParam1 = APP_GUIOBJ_MAINMENU;
@@ -4199,6 +4214,8 @@ void APP_Adjust_Process_VolumeKeyHandler(UINT32 dMessage, UINT8 IsCECKey)
 				g_i8CurIdx -= 5;
 			else
 				g_i8CurIdx--;
+
+		    g_dPara = ADJUST_BRIGHTNESS;  //set brightness, robbin	
 			_APP_GUIOBJ_Adjust_LeftRight();
 			_APP_GUIOBJ_Adjust_UpdateProgress(-1);
 		}
@@ -4216,6 +4233,7 @@ void APP_Adjust_Process_VolumeKeyHandler(UINT32 dMessage, UINT8 IsCECKey)
 			{
 				MAINAPP_SendGlobalEvent(UI_EVENT_MUTE, 0);
 			}
+			g_dPara = ADJUST_BRIGHTNESS;  //set brightness, robbin	
 			_APP_GUIOBJ_Adjust_LeftRight();
 			_APP_GUIOBJ_Adjust_UpdateProgress(1);
 		}

aps/application/s2tek/rda_atv/sys_common_guiobj/app_guiobj_adjust.c

@@ -2724,14 +2724,17 @@ void APP_Adjust_Process_VolumeKeyHandler(UINT32 dMessage, UINT8 IsCECKey)
 	}
 	else
 	{
-		if(dMessage == UI_EVENT_VOL_DN && ((g_dPara == ADJUST_VOLUME)||(g_dPara == ADJUST_HDMICEC_AMPVOLUME)))
+		if(dMessage == UI_EVENT_VOL_DN)// && ((g_dPara == ADJUST_VOLUME)||(g_dPara == ADJUST_HDMICEC_AMPVOLUME)))
 		{
+			printf("set brightness down\n");
+			g_dPara = ADJUST_BRIGHTNESS;  //set brightness, rob
 			g_i8CurIdx--;
 			_APP_GUIOBJ_Adjust_LeftRight();
 			_APP_GUIOBJ_Adjust_UpdateProgress(-1);
 		}
-		else if(UI_EVENT_VOL_UP == dMessage  && ((g_dPara == ADJUST_VOLUME)||(g_dPara == ADJUST_HDMICEC_AMPVOLUME)))
+		else if(UI_EVENT_VOL_UP == dMessage)//  && ((g_dPara == ADJUST_VOLUME)||(g_dPara == ADJUST_HDMICEC_AMPVOLUME)))
 		{
+			printf("set brightness up\n");
 			g_i8CurIdx++;
 			//Check Range
 			AL_Setting_Read(APP_Data_UserSetting_Handle(), SYS_SET_ID_USERINFO, 0,
@@ -2741,6 +2744,7 @@ void APP_Adjust_Process_VolumeKeyHandler(UINT32 dMessage, UINT8 IsCECKey)
 			{
 				MAINAPP_SendGlobalEvent(UI_EVENT_MUTE, 0);
 			}
+			g_dPara = ADJUST_BRIGHTNESS;  //set brightness, rob
 			_APP_GUIOBJ_Adjust_LeftRight();
 			if (flag_maxVol)
 			{

aps/customer/s2tek/UTS_6710_Monitor/adaptable/keypad_mapping.c

@@ -284,7 +284,7 @@ static void _Keypad_ATV_Event_convert(UINT32 dSystemAppIndex, UINT32 *pbEvent)
 			}
 			else if (ret == SYSTEM_APP_NO_FOCUSED_GUIOBJ)
 			{
-				*pbEvent = UI_EVENT_PIC_MOD;
+				*pbEvent = UI_EVENT_VOL_UP;  //robbin
 			}
 			break;
 		case UI_EVENT_KEYPAD_DOWN:
@@ -292,14 +292,18 @@ static void _Keypad_ATV_Event_convert(UINT32 dSystemAppIndex, UINT32 *pbEvent)
 			APP_GUIOBJ_PopMsg_GetMsgType(&eType);
 			if (ret == SYSTEM_APP_SUCCESS)
 			{
-				if((dObjectID == APP_GUIOBJ_MAINMENU) || (dObjectID == APP_GUIOBJ_ADJUST) || (dObjectID == APP_GUIOBJ_SOURCE) || (dObjectID == APP_GUIOBJ_BANNER) || (dObjectID == APP_GUIOBJ_FM_FACTORYSETTING))
+				if((dObjectID == APP_GUIOBJ_MAINMENU) || (dObjectID == APP_GUIOBJ_SOURCE) || (dObjectID == APP_GUIOBJ_FM_FACTORYSETTING))
 				{
-					*pbEvent = UI_EVENT_RETURN;
+					*pbEvent = UI_EVENT_DOWN;  //robbin
+				}
+				else if(dObjectID == APP_GUIOBJ_BANNER || dObjectID == APP_GUIOBJ_ADJUST)
+				{
+					*pbEvent = UI_EVENT_LEFT;
 				}
 			}
 			else if (ret == SYSTEM_APP_NO_FOCUSED_GUIOBJ)
 			{
-				*pbEvent = UI_EVENT_PCAUTOADJ;
+				*pbEvent = UI_EVENT_VOL_DN;  //robbin
 			}
 			break;
 		case UI_EVENT_KEYPAD_SOURCE:
@@ -307,17 +311,9 @@ static void _Keypad_ATV_Event_convert(UINT32 dSystemAppIndex, UINT32 *pbEvent)
 			APP_GUIOBJ_PopMsg_GetMsgType(&eType);
 			if (ret == SYSTEM_APP_SUCCESS)
 			{
-				if((dObjectID == APP_GUIOBJ_MAINMENU)  || (dObjectID == APP_GUIOBJ_SOURCE) || (dObjectID == APP_GUIOBJ_FM_FACTORYSETTING))
-				{
-					*pbEvent = UI_EVENT_DOWN;
-				}
-				else if(dObjectID == APP_GUIOBJ_BANNER || dObjectID == APP_GUIOBJ_ADJUST)
-				{
-					*pbEvent = UI_EVENT_LEFT;
-				}
-				else
+				if((dObjectID == APP_GUIOBJ_MAINMENU) || (dObjectID == APP_GUIOBJ_ADJUST) || (dObjectID == APP_GUIOBJ_SOURCE) || (dObjectID == APP_GUIOBJ_BANNER) || (dObjectID == APP_GUIOBJ_FM_FACTORYSETTING))
 				{
-					*pbEvent = UI_EVENT_SOURCE;
+					*pbEvent = UI_EVENT_RETURN;
 				}
 			}
 			else

aps/customer/s2tek/UTS_6710_Monitor/adaptable/keypad_mapping_table.c

@@ -50,11 +50,11 @@ KEYPAD_Info_t KeypadFacInfo =
 KEYPAD_Info_t KeypadInfo = 
 {/*Keep K0 to K7*/
 	{
-		{ 0,	KEYPAD_ADC_K0,	UI_EVENT_KEYPAD_SOURCE},//K0
-		{ 0,	KEYPAD_ADC_K1,	UI_EVENT_KEYPAD_UP},//K1
-		{ 0,	KEYPAD_ADC_K2,	UI_EVENT_KEYPAD_DOWN},//K2
+		{ 0,	KEYPAD_ADC_K0,	UI_EVENT_KEYPAD_UP},//K0
+		{ 0,	KEYPAD_ADC_K1,	UI_EVENT_KEYPAD_DOWN},//K1
+		{ 0,	KEYPAD_ADC_K2,	UI_EVENT_KEYPAD_LEFT},//K2
 		{ 0,	KEYPAD_ADC_K3,	UI_EVENT_KEYPAD_RIGHT},//K3
-		{ 0,	KEYPAD_ADC_K4,	UI_EVENT_KEYPAD_LEFT},//K4
+		{ 0,	KEYPAD_ADC_K4,	UI_EVENT_KEYPAD_SOURCE},//K4
 		{ 0,	KEYPAD_ADC_K5,	UI_EVENT_KEYPAD_MENU},//K5
 		{ 0,	KEYPAD_ADC_K6,	UI_EVENT_KEYPAD_POWER},//K6
 	},

aps/customer/s2tek/UTS_6710_Monitor/boardconfig.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: KERNELVERSION
-# Thu Jul 31 22:27:08 2025
+# Fri Aug 29 03:08:41 2025
 #
 
 #
@@ -93,7 +93,7 @@ CONFIG_FLASH_KEYSTORAGE_ALIGNMENT_4K=y
 #
 # HDMI setting
 #
-CONFIG_HDMI_NUM=2
+CONFIG_HDMI_NUM=1
 CONFIG_HDMI_SWITCH=0x00
 CONFIG_HDMI_PORT_MAP=0x012
 CONFIG_HDMIHPDInvertMap=0x00

aps/include/project.h

@@ -36,7 +36,7 @@
 #define CONFIG_SPI_SIMFS_FLASHSIZE 128
 #define CONFIG_FLASH_KEYSTORAGE_END_OFFSET 0x7e0000
 #define CONFIG_FLASH_KEYSTORAGE_ALIGNMENT_4K
-#define CONFIG_HDMI_NUM 2
+#define CONFIG_HDMI_NUM 1
 #define CONFIG_HDMI_SWITCH 0x00
 #define CONFIG_HDMI_PORT_MAP 0x012
 #define CONFIG_HDMIHPDInvertMap 0x00
@@ -176,7 +176,7 @@
 #define CONFIG_VIDEO_FORMAT 0x03FF00FF
 #define CONFIG_ROMOTE_CTL_NUM 1	/* this value is calculated by ./tools/auto_cfg.pl */
 #define CONFIG_PANEL_TYPE_NAME "CPT_M215FA_V0_1920x1080 TM121TDSG02_1024x768"	/* this value is calculated by ./tools/auto_cfg.pl */
-#define CONFIG_PANEL_NUM 2	/* this value is calculated by ./tools/auto_cfg.pl */
+#define CONFIG_PANEL_NUM 1	/* this value is calculated by ./tools/auto_cfg.pl */
 #define CONFIG_MULTI_PANELSET	/* this value is calculated by ./tools/auto_cfg.pl */
 #define CONFIG_DEFAULT_PANEL_IS_1440X900 0	
 

aps/include/timestamp.h

@@ -1,2 +1,2 @@
-#define TIMESTAMP "2025-08-12 23:41:47+08:00"
-#define TIMESTAMP_F2 "20250812_2341"
+#define TIMESTAMP "2025-10-09 22:59:05+08:00"
+#define TIMESTAMP_F2 "20251009_2259"

boardconfig.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: KERNELVERSION
-# Thu Jul 31 22:27:08 2025
+# Fri Aug 29 03:08:41 2025
 #
 
 #
@@ -93,7 +93,7 @@ CONFIG_FLASH_KEYSTORAGE_ALIGNMENT_4K=y
 #
 # HDMI setting
 #
-CONFIG_HDMI_NUM=2
+CONFIG_HDMI_NUM=1
 CONFIG_HDMI_SWITCH=0x00
 CONFIG_HDMI_PORT_MAP=0x012
 CONFIG_HDMIHPDInvertMap=0x00

project.h

@@ -36,7 +36,7 @@
 #define CONFIG_SPI_SIMFS_FLASHSIZE 128
 #define CONFIG_FLASH_KEYSTORAGE_END_OFFSET 0x7e0000
 #define CONFIG_FLASH_KEYSTORAGE_ALIGNMENT_4K
-#define CONFIG_HDMI_NUM 2
+#define CONFIG_HDMI_NUM 1
 #define CONFIG_HDMI_SWITCH 0x00
 #define CONFIG_HDMI_PORT_MAP 0x012
 #define CONFIG_HDMIHPDInvertMap 0x00
@@ -176,7 +176,7 @@
 #define CONFIG_VIDEO_FORMAT 0x03FF00FF
 #define CONFIG_ROMOTE_CTL_NUM 1	/* this value is calculated by ./tools/auto_cfg.pl */
 #define CONFIG_PANEL_TYPE_NAME "CPT_M215FA_V0_1920x1080 TM121TDSG02_1024x768"	/* this value is calculated by ./tools/auto_cfg.pl */
-#define CONFIG_PANEL_NUM 2	/* this value is calculated by ./tools/auto_cfg.pl */
+#define CONFIG_PANEL_NUM 1	/* this value is calculated by ./tools/auto_cfg.pl */
 #define CONFIG_MULTI_PANELSET	/* this value is calculated by ./tools/auto_cfg.pl */
 #define CONFIG_DEFAULT_PANEL_IS_1440X900 0