diff --git a/app/app.c b/app/app.c index b5d7e2f..1a87824 100644 --- a/app/app.c +++ b/app/app.c @@ -1330,7 +1330,7 @@ void APP_CheckKeys(void) g_ptt_debounce_counter = 0; // ***************** - + // scan the hardware keys Key = KEYBOARD_Poll(); @@ -1345,6 +1345,12 @@ void APP_CheckKeys(void) g_boot_counter_10ms = 0; // cancel boot screen/beeps + if (g_serial_config_count_down_500ms > 0) + { + g_boot_counter_10ms = 0; // cancel the boot-up screen + return; // the PC is uploading/downloading config + } + if (g_key_reading_0 != Key) { // new key pressed diff --git a/app/uart.c b/app/uart.c index 189b07b..c5d19f9 100644 --- a/app/uart.c +++ b/app/uart.c @@ -39,6 +39,7 @@ #include "sram-overlay.h" #endif #include "version.h" +#include "ui/ui.h" #define DMA_INDEX(x, y) (((x) + (y)) % sizeof(UART_DMA_Buffer)) @@ -238,7 +239,11 @@ static void CMD_0514(const uint8_t *pBuffer) g_serial_config_count_down_500ms = serial_config_count_down_500ms; // turn the LCD backlight off - GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); +// GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); + + // show message + g_request_display_screen = DISPLAY_MAIN; + g_update_display = true; SendVersion(); } @@ -413,7 +418,11 @@ static void CMD_052F(const uint8_t *pBuffer) Timestamp = pCmd->Timestamp; // turn the LCD backlight off - GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); +// GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); + + // show message + g_request_display_screen = DISPLAY_MAIN; + g_update_display = true; SendVersion(); } diff --git a/firmware.bin b/firmware.bin deleted file mode 100644 index c06c30e..0000000 Binary files a/firmware.bin and /dev/null differ diff --git a/firmware.packed.bin b/firmware.packed.bin deleted file mode 100644 index 07e3635..0000000 Binary files a/firmware.packed.bin and /dev/null differ