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

Removed floating point stuff

Browse Source
This commit is contained in:
OneOfEleven
2023-09-13 02:01:35 +01:00
parent 21d5d1ee15
commit 2f907f82f8
24 changed files with 146 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/aircopy.c
View File

@ -53,10 +53,10 @@ void UI_DisplayAircopy(void)
memset(String, 0, sizeof(String));
if (gAirCopyIsSendMode == 0)
sprintf(String, "RCV:%d E:%d", gAirCopyBlockNumber, gErrorsDuringAirCopy);
sprintf(String, "RCV:%u E:%u", gAirCopyBlockNumber, gErrorsDuringAirCopy);
else
if (gAirCopyIsSendMode == 1)
sprintf(String, "SND:%d", gAirCopyBlockNumber);
sprintf(String, "SND:%u", gAirCopyBlockNumber);
UI_PrintString(String, 2, 127, 4, 8);
ST7565_BlitFullScreen();

80
ui/fmradio.c
View File

@ -27,64 +27,80 @@
void UI_DisplayFM(void)
{
uint8_t i;
char String[16];
unsigned int i;
char String[16];
memset(gFrameBuffer, 0, sizeof(gFrameBuffer));
memset(String, 0, sizeof(String));
strcpy(String, "FM");
UI_PrintString(String, 0, 127, 0, 12);
memset(String, 0, sizeof(String));
if (gAskToSave) {
memset(String, 0, sizeof(String));
if (gAskToSave)
{
strcpy(String, "SAVE?");
} else if (gAskToDelete) {
}
else
if (gAskToDelete)
{
strcpy(String, "DEL?");
} else {
if (gFM_ScanState == FM_SCAN_OFF) {
if (!gEeprom.FM_IsMrMode) {
for (i = 0; i < 20; i++) {
if (gEeprom.FM_FrequencyPlaying == gFM_Channels[i]) {
sprintf(String, "VFO(CH%02d)", i + 1);
}
else
{
if (gFM_ScanState == FM_SCAN_OFF)
{
if (!gEeprom.FM_IsMrMode)
{
for (i = 0; i < 20; i++)
{
if (gEeprom.FM_FrequencyPlaying == gFM_Channels[i])
{
sprintf(String, "VFO(CH%02u)", i + 1);
break;
}
}
if (i == 20) {
if (i == 20)
strcpy(String, "VFO");
}
} else {
sprintf(String, "MR(CH%02d)", gEeprom.FM_SelectedChannel + 1);
}
} else {
if (!gFM_AutoScan) {
else
sprintf(String, "MR(CH%02u)", gEeprom.FM_SelectedChannel + 1);
}
else
{
if (!gFM_AutoScan)
strcpy(String, "M-SCAN");
} else {
sprintf(String, "A-SCAN(%d)", gFM_ChannelPosition + 1);
}
else
sprintf(String, "A-SCAN(%u)", gFM_ChannelPosition + 1);
}
}
UI_PrintString(String, 0, 127, 2, 10);
memset(String, 0, sizeof(String));
if (gAskToSave || (gEeprom.FM_IsMrMode && gInputBoxIndex)) {
memset(String, 0, sizeof(String));
if (gAskToSave || (gEeprom.FM_IsMrMode && gInputBoxIndex))
{
UI_GenerateChannelString(String, gFM_ChannelPosition);
} else if (!gAskToDelete) {
if (gInputBoxIndex == 0) {
}
else
if (!gAskToDelete)
{
if (gInputBoxIndex == 0)
{
NUMBER_ToDigits(gEeprom.FM_FrequencyPlaying * 10000, String);
UI_DisplayFrequency(String, 23, 4, false, true);
} else {
UI_DisplayFrequency(gInputBox, 23, 4, true, false);
}
else
UI_DisplayFrequency(gInputBox, 23, 4, true, false);
ST7565_BlitFullScreen();
return;
} else {
sprintf(String, "CH-%02d", gEeprom.FM_SelectedChannel + 1);
}
else
{
sprintf(String, "CH-%02u", gEeprom.FM_SelectedChannel + 1);
}
UI_PrintString(String, 0, 127, 4, 10);
ST7565_BlitFullScreen();
}

6
ui/helper.c
View File

@ -32,7 +32,7 @@ void UI_GenerateChannelString(char *pString, const uint8_t Channel)
if (gInputBoxIndex == 0)
{
sprintf(pString, "CH-%02d", Channel + 1);
sprintf(pString, "CH-%02u", Channel + 1);
return;
}
@ -54,12 +54,12 @@ void UI_GenerateChannelStringEx(char *pString, const bool bShowPrefix, const uin
}
if (bShowPrefix)
sprintf(pString, "CH-%03d", ChannelNumber + 1);
sprintf(pString, "CH-%03u", ChannelNumber + 1);
else
if (ChannelNumber == 0xFF)
strcpy(pString, "NULL");
else
sprintf(pString, "%03d", ChannelNumber + 1);
sprintf(pString, "%03u", ChannelNumber + 1);
}
void UI_PrintString(const char *pString, uint8_t Start, uint8_t End, uint8_t Line, uint8_t Width)

14
ui/main.c
View File

@ -240,7 +240,7 @@ void UI_DisplayMain(void)
strcpy(String, "ALARM");
break;
case VFO_STATE_VOLTAGE_HIGH:
sprintf(String, "VOLT HIGH");
strcpy(String, "VOLT HIGH");
//Width = 8;
break;
}
@ -290,13 +290,13 @@ void UI_DisplayMain(void)
UI_DisplaySmallDigits(2, String + 6, 112, Line + 1, true);
#else
// show the frequency in the main font
sprintf(String, "%9.5f", frequency_Hz * 0.00001);
sprintf(String, "%03u.%05u", frequency_Hz / 100000, frequency_Hz % 100000);
UI_PrintString(String, 31, 112, Line, 8);
#endif
break;
case MDF_CHANNEL: // show the channel number
sprintf(String, "CH-%03d", gEeprom.ScreenChannel[vfo_num] + 1);
sprintf(String, "CH-%03u", gEeprom.ScreenChannel[vfo_num] + 1);
UI_PrintString(String, 31, 112, Line, 8);
frequency_Hz = 0;
break;
@ -304,7 +304,7 @@ void UI_DisplayMain(void)
case MDF_NAME: // show the channel name
if (gEeprom.VfoInfo[vfo_num].Name[0] == 0 || gEeprom.VfoInfo[vfo_num].Name[0] == 0xFF)
{ // no channel name, show the channel number instead
sprintf(String, "CH-%03d", gEeprom.ScreenChannel[vfo_num] + 1);
sprintf(String, "CH-%03u", gEeprom.ScreenChannel[vfo_num] + 1);
UI_PrintString(String, 31, 112, Line, 8);
}
else
@ -317,7 +317,7 @@ void UI_DisplayMain(void)
case MDF_NAME_FREQ: // show the channel name and frequency
if (gEeprom.VfoInfo[vfo_num].Name[0] == 0 || gEeprom.VfoInfo[vfo_num].Name[0] == 0xFF)
{ // no channel name, show channel number instead
sprintf(String, "CH-%03d", gEeprom.ScreenChannel[vfo_num] + 1);
sprintf(String, "CH-%03u", gEeprom.ScreenChannel[vfo_num] + 1);
UI_PrintStringSmall(gEeprom.VfoInfo[vfo_num].Name, 31 + 8, 0, Line);
}
else
@ -332,7 +332,7 @@ void UI_DisplayMain(void)
NUMBER_ToDigits(frequency_Hz, String); // 8 digits
UI_DisplayFrequencySmall(String, 31 + 8, Line + 1, false);
#else
sprintf(String, "%9.5f", frequency_Hz * 0.00001);
sprintf(String, "%03u.%05u", frequency_Hz / 100000, frequency_Hz % 100000);
UI_PrintStringSmall(String, 31 + 8, 0, Line + 1);
#endif
@ -351,7 +351,7 @@ void UI_DisplayMain(void)
UI_DisplaySmallDigits(2, String + 6, 112, Line + 1, true);
#else
// show the frequency in the main font
sprintf(String, "%9.5f", frequency_Hz * 0.00001);
sprintf(String, "%03u.%05u", frequency_Hz / 100000, frequency_Hz % 100000);
UI_PrintString(String, 38, 112, Line, 8);
#endif
}

46
ui/menu.c
View File

@ -39,8 +39,8 @@ static const char MenuList[][7] =
"RxCTCS", // was "R_CTCS"
"TxDCS", // was "T_DCS"
"TxCTCS", // was "T_CTCS"
"SFTDir",
"Offset",
"TxDir", // was "SFT_D"
"TxOffs", // was "OFFSET"
"W/N",
"Scram", // was "SCR"
"BusyCL", // was "BCL"
@ -48,15 +48,15 @@ static const char MenuList[][7] =
"BatSav", // was "SAVE"
"VOX",
"BackLt", // was "ABR"
"Dual-W", // was "TDR"
"CrossB", // was "WX"
"DualRx", // was "TDR"
"TxVFO", // was "WX"
"Beep",
"TxTOut", // was "TOT"
#ifndef DISABLE_VOICE
"Voice",
#endif
"SC-Rev",
"MDF",
"ChDisp", // was "MDF"
"KeyLoc", // was "AUTOLk"
"S-Add1",
"S-Add2",
@ -80,7 +80,7 @@ static const char MenuList[][7] =
"PTT-ID",
"D-DCD",
"D-List",
"PonMsg",
"POnMsg",
"Roger",
"BatVol", // was "VOL"
"Mode", // was "AM"
@ -303,20 +303,18 @@ void UI_DisplayMenu(void)
switch (gMenuCursor)
{
case MENU_SQL:
sprintf(String, "%d", gSubMenuSelection);
sprintf(String, "%u", gSubMenuSelection);
break;
case MENU_MIC:
{ // display the mic gain in actual dB rather than just an index number
const uint8_t mic = gMicGain_dB2[gSubMenuSelection];
//EEPROM_ReadBuffer(0x1F80 + gSubMenuSelection, &mic, 1);
//sprintf(String, "%d %.1fdB", gSubMenuSelection, mic * 0.5);
sprintf(String, "%+.1fdB", mic * 0.5);
sprintf(String, "+%u.%01udB", mic / 2, mic % 2);
}
break;
case MENU_STEP:
sprintf(String, "%.2fKHz", gSubMenu_Step[gSubMenuSelection] * 0.01);
sprintf(String, "%u.%02uKHz", gSubMenu_Step[gSubMenuSelection] / 100, gSubMenu_Step[gSubMenuSelection] % 100);
break;
case MENU_TXP:
@ -339,7 +337,7 @@ void UI_DisplayMenu(void)
if (gSubMenuSelection == 0)
strcpy(String, "OFF");
else
sprintf(String, "%.1fHz", CTCSS_Options[gSubMenuSelection - 1] * 0.1);
sprintf(String, "%u.%uHz", CTCSS_Options[gSubMenuSelection - 1] / 10, CTCSS_Options[gSubMenuSelection - 1] % 10);
break;
case MENU_SFT_D:
@ -349,7 +347,7 @@ void UI_DisplayMenu(void)
case MENU_OFFSET:
if (!gIsInSubMenu || gInputBoxIndex == 0)
{
sprintf(String, "%.5f", gSubMenuSelection * 1e-05);
sprintf(String, "%u.%05u", gSubMenuSelection / 100000, gSubMenuSelection % 100000);
break;
}
@ -375,7 +373,7 @@ void UI_DisplayMenu(void)
if (gSubMenuSelection == 0)
strcpy(String, "OFF");
else
sprintf(String, "%d", gSubMenuSelection);
sprintf(String, "%u", gSubMenuSelection);
break;
case MENU_ABR:
@ -384,7 +382,7 @@ void UI_DisplayMenu(void)
strcpy(String, "OFF");
else
if (gSubMenuSelection < 5)
sprintf(String, "%d sec", gSubMenuSelection * 10);
sprintf(String, "%u sec", gSubMenuSelection * 10);
else
strcpy(String, "ON");
#else
@ -449,7 +447,7 @@ void UI_DisplayMenu(void)
if (gSubMenuSelection == 0)
strcpy(String, "OFF");
else
sprintf(String, "%dmin", gSubMenuSelection);
sprintf(String, "%umin", gSubMenuSelection);
break;
#ifndef DISABLE_VOICE
@ -470,11 +468,11 @@ void UI_DisplayMenu(void)
if (gSubMenuSelection == 0)
strcpy(String, "OFF");
else
sprintf(String, "%d*100ms", gSubMenuSelection);
sprintf(String, "%u*100ms", gSubMenuSelection);
break;
case MENU_S_LIST:
sprintf(String, "LIST%d", gSubMenuSelection);
sprintf(String, "LIST%u", gSubMenuSelection);
break;
#ifndef DISABLE_ALARM
@ -500,11 +498,11 @@ void UI_DisplayMenu(void)
break;
case MENU_D_HOLD:
sprintf(String, "%ds", gSubMenuSelection);
sprintf(String, "%us", gSubMenuSelection);
break;
case MENU_D_PRE:
sprintf(String, "%d*10ms", gSubMenuSelection);
sprintf(String, "%u*10ms", gSubMenuSelection);
break;
case MENU_PTT_ID:
@ -528,7 +526,7 @@ void UI_DisplayMenu(void)
break;
case MENU_VOL:
sprintf(String, "%.2fV", gBatteryVoltageAverage * 0.01); // argh, floating point :(
sprintf(String, "%u.%02uV", gBatteryVoltageAverage / 100, gBatteryVoltageAverage % 100);
break;
case MENU_RESET:
@ -642,7 +640,7 @@ void UI_DisplayMenu(void)
i = gMenuCursor - MENU_SLIST1;
if (gSubMenuSelection == 0xFF)
sprintf(String, "NULL");
strcpy(String, "NULL");
else
UI_GenerateChannelStringEx(String, true, (uint8_t)gSubMenuSelection);
@ -656,13 +654,13 @@ void UI_DisplayMenu(void)
if (IS_MR_CHANNEL(gEeprom.SCANLIST_PRIORITY_CH1[i]))
{
sprintf(String, "PRI1:%d", gEeprom.SCANLIST_PRIORITY_CH1[i] + 1);
sprintf(String, "PRI1:%u", gEeprom.SCANLIST_PRIORITY_CH1[i] + 1);
UI_PrintString(String, 50, 127, 2, 8);
}
if (IS_MR_CHANNEL(gEeprom.SCANLIST_PRIORITY_CH2[i]))
{
sprintf(String, "PRI2:%d", gEeprom.SCANLIST_PRIORITY_CH2[i] + 1);
sprintf(String, "PRI2:%u", gEeprom.SCANLIST_PRIORITY_CH2[i] + 1);
UI_PrintString(String, 50, 127, 4, 8);
}
}

8
ui/scanner.c
View File

@ -34,17 +34,17 @@ void UI_DisplayScanner(void)
memset(String, 0, sizeof(String));
if (gScanSingleFrequency || (gScanCssState != SCAN_CSS_STATE_OFF && gScanCssState != SCAN_CSS_STATE_FAILED))
sprintf(String, "FREQ:%.5f", gScanFrequency * 1e-05);
sprintf(String, "FREQ:%u.%05u", gScanFrequency / 100000, gScanFrequency % 100000);
else
sprintf(String, "FREQ:**.*****");
strcpy(String, "FREQ:**.*****");
UI_PrintString(String, 2, 0, 1, 8);
memset(String, 0, sizeof(String));
if (gScanCssState < SCAN_CSS_STATE_FOUND || !gScanUseCssResult)
sprintf(String, "CTC:******");
strcpy(String, "CTC:******");
else
if (gScanCssResultType == CODE_TYPE_CONTINUOUS_TONE)
sprintf(String, "CTC:%.1fHz", CTCSS_Options[gScanCssResultCode] * 0.1);
sprintf(String, "CTC:%u.%uHz", CTCSS_Options[gScanCssResultCode] / 10, CTCSS_Options[gScanCssResultCode] % 10);
else
sprintf(String, "DCS:D%03oN", DCS_Options[gScanCssResultCode]);
UI_PrintString(String, 2, 0, 3, 8);

7
ui/welcome.c
View File

@ -49,9 +49,10 @@ void UI_DisplayWelcome(void)
(gBatteryVoltageAverage > gMax_bat_v) ? gMax_bat_v :
gBatteryVoltageAverage;
sprintf(WelcomeString0, "VOLTAGE");
sprintf(WelcomeString1, "%.2fV %u%%",
gBatteryVoltageAverage * 0.01, // argh, floating point :(
strcpy(WelcomeString0, "VOLTAGE");
sprintf(WelcomeString1, "%u.%02uV %u%%",
gBatteryVoltageAverage / 100,
gBatteryVoltageAverage % 100,
(100 * (volts - gMin_bat_v)) / (gMax_bat_v - gMin_bat_v));
}
else