From 19c0c05aaee88f7ee43b79d70697fd94e4422db0 Mon Sep 17 00:00:00 2001 From: Armel FAUVEAU Date: Wed, 14 Aug 2024 04:16:58 +0200 Subject: [PATCH] Air Copy UI refactoring --- misc.c | 2 ++ misc.h | 2 ++ ui/aircopy.c | 24 +++++++++++++----------- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/misc.c b/misc.c index 75d401c..6c99d51 100644 --- a/misc.c +++ b/misc.c @@ -119,6 +119,8 @@ enum BacklightOnRxTx_t gSetting_backlight_on_tx_rx; uint8_t gDW = 0; uint8_t gCB = 0; bool gSaveRxMode = false; + uint8_t crc[15] = { 0 }; + uint8_t lErrorsDuringAirCopy = 0; #endif #ifdef ENABLE_AUDIO_BAR diff --git a/misc.h b/misc.h index fb5b4e6..9fcc6d5 100644 --- a/misc.h +++ b/misc.h @@ -171,6 +171,8 @@ extern enum BacklightOnRxTx_t gSetting_backlight_on_tx_rx; extern uint8_t gDW; extern uint8_t gCB; extern bool gSaveRxMode; + extern uint8_t crc[15]; + extern uint8_t lErrorsDuringAirCopy; #endif #ifdef ENABLE_AUDIO_BAR diff --git a/ui/aircopy.c b/ui/aircopy.c index cb0f771..88e7af0 100644 --- a/ui/aircopy.c +++ b/ui/aircopy.c @@ -39,8 +39,6 @@ void UI_DisplayAircopy(void) { char String[16] = { 0 }; char *pPrintStr = { 0 }; - static uint8_t crc[15] = { 0 }; - static uint8_t lErrorsDuringAirCopy = 0; uint16_t percent; UI_DisplayClear(); @@ -78,19 +76,23 @@ void UI_DisplayAircopy(void) } else if (gAirCopyIsSendMode == 1) { sprintf(String, "SND:%02u.%02u%%", percent / 100, percent % 100); } - UI_PrintString(String, 2, 127, 5, 8); // Draw gauge - gFrameBuffer[4][1] = 0x3c; - gFrameBuffer[4][2] = 0x42; - - for(uint8_t i = 1; i <= 122; i++) + if(gAircopyState != AIRCOPY_READY) { - gFrameBuffer[4][2 + i] = 0x81; - } + UI_PrintString(String, 2, 127, 5, 8); - gFrameBuffer[4][125] = 0x42; - gFrameBuffer[4][126] = 0x3c; + gFrameBuffer[4][1] = 0x3c; + gFrameBuffer[4][2] = 0x42; + + for(uint8_t i = 1; i <= 122; i++) + { + gFrameBuffer[4][2 + i] = 0x81; + } + + gFrameBuffer[4][125] = 0x42; + gFrameBuffer[4][126] = 0x3c; + } if(gAirCopyBlockNumber + gErrorsDuringAirCopy != 0) {