0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-06-19 14:48:03 +03:00

Added 'make clean' to win_make.bat

This commit is contained in:
OneOfEleven
2023-09-27 17:29:49 +01:00
parent b0794ec582
commit 470297ea25
8 changed files with 109 additions and 110 deletions

View File

@ -15,6 +15,7 @@
*/
#include <string.h>
#include <stdlib.h> // abs()
#include "app/dtmf.h"
#ifdef ENABLE_AM_FIX_SHOW_DATA
@ -425,13 +426,12 @@ void UI_DisplayMain(void)
// dBm
//
// this doesn't yet quite fit into the available screen space
const int16_t rssi = gVFO_RSSI[vfo_num];
if (rssi > 0)
{
const int16_t dBm = (rssi / 2) - 160;
sprintf(String, "%-3d", dBm);
UI_PrintStringSmall(String, 2, 0, Line + 2);
}
// I suppose the '-' sign could be dropped
//
const int16_t dBm = (gVFO_RSSI[vfo_num] / 2) - 160;
sprintf(String, "%-3d", dBm);
//sprintf(String, "%3d", abs(dBm));
UI_PrintStringSmall(String, 2, 0, Line + 2);
#else
// bar graph
if (gVFO_RSSI_bar_level[vfo_num] > 0)

View File

@ -15,6 +15,7 @@
*/
#include <string.h>
#include <stdlib.h> // abs()
#include "bitmaps.h"
#include "driver/st7565.h"
@ -29,9 +30,11 @@
#ifdef ENABLE_DBM
void UI_UpdateRSSI(const int16_t rssi, const int vfo)
{ // dBm
{
// dBm
//
// this doesn't yet quite fit into the available screen space
// I suppose the '-' sign could be dropped
char s[8];
const uint8_t line = (vfo == 0) ? 3 : 7;
@ -42,9 +45,10 @@ void UI_UpdateRSSI(const int16_t rssi, const int vfo)
gVFO_RSSI[vfo] = rssi;
gVFO_RSSI_bar_level[vfo] = 0;
{ // drop the '.5'
{ // drop the '.5' bit
const int16_t dBm = (rssi / 2) - 160;
sprintf(s, "%-3d", dBm);
// sprintf(s, "%3d", abs(dBm));
}
else
strcpy(s, " ");
@ -113,19 +117,19 @@ void UI_UpdateRSSI(const int16_t rssi, const int vfo)
#if 0
//const unsigned int band = gRxVfo->Band;
const unsigned int band = 0;
const uint16_t level0 = gEEPROM_RSSI_CALIB[band][0];
const uint16_t level1 = gEEPROM_RSSI_CALIB[band][1];
const uint16_t level2 = gEEPROM_RSSI_CALIB[band][2];
const uint16_t level3 = gEEPROM_RSSI_CALIB[band][3];
const int16_t level0 = gEEPROM_RSSI_CALIB[band][0];
const int16_t level1 = gEEPROM_RSSI_CALIB[band][1];
const int16_t level2 = gEEPROM_RSSI_CALIB[band][2];
const int16_t level3 = gEEPROM_RSSI_CALIB[band][3];
#else
const uint16_t level0 = (-115 + 160) * 2; // dB
const uint16_t level1 = ( -89 + 160) * 2; // dB
const uint16_t level2 = ( -64 + 160) * 2; // dB
const uint16_t level3 = ( -39 + 160) * 2; // dB
const int16_t level0 = (-115 + 160) * 2; // dB
const int16_t level1 = ( -89 + 160) * 2; // dB
const int16_t level2 = ( -64 + 160) * 2; // dB
const int16_t level3 = ( -39 + 160) * 2; // dB
#endif
const uint16_t level01 = (level0 + level1) / 2;
const uint16_t level12 = (level1 + level2) / 2;
const uint16_t level23 = (level2 + level3) / 2;
const int16_t level01 = (level0 + level1) / 2;
const int16_t level12 = (level1 + level2) / 2;
const int16_t level23 = (level2 + level3) / 2;
uint8_t Level = 0;