mirror of
https://github.com/armel/uv-k1-k5v3-firmware-custom.git
synced 2026-10-02 03:15:37 +00:00
Improve UI
This commit is contained in:
1 parent
ed6b98ce46
commit
1b170b9ff9
4 files changed
+47
-13
No files matched your search
+2
-2
@@ -130,7 +130,7 @@ void UI_PrintStringSmallNormalInverse(const char *pString, uint8_t Start, uint8_
|
||||
if (End != 0 && x_end > End)
|
||||
x_end = End;
|
||||
|
||||
gFrameBuffer[Line][x_start - 2] ^= 0x3E;
|
||||
//gFrameBuffer[Line][x_start - 2] ^= 0x3E;
|
||||
gFrameBuffer[Line][x_start - 1] ^= 0x7F;
|
||||
//gFrameBuffer[Line][x_start - 1] ^= 0xFF;
|
||||
for (uint8_t x = x_start; x < x_end; x++)
|
||||
@@ -140,7 +140,7 @@ void UI_PrintStringSmallNormalInverse(const char *pString, uint8_t Start, uint8_
|
||||
}
|
||||
//gFrameBuffer[Line][x_end + 0] ^= 0xFF;
|
||||
gFrameBuffer[Line][x_end + 0] ^= 0x7F;
|
||||
gFrameBuffer[Line][x_end + 1] ^= 0x3E;
|
||||
//gFrameBuffer[Line][x_end + 1] ^= 0x3E;
|
||||
}
|
||||
|
||||
|
||||
|
||||
+11
-6
@@ -846,7 +846,7 @@ void UI_DisplayMain(void)
|
||||
|
||||
if (IS_MR_CHANNEL(gEeprom.ScreenChannel[vfo_num]))
|
||||
{ // channel mode
|
||||
const unsigned int x = 2;
|
||||
const unsigned int x = 1;
|
||||
const bool inputting = gInputBoxIndex != 0 && gEeprom.TX_VFO == vfo_num;
|
||||
if (!inputting || gScanStateDir != SCAN_OFF)
|
||||
sprintf(String, "%04u", gEeprom.ScreenChannel[vfo_num] + 1);
|
||||
@@ -1014,9 +1014,11 @@ void UI_DisplayMain(void)
|
||||
|
||||
GUI_DisplaySmallest(displayStr, xDisplay, line == 0 ? 1 : 33, false, true);
|
||||
|
||||
for (uint8_t x = xStart; x < 128; x++) {
|
||||
gFrameBuffer[line][xStart] ^= 0x3E;
|
||||
for (uint8_t x = xStart + 1; x < 127; x++) {
|
||||
gFrameBuffer[line][x] ^= 0x7F;
|
||||
}
|
||||
gFrameBuffer[line][127] ^= 0x3E;
|
||||
|
||||
}
|
||||
else
|
||||
@@ -1083,15 +1085,15 @@ void UI_DisplayMain(void)
|
||||
}
|
||||
|
||||
if (gEeprom.CHANNEL_DISPLAY_MODE == MDF_NAME) {
|
||||
String[9] = 0;
|
||||
UI_PrintString(String, 36, 0, line, 8);
|
||||
String[10] = 0;
|
||||
UI_PrintString(String, 33, 0, line, 8);
|
||||
}
|
||||
else {
|
||||
#ifdef ENABLE_FEAT_F4HWN
|
||||
if (isMainOnly())
|
||||
{
|
||||
String[10] = 0;
|
||||
UI_PrintString(String, 36, 0, line, 8);
|
||||
UI_PrintString(String, 33, 0, line, 8);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1618,9 +1620,12 @@ void UI_DisplayMain(void)
|
||||
sprintf(String, "VFO %s", activeTxVFO ? "B" : "A");
|
||||
GUI_DisplaySmallest(String, 107, 50, false, true);
|
||||
|
||||
for (uint8_t x = 105; x < 128; x++) {
|
||||
gFrameBuffer[6][105] ^= 0x7C;
|
||||
for (uint8_t x = 106; x < 127; x++) {
|
||||
gFrameBuffer[6][x] ^= 0xFE;
|
||||
}
|
||||
gFrameBuffer[6][127] ^= 0x7C;
|
||||
|
||||
/*
|
||||
UI_PrintStringSmallBold(String, 92, 0, 6);
|
||||
for (uint8_t i = 92; i < 128; i++)
|
||||
|
||||
+8
-5
@@ -101,12 +101,12 @@ void UI_DisplayStatus()
|
||||
{
|
||||
if(gEeprom.SCAN_LIST_ENABLED==1) {
|
||||
sprintf(str, "%s+", "ALL");
|
||||
end = 19;
|
||||
end = 18;
|
||||
}
|
||||
else
|
||||
{
|
||||
sprintf(str, "%s", "ALL");
|
||||
end = 15;
|
||||
end = 14;
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -119,19 +119,22 @@ void UI_DisplayStatus()
|
||||
// Format the string
|
||||
if (nameValid) {
|
||||
sprintf(str, "%.3s%s", name, gEeprom.SCAN_LIST_ENABLED ? "+" : "");
|
||||
end = gEeprom.SCAN_LIST_ENABLED ? 19 : 15;
|
||||
end = gEeprom.SCAN_LIST_ENABLED ? 18 : 14;
|
||||
}
|
||||
else {
|
||||
sprintf(str, "%02d%s", gEeprom.SCAN_LIST_DEFAULT, gEeprom.SCAN_LIST_ENABLED ? "+" : "");
|
||||
end = gEeprom.SCAN_LIST_ENABLED ? 15 : 11;
|
||||
end = gEeprom.SCAN_LIST_ENABLED ? 14 : 10;
|
||||
}
|
||||
}
|
||||
|
||||
GUI_DisplaySmallest(str, 2, 1, true, true);
|
||||
for (uint8_t x = 0; x < end; x++)
|
||||
|
||||
gStatusLine[0] ^= 0x3E;
|
||||
for (uint8_t x = 1; x < end; x++)
|
||||
{
|
||||
gStatusLine[x] ^= 0x7F;
|
||||
}
|
||||
gStatusLine[end] ^= 0x3E;
|
||||
}
|
||||
else { // frequency mode
|
||||
memcpy(line + x + 1, gFontS, sizeof(gFontS));
|
||||
|
||||
Reference in new issue
Block a user