From 623a86b298a8127464a756af4f520e8b21d3ac51 Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Fri, 5 Apr 2024 06:05:49 +0200
Subject: [PATCH] Improve TxTOut (28/63)

---
 app/menu.c | 3 ++-
 radio.c    | 5 +++++
 settings.c | 2 +-
 ui/menu.c  | 4 +++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/menu.c b/app/menu.c
index d6471a7..533ba32 100644
--- a/app/menu.c
+++ b/app/menu.c
@@ -269,7 +269,8 @@ int MENU_GetLimits(uint8_t menu_id, int32_t *pMin, int32_t *pMax)
 
 		case MENU_TOT:
 			//*pMin = 0;
-			*pMax = ARRAY_SIZE(gSubMenu_TOT) - 1;
+			*pMin = 5;
+			*pMax = 179;
 			break;
 
 		#ifdef ENABLE_VOX
diff --git a/radio.c b/radio.c
index 16ffc7a..c4c0c9f 100644
--- a/radio.c
+++ b/radio.c
@@ -1113,12 +1113,17 @@ void RADIO_PrepareTX(void)
 	if (gAlarmState == ALARM_STATE_OFF)
 	#endif
 	{
+
+		gTxTimerCountdown_500ms = ((gEeprom.TX_TIMEOUT_TIMER + 1) * 5) * 2;
+
+		/*
 		if (gEeprom.TX_TIMEOUT_TIMER == 0)
 			gTxTimerCountdown_500ms = 60;   // 30 sec
 		else if (gEeprom.TX_TIMEOUT_TIMER < (ARRAY_SIZE(gSubMenu_TOT) - 1))
 			gTxTimerCountdown_500ms = 120 * gEeprom.TX_TIMEOUT_TIMER;  // minutes
 		else
 			gTxTimerCountdown_500ms = 120 * 15;  // 15 minutes
+		*/
 
 #ifdef ENABLE_FEAT_F4HWN 
 		gTxTimerCountdownAlert_500ms = gTxTimerCountdown_500ms;
diff --git a/settings.c b/settings.c
index 74b6902..77cd2c0 100644
--- a/settings.c
+++ b/settings.c
@@ -45,7 +45,7 @@ void SETTINGS_InitEEPROM(void)
 	EEPROM_ReadBuffer(0x0E70, Data, 8);
 	gEeprom.CHAN_1_CALL          = IS_MR_CHANNEL(Data[0]) ? Data[0] : MR_CHANNEL_FIRST;
 	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
 		gEeprom.NOAA_AUTO_SCAN   = (Data[3] <  2) ? Data[3] : false;
 	#endif
diff --git a/ui/menu.c b/ui/menu.c
index 0b7fcf4..3b85c2f 100644
--- a/ui/menu.c
+++ b/ui/menu.c
@@ -197,6 +197,7 @@ const char gSubMenu_SAVE[][4] =
 	"1:4"
 };
 
+/*
 const char gSubMenu_TOT[][7] =
 {
 	"30 sec",
@@ -211,6 +212,7 @@ const char gSubMenu_TOT[][7] =
 	"9 min",
 	"15 min"
 };
+*/
 
 const char* const gSubMenu_RXMode[] =
 {
@@ -791,7 +793,7 @@ void UI_DisplayMenu(void)
 			break;
 
 		case MENU_TOT:
-			strcpy(String, gSubMenu_TOT[gSubMenuSelection]);
+			sprintf(String, "%02dm:%02ds", (((gSubMenuSelection + 1) * 5) / 60), (((gSubMenuSelection + 1) * 5) % 60));
 			break;
 
 		#ifdef ENABLE_VOICE