BRNSystems/brnQuanFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Refactor

Browse Source
This commit is contained in:
Krzysiek Egzmont
2023-12-02 18:00:45 +01:00
parent a4cefe3401
commit 235a1a2f14
3 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/app.c
View File

@@ -1191,7 +1191,6 @@ void APP_TimeSlice10ms(void)
#endif #endif
#ifdef ENABLE_AM_FIX #ifdef ENABLE_AM_FIX
// if (gEeprom.VfoInfo[gEeprom.RX_VFO].Modulation != MODULATION_FM && gSetting_AM_fix)
if (gRxVfo->Modulation == MODULATION_AM && gSetting_AM_fix) if (gRxVfo->Modulation == MODULATION_AM && gSetting_AM_fix)
AM_fix_10ms(gEeprom.RX_VFO); AM_fix_10ms(gEeprom.RX_VFO);
#endif #endif
@@ -2015,7 +2014,7 @@ Skip:
gRequestSaveVFO = false; gRequestSaveVFO = false;
} }
if (gRequestSaveChannel > 0) if (gRequestSaveChannel > 0) // TODO: remove the gRequestSaveChannel, why use global variable for that??
{ {
if (!bKeyHeld) if (!bKeyHeld)
{ {

46
app/menu.c
View File

@@ -375,7 +375,6 @@ void MENU_AcceptSetting(void)
{ {
int32_t Min; int32_t Min;
int32_t Max; int32_t Max;
uint8_t Code;
FREQ_Config_t *pConfig = &gTxVfo->freq_config_RX; FREQ_Config_t *pConfig = &gTxVfo->freq_config_RX;
if (!MENU_GetLimits(UI_MENU_GetCurrentMenuId(), &Min, &Max)) if (!MENU_GetLimits(UI_MENU_GetCurrentMenuId(), &Min, &Max))
@@ -414,62 +413,51 @@ void MENU_AcceptSetting(void)
// Fallthrough // Fallthrough
case MENU_R_DCS: case MENU_R_DCS: {
if (gSubMenuSelection == 0) if (gSubMenuSelection == 0) {
{ if (pConfig->CodeType != CODE_TYPE_DIGITAL && pConfig->CodeType != CODE_TYPE_REVERSE_DIGITAL) {
if (pConfig->CodeType != CODE_TYPE_DIGITAL && pConfig->CodeType != CODE_TYPE_REVERSE_DIGITAL)
{
gRequestSaveChannel = 1; gRequestSaveChannel = 1;
return; return;
} }
Code = 0; pConfig->Code = 0;
pConfig->CodeType = CODE_TYPE_OFF; pConfig->CodeType = CODE_TYPE_OFF;
} }
else else if (gSubMenuSelection < 105) {
if (gSubMenuSelection < 105)
{
pConfig->CodeType = CODE_TYPE_DIGITAL; pConfig->CodeType = CODE_TYPE_DIGITAL;
Code = gSubMenuSelection - 1; pConfig->Code = gSubMenuSelection - 1;
} }
else else {
{
pConfig->CodeType = CODE_TYPE_REVERSE_DIGITAL; pConfig->CodeType = CODE_TYPE_REVERSE_DIGITAL;
Code = gSubMenuSelection - 105; pConfig->Code = gSubMenuSelection - 105;
} }
pConfig->Code = Code;
gRequestSaveChannel = 1; gRequestSaveChannel = 1;
return; return;
}
case MENU_T_CTCS: case MENU_T_CTCS:
pConfig = &gTxVfo->freq_config_TX; pConfig = &gTxVfo->freq_config_TX;
[[fallthrough]]; [[fallthrough]];
case MENU_R_CTCS: case MENU_R_CTCS: {
if (gSubMenuSelection == 0) if (gSubMenuSelection == 0) {
{ if (pConfig->CodeType != CODE_TYPE_CONTINUOUS_TONE) {
if (pConfig->CodeType != CODE_TYPE_CONTINUOUS_TONE)
{
gRequestSaveChannel = 1; gRequestSaveChannel = 1;
return; return;
} }
Code = 0; pConfig->Code = 0;
pConfig->Code = Code;
pConfig->CodeType = CODE_TYPE_OFF; pConfig->CodeType = CODE_TYPE_OFF;
BK4819_ExitSubAu(); BK4819_ExitSubAu();
} }
else else {
{ pConfig->Code = gSubMenuSelection - 1;
pConfig->CodeType = CODE_TYPE_CONTINUOUS_TONE; pConfig->CodeType = CODE_TYPE_CONTINUOUS_TONE;
Code = gSubMenuSelection - 1;
pConfig->Code = Code;
BK4819_SetCTCSSFrequency(CTCSS_Options[Code]); BK4819_SetCTCSSFrequency(CTCSS_Options[pConfig->Code]);
} }
gRequestSaveChannel = 1; gRequestSaveChannel = 1;
return; return;
}
case MENU_SFT_D: case MENU_SFT_D:
gTxVfo->TX_OFFSET_FREQUENCY_DIRECTION = gSubMenuSelection; gTxVfo->TX_OFFSET_FREQUENCY_DIRECTION = gSubMenuSelection;
gRequestSaveChannel = 1; gRequestSaveChannel = 1;

2
driver/bk4819.c
View File

@@ -669,7 +669,7 @@ void BK4819_SetupPowerAmplifier(const uint8_t bias, const uint32_t frequency)
// 7 = max // 7 = max
// 0 = min // 0 = min
// //
// 280MHz gain 1 = 1 gain 2 = 0 gain 1 = 4 gain 2 = 2 // 280MHz g1=1 g2=0 (-14.9dBm), g1=4 g2=2 (0.13dBm)
const uint8_t gain = (frequency < 28000000) ? (1u << 3) | (0u << 0) : (4u << 3) | (2u << 0); const uint8_t gain = (frequency < 28000000) ? (1u << 3) | (0u << 0) : (4u << 3) | (2u << 0);
const uint8_t enable = 1; const uint8_t enable = 1;
BK4819_WriteRegister(BK4819_REG_36, (bias << 8) | (enable << 7) | (gain << 0)); BK4819_WriteRegister(BK4819_REG_36, (bias << 8) | (enable << 7) | (gain << 0));