From b695f4f254d2ace06f7954ca12bfa446b52c99fd Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Wed, 24 Apr 2024 01:46:30 +0200
Subject: [PATCH 01/14] Let's go to 2.7

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index bf42b6a..b1bc0f4 100644
--- a/Makefile
+++ b/Makefile
@@ -211,7 +211,7 @@ ifeq ($(ENABLE_FEAT_F4HWN),1)
 	VERSION_STRING_1 ?= v0.22
 
 	AUTHOR_STRING_2 ?= F4HWN
-	VERSION_STRING_2 ?= v2.6
+	VERSION_STRING_2 ?= v2.7
 
 	AUTHOR_STRING ?= $(AUTHOR_STRING_1)+$(AUTHOR_STRING_2)
 	VERSION_STRING ?= $(VERSION_STRING_2)

From 9ef52c3a92b0d07aa5b8134ce1007cdcb521d469 Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Wed, 24 Apr 2024 19:41:37 +0200
Subject: [PATCH 02/14] Update donors

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e5f7e7e..5144319 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Anyway, have fun.
 
 # Donations
 
-Special thanks to Jean-Cyrille F6IWW, Fabrice 14RC123, David F4BPP, Olivier 14RC206, Frédéric F4ESO, Stéphane F5LGW, Jorge Ornelas, Laurent F4AXK, Christophe Morel, Clayton W0LED, Pierre Antoine F6FWB, Jean-Claude 14FRS3306 and Thierry F4GVO for their [donations](https://www.paypal.com/paypalme/F4HWN). That’s so kind of them. Thanks so much 🙏🏻
+Special thanks to Jean-Cyrille F6IWW, Fabrice 14RC123, David F4BPP, Olivier 14RC206, Frédéric F4ESO, Stéphane F5LGW, Jorge Ornelas, Laurent F4AXK, Christophe Morel, Clayton W0LED, Pierre Antoine F6FWB, Jean-Claude 14FRS3306, Thierry F4GVO and Eric F1NOU for their [donations](https://www.paypal.com/paypalme/F4HWN). That’s so kind of them. Thanks so much 🙏🏻
 
 ## Table of Contents
 

From 5567f99ead9c759c3cda2c5293882565550aac9f Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Wed, 24 Apr 2024 19:43:35 +0200
Subject: [PATCH 03/14] Fix issue #57

---
 ui/status.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/status.c b/ui/status.c
index 425ed1a..1c38bb2 100644
--- a/ui/status.c
+++ b/ui/status.c
@@ -51,6 +51,8 @@ static void convertTime(uint8_t *line, uint8_t type)
     m = t / 60;
     s = t - (m * 60);
 
+	gStatusLine[14] = 0x00; // Quick fix on display (on scanning I, II, etc.)
+
     sprintf(str, "%02d:%02d", m, s);
     UI_PrintStringSmallBufferNormal(str, line + 0);
 

From 81e97e591a192ac024685b06eaac6042ea36d13b Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Thu, 25 Apr 2024 05:17:15 +0200
Subject: [PATCH 04/14] Improve OnePush

---
 app/app.c | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/app/app.c b/app/app.c
index 65d8a56..b571c85 100644
--- a/app/app.c
+++ b/app/app.c
@@ -881,6 +881,24 @@ void APP_Update(void)
 		gTxTimeoutReachedAlert = false;
 		gTxTimeoutToneAlert = 800;
 
+		if (gSetting_set_ptt_session) // Improve OnePush if TOT
+		{
+			if(gPttOnePushCounter == 1)
+			{
+				gPttOnePushCounter = 3;
+			}
+			else if(gPttOnePushCounter == 2)
+			{
+				ProcessKey(KEY_PTT, false, false);
+				gPttIsPressed = false;
+				gPttOnePushCounter = 0;
+				gPttWasReleased = true;
+				//if (gKeyReading1 != KEY_INVALID)
+				//	gPttWasReleased = true;
+			}
+			ST7565_ContrastAndInv();
+		}
+		/*
 		if (gSetting_set_ptt_session) // Improve OnePush if TOT
 		{
 			ProcessKey(KEY_PTT, false, false);
@@ -890,6 +908,7 @@ void APP_Update(void)
 				gPttWasReleased = true;
 			ST7565_ContrastAndInv();
 		}
+		*/
 #endif
 
 		APP_EndTransmission();
@@ -1101,23 +1120,25 @@ static void CheckKeys(void)
 		{	// PTT pressed again			
 			if (++gPttDebounceCounter >= 3 || SerialConfigInProgress())	    // 30ms
 			{	// stop transmitting
-				ProcessKey(KEY_PTT, false, false);
-				gPttIsPressed = false;
 				gPttOnePushCounter = 3;
-				if (gKeyReading1 != KEY_INVALID)
-					gPttWasReleased = true;
-				ST7565_ContrastAndInv();
 			}
 		}
 		else if ((GPIO_CheckBit(&GPIOC->DATA, GPIOC_PIN_PTT) || SerialConfigInProgress()) && gPttOnePushCounter == 3)
 		{	// PTT released or serial comms config in progress
 			if (++gPttDebounceCounter >= 3 || SerialConfigInProgress())	    // 30ms
 			{	// stop transmitting
+				ProcessKey(KEY_PTT, false, false);
+				gPttIsPressed = false;
+				if (gKeyReading1 != KEY_INVALID)
+					gPttWasReleased = true;
 				gPttOnePushCounter = 0;
+				ST7565_ContrastAndInv();			
 			}
 		}
 		else
 			gPttDebounceCounter = 0;
+
+		//gDebug = gPttOnePushCounter;
 	}
 	else
 	{

From 990f1856548d653d1532ae24ce7c5fb4a999ac6f Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Sat, 27 Apr 2024 19:00:04 +0200
Subject: [PATCH 05/14] Update donors

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5144319..261c10e 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Anyway, have fun.
 
 # Donations
 
-Special thanks to Jean-Cyrille F6IWW, Fabrice 14RC123, David F4BPP, Olivier 14RC206, Frédéric F4ESO, Stéphane F5LGW, Jorge Ornelas, Laurent F4AXK, Christophe Morel, Clayton W0LED, Pierre Antoine F6FWB, Jean-Claude 14FRS3306, Thierry F4GVO and Eric F1NOU for their [donations](https://www.paypal.com/paypalme/F4HWN). That’s so kind of them. Thanks so much 🙏🏻
+Special thanks to Jean-Cyrille F6IWW, Fabrice 14RC123, David F4BPP, Olivier 14RC206, Frédéric F4ESO, Stéphane F5LGW, Jorge Ornelas, Laurent F4AXK, Christophe Morel, Clayton W0LED, Pierre Antoine F6FWB, Jean-Claude 14FRS3306, Thierry F4GVO, Eric F1NOU, PricelessToolkit and Ady M6NYJ for their [donations](https://www.paypal.com/paypalme/F4HWN). That’s so kind of them. Thanks so much 🙏🏻
 
 ## Table of Contents
 

From a79edc96d8160c0757f767151c4d52b1b01501cf Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Mon, 29 Apr 2024 22:43:52 +0200
Subject: [PATCH 06/14] Update donors

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 261c10e..b045317 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Anyway, have fun.
 
 # Donations
 
-Special thanks to Jean-Cyrille F6IWW, Fabrice 14RC123, David F4BPP, Olivier 14RC206, Frédéric F4ESO, Stéphane F5LGW, Jorge Ornelas, Laurent F4AXK, Christophe Morel, Clayton W0LED, Pierre Antoine F6FWB, Jean-Claude 14FRS3306, Thierry F4GVO, Eric F1NOU, PricelessToolkit and Ady M6NYJ for their [donations](https://www.paypal.com/paypalme/F4HWN). That’s so kind of them. Thanks so much 🙏🏻
+Special thanks to Jean-Cyrille F6IWW, Fabrice 14RC123, David F4BPP, Olivier 14RC206, Frédéric F4ESO, Stéphane F5LGW, Jorge Ornelas, Laurent F4AXK, Christophe Morel, Clayton W0LED, Pierre Antoine F6FWB, Jean-Claude 14FRS3306, Thierry F4GVO, Eric F1NOU, PricelessToolkit, Ady M6NYJ and Tom McGovern for their [donations](https://www.paypal.com/paypalme/F4HWN). That’s so kind of them. Thanks so much 🙏🏻
 
 ## Table of Contents
 

From df1cceb160120f18258f28cffa928bc816b3443e Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Thu, 2 May 2024 04:45:42 +0200
Subject: [PATCH 07/14] Improve hidden menus (issue #71)

---
 main.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main.c b/main.c
index 68de643..2f99283 100644
--- a/main.c
+++ b/main.c
@@ -117,6 +117,10 @@ void Main(void)
 	if (BootMode == BOOT_MODE_F_LOCK)
 	{
 		gF_LOCK = true;            // flag to say include the hidden menu items
+		#ifdef ENABLE_FEAT_F4HWN
+			gEeprom.KEY_LOCK = 0;
+			gMenuCursor = 63; // move to hidden section, fix me if change... !!!
+		#endif
 	}
 
 	// count the number of menu items

From 20ddf1e820fe002a518a49e89af4980229bc63a5 Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Fri, 3 May 2024 04:33:06 +0200
Subject: [PATCH 08/14] Improve hidden menus (issue #71)

---
 main.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/main.c b/main.c
index 2f99283..90ac18b 100644
--- a/main.c
+++ b/main.c
@@ -39,6 +39,7 @@
 #include "driver/gpio.h"
 #include "driver/system.h"
 #include "driver/systick.h"
+#include "driver/eeprom.h"
 #ifdef ENABLE_UART
 	#include "driver/uart.h"
 #endif
@@ -118,7 +119,12 @@ void Main(void)
 	{
 		gF_LOCK = true;            // flag to say include the hidden menu items
 		#ifdef ENABLE_FEAT_F4HWN
+			uint8_t Data[8] = {0};
+			EEPROM_ReadBuffer(0x0E70, Data, 8);
 			gEeprom.KEY_LOCK = 0;
+			Data[4] = 0;
+			EEPROM_WriteBuffer(0x0E70, Data);
+
 			gMenuCursor = 63; // move to hidden section, fix me if change... !!!
 		#endif
 	}

From 014f946ed458eaf70741eee3b5be202d2e728b05 Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Fri, 3 May 2024 04:45:46 +0200
Subject: [PATCH 09/14] Improve hidden menus (issue #71)

---
 main.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/main.c b/main.c
index 90ac18b..7bc2a92 100644
--- a/main.c
+++ b/main.c
@@ -119,12 +119,8 @@ void Main(void)
 	{
 		gF_LOCK = true;            // flag to say include the hidden menu items
 		#ifdef ENABLE_FEAT_F4HWN
-			uint8_t Data[8] = {0};
-			EEPROM_ReadBuffer(0x0E70, Data, 8);
 			gEeprom.KEY_LOCK = 0;
-			Data[4] = 0;
-			EEPROM_WriteBuffer(0x0E70, Data);
-
+			SETTINGS_SaveSettings();
 			gMenuCursor = 63; // move to hidden section, fix me if change... !!!
 		#endif
 	}

From fb00ac8dfdbd64348208146088937c8ce3f5979f Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Sat, 4 May 2024 18:37:59 +0200
Subject: [PATCH 10/14] Change I and II

---
 bitmaps.c | 22 ++++++++++++----------
 bitmaps.h |  4 ++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/bitmaps.c b/bitmaps.c
index 91cefd2..32adb7a 100644
--- a/bitmaps.c
+++ b/bitmaps.c
@@ -168,24 +168,26 @@ const uint8_t BITMAP_VFO_NotDefault[8] =
 	0b00001000
 };
 
-const uint8_t BITMAP_ScanList1[6] =
+const uint8_t BITMAP_ScanList1[7] =
 {	// 'I' symbol
-	0b00000000,
-	0b00000000,
+	0b01111111,
+	0b01111111,
+	0b01111011,
 	0b01000001,
 	0b01111111,
-	0b01000001,
-	0b00000000
+	0b01111111,
+	0b01111111,
 };
 
-const uint8_t BITMAP_ScanList2[6] =
+const uint8_t BITMAP_ScanList2[7] =
 {	// 'II' symbol
-	0b00000000,
-	0b01000001,
 	0b01111111,
-	0b01000001,
 	0b01111111,
-	0b01000001
+	0b01001101,
+	0b01010101,
+	0b01011011,
+	0b01111111,
+	0b01111111,
 };
 
 const uint8_t BITMAP_compand[6] =
diff --git a/bitmaps.h b/bitmaps.h
index 69a437a..ba54590 100644
--- a/bitmaps.h
+++ b/bitmaps.h
@@ -28,8 +28,8 @@ extern const uint8_t BITMAP_USB_C[9];
 extern const uint8_t BITMAP_Antenna[5];
 extern const uint8_t BITMAP_VFO_Default[8];
 extern const uint8_t BITMAP_VFO_NotDefault[8];
-extern const uint8_t BITMAP_ScanList1[6];
-extern const uint8_t BITMAP_ScanList2[6];
+extern const uint8_t BITMAP_ScanList1[7];
+extern const uint8_t BITMAP_ScanList2[7];
 extern const uint8_t BITMAP_compand[6];
 
 #ifndef ENABLE_CUSTOM_MENU_LAYOUT

From 9a93744a247e67a0ca2178c47995646e9728d315 Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Sat, 4 May 2024 23:49:55 +0200
Subject: [PATCH 11/14] Fix issue #75

---
 app/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/main.c b/app/main.c
index 704613d..5e08a1f 100644
--- a/app/main.c
+++ b/app/main.c
@@ -126,7 +126,7 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
 					//SETTINGS_SaveChannel(channel, gEeprom.RX_VFO, gRxVfo, 1);
 
 					gRequestSaveChannel = 1;
-
+					gRequestSaveVFO = true;
 					gUpdateDisplay = true;
 				}
 #endif

From f1f9c91de4c4013d16a44e6de9b9b4ad794a13f2 Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Sun, 5 May 2024 02:44:58 +0200
Subject: [PATCH 12/14] Status bar memory optimize, again...

---
 bitmaps.c   | 10 ++++++++++
 bitmaps.h   |  3 +++
 ui/status.c |  6 +++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/bitmaps.c b/bitmaps.c
index 32adb7a..f3c02bd 100644
--- a/bitmaps.c
+++ b/bitmaps.c
@@ -29,6 +29,16 @@ const uint8_t gFontFM[2][6] =
 	{0x00, 0x7f, 0x2, 0x1c, 0x2, 0x7f},
 };
 
+const uint8_t gFontF[1][8] =
+{
+	{0x7f, 0x00, 0x76, 0x76, 0x76, 0x76, 0x7e, 0x7f}, // 'F'
+};
+
+const uint8_t gFontS[1][6] =
+{
+	{0x26, 0x49, 0x49, 0x49, 0x49, 0x32}, // 'S'
+};
+
 const uint8_t gFontKeyLock[1][9] =
 {
 	{0x7c, 0x46, 0x45, 0x45, 0x45, 0x45, 0x45, 0x46, 0x7c}
diff --git a/bitmaps.h b/bitmaps.h
index ba54590..f60a63b 100644
--- a/bitmaps.h
+++ b/bitmaps.h
@@ -8,6 +8,9 @@ extern const uint8_t gFontPowerSave[2][6];
 extern const uint8_t gFontPttOnePush[2][6];
 extern const uint8_t gFontPttClassic[2][6];
 extern const uint8_t gFontFM[2][6];
+extern const uint8_t gFontF[1][8];
+extern const uint8_t gFontS[1][6];
+
 extern const uint8_t gFontKeyLock[1][9];
 extern const uint8_t gFontScanAll[9];
 extern const uint8_t gFontLight[9];
diff --git a/ui/status.c b/ui/status.c
index 1c38bb2..92df154 100644
--- a/ui/status.c
+++ b/ui/status.c
@@ -115,7 +115,8 @@ void UI_DisplayStatus()
 				}
 			}
 			else {	// frequency mode
-				UI_PrintStringSmallBufferNormal("S", line + x + 1);
+				memcpy(line + x + 1, gFontS, sizeof(gFontS));
+				//UI_PrintStringSmallBufferNormal("S", line + x + 1);
 			}
 			x1 = x + 10;
 		}
@@ -205,12 +206,15 @@ void UI_DisplayStatus()
 		memcpy(line + x + 1, gFontKeyLock, sizeof(gFontKeyLock));
 	}
 	else if (gWasFKeyPressed) {
+		memcpy(line + x + 1, gFontF, sizeof(gFontF));
+		/*
 		UI_PrintStringSmallBufferNormal("F", line + x + 1);
 		
 		for (uint8_t i = 71; i < 79; i++)
 		{
 			gStatusLine[i] ^= 0x7F;
 		}
+		*/
 	}
 	else if (gBackLight)
 	{

From 18644e5a06c13471b554a350d210188ca6eaa603 Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Sun, 5 May 2024 05:13:32 +0200
Subject: [PATCH 13/14] Fix issue #76

---
 app/app.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/app.c b/app/app.c
index b571c85..07ea968 100644
--- a/app/app.c
+++ b/app/app.c
@@ -844,11 +844,13 @@ void APP_Update(void)
 			{
 				if (gBlinkCounter == 0)
 				{
-					BACKLIGHT_TurnOn();
+					//BACKLIGHT_TurnOn();
+					BACKLIGHT_SetBrightness(gEeprom.BACKLIGHT_MAX);
 				}
 				else if(gBlinkCounter == 15000)
 				{
-					BACKLIGHT_TurnOff();
+					//BACKLIGHT_TurnOff();
+					BACKLIGHT_SetBrightness(gEeprom.BACKLIGHT_MIN);
 				}
 			}
 		}
@@ -878,6 +880,12 @@ void APP_Update(void)
 		gTxTimeoutReached = false;
 
 #ifdef ENABLE_FEAT_F4HWN
+		if(gBacklightCountdown_500ms > 0 || gEeprom.BACKLIGHT_TIME == 61)
+		{
+			//BACKLIGHT_TurnOn();
+			BACKLIGHT_SetBrightness(gEeprom.BACKLIGHT_MAX);
+		}
+
 		gTxTimeoutReachedAlert = false;
 		gTxTimeoutToneAlert = 800;
 

From 1d78b9b1793a2b06039b24565c7f7f92dd234c73 Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Sun, 5 May 2024 05:18:54 +0200
Subject: [PATCH 14/14] Fix issue #69

---
 radio.c   | 1 +
 ui/main.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/radio.c b/radio.c
index c4c0c9f..a4c45f8 100644
--- a/radio.c
+++ b/radio.c
@@ -1054,6 +1054,7 @@ void RADIO_PrepareTX(void)
 	){
 		// TX frequency not allowed
 		State = VFO_STATE_TX_DISABLE;
+		gVfoConfigureMode = VFO_CONFIGURE;
 	} else if (SerialConfigInProgress()) {
 		// TX is disabled or config upload/download in progress
 		State = VFO_STATE_TX_DISABLE;
diff --git a/ui/main.c b/ui/main.c
index 7166f10..c5b84f9 100644
--- a/ui/main.c
+++ b/ui/main.c
@@ -777,7 +777,8 @@ void UI_DisplayMain(void)
 		else
 		{	// receiving .. show the RX symbol
 			mode = VFO_MODE_RX;
-			if (FUNCTION_IsRx() && gEeprom.RX_VFO == vfo_num) {
+			//if (FUNCTION_IsRx() && gEeprom.RX_VFO == vfo_num) {
+			if (FUNCTION_IsRx() && gEeprom.RX_VFO == vfo_num && VfoState[vfo_num] == VFO_STATE_NORMAL) {
 #ifdef ENABLE_FEAT_F4HWN
 				RxBlinkLed = 1;
 				RxBlinkLedCounter = 0;