power-on screen

Makefile

@@ -81,7 +81,7 @@ ENABLE_TX_AUDIO_BAR              := 0
 ENABLE_SIDE_BUTT_MENU            := 0
 # Key Lock 400 B
 ENABLE_KEYLOCK                   := 0
-#ENABLE_PANADAPTER               := 0
+ENABLE_PANADAPTER                := 0
 #ENABLE_SINGLE_VFO_CHAN          := 0
 
 #############################################################
@@ -181,7 +181,7 @@ ifeq ($(ENABLE_SCAN_IGNORE_LIST),1)
 	OBJS += freq_ignore.o
 endif
 ifeq ($(ENABLE_PANADAPTER),1)
-	OBJS += app/spectrum.o
+//	OBJS += app/spectrum.o
 endif
 ifeq ($(ENABLE_UART),1)
 	OBJS += app/uart.o

main.c

@@ -52,84 +52,97 @@
 #include "ui/status.h"
 #include "version.h"
 
-void MAIN_DisplayInitScreen(void)
-{
-	memset(g_status_line,  0, sizeof(g_status_line));
-	memset(g_frame_buffer, 0, sizeof(g_frame_buffer));
-
-	UI_PrintString("UV-K5(8)/K6", 0, LCD_WIDTH, 2, 10);
-
-	ST7565_BlitStatusLine();
-	ST7565_BlitFullScreen();
-}
-
 void MAIN_DisplayReleaseKeys(void)
 {
-//	memset(g_status_line,  0, sizeof(g_status_line));
+	memset(g_status_line,  0, sizeof(g_status_line));
 	memset(g_frame_buffer, 0, sizeof(g_frame_buffer));
 
 	UI_PrintString("RELEASE",  0, LCD_WIDTH, 1, 10);
 	UI_PrintString("ALL KEYS", 0, LCD_WIDTH, 3, 10);
 
-//	ST7565_BlitStatusLine();  // blank status line
+	ST7565_BlitStatusLine();  // blank status line
 	ST7565_BlitFullScreen();
+
+	GPIO_SetBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);  // backlight on
 }
 
-void MAIN_DisplayWelcome(void)
+void MAIN_DisplayPowerOn(void)
 {
 	char str0[17];
 	char str1[17];
 	char str2[17];
 	
-//	memset(g_status_line,  0, sizeof(g_status_line));
+	unsigned int slen = strlen(Version_str);
+	if (slen > (sizeof(str2) - 1))
+		slen =  sizeof(str2) - 1;
+
+	memset(g_status_line,  0, sizeof(g_status_line));
 	memset(g_frame_buffer, 0, sizeof(g_frame_buffer));
 
-	if (g_eeprom.config.setting.power_on_display_mode == PWR_ON_DISPLAY_MODE_NONE)
+	memset(str0, 0, sizeof(str0));
-	{
+	memset(str1, 0, sizeof(str1));
-		ST7565_FillScreen(0xFF);
+	memset(str2, 0, sizeof(str2));
-	}
-	else
-	if (g_eeprom.config.setting.power_on_display_mode == PWR_ON_DISPLAY_MODE_FULL_SCREEN)
-	{
-		ST7565_FillScreen(0xFF);
-	}
-	else
-	{
-		unsigned int slen = strlen(Version_str);
-		if (slen > (sizeof(str2) - 1))
-			slen =  sizeof(str2) - 1;
 
-		memset(str0, 0, sizeof(str0));
+	EEPROM_ReadBuffer(0x0E90, ((uint8_t *)&g_eeprom) + 0x0E90, 16);
-		memset(str1, 0, sizeof(str1));
+
-		memset(str2, 0, sizeof(str2));
+	switch (g_eeprom.config.setting.power_on_display_mode)
+	{
+		case PWR_ON_DISPLAY_MODE_FULL_SCREEN:
+			ST7565_FillScreen(0xFF);
+			break;
+
+		case PWR_ON_DISPLAY_MODE_VOLTAGE:
+			EEPROM_ReadBuffer(0x1F40, &g_eeprom.calib.battery, 16);
+
+			{
+				unsigned int i;
+				for (i = 0; i < ARRAY_SIZE(g_battery_voltages); i++)
+					BOARD_ADC_GetBatteryInfo(&g_battery_voltages[i], &g_usb_current);
+				BATTERY_GetReadings(false);
+			}
 
-		if (g_eeprom.config.setting.power_on_display_mode == PWR_ON_DISPLAY_MODE_VOLTAGE)
-		{
 			strcpy(str0, "VOLTAGE");
 			sprintf(str1, "%u.%02uV %u%%",
 				g_battery_voltage_average / 100,
 				g_battery_voltage_average % 100,
 				BATTERY_VoltsToPercent(g_battery_voltage_average));
-		}
+
-		else
+			memcpy(str2, Version_str, slen);
-		{
+			break;
-			//EEPROM_ReadBuffer(0x0EB0, str0, 16);
+
-			//sEEPROM_ReadBuffer(0x0EC0, str1, 16);
+		case PWR_ON_DISPLAY_MODE_MESSAGE:
+			EEPROM_ReadBuffer(0x0EB0, ((uint8_t *)&g_eeprom) + 0x0EB0, 32);
 			memcpy(str0, g_eeprom.config.setting.welcome_line[0], 16);
 			memcpy(str1, g_eeprom.config.setting.welcome_line[1], 16);
-		}
+			memcpy(str2, Version_str, slen);
+			break;
 
-		memcpy(str2, Version_str, slen);
+		case PWR_ON_DISPLAY_MODE_NONE:
+			break;
 
+		default:
+			UI_PrintString("UV-K5(8)/K6", 0, LCD_WIDTH, 2, 10);
+			break;
+	}
+
+	if (g_eeprom.config.setting.power_on_display_mode != PWR_ON_DISPLAY_MODE_NONE &&
+	    g_eeprom.config.setting.power_on_display_mode != PWR_ON_DISPLAY_MODE_FULL_SCREEN)
+	{
 		UI_PrintString(str0, 0, LCD_WIDTH, 0, 10);
 		UI_PrintString(str1, 0, LCD_WIDTH, 2, 10);
 		UI_PrintStringSmall(str2, 0, LCD_WIDTH, 4);
 		UI_PrintStringSmall(__DATE__, 0, LCD_WIDTH, 5);
 		UI_PrintStringSmall(__TIME__, 0, LCD_WIDTH, 6);
+	}
 
-//		ST7565_BlitStatusLine();
+	if (g_eeprom.config.setting.power_on_display_mode != PWR_ON_DISPLAY_MODE_FULL_SCREEN)
+	{
+		ST7565_BlitStatusLine();
 		ST7565_BlitFullScreen();
 	}
+
+	if (g_eeprom.config.setting.power_on_display_mode != PWR_ON_DISPLAY_MODE_NONE)
+		GPIO_SetBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);  // backlight on
 }
 
 void Main(void)
@@ -174,8 +187,16 @@ void Main(void)
 	BootMode = BOOT_GetMode();
 	g_unhide_hidden = (BootMode == BOOT_MODE_UNHIDE_HIDDEN); // flag to say include the hidden menu items
 
-	GPIO_SetBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);  // backlight on
+	if (!GPIO_CheckBit(&GPIOC->DATA, GPIOC_PIN_PTT) ||
-	MAIN_DisplayInitScreen();
+	     KEYBOARD_Poll() != KEY_INVALID ||
+		 BootMode != BOOT_MODE_NORMAL)
+	{
+		MAIN_DisplayReleaseKeys();
+	}
+	else
+	{
+		MAIN_DisplayPowerOn();
+	}
 
 	// load the entire EEPROM contents into memory
 	SETTINGS_read_eeprom();
@@ -217,7 +238,6 @@ void Main(void)
 
 	for (i = 0; i < ARRAY_SIZE(g_battery_voltages); i++)
 		BOARD_ADC_GetBatteryInfo(&g_battery_voltages[i], &g_usb_current);
-
 	BATTERY_GetReadings(false);
 
 	#if defined(ENABLE_UART) && defined(ENABLE_UART_DEBUG)
@@ -255,10 +275,10 @@ void Main(void)
 	}
 	else
 	{
-		MAIN_DisplayWelcome();
-
 		backlight_turn_on(0);
 
+		MAIN_DisplayPowerOn();
+
 		#ifdef ENABLE_VOICE
 //			AUDIO_SetVoiceID(0, VOICE_ID_WELCOME);
 //			AUDIO_PlaySingleVoice(0);