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

Scrambler inversion frequencies shown in menu

This commit is contained in:
OneOfEleven
2023-09-26 16:48:16 +01:00
parent cb92f2e098
commit ee05c4f075
12 changed files with 112 additions and 76 deletions

116
app/app.c
View File

@ -861,80 +861,79 @@ void APP_EndTransmission(void)
}
RADIO_SetupRegisters(false);
if (gMonitor)
ACTION_Monitor(); // 1of11
}
static void APP_HandleVox(void)
{
if (!gSetting_KILLED)
if (gSetting_KILLED)
return;
if (gVoxResumeCountdown == 0)
{
if (gVoxResumeCountdown == 0)
{
if (gVoxPauseCountdown)
return;
}
if (gVoxPauseCountdown)
return;
}
else
{
g_VOX_Lost = false;
gVoxPauseCountdown = 0;
}
#ifdef ENABLE_FMRADIO
if (gFmRadioMode)
return;
#endif
if (gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR)
return;
if (gScanState != SCAN_OFF || gCssScanMode != CSS_SCAN_MODE_OFF)
return;
if (gVOX_NoiseDetected)
{
if (g_VOX_Lost)
gVoxStopCountdown_10ms = vox_stop_count_down_10ms;
else
{
g_VOX_Lost = false;
gVoxPauseCountdown = 0;
}
if (gVoxStopCountdown_10ms == 0)
gVOX_NoiseDetected = false;
if (gCurrentFunction != FUNCTION_RECEIVE &&
gCurrentFunction != FUNCTION_MONITOR &&
gScanState == SCAN_OFF &&
gCssScanMode == CSS_SCAN_MODE_OFF
#ifdef ENABLE_FMRADIO
&& !gFmRadioMode
#endif
)
if (gCurrentFunction == FUNCTION_TRANSMIT && !gPttIsPressed && !gVOX_NoiseDetected)
{
if (gVOX_NoiseDetected)
if (gFlagEndTransmission)
{
if (g_VOX_Lost)
gVoxStopCountdown_10ms = 100; // 1 sec
else
if (gVoxStopCountdown_10ms == 0)
gVOX_NoiseDetected = false;
if (gCurrentFunction == FUNCTION_TRANSMIT && !gPttIsPressed && !gVOX_NoiseDetected)
{
if (gFlagEndTransmission)
{
FUNCTION_Select(FUNCTION_FOREGROUND);
}
else
{
APP_EndTransmission();
if (gEeprom.REPEATER_TAIL_TONE_ELIMINATION == 0)
FUNCTION_Select(FUNCTION_FOREGROUND);
else
gRTTECountdown = gEeprom.REPEATER_TAIL_TONE_ELIMINATION * 10;
}
gUpdateDisplay = true;
gFlagEndTransmission = false;
return;
}
FUNCTION_Select(FUNCTION_FOREGROUND);
}
else
if (g_VOX_Lost)
{
gVOX_NoiseDetected = true;
APP_EndTransmission();
if (gCurrentFunction == FUNCTION_POWER_SAVE)
FUNCTION_Select(FUNCTION_FOREGROUND);
if (gCurrentFunction != FUNCTION_TRANSMIT)
if (gEeprom.REPEATER_TAIL_TONE_ELIMINATION == 0)
{
gDTMF_ReplyState = DTMF_REPLY_NONE;
RADIO_PrepareTX();
gUpdateDisplay = true;
FUNCTION_Select(FUNCTION_FOREGROUND);
}
else
gRTTECountdown = gEeprom.REPEATER_TAIL_TONE_ELIMINATION * 10;
}
gUpdateDisplay = true;
gFlagEndTransmission = false;
}
return;
}
if (g_VOX_Lost)
{
gVOX_NoiseDetected = true;
if (gCurrentFunction == FUNCTION_POWER_SAVE)
FUNCTION_Select(FUNCTION_FOREGROUND);
if (gCurrentFunction != FUNCTION_TRANSMIT)
{
gDTMF_ReplyState = DTMF_REPLY_NONE;
RADIO_PrepareTX();
gUpdateDisplay = true;
}
}
}
@ -1452,6 +1451,7 @@ void APP_TimeSlice10ms(void)
if (--gRTTECountdown == 0)
{
FUNCTION_Select(FUNCTION_FOREGROUND);
gUpdateDisplay = true;
}
}

View File

@ -132,6 +132,9 @@ void GENERIC_Key_PTT(bool bKeyPressed)
RADIO_SetVfoState(VFO_STATE_NORMAL);
// beep when you release the PTT
//gBeepToPlay = BEEP_880HZ_40MS_OPTIONAL; // 1of11
gRequestDisplayScreen = DISPLAY_MAIN;
return;
}

View File

@ -210,6 +210,10 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
break;
case MENU_SCR:
*pMin = 0;
*pMax = ARRAY_SIZE(gSubMenu_SCRAMBLER) - 1;
break;
case MENU_VOX:
case MENU_TOT:
case MENU_RP_STE: