BRNSystems/brnQuanFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Air Copy UI refactoring

Browse Source
This commit is contained in:
Armel FAUVEAU
2024-08-11 07:06:33 +02:00
parent f42de8f7c3
commit bf85a444d0
3 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -6,7 +6,7 @@
# ---- STOCK QUANSHENG FERATURES ---- # ---- STOCK QUANSHENG FERATURES ----
ENABLE_FMRADIO ?= 0 ENABLE_FMRADIO ?= 0
ENABLE_UART ?= 1 ENABLE_UART ?= 1
ENABLE_AIRCOPY ?= 0 ENABLE_AIRCOPY ?= 1
ENABLE_NOAA ?= 0 ENABLE_NOAA ?= 0
ENABLE_VOICE ?= 0 ENABLE_VOICE ?= 0
ENABLE_VOX ?= 1 ENABLE_VOX ?= 1

2
helper/boot.c
View File

@@ -101,6 +101,8 @@ void BOOT_ProcessMode(BOOT_Mode_t Mode)
gAircopyState = AIRCOPY_READY; gAircopyState = AIRCOPY_READY;
gEeprom.BACKLIGHT_TIME = 61;
GUI_SelectNextDisplay(DISPLAY_AIRCOPY); GUI_SelectNextDisplay(DISPLAY_AIRCOPY);
} }
#endif #endif

40
ui/aircopy.c
View File

@@ -27,10 +27,16 @@
#include "ui/helper.h" #include "ui/helper.h"
#include "ui/inputbox.h" #include "ui/inputbox.h"
static int8_t map(int8_t x, int8_t in_min, int8_t in_max, int8_t out_min, int8_t out_max) {
return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
}
void UI_DisplayAircopy(void) void UI_DisplayAircopy(void)
{ {
char String[16] = { 0 }; char String[16] = { 0 };
char *pPrintStr = { 0 }; char *pPrintStr = { 0 };
static bool crc[120] = { 0 };
static uint8_t lErrorsDuringAirCopy = 0;
UI_DisplayClear(); UI_DisplayClear();
@@ -60,11 +66,39 @@ void UI_DisplayAircopy(void)
memset(String, 0, sizeof(String)); memset(String, 0, sizeof(String));
if (gAirCopyIsSendMode == 0) { if (gAirCopyIsSendMode == 0) {
sprintf(String, "RCV:%u E:%u", gAirCopyBlockNumber, gErrorsDuringAirCopy); sprintf(String, "RCV:%02d%% E:%02d", map(gAirCopyBlockNumber + gErrorsDuringAirCopy, 0, 120, 0, 100), gErrorsDuringAirCopy);
} else if (gAirCopyIsSendMode == 1) { } else if (gAirCopyIsSendMode == 1) {
sprintf(String, "SND:%u", gAirCopyBlockNumber); sprintf(String, "SND:%02d%%", map(gAirCopyBlockNumber + gErrorsDuringAirCopy, 0, 120, 0, 100));
} }
UI_PrintString(String, 2, 127, 4, 8); UI_PrintString(String, 2, 127, 5, 8);
// Draw gauge
gFrameBuffer[4][2] = 0xff;
for(uint8_t i = 1; i <= 122; i++)
{
gFrameBuffer[4][2 + i] = 0x81;
}
if(gAirCopyBlockNumber + gErrorsDuringAirCopy != 0)
{
// Check CRC
if(gErrorsDuringAirCopy != lErrorsDuringAirCopy)
{
crc[gAirCopyBlockNumber + gErrorsDuringAirCopy - 1] = 1;
lErrorsDuringAirCopy = gErrorsDuringAirCopy;
}
for(uint8_t i = 0; i < (gAirCopyBlockNumber + gErrorsDuringAirCopy); i++)
{
if(crc[i] == 0)
{
gFrameBuffer[4][i + 4] = 0xbd;
}
}
}
gFrameBuffer[4][125] = 0xff;
ST7565_BlitFullScreen(); ST7565_BlitFullScreen();
} }