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

Improve TxTOut (28/63)

Browse Source
This commit is contained in:
Armel FAUVEAU
2024-04-05 06:05:49 +02:00
parent d489dedf51
commit 623a86b298
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/menu.c
View File

@@ -269,7 +269,8 @@ int MENU_GetLimits(uint8_t menu_id, int32_t *pMin, int32_t *pMax)
case MENU_TOT: case MENU_TOT:
//*pMin = 0; //*pMin = 0;
*pMax = ARRAY_SIZE(gSubMenu_TOT) - 1; *pMin = 5;
*pMax = 179;
break; break;
#ifdef ENABLE_VOX #ifdef ENABLE_VOX

5
radio.c
View File

@@ -1113,12 +1113,17 @@ void RADIO_PrepareTX(void)
if (gAlarmState == ALARM_STATE_OFF) if (gAlarmState == ALARM_STATE_OFF)
#endif #endif
{ {
gTxTimerCountdown_500ms = ((gEeprom.TX_TIMEOUT_TIMER + 1) * 5) * 2;
/*
if (gEeprom.TX_TIMEOUT_TIMER == 0) if (gEeprom.TX_TIMEOUT_TIMER == 0)
gTxTimerCountdown_500ms = 60; // 30 sec gTxTimerCountdown_500ms = 60; // 30 sec
else if (gEeprom.TX_TIMEOUT_TIMER < (ARRAY_SIZE(gSubMenu_TOT) - 1)) else if (gEeprom.TX_TIMEOUT_TIMER < (ARRAY_SIZE(gSubMenu_TOT) - 1))
gTxTimerCountdown_500ms = 120 * gEeprom.TX_TIMEOUT_TIMER; // minutes gTxTimerCountdown_500ms = 120 * gEeprom.TX_TIMEOUT_TIMER; // minutes
else else
gTxTimerCountdown_500ms = 120 * 15; // 15 minutes gTxTimerCountdown_500ms = 120 * 15; // 15 minutes
*/
#ifdef ENABLE_FEAT_F4HWN #ifdef ENABLE_FEAT_F4HWN
gTxTimerCountdownAlert_500ms = gTxTimerCountdown_500ms; gTxTimerCountdownAlert_500ms = gTxTimerCountdown_500ms;

2
settings.c
View File

@@ -45,7 +45,7 @@ void SETTINGS_InitEEPROM(void)
EEPROM_ReadBuffer(0x0E70, Data, 8); EEPROM_ReadBuffer(0x0E70, Data, 8);
gEeprom.CHAN_1_CALL = IS_MR_CHANNEL(Data[0]) ? Data[0] : MR_CHANNEL_FIRST; gEeprom.CHAN_1_CALL = IS_MR_CHANNEL(Data[0]) ? Data[0] : MR_CHANNEL_FIRST;
gEeprom.SQUELCH_LEVEL = (Data[1] < 10) ? Data[1] : 1; gEeprom.SQUELCH_LEVEL = (Data[1] < 10) ? Data[1] : 1;
gEeprom.TX_TIMEOUT_TIMER = (Data[2] < 11) ? Data[2] : 1; gEeprom.TX_TIMEOUT_TIMER = (Data[2] > 4 && Data[2] < 180) ? Data[2] : 11;
#ifdef ENABLE_NOAA #ifdef ENABLE_NOAA
gEeprom.NOAA_AUTO_SCAN = (Data[3] < 2) ? Data[3] : false; gEeprom.NOAA_AUTO_SCAN = (Data[3] < 2) ? Data[3] : false;
#endif #endif

4
ui/menu.c
View File

@@ -197,6 +197,7 @@ const char gSubMenu_SAVE[][4] =
"1:4" "1:4"
}; };
/*
const char gSubMenu_TOT[][7] = const char gSubMenu_TOT[][7] =
{ {
"30 sec", "30 sec",
@@ -211,6 +212,7 @@ const char gSubMenu_TOT[][7] =
"9 min", "9 min",
"15 min" "15 min"
}; };
*/
const char* const gSubMenu_RXMode[] = const char* const gSubMenu_RXMode[] =
{ {
@@ -791,7 +793,7 @@ void UI_DisplayMenu(void)
break; break;
case MENU_TOT: case MENU_TOT:
strcpy(String, gSubMenu_TOT[gSubMenuSelection]); sprintf(String, "%02dm:%02ds", (((gSubMenuSelection + 1) * 5) / 60), (((gSubMenuSelection + 1) * 5) % 60));
break; break;
#ifdef ENABLE_VOICE #ifdef ENABLE_VOICE