Merge remote-tracking branch 'remotes/OneOfEleven/main'

egzumer · Oct 2, 2023 · d826ecb · d826ecb
2 parents e64bf6b + e0aa1a8
commit d826ecb
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -211,7 +211,7 @@ ifeq ($(ENABLE_TX1750),1)
 	CFLAGS  += -DENABLE_TX1750
 endif
 ifeq ($(ENABLE_KEEP_MEM_NAME),1)
-	CFLAGS  += -DKEEP_MEM_NAME
+	CFLAGS  += -DENABLE_KEEP_MEM_NAME
 endif
 ifeq ($(ENABLE_WIDE_RX),1)
 	CFLAGS  += -DENABLE_WIDE_RX

diff --git a/app/menu.c b/app/menu.c
@@ -737,7 +737,7 @@ void MENU_AcceptSetting(void)
 			break;
 
 		case MENU_F_CALI:
-			if (gF_LOCK)
+			//if (gF_LOCK)
 				writeXtalFreqCal(gSubMenuSelection);
 			return;
 

diff --git a/firmware.bin b/firmware.bin
diff --git a/firmware.packed.bin b/firmware.packed.bin
diff --git a/settings.c b/settings.c
@@ -223,7 +223,7 @@ void SETTINGS_SaveChannel(uint8_t Channel, uint8_t VFO, const VFO_Info_t *pVFO,
 
 			if (IS_MR_CHANNEL(Channel))
 			{
-				#ifndef KEEP_MEM_NAME
+				#ifndef ENABLE_KEEP_MEM_NAME
 					// clear/reset the channel name
 					//memset(&State, 0xFF, sizeof(State));
 					memset(&State, 0x00, sizeof(State));     // follow the QS way
@@ -277,7 +277,7 @@ void SETTINGS_UpdateChannel(uint8_t Channel, const VFO_Info_t *pVFO, bool keep)
 
 		gMR_ChannelAttributes[Channel] = Attributes;
 
-//		#ifndef KEEP_MEM_NAME
+//		#ifndef ENABLE_KEEP_MEM_NAME
 			if (IS_MR_CHANNEL(Channel))
 			{
 				const uint16_t OffsetMR = Channel * 16;