diff --git a/Makefile b/Makefile index 93b0ce3..06f9884 100644 --- a/Makefile +++ b/Makefile @@ -29,14 +29,14 @@ ENABLE_NOAA := 0 ENABLE_VOICE := 0 ENABLE_MUTE_RADIO_FOR_VOICE := 0 # Tx on Voice 1.0 kB -ENABLE_VOX := 1 +ENABLE_VOX := 0 ENABLE_VOX_MORE_SENSITIVE := 1 ENABLE_REDUCE_LOW_MID_TX_POWER := 1 # Tx Alarm 600 B ENABLE_ALARM := 0 ENABLE_TX1750 := 0 # MDC1200 2.8 kB -ENABLE_MDC1200 := 0 +ENABLE_MDC1200 := 1 ENABLE_MDC1200_SHOW_OP_ARG := 1 ENABLE_PWRON_PASSWORD := 0 ENABLE_RESET_AES_KEY := 0 diff --git a/app/main.c b/app/main.c index 231de64..79f1561 100644 --- a/app/main.c +++ b/app/main.c @@ -359,9 +359,7 @@ void processFKeyFunction(const key_code_t Key) g_vfo_configure_mode = VFO_CONFIGURE_RELOAD; #else - #ifdef ENABLE_VOX - toggle_chan_scanlist(); - #endif + toggle_chan_scanlist(); #endif break; @@ -381,9 +379,8 @@ void processFKeyFunction(const key_code_t Key) #ifdef ENABLE_VOX APP_stop_scan(); - ACTION_Vox(); - #else + #elif defined(ENABLE_NOAA) toggle_chan_scanlist(); #endif diff --git a/firmware.bin b/firmware.bin index 865c62f..a5fc0b2 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index 8f60a63..8c025be 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ diff --git a/main.c b/main.c index 11caa94..33fc5cf 100644 --- a/main.c +++ b/main.c @@ -52,22 +52,12 @@ #include "ui/status.h" #include "version.h" -void MAIN_DisplayClear(void) +void MAIN_DisplayInitScreen(void) { memset(g_status_line, 0, sizeof(g_status_line)); memset(g_frame_buffer, 0, sizeof(g_frame_buffer)); - ST7565_BlitStatusLine(); - ST7565_BlitFullScreen(); -} - -void MAIN_DisplayReadingEEPROM(void) -{ - memset(g_status_line, 0, sizeof(g_status_line)); - memset(g_frame_buffer, 0, sizeof(g_frame_buffer)); - - UI_PrintString("READING", 0, LCD_WIDTH, 1, 10); - UI_PrintString("EEPROM", 0, LCD_WIDTH, 3, 10); + UI_PrintString("UV-K5(8)/K6", 0, LCD_WIDTH, 2, 10); ST7565_BlitStatusLine(); ST7565_BlitFullScreen(); @@ -75,13 +65,13 @@ void MAIN_DisplayReadingEEPROM(void) 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(); } @@ -91,7 +81,7 @@ void MAIN_DisplayWelcome(void) char str1[17]; char str2[17]; - 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)); if (g_eeprom.config.setting.power_on_display_mode == PWR_ON_DISPLAY_MODE_NONE) @@ -137,12 +127,7 @@ void MAIN_DisplayWelcome(void) UI_PrintStringSmall(__DATE__, 0, LCD_WIDTH, 5); UI_PrintStringSmall(__TIME__, 0, LCD_WIDTH, 6); - #if 1 - ST7565_BlitStatusLine(); // blank status line - #else - UI_DisplayStatus(true); // show all status line symbols (test) - #endif - +// ST7565_BlitStatusLine(); ST7565_BlitFullScreen(); } } @@ -189,11 +174,11 @@ 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 + MAIN_DisplayInitScreen(); + // load the entire EEPROM contents into memory -// GPIO_SetBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); // backlight on - MAIN_DisplayReadingEEPROM(); SETTINGS_read_eeprom(); - MAIN_DisplayClear(); FREQUENCY_init(); @@ -248,7 +233,6 @@ void Main(void) KEYBOARD_Poll() != KEY_INVALID || BootMode != BOOT_MODE_NORMAL) { - GPIO_SetBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); // backlight on MAIN_DisplayReleaseKeys(); i = 0; while (i < (500 / 10)) // 500ms