M fix revert - for now

pdrbsts · Sep 23, 2023 · 9626dbb · 9626dbb
1 parent 6fbcbef
commit 9626dbb
Show file tree

Hide file tree

Showing 12 changed files with 303 additions and 169 deletions.
diff --git a/Makefile b/Makefile
@@ -23,6 +23,7 @@ ENABLE_SHOW_CHARGE_LEVEL      := 0
 ENABLE_REVERSE_BAT_SYMBOL     := 1
 ENABLE_AM_FIX                 := 1
 ENABLE_AM_FIX_SHOW_DATA       := 1
+ENABLE_AM_FIX_TEST1           := 0
 ENABLE_SQUELCH1_LOWER         := 0
 ENABLE_AUDIO_BAR              := 0
 #ENABLE_SINGLE_VFO_CHAN       := 1
@@ -208,6 +209,9 @@ endif
 ifeq ($(ENABLE_AM_FIX_SHOW_DATA),1)
 	CFLAGS  += -DENABLE_AM_FIX_SHOW_DATA
 endif
+ifeq ($(ENABLE_AM_FIX_TEST1),1)
+	CFLAGS  += -DENABLE_AM_FIX_TEST1
+endif
 ifeq ($(ENABLE_SQUELCH1_LOWER),1)
 	CFLAGS  += -DENABLE_SQUELCH1_LOWER
 endif

diff --git a/am_fix.c b/am_fix.c
diff --git a/am_fix.h b/am_fix.h
@@ -10,28 +10,6 @@ extern const uint8_t orig_mixer;
 extern const uint8_t orig_pga;
 
 #ifdef ENABLE_AM_FIX
-	extern const int8_t lna_short_dB[4];
-	extern const int8_t lna_dB[8];
-	extern const int8_t mixer_dB[4];
-	extern const int8_t pga_dB[8];
-
-	typedef struct
-	{
-		#if 1
-			// bitfields take less flash bytes
-			uint8_t lna_short:2;   // 0 ~ 3
-			uint8_t       lna:3;   // 0 ~ 7
-			uint8_t     mixer:2;   // 0 ~ 3
-			uint8_t       pga:3;   // 0 ~ 7
-		#else
-			uint8_t lna_short;     // 0 ~ 3
-			uint8_t       lna;     // 0 ~ 7
-			uint8_t     mixer;     // 0 ~ 3
-			uint8_t       pga;     // 0 ~ 7
-		#endif
-	} t_am_fix_gain_table;
-//	} __attribute__((packed)) t_am_fix_gain_table;
-
 	extern int16_t rssi_db_gain_diff;
 
 	void AM_fix_reset(void);

diff --git a/app/menu.c b/app/menu.c
@@ -168,11 +168,21 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
 
 		#ifdef ENABLE_COMPANDER
 			case MENU_COMPAND:
-			*pMin = 0;
-			*pMax = ARRAY_SIZE(gSubMenu_Compand) - 1;
-			break;
+				*pMin = 0;
+				*pMax = ARRAY_SIZE(gSubMenu_Compand) - 1;
+				break;
 		#endif
 
+		#ifdef ENABLE_AM_FIX_TEST1
+			case MENU_AM_FIX_TEST1:
+				*pMin = 0;
+				*pMax = ARRAY_SIZE(gSubMenu_AM_fix_test1) - 1;
+				break;
+		#endif
+
+		#ifdef ENABLE_AM_FIX
+			case MENU_AM_FIX:
+		#endif
 		#ifdef ENABLE_AUDIO_BAR
 			case MENU_MIC_BAR:
 		#endif
@@ -186,9 +196,6 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
 		case MENU_D_DCD:
 		case MENU_D_LIVE_DEC:
 		case MENU_AM:
-		#ifdef ENABLE_AM_FIX
-			case MENU_AM_FIX:
-		#endif
 		#ifdef ENABLE_NOAA
 			case MENU_NOAA_S:
 		#endif
@@ -617,6 +624,14 @@ void MENU_AcceptSetting(void)
 				break;
 		#endif
 
+		#ifdef ENABLE_AM_FIX_TEST1
+			case MENU_AM_FIX_TEST1:
+				gSetting_AM_fix_test1 = gSubMenuSelection;
+				gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
+				gFlagResetVfos    = true;
+				break;
+		#endif
+
 		#ifdef ENABLE_NOAA
 			case MENU_NOAA_S:
 				gEeprom.NOAA_AUTO_SCAN = gSubMenuSelection;
@@ -993,6 +1008,12 @@ void MENU_ShowCurrentSetting(void)
 				break;
 		#endif
 
+		#ifdef ENABLE_AM_FIX_TEST1
+			case MENU_AM_FIX_TEST1:
+				gSubMenuSelection = gSetting_AM_fix_test1;
+				break;
+		#endif
+
 		#ifdef ENABLE_NOAA
 			case MENU_NOAA_S:
 				gSubMenuSelection = gEeprom.NOAA_AUTO_SCAN;

diff --git a/firmware b/firmware
diff --git a/firmware.bin b/firmware.bin
diff --git a/firmware.packed.bin b/firmware.packed.bin
diff --git a/misc.c b/misc.c
@@ -72,6 +72,9 @@ bool              gSetting_ScrambleEnable;
 #ifdef ENABLE_AM_FIX
 	bool          gSetting_AM_fix;
 #endif
+#ifdef ENABLE_AM_FIX_TEST1
+	uint8_t       gSetting_AM_fix_test1 = 0;
+#endif
 #ifdef ENABLE_AUDIO_BAR
 	bool          gSetting_mic_bar;
 #endif

diff --git a/misc.h b/misc.h
@@ -133,6 +133,9 @@ extern bool                  gSetting_ScrambleEnable;
 #ifdef ENABLE_AM_FIX
 	extern bool              gSetting_AM_fix;
 #endif
+#ifdef ENABLE_AM_FIX_TEST1
+	extern uint8_t           gSetting_AM_fix_test1;
+#endif
 #ifdef ENABLE_AUDIO_BAR
 	extern bool              gSetting_mic_bar;
 #endif

diff --git a/ui/main.c b/ui/main.c
@@ -504,12 +504,8 @@ void UI_DisplayMain(void)
 					case FUNCTION_RECEIVE:
 					case FUNCTION_MONITOR:
 					case FUNCTION_INCOMING:
-//						if (gScanState == SCAN_OFF && gScreenToDisplay != DISPLAY_SCANNER)
-//						if (gScreenToDisplay != DISPLAY_SCANNER)
-						{
-							AM_fix_print_data(String);
-							UI_PrintStringSmall(String, 2, 0, 3);
-						}
+						AM_fix_print_data(String);
+						UI_PrintStringSmall(String, 0, 0, 3);
 						break;
 				}
 			}

diff --git a/ui/menu.c b/ui/menu.c
@@ -104,6 +104,9 @@ const t_menu_item MenuList[] =
 #ifdef ENABLE_AM_FIX
 	{"AM-FIX", 0, VOICE_ID_INVALID,                       MENU_AM_FIX     },
 #endif
+#ifdef ENABLE_AM_FIX_TEST1
+	{"AM-FT1", 0, VOICE_ID_INVALID,                       MENU_AM_FIX_TEST1},
+#endif
 #ifdef ENABLE_NOAA
 	{"NOAA-S", 0, VOICE_ID_INVALID,                       MENU_NOAA_S     },
 #endif
@@ -267,6 +270,16 @@ const char gSubMenu_BACKLIGHT[7][7] =
 	};
 #endif
 
+#ifdef ENABLE_AM_FIX_TEST1
+	const char gSubMenu_AM_fix_test1[4][8] =
+	{
+		"LNA-S 0",
+		"LNA-S 1",
+		"LNA-S 2",
+		"LNA-S 3"
+	};
+#endif
+
 const char gSubMenu_BAT_TXT[3][8] =
 {
 	"NONE",
@@ -425,6 +438,12 @@ void UI_DisplayMenu(void)
 				break;
 		#endif
 
+		#ifdef ENABLE_AM_FIX_TEST1
+			case MENU_AM_FIX_TEST1:
+				strcpy(String, gSubMenu_AM_fix_test1[gSubMenuSelection]);
+				break;
+		#endif
+
 		case MENU_AUTOLK:
 			strcpy(String, (gSubMenuSelection == 0) ? "OFF" : "AUTO");
 			break;

diff --git a/ui/menu.h b/ui/menu.h
@@ -96,6 +96,9 @@ enum
 	#ifdef ENABLE_AM_FIX
 		MENU_AM_FIX,
 	#endif
+	#ifdef ENABLE_AM_FIX_TEST1
+		MENU_AM_FIX_TEST1,
+	#endif
 	#ifdef ENABLE_NOAA
 		MENU_NOAA_S,
 	#endif
@@ -140,6 +143,9 @@ extern const char        gSubMenu_BACKLIGHT[7][7];
 #ifdef ENABLE_COMPANDER
 	extern const char    gSubMenu_Compand[4][6];
 #endif
+#ifdef ENABLE_AM_FIX_TEST1
+	extern const char    gSubMenu_AM_fix_test1[4][8];
+#endif
 extern const char        gSubMenu_BAT_TXT[3][8];
 
 extern bool              gIsInSubMenu;