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

Battery volt/percent now has menu setting instead of compile option

Browse Source
This commit is contained in:
OneOfEleven
2023-09-19 20:04:02 +01:00
parent 93f6866c87
commit 0b676d29e3
16 changed files with 181 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/app.c
View File

@ -654,6 +654,7 @@ void APP_StartListening(FUNCTION_Type_t Function)
uint16_t lna;
uint16_t mixer;
uint16_t pga;
// seems the RX gain abrutly reduces above this frequency, why ?
if (rx_frequency <= 22640000)
{
@ -663,7 +664,7 @@ void APP_StartListening(FUNCTION_Type_t Function)
pga = 3; // reduced - seems to help reduce the AM demodulation distortion
}
else
{
{ // increasing the front ends gain decreases the dynamic range
lna_short = 3; // original
lna = 4; // increased
mixer = 3; // original
@ -679,16 +680,32 @@ void APP_StartListening(FUNCTION_Type_t Function)
//BK4819_WriteRegister(BK4819_REG_10, 0x007A); // 000000 00 011 11 010
//BK4819_WriteRegister(BK4819_REG_14, 0x0019); // 000000 00 000 11 001
}
BK4819_WriteRegister(BK4819_REG_48,
// max RX AF gain
(11u << 12) | // ???
( 0u << 10) | // AF Rx Gain-1
(63u << 4) | // AF Rx Gain-2
(15u << 0)); // AF DAC Gain (after Gain-1 and Gain-2)
gNeverUsed = 0;
}
else
{ // FM
uint16_t lna_short; // whats "LNA SHORT" mean ?
uint16_t lna;
uint16_t mixer;
uint16_t pga;
// original
lna_short = 3;
lna = 2;
mixer = 3;
pga = 6;
BK4819_WriteRegister(BK4819_REG_13, (lna_short << 8) | (lna << 5) | (mixer << 3) | (pga << 0));
BK4819_WriteRegister(BK4819_REG_48,
(11u << 12) | // ???
( 0u << 10) | // AF Rx Gain-1
@ -1788,16 +1805,13 @@ void APP_TimeSlice500ms(void)
gBatteryVoltageIndex = 0;
BATTERY_GetReadings(true);
#if defined(ENABLE_STATUSBAR_VOLTAGE) || defined(ENABLE_STATUSBAR_PERCENTAGE)
// regular statusbar updates (once per sec) if battery voltage or percentage is enabled
gUpdateStatus = true;
#else
if (gChargingWithTypeC)
gUpdateDisplay = true;
#endif
}
// regular statusbar updates (once every 2 sec) if need be
if ((gBatteryCheckCounter & 3) == 0)
if (gChargingWithTypeC || gSetting_battery_text > 0)
gUpdateStatus = true;
if (gCurrentFunction != FUNCTION_POWER_SAVE)
{
gCurrentRSSI = BK4819_GetRSSI();

55
app/menu.c
View File

@ -104,6 +104,7 @@
VOICE_ID_INVALID, // PONMSG
VOICE_ID_INVALID, // ROGER
VOICE_ID_INVALID, // BATVOL
VOICE_ID_INVALID, // BATTXT
VOICE_ID_INVALID, // MODE
#ifdef ENABLE_NOAA
VOICE_ID_INVALID, // NOAA-S
@ -322,6 +323,11 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
*pMax = ARRAY_SIZE(gSubMenu_PTT_ID) - 1;
break;
case MENU_BAT_TXT:
*pMin = 0;
*pMax = ARRAY_SIZE(gSubMenu_BAT_TXT) - 1;
break;
case MENU_D_HOLD:
*pMin = 5;
*pMax = 60;
@ -365,11 +371,13 @@ void MENU_AcceptSetting(void)
switch (gMenuCursor)
{
default:
return;
case MENU_SQL:
gEeprom.SQUELCH_LEVEL = gSubMenuSelection;
gRequestSaveSettings = true;
gVfoConfigureMode = VFO_CONFIGURE_1;
return;
break;
case MENU_STEP:
if (IS_FREQ_CHANNEL(gTxVfo->CHANNEL_SAVE))
@ -484,9 +492,8 @@ void MENU_AcceptSetting(void)
gEeprom.VOX_LEVEL = gSubMenuSelection - 1;
BOARD_EEPROM_LoadMoreSettings();
gFlagReconfigureVfos = true;
gRequestSaveSettings = true;
gUpdateStatus = true;
return;
break;
case MENU_ABR:
gEeprom.BACKLIGHT = gSubMenuSelection;
@ -499,9 +506,8 @@ void MENU_AcceptSetting(void)
case MENU_TDR:
gEeprom.DUAL_WATCH = gSubMenuSelection;
gFlagReconfigureVfos = true;
gRequestSaveSettings = true;
gUpdateStatus = true;
return;
break;
case MENU_XB:
#ifdef ENABLE_NOAA
@ -513,9 +519,8 @@ void MENU_AcceptSetting(void)
gEeprom.CROSS_BAND_RX_TX = gSubMenuSelection;
gFlagReconfigureVfos = true;
gRequestSaveSettings = true;
gUpdateStatus = true;
return;
break;
case MENU_BEEP:
gEeprom.BEEP_CONTROL = gSubMenuSelection;
@ -528,9 +533,8 @@ void MENU_AcceptSetting(void)
#ifdef ENABLE_VOICE
case MENU_VOICE:
gEeprom.VOICE_PROMPT = gSubMenuSelection;
gRequestSaveSettings = true;
gUpdateStatus = true;
return;
break;
#endif
case MENU_SC_REV:
@ -571,9 +575,8 @@ void MENU_AcceptSetting(void)
case MENU_MIC:
gEeprom.MIC_SENSITIVITY = gSubMenuSelection;
BOARD_EEPROM_LoadMoreSettings();
gRequestSaveSettings = true;
gFlagReconfigureVfos = true;
return;
break;
#ifdef ENABLE_COMPANDER
case MENU_COMPAND:
@ -617,6 +620,10 @@ void MENU_AcceptSetting(void)
gRequestSaveChannel = 1;
return;
case MENU_BAT_TXT:
gSetting_battery_text = gSubMenuSelection;
break;
case MENU_D_DCD:
gTxVfo->DTMF_DECODING_ENABLE = gSubMenuSelection;
gRequestSaveChannel = 1;
@ -624,8 +631,7 @@ void MENU_AcceptSetting(void)
case MENU_D_LIVE_DEC:
gSetting_live_DTMF_decoder = gSubMenuSelection;
gRequestSaveSettings = true;
return;
break;
case MENU_D_LIST:
gDTMFChosenContact = gSubMenuSelection - 1;
@ -655,9 +661,8 @@ void MENU_AcceptSetting(void)
#ifdef ENABLE_NOAA
case MENU_NOAA_S:
gEeprom.NOAA_AUTO_SCAN = gSubMenuSelection;
gRequestSaveSettings = true;
gFlagReconfigureVfos = true;
return;
break;
#endif
case MENU_DEL_CH:
@ -688,21 +693,18 @@ void MENU_AcceptSetting(void)
case MENU_350EN:
gSetting_350EN = gSubMenuSelection;
gRequestSaveSettings = true;
gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
gFlagResetVfos = true;
return;
break;
case MENU_SCREN:
gSetting_ScrambleEnable = gSubMenuSelection;
gRequestSaveSettings = true;
gFlagReconfigureVfos = true;
return;
break;
case MENU_TX_EN:
gSetting_TX_EN = gSubMenuSelection;
gRequestSaveSettings = true;
return;
gSetting_TX_EN = gSubMenuSelection;
break;
case MENU_F_CALI:
gEeprom.BK4819_XTAL_FREQ_LOW = gSubMenuSelection;
@ -724,9 +726,6 @@ void MENU_AcceptSetting(void)
EEPROM_WriteBuffer(0x1F88, &Misc);
}
return;
default:
return;
}
gRequestSaveSettings = true;
@ -988,6 +987,10 @@ void MENU_ShowCurrentSetting(void)
gSubMenuSelection = gTxVfo->DTMF_PTT_ID_TX_MODE;
break;
case MENU_BAT_TXT:
gSubMenuSelection = gSetting_battery_text;
return;
case MENU_D_DCD:
gSubMenuSelection = gTxVfo->DTMF_DECODING_ENABLE;
break;