mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-06-19 06:39:49 +03:00
Code Issues Releases Activity

bug fix

Browse Source
This commit is contained in:
OneOfEleven
2023-09-09 20:45:38 +01:00
parent 6eaac5ce88
commit 5bc11d6674
8 changed files with 630 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ui/main.c
View File

@ -103,9 +103,7 @@ void UI_DisplayMain(void)
}
}
else
{
sprintf(String, ">%s", gDTMF_InputBox);
}
UI_PrintString(String, 2, 127, i * 3, 8, false);
@ -133,6 +131,7 @@ void UI_DisplayMain(void)
if (gDTMF_IsTx)
sprintf(String, ">%s", gDTMF_String);
}
UI_PrintString(String, 2, 127, 2 + (i * 3), 8, false);
continue;
}
@ -143,7 +142,7 @@ void UI_DisplayMain(void)
else
{
if (bIsSameVfo)
memcpy(pLine0 + 2, BITMAP_VFO_Default, sizeof(BITMAP_VFO_Default));
memcpy(pLine0 + 2, BITMAP_VFO_Default, sizeof(BITMAP_VFO_Default));
else
memcpy(pLine0 + 2, BITMAP_VFO_NotDefault, sizeof(BITMAP_VFO_NotDefault));
}
@ -176,6 +175,7 @@ void UI_DisplayMain(void)
else
{
SomeValue = 2;
if ((gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR) && gEeprom.RX_CHANNEL == i)
memcpy(pLine0 + 14, BITMAP_RX, sizeof(BITMAP_RX));
}
@ -234,6 +234,7 @@ void UI_DisplayMain(void)
uint8_t Width = 10;
memset(String, 0, sizeof(String));
switch (State)
{
case 1:
@ -316,9 +317,7 @@ void UI_DisplayMain(void)
UI_PrintString(String, 31, 112, i * 4, 8, true);
}
else
{
UI_PrintString(gEeprom.VfoInfo[i].Name, 31, 112, i * 4, 8, true);
}
break;
}
}
@ -344,8 +343,10 @@ void UI_DisplayMain(void)
if (IS_MR_CHANNEL(gEeprom.ScreenChannel[i]))
{
const uint8_t Attributes = gMR_ChannelAttributes[gEeprom.ScreenChannel[i]];
if (Attributes & MR_CH_SCANLIST1)
memcpy(pLine0 + 113, BITMAP_ScanList, sizeof(BITMAP_ScanList));
if (Attributes & MR_CH_SCANLIST2)
memcpy(pLine0 + 120, BITMAP_ScanList, sizeof(BITMAP_ScanList));
}
@ -360,13 +361,13 @@ void UI_DisplayMain(void)
if (SomeValue == 1)
{
if (gRxVfo->OUTPUT_POWER == OUTPUT_POWER_LOW)
Level = 2;
else
if (gRxVfo->OUTPUT_POWER == OUTPUT_POWER_MID)
Level = 4;
else
Level = 6;
if (gRxVfo->OUTPUT_POWER == OUTPUT_POWER_LOW)
Level = 2;
else
if (gRxVfo->OUTPUT_POWER == OUTPUT_POWER_MID)
Level = 4;
else
Level = 6;
}
else
if (SomeValue == 2)
@ -409,10 +410,7 @@ void UI_DisplayMain(void)
{
const FREQ_Config_t *pConfig;
if (SomeValue == 1)
pConfig = gEeprom.VfoInfo[i].pTX;
else
pConfig = gEeprom.VfoInfo[i].pRX;
pConfig = (SomeValue == 1) ? gEeprom.VfoInfo[i].pTX : gEeprom.VfoInfo[i].pRX;
switch (pConfig->CodeType)
{

16
ui/rssi.c
View File

@ -35,12 +35,12 @@ static void Render(uint8_t RssiLevel, uint8_t VFO)
if (VFO == 0)
{
pLine = gFrameBuffer[2];
Line = 3;
Line = 3;
}
else
{
pLine = gFrameBuffer[6];
Line = 7;
Line = 7;
}
memset(pLine, 0, 23);
@ -54,15 +54,15 @@ static void Render(uint8_t RssiLevel, uint8_t VFO)
{
memcpy(pLine, BITMAP_Antenna, 5);
memcpy(pLine + 5, BITMAP_AntennaLevel1, sizeof(BITMAP_AntennaLevel1));
if (RssiLevel >= 2)
if (RssiLevel >= 2) // 2
memcpy(pLine + 8, BITMAP_AntennaLevel2, sizeof(BITMAP_AntennaLevel2));
if (RssiLevel >= 3)
if (RssiLevel >= 3) // 3
memcpy(pLine + 11, BITMAP_AntennaLevel3, sizeof(BITMAP_AntennaLevel3));
if (RssiLevel >= 4)
if (RssiLevel >= 4) // 4
memcpy(pLine + 14, BITMAP_AntennaLevel4, sizeof(BITMAP_AntennaLevel4));
if (RssiLevel >= 5)
if (RssiLevel >= 5) // 5
memcpy(pLine + 17, BITMAP_AntennaLevel5, sizeof(BITMAP_AntennaLevel5));
if (RssiLevel >= 6)
if (RssiLevel >= 6) // 6
memcpy(pLine + 20, BITMAP_AntennaLevel6, sizeof(BITMAP_AntennaLevel6));
bIsClearMode = false;
@ -87,6 +87,8 @@ void UI_UpdateRSSI(uint16_t RSSI)
if (RSSI >= gEEPROM_RSSI_CALIB[gRxVfo->Band][0])
Level = 1;
//const int16_t dB = (int16_t)(RSSI / 2) - 160;
if (gVFO_RSSI_Level[gEeprom.RX_CHANNEL] != Level)
{
gVFO_RSSI_Level[gEeprom.RX_CHANNEL] = Level;