Skip to content

Commit

Permalink
PC config comms screen message update
Browse files Browse the repository at this point in the history
  • Loading branch information
OneOfEleven committed Oct 9, 2023
1 parent 6b42315 commit 7a42f33
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 3 deletions.
8 changes: 7 additions & 1 deletion app/app.c
Original file line number Diff line number Diff line change
Expand Up @@ -1330,7 +1330,7 @@ void APP_CheckKeys(void)
g_ptt_debounce_counter = 0;

// *****************

// scan the hardware keys
Key = KEYBOARD_Poll();

Expand All @@ -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

Expand Down
13 changes: 11 additions & 2 deletions app/uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down Expand Up @@ -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();
}
Expand Down Expand Up @@ -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();
}
Expand Down
Binary file removed firmware.bin
Binary file not shown.
Binary file removed firmware.packed.bin
Binary file not shown.

0 comments on commit 7a42f33

Please sign in to comment.