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

AM fix update, RSSI bar graphs now include gain compensation

Browse Source
This commit is contained in:
OneOfEleven
2023-09-23 03:28:21 +01:00
parent 2643d197c6
commit d874893a50
10 changed files with 90 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ui/main.c
View File

@ -393,17 +393,17 @@ void UI_DisplayMain(void)
// dBm
//
// this doesn't yet quite fit into the available screen space
const uint16_t rssi = gVFO_RSSI[vfo_num];
const int16_t rssi = gVFO_RSSI[vfo_num];
if (rssi > 0)
{
const int16_t dBm = (int16_t)(rssi / 2) - 160;
const int16_t dBm = (rssi / 2) - 160;
sprintf(String, "%-3d", dBm);
UI_PrintStringSmall(String, 2, 0, Line + 2);
}
#else
// bar graph
if (gVFO_RSSI_Level[vfo_num] > 0)
Level = gVFO_RSSI_Level[vfo_num];
if (gVFO_RSSI_bar_level[vfo_num] > 0)
Level = gVFO_RSSI_bar_level[vfo_num];
#endif
}

17
ui/rssi.c
View File

@ -28,7 +28,7 @@
#ifdef ENABLE_DBM
void UI_UpdateRSSI(uint16_t RSSI)
void UI_UpdateRSSI(const int16_t RSSI)
{ // dBm
//
// this doesn't yet quite fit into the available screen space
@ -39,12 +39,11 @@ void UI_UpdateRSSI(uint16_t RSSI)
if (gEeprom.KEY_LOCK && gKeypadLocked > 0)
return; // the screen is currently in use
gVFO_RSSI[gEeprom.RX_CHANNEL] = RSSI;
gVFO_RSSI_Level[gEeprom.RX_CHANNEL] = 0;
gVFO_RSSI[gEeprom.RX_CHANNEL] = RSSI;
gVFO_RSSI_bar_level[gEeprom.RX_CHANNEL] = 0;
if (RSSI > 0)
{ // drop the '.5'
const int16_t dBm = (int16_t)(RSSI / 2) - 160;
const int16_t dBm = (RSSI / 2) - 160;
sprintf(s, "%-3d", dBm);
}
else
@ -105,11 +104,11 @@ void Render(const uint8_t rssi, const uint8_t RssiLevel, const uint8_t VFO)
ST7565_DrawLine(0, Line, 23, pLine);
}
void UI_UpdateRSSI(uint16_t RSSI)
void UI_UpdateRSSI(const int16_t RSSI)
{
gVFO_RSSI[gEeprom.RX_CHANNEL] = RSSI;
//const int16_t dBm = (int16_t)(RSSI / 2) - 160;
//const int16_t dBm = (RSSI / 2) - 160;
#if 0
//const unsigned int band = gRxVfo->Band;
@ -144,9 +143,9 @@ void UI_UpdateRSSI(uint16_t RSSI)
else
if (RSSI >= level0) Level = 1;
if (gVFO_RSSI_Level[gEeprom.RX_CHANNEL] != Level)
if (gVFO_RSSI_bar_level[gEeprom.RX_CHANNEL] != Level)
{
gVFO_RSSI_Level[gEeprom.RX_CHANNEL] = Level;
gVFO_RSSI_bar_level[gEeprom.RX_CHANNEL] = Level;
Render(RSSI, Level, gEeprom.RX_CHANNEL);
}
}

2
ui/rssi.h
View File

@ -17,7 +17,7 @@
#ifndef UI_RSSI_H
#define UI_RSSI_H
void UI_UpdateRSSI(uint16_t RSSI);
void UI_UpdateRSSI(const int16_t RSSI);
#endif