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

Retain space saving benefits when not using LTO

Makefile

@@ -11,7 +11,8 @@ ENABLE_AIRCOPY                := 0
 ENABLE_FMRADIO                := 1
 ENABLE_NOAA                   := 0
 ENABLE_VOICE                  := 0
-ENABLE_ALARM                  := 1
+ENABLE_VOX                    := 1
+ENABLE_ALARM                  := 0
 ENABLE_TX1750                 := 1
 ENABLE_BIG_FREQ               := 1
 ENABLE_SMALL_BOLD             := 1
@@ -22,25 +23,26 @@ ENABLE_F_CAL_MENU             := 0
 ENABLE_CTCSS_TAIL_PHASE_SHIFT := 1
 ENABLE_MAIN_KEY_HOLD          := 1
 ENABLE_BOOT_BEEPS             := 0
-ENABLE_COMPANDER              := 1
 ENABLE_SHOW_CHARGE_LEVEL      := 1
 ENABLE_REVERSE_BAT_SYMBOL     := 1
 ENABLE_CODE_SCAN_TIMEOUT      := 0
 ENABLE_AM_FIX                 := 1
 ENABLE_AM_FIX_SHOW_DATA       := 0
 ENABLE_SQUELCH_LOWER          := 0
+ENABLE_FASTER_CHANNEL_SCAN    := 1
 ENABLE_RSSI_BAR               := 1
 ENABLE_AUDIO_BAR              := 1
-ENABLE_SPECTRUM               := 1
+ENABLE_COPY_CHAN_TO_VFO       := 1
-#ENABLE_COPY_CHAN_TO_VFO       := 1
 #ENABLE_SINGLE_VFO_CHAN        := 1
+ENABLE_SPECTRUM               := 1
 #ENABLE_BAND_SCOPE             := 1
 
 #############################################################
 
 TARGET = firmware
 
-ifeq ($(ENABLE_LTO),1)
+ifeq ($(ENABLE_LTO), 1)
+	# can't have LTO and OVERLAY enabled at same time
 	ENABLE_OVERLAY := 0
 endif
 
@@ -105,7 +107,9 @@ OBJS += app/scanner.o
 ifeq ($(ENABLE_UART),1)
 	OBJS += app/uart.o
 endif
-OBJS += am_fix.o
+ifeq ($(ENABLE_AM_FIX), 1)
+	OBJS += am_fix.o
+endif
 OBJS += audio.o
 OBJS += bitmaps.o
 OBJS += board.o
@@ -138,7 +142,7 @@ OBJS += ui/welcome.o
 OBJS += version.o
 OBJS += main.o
 
-ifeq ($(OS),Windows_NT)
+ifeq ($(OS), Windows_NT)
 	TOP := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
 else
 	TOP := $(shell pwd)
@@ -167,11 +171,17 @@ CFLAGS = -Os -Wall -Werror -mcpu=cortex-m0 -fno-builtin -fshort-enums -fno-delet
 #CFLAGS = -Os -Wall -Werror -mcpu=cortex-m0 -fno-builtin -fshort-enums -fno-delete-null-pointer-checks -std=gnu99 -MMD
 #CFLAGS = -Os -Wall -Werror -mcpu=cortex-m0 -fno-builtin -fshort-enums -fno-delete-null-pointer-checks -std=gnu11 -MMD
 
-ifeq ($(ENABLE_LTO),1)
+ifeq ($(ENABLE_LTO), 1)
 #	CFLAGS += -flto
 	CFLAGS += -flto=2
+else
+#	We get most of the space savings if LTO creates problems
+	CFLAGS += -ffunction-sections -fdata-sections
 endif
 
+# May cause unhelpful build failures
+#CFLAGS += -Wpadded
+
 CFLAGS += -DPRINTF_INCLUDE_CONFIG_H
 CFLAGS += -DGIT_HASH=\"$(GIT_HASH)\"
 
@@ -205,6 +215,9 @@ endif
 ifeq ($(ENABLE_VOICE),1)
 	CFLAGS  += -DENABLE_VOICE
 endif
+ifeq ($(ENABLE_VOX),1)
+	CFLAGS  += -DENABLE_VOX
+endif
 ifeq ($(ENABLE_ALARM),1)
 	CFLAGS  += -DENABLE_ALARM
 endif
@@ -232,9 +245,6 @@ endif
 ifeq ($(ENABLE_BOOT_BEEPS),1)
 	CFLAGS  += -DENABLE_BOOT_BEEPS
 endif
-ifeq ($(ENABLE_COMPANDER),1)
-	CFLAGS  += -DENABLE_COMPANDER
-endif
 ifeq ($(ENABLE_SHOW_CHARGE_LEVEL),1)
 	CFLAGS  += -DENABLE_SHOW_CHARGE_LEVEL
 endif
@@ -253,8 +263,14 @@ endif
 ifeq ($(ENABLE_AM_FIX_TEST1),1)
 	CFLAGS  += -DENABLE_AM_FIX_TEST1
 endif
-ifeq ($(ENABLE_SQUELCH_LOWER),1)
+ifeq ($(ENABLE_SQUELCH_MORE_SENSITIVE),1)
-	CFLAGS  += -DENABLE_SQUELCH_LOWER
+	CFLAGS  += -DENABLE_SQUELCH_MORE_SENSITIVE
+endif
+ifeq ($(ENABLE_FASTER_CHANNEL_SCAN),1)
+	CFLAGS  += -DENABLE_FASTER_CHANNEL_SCAN
+endif
+ifeq ($(ENABLE_BACKLIGHT_ON_RX),1)
+	CFLAGS  += -DENABLE_BACKLIGHT_ON_RX
 endif
 ifeq ($(ENABLE_RSSI_BAR),1)
 	CFLAGS  += -DENABLE_RSSI_BAR
@@ -274,6 +290,14 @@ endif
 
 LDFLAGS = -mcpu=cortex-m0 -nostartfiles -Wl,-T,firmware.ld
 
+# Use newlib-nano instead of newlib
+LDFLAGS += --specs=nano.specs
+
+ifeq ($(ENABLE_LTO), 0)
+#	Throw away unneeded func/data sections like LTO does
+	LDFLAGS += -Wl,--gc-sections
+endif
+
 ifeq ($(DEBUG),1)
 	ASFLAGS += -g
 	CFLAGS += -g

README.md

@@ -51,38 +51,45 @@ You'll find the options at the top of "Makefile" ('0' = disable, '1' = enable) .
 
 ```
 ENABLE_SWD                    := 0       only needed if using CPU's SWD port (debugging/programming)
-ENABLE_OVERLAY                := 0       cpu FLASH stuff
+ENABLE_OVERLAY                := 0       cpu FLASH stuff, not needed
-ENABLE_LTO                    := 0     **experimental, reduces size of compiled firmware but might break EEPROM reads - DISABLE overlay if you enable this
+ENABLE_LTO                    := 0     **experimental, reduces size of compiled firmware but might break EEPROM reads (overlay will be disabled if you enable this)
-ENABLE_UART                   := 1       without this you can't configure radio via PC
+ENABLE_UART                   := 1       without this you can't configure radio via PC !
-ENABLE_AIRCOPY                := 0       easier to just enter frequency
+ENABLE_AIRCOPY                := 0       easier to just enter frequency with butts
-ENABLE_FMRADIO                := 1       WBFM VHF band 2 RX
+ENABLE_FMRADIO                := 0       WBFM VHF broadcast band receiver
-ENABLE_NOAA                   := 0       everything NOAA
+ENABLE_NOAA                   := 0       everything NOAA (only of any use in the USA)
 ENABLE_VOICE                  := 0       want to hear voices ?
+ENABLE_VOX                    := 0
 ENABLE_ALARM                  := 0       TX alarms
-ENABLE_1750HZ                 := 0       side key 1750Hz TX tone
+ENABLE_1750HZ                 := 0       side key 1750Hz TX tone (older style repeater access)
-ENABLE_BIG_FREQ               := 0       big font frequencies
+ENABLE_BIG_FREQ               := 0       big font frequencies (like original QS firmware)
 ENABLE_SMALL_BOLD             := 1       bold channel name/no. (when name + freq channel display mode)
 ENABLE_KEEP_MEM_NAME          := 1       maintain channel name when (re)saving memory channel
-ENABLE_WIDE_RX                := 1       full 18MHz to 1300MHz RX (though frontend not tuned over full range)
+ENABLE_WIDE_RX                := 1       full 18MHz to 1300MHz RX (though front-end/PA not designed for full range)
 ENABLE_TX_WHEN_AM             := 0       allow TX (always FM) when RX is set to AM
 ENABLE_F_CAL_MENU             := 0       enable/disable the radios hidden frequency calibration menu
 ENABLE_CTCSS_TAIL_PHASE_SHIFT := 1       standard CTCSS tail phase shift rather than QS's own 55Hz tone method
-ENABLE_MAIN_KEY_HOLD          := 1       initial F-key press not needed, instead hold down keys 0-9 to access the functions
+ENABLE_MAIN_KEY_HOLD          := 1       initial F-key press not needed, instead just hold down keys 0-9 to access the secondary butt functions
-ENABLE_BOOT_BEEPS             := 0       give user audio feedback on volume knob position at boot-up
+ENABLE_BOOT_BEEPS             := 0       gives user audio feedback on volume knob position at boot-up
-ENABLE_COMPANDER              := 1       compander option (per channel)
 ENABLE_SHOW_CHARGE_LEVEL      := 0       show the charge level when the radio is on charge
 ENABLE_REVERSE_BAT_SYMBOL     := 1       mirror the battery symbol on the status bar (+ pole on the right)
-ENABLE_CODE_SCAN_TIMEOUT      := 0       enable/disable 32-sec CTCSS/DCS scan timeout (press exit butt to end scan if disabled)
+ENABLE_CODE_SCAN_TIMEOUT      := 0       enable/disable 32-sec CTCSS/DCS scan timeout (press exit butt instead of time-out to end scan)
-ENABLE_AM_FIX                 := 1       dynamically adjust the front end gains when in AM mode to helo prevent AM demodulator saturation - ignore the on-screen RSSI (for now)
+ENABLE_AM_FIX                 := 1       dynamically adjust the front end gains when in AM mode to helo prevent AM demodulator saturation, ignore the on-screen RSSI level (for now)
-ENABLE_AM_FIX_SHOW_DATA       := 1       show debug data for the AM fix
+ENABLE_AM_FIX_SHOW_DATA       := 1       show debug data for the AM fix (still tweaking it)
-ENABLE_SQUELCH_LOWER          := 1       squelch settings more sensitive - plan to let user adjust it in the menu
+ENABLE_SQUELCH_MORE_SENSITIVE := 0       make squelch levels a little bit more sensitive - I plan to let user adjust the values themselves
-ENABLE_RSSI_BAR               := 1       enable a dBm/Sx RSSI bar graph level
+ENABLE_FASTER_CHANNEL_SCAN    := 0       increases the channel scan speed, but the squelch is also made more twitchy
+ENABLE_RSSI_BAR               := 1       enable a dBm/Sn RSSI bar graph level inplace of the little antenna symbols
 ENABLE_AUDIO_BAR              := 0       experimental, display an audo bar level when TX'ing
-#ENABLE_COPY_CHAN_TO_VFO      := 1       not yet implemented - copy the channel into the VFO
+ENABLE_COPY_CHAN_TO_VFO       := 1       copy current channel into the other VFO. Long press Menu key ('M')
 #ENABLE_SINGLE_VFO_CHAN       := 1       not yet implemented - single VFO on display when possible
 #ENABLE_BAND_SCOPE            := 1       not yet implemented - spectrum/pan-adapter
 ```
 
+# New/modified function keys
+
+* Long-press 'M' = Copy selected channel into the same VFO, then switches to frequency mode
+* Long-press '5' = Toggle a selected channels scanlist setting .. if NOAA is disable in Makefile
+* Long-press '*' = Toggles the scanlist number 1, 2 or ALL channels .. if in channel scan mode
+
 # Some changes made from the Quansheng firmware
 
 * Various Quansheng firmware bugs fixed

am_fix.c

@@ -30,30 +30,13 @@
 #include "functions.h"
 #include "misc.h"
 
-// original QS front end register settings
-const uint8_t orig_lna_short = 3;   //   0dB
-const uint8_t orig_lna       = 2;   // -14dB
-const uint8_t orig_mixer     = 3;   //   0dB
-const uint8_t orig_pga       = 6;   //  -3dB
-
 #ifdef ENABLE_AM_FIX
 
 	typedef struct
 	{
-		#if 1
+		uint16_t reg_val;
-			// bitfields take up less flash bytes
+		int8_t   gain_dB;
-			uint8_t lna_short:2;   // 0 ~ 3
+	} __attribute__((packed)) t_gain_table;
-			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_gain_table;
-	//} __attribute__((packed)) t_gain_table;
 
 	// REG_10 AGC gain table
 	//
@@ -103,141 +86,140 @@ const uint8_t orig_pga       = 6;   //  -3dB
 	//           if I don't add the brackets, reading the table returns unexpected/different values !!!
 	//
 	//
-//	static const int16_t lna_short_dB[] = {  -19,   -16,   -11,     0};   // was (but wrong)
+////	static const int16_t lna_short_dB[] = {  -19,   -16,   -11,     0};   // was (but wrong)
-	static const int16_t lna_short_dB[] = { (-33), (-30), (-24),    0};   // corrected'ish
+//	static const int16_t lna_short_dB[] = { (-33), (-30), (-24),    0};   // corrected'ish
-	static const int16_t lna_dB[]       = { (-24), (-19), (-14), ( -9), (-6), (-4), (-2), 0};
+//	static const int16_t lna_dB[]       = { (-24), (-19), (-14), ( -9), (-6), (-4), (-2), 0};
-	static const int16_t mixer_dB[]     = { ( -8), ( -6), ( -3),    0};
+//	static const int16_t mixer_dB[]     = { ( -8), ( -6), ( -3),    0};
-	static const int16_t pga_dB[]       = { (-33), (-27), (-21), (-15), (-9), (-6), (-3), 0};
+//	static const int16_t pga_dB[]       = { (-33), (-27), (-21), (-15), (-9), (-6), (-3), 0};
 
 	// lookup table is hugely easier than writing code to do the same
 	//
 	static const t_gain_table gain_table[] =
 	{
-		{.lna_short = 3, .lna = 2, .mixer = 3, .pga = 6},  //  0 0dB -14dB  0dB  -3dB .. -17dB original
+		{0x035E, -17},         //   0 .. 3 2 3 6 ..   0dB -14dB  0dB  -3dB .. -17dB original
 
 #ifdef ENABLE_AM_FIX_TEST1
 
 		// test table that lets me manually set the lna-short register
 		// to measure it's actual dB change using an RF signal generator
 
-		{0, 2, 3, 6},         // 1 .. -33dB  -14dB   0dB  -3dB .. -50dB
+		{0x005E, -50},         //   1 .. 0 2 3 6 .. -33dB -14dB  0dB  -3dB .. -50dB
-		{1, 2, 3, 6},         // 2 .. -30dB  -14dB   0dB  -3dB .. -47dB
+		{0x015E, -47},         //   2 .. 1 2 3 6 .. -30dB -14dB  0dB  -3dB .. -47dB
-		{2, 2, 3, 6},         // 3 .. -24dB  -14dB   0dB  -3dB .. -41dB
+		{0x025E, -41},         //   3 .. 2 2 3 6 .. -24dB -14dB  0dB  -3dB .. -41dB
-		{3, 2, 3, 6}          // 4 ..   0dB  -14dB   0dB  -3dB .. -17dB
+		{0x035E, -17}          //   4 .. 3 2 3 6 ..   0dB -14dB  0dB  -3dB .. -17dB original
 	};
 
-	const unsigned int original_index = 1;
+	static const unsigned int original_index = 1;
 
 #else
 
-		{0, 0, 0, 0},         //   1 .. -33dB -24dB -8dB -33dB .. -98dB
+		{0x0000, -98},         //   1 .. 0 0 0 0 .. -33dB -24dB -8dB -33dB .. -98dB
-		{0, 0, 1, 0},         //   2 .. -33dB -24dB -6dB -33dB .. -96dB
+		{0x0008, -96},         //   2 .. 0 0 1 0 .. -33dB -24dB -6dB -33dB .. -96dB
-		{1, 0, 0, 0},         //   3 .. -30dB -24dB -8dB -33dB .. -95dB
+		{0x0100, -95},         //   3 .. 1 0 0 0 .. -30dB -24dB -8dB -33dB .. -95dB
-		{0, 1, 0, 0},         //   4 .. -33dB -19dB -8dB -33dB .. -93dB
+		{0x0020, -93},         //   4 .. 0 1 0 0 .. -33dB -19dB -8dB -33dB .. -93dB
-		{0, 0, 0, 1},         //   5 .. -33dB -24dB -8dB -27dB .. -92dB
+		{0x0001, -92},         //   5 .. 0 0 0 1 .. -33dB -24dB -8dB -27dB .. -92dB
-		{0, 1, 1, 0},         //   6 .. -33dB -19dB -6dB -33dB .. -91dB
+		{0x0028, -91},         //   6 .. 0 1 1 0 .. -33dB -19dB -6dB -33dB .. -91dB
-		{0, 0, 1, 1},         //   7 .. -33dB -24dB -6dB -27dB .. -90dB
+		{0x0009, -90},         //   7 .. 0 0 1 1 .. -33dB -24dB -6dB -27dB .. -90dB
-		{1, 0, 0, 1},         //   8 .. -30dB -24dB -8dB -27dB .. -89dB
+		{0x0101, -89},         //   8 .. 1 0 0 1 .. -30dB -24dB -8dB -27dB .. -89dB
-		{0, 1, 2, 0},         //   9 .. -33dB -19dB -3dB -33dB .. -88dB
+		{0x0030, -88},         //   9 .. 0 1 2 0 .. -33dB -19dB -3dB -33dB .. -88dB
-		{1, 0, 3, 0},         //  10 .. -30dB -24dB  0dB -33dB .. -87dB
+		{0x0118, -87},         //  10 .. 1 0 3 0 .. -30dB -24dB  0dB -33dB .. -87dB
-		{0, 0, 0, 2},         //  11 .. -33dB -24dB -8dB -21dB .. -86dB
+		{0x0002, -86},         //  11 .. 0 0 0 2 .. -33dB -24dB -8dB -21dB .. -86dB
-		{1, 1, 2, 0},         //  12 .. -30dB -19dB -3dB -33dB .. -85dB
+		{0x0130, -85},         //  12 .. 1 1 2 0 .. -30dB -19dB -3dB -33dB .. -85dB
-		{0, 0, 3, 1},         //  13 .. -33dB -24dB  0dB -27dB .. -84dB
+		{0x0019, -84},         //  13 .. 0 0 3 1 .. -33dB -24dB  0dB -27dB .. -84dB
-		{0, 3, 0, 0},         //  14 .. -33dB  -9dB -8dB -33dB .. -83dB
+		{0x0060, -83},         //  14 .. 0 3 0 0 .. -33dB  -9dB -8dB -33dB .. -83dB
-		{1, 1, 3, 0},         //  15 .. -30dB -19dB  0dB -33dB .. -82dB
+		{0x0138, -82},         //  15 .. 1 1 3 0 .. -30dB -19dB  0dB -33dB .. -82dB
-		{1, 0, 3, 1},         //  16 .. -30dB -24dB  0dB -27dB .. -81dB
+		{0x0119, -81},         //  16 .. 1 0 3 1 .. -30dB -24dB  0dB -27dB .. -81dB
-		{0, 2, 3, 0},         //  17 .. -33dB -14dB  0dB -33dB .. -80dB
+		{0x0058, -80},         //  17 .. 0 2 3 0 .. -33dB -14dB  0dB -33dB .. -80dB
-		{1, 2, 0, 1},         //  18 .. -30dB -14dB -8dB -27dB .. -79dB
+		{0x0141, -79},         //  18 .. 1 2 0 1 .. -30dB -14dB -8dB -27dB .. -79dB
-		{0, 3, 2, 0},         //  19 .. -33dB  -9dB -3dB -33dB .. -78dB
+		{0x0070, -78},         //  19 .. 0 3 2 0 .. -33dB  -9dB -3dB -33dB .. -78dB
-		{1, 4, 0, 0},         //  20 .. -30dB  -6dB -8dB -33dB .. -77dB
+		{0x0180, -77},         //  20 .. 1 4 0 0 .. -30dB  -6dB -8dB -33dB .. -77dB
-		{1, 1, 3, 1},         //  21 .. -30dB -19dB  0dB -27dB .. -76dB
+		{0x0139, -76},         //  21 .. 1 1 3 1 .. -30dB -19dB  0dB -27dB .. -76dB
-		{0, 0, 2, 3},         //  22 .. -33dB -24dB -3dB -15dB .. -75dB
+		{0x0013, -75},         //  22 .. 0 0 2 3 .. -33dB -24dB -3dB -15dB .. -75dB
-		{1, 3, 0, 1},         //  23 .. -30dB  -9dB -8dB -27dB .. -74dB
+		{0x0161, -74},         //  23 .. 1 3 0 1 .. -30dB  -9dB -8dB -27dB .. -74dB
-		{1, 6, 0, 0},         //  24 .. -30dB  -2dB -8dB -33dB .. -73dB
+		{0x01C0, -73},         //  24 .. 1 6 0 0 .. -30dB  -2dB -8dB -33dB .. -73dB
-		{0, 7, 1, 0},         //  25 .. -33dB   0dB -6dB -33dB .. -72dB
+		{0x00E8, -72},         //  25 .. 0 7 1 0 .. -33dB   0dB -6dB -33dB .. -72dB
-		{0, 6, 2, 0},         //  26 .. -33dB  -2dB -3dB -33dB .. -71dB
+		{0x00D0, -71},         //  26 .. 0 6 2 0 .. -33dB  -2dB -3dB -33dB .. -71dB
-		{2, 1, 3, 1},         //  27 .. -24dB -19dB  0dB -27dB .. -70dB
+		{0x0239, -70},         //  27 .. 2 1 3 1 .. -24dB -19dB  0dB -27dB .. -70dB
-		{0, 3, 1, 2},         //  28 .. -33dB  -9dB -6dB -21dB .. -69dB
+		{0x006A, -69},         //  28 .. 0 3 1 2 .. -33dB  -9dB -6dB -21dB .. -69dB
-		{0, 0, 0, 6},         //  29 .. -33dB -24dB -8dB  -3dB .. -68dB
+		{0x0006, -68},         //  29 .. 0 0 0 6 .. -33dB -24dB -8dB  -3dB .. -68dB
-		{0, 5, 2, 1},         //  30 .. -33dB  -4dB -3dB -27dB .. -67dB
+		{0x00B1, -67},         //  30 .. 0 5 2 1 .. -33dB  -4dB -3dB -27dB .. -67dB
-		{0, 0, 1, 6},         //  31 .. -33dB -24dB -6dB  -3dB .. -66dB
+		{0x000E, -66},         //  31 .. 0 0 1 6 .. -33dB -24dB -6dB  -3dB .. -66dB
-		{1, 2, 3, 2},         //  32 .. -30dB -14dB  0dB -21dB .. -65dB
+		{0x015A, -65},         //  32 .. 1 2 3 2 .. -30dB -14dB  0dB -21dB .. -65dB
-		{2, 1, 1, 3},         //  33 .. -24dB -19dB -6dB -15dB .. -64dB
+		{0x022B, -64},         //  33 .. 2 1 1 3 .. -24dB -19dB -6dB -15dB .. -64dB
-		{1, 7, 3, 0},         //  34 .. -30dB   0dB  0dB -33dB .. -63dB
+		{0x01F8, -63},         //  34 .. 1 7 3 0 .. -30dB   0dB  0dB -33dB .. -63dB
-		{1, 3, 0, 3},         //  35 .. -30dB  -9dB -8dB -15dB .. -62dB
+		{0x0163, -62},         //  35 .. 1 3 0 3 .. -30dB  -9dB -8dB -15dB .. -62dB
-		{0, 1, 2, 5},         //  36 .. -33dB -19dB -3dB  -6dB .. -61dB
+		{0x0035, -61},         //  36 .. 0 1 2 5 .. -33dB -19dB -3dB  -6dB .. -61dB
-		{2, 0, 2, 4},         //  37 .. -24dB -24dB -3dB  -9dB .. -60dB
+		{0x0214, -60},         //  37 .. 2 0 2 4 .. -24dB -24dB -3dB  -9dB .. -60dB
-		{1, 6, 3, 1},         //  38 .. -30dB  -2dB  0dB -27dB .. -59dB
+		{0x01D9, -59},         //  38 .. 1 6 3 1 .. -30dB  -2dB  0dB -27dB .. -59dB
-		{1, 2, 0, 5},         //  39 .. -30dB -14dB -8dB  -6dB .. -58dB
+		{0x0145, -58},         //  39 .. 1 2 0 5 .. -30dB -14dB -8dB  -6dB .. -58dB
-		{2, 5, 0, 2},         //  40 .. -24dB  -4dB -8dB -21dB .. -57dB
+		{0x02A2, -57},         //  40 .. 2 5 0 2 .. -24dB  -4dB -8dB -21dB .. -57dB
-		{2, 6, 2, 1},         //  41 .. -24dB  -2dB -3dB -27dB .. -56dB
+		{0x02D1, -56},         //  41 .. 2 6 2 1 .. -24dB  -2dB -3dB -27dB .. -56dB
-		{0, 5, 2, 3},         //  42 .. -33dB  -4dB -3dB -15dB .. -55dB
+		{0x00B3, -55},         //  42 .. 0 5 2 3 .. -33dB  -4dB -3dB -15dB .. -55dB
-		{2, 0, 2, 6},         //  43 .. -24dB -24dB -3dB  -3dB .. -54dB
+		{0x0216, -54},         //  43 .. 2 0 2 6 .. -24dB -24dB -3dB  -3dB .. -54dB
-		{0, 3, 0, 6},         //  44 .. -33dB  -9dB -8dB  -3dB .. -53dB
+		{0x0066, -53},         //  44 .. 0 3 0 6 .. -33dB  -9dB -8dB  -3dB .. -53dB
-		{0, 6, 0, 4},         //  45 .. -33dB  -2dB -8dB  -9dB .. -52dB
+		{0x00C4, -52},         //  45 .. 0 6 0 4 .. -33dB  -2dB -8dB  -9dB .. -52dB
-		{0, 3, 1, 6},         //  46 .. -33dB  -9dB -6dB  -3dB .. -51dB
+		{0x006E, -51},         //  46 .. 0 3 1 6 .. -33dB  -9dB -6dB  -3dB .. -51dB
-		{1, 2, 3, 5},         //  47 .. -30dB -14dB  0dB  -6dB .. -50dB
+		{0x015D, -50},         //  47 .. 1 2 3 5 .. -30dB -14dB  0dB  -6dB .. -50dB
-		{0, 5, 1, 5},         //  48 .. -33dB  -4dB -6dB  -6dB .. -49dB
+		{0x00AD, -49},         //  48 .. 0 5 1 5 .. -33dB  -4dB -6dB  -6dB .. -49dB
-		{0, 3, 3, 5},         //  49 .. -33dB  -9dB  0dB  -6dB .. -48dB
+		{0x007D, -48},         //  49 .. 0 3 3 5 .. -33dB  -9dB  0dB  -6dB .. -48dB
-		{0, 6, 2, 4},         //  50 .. -33dB  -2dB -3dB  -9dB .. -47dB
+		{0x00D4, -47},         //  50 .. 0 6 2 4 .. -33dB  -2dB -3dB  -9dB .. -47dB
-		{1, 5, 2, 4},         //  51 .. -30dB  -4dB -3dB  -9dB .. -46dB
+		{0x01B4, -46},         //  51 .. 1 5 2 4 .. -30dB  -4dB -3dB  -9dB .. -46dB
-		{3, 0, 1, 3},         //  52 ..   0dB -24dB -6dB -15dB .. -45dB
+		{0x030B, -45},         //  52 .. 3 0 1 3 ..   0dB -24dB -6dB -15dB .. -45dB
-		{0, 6, 1, 6},         //  53 .. -33dB  -2dB -6dB  -3dB .. -44dB
+		{0x00CE, -44},         //  53 .. 0 6 1 6 .. -33dB  -2dB -6dB  -3dB .. -44dB
-		{1, 5, 2, 5},         //  54 .. -30dB  -4dB -3dB  -6dB .. -43dB
+		{0x01B5, -43},         //  54 .. 1 5 2 5 .. -30dB  -4dB -3dB  -6dB .. -43dB
-		{0, 4, 2, 7},         //  55 .. -33dB  -6dB -3dB   0dB .. -42dB
+		{0x0097, -42},         //  55 .. 0 4 2 7 .. -33dB  -6dB -3dB   0dB .. -42dB
-		{2, 2, 2, 7},         //  56 .. -24dB -14dB -3dB   0dB .. -41dB
+		{0x0257, -41},         //  56 .. 2 2 2 7 .. -24dB -14dB -3dB   0dB .. -41dB
-		{2, 5, 2, 4},         //  57 .. -24dB  -4dB -3dB  -9dB .. -40dB
+		{0x02B4, -40},         //  57 .. 2 5 2 4 .. -24dB  -4dB -3dB  -9dB .. -40dB
-		{2, 3, 3, 5},         //  58 .. -24dB  -9dB  0dB  -6dB .. -39dB
+		{0x027D, -39},         //  58 .. 2 3 3 5 .. -24dB  -9dB  0dB  -6dB .. -39dB
-		{1, 6, 3, 5},         //  59 .. -30dB  -2dB  0dB  -6dB .. -38dB
+		{0x01DD, -38},         //  59 .. 1 6 3 5 .. -30dB  -2dB  0dB  -6dB .. -38dB
-		{2, 5, 1, 6},         //  60 .. -24dB  -4dB -6dB  -3dB .. -37dB
+		{0x02AE, -37},         //  60 .. 2 5 1 6 .. -24dB  -4dB -6dB  -3dB .. -37dB
-		{3, 3, 3, 1},         //  61 ..   0dB  -9dB  0dB -27dB .. -36dB
+		{0x0379, -36},         //  61 .. 3 3 3 1 ..   0dB  -9dB  0dB -27dB .. -36dB
-		{3, 2, 3, 2},         //  62 ..   0dB -14dB  0dB -21dB .. -35dB
+		{0x035A, -35},         //  62 .. 3 2 3 2 ..   0dB -14dB  0dB -21dB .. -35dB
-		{2, 5, 2, 6},         //  63 .. -24dB  -4dB -3dB  -3dB .. -34dB
+		{0x02B6, -34},         //  63 .. 2 5 2 6 .. -24dB  -4dB -3dB  -3dB .. -34dB
-		{3, 0, 1, 6},         //  64 ..   0dB -24dB -6dB  -3dB .. -33dB
+		{0x030E, -33},         //  64 .. 3 0 1 6 ..   0dB -24dB -6dB  -3dB .. -33dB
-		{3, 0, 0, 7},         //  65 ..   0dB -24dB -8dB   0dB .. -32dB
+		{0x0307, -32},         //  65 .. 3 0 0 7 ..   0dB -24dB -8dB   0dB .. -32dB
-		{2, 5, 3, 6},         //  66 .. -24dB  -4dB  0dB  -3dB .. -31dB
+		{0x02BE, -31},         //  66 .. 2 5 3 6 .. -24dB  -4dB  0dB  -3dB .. -31dB
-		{3, 3, 3, 2},         //  67 ..   0dB  -9dB  0dB -21dB .. -30dB
+		{0x037A, -30},         //  67 .. 3 3 3 2 ..   0dB  -9dB  0dB -21dB .. -30dB
-		{2, 6, 3, 6},         //  68 .. -24dB  -2dB  0dB  -3dB .. -29dB
+		{0x02DE, -29},         //  68 .. 2 6 3 6 .. -24dB  -2dB  0dB  -3dB .. -29dB
-		{3, 2, 0, 5},         //  69 ..   0dB -14dB -8dB  -6dB .. -28dB
+		{0x0345, -28},         //  69 .. 3 2 0 5 ..   0dB -14dB -8dB  -6dB .. -28dB
-		{3, 5, 0, 3},         //  70 ..   0dB  -4dB -8dB -15dB .. -27dB
+		{0x03A3, -27},         //  70 .. 3 5 0 3 ..   0dB  -4dB -8dB -15dB .. -27dB
-		{3, 3, 0, 4},         //  71 ..   0dB  -9dB -8dB  -9dB .. -26dB
+		{0x0364, -26},         //  71 .. 3 3 0 4 ..   0dB  -9dB -8dB  -9dB .. -26dB
-		{3, 1, 1, 7},         //  72 ..   0dB -19dB -6dB   0dB .. -25dB
+		{0x032F, -25},         //  72 .. 3 1 1 7 ..   0dB -19dB -6dB   0dB .. -25dB
-		{3, 4, 2, 3},         //  73 ..   0dB  -6dB -3dB -15dB .. -24dB
+		{0x0393, -24},         //  73 .. 3 4 2 3 ..   0dB  -6dB -3dB -15dB .. -24dB
-		{3, 4, 0, 4},         //  74 ..   0dB  -6dB -8dB  -9dB .. -23dB
+		{0x0384, -23},         //  74 .. 3 4 0 4 ..   0dB  -6dB -8dB  -9dB .. -23dB
-		{3, 2, 0, 7},         //  75 ..   0dB -14dB -8dB   0dB .. -22dB
+		{0x0347, -22},         //  75 .. 3 2 0 7 ..   0dB -14dB -8dB   0dB .. -22dB
-		{3, 7, 1, 3},         //  76 ..   0dB   0dB -6dB -15dB .. -21dB
+		{0x03EB, -21},         //  76 .. 3 7 1 3 ..   0dB   0dB -6dB -15dB .. -21dB
-		{3, 6, 2, 3},         //  77 ..   0dB  -2dB -3dB -15dB .. -20dB
+		{0x03D3, -20},         //  77 .. 3 6 2 3 ..   0dB  -2dB -3dB -15dB .. -20dB
-		{3, 5, 3, 3},         //  78 ..   0dB  -4dB  0dB -15dB .. -19dB
+		{0x03BB, -19},         //  78 .. 3 5 3 3 ..   0dB  -4dB  0dB -15dB .. -19dB
-		{3, 3, 3, 4},         //  79 ..   0dB  -9dB  0dB  -9dB .. -18dB
+		{0x037C, -18},         //  79 .. 3 3 3 4 ..   0dB  -9dB  0dB  -9dB .. -18dB
-		{3, 2, 3, 6},         //  80 ..   0dB -14dB  0dB  -3dB .. -17dB original
+		{0x035E, -17},         //  80 .. 3 2 3 6 ..   0dB -14dB  0dB  -3dB .. -17dB original
-		{3, 6, 0, 5},         //  81 ..   0dB  -2dB -8dB  -6dB .. -16dB
+		{0x03C5, -16},         //  81 .. 3 6 0 5 ..   0dB  -2dB -8dB  -6dB .. -16dB
-		{3, 7, 1, 4},         //  82 ..   0dB   0dB -6dB  -9dB .. -15dB
+		{0x03EC, -15},         //  82 .. 3 7 1 4 ..   0dB   0dB -6dB  -9dB .. -15dB
-		{3, 2, 3, 7},         //  83 ..   0dB -14dB  0dB   0dB .. -14dB
+		{0x035F, -14},         //  83 .. 3 2 3 7 ..   0dB -14dB  0dB   0dB .. -14dB
-		{3, 6, 0, 6},         //  84 ..   0dB  -2dB -8dB  -3dB .. -13dB
+		{0x03C6, -13},         //  84 .. 3 6 0 6 ..   0dB  -2dB -8dB  -3dB .. -13dB
-		{3, 3, 2, 7},         //  85 ..   0dB  -9dB -3dB   0dB .. -12dB
+		{0x0377, -12},         //  85 .. 3 3 2 7 ..   0dB  -9dB -3dB   0dB .. -12dB
-		{3, 7, 0, 6},         //  86 ..   0dB   0dB -8dB  -3dB .. -11dB
+		{0x03E6, -11},         //  86 .. 3 7 0 6 ..   0dB   0dB -8dB  -3dB .. -11dB
-		{3, 5, 3, 5},         //  87 ..   0dB  -4dB  0dB  -6dB .. -10dB
+		{0x03BD, -10},         //  87 .. 3 5 3 5 ..   0dB  -4dB  0dB  -6dB .. -10dB
-		{3, 7, 2, 5},         //  88 ..   0dB   0dB -3dB  -6dB ..  -9dB
+		{0x03F5,  -9},         //  88 .. 3 7 2 5 ..   0dB   0dB -3dB  -6dB ..  -9dB
-		{3, 6, 3, 5},         //  89 ..   0dB  -2dB  0dB  -6dB ..  -8dB
+		{0x03DD,  -8},         //  89 .. 3 6 3 5 ..   0dB  -2dB  0dB  -6dB ..  -8dB
-		{3, 5, 2, 7},         //  90 ..   0dB  -4dB -3dB   0dB ..  -7dB
+		{0x03B7,  -7},         //  90 .. 3 5 2 7 ..   0dB  -4dB -3dB   0dB ..  -7dB
-		{3, 7, 2, 6},         //  91 ..   0dB   0dB -3dB  -3dB ..  -6dB
+		{0x03F6,  -6},         //  91 .. 3 7 2 6 ..   0dB   0dB -3dB  -3dB ..  -6dB
-		{3, 6, 2, 7},         //  92 ..   0dB  -2dB -3dB   0dB ..  -5dB
+		{0x03D7,  -5},         //  92 .. 3 6 2 7 ..   0dB  -2dB -3dB   0dB ..  -5dB
-		{3, 5, 3, 7},         //  93 ..   0dB  -4dB  0dB   0dB ..  -4dB
+		{0x03BF,  -4},         //  93 .. 3 5 3 7 ..   0dB  -4dB  0dB   0dB ..  -4dB
-		{3, 7, 2, 7},         //  94 ..   0dB   0dB -3dB   0dB ..  -3dB
+		{0x03F7,  -3},         //  94 .. 3 7 2 7 ..   0dB   0dB -3dB   0dB ..  -3dB
-		{3, 6, 3, 7},         //  95 ..   0dB  -2dB  0dB   0dB ..  -2dB
+		{0x03DF,  -2},         //  95 .. 3 6 3 7 ..   0dB  -2dB  0dB   0dB ..  -2dB
-		{3, 7, 3, 7}          //  96 ..   0dB   0dB  0dB   0dB ..   0dB
+		{0x03FF,   0}          //  96 .. 3 7 3 7 ..   0dB   0dB  0dB   0dB ..   0dB
 	};
 
-	const unsigned int original_index = 80;
+	static const unsigned int original_index = 80;
 
 #endif
 
-	// total RF gain for each table index
+	#ifdef ENABLE_AM_FIX_SHOW_DATA
-	int8_t gain_dB[ARRAY_SIZE(gain_table)] = {0};
+		// display update rate
-
+		static const unsigned int display_update_rate = 250 / 10;   // max 250ms display update rate
-	// display update rate
+		unsigned int counter = 0;
-	const unsigned int display_update_rate = 250 / 10;   // max 250ms display update rate
+	#endif
-	unsigned int counter = 0;
 
 	#ifdef ENABLE_AM_FIX_TEST1
 		// user manually sets the table index .. used to calibrate the desired dB gain table
@@ -280,13 +262,6 @@ const uint8_t orig_pga       = 6;   //  -3dB
 			#endif
 		}
 
-		// pre-compute the total gain for each table index .. saves doing it in real time
-		for (i = 0; i < ARRAY_SIZE(gain_table); i++)
-		{
-			const t_gain_table gains = gain_table[i];
-			gain_dB[i] = lna_short_dB[gains.lna_short] + lna_dB[gains.lna] + mixer_dB[gains.mixer] + pga_dB[gains.pga];
-		}
-
 		#if 0
 		{	// set a maximum gain to use
 //			const int16_t max_gain_dB = gain_dB[original_index];
@@ -294,7 +269,8 @@ const uint8_t orig_pga       = 6;   //  -3dB
 
 			max_index = ARRAY_SIZE(gain_table);
 			while (--max_index > 1)
-				if (gain_dB[max_index] <= max_gain_dB)
+//				if (gain_dB[max_index] <= max_gain_dB)
+				if (gain_table[max_index].gain_dB <= max_gain_dB)
 					break;
 		}
 		#else
@@ -306,7 +282,9 @@ const uint8_t orig_pga       = 6;   //  -3dB
 	void AM_fix_reset(const int vfo)
 	{	// reset the AM fixer upper
 
-		counter = 0;
+		#ifdef ENABLE_AM_FIX_SHOW_DATA
+			counter = 0;
+		#endif
 
 		prev_rssi[vfo] = 0;
 
@@ -340,7 +318,9 @@ const uint8_t orig_pga       = 6;   //  -3dB
 			case FUNCTION_TRANSMIT:
 			case FUNCTION_BAND_SCOPE:
 			case FUNCTION_POWER_SAVE:
-				counter = display_update_rate;  // queue up a display update as soon as we switch to RX mode
+				#ifdef ENABLE_AM_FIX_SHOW_DATA
+					counter = display_update_rate;  // queue up a display update as soon as we switch to RX mode
+				#endif
 				return;
 
 			// only adjust stuff if we're in one of these modes
@@ -351,14 +331,16 @@ const uint8_t orig_pga       = 6;   //  -3dB
 				break;
 		}
 
-		if (counter > 0)
+		#ifdef ENABLE_AM_FIX_SHOW_DATA
-		{
+			if (counter > 0)
-			if (++counter >= display_update_rate)
+			{
-			{	// trigger a display update
+				if (++counter >= display_update_rate)
-				counter        = 0;
+				{	// trigger a display update
-				gUpdateDisplay = true;
+					counter        = 0;
+					gUpdateDisplay = true;
+				}
 			}
-		}
+		#endif
 
 		{	// sample the current RSSI level
 			// average it with the previous rssi (a bit of noise/spike immunity)
@@ -367,11 +349,14 @@ const uint8_t orig_pga       = 6;   //  -3dB
 			prev_rssi[vfo]         = new_rssi;
 		}
 
-		{	// save the corrected RSSI level
+		// save the corrected RSSI level
+		#ifdef ENABLE_AM_FIX_SHOW_DATA
+		{
 			const int16_t new_rssi = rssi - rssi_gain_diff[vfo];
 			if (gCurrentRSSI[vfo] != new_rssi)
 			{
 				gCurrentRSSI[vfo] = new_rssi;
+		
 				if (counter == 0)
 				{	// trigger a display update
 					counter        = 1;
@@ -379,6 +364,9 @@ const uint8_t orig_pga       = 6;   //  -3dB
 				}
 			}
 		}
+		#else
+			gCurrentRSSI[vfo] = rssi - rssi_gain_diff[vfo];
+		#endif
 
 #ifdef ENABLE_AM_FIX_TEST1
 		// user is manually adjusting a gain register - don't do anything automatically
@@ -411,10 +399,12 @@ const uint8_t orig_pga       = 6;   //  -3dB
 			if (diff_dB >= 10)
 			{	// jump immediately to a new gain setting
 				// this greatly speeds up initial gain reduction (but reduces noise/spike immunity)
-				const int16_t desired_gain_dB = (int16_t)gain_dB[index] - diff_dB + 8; // get no closer than 8dB (bit of noise/spike immunity)
+
+				const int16_t desired_gain_dB = (int16_t)gain_table[index].gain_dB - diff_dB + 8; // get no closer than 8dB (bit of noise/spike immunity)
+
 				// scan the table to see what index to jump straight too
 				while (index > 1)
-					if (gain_dB[--index] <= desired_gain_dB)
+					if (gain_table[--index].gain_dB <= desired_gain_dB)
 						break;
 
 				//index = (gain_table_index[vfo] + index) / 2;  // easy does it
@@ -449,7 +439,7 @@ const uint8_t orig_pga       = 6;   //  -3dB
 
 		#if 0
 			if (gain_table_index[vfo] == gain_table_index_prev[vfo])
-				return;     // no gain change
+				return;     // no gain change - this is to reduce writing to the BK chip on ever call
 		#endif
 
 #endif
@@ -461,33 +451,35 @@ const uint8_t orig_pga       = 6;   //  -3dB
 			// remember the new table index
 			gain_table_index_prev[vfo] = index;
 
-			const t_gain_table gains = gain_table[index];
+			BK4819_WriteRegister(BK4819_REG_13, gain_table[index].reg_val);
-			BK4819_WriteRegister(BK4819_REG_13, ((uint16_t)gains.lna_short << 8) | ((uint16_t)gains.lna << 5) | ((uint16_t)gains.mixer << 3) | ((uint16_t)gains.pga << 0));
 
 			// offset the RSSI reading to the rest of the firmware to cancel out the gain adjustments we make
 
 			// RF gain difference from original QS setting
-			rssi_gain_diff[vfo] = ((int16_t)gain_dB[index] - gain_dB[original_index]) * 2;
+			rssi_gain_diff[vfo] = ((int16_t)gain_table[index].gain_dB - gain_table[original_index].gain_dB) * 2;
 		}
 
 		// save the corrected RSSI level
 		gCurrentRSSI[vfo] = rssi - rssi_gain_diff[vfo];
 
-		if (counter == 0)
+		#ifdef ENABLE_AM_FIX_SHOW_DATA
-		{
+			if (counter == 0)
-			counter        = 1;
+			{
-			gUpdateDisplay = true;
+				counter        = 1;
-		}
+				gUpdateDisplay = true;
+			}
+		#endif
 	}
 
 	#ifdef ENABLE_AM_FIX_SHOW_DATA
 
 		void AM_fix_print_data(const int vfo, char *s)
 		{
-			if (s != NULL)
+			if (s != NULL && vfo >= 0 && vfo < ARRAY_SIZE(gain_table_index))
 			{
 				const unsigned int index = gain_table_index[vfo];
-				sprintf(s, "%2u.%u %4ddB %3u", index, ARRAY_SIZE(gain_table) - 1, gain_dB[index], prev_rssi[vfo]);
+//				sprintf(s, "%2u.%u %4ddB %3u", index, ARRAY_SIZE(gain_table) - 1, gain_table[index].gain_dB, prev_rssi[vfo]);
+				sprintf(s, "%2u %4ddB %3u", index, gain_table[index].gain_dB, prev_rssi[vfo]);
 				counter = 0;
 			}
 		}

am_fix.h

@@ -20,11 +20,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-extern const uint8_t orig_lna_short;
-extern const uint8_t orig_lna;
-extern const uint8_t orig_mixer;
-extern const uint8_t orig_pga;
-
 #ifdef ENABLE_AM_FIX
 	extern int16_t rssi_gain_diff[2];
 

app/action.c

@@ -109,7 +109,7 @@ void ACTION_Monitor(void)
 		}
 		else
 	#endif
-		gRequestDisplayScreen = gScreenToDisplay;
+			gRequestDisplayScreen = gScreenToDisplay;
 }
 
 void ACTION_Scan(bool bRestart)
@@ -184,10 +184,16 @@ void ACTION_Scan(bool bRestart)
 
 			if (gScanState != SCAN_OFF)
 			{
-				SCANNER_Stop();
+				#if 1
+					// keep scanning but toggle between scan lists
+					gEeprom.SCAN_LIST_DEFAULT = (gEeprom.SCAN_LIST_DEFAULT + 1) % 3;
+					gUpdateStatus = true;
+				#else
+					SCANNER_Stop();
 
-				#ifdef ENABLE_VOICE
+					#ifdef ENABLE_VOICE
-					gAnotherVoiceID = VOICE_ID_SCANNING_STOP;
+						gAnotherVoiceID = VOICE_ID_SCANNING_STOP;
+					#endif
 				#endif
 			}
 			else
@@ -200,7 +206,7 @@ void ACTION_Scan(bool bRestart)
 				#endif
 
 				// clear the other vfo's rssi level (to hide the antenna symbol)
-				gVFO_RSSI_bar_level[gEeprom.RX_CHANNEL == 0] = 0;
+				gVFO_RSSI_bar_level[(gEeprom.RX_CHANNEL + 1) & 1u] = 0;
 
 				// let the user see DW is not active
 				gDualWatchActive = false;
@@ -210,33 +216,39 @@ void ACTION_Scan(bool bRestart)
 	}
 	else
 	if (!bRestart)
-	{	// scanning
+	{	// keep scanning but toggle between scan lists
-
+		gEeprom.SCAN_LIST_DEFAULT = (gEeprom.SCAN_LIST_DEFAULT + 1) % 3;
+		gUpdateStatus = true;
+	}
+	else
+	{	// stop scanning
 		gMonitor = false;
-
+	
 		SCANNER_Stop();
-
+	
 		#ifdef ENABLE_VOICE
 			gAnotherVoiceID = VOICE_ID_SCANNING_STOP;
 		#endif
-
+	
 		gRequestDisplayScreen = DISPLAY_MAIN;
 	}
 }
 
-void ACTION_Vox(void)
+#ifdef ENABLE_VOX
-{
+	void ACTION_Vox(void)
-	gEeprom.VOX_SWITCH   = !gEeprom.VOX_SWITCH;
+	{
-	gRequestSaveSettings = true;
+		gEeprom.VOX_SWITCH   = !gEeprom.VOX_SWITCH;
-	gFlagReconfigureVfos = true;
+		gRequestSaveSettings = true;
-	#ifdef ENABLE_VOICE
+		gFlagReconfigureVfos = true;
-		gAnotherVoiceID  = VOICE_ID_VOX;
+		#ifdef ENABLE_VOICE
-	#endif
+			gAnotherVoiceID  = VOICE_ID_VOX;
-	gUpdateStatus        = true;
+		#endif
-}
+		gUpdateStatus        = true;
+	}
+#endif
 
 #if defined(ENABLE_ALARM) || defined(ENABLE_TX1750)
-	static void ACTION_AlarmOr1750(bool b1750)
+	static void ACTION_AlarmOr1750(const bool b1750)
 	{
 		gInputBoxIndex = 0;
 
@@ -251,7 +263,9 @@ void ACTION_Vox(void)
 		#endif
 
 		gFlagPrepareTX = true;
-		gRequestDisplayScreen = DISPLAY_MAIN;
+
+		if (gScreenToDisplay != DISPLAY_MENU)     // 1of11 .. don't close the menu
+			gRequestDisplayScreen = DISPLAY_MAIN;
 	}
 #endif
 
@@ -266,8 +280,11 @@ void ACTION_Vox(void)
 				FM_TurnOff();
 
 				gInputBoxIndex        = 0;
-				gVoxResumeCountdown   = 80;
+				#ifdef ENABLE_VOX
+					gVoxResumeCountdown = 80;
+				#endif
 				gFlagReconfigureVfos  = true;
+
 				gRequestDisplayScreen = DISPLAY_MAIN;
 				return;
 			}
@@ -279,7 +296,8 @@ void ACTION_Vox(void)
 
 			FM_Start();
 
-			gInputBoxIndex        = 0;
+			gInputBoxIndex = 0;
+
 			gRequestDisplayScreen = DISPLAY_FM;
 		}
 	}
@@ -365,7 +383,9 @@ void ACTION_Handle(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 			ACTION_Scan(true);
 			break;
 		case ACTION_OPT_VOX:
-			ACTION_Vox();
+			#ifdef ENABLE_VOX
+				ACTION_Vox();
+			#endif
 			break;
 		case ACTION_OPT_ALARM:
 			#ifdef ENABLE_ALARM

app/action.h

@@ -23,7 +23,9 @@
 void ACTION_Power(void);
 void ACTION_Monitor(void);
 void ACTION_Scan(bool bFlag);
-void ACTION_Vox(void);
+#ifdef ENABLE_VOX
+	void ACTION_Vox(void);
+#endif
 #ifdef ENABLE_ALARM
 	//static void ACTION_AlarmOr1750(bool b1750)
 #endif

app/app.c

@@ -62,6 +62,12 @@
 #include "ui/status.h"
 #include "ui/ui.h"
 
+// original QS front end register settings
+const uint8_t orig_lna_short = 3;   //   0dB
+const uint8_t orig_lna       = 2;   // -14dB
+const uint8_t orig_mixer     = 3;   //   0dB
+const uint8_t orig_pga       = 6;   //  -3dB
+
 static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld);
 
 static void updateRSSI(const int vfo)
@@ -157,6 +163,7 @@ static void APP_CheckForIncoming(void)
 				updateRSSI(gEeprom.RX_CHANNEL);
 				gUpdateRSSI = true;
 			}
+
 			return;
 		}
 
@@ -223,7 +230,7 @@ static void APP_HandleIncoming(void)
 		if (gRxVfo->DTMF_DECODING_ENABLE || gSetting_KILLED)
 		{	// DTMF DCD is enabled
 
-//			DTMF_HandleRequest();
+			DTMF_HandleRequest();
 
 			if (gDTMF_CallState == DTMF_CALL_STATE_NONE)
 			{
@@ -461,6 +468,9 @@ static void APP_HandleFunction(void)
 
 void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
 {
+	const unsigned int chan = gEeprom.RX_CHANNEL;
+//	const unsigned int chan = gRxVfo->CHANNEL_SAVE;
+
 	if (gSetting_KILLED)
 		return;
 
@@ -469,19 +479,15 @@ void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
 			BK1080_Init(0, false);
 	#endif
 
-	#ifdef ENABLE_AM_FIX
-		if (gEeprom.VfoInfo[gEeprom.RX_CHANNEL].AM_mode && reset_am_fix)
-			AM_fix_reset(gEeprom.RX_CHANNEL);      // TODO: only reset it when moving channel/frequency
-	#endif
-
 	// clear the other vfo's rssi level (to hide the antenna symbol)
-	gVFO_RSSI_bar_level[gEeprom.RX_CHANNEL == 0] = 0;
+	gVFO_RSSI_bar_level[(chan + 1) & 1u] = 0;
 
 	GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
 
 	gEnableSpeaker = true;
 
-	BACKLIGHT_TurnOn();
+	if (gSetting_backlight_on_tx_rx >= 2)
+		BACKLIGHT_TurnOn();
 
 	if (gScanState != SCAN_OFF)
 	{
@@ -509,19 +515,22 @@ void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
 	#ifdef ENABLE_NOAA
 		if (IS_NOAA_CHANNEL(gRxVfo->CHANNEL_SAVE) && gIsNoaaMode)
 		{
-			gRxVfo->CHANNEL_SAVE                      = gNoaaChannel + NOAA_CHANNEL_FIRST;
+			gRxVfo->CHANNEL_SAVE        = gNoaaChannel + NOAA_CHANNEL_FIRST;
-			gRxVfo->pRX->Frequency                    = NoaaFrequencyTable[gNoaaChannel];
+			gRxVfo->pRX->Frequency      = NoaaFrequencyTable[gNoaaChannel];
-			gRxVfo->pTX->Frequency                    = NoaaFrequencyTable[gNoaaChannel];
+			gRxVfo->pTX->Frequency      = NoaaFrequencyTable[gNoaaChannel];
-			gEeprom.ScreenChannel[gEeprom.RX_CHANNEL] = gRxVfo->CHANNEL_SAVE;
+			gEeprom.ScreenChannel[chan] = gRxVfo->CHANNEL_SAVE;
-			gNOAA_Countdown_10ms                      = 500;   // 5 sec
+
-			gScheduleNOAA                             = false;
+			gNOAA_Countdown_10ms        = 500;   // 5 sec
+			gScheduleNOAA               = false;
 		}
 	#endif
 
 	if (gCssScanMode != CSS_SCAN_MODE_OFF)
 		gCssScanMode = CSS_SCAN_MODE_FOUND;
 
-	if (gScanState == SCAN_OFF && gCssScanMode == CSS_SCAN_MODE_OFF && gEeprom.DUAL_WATCH != DUAL_WATCH_OFF)
+	if (gScanState == SCAN_OFF &&
+	    gCssScanMode == CSS_SCAN_MODE_OFF &&
+	    gEeprom.DUAL_WATCH != DUAL_WATCH_OFF)
 	{	// not scanning, dual watch is enabled
 
 		gDualWatchCountdown_10ms = dual_watch_count_after_2_10ms;
@@ -534,53 +543,31 @@ void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
 		gUpdateStatus    = true;
 	}
 
-	// ******************************************
+	{	// RF RX front end gain
 
-	// original setting
+		// original setting
-	uint8_t lna_short = orig_lna_short;
+		uint16_t lna_short = orig_lna_short;
-	uint8_t lna       = orig_lna;
+		uint16_t lna       = orig_lna;
-	uint8_t mixer     = orig_mixer;
+		uint16_t mixer     = orig_mixer;
-	uint8_t pga       = orig_pga;
+		uint16_t pga       = orig_pga;
 
-	if (gRxVfo->AM_mode)
+		#ifdef ENABLE_AM_FIX
-	{	// AM
+			if (gRxVfo->AM_mode && gSetting_AM_fix)
-/*
+			{	// AM RX mode
-		#ifndef ENABLE_AM_FIX
+				if (reset_am_fix)
-			const uint32_t rx_frequency = gRxVfo->pRX->Frequency;
+					AM_fix_reset(chan);      // TODO: only reset it when moving channel/frequency
-
+				AM_fix_10ms(chan);
-			// the RX gain abrutly reduces above this frequency
-			// I guess this is (one of) the freq the hardware switches the front ends over ?
-			if (rx_frequency <= 22640000)
-			{	// decrease front end gain - AM demodulator saturates at a slightly higher signal level
-				lna_short = 3;   // 3 original
-				lna       = 2;   // 2 original
-				mixer     = 3;   // 3 original
-				pga       = 3;   // 6 original, 3 reduced
 			}
 			else
-			{	// increase the front end to compensate the reduced gain, but more gain decreases dynamic range :(
+			{	// FM RX mode
-				lna_short = 3;   // 3 original
+				BK4819_WriteRegister(BK4819_REG_13, (lna_short << 8) | (lna << 5) | (mixer << 3) | (pga << 0));
-				lna       = 4;   // 2 original, 4 increased
-				mixer     = 3;   // 3 original
-				pga       = 7;   // 6 original, 7 increased
 			}
+		#else
+			BK4819_WriteRegister(BK4819_REG_13, (lna_short << 8) | (lna << 5) | (mixer << 3) | (pga << 0));
 		#endif
-*/
-		// what do these 4 other gain settings do ???
-		//BK4819_WriteRegister(BK4819_REG_12, 0x037B);  // 000000 11 011 11 011
-		//BK4819_WriteRegister(BK4819_REG_11, 0x027B);  // 000000 10 011 11 011
-		//BK4819_WriteRegister(BK4819_REG_10, 0x007A);  // 000000 00 011 11 010
-		//BK4819_WriteRegister(BK4819_REG_14, 0x0019);  // 000000 00 000 11 001
-
-		gNeverUsed = 0;
 	}
 
-	// apply the front end gain settings
+	// AF gain - original QS values
-	BK4819_WriteRegister(BK4819_REG_13, ((uint16_t)lna_short << 8) | ((uint16_t)lna << 5) | ((uint16_t)mixer << 3) | ((uint16_t)pga << 0));
-
-	// ******************************************
-
-	// AF gain - original
 	BK4819_WriteRegister(BK4819_REG_48,
 		(11u << 12)                |     // ??? .. 0 to 15, doesn't seem to make any difference
 		( 0u << 10)                |     // AF Rx Gain-1
@@ -588,9 +575,9 @@ void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
 		(gEeprom.DAC_GAIN    << 0));     // AF DAC Gain (after Gain-1 and Gain-2)
 
 	#ifdef ENABLE_VOICE
-		if (gVoiceWriteIndex == 0)
+		if (gVoiceWriteIndex == 0)       // AM/FM RX mode will be set when the voice has finished
 	#endif
-			BK4819_SetAF(gRxVfo->AM_mode ? BK4819_AF_AM : BK4819_AF_OPEN);
+			BK4819_SetAF(gRxVfo->AM_mode ? BK4819_AF_AM : BK4819_AF_FM);  // no need, set it now
 
 	FUNCTION_Select(Function);
 
@@ -600,11 +587,13 @@ void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
 		if (Function == FUNCTION_MONITOR)
 	#endif
 	{	// squelch is disabled
-		GUI_SelectNextDisplay(DISPLAY_MAIN);
+		if (gScreenToDisplay != DISPLAY_MENU)     // 1of11 .. don't close the menu
-		return;
+			GUI_SelectNextDisplay(DISPLAY_MAIN);
 	}
+	else
+		gUpdateDisplay = true;
 
-	gUpdateDisplay = true;
+	gUpdateStatus = true;
 }
 
 uint32_t APP_SetFrequencyByStep(VFO_Info_t *pInfo, int8_t Step)
@@ -642,7 +631,7 @@ static void FREQ_NextChannel(void)
 	RADIO_SetupRegisters(true);
 
 //	ScanPauseDelayIn_10ms = scan_pause_delay_in_6_10ms;
-	ScanPauseDelayIn_10ms = 10;  // 100ms
+	ScanPauseDelayIn_10ms = 10;  // 100ms .. it don't like any faster :(
 
 	bScanKeepFrequency = false;
 	gUpdateDisplay     = true;
@@ -650,12 +639,12 @@ static void FREQ_NextChannel(void)
 
 static void MR_NextChannel(void)
 {
-	static unsigned int prev_mr_chan = 0;
+	static int prev_mr_chan = 0;
-	const bool          enabled      = gEeprom.SCAN_LIST_ENABLED[gEeprom.SCAN_LIST_DEFAULT];
+	const bool enabled      = (gEeprom.SCAN_LIST_DEFAULT < 2) ? gEeprom.SCAN_LIST_ENABLED[gEeprom.SCAN_LIST_DEFAULT] : true;
-	const unsigned int  chan1        = gEeprom.SCANLIST_PRIORITY_CH1[gEeprom.SCAN_LIST_DEFAULT];
+	const int  chan1        = (gEeprom.SCAN_LIST_DEFAULT < 2) ? gEeprom.SCANLIST_PRIORITY_CH1[gEeprom.SCAN_LIST_DEFAULT] : -1;
-	const unsigned int  chan2        = gEeprom.SCANLIST_PRIORITY_CH2[gEeprom.SCAN_LIST_DEFAULT];
+	const int  chan2        = (gEeprom.SCAN_LIST_DEFAULT < 2) ? gEeprom.SCANLIST_PRIORITY_CH2[gEeprom.SCAN_LIST_DEFAULT] : -1;
-	const unsigned int  prev_chan    = gNextMrChannel;
+	const int  prev_chan    = gNextMrChannel;
-	unsigned int        chan         = 0;
+	int        chan         = 0;
 
 	if (enabled)
 	{
@@ -663,29 +652,34 @@ static void MR_NextChannel(void)
 		{
 			case SCAN_NEXT_CHAN_SCANLIST1:
 				prev_mr_chan = gNextMrChannel;
-				if (RADIO_CheckValidChannel(chan1, false, 0))
+	
+				if (chan1 >= 0)
 				{
-					//gCurrentScanList = SCAN_NEXT_CHAN_SCANLIST1;
+					if (RADIO_CheckValidChannel(chan1, false, 0))
-					gNextMrChannel = chan1;
+					{
-					break;
+						//gCurrentScanList = SCAN_NEXT_CHAN_SCANLIST1;
+						gNextMrChannel = chan1;
+						break;
+					}
 				}
-
+				
 			case SCAN_NEXT_CHAN_SCANLIST2:
-				if (RADIO_CheckValidChannel(chan2, false, 0))
+				if (chan2 >= 0)
 				{
-					gCurrentScanList = SCAN_NEXT_CHAN_SCANLIST2;
+					if (RADIO_CheckValidChannel(chan2, false, 0))
-					gNextMrChannel   = chan2;
+					{
-					break;
+						gCurrentScanList = SCAN_NEXT_CHAN_SCANLIST2;
+						gNextMrChannel   = chan2;
+						break;
+					}
 				}
-
+				
-				// this bit doesn't work at all :(
+				// this bit doesn't work at all - yet :(
 			case SCAN_NEXT_CHAN_DUAL_WATCH:
 //				if (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF)
 				{
 //					chan = (gEeprom.RX_CHANNEL + 1) & 1u;
-//					chan = gEeprom.MrChannel[chan];
 //					chan = gEeprom.ScreenChannel[chan];
-//					chan = gEeprom.VfoInfo[chan].CHANNEL_SAVE;
 //					chan = 14;
 //					if (RADIO_CheckValidChannel(chan, false, 0))
 //					{
@@ -706,7 +700,7 @@ static void MR_NextChannel(void)
 
 	if (!enabled || chan == 0xffffffff)
 	{
-		chan = RADIO_FindNextChannel(gNextMrChannel + gScanState, gScanState, true, gEeprom.SCAN_LIST_DEFAULT);
+		chan = RADIO_FindNextChannel(gNextMrChannel + gScanState, gScanState, (gEeprom.SCAN_LIST_DEFAULT < 2) ? true : false, gEeprom.SCAN_LIST_DEFAULT);
 		if (chan == 0xFF)
 			return;
 
@@ -724,8 +718,11 @@ static void MR_NextChannel(void)
 		gUpdateDisplay = true;
 	}
 
-//	ScanPauseDelayIn_10ms = scan_pause_delay_in_3_10ms;
+	#ifdef ENABLE_FASTER_CHANNEL_SCAN
-	ScanPauseDelayIn_10ms = 8;  // 80ms .. <= ~60ms it misses signals (squelch response and/or PLL lock time) ?
+		ScanPauseDelayIn_10ms = 8;  // 80ms .. <= ~60ms it misses signals (squelch response and/or PLL lock time) ?
+	#else
+		ScanPauseDelayIn_10ms = scan_pause_delay_in_3_10ms;
+	#endif
 
 	bScanKeepFrequency = false;
 
@@ -860,36 +857,38 @@ void APP_CheckRadioInterrupts(void)
 		if (interrupt_status_bits & BK4819_REG_02_CTCSS_FOUND)
 			g_CTCSS_Lost = false;
 
-		if (interrupt_status_bits & BK4819_REG_02_VOX_LOST)
+		#ifdef ENABLE_VOX
-		{
+			if (interrupt_status_bits & BK4819_REG_02_VOX_LOST)
-			g_VOX_Lost         = true;
-			gVoxPauseCountdown = 10;
-
-			if (gEeprom.VOX_SWITCH)
 			{
-				if (gCurrentFunction == FUNCTION_POWER_SAVE && !gRxIdleMode)
+				g_VOX_Lost         = true;
+				gVoxPauseCountdown = 10;
+	
+				if (gEeprom.VOX_SWITCH)
 				{
-					gPowerSave_10ms            = power_save2_10ms;
+					if (gCurrentFunction == FUNCTION_POWER_SAVE && !gRxIdleMode)
-					gPowerSaveCountdownExpired = 0;
+					{
-				}
+						gPowerSave_10ms            = power_save2_10ms;
-
+						gPowerSaveCountdownExpired = 0;
-				if (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF && (gScheduleDualWatch || gDualWatchCountdown_10ms < dual_watch_count_after_vox_10ms))
+					}
-				{
+	
-					gDualWatchCountdown_10ms = dual_watch_count_after_vox_10ms;
+					if (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF && (gScheduleDualWatch || gDualWatchCountdown_10ms < dual_watch_count_after_vox_10ms))
-					gScheduleDualWatch = false;
+					{
-
+						gDualWatchCountdown_10ms = dual_watch_count_after_vox_10ms;
-					// let the user see DW is not active
+						gScheduleDualWatch = false;
-					gDualWatchActive = false;
+	
-					gUpdateStatus    = true;
+						// let the user see DW is not active
+						gDualWatchActive = false;
+						gUpdateStatus    = true;
+					}
 				}
 			}
-		}
 
-		if (interrupt_status_bits & BK4819_REG_02_VOX_FOUND)
+			if (interrupt_status_bits & BK4819_REG_02_VOX_FOUND)
-		{
+			{
-			g_VOX_Lost         = false;
+				g_VOX_Lost         = false;
-			gVoxPauseCountdown = 0;
+				gVoxPauseCountdown = 0;
-		}
+			}
+		#endif
 
 		if (interrupt_status_bits & BK4819_REG_02_SQUELCH_LOST)
 		{
@@ -944,83 +943,85 @@ void APP_EndTransmission(void)
 	RADIO_SetupRegisters(false);
 }
 
-static void APP_HandleVox(void)
+#ifdef ENABLE_VOX
-{
+	static void APP_HandleVox(void)
-	if (gSetting_KILLED)
-		return;
-
-	if (gVoxResumeCountdown == 0)
 	{
-		if (gVoxPauseCountdown)
+		if (gSetting_KILLED)
 			return;
-	}
+	
-	else
+		if (gVoxResumeCountdown == 0)
-	{
-		g_VOX_Lost         = false;
-		gVoxPauseCountdown = 0;
-	}
-
-	#ifdef ENABLE_FMRADIO
-		if (gFmRadioMode)
-			return;
-	#endif
-
-	if (gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR)
-		return;
-
-	if (gScanState != SCAN_OFF || gCssScanMode != CSS_SCAN_MODE_OFF)
-		return;
-
-	if (gVOX_NoiseDetected)
-	{
-		if (g_VOX_Lost)
-			gVoxStopCountdown_10ms = vox_stop_count_down_10ms;
-		else
-		if (gVoxStopCountdown_10ms == 0)
-			gVOX_NoiseDetected = false;
-
-		if (gCurrentFunction == FUNCTION_TRANSMIT && !gPttIsPressed && !gVOX_NoiseDetected)
 		{
-			if (gFlagEndTransmission)
+			if (gVoxPauseCountdown)
-			{
+				return;
-				//if (gCurrentFunction != FUNCTION_FOREGROUND)
+		}
-					FUNCTION_Select(FUNCTION_FOREGROUND);
+		else
-			}
+		{
+			g_VOX_Lost         = false;
+			gVoxPauseCountdown = 0;
+		}
+	
+		#ifdef ENABLE_FMRADIO
+			if (gFmRadioMode)
+				return;
+		#endif
+	
+		if (gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR)
+			return;
+	
+		if (gScanState != SCAN_OFF || gCssScanMode != CSS_SCAN_MODE_OFF)
+			return;
+	
+		if (gVOX_NoiseDetected)
+		{
+			if (g_VOX_Lost)
+				gVoxStopCountdown_10ms = vox_stop_count_down_10ms;
 			else
+			if (gVoxStopCountdown_10ms == 0)
+				gVOX_NoiseDetected = false;
+	
+			if (gCurrentFunction == FUNCTION_TRANSMIT && !gPttIsPressed && !gVOX_NoiseDetected)
 			{
-				APP_EndTransmission();
+				if (gFlagEndTransmission)
-
-				if (gEeprom.REPEATER_TAIL_TONE_ELIMINATION == 0)
 				{
 					//if (gCurrentFunction != FUNCTION_FOREGROUND)
 						FUNCTION_Select(FUNCTION_FOREGROUND);
 				}
 				else
-					gRTTECountdown = gEeprom.REPEATER_TAIL_TONE_ELIMINATION * 10;
+				{
+					APP_EndTransmission();
+	
+					if (gEeprom.REPEATER_TAIL_TONE_ELIMINATION == 0)
+					{
+						//if (gCurrentFunction != FUNCTION_FOREGROUND)
+							FUNCTION_Select(FUNCTION_FOREGROUND);
+					}
+					else
+						gRTTECountdown = gEeprom.REPEATER_TAIL_TONE_ELIMINATION * 10;
+				}
+	
+				gUpdateStatus        = true;
+				gUpdateDisplay       = true;
+				gFlagEndTransmission = false;
 			}
-
+			return;
-			gUpdateStatus        = true;
-			gUpdateDisplay       = true;
-			gFlagEndTransmission = false;
 		}
-		return;
+	
-	}
+		if (g_VOX_Lost)
-
-	if (g_VOX_Lost)
-	{
-		gVOX_NoiseDetected = true;
-
-		if (gCurrentFunction == FUNCTION_POWER_SAVE)
-			FUNCTION_Select(FUNCTION_FOREGROUND);
-
-		if (gCurrentFunction != FUNCTION_TRANSMIT)
 		{
-			gDTMF_ReplyState = DTMF_REPLY_NONE;
+			gVOX_NoiseDetected = true;
-			RADIO_PrepareTX();
+	
-			gUpdateDisplay = true;
+			if (gCurrentFunction == FUNCTION_POWER_SAVE)
+				FUNCTION_Select(FUNCTION_FOREGROUND);
+	
+			if (gCurrentFunction != FUNCTION_TRANSMIT && gSerialConfigCountDown_500ms == 0)
+			{
+				gDTMF_ReplyState = DTMF_REPLY_NONE;
+				RADIO_PrepareTX();
+				gUpdateDisplay = true;
+			}
 		}
 	}
-}
+#endif
 
 void APP_Update(void)
 {
@@ -1032,8 +1033,8 @@ void APP_Update(void)
 		}
 	#endif
 
-	if (gCurrentFunction == FUNCTION_TRANSMIT && gTxTimeoutReached)
+	if (gCurrentFunction == FUNCTION_TRANSMIT && (gTxTimeoutReached || gSerialConfigCountDown_500ms > 0))
-	{	// transmitter timed out
+	{	// transmitter timed out or must de-key
 		gTxTimeoutReached = false;
 
 		gFlagEndTransmission = true;
@@ -1154,8 +1155,10 @@ void APP_Update(void)
 		}
 	#endif
 
-	if (gEeprom.VOX_SWITCH)
+	#ifdef ENABLE_VOX
-		APP_HandleVox();
+		if (gEeprom.VOX_SWITCH)
+			APP_HandleVox();
+	#endif
 
 	if (gSchedulePowerSave)
 	{
@@ -1220,10 +1223,14 @@ void APP_Update(void)
 		{
 			BK4819_Conditional_RX_TurnOn_and_GPIO6_Enable();
 
-			if (gEeprom.VOX_SWITCH)
+			#ifdef ENABLE_VOX
-				BK4819_EnableVox(gEeprom.VOX1_THRESHOLD, gEeprom.VOX0_THRESHOLD);
+				if (gEeprom.VOX_SWITCH)
+					BK4819_EnableVox(gEeprom.VOX1_THRESHOLD, gEeprom.VOX0_THRESHOLD);
+			#endif
 
-			if (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF && gScanState == SCAN_OFF && gCssScanMode == CSS_SCAN_MODE_OFF)
+			if (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF &&
+			    gScanState == SCAN_OFF &&
+			    gCssScanMode == CSS_SCAN_MODE_OFF)
 			{	// dual watch mode, toggle between the two VFO's
 				DUALWATCH_Alternate();
 
@@ -1399,7 +1406,8 @@ void APP_TimeSlice10ms(void)
 	#endif
 
 	#ifdef ENABLE_AM_FIX
-		if (gEeprom.VfoInfo[gEeprom.RX_CHANNEL].AM_mode && gSetting_AM_fix)
+//		if (gEeprom.VfoInfo[gEeprom.RX_CHANNEL].AM_mode && gSetting_AM_fix)
+		if (gRxVfo->AM_mode && gSetting_AM_fix)
 			AM_fix_10ms(gEeprom.RX_CHANNEL);
 	#endif
 
@@ -1454,11 +1462,13 @@ void APP_TimeSlice10ms(void)
 	if (gFlashLightState == FLASHLIGHT_BLINK && (gFlashLightBlinkCounter & 15u) == 0)
 		GPIO_FlipBit(&GPIOC->DATA, GPIOC_PIN_FLASHLIGHT);
 
-	if (gVoxResumeCountdown > 0)
+	#ifdef ENABLE_VOX
-		gVoxResumeCountdown--;
+		if (gVoxResumeCountdown > 0)
-
+			gVoxResumeCountdown--;
-	if (gVoxPauseCountdown > 0)
+	
-		gVoxPauseCountdown--;
+		if (gVoxPauseCountdown > 0)
+			gVoxPauseCountdown--;
+	#endif
 
 	if (gCurrentFunction == FUNCTION_TRANSMIT)
 	{
@@ -1486,22 +1496,27 @@ void APP_TimeSlice10ms(void)
 					if (gAlarmState == ALARM_STATE_TXALARM)
 					{
 						gAlarmState = ALARM_STATE_ALARM;
+
 						RADIO_EnableCxCSS();
 						BK4819_SetupPowerAmplifier(0, 0);
 						BK4819_ToggleGpioOut(BK4819_GPIO5_PIN1, false);
 						BK4819_Enable_AfDac_DiscMode_TxDsp();
 						BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_RED, false);
+
 						GUI_DisplayScreen();
 					}
 					else
 					{
 						gAlarmState = ALARM_STATE_TXALARM;
+
 						GUI_DisplayScreen();
+
 						BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_RED, true);
 						RADIO_SetTxParameters();
 						BK4819_TransmitTone(true, 500);
 						SYSTEM_DelayMs(2);
 						GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+
 						gEnableSpeaker    = true;
 						gAlarmToneCounter = 0;
 					}
@@ -1588,7 +1603,9 @@ void APP_TimeSlice10ms(void)
 					gScanUseCssResult      = false;
 					gScanProgressIndicator = 0;
 					gScanCssState          = SCAN_CSS_STATE_SCANNING;
+
 					GUI_SelectNextDisplay(DISPLAY_SCANNER);
+
 					gUpdateStatus          = true;
 				}
 
@@ -1679,7 +1696,9 @@ void cancelUserInputModes(void)
 		gDTMF_InputMode       = false;
 		gDTMF_InputIndex      = 0;
 		gInputBoxIndex        = 0;
+
 		gRequestDisplayScreen = DISPLAY_MAIN;
+
 		gBeepToPlay           = BEEP_1KHZ_60MS_OPTIONAL;
 	}
 }
@@ -1699,30 +1718,31 @@ void APP_TimeSlice500ms(void)
 
 	if (gDTMF_RX_live_timeout > 0)
 	{
-		if (--gDTMF_RX_live_timeout == 0)
+		#ifdef ENABLE_RSSI_BAR
+			if (center_line == CENTER_LINE_DTMF_DEC ||
+				center_line == CENTER_LINE_NONE)  // wait till the center line is free for us to use before timing out
+		#endif
 		{
-			if (gDTMF_RX_live[0] != 0)
+			if (--gDTMF_RX_live_timeout == 0)
 			{
-				memset(gDTMF_RX_live, 0, sizeof(gDTMF_RX_live));
+				if (gDTMF_RX_live[0] != 0)
-				gUpdateDisplay   = true;
+				{
+					memset(gDTMF_RX_live, 0, sizeof(gDTMF_RX_live));
+					gUpdateDisplay   = true;
+				}
 			}
 		}
 	}
-
+	
 	if (gDTMF_RX_timeout > 0)
 		if (--gDTMF_RX_timeout == 0)
 			DTMF_clear_RX();
 
 	if (gSerialConfigCountDown_500ms > 0)
 	{
-		gReducedService = true;            // a serial config upload/download is in progress
+//		gReducedService = true;            // a serial config upload/download is in progress
-
-//		if (gCurrentFunction == FUNCTION_TRANSMIT)
-//		{	// stop transmitting
-//
-//		}
 	}
-	
+
 	// Skipped authentic device check
 
 	#ifdef ENABLE_FMRADIO
@@ -1754,30 +1774,27 @@ void APP_TimeSlice500ms(void)
 
 	// Skipped authentic device check
 
+	if ((gBatteryCheckCounter & 1) == 0)
+	{
+		BOARD_ADC_GetBatteryInfo(&gBatteryVoltages[gBatteryVoltageIndex++], &gBatteryCurrent);
+		if (gBatteryVoltageIndex > 3)
+			gBatteryVoltageIndex = 0;
+		BATTERY_GetReadings(true);
+	}
+
+	// regular display updates (once every 2 sec) - if need be
+	if ((gBatteryCheckCounter & 3) == 0)
+	{
+		if (gChargingWithTypeC || gSetting_battery_text > 0)
+			gUpdateStatus = true;
+		#ifdef ENABLE_SHOW_CHARGE_LEVEL
+			if (gChargingWithTypeC)
+				gUpdateDisplay = true;
+		#endif
+	}
+
 	if (gCurrentFunction != FUNCTION_TRANSMIT)
 	{
-		if ((gBatteryCheckCounter & 1) == 0)
-		{
-			BOARD_ADC_GetBatteryInfo(&gBatteryVoltages[gBatteryVoltageIndex++], &gBatteryCurrent);
-
-			if (gBatteryVoltageIndex > 3)
-				gBatteryVoltageIndex = 0;
-
-			BATTERY_GetReadings(true);
-		}
-
-		// regular display updates (once every 2 sec) - if need be
-		if ((gBatteryCheckCounter & 3) == 0)
-		{
-			if (gChargingWithTypeC || gSetting_battery_text > 0)
-				gUpdateStatus = true;
-
-			#ifdef ENABLE_SHOW_CHARGE_LEVEL
-				if (gChargingWithTypeC)
-					gUpdateDisplay = true;
-			#endif
-		}
-		
 		if (gCurrentFunction != FUNCTION_POWER_SAVE)
 			updateRSSI(gEeprom.RX_CHANNEL);
 
@@ -1800,7 +1817,7 @@ void APP_TimeSlice500ms(void)
 			#endif
 			{
 				bool exit_menu = false;
-				
+
 				if (gEeprom.AUTO_KEYPAD_LOCK && gKeyLockCountdown > 0 && !gDTMF_InputMode)
 				{
 					if (--gKeyLockCountdown == 0)
@@ -1812,11 +1829,11 @@ void APP_TimeSlice500ms(void)
 				if (gMenuCountdown > 0)
 					if (--gMenuCountdown == 0)
 						exit_menu = true;	// exit menu mode
-			
+
 				if (exit_menu)
 				{
 					gMenuCountdown = 0;
-					
+
 					if (gEeprom.BACKLIGHT == 0 && gScreenToDisplay == DISPLAY_MENU)
 					{
 						gBacklightCountdown = 0;
@@ -1969,9 +1986,9 @@ void APP_TimeSlice500ms(void)
 	    gCurrentFunction != FUNCTION_TRANSMIT &&
 	    gCurrentFunction != FUNCTION_RECEIVE)
 	{
-		if (gDTMF_AUTO_RESET_TIME > 0)
+		if (gDTMF_auto_reset_time_500ms > 0)
 		{
-			if (--gDTMF_AUTO_RESET_TIME == 0)
+			if (--gDTMF_auto_reset_time_500ms == 0)
 			{
 				gDTMF_CallState = DTMF_CALL_STATE_NONE;
 				gUpdateDisplay  = true;
@@ -1993,6 +2010,7 @@ void APP_TimeSlice500ms(void)
 	static void ALARM_Off(void)
 	{
 		gAlarmState = ALARM_STATE_OFF;
+
 		GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
 		gEnableSpeaker = false;
 
@@ -2002,13 +2020,16 @@ void APP_TimeSlice500ms(void)
 			RADIO_EnableCxCSS();
 		}
 
-		gVoxResumeCountdown = 80;
+		#ifdef ENABLE_VOX
+			gVoxResumeCountdown = 80;
+		#endif
 
 		SYSTEM_DelayMs(5);
 
 		RADIO_SetupRegisters(true);
 
-		gRequestDisplayScreen = DISPLAY_MAIN;
+		if (gScreenToDisplay != DISPLAY_MENU)     // 1of11 .. don't close the menu
+			gRequestDisplayScreen = DISPLAY_MAIN;
 	}
 #endif
 
@@ -2061,17 +2082,6 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 	if (gEeprom.AUTO_KEYPAD_LOCK)
 		gKeyLockCountdown = 30;     // 15 seconds
 
-	if (Key == KEY_EXIT && bKeyPressed && bKeyHeld && gDTMF_RX_live[0] != 0)
-	{	// clear the live DTMF decoder if the EXIT key is held
-		if (gDTMF_RX_live[0] != 0)
-		{
-			gDTMF_RX_live_timeout = 0;
-			memset(gDTMF_RX_live, 0, sizeof(gDTMF_RX_live));
-
-			gUpdateDisplay = true;
-		}
-	}
-
 	if (!bKeyPressed)
 	{
 		if (gFlagSaveVfo)
@@ -2098,19 +2108,32 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 		{
 			SETTINGS_SaveChannel(gTxVfo->CHANNEL_SAVE, gEeprom.TX_CHANNEL, gTxVfo, gFlagSaveChannel);
 			gFlagSaveChannel = false;
+
 			RADIO_ConfigureChannel(gEeprom.TX_CHANNEL, VFO_CONFIGURE);
 			RADIO_SetupRegisters(true);
+
 			GUI_SelectNextDisplay(DISPLAY_MAIN);
 		}
 	}
 	else
 	{
 		if (Key != KEY_PTT)
-		{
+			BACKLIGHT_TurnOn();
-			gMenuCountdown = menu_timeout_500ms;
+
+		if (Key == KEY_EXIT && bKeyHeld)
+		{	// exit key held pressed
+
+			// clear the live DTMF decoder
+			if (gDTMF_RX_live[0] != 0)
+			{
+				memset(gDTMF_RX_live, 0, sizeof(gDTMF_RX_live));
+				gDTMF_RX_live_timeout = 0;
+				gUpdateDisplay        = true;
+			}
 		}
-		
+
-		BACKLIGHT_TurnOn();
+		if (gScreenToDisplay == DISPLAY_MENU)       // 1of11
+			gMenuCountdown = menu_timeout_500ms;
 
 		if (gDTMF_DecodeRingCountdown_500ms > 0)
 		{	// cancel the ringing
@@ -2168,24 +2191,27 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 		Key != KEY_MENU)
 	{
 		if (gScanState != SCAN_OFF || gCssScanMode != CSS_SCAN_MODE_OFF)
-		{	// frequency or CTCSS/DCS scanning
+		{	// FREQ/CTCSS/DCS scanning
 			if (bKeyPressed && !bKeyHeld)
 				AUDIO_PlayBeep(BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL);
 			return;
 		}
 	}
 
-	if (gPttWasPressed && Key == KEY_PTT)
+	if (Key == KEY_PTT)
 	{
-		bFlag = bKeyHeld;
+		if (gPttWasPressed)
-		if (!bKeyPressed)
 		{
-			bFlag          = true;
+			bFlag = bKeyHeld;
-			gPttWasPressed = false;
+			if (!bKeyPressed)
+			{
+				bFlag          = true;
+				gPttWasPressed = false;
+			}
 		}
 	}
-
+	else
-	if (gPttWasReleased && Key != KEY_PTT)
+	if (gPttWasReleased)
 	{
 		if (bKeyHeld)
 			bFlag = true;
@@ -2267,10 +2293,12 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 			}
 			#if defined(ENABLE_ALARM) || defined(ENABLE_TX1750)
 				else
-				if (!bKeyHeld && bKeyPressed)
+				if ((!bKeyHeld && bKeyPressed) || (gAlarmState == ALARM_STATE_TX1750 && bKeyHeld && !bKeyPressed))
 				{
 					ALARM_Off();
 
+					// TODO:  fix side key 1750, you have to press it twice to restart the tone :(
+
 					if (gEeprom.REPEATER_TAIL_TONE_ELIMINATION == 0)
 					{
 						//if (gCurrentFunction != FUNCTION_FOREGROUND)
@@ -2282,6 +2310,7 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 					if (Key == KEY_PTT)
 						gPttWasPressed  = true;
 					else
+					if (!bKeyHeld)
 						gPttWasReleased = true;
 				}
 			#endif
@@ -2293,9 +2322,11 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 			{
 				case DISPLAY_MAIN:
 					MAIN_ProcessKeys(Key, bKeyPressed, bKeyHeld);
+
 					#ifdef ENABLE_MAIN_KEY_HOLD
 						bKeyHeld = false;	// allow the channel setting to be saved
 					#endif
+
 					break;
 
 				#ifdef ENABLE_FMRADIO
@@ -2401,6 +2432,7 @@ Skip:
 		if (!bKeyHeld)
 		{
 			SETTINGS_SaveChannel(gTxVfo->CHANNEL_SAVE, gEeprom.TX_CHANNEL, gTxVfo, gRequestSaveChannel);
+
 			if (gScreenToDisplay != DISPLAY_SCANNER)
 				if (gVfoConfigureMode == VFO_CONFIGURE_NONE)  // 'if' is so as we don't wipe out previously setting this variable elsewhere
 					gVfoConfigureMode = VFO_CONFIGURE;
@@ -2408,6 +2440,7 @@ Skip:
 		else
 		{
 			gFlagSaveChannel = gRequestSaveChannel;
+
 			if (gRequestDisplayScreen == DISPLAY_INVALID)
 				gRequestDisplayScreen = DISPLAY_MAIN;
 		}
@@ -2443,7 +2476,7 @@ Skip:
 
 		RADIO_SetupRegisters(true);
 
-		gDTMF_AUTO_RESET_TIME       = 0;
+		gDTMF_auto_reset_time_500ms = 0;
 		gDTMF_CallState             = DTMF_CALL_STATE_NONE;
 		gDTMF_TxStopCountdown_500ms = 0;
 		gDTMF_IsTx                  = false;

app/app.h

@@ -23,6 +23,11 @@
 #include "frequencies.h"
 #include "radio.h"
 
+extern const uint8_t orig_lna_short;
+extern const uint8_t orig_lna;
+extern const uint8_t orig_mixer;
+extern const uint8_t orig_pga;
+
 void     APP_EndTransmission(void);
 void     CHANNEL_Next(bool bFlag, int8_t Direction);
 void     APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix);

app/dtmf.c

@@ -54,8 +54,8 @@ char              gDTMF_Caller[4];
 char              gDTMF_Callee[4];
 DTMF_State_t      gDTMF_State;
 uint8_t           gDTMF_DecodeRingCountdown_500ms;
-uint8_t           gDTMFChosenContact;
+uint8_t           gDTMF_chosen_contact;
-uint8_t           gDTMF_AUTO_RESET_TIME;
+uint8_t           gDTMF_auto_reset_time_500ms;
 DTMF_CallState_t  gDTMF_CallState;
 DTMF_ReplyState_t gDTMF_ReplyState;
 DTMF_CallMode_t   gDTMF_CallMode;
@@ -403,13 +403,12 @@ void DTMF_Reply(void)
 	if (pString == NULL)
 		return;
 
-	Delay = gEeprom.DTMF_PRELOAD_TIME;
+	Delay = (gEeprom.DTMF_PRELOAD_TIME < 200) ? 200 : gEeprom.DTMF_PRELOAD_TIME;
 
 	if (gEeprom.DTMF_SIDE_TONE)
-	{	// the will also hear the transmitted tones
+	{	// the user will also hear the transmitted tones
 		GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
 		gEnableSpeaker = true;
-		Delay = (gEeprom.DTMF_PRELOAD_TIME < 60) ? 60 : gEeprom.DTMF_PRELOAD_TIME;
 	}
 
 	SYSTEM_DelayMs(Delay);

app/dtmf.h

@@ -83,8 +83,8 @@ extern char              gDTMF_Caller[4];
 extern char              gDTMF_Callee[4];
 extern DTMF_State_t      gDTMF_State;
 extern uint8_t           gDTMF_DecodeRingCountdown_500ms;
-extern uint8_t           gDTMFChosenContact;
+extern uint8_t           gDTMF_chosen_contact;
-extern uint8_t           gDTMF_AUTO_RESET_TIME;
+extern uint8_t           gDTMF_auto_reset_time_500ms;
 extern DTMF_CallState_t  gDTMF_CallState;
 extern DTMF_ReplyState_t gDTMF_ReplyState;
 extern DTMF_CallMode_t   gDTMF_CallMode;

app/generic.c

@@ -86,7 +86,7 @@ void GENERIC_Key_F(bool bKeyPressed, bool bKeyHeld)
 			gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
 			return;
 		}
-	
+
 		#ifdef ENABLE_FMRADIO
 			if (gFM_ScanState == FM_SCAN_OFF)
 			{
@@ -104,9 +104,9 @@ void GENERIC_Key_PTT(bool bKeyPressed)
 {
 	gInputBoxIndex = 0;
 
-	if (!bKeyPressed)
+	if (!bKeyPressed || gSerialConfigCountDown_500ms > 0)
 	{
-		if (gScreenToDisplay == DISPLAY_MAIN)
+		//if (gScreenToDisplay == DISPLAY_MAIN)
 		{
 			if (gCurrentFunction == FUNCTION_TRANSMIT)
 			{
@@ -127,15 +127,16 @@ void GENERIC_Key_PTT(bool bKeyPressed)
 				}
 
 				gFlagEndTransmission = false;
-				gVOX_NoiseDetected   = false;
+				#ifdef ENABLE_VOX
+					gVOX_NoiseDetected = false;
+				#endif
 			}
 
 			RADIO_SetVfoState(VFO_STATE_NORMAL);
 
-			// beep when you release the PTT
+			if (gScreenToDisplay != DISPLAY_MENU)     // 1of11 .. don't close the menu
-			//gBeepToPlay = BEEP_880HZ_40MS_OPTIONAL;   // 1of11
+				gRequestDisplayScreen = DISPLAY_MAIN;
 
-			gRequestDisplayScreen = DISPLAY_MAIN;
 			return;
 		}
 
@@ -149,7 +150,10 @@ void GENERIC_Key_PTT(bool bKeyPressed)
 
 		gPttDebounceCounter   = 0;
 		gPttIsPressed         = false;
-		gRequestDisplayScreen = DISPLAY_MAIN;
+
+		if (gScreenToDisplay != DISPLAY_MENU)     // 1of11 .. don't close the menu
+			gRequestDisplayScreen = DISPLAY_MAIN;
+
 		return;
 	}
 
@@ -160,17 +164,15 @@ void GENERIC_Key_PTT(bool bKeyPressed)
 		if (gCssScanMode == CSS_SCAN_MODE_OFF)
 		{
 			#ifdef ENABLE_FMRADIO
-				if (gScreenToDisplay == DISPLAY_MENU || gScreenToDisplay == DISPLAY_FM)
+				if (gScreenToDisplay == DISPLAY_FM)
-			#else
+				{
-				if (gScreenToDisplay == DISPLAY_MENU)
+					gRequestDisplayScreen = DISPLAY_MAIN;
+					gInputBoxIndex        = 0;
+					gPttIsPressed         = false;
+					gPttDebounceCounter   = 0;
+					return;
+				}
 			#endif
-			{
-				gRequestDisplayScreen = DISPLAY_MAIN;
-				gInputBoxIndex        = 0;
-				gPttIsPressed         = false;
-				gPttDebounceCounter   = 0;
-				return;
-			}
 
 			if (gScreenToDisplay != DISPLAY_SCANNER)
 			{
@@ -213,21 +215,26 @@ void GENERIC_Key_PTT(bool bKeyPressed)
 						gDTMF_State         = DTMF_STATE_0;
 					}
 
-					gRequestDisplayScreen = DISPLAY_MAIN;
+					if (gScreenToDisplay != DISPLAY_MENU)     // 1of11 .. don't close the menu
+						gRequestDisplayScreen = DISPLAY_MAIN;
 
 					gDTMF_InputMode = false;
 					gDTMF_InputIndex = 0;
 					return;
 				}
 
-				gRequestDisplayScreen = DISPLAY_MAIN;
+				if (gScreenToDisplay != DISPLAY_MENU)     // 1of11 .. don't close the menu
+					gRequestDisplayScreen = DISPLAY_MAIN;
+
 				gFlagPrepareTX        = true;
 				gInputBoxIndex        = 0;
 
 				return;
 			}
 
-			gRequestDisplayScreen    = DISPLAY_MAIN;
+			if (gScreenToDisplay != DISPLAY_MENU)     // 1of11 .. don't close the menu
+				gRequestDisplayScreen    = DISPLAY_MAIN;
+
 			gEeprom.CROSS_BAND_RX_TX = gBackupCROSS_BAND_RX_TX;
 			gUpdateStatus            = true;
 			gFlagStopScan            = true;
@@ -237,7 +244,9 @@ void GENERIC_Key_PTT(bool bKeyPressed)
 		else
 		{
 			MENU_StopCssScan();
-			gRequestDisplayScreen = DISPLAY_MENU;
+
+			if (gScreenToDisplay != DISPLAY_MENU)     // 1of11 .. don't close the menu
+				gRequestDisplayScreen = DISPLAY_MENU;
 		}
 	}
 	#ifdef ENABLE_FMRADIO
@@ -247,11 +256,10 @@ void GENERIC_Key_PTT(bool bKeyPressed)
 			gRequestDisplayScreen = DISPLAY_FM;
 		}
 	#endif
-	
+
 	#ifdef ENABLE_VOICE
 		gAnotherVoiceID = VOICE_ID_SCANNING_STOP;
 	#endif
 
 	gPttWasPressed  = true;
 }
-

app/main.c

@@ -28,6 +28,7 @@
 #include "app/spectrum.h"
 #endif
 #include "audio.h"
+#include "board.h"
 #include "driver/bk4819.h"
 #include "dtmf.h"
 #include "frequencies.h"
@@ -50,7 +51,7 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
 			#else
 
 
-				// TODO: do something useful with the key
+				// TODO: make use of this function key
 
 
 			#endif
@@ -80,6 +81,7 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
 
 			gRequestSaveVFO            = true;
 			gVfoConfigureMode          = VFO_CONFIGURE_RELOAD;
+
 			gRequestDisplayScreen      = DISPLAY_MAIN;
 
 			if (beep)
@@ -100,10 +102,11 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
 			if (gEeprom.DUAL_WATCH == DUAL_WATCH_CHAN_B)
 				gEeprom.DUAL_WATCH = DUAL_WATCH_CHAN_A;
 			else
-				gEeprom.TX_CHANNEL = (Vfo == 0);
+				gEeprom.TX_CHANNEL = (Vfo + 1) & 1u;
 
 			gRequestSaveSettings  = 1;
 			gFlagReconfigureVfos  = true;
+
 			gRequestDisplayScreen = DISPLAY_MAIN;
 
 			if (beep)
@@ -121,7 +124,7 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
 				uint8_t Channel;
 
 				if (IS_MR_CHANNEL(gTxVfo->CHANNEL_SAVE))
-				{
+				{	// swap to frequency mode
 					gEeprom.ScreenChannel[Vfo] = gEeprom.FreqChannel[gEeprom.TX_CHANNEL];
 					#ifdef ENABLE_VOICE
 						gAnotherVoiceID        = VOICE_ID_FREQUENCY_MODE;
@@ -133,7 +136,7 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
 
 				Channel = RADIO_FindNextChannel(gEeprom.MrChannel[gEeprom.TX_CHANNEL], 1, false, 0);
 				if (Channel != 0xFF)
-				{
+				{	// swap to channel mode
 					gEeprom.ScreenChannel[Vfo] = Channel;
 					#ifdef ENABLE_VOICE
 						AUDIO_SetVoiceID(0, VOICE_ID_CHANNEL_MODE);
@@ -165,7 +168,9 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
 			break;
 
 		case KEY_5:
+			if(beep) {
 			#ifdef ENABLE_NOAA
+			
 				if (IS_NOT_NOAA_CHANNEL(gTxVfo->CHANNEL_SAVE))
 				{
 					gEeprom.ScreenChannel[Vfo] = gEeprom.NoaaChannel[gEeprom.TX_CHANNEL];
@@ -182,29 +187,35 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
 			#elif defined(ENABLE_SPECTRUM)
 				APP_RunSpectrum();
 				gRequestDisplayScreen = DISPLAY_MAIN;
-			#else 
+			#endif
-				// toggle scanlist-1 and scanlist 2
+			}
+			else {
+				// toggle the selected channels scanlist setting
+			
 				if (gScreenToDisplay != DISPLAY_SCANNER)
 				{
-					if (gTxVfo->SCANLIST1_PARTICIPATION)
+					if (IS_MR_CHANNEL(gTxVfo->CHANNEL_SAVE))
 					{
-						if (gTxVfo->SCANLIST2_PARTICIPATION)
+						if (gTxVfo->SCANLIST1_PARTICIPATION)
-							gTxVfo->SCANLIST1_PARTICIPATION = 0;
+						{
+							if (gTxVfo->SCANLIST2_PARTICIPATION)
+								gTxVfo->SCANLIST1_PARTICIPATION = 0;
+							else
+								gTxVfo->SCANLIST2_PARTICIPATION = 1;
+						}
 						else
-							gTxVfo->SCANLIST2_PARTICIPATION = 1;
+						{
+							if (gTxVfo->SCANLIST2_PARTICIPATION)
+								gTxVfo->SCANLIST2_PARTICIPATION = 0;
+							else
+								gTxVfo->SCANLIST1_PARTICIPATION = 1;
+						}
+						SETTINGS_UpdateChannel(gTxVfo->CHANNEL_SAVE, gTxVfo, true);
+						gVfoConfigureMode = VFO_CONFIGURE;
+						gFlagResetVfos    = true;
 					}
-					else
-					{
-						if (gTxVfo->SCANLIST2_PARTICIPATION)
-							gTxVfo->SCANLIST2_PARTICIPATION = 0;
-						else
-							gTxVfo->SCANLIST1_PARTICIPATION = 1;
-					}
-					SETTINGS_UpdateChannel(gTxVfo->CHANNEL_SAVE, gTxVfo, true);
-					gVfoConfigureMode = VFO_CONFIGURE;
-					gFlagResetVfos    = true;
 				}
-			#endif
+			}
 			break;
 
 		case KEY_6:
@@ -212,7 +223,15 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
 			break;
 
 		case KEY_7:
-			ACTION_Vox();
+			#ifdef ENABLE_VOX
+				ACTION_Vox();
+			#else
+	
+
+				// TODO: make use of this function key
+
+
+			#endif
 			break;
 
 		case KEY_8:
@@ -302,7 +321,7 @@ static void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 
 		if (IS_MR_CHANNEL(gTxVfo->CHANNEL_SAVE))
 		{	// user is entering channel number
-	
+
 			uint16_t Channel;
 
 			if (gInputBoxIndex != 3)
@@ -341,7 +360,7 @@ static void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 //		#endif
 		if (IS_FREQ_CHANNEL(gTxVfo->CHANNEL_SAVE))
 		{	// user is entering frequency
-	
+
 			uint32_t Frequency;
 
 			if (gInputBoxIndex < 6)
@@ -373,7 +392,7 @@ static void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 			{
 				Frequency = frequencyBandTable[ARRAY_SIZE(frequencyBandTable) - 1].upper;
 			}
-			
+
 			{
 				const FREQUENCY_Band_t band = FREQUENCY_GetBand(Frequency);
 
@@ -386,35 +405,35 @@ static void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 					gTxVfo->Band               = band;
 					gEeprom.ScreenChannel[Vfo] = band + FREQ_CHANNEL_FIRST;
 					gEeprom.FreqChannel[Vfo]   = band + FREQ_CHANNEL_FIRST;
-	
+
 					SETTINGS_SaveVfoIndices();
-	
+
 					RADIO_ConfigureChannel(Vfo, VFO_CONFIGURE_RELOAD);
 				}
-	
+
 //				Frequency += 75;                        // is this meant to be rounding ?
 				Frequency += gTxVfo->StepFrequency / 2; // no idea, but this is
-				
+
 				Frequency = FREQUENCY_FloorToStep(Frequency, gTxVfo->StepFrequency, frequencyBandTable[gTxVfo->Band].lower);
-	
+
 				if (Frequency >= BX4819_band1.upper && Frequency < BX4819_band2.lower)
 				{	// clamp the frequency to the limit
 					const uint32_t center = (BX4819_band1.upper + BX4819_band2.lower) / 2;
 					Frequency = (Frequency < center) ? BX4819_band1.upper - gTxVfo->StepFrequency : BX4819_band2.lower;
 				}
-	
+
 				gTxVfo->freq_config_RX.Frequency = Frequency;
-				
+
 				gRequestSaveChannel = 1;
 				return;
 			}
-			
+
 		}
 		#ifdef ENABLE_NOAA
 			else
 			if (IS_NOAA_CHANNEL(gTxVfo->CHANNEL_SAVE))
 			{	// user is entering NOAA channel
-		
+
 				uint8_t Channel;
 
 				if (gInputBoxIndex != 2)
@@ -527,7 +546,8 @@ static void MAIN_Key_MENU(const bool bKeyPressed, const bool bKeyHeld)
 	{	// menu key held down (long press)
 
 		if (bKeyPressed)
-		{
+		{	// long press MENU key
+
 			if (gScreenToDisplay == DISPLAY_MAIN)
 			{
 				if (gInputBoxIndex > 0)
@@ -539,50 +559,68 @@ static void MAIN_Key_MENU(const bool bKeyPressed, const bool bKeyHeld)
 				gWasFKeyPressed = false;
 				gUpdateStatus   = true;
 
-
-
-				// TODO: long press M-key
-
-
-
 				#ifdef ENABLE_COPY_CHAN_TO_VFO
+				if (gEeprom.VFO_OPEN &&
+				    gEeprom.DUAL_WATCH == DUAL_WATCH_OFF &&
+				    gScanState == SCAN_OFF &&
+				    gCssScanMode == CSS_SCAN_MODE_OFF)
 				{	// copy channel to VFO
+
 					int channel  = -1;
 					int vfo      = -1;
-					//int selected = -1;
 
-					if (IS_FREQ_CHANNEL(gRxVfo->CHANNEL_SAVE))
+					#if 0
-					{	// VFO mode
+						// copy channel to opposite VFO
-						if (IS_MR_CHANNEL(gTxVfo->CHANNEL_SAVE))
+						if (IS_FREQ_CHANNEL(gEeprom.ScreenChannel[0]) &&
-						{	// other VFO is in channel mode
+							IS_MR_CHANNEL(gEeprom.ScreenChannel[1]))
-							channel = gTxVfo->CHANNEL_SAVE;
+						{
-							vfo     = gRxVfo->CHANNEL_SAVE;
+							channel = gEeprom.ScreenChannel[1];
+							vfo     = 0;
 						}
-					}
+						else
-					else
+						if (IS_FREQ_CHANNEL(gEeprom.ScreenChannel[1]) &&
-					if (IS_FREQ_CHANNEL(gTxVfo->CHANNEL_SAVE))
+							IS_MR_CHANNEL(gEeprom.ScreenChannel[0]))
-					{	// VFO mode
+						{
-						if (IS_MR_CHANNEL(gRxVfo->CHANNEL_SAVE))
+							channel = gEeprom.ScreenChannel[0];
-						{	// other VFO is in channel mode
+							vfo     = 1;
-							channel = gRxVfo->CHANNEL_SAVE;
-							vfo     = gTxVfo->CHANNEL_SAVE;
 						}
-					}
+					#else
-
+						// copy channel to same VFO
+						if (IS_MR_CHANNEL(gEeprom.ScreenChannel[gEeprom.RX_CHANNEL]))
+						{
+							channel = gEeprom.ScreenChannel[gEeprom.RX_CHANNEL];
+							vfo     = gEeprom.RX_CHANNEL;
+						}
+					#endif
+					
 					if (channel >= 0 && vfo >= 0)
 					{	// copy the channel into the VFO
 
 						gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
 
+						gEeprom.MrChannel[vfo]     = channel;
+						gEeprom.ScreenChannel[vfo] = channel;
+						RADIO_ConfigureChannel(vfo, VFO_CONFIGURE_RELOAD);
 
-						// TODO: finish this
+						channel = FREQ_CHANNEL_FIRST + gEeprom.VfoInfo[vfo].Band;
+						gEeprom.MrChannel[vfo]     = channel;
+						gEeprom.ScreenChannel[vfo] = channel;
+						gEeprom.VfoInfo[vfo].CHANNEL_SAVE = channel;
 
-						//gEeprom.RX_CHANNEL = () & 1;   // swap to the VFO
+						// swap to the VFO
+						gEeprom.TX_CHANNEL = vfo;
+						gEeprom.RX_CHANNEL = vfo;
+						RADIO_SelectVfos();
 
+						RADIO_ApplyOffset(gRxVfo);
+						RADIO_ConfigureSquelchAndOutputPower(gRxVfo);
 
-//						gRequestSaveVFO       = true;
+						RADIO_SetupRegisters(true);
-//						gVfoConfigureMode     = VFO_CONFIGURE_RELOAD;
+
-//						gRequestDisplayScreen = DISPLAY_MAIN;
+//						SETTINGS_SaveChannel(gRxVfo->CHANNEL_SAVE, gEeprom.RX_CHANNEL, gRxVfo, 1);
+
+						gUpdateStatus  = true;
+						gUpdateDisplay = true;
 					}
 				}
 				#endif
@@ -599,7 +637,7 @@ static void MAIN_Key_MENU(const bool bKeyPressed, const bool bKeyHeld)
 		gInputBoxIndex   = 0;
 
 		gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
-		
+
 		if (bFlag)
 		{
 			gFlagRefreshSetting = true;
@@ -637,6 +675,7 @@ static void MAIN_Key_STAR(bool bKeyPressed, bool bKeyHeld)
 				return;
 
 			ACTION_Scan(false);
+
 			return;
 		}
 
@@ -650,6 +689,7 @@ static void MAIN_Key_STAR(bool bKeyPressed, bool bKeyHeld)
 			gDTMF_InputMode       = true;
 			memmove(gDTMF_InputBox, gDTMF_String, sizeof(gDTMF_InputBox));
 			gDTMF_InputIndex      = 0;
+
 			gRequestDisplayScreen = DISPLAY_MAIN;
 			return;
 		}
@@ -744,7 +784,7 @@ static void MAIN_Key_UP_DOWN(bool bKeyPressed, bool bKeyHeld, int8_t Direction)
 				}
 
 				gTxVfo->freq_config_RX.Frequency = frequency;
-				
+
 				gRequestSaveChannel = 1;
 				return;
 			}
@@ -807,7 +847,9 @@ void MAIN_ProcessKeys(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 				DTMF_Append(Character);
 
 				gKeyInputCountdown    = key_input_timeout_500ms;
+
 				gRequestDisplayScreen = DISPLAY_MAIN;
+
 				gPttWasReleased       = true;
 				gBeepToPlay           = BEEP_1KHZ_60MS_OPTIONAL;
 				return;

app/menu.c

@@ -47,26 +47,33 @@
 	#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
 #endif
 
-void writeXtalFreqCal(const int32_t value)
+#ifdef ENABLE_F_CAL_MENU
-{
+	void writeXtalFreqCal(const int32_t value, const bool update_eeprom)
-	struct
 	{
-		int16_t  BK4819_XtalFreqLow;
+		BK4819_WriteRegister(BK4819_REG_3B, 22656 + value);
-		uint16_t EEPROM_1F8A;
-		uint16_t EEPROM_1F8C;
-		uint8_t  VOLUME_GAIN;
-		uint8_t  DAC_GAIN;
-	} __attribute__((packed)) Misc;
 
-	gEeprom.BK4819_XTAL_FREQ_LOW = value;
+		if (update_eeprom)
-	BK4819_WriteRegister(BK4819_REG_3B, 22656 + gEeprom.BK4819_XTAL_FREQ_LOW);
+		{
+			struct
+			{
+				int16_t  BK4819_XtalFreqLow;
+				uint16_t EEPROM_1F8A;
+				uint16_t EEPROM_1F8C;
+				uint8_t  VOLUME_GAIN;
+				uint8_t  DAC_GAIN;
+			} __attribute__((packed)) misc;
 
-	// radio 1 .. 04 00 46 00 50 00 2C 0E
+			gEeprom.BK4819_XTAL_FREQ_LOW = value;
-	// radio 2 .. 05 00 46 00 50 00 2C 0E
+
-	EEPROM_ReadBuffer(0x1F88, &Misc, 8);
+			// radio 1 .. 04 00 46 00 50 00 2C 0E
-	Misc.BK4819_XtalFreqLow = gEeprom.BK4819_XTAL_FREQ_LOW;
+			// radio 2 .. 05 00 46 00 50 00 2C 0E
-	EEPROM_WriteBuffer(0x1F88, &Misc);
+			//
-}
+			EEPROM_ReadBuffer(0x1F88, &misc, 8);
+			misc.BK4819_XtalFreqLow = value;
+			EEPROM_WriteBuffer(0x1F88, &misc);
+		}
+	}
+#endif
 
 void MENU_StartCssScan(int8_t Direction)
 {
@@ -192,12 +199,11 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
 			*pMax = ARRAY_SIZE(gSubMenu_RESET) - 1;
 			break;
 
-		#ifdef ENABLE_COMPANDER
+		case MENU_COMPAND:
-			case MENU_COMPAND:
+		case MENU_ABR_ON_TX_RX:
-				*pMin = 0;
+			*pMin = 0;
-				*pMax = ARRAY_SIZE(gSubMenu_Compand) - 1;
+			*pMax = ARRAY_SIZE(gSubMenu_RX_TX) - 1;
-				break;
+			break;
-		#endif
 
 		#ifdef ENABLE_AM_FIX_TEST1
 			case MENU_AM_FIX_TEST1:
@@ -245,7 +251,9 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
 			*pMax = ARRAY_SIZE(gSubMenu_TOT) - 1;
 			break;
 
-		case MENU_VOX:
+		#ifdef ENABLE_VOX
+			case MENU_VOX:
+		#endif
 		case MENU_RP_STE:
 			*pMin = 0;
 			*pMax = 10;
@@ -276,7 +284,8 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
 			break;
 
 		case MENU_S_LIST:
-			*pMin = 1;
+			*pMin = 0;
+//			*pMax = 1;
 			*pMax = 2;
 			break;
 
@@ -290,11 +299,6 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
 			*pMax = ARRAY_SIZE(gSubMenu_PTT_ID) - 1;
 			break;
 
-		case MENU_VOL:
-			*pMin = 0;
-			*pMax = 2300;
-			break;
-
 		case MENU_BAT_TXT:
 			*pMin = 0;
 			*pMax = ARRAY_SIZE(gSubMenu_BAT_TXT) - 1;
@@ -406,9 +410,6 @@ void MENU_AcceptSetting(void)
 
 		case MENU_T_CTCS:
 			pConfig = &gTxVfo->freq_config_TX;
-
-			// Fallthrough
-
 		case MENU_R_CTCS:
 			if (gSubMenuSelection == 0)
 			{
@@ -418,14 +419,20 @@ void MENU_AcceptSetting(void)
 					return;
 				}
 				Code              = 0;
+				pConfig->Code     = Code;
 				pConfig->CodeType = CODE_TYPE_OFF;
+
+				BK4819_ExitSubAu();
 			}
 			else
-				{
+			{
 				pConfig->CodeType = CODE_TYPE_CONTINUOUS_TONE;
 				Code              = gSubMenuSelection - 1;
+				pConfig->Code     = Code;
+
+				BK4819_SetCTCSSFrequency(CTCSS_Options[Code]);
 			}
-			pConfig->Code       = Code;
+
 			gRequestSaveChannel = 1;
 			return;
 
@@ -446,6 +453,12 @@ void MENU_AcceptSetting(void)
 
 		case MENU_SCR:
 			gTxVfo->SCRAMBLING_TYPE = gSubMenuSelection;
+			#if 0
+				if (gSubMenuSelection > 0 && gSetting_ScrambleEnable)
+					BK4819_EnableScramble(gSubMenuSelection - 1);
+				else
+					BK4819_DisableScramble();
+			#endif
 			gRequestSaveChannel     = 1;
 			return;
 
@@ -487,19 +500,25 @@ void MENU_AcceptSetting(void)
 			gEeprom.BATTERY_SAVE = gSubMenuSelection;
 			break;
 
-		case MENU_VOX:
+		#ifdef ENABLE_VOX
-			gEeprom.VOX_SWITCH = gSubMenuSelection != 0;
+			case MENU_VOX:
-			if (gEeprom.VOX_SWITCH)
+				gEeprom.VOX_SWITCH = gSubMenuSelection != 0;
-				gEeprom.VOX_LEVEL = gSubMenuSelection - 1;
+				if (gEeprom.VOX_SWITCH)
-			BOARD_EEPROM_LoadMoreSettings();
+					gEeprom.VOX_LEVEL = gSubMenuSelection - 1;
-			gFlagReconfigureVfos = true;
+				BOARD_EEPROM_LoadMoreSettings();
-			gUpdateStatus        = true;
+				gFlagReconfigureVfos = true;
-			break;
+				gUpdateStatus        = true;
+				break;
+		#endif
 
 		case MENU_ABR:
 			gEeprom.BACKLIGHT = gSubMenuSelection;
 			break;
 
+		case MENU_ABR_ON_TX_RX:
+			gSetting_backlight_on_tx_rx = gSubMenuSelection;
+			break;
+
 		case MENU_TDR:
 			gEeprom.DUAL_WATCH   = gSubMenuSelection;
 			gFlagReconfigureVfos = true;
@@ -581,19 +600,20 @@ void MENU_AcceptSetting(void)
 				break;
 		#endif
 
-		#ifdef ENABLE_COMPANDER
+		case MENU_COMPAND:
-			case MENU_COMPAND:
+			gTxVfo->Compander = gSubMenuSelection;
-				gTxVfo->Compander = gSubMenuSelection;
+			SETTINGS_UpdateChannel(gTxVfo->CHANNEL_SAVE, gTxVfo, true);
-				gRequestSaveChannel = 1;
+			gVfoConfigureMode = VFO_CONFIGURE;
-				return;
+			gFlagResetVfos    = true;
-		#endif
+//			gRequestSaveChannel = 1;
+			return;
 
 		case MENU_1_CALL:
 			gEeprom.CHAN_1_CALL = gSubMenuSelection;
 			break;
 
 		case MENU_S_LIST:
-			gEeprom.SCAN_LIST_DEFAULT = gSubMenuSelection - 1;
+			gEeprom.SCAN_LIST_DEFAULT = gSubMenuSelection;
 			break;
 
 		#ifdef ENABLE_ALARM
@@ -611,7 +631,7 @@ void MENU_AcceptSetting(void)
 			break;
 
 		case MENU_D_HOLD:
-			gEeprom.DTMF_AUTO_RESET_TIME = gSubMenuSelection;
+			gEeprom.DTMF_auto_reset_time = gSubMenuSelection;
 			break;
 
 		case MENU_D_PRE:
@@ -623,12 +643,6 @@ void MENU_AcceptSetting(void)
 			gRequestSaveChannel         = 1;
 			return;
 
-		case MENU_VOL:
-			if(gF_LOCK) {
-				EEPROM_WriteBuffer(0x1F40, gBatteryCalibration);
-			}
-			break;
-
 		case MENU_BAT_TXT:
 			gSetting_battery_text = gSubMenuSelection;
 			break;
@@ -650,7 +664,7 @@ void MENU_AcceptSetting(void)
 			break;
 
 		case MENU_D_LIST:
-			gDTMFChosenContact = gSubMenuSelection - 1;
+			gDTMF_chosen_contact = gSubMenuSelection - 1;
 			if (gIsDtmfContactValid)
 			{
 				GUI_SelectNextDisplay(DISPLAY_MAIN);
@@ -740,14 +754,29 @@ void MENU_AcceptSetting(void)
 
 		#ifdef ENABLE_F_CAL_MENU
 			case MENU_F_CALI:
-				writeXtalFreqCal(gSubMenuSelection);
+				writeXtalFreqCal(gSubMenuSelection, true);
 				return;
 		#endif
 
 		case MENU_BATCAL:
-			gBatteryCalibration[3] = gSubMenuSelection;
+		{
+			uint16_t buf[4];
+
+			gBatteryCalibration[0] = (520ul * gSubMenuSelection) / 760;  // 5.20V empty, blinking above this value, reduced functionality below
+			gBatteryCalibration[1] = (700ul * gSubMenuSelection) / 760;  // 7.00V,  ~5%, 1 bars above this value
+			gBatteryCalibration[2] = (745ul * gSubMenuSelection) / 760;  // 7.45V, ~17%, 2 bars above this value
+			gBatteryCalibration[3] =          gSubMenuSelection;         // 7.6V,  ~29%, 3 bars above this value
+			gBatteryCalibration[4] = (788ul * gSubMenuSelection) / 760;  // 7.88V, ~65%, 4 bars above this value
+			gBatteryCalibration[5] = 2300;
 			EEPROM_WriteBuffer(0x1F40, gBatteryCalibration);
+
+			EEPROM_ReadBuffer( 0x1F48, buf, sizeof(buf));
+			buf[0] = gBatteryCalibration[4];
+			buf[1] = gBatteryCalibration[5];
+			EEPROM_WriteBuffer(0x1F48, buf);
+
 			break;
+		}
 	}
 
 	gRequestSaveSettings = true;
@@ -904,9 +933,11 @@ void MENU_ShowCurrentSetting(void)
 			gSubMenuSelection = gEeprom.BATTERY_SAVE;
 			break;
 
-		case MENU_VOX:
+		#ifdef ENABLE_VOX
-			gSubMenuSelection = gEeprom.VOX_SWITCH ? gEeprom.VOX_LEVEL + 1 : 0;
+			case MENU_VOX:
-			break;
+				gSubMenuSelection = gEeprom.VOX_SWITCH ? gEeprom.VOX_LEVEL + 1 : 0;
+				break;
+		#endif
 
 		case MENU_ABR:
 			gSubMenuSelection = gEeprom.BACKLIGHT;
@@ -915,6 +946,10 @@ void MENU_ShowCurrentSetting(void)
 			GPIO_SetBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);  	// turn the backlight ON while in backlight menu
 			break;
 
+		case MENU_ABR_ON_TX_RX:
+			gSubMenuSelection = gSetting_backlight_on_tx_rx;
+			break;
+
 		case MENU_TDR:
 			gSubMenuSelection = gEeprom.DUAL_WATCH;
 			break;
@@ -975,18 +1010,16 @@ void MENU_ShowCurrentSetting(void)
 				break;
 		#endif
 
-		#ifdef ENABLE_COMPANDER
+		case MENU_COMPAND:
-			case MENU_COMPAND:
+			gSubMenuSelection = gTxVfo->Compander;
-				gSubMenuSelection = gTxVfo->Compander;
+			return;
-				return;
-		#endif
 
 		case MENU_1_CALL:
 			gSubMenuSelection = gEeprom.CHAN_1_CALL;
 			break;
 
 		case MENU_S_LIST:
-			gSubMenuSelection = gEeprom.SCAN_LIST_DEFAULT + 1;
+			gSubMenuSelection = gEeprom.SCAN_LIST_DEFAULT;
 			break;
 
 		case MENU_SLIST1:
@@ -1012,7 +1045,7 @@ void MENU_ShowCurrentSetting(void)
 			break;
 
 		case MENU_D_HOLD:
-			gSubMenuSelection = gEeprom.DTMF_AUTO_RESET_TIME;
+			gSubMenuSelection = gEeprom.DTMF_auto_reset_time;
 			break;
 
 		case MENU_D_PRE:
@@ -1023,10 +1056,6 @@ void MENU_ShowCurrentSetting(void)
 			gSubMenuSelection = gTxVfo->DTMF_PTT_ID_TX_MODE;
 			break;
 
-		case MENU_VOL:
-			gSubMenuSelection = gBatteryCalibration[3];
-			return;
-
 		case MENU_BAT_TXT:
 			gSubMenuSelection = gSetting_battery_text;
 			return;
@@ -1036,7 +1065,7 @@ void MENU_ShowCurrentSetting(void)
 			break;
 
 		case MENU_D_LIST:
-			gSubMenuSelection = gDTMFChosenContact + 1;
+			gSubMenuSelection = gDTMF_chosen_contact + 1;
 			break;
 
 		case MENU_D_LIVE_DEC:

app/menu.h

@@ -19,6 +19,10 @@
 
 #include "driver/keyboard.h"
 
+#ifdef ENABLE_F_CAL_MENU
+	void writeXtalFreqCal(const int32_t value, const bool update_eeprom);
+#endif
+
 int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax);
 void MENU_AcceptSetting(void);
 void MENU_SelectNextCode(void);

app/scanner.c

@@ -92,6 +92,7 @@ static void SCANNER_Key_EXIT(bool bKeyPressed, bool bKeyHeld)
 		{
 			case 0:
 				gRequestDisplayScreen    = DISPLAY_MAIN;
+				
 				gEeprom.CROSS_BAND_RX_TX = gBackupCROSS_BAND_RX_TX;
 				gUpdateStatus            = true;
 				gFlagStopScan            = true;
@@ -411,7 +412,9 @@ void SCANNER_Start(void)
 	g_CDCSS_Lost           = false;
 	gCDCSSCodeType         = 0;
 	g_CTCSS_Lost           = false;
-	g_VOX_Lost             = false;
+	#ifdef ENABLE_VOX
+		g_VOX_Lost         = false;
+	#endif
 	g_SquelchLost          = false;
 	gScannerEditState      = 0;
 	gScanProgressIndicator = 0;

app/spectrum.c

@@ -62,17 +62,17 @@ const char *modulationTypeOptions[] = {" FM", " AM", "USB"};
 const uint8_t modulationTypeTuneSteps[] = {100, 50, 10};
 const uint8_t modTypeReg47Values[] = {1, 7, 5};
 
-SpectrumSettings settings = {STEPS_64,
+SpectrumSettings settings = {stepsCount: STEPS_64,
-                             S_STEP_25_0kHz,
+                             scanStepIndex: S_STEP_25_0kHz,
-                             80000,
+                             frequencyChangeStep: 80000,
-                             3200,
+                             scanDelay: 3200,
-                             150,
+                             rssiTriggerLevel: 150,
-                             true,
+                             backlightState: true,
-                             BK4819_FILTER_BW_WIDE,
+                             bw: BK4819_FILTER_BW_WIDE,
-                             BK4819_FILTER_BW_WIDE,
+                             listenBw: BK4819_FILTER_BW_WIDE,
-                             false,
+                             modulationType: false,
-                             -130,
+                             dbMin: -130,
-                             -50};
+                             dbMax: -50};
 
 uint32_t fMeasure = 0;
 uint32_t currentFreq, tempFreq;

app/spectrum.h

@@ -122,18 +122,17 @@ typedef enum ScanStep {
 } ScanStep;
 
 typedef struct SpectrumSettings {
+  uint32_t frequencyChangeStep;  
   StepsCount stepsCount;
   ScanStep scanStepIndex;
-  uint32_t frequencyChangeStep;
   uint16_t scanDelay;
   uint16_t rssiTriggerLevel;
-
-  bool backlightState;
   BK4819_FilterBandwidth_t bw;
   BK4819_FilterBandwidth_t listenBw;
-  ModulationType modulationType;
   int dbMin;
-  int dbMax;
+  int dbMax;  
+  ModulationType modulationType;
+  bool backlightState;
 } SpectrumSettings;
 
 typedef struct KeyboardState {
@@ -161,8 +160,8 @@ typedef struct RegisterSpec {
 typedef struct PeakInfo {
   uint16_t t;
   uint16_t rssi;
-  uint8_t i;
   uint32_t f;
+  uint8_t i;
 } PeakInfo;
 
 void APP_RunSpectrum(void);

app/uart.c

@@ -230,8 +230,7 @@ static void CMD_0514(const uint8_t *pBuffer)
 		gFmRadioCountdown_500ms = fm_radio_countdown_500ms;
 	#endif
 
-	gSerialConfigCountDown_500ms = 6; // 3 sec
+	gSerialConfigCountDown_500ms = 12; // 6 sec
-	gSerialConfigCountDown_done  = false;
 	
 	// turn the LCD backlight off
 	GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);
@@ -248,8 +247,7 @@ static void CMD_051B(const uint8_t *pBuffer)
 	if (pCmd->Timestamp != Timestamp)
 		return;
 
-	gSerialConfigCountDown_500ms = 6; // 3 sec
+	gSerialConfigCountDown_500ms = 12; // 6 sec
-	gSerialConfigCountDown_done  = false;
 
 	#ifdef ENABLE_FMRADIO
 		gFmRadioCountdown_500ms = fm_radio_countdown_500ms;
@@ -280,9 +278,8 @@ static void CMD_051D(const uint8_t *pBuffer)
 	if (pCmd->Timestamp != Timestamp)
 		return;
 
-	gSerialConfigCountDown_500ms = 6; // 3 sec
+	gSerialConfigCountDown_500ms = 12; // 6 sec
-	gSerialConfigCountDown_done  = false;
+	
-
 	bReloadEeprom = false;
 
 	#ifdef ENABLE_FMRADIO
@@ -404,8 +401,7 @@ static void CMD_052F(const uint8_t *pBuffer)
 	if (gCurrentFunction == FUNCTION_POWER_SAVE)
 		FUNCTION_Select(FUNCTION_FOREGROUND);
 
-	gSerialConfigCountDown_500ms = 6; // 3 sec
+	gSerialConfigCountDown_500ms = 12; // 6 sec
-	gSerialConfigCountDown_done  = false;
 
 	Timestamp = pCmd->Timestamp;
 

audio.c

@@ -187,7 +187,9 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 
 	GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
 
-	gVoxResumeCountdown = 80;
+	#ifdef ENABLE_VOX
+		gVoxResumeCountdown = 80;
+	#endif
 
 	SYSTEM_DelayMs(5);
 	BK4819_TurnsOffTones_TurnsOnRX();
@@ -258,7 +260,9 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 				VoiceID += VOICE_ID_ENG_BASE;
 			}
 	
-			if (gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR)
+			if (gCurrentFunction == FUNCTION_RECEIVE ||
+			    gCurrentFunction == FUNCTION_MONITOR ||
+			    gCurrentFunction == FUNCTION_INCOMING)   // 1of11
 				BK4819_SetAF(BK4819_AF_MUTE);
 	
 			#ifdef ENABLE_FMRADIO
@@ -267,7 +271,11 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 			#endif
 			
 			GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
-			gVoxResumeCountdown = 2000;
+
+			#ifdef ENABLE_VOX
+				gVoxResumeCountdown = 2000;
+			#endif
+			
 			SYSTEM_DelayMs(5);
 			AUDIO_PlayVoice(VoiceID);
 	
@@ -278,13 +286,10 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 			{
 				SYSTEM_DelayMs(Delay * 10);
 	
-				if (gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR)
+				if (gCurrentFunction == FUNCTION_RECEIVE ||
-				{
+				    gCurrentFunction == FUNCTION_MONITOR ||
-					if (gRxVfo->AM_mode)
+					gCurrentFunction == FUNCTION_INCOMING)	// 1of11
-						BK4819_SetAF(BK4819_AF_AM);
+					BK4819_SetAF(gRxVfo->AM_mode ? BK4819_AF_AM : BK4819_AF_FM);
-					else
-						BK4819_SetAF(BK4819_AF_OPEN);
-				}
 	
 				#ifdef ENABLE_FMRADIO
 					if (gFmRadioMode)
@@ -296,7 +301,11 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 	
 				gVoiceWriteIndex    = 0;
 				gVoiceReadIndex     = 0;
-				gVoxResumeCountdown = 80;
+	
+				#ifdef ENABLE_VOX
+					gVoxResumeCountdown = 80;
+				#endif
+					
 				return;
 			}
 	
@@ -409,14 +418,19 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 				
 				gCountdownToPlayNextVoice_10ms = Delay;
 				gFlagPlayQueuedVoice           = false;
-				gVoxResumeCountdown            = 2000;
+
+				#ifdef ENABLE_VOX
+					gVoxResumeCountdown = 2000;
+				#endif
 	
 				return;
 			}
 		}
 	
-		if (gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR)
+		if (gCurrentFunction == FUNCTION_RECEIVE ||
-			BK4819_SetAF(gRxVfo->AM_mode ? BK4819_AF_AM : BK4819_AF_OPEN);
+		    gCurrentFunction == FUNCTION_MONITOR ||
+		    gCurrentFunction == FUNCTION_INCOMING)    // 1of11
+			BK4819_SetAF(gRxVfo->AM_mode ? BK4819_AF_AM : BK4819_AF_FM);
 	
 		#ifdef ENABLE_FMRADIO
 			if (gFmRadioMode)
@@ -426,7 +440,10 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 		if (!gEnableSpeaker)
 			GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
 	
-		gVoxResumeCountdown = 80;
+		#ifdef ENABLE_VOX
+			gVoxResumeCountdown = 80;
+		#endif
+		
 		gVoiceWriteIndex    = 0;
 		gVoiceReadIndex     = 0;
 	}

bitmaps.c

@@ -4,7 +4,7 @@
 // all these images are on their right sides
 // turn your monitor 90-deg anti-clockwise to see the images
 
-const uint8_t BITMAP_PowerSave[8] =
+const uint8_t BITMAP_POWERSAVE[8] =
 {
 	#if 0
 		// "S"
@@ -29,6 +29,30 @@ const uint8_t BITMAP_PowerSave[8] =
 	#endif
 };
 
+const uint8_t BITMAP_TX[8] =
+{	// "TX"
+	0b00000000,
+	0b00000001,
+	0b00000001,
+	0b01111111,
+	0b00000001,
+	0b00000001,
+	0b00000000,
+	0b00000000
+};
+
+const uint8_t BITMAP_RX[8] =
+{	// "RX"
+	0b00000000,
+	0b01111111,
+	0b00001001,
+	0b00011001,
+	0b01100110,
+	0b00000000,
+	0b00000000,
+	0b00000000
+};
+
 const uint8_t BITMAP_BatteryLevel[2] =
 {
 	0b01011101,
@@ -114,27 +138,29 @@ const uint8_t BITMAP_F_Key[6] =
 	0b01000001
 };
 
-const uint8_t BITMAP_VOX[18] =
+#ifdef ENABLE_VOX
-{	// "VOX"
+	const uint8_t BITMAP_VOX[18] =
-	0b00000000,
+	{	// "VOX"
-	0b00011111,
+		0b00000000,
-	0b00100000,
+		0b00011111,
-	0b01000000,
+		0b00100000,
-	0b00100000,
+		0b01000000,
-	0b00011111,
+		0b00100000,
-	0b00000000,
+		0b00011111,
-	0b00111110,
+		0b00000000,
-	0b01000001,
+		0b00111110,
-	0b01000001,
+		0b01000001,
-	0b01000001,
+		0b01000001,
-	0b00111110,
+		0b01000001,
-	0b00000000,
+		0b00111110,
-	0b01100011,
+		0b00000000,
-	0b00010100,
+		0b01100011,
-	0b00001000,
+		0b00010100,
-	0b00010100,
+		0b00001000,
-	0b01100011
+		0b00010100,
-};
+		0b01100011
+	};
+#endif
 
 #if 0
 	const uint8_t BITMAP_WX[12] =
@@ -255,24 +281,54 @@ const uint8_t BITMAP_TDR2[12] =
 		0b00110001
 	};
 #endif
-
+/*
-const uint8_t BITMAP_SC[12] =
+const uint8_t BITMAP_SC1[8] =
-{	// "SC"
+{	// "I"
-	0b00000000,
-	0b01000110,
-	0b01001001,
-	0b01001001,
-	0b01001001,
-	0b00110001,
-
-	0b00000000,
-	0b00111110,
 	0b01000001,
 	0b01000001,
+	0b01111111,
+	0b01111111,
+	0b01111111,
 	0b01000001,
-	0b00100010
+	0b01000001,
+	0b00000000
 };
 
+const uint8_t BITMAP_SC2[8] =
+{	// "II"
+	0b01000001,
+	0b01111111,
+	0b01111111,
+	0b01000001,
+	0b01111111,
+	0b01111111,
+	0b01000001,
+	0b00000000
+};
+*/
+/*
+const uint8_t BITMAP_SC1[7] =
+{	// "1"
+	0b01000000,
+	0b01000000,
+	0b01000110,
+	0b01111111,
+	0b01000000,
+	0b01000000,
+	0b00000000
+};
+
+const uint8_t BITMAP_SC2[7] =
+{	// "2"
+	0b01000010,
+	0b01100001,
+	0b01010001,
+	0b01001001,
+	0b01001001,
+	0b01000110,
+	0b00000000
+};
+*/
 const uint8_t BITMAP_Antenna[5] =
 {
 	0b00000011,
@@ -359,17 +415,7 @@ const uint8_t BITMAP_VFO_NotDefault[8] =
 	0b00010100,
 	0b00001000
 };
-/*
+
-const uint8_t BITMAP_ScanList[6] =
-{	// diamond symbol
-	0b00001000,
-	0b00011100,
-	0b00111110,
-	0b00111110,
-	0b00011100,
-	0b00001000
-};
-*/
 const uint8_t BITMAP_ScanList1[6] =
 {	// 'I' symbol
 	0b00000000,
@@ -390,14 +436,12 @@ const uint8_t BITMAP_ScanList2[6] =
 	0b01000010
 };
 
-#ifdef ENABLE_COMPANDER
+const uint8_t BITMAP_compand[6] =
-	const uint8_t BITMAP_compand[6] =
+{
-	{
+	0b00000000,
-		0b00000000,
+	0b00111100,
-		0b00111100,
+	0b01000010,
-		0b01000010,
+	0b01000010,
-		0b01000010,
+	0b01000010,
-		0b01000010,
+	0b00100100
-		0b00100100
+};
-	};
-#endif

bitmaps.h

@@ -4,7 +4,9 @@
 
 #include <stdint.h>
 
-extern const uint8_t BITMAP_PowerSave[8];
+extern const uint8_t BITMAP_POWERSAVE[8];
+extern const uint8_t BITMAP_TX[8];
+extern const uint8_t BITMAP_RX[8];
 
 extern const uint8_t BITMAP_BatteryLevel[2];
 extern const uint8_t BITMAP_BatteryLevel1[17];
@@ -19,7 +21,9 @@ extern const uint8_t BITMAP_KeyLock[6];
 
 extern const uint8_t BITMAP_F_Key[6];
 
-extern const uint8_t BITMAP_VOX[18];
+#ifdef ENABLE_VOX
+	extern const uint8_t BITMAP_VOX[18];
+#endif
 
 #if 0
 	extern const uint8_t BITMAP_WX[12];
@@ -42,7 +46,10 @@ extern const uint8_t BITMAP_TDR2[12];
 	extern const uint8_t BITMAP_NOAA[12];
 #endif
 
-extern const uint8_t BITMAP_SC[12];
+//extern const uint8_t BITMAP_SC1[8];
+//extern const uint8_t BITMAP_SC2[8];
+//extern const uint8_t BITMAP_SC1[7];
+//extern const uint8_t BITMAP_SC2[7];
 
 extern const uint8_t BITMAP_Antenna[5];
 extern const uint8_t BITMAP_AntennaLevel1[3];
@@ -57,13 +64,10 @@ extern const uint8_t BITMAP_MARKER[8];
 extern const uint8_t BITMAP_VFO_Default[8];
 extern const uint8_t BITMAP_VFO_NotDefault[8];
 
-//extern const uint8_t BITMAP_ScanList[6];
 extern const uint8_t BITMAP_ScanList1[6];
 extern const uint8_t BITMAP_ScanList2[6];
 
-#ifdef ENABLE_COMPANDER
+extern const uint8_t BITMAP_compand[6];
-	extern const uint8_t BITMAP_compand[6];
-#endif
 
 #endif
 

board.c

@@ -532,8 +532,10 @@ void BOARD_EEPROM_Init(void)
 		gEeprom.NOAA_AUTO_SCAN   = (Data[3] <  2) ? Data[3] : false;
 	#endif
 	gEeprom.KEY_LOCK             = (Data[4] <  2) ? Data[4] : false;
-	gEeprom.VOX_SWITCH           = (Data[5] <  2) ? Data[5] : false;
+	#ifdef ENABLE_VOX
-	gEeprom.VOX_LEVEL            = (Data[6] < 10) ? Data[6] : 1;
+		gEeprom.VOX_SWITCH       = (Data[5] <  2) ? Data[5] : false;
+		gEeprom.VOX_LEVEL        = (Data[6] < 10) ? Data[6] : 1;
+	#endif
 	gEeprom.MIC_SENSITIVITY      = (Data[7] <  5) ? Data[7] : 4;
 
 	// 0E78..0E7F
@@ -622,7 +624,7 @@ void BOARD_EEPROM_Init(void)
 	gEeprom.DTMF_SEPARATE_CODE           = DTMF_ValidateCodes((char *)(Data + 1), 1) ? Data[1] : '*';
 	gEeprom.DTMF_GROUP_CALL_CODE         = DTMF_ValidateCodes((char *)(Data + 2), 1) ? Data[2] : '#';
 	gEeprom.DTMF_DECODE_RESPONSE         = (Data[3] <   4) ? Data[3] : 0;
-	gEeprom.DTMF_AUTO_RESET_TIME         = (Data[4] <  61) ? Data[4] : 5;
+	gEeprom.DTMF_auto_reset_time         = (Data[4] <  61) ? Data[4] : (Data[4] >= 5) ? Data[4] : 10;
 	gEeprom.DTMF_PRELOAD_TIME            = (Data[5] < 101) ? Data[5] * 10 : 300;
 	gEeprom.DTMF_FIRST_CODE_PERSIST_TIME = (Data[6] < 101) ? Data[6] * 10 : 100;
 	gEeprom.DTMF_HASH_CODE_PERSIST_TIME  = (Data[7] < 101) ? Data[7] * 10 : 100;
@@ -705,13 +707,14 @@ void BOARD_EEPROM_Init(void)
 	gSetting_ScrambleEnable    = (Data[6] < 2) ? Data[6] : true;
 	gSetting_TX_EN             = (Data[7] & (1u << 0)) ? true : false;
 	gSetting_live_DTMF_decoder = (Data[7] & (1u << 1)) ? true : false;
-	gSetting_battery_text      = (((Data[7] >> 2) & 3u) <= 2) ? (Data[7] >> 2) & 3: 2;
+	gSetting_battery_text      = (((Data[7] >> 2) & 3u) <= 2) ? (Data[7] >> 2) & 3 : 2;
 	#ifdef ENABLE_AUDIO_BAR
 		gSetting_mic_bar       = (Data[7] & (1u << 4)) ? true : false;
 	#endif
 	#ifdef ENABLE_AM_FIX
 		gSetting_AM_fix        = (Data[7] & (1u << 5)) ? true : false;
 	#endif
+	gSetting_backlight_on_tx_rx = (Data[7] >> 6) & 3u;
 
 	if (!gEeprom.VFO_OPEN)
 	{
@@ -756,9 +759,11 @@ void BOARD_EEPROM_LoadMoreSettings(void)
 	}
 	gBatteryCalibration[5] = 2300;
 
-	EEPROM_ReadBuffer(0x1F50 + (gEeprom.VOX_LEVEL * 2), &gEeprom.VOX1_THRESHOLD, 2);
+	#ifdef ENABLE_VOX
-	EEPROM_ReadBuffer(0x1F68 + (gEeprom.VOX_LEVEL * 2), &gEeprom.VOX0_THRESHOLD, 2);
+		EEPROM_ReadBuffer(0x1F50 + (gEeprom.VOX_LEVEL * 2), &gEeprom.VOX1_THRESHOLD, 2);
-
+		EEPROM_ReadBuffer(0x1F68 + (gEeprom.VOX_LEVEL * 2), &gEeprom.VOX0_THRESHOLD, 2);
+	#endif
+	
 	//EEPROM_ReadBuffer(0x1F80 + gEeprom.MIC_SENSITIVITY, &Mic, 1);
 	//gEeprom.MIC_SENSITIVITY_TUNING = (Mic < 32) ? Mic : 15;
 	gEeprom.MIC_SENSITIVITY_TUNING = gMicGain_dB2[gEeprom.MIC_SENSITIVITY];

driver/adc.h

@@ -42,8 +42,10 @@ enum ADC_CH_MASK {
 typedef enum ADC_CH_MASK ADC_CH_MASK;
 
 typedef struct {
-	uint8_t CLK_SEL;
+	uint16_t EXTTRIG_SEL;
+	uint16_t IE_CHx_EOC;
 	ADC_CH_MASK CH_SEL;
+	uint8_t CLK_SEL;
 	uint8_t AVG;
 	uint8_t CONT;
 	uint8_t MEM_MODE;
@@ -51,13 +53,12 @@ typedef struct {
 	uint8_t SMPL_SETUP;
 	uint8_t SMPL_WIN;
 	uint8_t ADC_TRIG;
-	uint16_t EXTTRIG_SEL;
-	bool CALIB_OFFSET_VALID;
-	bool CALIB_KD_VALID;
 	uint8_t DMA_EN;
-	uint16_t IE_CHx_EOC;
 	uint8_t IE_FIFO_HFULL;
 	uint8_t IE_FIFO_FULL;
+	bool CALIB_OFFSET_VALID;
+	bool CALIB_KD_VALID;
+	uint8_t _pad[1];
 } ADC_Config_t;
 
 uint8_t ADC_GetChannelNumber(ADC_CH_MASK Mask);

driver/bk4819.c

@@ -716,14 +716,14 @@ void BK4819_SetupSquelch(
 	//                0 ~ 255
 	//
 	BK4819_WriteRegister(BK4819_REG_4E,  // 01 101 11 1 00000000
-	#if 0
+	#ifndef ENABLE_FASTER_CHANNEL_SCAN
 		// original
 		  (1u << 14)                // 1 ???
 		| (5u << 11)                // 5  squelch = 1 delay .. 0 ~ 7
 		| (3u <<  9)                // 3  squelch = 0 delay .. 0 ~ 3
 		| SquelchOpenGlitchThresh); // 0 ~ 255
 	#else
-		// supposedly fast
+		// faster (but twitchier)
 		  (1u << 14)                // 1 ???
 		| SquelchOpenGlitchThresh); // 0 ~ 255
 	#endif
@@ -831,15 +831,14 @@ void BK4819_SetCompander(const unsigned int mode)
 	// mode 2 .. RX
 	// mode 3 .. TX and RX
 
+	const uint16_t r31 = BK4819_ReadRegister(BK4819_REG_31);
+	
 	if (mode == 0)
 	{	// disable
-		BK4819_WriteRegister(BK4819_REG_31, BK4819_ReadRegister(BK4819_REG_31) & ~(1u < 3));
+		BK4819_WriteRegister(BK4819_REG_31, r31 & ~(1u << 3));
 		return;
 	}
 
-	// enable
-	BK4819_WriteRegister(BK4819_REG_31, BK4819_ReadRegister(BK4819_REG_31) | (1u < 3));
-
 	// set the compressor ratio
 	//
 	// REG_29 <15:14> 10 Compress (AF Tx) Ratio
@@ -848,9 +847,19 @@ void BK4819_SetCompander(const unsigned int mode)
 	//                10 = 2:1
 	//                11 = 4:1
 	//
-	const uint16_t compress_ratio = (mode == 1 || mode >= 3) ? 3 : 0;  // 4:1
+	// REG_29  <13:7> 86 Compress (AF Tx) 0 dB point (dB)
-	BK4819_WriteRegister(BK4819_REG_29, (BK4819_ReadRegister(BK4819_REG_29) & ~(3u < 14)) | (compress_ratio < 14));
+	//
-
+	// REG_29   <6:0> 64 Compress (AF Tx) noise point (dB)
+	//
+	const uint16_t compress_ratio    = (mode == 1 || mode >= 3) ? 2 : 0;  // 2:1
+	const uint16_t compress_0dB      = 86;
+	const uint16_t compress_noise_dB = 64;
+//	AB40  10 1010110 1000000
+	BK4819_WriteRegister(BK4819_REG_29, // (BK4819_ReadRegister(BK4819_REG_29) & ~(3u < 14)) | (compress_ratio < 14));
+		  (compress_ratio    << 14)
+		| (compress_0dB      <<  7)
+		| (compress_noise_dB <<  0));
+ 
 	// set the expander ratio
 	//
 	// REG_28 <15:14> 01 Expander (AF Rx) Ratio
@@ -859,8 +868,21 @@ void BK4819_SetCompander(const unsigned int mode)
 	//                10 = 1:3
 	//                11 = 1:4
 	//
-	const uint16_t expand_ratio = (mode >= 2) ? 3 : 0;   // 1:4
+	// REG_28  <13:7> 86 Expander (AF Rx) 0 dB point (dB)
-	BK4819_WriteRegister(BK4819_REG_28, (BK4819_ReadRegister(BK4819_REG_28) & ~(3u < 14)) | (expand_ratio < 14));
+	//
+	// REG_28   <6:0> 56 Expander (AF Rx) noise point (dB)
+	//
+	const uint16_t expand_ratio    = (mode >= 2) ? 1 : 0;   // 1:2
+	const uint16_t expand_0dB      = 86;
+	const uint16_t expand_noise_dB = 56;
+//	6B38  01 1010110 0111000
+	BK4819_WriteRegister(BK4819_REG_28, // (BK4819_ReadRegister(BK4819_REG_28) & ~(3u < 14)) | (expand_ratio < 14));
+		  (expand_ratio    << 14)
+		| (expand_0dB      <<  7)
+		| (expand_noise_dB <<  0));
+
+	// enable
+	BK4819_WriteRegister(BK4819_REG_31, r31 | (1u << 3));
 }
 
 void BK4819_DisableVox(void)
@@ -891,7 +913,7 @@ void BK4819_EnableDTMF(void)
 	// REG_24 <3:0>  14 Max symbol number for SelCall detection
 
 //	const uint16_t threshold = 24;    // doesn't decode non-QS radios
-	const uint16_t threshold = 140;   // but 128 ~ 247 does
+	const uint16_t threshold = 160;   // but 128 ~ 247 does
 	BK4819_WriteRegister(BK4819_REG_24,                // 1 00011000 1 1 1 1110
 		  (1u        << BK4819_REG_24_SHIFT_UNKNOWN_15)
 		| (threshold << BK4819_REG_24_SHIFT_THRESHOLD)      // 0 ~ 255
@@ -1161,7 +1183,25 @@ void BK4819_TransmitTone(bool bLocalLoopback, uint32_t Frequency)
 {
 	BK4819_EnterTxMute();
 
-	BK4819_WriteRegister(BK4819_REG_70, 0 | BK4819_REG_70_MASK_ENABLE_TONE1 | (96U << BK4819_REG_70_SHIFT_TONE1_TUNING_GAIN));
+	// REG_70 <15>   0 Enable TONE1
+	//               1 = Enable
+	//               0 = Disable
+	//
+	// REG_70 <14:8> 0 TONE1 tuning gain
+	//               0 ~ 127
+	//
+	// REG_70 <7>    0 Enable TONE2
+	//               1 = Enable
+	//               0 = Disable
+	//
+	// REG_70 <6:0>  0 TONE2/FSK tuning gain
+	//               0 ~ 127
+	//
+	// set the tone amplitude
+	//
+//	BK4819_WriteRegister(BK4819_REG_70, BK4819_REG_70_MASK_ENABLE_TONE1 | (96u << BK4819_REG_70_SHIFT_TONE1_TUNING_GAIN));
+	BK4819_WriteRegister(BK4819_REG_70, BK4819_REG_70_MASK_ENABLE_TONE1 | (50u << BK4819_REG_70_SHIFT_TONE1_TUNING_GAIN));
+
 	BK4819_WriteRegister(BK4819_REG_71, scale_freq(Frequency));
 
 	BK4819_SetAF(bLocalLoopback ? BK4819_AF_BEEP : BK4819_AF_MUTE);

driver/bk4819.h

@@ -24,22 +24,22 @@
 
 enum BK4819_AF_Type_t
 {
-	BK4819_AF_MUTE     =  0u,
+	BK4819_AF_MUTE      =  0u,  //
-	BK4819_AF_OPEN     =  1u,
+	BK4819_AF_FM        =  1u,  // FM
-	BK4819_AF_ALAM     =  2u,
+	BK4819_AF_ALAM      =  2u,  //
-	BK4819_AF_BEEP     =  3u,
+	BK4819_AF_BEEP      =  3u,  //
-	BK4819_AF_UNKNOWN1 =  4u,
+	BK4819_AF_BASEBAND1 =  4u,  // SSB
-	BK4819_AF_UNKNOWN2 =  5u,
+	BK4819_AF_BASEBAND2 =  5u,  // SSB
-	BK4819_AF_CTCO     =  6u,
+	BK4819_AF_CTCO      =  6u,  // strange LF audio .. maybe the CTCSS LF line ?
-	BK4819_AF_AM       =  7u,
+	BK4819_AF_AM        =  7u,  // AM
-	BK4819_AF_FSKO     =  8u,
+	BK4819_AF_FSKO      =  8u,  // nothing
-	BK4819_AF_UNKNOWN3 =  9u,
+	BK4819_AF_UNKNOWN3  =  9u,  // distorted
-	BK4819_AF_UNKNOWN4 = 10u,
+	BK4819_AF_UNKNOWN4  = 10u,  // nothing at all
-	BK4819_AF_UNKNOWN5 = 11u,
+	BK4819_AF_UNKNOWN5  = 11u,  // distorted
-	BK4819_AF_UNKNOWN6 = 12u,
+	BK4819_AF_UNKNOWN6  = 12u,  // distorted
-	BK4819_AF_UNKNOWN7 = 13u,
+	BK4819_AF_UNKNOWN7  = 13u,  // interesting
-	BK4819_AF_UNKNOWN8 = 14u,
+	BK4819_AF_UNKNOWN8  = 14u,  // interesting 
-	BK4819_AF_UNKNOWN9 = 15u
+	BK4819_AF_UNKNOWN9  = 15u   // not a lot
 };
 
 typedef enum BK4819_AF_Type_t BK4819_AF_Type_t;

firmware.ld

@@ -17,7 +17,7 @@ SECTIONS
 	.text :
 	{
 		. = ALIGN(4);
-		*(.text.isr)           /* .text sections of code  */
+		KEEP(*(.text.isr)) /* .text sections of code  */
 		*(.text)           /* .text sections of code  */
 		*(.text*)          /* .text* sections of code */
 		*(.rodata)         /* .rodata sections        */

functions.c

@@ -22,6 +22,7 @@
 #endif
 #include "bsp/dp32g030/gpio.h"
 #include "dcs.h"
+#include "driver/backlight.h"
 #if defined(ENABLE_FMRADIO)
 	#include "driver/bk1080.h"
 #endif
@@ -55,12 +56,15 @@ void FUNCTION_Init(void)
 	#endif
 
 	DTMF_clear_RX();
-	
+
 	g_CxCSS_TAIL_Found = false;
 	g_CDCSS_Lost       = false;
 	g_CTCSS_Lost       = false;
-					  
+
-	g_VOX_Lost         = false;
+	#ifdef ENABLE_VOX
+		g_VOX_Lost     = false;
+	#endif
+
 	g_SquelchLost      = false;
 
 	gFlagTailNoteEliminationComplete   = false;
@@ -74,6 +78,8 @@ void FUNCTION_Init(void)
 	#ifdef ENABLE_NOAA
 		gNOAACountdown_10ms = 0;
 	#endif
+
+	gUpdateStatus = true;
 }
 
 void FUNCTION_Select(FUNCTION_Type_t Function)
@@ -111,36 +117,39 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
 			#endif
 
 			if (gDTMF_CallState == DTMF_CALL_STATE_CALL_OUT || gDTMF_CallState == DTMF_CALL_STATE_RECEIVED)
-				gDTMF_AUTO_RESET_TIME = 1 + (gEeprom.DTMF_AUTO_RESET_TIME * 2);
+				gDTMF_auto_reset_time_500ms = 1 + (gEeprom.DTMF_auto_reset_time * 2);
 
+			gUpdateStatus = true;
 			return;
-	
+
 		case FUNCTION_MONITOR:
 			gMonitor = true;
 			break;
-			
+
 		case FUNCTION_INCOMING:
 		case FUNCTION_RECEIVE:
 			break;
-	
+
 		case FUNCTION_POWER_SAVE:
 			gPowerSave_10ms            = gEeprom.BATTERY_SAVE * 10;
 			gPowerSaveCountdownExpired = false;
 
 			gRxIdleMode = true;
-			
+
 			gMonitor = false;
 
-			BK4819_DisableVox();
+			BK4819_DisableVox();			
 			BK4819_Sleep();
-			
+
 			BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2, false);
 
 			gUpdateStatus = true;
 
-			GUI_SelectNextDisplay(DISPLAY_MAIN);
+			if (gScreenToDisplay != DISPLAY_MENU)     // 1of11 .. don't close the menu
+				GUI_SelectNextDisplay(DISPLAY_MAIN);
+
 			return;
-	
+
 		case FUNCTION_TRANSMIT:
 
 			// if DTMF is enabled when TX'ing, it changes the TX audio filtering !! .. 1of11
@@ -153,7 +162,7 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
 			gDTMF_RX_live_timeout = 0;
 			gDTMF_RX_live_timeout = 0;
 			memset(gDTMF_RX_live, 0, sizeof(gDTMF_RX_live));
-			
+
 			#if defined(ENABLE_FMRADIO)
 				if (gFmRadioMode)
 					BK1080_Init(0, false);
@@ -183,16 +192,18 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
 					break;
 				}
 			#endif
-			
+
+			gUpdateStatus = true;
+
 			GUI_DisplayScreen();
 
 			RADIO_SetTxParameters();
 
 			// turn the RED LED on
 			BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_RED, true);
-	
+
 			DTMF_Reply();
-	
+
 			#if defined(ENABLE_ALARM) || defined(ENABLE_TX1750)
 				if (gAlarmState != ALARM_STATE_OFF)
 				{
@@ -219,6 +230,9 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
 			else
 				BK4819_DisableScramble();
 
+			if (gSetting_backlight_on_tx_rx == 1 || gSetting_backlight_on_tx_rx == 3)
+				BACKLIGHT_TurnOn();
+
 			break;
 
 		case FUNCTION_BAND_SCOPE:

helper/boot.c

@@ -75,7 +75,9 @@ void BOOT_ProcessMode(BOOT_Mode_t Mode)
 		{
 			gEeprom.DUAL_WATCH               = DUAL_WATCH_OFF;
 			gEeprom.BATTERY_SAVE             = 0;
-			gEeprom.VOX_SWITCH               = false;
+			#ifdef ENABLE_VOX
+				gEeprom.VOX_SWITCH           = false;
+			#endif
 			gEeprom.CROSS_BAND_RX_TX         = CROSS_BAND_OFF;
 			gEeprom.AUTO_KEYPAD_LOCK         = false;
 			gEeprom.KEY_1_SHORT_PRESS_ACTION = ACTION_OPT_NONE;

misc.c

@@ -45,7 +45,9 @@ const uint16_t    dual_watch_count_after_rx_10ms   =  1000 / 10;   // 1 sec afte
 const uint16_t    dual_watch_count_after_1_10ms    =  5000 / 10;   // 5 sec
 const uint16_t    dual_watch_count_after_2_10ms    =  3600 / 10;   // 3.6 sec
 const uint16_t    dual_watch_count_noaa_10ms       =    70 / 10;   // 70ms
-const uint16_t    dual_watch_count_after_vox_10ms  =   200 / 10;   // 200ms
+#ifdef ENABLE_VOX
+	const uint16_t dual_watch_count_after_vox_10ms  =   200 / 10;   // 200ms
+#endif
 const uint16_t    dual_watch_count_toggle_10ms     =   100 / 10;   // 100ms between VFO toggles
 
 const uint16_t    scan_pause_delay_in_1_10ms       =  5000 / 10;   // 5 seconds
@@ -61,7 +63,9 @@ const uint16_t    battery_save_count_10ms          = 10000 / 10;   // 10 seconds
 const uint16_t    power_save1_10ms                 =   100 / 10;   // 100ms
 const uint16_t    power_save2_10ms                 =   200 / 10;   // 200ms
 
-const uint16_t    vox_stop_count_down_10ms         =  1000 / 10;   // 1 second
+#ifdef ENABLE_VOX
+	const uint16_t    vox_stop_count_down_10ms         =  1000 / 10;   // 1 second
+#endif
 
 const uint16_t    NOAA_countdown_10ms              =  5000 / 10;   // 5 seconds
 const uint16_t    NOAA_countdown_2_10ms            =   500 / 10;   // 500ms
@@ -83,6 +87,8 @@ bool              gSetting_TX_EN;
 uint8_t           gSetting_F_LOCK;
 bool              gSetting_ScrambleEnable;
 
+uint8_t           gSetting_backlight_on_tx_rx;
+
 #ifdef ENABLE_AM_FIX
 	bool          gSetting_AM_fix;
 #endif
@@ -126,7 +132,6 @@ volatile bool     gDualWatchCountdownExpired = true;
 bool              gDualWatchActive           = false;
 
 volatile uint8_t  gSerialConfigCountDown_500ms;
-volatile bool     gSerialConfigCountDown_done;
 
 volatile bool     gNextTimeslice_500ms;
 
@@ -187,12 +192,14 @@ bool              g_CDCSS_Lost;
 uint8_t           gCDCSSCodeType;
 bool              g_CTCSS_Lost;
 bool              g_CxCSS_TAIL_Found;
-bool              g_VOX_Lost;
+#ifdef ENABLE_VOX
+	bool          g_VOX_Lost;
+	bool          gVOX_NoiseDetected;
+	uint16_t      gVoxResumeCountdown;
+	uint16_t      gVoxPauseCountdown;
+#endif
 bool              g_SquelchLost;
 uint8_t           gFlashLightState;
-bool              gVOX_NoiseDetected;
-uint16_t          gVoxResumeCountdown;
-uint16_t          gVoxPauseCountdown;
 volatile uint16_t gFlashLightBlinkCounter;
 bool              gFlagEndTransmission;
 uint16_t          gLowBatteryCountdown;
@@ -218,7 +225,6 @@ uint8_t           gScanDelay_10ms;
 	uint8_t       gAircopySendCountdown;
 #endif
 uint8_t           gFSKWriteIndex;
-uint8_t           gNeverUsed;
 
 #ifdef ENABLE_NOAA
 	bool          gIsNoaaMode;
@@ -234,7 +240,9 @@ uint8_t           gShowChPrefix;
 volatile bool     gNextTimeslice;
 volatile uint8_t  gFoundCDCSSCountdown_10ms;
 volatile uint8_t  gFoundCTCSSCountdown_10ms;
-volatile uint16_t gVoxStopCountdown_10ms;
+#ifdef ENABLE_VOX
+	volatile uint16_t gVoxStopCountdown_10ms;
+#endif
 volatile bool     gNextTimeslice40ms;
 #ifdef ENABLE_NOAA
 	volatile uint16_t gNOAACountdown_10ms = 0;

misc.h

@@ -116,7 +116,9 @@ extern const uint16_t        battery_save_count_10ms;
 extern const uint16_t        power_save1_10ms;
 extern const uint16_t        power_save2_10ms;
 
-extern const uint16_t        vox_stop_count_down_10ms;
+#ifdef ENABLE_VOX
+	extern const uint16_t    vox_stop_count_down_10ms;
+#endif
 
 extern const uint16_t        NOAA_countdown_10ms;
 extern const uint16_t        NOAA_countdown_2_10ms;
@@ -128,7 +130,9 @@ extern const uint16_t        dual_watch_count_after_1_10ms;
 extern const uint16_t        dual_watch_count_after_2_10ms;
 extern const uint16_t        dual_watch_count_toggle_10ms;
 extern const uint16_t        dual_watch_count_noaa_10ms;
-extern const uint16_t        dual_watch_count_after_vox_10ms;
+#ifdef ENABLE_VOX
+	extern const uint16_t    dual_watch_count_after_vox_10ms;
+#endif
 
 extern const uint16_t        scan_pause_delay_in_1_10ms;
 extern const uint16_t        scan_pause_delay_in_2_10ms;
@@ -152,6 +156,8 @@ extern bool                  gSetting_TX_EN;
 extern uint8_t               gSetting_F_LOCK;
 extern bool                  gSetting_ScrambleEnable;
 
+extern uint8_t               gSetting_backlight_on_tx_rx;
+
 #ifdef ENABLE_AM_FIX
 	extern bool              gSetting_AM_fix;
 #endif
@@ -196,7 +202,6 @@ extern volatile bool         gDualWatchCountdownExpired;
 extern bool                  gDualWatchActive;
 
 extern volatile uint8_t      gSerialConfigCountDown_500ms;
-extern volatile bool         gSerialConfigCountDown_done;
 
 extern volatile bool         gNextTimeslice_500ms;
 
@@ -257,12 +262,14 @@ extern bool                  g_CDCSS_Lost;
 extern uint8_t               gCDCSSCodeType;
 extern bool                  g_CTCSS_Lost;
 extern bool                  g_CxCSS_TAIL_Found;
-extern bool                  g_VOX_Lost;
+#ifdef ENABLE_VOX
+	extern bool              g_VOX_Lost;
+	extern bool              gVOX_NoiseDetected;
+	extern uint16_t          gVoxResumeCountdown;
+	extern uint16_t          gVoxPauseCountdown;
+#endif
 extern bool                  g_SquelchLost;
 extern uint8_t               gFlashLightState;
-extern bool                  gVOX_NoiseDetected;
-extern uint16_t              gVoxResumeCountdown;
-extern uint16_t              gVoxPauseCountdown;
 extern volatile uint16_t     gFlashLightBlinkCounter;
 extern bool                  gFlagEndTransmission;
 extern uint16_t              gLowBatteryCountdown;
@@ -286,7 +293,6 @@ extern uint8_t               gScanDelay_10ms;
 	extern uint8_t           gAircopySendCountdown;
 #endif
 extern uint8_t               gFSKWriteIndex;
-extern uint8_t               gNeverUsed;
 #ifdef ENABLE_NOAA
 	extern bool              gIsNoaaMode;
 	extern uint8_t           gNoaaChannel;
@@ -300,7 +306,9 @@ extern bool                  gF_LOCK;
 extern uint8_t               gShowChPrefix;
 extern volatile uint8_t      gFoundCDCSSCountdown_10ms;
 extern volatile uint8_t      gFoundCTCSSCountdown_10ms;
-extern volatile uint16_t     gVoxStopCountdown_10ms;
+#ifdef ENABLE_VOX
+	extern volatile uint16_t gVoxStopCountdown_10ms;
+#endif
 extern volatile bool         gNextTimeslice40ms;
 #ifdef ENABLE_NOAA
 	extern volatile uint16_t gNOAACountdown_10ms;

radio.c

@@ -130,9 +130,7 @@ void RADIO_InitInfo(VFO_Info_t *pInfo, const uint8_t ChannelSave, const uint32_t
 	pInfo->freq_config_TX.Frequency = Frequency;
 	pInfo->pRX                      = &pInfo->freq_config_RX;
 	pInfo->pTX                      = &pInfo->freq_config_TX;
-	#ifdef ENABLE_COMPANDER
+	pInfo->Compander                = 0;  // off
-		pInfo->Compander            = 0;  // off
-	#endif
 
 	if (ChannelSave == (FREQ_CHANNEL_FIRST + BAND2_108MHz))
 		pInfo->AM_mode = 1;
@@ -218,7 +216,6 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 	if (Band > BAND7_470MHz)
 	{
 		Band = BAND6_400MHz;
-//		Band = FREQUENCY_GetBand(gEeprom.ScreenChannel[VFO]);   // 1of11 bug fix, or have I broke it ?
 	}
 
 	if (IS_MR_CHANNEL(Channel))
@@ -344,7 +341,7 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 		}
 
 		// ***************
-		
+
 		struct
 		{
 			uint32_t Frequency;
@@ -372,8 +369,8 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 	if (Frequency < frequencyBandTable[Band].lower)
 		Frequency = frequencyBandTable[Band].lower;
 	else
-	if (Frequency > frequencyBandTable[Band + 1].upper)
+	if (Frequency > frequencyBandTable[Band].upper)
-		Frequency = frequencyBandTable[Band + 1].upper;
+		Frequency = frequencyBandTable[Band].upper;
 	else
 	if (Channel >= FREQ_CHANNEL_FIRST)
 		Frequency = FREQUENCY_FloorToStep(Frequency, gEeprom.VfoInfo[VFO].StepFrequency, frequencyBandTable[Band].lower);
@@ -421,9 +418,7 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 		gEeprom.VfoInfo[VFO].freq_config_TX.CodeType = CODE_TYPE_OFF;
 	}
 
-	#ifdef ENABLE_COMPANDER
+	gEeprom.VfoInfo[VFO].Compander = (Attributes & MR_CH_COMPAND) >> 4;
-		gEeprom.VfoInfo[VFO].Compander = (Attributes & MR_CH_COMPAND) >> 4;
-	#endif
 
 	RADIO_ConfigureSquelchAndOutputPower(pRadio);
 }
@@ -457,16 +452,20 @@ void RADIO_ConfigureSquelchAndOutputPower(VFO_Info_t *pInfo)
 		EEPROM_ReadBuffer(Base + 0x40, &pInfo->SquelchCloseGlitchThresh, 1);  //  90    90
 		EEPROM_ReadBuffer(Base + 0x50, &pInfo->SquelchOpenGlitchThresh,  1);  // 100   100
 
-		#if ENABLE_SQUELCH_LOWER
+		#if ENABLE_SQUELCH_MORE_SENSITIVE
-			// make squelch more sensitive
+			// make squelch a little more sensitive
+			//
+			// getting the best setting here is still experimental, bare with me
+			//
+			// note that 'noise' and 'glitch' values are inverted compared to 'rssi' values
 
 			pInfo->SquelchOpenRSSIThresh    = ((uint16_t)pInfo->SquelchOpenRSSIThresh   * 8) / 9;
-			pInfo->SquelchCloseRSSIThresh   = ((uint16_t)pInfo->SquelchOpenRSSIThresh   * 7) / 8;
+			pInfo->SquelchCloseRSSIThresh   = ((uint16_t)pInfo->SquelchOpenRSSIThresh   * 8) / 9;
 
-			pInfo->SquelchOpenNoiseThresh   = ((uint16_t)pInfo->SquelchOpenNoiseThresh  * 8) / 7;
+			pInfo->SquelchOpenNoiseThresh   = ((uint16_t)pInfo->SquelchOpenNoiseThresh  * 9) / 8;
 			pInfo->SquelchCloseNoiseThresh  = ((uint16_t)pInfo->SquelchOpenNoiseThresh  * 9) / 8;
 
-			pInfo->SquelchOpenGlitchThresh  = ((uint16_t)pInfo->SquelchOpenGlitchThresh * 8) / 7;
+			pInfo->SquelchOpenGlitchThresh  = ((uint16_t)pInfo->SquelchOpenGlitchThresh * 9) / 8;
 			pInfo->SquelchCloseGlitchThresh = ((uint16_t)pInfo->SquelchOpenGlitchThresh * 9) / 8;
 		#endif
 
@@ -518,7 +517,7 @@ void RADIO_ApplyOffset(VFO_Info_t *pInfo)
 
 static void RADIO_SelectCurrentVfo(void)
 {
-	gCurrentVfo = (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) ? gRxVfo : &gEeprom.VfoInfo[gEeprom.TX_CHANNEL];
+ 	gCurrentVfo = (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) ? gRxVfo : &gEeprom.VfoInfo[gEeprom.TX_CHANNEL];
 }
 
 void RADIO_SelectVfos(void)
@@ -548,7 +547,7 @@ void RADIO_SelectVfos(void)
 
 void RADIO_SetupRegisters(bool bSwitchToFunction0)
 {
-	BK4819_FilterBandwidth_t Bandwidth;
+	BK4819_FilterBandwidth_t Bandwidth = gRxVfo->CHANNEL_BANDWIDTH;
 	uint16_t                 InterruptMask;
 	uint32_t                 Frequency;
 
@@ -558,7 +557,6 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
 
 	BK4819_ToggleGpioOut(BK4819_GPIO0_PIN28_GREEN, false);
 
-	Bandwidth = gRxVfo->CHANNEL_BANDWIDTH;
 	switch (Bandwidth)
 	{
 		default:
@@ -566,8 +564,8 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
 		case BK4819_FILTER_BW_WIDE:
 		case BK4819_FILTER_BW_NARROW:
 			#ifdef ENABLE_AM_FIX
-				BK4819_SetFilterBandwidth(Bandwidth, gRxVfo->AM_mode && gSetting_AM_fix);
+//				BK4819_SetFilterBandwidth(Bandwidth, gRxVfo->AM_mode && gSetting_AM_fix);
-//				BK4819_SetFilterBandwidth(Bandwidth, false);
+				BK4819_SetFilterBandwidth(Bandwidth, true);
 			#else
 				BK4819_SetFilterBandwidth(Bandwidth, false);
 			#endif
@@ -611,6 +609,7 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
 
 	BK4819_PickRXFilterPathBasedOnFrequency(Frequency);
 
+	// what does this in do ?
 	BK4819_ToggleGpioOut(BK4819_GPIO6_PIN2, true);
 
 	// AF RX Gain and DAC
@@ -623,7 +622,7 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
 	#endif
 	{
 		if (gRxVfo->AM_mode == 0)
-		{
+		{	// FM
 			uint8_t CodeType = gSelectedCodeType;
 			uint8_t Code     = gSelectedCode;
 			if (gCssScanMode == CSS_SCAN_MODE_OFF)
@@ -695,30 +694,30 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
 		}
 	#endif
 
-	#ifdef ENABLE_NOAA
+	#ifdef ENABLE_VOX
-		#ifdef ENABLE_FMRADIO
+		#ifdef ENABLE_NOAA
-			if (gEeprom.VOX_SWITCH && !gFmRadioMode && IS_NOT_NOAA_CHANNEL(gCurrentVfo->CHANNEL_SAVE) && gCurrentVfo->AM_mode == 0)
+			#ifdef ENABLE_FMRADIO
+				if (gEeprom.VOX_SWITCH && !gFmRadioMode && IS_NOT_NOAA_CHANNEL(gCurrentVfo->CHANNEL_SAVE) && gCurrentVfo->AM_mode == 0)
+			#else
+				if (gEeprom.VOX_SWITCH && IS_NOT_NOAA_CHANNEL(gCurrentVfo->CHANNEL_SAVE) && gCurrentVfo->AM_mode == 0)
+			#endif
 		#else
-			if (gEeprom.VOX_SWITCH && IS_NOT_NOAA_CHANNEL(gCurrentVfo->CHANNEL_SAVE) && gCurrentVfo->AM_mode == 0)
+			#ifdef ENABLE_FMRADIO
-		#endif
+				if (gEeprom.VOX_SWITCH && !gFmRadioMode && gCurrentVfo->AM_mode == 0)
-	#else
+			#else
-		#ifdef ENABLE_FMRADIO
+				if (gEeprom.VOX_SWITCH && gCurrentVfo->AM_mode == 0)
-			if (gEeprom.VOX_SWITCH && !gFmRadioMode && gCurrentVfo->AM_mode == 0)
+			#endif
-		#else
-			if (gEeprom.VOX_SWITCH && gCurrentVfo->AM_mode == 0)
 		#endif
+		{
+			BK4819_EnableVox(gEeprom.VOX1_THRESHOLD, gEeprom.VOX0_THRESHOLD);
+			InterruptMask |= BK4819_REG_3F_VOX_FOUND | BK4819_REG_3F_VOX_LOST;
+		}
+		else
 	#endif
-	{
-		BK4819_EnableVox(gEeprom.VOX1_THRESHOLD, gEeprom.VOX0_THRESHOLD);
-		InterruptMask |= BK4819_REG_3F_VOX_FOUND | BK4819_REG_3F_VOX_LOST;
-	}
-	else
 		BK4819_DisableVox();
 
-	#ifdef ENABLE_COMPANDER
+	// RX expander
-		// RX expander
+	BK4819_SetCompander((gRxVfo->AM_mode == 0 && gRxVfo->Compander >= 2) ? gRxVfo->Compander : 0);
-		BK4819_SetCompander((gRxVfo->AM_mode == 0 && gRxVfo->Compander >= 2) ? gRxVfo->Compander : 0);
-	#endif
 
 	#if 0
 		if (!gRxVfo->DTMF_DECODING_ENABLE && !gSetting_KILLED)
@@ -733,6 +732,7 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
 	#else
 		if (gCurrentFunction != FUNCTION_TRANSMIT)
 		{
+			BK4819_DisableDTMF();
 			BK4819_EnableDTMF();
 			InterruptMask |= BK4819_REG_3F_DTMF_5TONE_FOUND;
 		}
@@ -813,8 +813,8 @@ void RADIO_SetTxParameters(void)
 		case BK4819_FILTER_BW_WIDE:
 		case BK4819_FILTER_BW_NARROW:
 			#ifdef ENABLE_AM_FIX
-				BK4819_SetFilterBandwidth(Bandwidth, gCurrentVfo->AM_mode && gSetting_AM_fix);
+//				BK4819_SetFilterBandwidth(Bandwidth, gCurrentVfo->AM_mode && gSetting_AM_fix);
-//				BK4819_SetFilterBandwidth(Bandwidth, false);
+				BK4819_SetFilterBandwidth(Bandwidth, true);
 			#else
 				BK4819_SetFilterBandwidth(Bandwidth, false);
 			#endif
@@ -823,10 +823,8 @@ void RADIO_SetTxParameters(void)
 
 	BK4819_SetFrequency(gCurrentVfo->pTX->Frequency);
 
-	#ifdef ENABLE_COMPANDER
+	// TX compressor
-		// TX compressor
+	BK4819_SetCompander((gRxVfo->AM_mode == 0 && (gRxVfo->Compander == 1 || gRxVfo->Compander >= 3)) ? gRxVfo->Compander : 0);
-		BK4819_SetCompander((gRxVfo->AM_mode == 0 && (gRxVfo->Compander == 1 || gRxVfo->Compander >= 3)) ? gRxVfo->Compander : 0);
-	#endif
 
 	BK4819_PrepareTransmit();
 
@@ -936,8 +934,8 @@ void RADIO_PrepareTX(void)
 			}
 			else
 		#endif
-		if (!gSetting_TX_EN)
+		if (!gSetting_TX_EN || gSerialConfigCountDown_500ms > 0)
-		{	// TX is disabled
+		{	// TX is disabled or config upload/download in progress
 			State = VFO_STATE_TX_DISABLE;
 		}
 		else
@@ -969,7 +967,7 @@ void RADIO_PrepareTX(void)
 	}
 
 	// TX is allowed
-	
+
 	if (gDTMF_ReplyState == DTMF_REPLY_ANI)
 	{
 		if (gDTMF_CallMode == DTMF_CALL_MODE_DTMF)

radio.h

@@ -25,9 +25,7 @@
 
 enum {
 	MR_CH_BAND_MASK   = 0x0F << 0,
-	#ifdef ENABLE_COMPANDER
+	MR_CH_COMPAND     =   3u << 4,  // new
-		MR_CH_COMPAND =   3u << 4,  // new
-	#endif
 	MR_CH_SCANLIST2   =   1u << 6,
 	MR_CH_SCANLIST1   =   1u << 7
 };
@@ -111,9 +109,7 @@ typedef struct VFO_Info_t
 
 	uint8_t        AM_mode;
 
-	#ifdef ENABLE_COMPANDER
+	uint8_t        Compander;
-		uint8_t    Compander;
-	#endif
 
 	char           Name[16];
 } VFO_Info_t;

scheduler.c

@@ -57,7 +57,7 @@ void SystickHandler(void)
 		gNextTimeslice_500ms = true;
 		
 		DECREMENT_AND_TRIGGER(gTxTimerCountdown_500ms, gTxTimeoutReached);
-		DECREMENT_AND_TRIGGER(gSerialConfigCountDown_500ms, gSerialConfigCountDown_done);
+		DECREMENT(gSerialConfigCountDown_500ms);
 	}
 
 	if ((gGlobalSysTickCounter & 3) == 0)
@@ -104,7 +104,9 @@ void SystickHandler(void)
 				DECREMENT_AND_TRIGGER(gFmPlayCountdown_10ms, gScheduleFM);
 	#endif
 
-	DECREMENT(gVoxStopCountdown_10ms);
+	#ifdef ENABLE_VOX
+		DECREMENT(gVoxStopCountdown_10ms);
+	#endif
 
 	DECREMENT(boot_counter_10ms);
 }

settings.c

@@ -86,8 +86,13 @@ void SETTINGS_SaveSettings(void)
 		State[3] = false;
 	#endif
 	State[4] = gEeprom.KEY_LOCK;
-	State[5] = gEeprom.VOX_SWITCH;
+	#ifdef ENABLE_VOX
-	State[6] = gEeprom.VOX_LEVEL;
+		State[5] = gEeprom.VOX_SWITCH;
+		State[6] = gEeprom.VOX_LEVEL;
+	#else
+		State[5] = false;
+		State[6] = 0;
+	#endif
 	State[7] = gEeprom.MIC_SENSITIVITY;
 	EEPROM_WriteBuffer(0x0E70, State);
 
@@ -135,7 +140,7 @@ void SETTINGS_SaveSettings(void)
 	State[1] = gEeprom.DTMF_SEPARATE_CODE;
 	State[2] = gEeprom.DTMF_GROUP_CALL_CODE;
 	State[3] = gEeprom.DTMF_DECODE_RESPONSE;
-	State[4] = gEeprom.DTMF_AUTO_RESET_TIME;
+	State[4] = gEeprom.DTMF_auto_reset_time;
 	State[5] = gEeprom.DTMF_PRELOAD_TIME / 10U;
 	State[6] = gEeprom.DTMF_FIRST_CODE_PERSIST_TIME / 10U;
 	State[7] = gEeprom.DTMF_HASH_CODE_PERSIST_TIME / 10U;
@@ -174,6 +179,8 @@ void SETTINGS_SaveSettings(void)
 	#ifdef ENABLE_AM_FIX
 		if (!gSetting_AM_fix)            State[7] &= ~(1u << 5);
 	#endif
+	State[7] = (State[7] & ~(3u << 6)) | ((gSetting_backlight_on_tx_rx & 3u) << 6);
+	 
 	EEPROM_WriteBuffer(0x0F40, State);
 }
 
@@ -253,20 +260,15 @@ void SETTINGS_UpdateChannel(uint8_t Channel, const VFO_Info_t *pVFO, bool keep)
 	{
 		uint8_t  State[8];
 		uint8_t  Attributes = 0xFF;        // default attributes
-		#ifdef ENABLE_COMPANDER
-			Attributes &= ~MR_CH_COMPAND;  // default to '0' = compander disabled
-		#endif
 		uint16_t Offset = 0x0D60 + (Channel & ~7u);
+		
+		Attributes &= ~MR_CH_COMPAND;  // default to '0' = compander disabled
 
 		EEPROM_ReadBuffer(Offset, State, sizeof(State));
 
 		if (keep)
 		{
-			#ifdef ENABLE_COMPANDER
+			Attributes = (pVFO->SCANLIST1_PARTICIPATION << 7) | (pVFO->SCANLIST2_PARTICIPATION << 6) | (pVFO->Compander << 4) | (pVFO->Band << 0);
-				Attributes = (pVFO->SCANLIST1_PARTICIPATION << 7) | (pVFO->SCANLIST2_PARTICIPATION << 6) | (pVFO->Compander << 4) | (pVFO->Band << 0);
-			#else
-				Attributes = (pVFO->SCANLIST1_PARTICIPATION << 7) | (pVFO->SCANLIST2_PARTICIPATION << 6) | (pVFO->Band << 0);
-			#endif
 			if (State[Channel & 7u] == Attributes)
 				return; // no change in the attributes
 		}

settings.h

@@ -127,7 +127,15 @@ typedef struct {
 	uint8_t               field7_0xa;
 	uint8_t               field8_0xb;
 
-	uint32_t              POWER_ON_PASSWORD;
+	#ifdef ENABLE_FMRADIO
+		uint16_t          FM_SelectedFrequency;
+		uint8_t           FM_SelectedChannel;
+		bool              FM_IsMrMode;
+		uint16_t          FM_FrequencyPlaying;
+		uint16_t          FM_LowerLimit;
+		uint16_t          FM_UpperLimit;
+	#endif
+
 	uint8_t               SQUELCH_LEVEL;
 	uint8_t               TX_TIMEOUT_TIMER;
 	bool                  KEY_LOCK;
@@ -152,25 +160,10 @@ typedef struct {
 
 	uint8_t               field29_0x26;
 	uint8_t               field30_0x27;
-
-	uint16_t              VOX1_THRESHOLD;
-	uint16_t              VOX0_THRESHOLD;
-
-	#ifdef ENABLE_FMRADIO
-		uint16_t          FM_SelectedFrequency;
-		uint8_t           FM_SelectedChannel;
-		bool              FM_IsMrMode;
-		uint16_t          FM_FrequencyPlaying;
-	#endif
 	
 	uint8_t               field37_0x32;
 	uint8_t               field38_0x33;
 
-	#ifdef ENABLE_FMRADIO
-		uint16_t          FM_LowerLimit;
-		uint16_t          FM_UpperLimit;
-	#endif
-
 	bool                  AUTO_KEYPAD_LOCK;
 	#if defined(ENABLE_ALARM) || defined(ENABLE_TX1750)
 		ALARM_Mode_t      ALARM_MODE;
@@ -201,7 +194,7 @@ typedef struct {
 	char                  DTMF_SEPARATE_CODE;
 	char                  DTMF_GROUP_CALL_CODE;
 	uint8_t               DTMF_DECODE_RESPONSE;
-	uint8_t               DTMF_AUTO_RESET_TIME;
+	uint8_t               DTMF_auto_reset_time;
 	uint16_t              DTMF_PRELOAD_TIME;
 	uint16_t              DTMF_FIRST_CODE_PERSIST_TIME;
 	uint16_t              DTMF_HASH_CODE_PERSIST_TIME;
@@ -216,11 +209,16 @@ typedef struct {
 	uint8_t               VOLUME_GAIN;
 	uint8_t               DAC_GAIN;
 
+	VFO_Info_t            VfoInfo[2];
+	uint32_t              POWER_ON_PASSWORD;
+	uint16_t              VOX1_THRESHOLD;
+	uint16_t              VOX0_THRESHOLD;
+
 	uint8_t               field77_0x95;
 	uint8_t               field78_0x96;
 	uint8_t               field79_0x97;
 
-	VFO_Info_t            VfoInfo[2];
+	uint8_t _pad[1];
 } EEPROM_Config_t;
 extern EEPROM_Config_t gEeprom;
 

ui/main.c

@@ -36,21 +36,26 @@
 #include "ui/main.h"
 #include "ui/ui.h"
 
-enum center_line_t {
-	CENTER_LINE_NONE = 0,
-	CENTER_LINE_IN_USE,
-	CENTER_LINE_AUDIO_BAR,
-	CENTER_LINE_RSSI,
-	CENTER_LINE_AM_FIX_DATA,
-	CENTER_LINE_DTMF_DEC,
-	CENTER_LINE_CHARGE_DATA
-};
-typedef enum center_line_t center_line_t;
-
 center_line_t center_line = CENTER_LINE_NONE;
 
 // ***************************************************************************
 
+void UI_drawBars(uint8_t *p, const unsigned int level)
+{
+	switch (level)
+	{
+		default:
+		case 7: memmove(p + 20, BITMAP_AntennaLevel6, sizeof(BITMAP_AntennaLevel6));
+		case 6: memmove(p + 17, BITMAP_AntennaLevel5, sizeof(BITMAP_AntennaLevel5));
+		case 5: memmove(p + 14, BITMAP_AntennaLevel4, sizeof(BITMAP_AntennaLevel4));
+		case 4: memmove(p + 11, BITMAP_AntennaLevel3, sizeof(BITMAP_AntennaLevel3));
+		case 3: memmove(p +  8, BITMAP_AntennaLevel2, sizeof(BITMAP_AntennaLevel2));
+		case 2: memmove(p +  5, BITMAP_AntennaLevel1, sizeof(BITMAP_AntennaLevel1));
+		case 1: memmove(p +  0, BITMAP_Antenna,       sizeof(BITMAP_Antenna));
+		case 0: break;
+	}
+}
+
 #ifdef ENABLE_AUDIO_BAR
 
 	unsigned int sqrt16(unsigned int value)
@@ -80,11 +85,21 @@ center_line_t center_line = CENTER_LINE_NONE;
 			const unsigned int bar_width = LCD_WIDTH - 2 - bar_x;
 			unsigned int       i;
 
+			if (gScreenToDisplay != DISPLAY_MAIN)
+				return;
+
 			#if 1
 				// TX audio level
 
-				if (gCurrentFunction != FUNCTION_TRANSMIT)
+			if (gCurrentFunction != FUNCTION_TRANSMIT ||
-					return;
+			    gScreenToDisplay != DISPLAY_MAIN ||
+			    gDTMF_CallState != DTMF_CALL_STATE_NONE)
+				return;  // screen is in use
+				
+				#if defined(ENABLE_ALARM) || defined(ENABLE_TX1750)
+					if (gAlarmState != ALARM_STATE_OFF)
+						return;
+				#endif
 
 				const unsigned int voice_amp  = BK4819_GetVoiceAmplitudeOut();  // 15:0
 
@@ -157,7 +172,9 @@ center_line_t center_line = CENTER_LINE_NONE;
 
 		if (gEeprom.KEY_LOCK && gKeypadLocked > 0)
 			return;     // display is in use
-		if (gCurrentFunction == FUNCTION_TRANSMIT || gScreenToDisplay != DISPLAY_MAIN)
+		if (gCurrentFunction == FUNCTION_TRANSMIT ||
+		    gScreenToDisplay != DISPLAY_MAIN ||
+			gDTMF_CallState != DTMF_CALL_STATE_NONE)
 			return;     // display is in use
 
 		if (now)
@@ -272,25 +289,12 @@ void UI_UpdateRSSI(const int16_t rssi, const int vfo)
 
 		memset(p_line, 0, 23);
 
-		if (rssi_level > 0)
+		// untested !!!
-		{
+
-			//if (rssi_level >= 1)
+		if (rssi_level == 0)
-				memmove(p_line, BITMAP_Antenna, 5);
-			if (rssi_level >= 2)
-				memmove(p_line +  5, BITMAP_AntennaLevel1, sizeof(BITMAP_AntennaLevel1));
-			if (rssi_level >= 3)
-				memmove(p_line +  8, BITMAP_AntennaLevel2, sizeof(BITMAP_AntennaLevel2));
-			if (rssi_level >= 4)
-				memmove(p_line + 11, BITMAP_AntennaLevel3, sizeof(BITMAP_AntennaLevel3));
-			if (rssi_level >= 5)
-				memmove(p_line + 14, BITMAP_AntennaLevel4, sizeof(BITMAP_AntennaLevel4));
-			if (rssi_level >= 6)
-				memmove(p_line + 17, BITMAP_AntennaLevel5, sizeof(BITMAP_AntennaLevel5));
-			if (rssi_level >= 7)
-				memmove(p_line + 20, BITMAP_AntennaLevel6, sizeof(BITMAP_AntennaLevel6));
-		}
-		else
 			p_line = NULL;
+		else
+			UI_drawBars(p_line, rssi_level);
 
 		ST7565_DrawLine(0, Line, 23, p_line);
 	#endif
@@ -332,7 +336,7 @@ void UI_DisplayMain(void)
 		const bool         same_vfo   = (channel == vfo_num) ? true : false;
 		uint8_t           *p_line0    = gFrameBuffer[line + 0];
 		uint8_t           *p_line1    = gFrameBuffer[line + 1];
-		uint32_t           duff_beer  = 0;
+		uint8_t            mode       = 0;
 		uint8_t            state;
 
 		if (single_vfo)
@@ -419,23 +423,36 @@ void UI_DisplayMain(void)
 
 			#ifdef ENABLE_ALARM
 				if (gAlarmState == ALARM_STATE_ALARM)
-					duff_beer = 2;
+					mode = 2;
 				else
 			#endif
 			{
 				channel = (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) ? gEeprom.RX_CHANNEL : gEeprom.TX_CHANNEL;
 				if (channel == vfo_num)
 				{	// show the TX symbol
-					duff_beer = 1;
+					mode = 1;
-					UI_PrintStringSmall("TX", 14, 0, line);
+					#ifdef ENABLE_SMALL_BOLD
+						UI_PrintStringSmallBold("TX", 14, 0, line);
+					#else
+						UI_PrintStringSmall("TX", 14, 0, line);
+					#endif
 				}
 			}
 		}
 		else
 		{	// receiving .. show the RX symbol
-			duff_beer = 2;
+			mode = 2;
-			if ((gCurrentFunction == FUNCTION_RECEIVE || gCurrentFunction == FUNCTION_MONITOR) && gEeprom.RX_CHANNEL == vfo_num)
+			if ((gCurrentFunction == FUNCTION_RECEIVE ||
-				UI_PrintStringSmall("RX", 14, 0, line);
+			     gCurrentFunction == FUNCTION_MONITOR ||
+			     gCurrentFunction == FUNCTION_INCOMING) &&
+			     gEeprom.RX_CHANNEL == vfo_num)
+			{
+				#ifdef ENABLE_SMALL_BOLD
+					UI_PrintStringSmallBold("RX", 14, 0, line);
+				#else
+					UI_PrintStringSmall("RX", 14, 0, line);
+				#endif
+			}
 		}
 
 		if (IS_MR_CHANNEL(gEeprom.ScreenChannel[vfo_num]))
@@ -519,10 +536,12 @@ void UI_DisplayMain(void)
 				if (attributes & MR_CH_SCANLIST2)
 					memmove(p_line0 + 120, BITMAP_ScanList2, sizeof(BITMAP_ScanList2));
 				#ifndef ENABLE_BIG_FREQ
-					#ifdef ENABLE_COMPANDER
+					if ((attributes & MR_CH_COMPAND) > 0)
-						if ((attributes & MR_CH_COMPAND) > 0)
+						memmove(p_line0 + 120 + LCD_WIDTH, BITMAP_compand, sizeof(BITMAP_compand));
-							memmove(p_line0 + 120 + LCD_WIDTH, BITMAP_compand, sizeof(BITMAP_compand));
+				#else
-					#endif
+					
+					// TODO:  // find somewhere else to put the symbol
+				
 				#endif
 
 				switch (gEeprom.CHANNEL_DISPLAY_MODE)
@@ -589,16 +608,14 @@ void UI_DisplayMain(void)
 					UI_PrintString(String, 32, 0, line, 8);
 				#endif
 
-				#ifdef ENABLE_COMPANDER
+				// show the channel symbols
-					// show the channel symbols
+				const uint8_t attributes = gMR_ChannelAttributes[gEeprom.ScreenChannel[vfo_num]];
-					const uint8_t attributes = gMR_ChannelAttributes[gEeprom.ScreenChannel[vfo_num]];
+				if ((attributes & MR_CH_COMPAND) > 0)
-					if ((attributes & MR_CH_COMPAND) > 0)
+					#ifdef ENABLE_BIG_FREQ
-						#ifdef ENABLE_BIG_FREQ
+						memmove(p_line0 + 120, BITMAP_compand, sizeof(BITMAP_compand));
-							memmove(p_line0 + 120, BITMAP_compand, sizeof(BITMAP_compand));
+					#else
-						#else
+						memmove(p_line0 + 120 + LCD_WIDTH, BITMAP_compand, sizeof(BITMAP_compand));
-							memmove(p_line0 + 120 + LCD_WIDTH, BITMAP_compand, sizeof(BITMAP_compand));
+					#endif
-						#endif
-				#endif
 			}
 		}
 
@@ -607,7 +624,7 @@ void UI_DisplayMain(void)
 		{	// show the TX/RX level
 			uint8_t Level = 0;
 
-			if (duff_beer == 1)
+			if (mode == 1)
 			{	// TX power level
 				switch (gRxVfo->OUTPUT_POWER)
 				{
@@ -617,7 +634,7 @@ void UI_DisplayMain(void)
 				}
 			}
 			else
-			if (duff_beer == 2)
+			if (mode == 2)
 			{	// RX signal level
 				#ifndef ENABLE_RSSI_BAR
 					// bar graph
@@ -626,23 +643,7 @@ void UI_DisplayMain(void)
 				#endif
 			}
 
-			if (Level >= 1)
+			UI_drawBars(p_line1 + LCD_WIDTH, Level);
-			{
-				uint8_t *p_line = p_line1 + LCD_WIDTH;
-					memmove(p_line +  0, BITMAP_Antenna,       sizeof(BITMAP_Antenna));
-				if (Level >= 2)
-					memmove(p_line +  5, BITMAP_AntennaLevel1, sizeof(BITMAP_AntennaLevel1));
-				if (Level >= 3)
-					memmove(p_line +  8, BITMAP_AntennaLevel2, sizeof(BITMAP_AntennaLevel2));
-				if (Level >= 4)
-					memmove(p_line + 11, BITMAP_AntennaLevel3, sizeof(BITMAP_AntennaLevel3));
-				if (Level >= 5)
-					memmove(p_line + 14, BITMAP_AntennaLevel4, sizeof(BITMAP_AntennaLevel4));
-				if (Level >= 6)
-					memmove(p_line + 17, BITMAP_AntennaLevel5, sizeof(BITMAP_AntennaLevel5));
-				if (Level >= 7)
-					memmove(p_line + 20, BITMAP_AntennaLevel6, sizeof(BITMAP_AntennaLevel6));
-			}
 		}
 
 		// ************
@@ -654,7 +655,7 @@ void UI_DisplayMain(void)
 		}
 		else
 		{	// or show the CTCSS/DCS symbol
-			const FREQ_Config_t *pConfig = (duff_beer == 1) ? gEeprom.VfoInfo[vfo_num].pTX : gEeprom.VfoInfo[vfo_num].pRX;
+			const FREQ_Config_t *pConfig = (mode == 1) ? gEeprom.VfoInfo[vfo_num].pTX : gEeprom.VfoInfo[vfo_num].pRX;
 			const unsigned int code_type = pConfig->CodeType;
 			const char *code_list[] = {"", "CT", "DCS", "DCR"};
 			if (code_type >= 0 && code_type < ARRAY_SIZE(code_list))
@@ -713,8 +714,8 @@ void UI_DisplayMain(void)
 		#ifdef ENABLE_AUDIO_BAR
 			if (gSetting_mic_bar && gCurrentFunction == FUNCTION_TRANSMIT)
 			{
-				UI_DisplayAudioBar();
 				center_line = CENTER_LINE_AUDIO_BAR;
+				UI_DisplayAudioBar();
 			}
 			else
 		#endif
@@ -722,9 +723,13 @@ void UI_DisplayMain(void)
 		#if defined(ENABLE_AM_FIX) && defined(ENABLE_AM_FIX_SHOW_DATA)
 			if (rx && gEeprom.VfoInfo[gEeprom.RX_CHANNEL].AM_mode && gSetting_AM_fix)
 			{
+				if (gScreenToDisplay != DISPLAY_MAIN ||
+					gDTMF_CallState != DTMF_CALL_STATE_NONE)
+					return;
+
+				center_line = CENTER_LINE_AM_FIX_DATA;
 				AM_fix_print_data(gEeprom.RX_CHANNEL, String);
 				UI_PrintStringSmall(String, 2, 0, 3);
-				center_line = CENTER_LINE_AM_FIX_DATA;
 			}
 			else
 		#endif
@@ -732,8 +737,8 @@ void UI_DisplayMain(void)
 		#ifdef ENABLE_RSSI_BAR
 			if (rx)
 			{
-				UI_DisplayRSSIBar(gCurrentRSSI[gEeprom.RX_CHANNEL], false);
 				center_line = CENTER_LINE_RSSI;
+				UI_DisplayRSSIBar(gCurrentRSSI[gEeprom.RX_CHANNEL], false);
 			}
 			else
 		#endif
@@ -745,20 +750,32 @@ void UI_DisplayMain(void)
 				{	// show live DTMF decode
 					const unsigned int len = strlen(gDTMF_RX_live);
 					const unsigned int idx = (len > (17 - 5)) ? len - (17 - 5) : 0;  // limit to last 'n' chars
+
+					if (gScreenToDisplay != DISPLAY_MAIN ||
+						gDTMF_CallState != DTMF_CALL_STATE_NONE)
+						return;
+						
+					center_line = CENTER_LINE_DTMF_DEC;
+					
 					strcpy(String, "DTMF ");
 					strcat(String, gDTMF_RX_live + idx);
 					UI_PrintStringSmall(String, 2, 0, 3);
-					center_line = CENTER_LINE_DTMF_DEC;
 				}
 			#else
 				if (gSetting_live_DTMF_decoder && gDTMF_RX_index > 0)
 				{	// show live DTMF decode
 					const unsigned int len = gDTMF_RX_index;
 					const unsigned int idx = (len > (17 - 5)) ? len - (17 - 5) : 0;  // limit to last 'n' chars
+
+					if (gScreenToDisplay != DISPLAY_MAIN ||
+						gDTMF_CallState != DTMF_CALL_STATE_NONE)
+						return;
+
+					center_line = CENTER_LINE_DTMF_DEC;
+					
 					strcpy(String, "DTMF ");
 					strcat(String, gDTMF_RX + idx);
 					UI_PrintStringSmall(String, 2, 0, 3);
-					center_line = CENTER_LINE_DTMF_DEC;
 				}
 			#endif
 
@@ -766,11 +783,16 @@ void UI_DisplayMain(void)
 				else
 				if (gChargingWithTypeC)
 				{	// charging .. show the battery state
+					if (gScreenToDisplay != DISPLAY_MAIN ||
+						gDTMF_CallState != DTMF_CALL_STATE_NONE)
+						return;
+						
+					center_line = CENTER_LINE_CHARGE_DATA;
+					
 					sprintf(String, "Charge %u.%02uV %u%%",
 						gBatteryVoltageAverage / 100, gBatteryVoltageAverage % 100,
 						BATTERY_VoltsToPercent(gBatteryVoltageAverage));
 					UI_PrintStringSmall(String, 2, 0, 3);
-					center_line = CENTER_LINE_CHARGE_DATA;
 				}
 			#endif
 		}

ui/main.h

@@ -17,6 +17,19 @@
 #ifndef UI_MAIN_H
 #define UI_MAIN_H
 
+enum center_line_t {
+	CENTER_LINE_NONE = 0,
+	CENTER_LINE_IN_USE,
+	CENTER_LINE_AUDIO_BAR,
+	CENTER_LINE_RSSI,
+	CENTER_LINE_AM_FIX_DATA,
+	CENTER_LINE_DTMF_DEC,
+	CENTER_LINE_CHARGE_DATA
+};
+typedef enum center_line_t center_line_t;
+
+extern center_line_t center_line;
+
 void UI_DisplayAudioBar(void);
 void UI_UpdateRSSI(const int16_t rssi, const int vfo);
 void UI_DisplayMain(void);

ui/menu.c

@@ -18,6 +18,7 @@
 #include <stdlib.h>  // abs()
 
 #include "app/dtmf.h"
+#include "app/menu.h"
 #include "bitmaps.h"
 #include "board.h"
 #include "dcs.h"
@@ -42,96 +43,97 @@ const t_menu_item MenuList[] =
 {
 //   text,     voice ID,                               menu ID
 
-	{"SQL",    VOICE_ID_SQUELCH,                       MENU_SQL        },
+	{"SQL",    VOICE_ID_SQUELCH,                       MENU_SQL           },
-	{"STEP",   VOICE_ID_FREQUENCY_STEP,                MENU_STEP       },
+	{"STEP",   VOICE_ID_FREQUENCY_STEP,                MENU_STEP          },
-	{"T PWR",  VOICE_ID_POWER,                         MENU_TXP        }, // was "TXP"
+	{"T PWR",  VOICE_ID_POWER,                         MENU_TXP           }, // was "TXP"
-	{"R DCS",  VOICE_ID_DCS,                           MENU_R_DCS      }, // was "R_DCS"
+	{"R DCS",  VOICE_ID_DCS,                           MENU_R_DCS         }, // was "R_DCS"
-	{"R CTCS", VOICE_ID_CTCSS,                         MENU_R_CTCS     }, // was "R_CTCS"
+	{"R CTCS", VOICE_ID_CTCSS,                         MENU_R_CTCS        }, // was "R_CTCS"
-	{"T DCS",  VOICE_ID_DCS,                           MENU_T_DCS      }, // was "T_DCS"
+	{"T DCS",  VOICE_ID_DCS,                           MENU_T_DCS         }, // was "T_DCS"
-	{"T CTCS", VOICE_ID_CTCSS,                         MENU_T_CTCS     }, // was "T_CTCS"
+	{"T CTCS", VOICE_ID_CTCSS,                         MENU_T_CTCS        }, // was "T_CTCS"
-	{"T DIR",  VOICE_ID_TX_OFFSET_FREQUENCY_DIRECTION, MENU_SFT_D      }, // was "SFT_D"
+	{"T DIR",  VOICE_ID_TX_OFFSET_FREQUENCY_DIRECTION, MENU_SFT_D         }, // was "SFT_D"
-	{"T OFFS", VOICE_ID_TX_OFFSET_FREQUENCY,           MENU_OFFSET     }, // was "OFFSET"
+	{"T OFFS", VOICE_ID_TX_OFFSET_FREQUENCY,           MENU_OFFSET        }, // was "OFFSET"
-	{"T VFO",  VOICE_ID_INVALID,                       MENU_XB         }, // was "WX"
+	{"T VFO",  VOICE_ID_INVALID,                       MENU_XB            }, // was "WX"
-	{"T TOUT", VOICE_ID_TRANSMIT_OVER_TIME,            MENU_TOT        }, // was "TOT"
+	{"T TOUT", VOICE_ID_TRANSMIT_OVER_TIME,            MENU_TOT           }, // was "TOT"
-	{"W/N",    VOICE_ID_CHANNEL_BANDWIDTH,             MENU_W_N        },
+	{"W/N",    VOICE_ID_CHANNEL_BANDWIDTH,             MENU_W_N           },
-	{"SCRAM",  VOICE_ID_SCRAMBLER_ON,                  MENU_SCR        }, // was "SCR"
+	{"SCRAM",  VOICE_ID_SCRAMBLER_ON,                  MENU_SCR           }, // was "SCR"
-	{"BUSYCL", VOICE_ID_BUSY_LOCKOUT,                  MENU_BCL        }, // was "BCL"
+	{"BUSYCL", VOICE_ID_BUSY_LOCKOUT,                  MENU_BCL           }, // was "BCL"
-	{"CH SAV", VOICE_ID_MEMORY_CHANNEL,                MENU_MEM_CH     }, // was "MEM-CH"
+	{"CH SAV", VOICE_ID_MEMORY_CHANNEL,                MENU_MEM_CH        }, // was "MEM-CH"
-	{"CH DEL", VOICE_ID_DELETE_CHANNEL,                MENU_DEL_CH     }, // was "DEL-CH"
+	{"CH DEL", VOICE_ID_DELETE_CHANNEL,                MENU_DEL_CH        }, // was "DEL-CH"
-	{"CH NAM", VOICE_ID_INVALID,                       MENU_MEM_NAME   },
+	{"CH NAM", VOICE_ID_INVALID,                       MENU_MEM_NAME      },
-	{"CH DIS", VOICE_ID_INVALID,                       MENU_MDF        }, // was "MDF"
+	{"CH DIS", VOICE_ID_INVALID,                       MENU_MDF           }, // was "MDF"
-	{"BATSAV", VOICE_ID_SAVE_MODE,                     MENU_SAVE       }, // was "SAVE"
+	{"BATSAV", VOICE_ID_SAVE_MODE,                     MENU_SAVE          }, // was "SAVE"
-	{"VOX",    VOICE_ID_VOX,                           MENU_VOX        },
+#ifdef ENABLE_VOX
-	{"BACKLT", VOICE_ID_INVALID,                       MENU_ABR        }, // was "ABR"
+	{"VOX",    VOICE_ID_VOX,                           MENU_VOX           },
-	{"DUALRX", VOICE_ID_DUAL_STANDBY,                  MENU_TDR        }, // was "TDR"
+#endif
-	{"BEEP",   VOICE_ID_BEEP_PROMPT,                   MENU_BEEP       },
+	{"BLT",    VOICE_ID_INVALID,                       MENU_ABR           }, // was "ABR"
+	{"BLTTRX", VOICE_ID_INVALID,                       MENU_ABR_ON_TX_RX  },
+	{"DUALRX", VOICE_ID_DUAL_STANDBY,                  MENU_TDR           }, // was "TDR"
+	{"BEEP",   VOICE_ID_BEEP_PROMPT,                   MENU_BEEP          },
 #ifdef ENABLE_VOICE
-	{"VOICE",  VOICE_ID_VOICE_PROMPT,                  MENU_VOICE      },
+	{"VOICE",  VOICE_ID_VOICE_PROMPT,                  MENU_VOICE         },
 #endif
-	{"SC REV", VOICE_ID_INVALID,                       MENU_SC_REV     },
+	{"SC REV", VOICE_ID_INVALID,                       MENU_SC_REV        },
-	{"KEYLOC", VOICE_ID_INVALID,                       MENU_AUTOLK     }, // was "AUTOLk"
+	{"KEYLOC", VOICE_ID_INVALID,                       MENU_AUTOLK        }, // was "AUTOLk"
-	{"S ADD1", VOICE_ID_INVALID,                       MENU_S_ADD1     },
+	{"S ADD1", VOICE_ID_INVALID,                       MENU_S_ADD1        },
-	{"S ADD2", VOICE_ID_INVALID,                       MENU_S_ADD2     },
+	{"S ADD2", VOICE_ID_INVALID,                       MENU_S_ADD2        },
-	{"STE",    VOICE_ID_INVALID,                       MENU_STE        },
+	{"STE",    VOICE_ID_INVALID,                       MENU_STE           },
-	{"RP STE", VOICE_ID_INVALID,                       MENU_RP_STE     },
+	{"RP STE", VOICE_ID_INVALID,                       MENU_RP_STE        },
-	{"MIC",    VOICE_ID_INVALID,                       MENU_MIC        },
+	{"MIC",    VOICE_ID_INVALID,                       MENU_MIC           },
 #ifdef ENABLE_AUDIO_BAR
-	{"MICBAR", VOICE_ID_INVALID,                       MENU_MIC_BAR    },
+	{"MICBAR", VOICE_ID_INVALID,                       MENU_MIC_BAR       },
 #endif
-#ifdef ENABLE_COMPANDER
+	{"COMPND", VOICE_ID_INVALID,                       MENU_COMPAND       },
-	{"COMPND", VOICE_ID_INVALID,                       MENU_COMPAND    },
+	{"1 CALL", VOICE_ID_INVALID,                       MENU_1_CALL        },
-#endif
+	{"SLIST",  VOICE_ID_INVALID,                       MENU_S_LIST        },
-	{"1 CALL", VOICE_ID_INVALID,                       MENU_1_CALL     },
+	{"SLIST1", VOICE_ID_INVALID,                       MENU_SLIST1        },
-	{"SLIST",  VOICE_ID_INVALID,                       MENU_S_LIST     },
+	{"SLIST2", VOICE_ID_INVALID,                       MENU_SLIST2        },
-	{"SLIST1", VOICE_ID_INVALID,                       MENU_SLIST1     },
-	{"SLIST2", VOICE_ID_INVALID,                       MENU_SLIST2     },
 #ifdef ENABLE_ALARM
-	{"AL-MOD", VOICE_ID_INVALID,                       MENU_AL_MOD     },
+	{"AL-MOD", VOICE_ID_INVALID,                       MENU_AL_MOD        },
 #endif
-	{"ANI ID", VOICE_ID_ANI_CODE,                      MENU_ANI_ID     },
+	{"ANI ID", VOICE_ID_ANI_CODE,                      MENU_ANI_ID        },
-	{"UPCODE", VOICE_ID_INVALID,                       MENU_UPCODE     },
+	{"UPCODE", VOICE_ID_INVALID,                       MENU_UPCODE        },
-	{"DWCODE", VOICE_ID_INVALID,                       MENU_DWCODE     },
+	{"DWCODE", VOICE_ID_INVALID,                       MENU_DWCODE        },
-	{"PTT ID", VOICE_ID_INVALID,                       MENU_PTT_ID     },
+	{"PTT ID", VOICE_ID_INVALID,                       MENU_PTT_ID        },
-	{"D ST",   VOICE_ID_INVALID,                       MENU_D_ST       },
+	{"D ST",   VOICE_ID_INVALID,                       MENU_D_ST          },
-    {"D RSP",  VOICE_ID_INVALID,                       MENU_D_RSP      },
+    {"D RSP",  VOICE_ID_INVALID,                       MENU_D_RSP         },
-	{"D HOLD", VOICE_ID_INVALID,                       MENU_D_HOLD     },
+	{"D HOLD", VOICE_ID_INVALID,                       MENU_D_HOLD        },
-	{"D PRE",  VOICE_ID_INVALID,                       MENU_D_PRE      },
+	{"D PRE",  VOICE_ID_INVALID,                       MENU_D_PRE         },
-	{"D DCD",  VOICE_ID_INVALID,                       MENU_D_DCD      },
+	{"D DCD",  VOICE_ID_INVALID,                       MENU_D_DCD         },
-	{"D LIST", VOICE_ID_INVALID,                       MENU_D_LIST     },
+	{"D LIST", VOICE_ID_INVALID,                       MENU_D_LIST        },
-	{"D LIVE", VOICE_ID_INVALID,                       MENU_D_LIVE_DEC }, // live DTMF decoder
+	{"D LIVE", VOICE_ID_INVALID,                       MENU_D_LIVE_DEC    }, // live DTMF decoder
-	{"PONMSG", VOICE_ID_INVALID,                       MENU_PONMSG     },
+	{"PONMSG", VOICE_ID_INVALID,                       MENU_PONMSG        },
-	{"ROGER",  VOICE_ID_INVALID,                       MENU_ROGER      },
+	{"ROGER",  VOICE_ID_INVALID,                       MENU_ROGER         },
-	{"BATVOL", VOICE_ID_INVALID,                       MENU_VOL        }, // was "VOL"
+	{"BATVOL", VOICE_ID_INVALID,                       MENU_VOL           }, // was "VOL"
-	{"BATTXT", VOICE_ID_INVALID,                       MENU_BAT_TXT    },
+	{"BATTXT", VOICE_ID_INVALID,                       MENU_BAT_TXT       },
-	{"MODE",   VOICE_ID_INVALID,                       MENU_AM         }, // was "AM"
+	{"MODE",   VOICE_ID_INVALID,                       MENU_AM            }, // was "AM"
 #ifdef ENABLE_AM_FIX
-	{"AM FIX", VOICE_ID_INVALID,                       MENU_AM_FIX     },
+	{"AM FIX", VOICE_ID_INVALID,                       MENU_AM_FIX        },
 #endif
 #ifdef ENABLE_AM_FIX_TEST1
-	{"AM FT1", VOICE_ID_INVALID,                       MENU_AM_FIX_TEST1},
+	{"AM FT1", VOICE_ID_INVALID,                       MENU_AM_FIX_TEST1  },
 #endif
 #ifdef ENABLE_NOAA
-	{"NOAA-S", VOICE_ID_INVALID,                       MENU_NOAA_S     },
+	{"NOAA-S", VOICE_ID_INVALID,                       MENU_NOAA_S        },
 #endif
-	{"RESET",  VOICE_ID_INITIALISATION,                MENU_RESET      }, // might be better to move this to the hidden menu items ?
+	{"RESET",  VOICE_ID_INITIALISATION,                MENU_RESET         }, // might be better to move this to the hidden menu items ?
 
 	// hidden menu items from here on
 	// enabled if pressing both the PTT and upper side button at power-on
 
-	{"F LOCK", VOICE_ID_INVALID,                       MENU_F_LOCK     },
+	{"F LOCK", VOICE_ID_INVALID,                       MENU_F_LOCK        },
-	{"TX 200", VOICE_ID_INVALID,                       MENU_200TX      }, // was "200TX"
+	{"TX 200", VOICE_ID_INVALID,                       MENU_200TX         }, // was "200TX"
-	{"TX 350", VOICE_ID_INVALID,                       MENU_350TX      }, // was "350TX"
+	{"TX 350", VOICE_ID_INVALID,                       MENU_350TX         }, // was "350TX"
-	{"TX 500", VOICE_ID_INVALID,                       MENU_500TX      }, // was "500TX"
+	{"TX 500", VOICE_ID_INVALID,                       MENU_500TX         }, // was "500TX"
-	{"350 EN", VOICE_ID_INVALID,                       MENU_350EN      }, // was "350EN"
+	{"350 EN", VOICE_ID_INVALID,                       MENU_350EN         }, // was "350EN"
-	{"SCR EN", VOICE_ID_INVALID,                       MENU_SCREN      }, // was "SCREN"
+	{"SCR EN", VOICE_ID_INVALID,                       MENU_SCREN         }, // was "SCREN"
 
-	{"TX EN",  VOICE_ID_INVALID,                       MENU_TX_EN      }, // enable TX
+	{"TX EN",  VOICE_ID_INVALID,                       MENU_TX_EN         }, // enable TX
 #ifdef ENABLE_F_CAL_MENU
-	{"F CALI", VOICE_ID_INVALID,                       MENU_F_CALI     }, // reference xtal calibration
+	{"F CALI", VOICE_ID_INVALID,                       MENU_F_CALI        }, // reference xtal calibration
 #endif
-	{"BATCAL", VOICE_ID_INVALID,                       MENU_BATCAL     }, // battery voltage calibration
+	{"BATCAL", VOICE_ID_INVALID,                       MENU_BATCAL        }, // battery voltage calibration
 
-	{"",       VOICE_ID_INVALID,                       0xff            }  // end of list - DO NOT delete or move this this
+	{"",       VOICE_ID_INVALID,                       0xff               }  // end of list - DO NOT delete or move this this
 };
 
 const char gSubMenu_TXP[3][5] =
@@ -289,15 +291,13 @@ const char gSubMenu_BACKLIGHT[8][7] =
 	"ON"
 };
 
-#ifdef ENABLE_COMPANDER
+const char gSubMenu_RX_TX[4][6] =
-	const char gSubMenu_Compand[4][6] =
+{
-	{
+	"OFF",
-		"OFF",
+	"TX",
-		"TX",
+	"RX",
-		"RX",
+	"TX/RX"
-		"TX/RX"
+};
-	};
-#endif
 
 #ifdef ENABLE_AM_FIX_TEST1
 	const char gSubMenu_AM_fix_test1[4][8] =
@@ -355,7 +355,7 @@ void UI_DisplayMenu(void)
 
 	#if 0
 		// original menu layout
-		
+
 		for (i = 0; i < 3; i++)
 			if (gMenuCursor > 0 || i > 0)
 				if ((gMenuListCount - 1) != gMenuCursor || i != 2)
@@ -476,11 +476,41 @@ void UI_DisplayMenu(void)
 
 		case MENU_R_CTCS:
 		case MENU_T_CTCS:
-			if (gSubMenuSelection == 0)
+		{
-				strcpy(String, "OFF");
+			#if 1
-			else
+				unsigned int Code;
-				sprintf(String, "%u.%uHz", CTCSS_Options[gSubMenuSelection - 1] / 10, CTCSS_Options[gSubMenuSelection - 1] % 10);
+				FREQ_Config_t *pConfig = (gMenuCursor == MENU_R_CTCS) ? &gTxVfo->freq_config_RX : &gTxVfo->freq_config_TX;
+				if (gSubMenuSelection == 0)
+				{
+					strcpy(String, "OFF");
+
+					if (pConfig->CodeType != CODE_TYPE_CONTINUOUS_TONE)
+						break;
+					Code = 0;
+					pConfig->CodeType = CODE_TYPE_OFF;
+					pConfig->Code = Code;
+
+					BK4819_ExitSubAu();
+				}
+				else
+				{
+					sprintf(String, "%u.%uHz", CTCSS_Options[gSubMenuSelection - 1] / 10, CTCSS_Options[gSubMenuSelection - 1] % 10);
+
+					pConfig->CodeType = CODE_TYPE_CONTINUOUS_TONE;
+					Code = gSubMenuSelection - 1;
+					pConfig->Code = Code;
+
+					BK4819_SetCTCSSFrequency(CTCSS_Options[Code]);
+				}
+			#else
+				if (gSubMenuSelection == 0)
+					strcpy(String, "OFF");
+				else
+					sprintf(String, "%u.%uHz", CTCSS_Options[gSubMenuSelection - 1] / 10, CTCSS_Options[gSubMenuSelection - 1] % 10);
+			#endif
+
 			break;
+		}
 
 		case MENU_SFT_D:
 			strcpy(String, gSubMenu_SFT_D[gSubMenuSelection]);
@@ -518,14 +548,22 @@ void UI_DisplayMenu(void)
 
 		case MENU_SCR:
 			strcpy(String, gSubMenu_SCRAMBLER[gSubMenuSelection]);
+			#if 1
+				if (gSubMenuSelection > 0 && gSetting_ScrambleEnable)
+					BK4819_EnableScramble(gSubMenuSelection - 1);
+				else
+					BK4819_DisableScramble();
+			#endif
 			break;
 
-		case MENU_VOX:
+		#ifdef ENABLE_VOX
-			if (gSubMenuSelection == 0)
+			case MENU_VOX:
-				strcpy(String, "OFF");
+				if (gSubMenuSelection == 0)
-			else
+					strcpy(String, "OFF");
-				sprintf(String, "%d", gSubMenuSelection);
+				else
-			break;
+					sprintf(String, "%d", gSubMenuSelection);
+				break;
+		#endif
 
 		case MENU_ABR:
 			strcpy(String, gSubMenu_BACKLIGHT[gSubMenuSelection]);
@@ -538,6 +576,7 @@ void UI_DisplayMenu(void)
 		#ifdef ENABLE_AM_FIX_TEST1
 			case MENU_AM_FIX_TEST1:
 				strcpy(String, gSubMenu_AM_fix_test1[gSubMenuSelection]);
+//				gSetting_AM_fix = gSubMenuSelection;
 				break;
 		#endif
 
@@ -545,11 +584,10 @@ void UI_DisplayMenu(void)
 			strcpy(String, (gSubMenuSelection == 0) ? "OFF" : "AUTO");
 			break;
 
-		#ifdef ENABLE_COMPANDER
+		case MENU_COMPAND:
-			case MENU_COMPAND:
+		case MENU_ABR_ON_TX_RX:
-				strcpy(String, gSubMenu_Compand[gSubMenuSelection]);
+			strcpy(String, gSubMenu_RX_TX[gSubMenuSelection]);
-				break;
+			break;
-		#endif
 
 		#ifdef ENABLE_AM_FIX
 			case MENU_AM_FIX:
@@ -671,7 +709,10 @@ void UI_DisplayMenu(void)
 			break;
 
 		case MENU_S_LIST:
-			sprintf(String, "LIST%u", gSubMenuSelection);
+			if (gSubMenuSelection < 2)
+				sprintf(String, "LIST%u", 1 + gSubMenuSelection);
+			else
+				strcpy(String, "ALL");
 			break;
 
 		#ifdef ENABLE_ALARM
@@ -747,10 +788,9 @@ void UI_DisplayMenu(void)
 				{
 					const uint32_t value   = 22656 + gSubMenuSelection;
 					const uint32_t xtal_Hz = (0x4f0000u + value) * 5;
-	
+
-					//gEeprom.BK4819_XTAL_FREQ_LOW = gSubMenuSelection;  // already set when the user was adjusting the value
+					writeXtalFreqCal(gSubMenuSelection, false);
-					BK4819_WriteRegister(BK4819_REG_3B, value);
+
-	
 					sprintf(String, "%d\n%u.%06u\nMHz",
 						gSubMenuSelection,
 						xtal_Hz / 1000000, xtal_Hz % 1000000);

ui/menu.h

@@ -49,8 +49,11 @@ enum
 	MENU_MEM_NAME,
 	MENU_MDF,
 	MENU_SAVE,
+#ifdef ENABLE_VOX
 	MENU_VOX,
+#endif
 	MENU_ABR,
+	MENU_ABR_ON_TX_RX,
 	MENU_TDR,
 	MENU_BEEP,
 #ifdef ENABLE_VOICE
@@ -66,9 +69,7 @@ enum
 #ifdef ENABLE_AUDIO_BAR
 	MENU_MIC_BAR,
 #endif
-#ifdef ENABLE_COMPANDER
 	MENU_COMPAND,
-#endif
 	MENU_1_CALL,
 	MENU_S_LIST,
 	MENU_SLIST1,
@@ -144,9 +145,7 @@ extern const char        gSubMenu_ROGER[3][9];
 extern const char        gSubMenu_RESET[2][4];
 extern const char        gSubMenu_F_LOCK[6][4];
 extern const char        gSubMenu_BACKLIGHT[8][7];
-#ifdef ENABLE_COMPANDER
+extern const char        gSubMenu_RX_TX[4][6];
-	extern const char    gSubMenu_Compand[4][6];
-#endif
 #ifdef ENABLE_AM_FIX_TEST1
 	extern const char    gSubMenu_AM_fix_test1[4][8];
 #endif

ui/status.c

@@ -45,12 +45,26 @@ void UI_DisplayStatus(const bool test_display)
 	// **************
 
 	// POWER-SAVE indicator
+	if (gCurrentFunction == FUNCTION_TRANSMIT)
+	{
+		memmove(line + x, BITMAP_TX, sizeof(BITMAP_TX));
+		x1 = x + sizeof(BITMAP_TX);
+	}
+	else
+	if (gCurrentFunction == FUNCTION_RECEIVE ||
+	    gCurrentFunction == FUNCTION_MONITOR ||
+	    gCurrentFunction == FUNCTION_INCOMING)
+	{
+		memmove(line + x, BITMAP_RX, sizeof(BITMAP_RX));
+		x1 = x + sizeof(BITMAP_RX);
+	}
+	else
 	if (gCurrentFunction == FUNCTION_POWER_SAVE || test_display)
 	{
-		memmove(line + x, BITMAP_PowerSave, sizeof(BITMAP_PowerSave));
+		memmove(line + x, BITMAP_POWERSAVE, sizeof(BITMAP_POWERSAVE));
-		x1 = x + sizeof(BITMAP_PowerSave);
+		x1 = x + sizeof(BITMAP_POWERSAVE);
 	}
-	x += sizeof(BITMAP_PowerSave);
+	x += sizeof(BITMAP_POWERSAVE);
 
 	#ifdef ENABLE_NOAA
 		// NOASS SCAN indicator
@@ -82,10 +96,22 @@ void UI_DisplayStatus(const bool test_display)
 		// SCAN indicator
 		if (gScanState != SCAN_OFF || gScreenToDisplay == DISPLAY_SCANNER || test_display)
 		{
-			memmove(line + x, BITMAP_SC, sizeof(BITMAP_SC));
+			if (gEeprom.SCAN_LIST_DEFAULT == 0)
-			x1 = x + sizeof(BITMAP_SC);
+//				memmove(line + x, BITMAP_SC1, sizeof(BITMAP_SC1));
+				UI_PrintStringSmallBuffer("1", line + x);
+			else
+			if (gEeprom.SCAN_LIST_DEFAULT == 1)
+//				memmove(line + x, BITMAP_SC2, sizeof(BITMAP_SC2));
+				UI_PrintStringSmallBuffer("2", line + x);
+			else
+			if (gEeprom.SCAN_LIST_DEFAULT == 2)
+//				memmove(line + x, BITMAP_SCA, sizeof(BITMAP_SCA));
+				UI_PrintStringSmallBuffer("*", line + x);
+//			x1 = x + sizeof(BITMAP_SC1);
+			x1 = x + 7;
 		}
-	x += sizeof(BITMAP_SC);
+//	x += sizeof(BITMAP_SC1);
+	x += 7;  // font character width
 
 	#ifdef ENABLE_VOICE
 		// VOICE indicator
@@ -117,13 +143,15 @@ void UI_DisplayStatus(const bool test_display)
 	}
 	x += sizeof(BITMAP_XB);
 	
-	// VOX indicator
+	#ifdef ENABLE_VOX
-	if (gEeprom.VOX_SWITCH || test_display)
+		// VOX indicator
-	{
+		if (gEeprom.VOX_SWITCH || test_display)
-		memmove(line + x, BITMAP_VOX, sizeof(BITMAP_VOX));
+		{
-		x1 = x + sizeof(BITMAP_VOX);
+			memmove(line + x, BITMAP_VOX, sizeof(BITMAP_VOX));
-	}
+			x1 = x + sizeof(BITMAP_VOX);
-	x += sizeof(BITMAP_VOX);
+		}
+		x += sizeof(BITMAP_VOX);
+	#endif
 
 	// KEY-LOCK indicator
 	if (gEeprom.KEY_LOCK || test_display)
@@ -194,23 +222,37 @@ void UI_DisplayStatus(const bool test_display)
 
 		#ifndef ENABLE_REVERSE_BAT_SYMBOL
 			line += sizeof(BITMAP_BatteryLevel1);
-			if (gBatteryDisplayLevel >= 2)
+			{
-				memmove(line -  4, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
+				const int8_t pos[] = {-4, -7, -10, 13};
-			if (gBatteryDisplayLevel >= 3)
+				for (unsigned int i = 0; i < ARRAY_SIZE(pos); i++)
-				memmove(line -  7, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
+					if (gBatteryDisplayLevel >= (2 + i))
-			if (gBatteryDisplayLevel >= 4)
+						memmove(line + pos[i], BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
-				memmove(line - 10, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
+	
-			if (gBatteryDisplayLevel >= 5)
+/*				switch (gBatteryDisplayLevel)
-				memmove(line - 13, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
+				{
+					default:
+					case 5: memmove(line - 13, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
+					case 4: memmove(line - 10, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
+					case 3: memmove(line -  7, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
+					case 2: memmove(line -  4, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
+				}
+*/			}
 		#else
-			if (gBatteryDisplayLevel >= 2)
+		{
-				memmove(line +  3, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
+			const int8_t pos[] = {3, 6, 9, 12};
-			if (gBatteryDisplayLevel >= 3)
+			for (unsigned int i = 0; i < ARRAY_SIZE(pos); i++)
-				memmove(line +  6, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
+				if (gBatteryDisplayLevel >= (2 + i))
-			if (gBatteryDisplayLevel >= 4)
+					memmove(line + pos[i], BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
-				memmove(line +  9, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
+/*
-			if (gBatteryDisplayLevel >= 5)
+			switch (gBatteryDisplayLevel)
-				memmove(line + 12, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
+			{
+				default:
+				case 5: memmove(line + 12, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
+				case 4: memmove(line +  9, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
+				case 3: memmove(line +  6, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
+				case 2: memmove(line +  3, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
+			}
+*/		}
 		#endif
 	}
 	else

utils/main.cpp

@@ -93,15 +93,29 @@ void create_gain_table(const char *filename)
 		mixer_dB[orig_mixer] +
 		pga_dB[orig_pga];
 
-	const uint8_t lna_short_min = 0;  // 0
+	#if 1
-	const uint8_t lna_min       = 0;  // 0
+		// full table
-	const uint8_t mixer_min     = 0;  // 0
+		const uint8_t lna_short_min = 0;  // 0
-	const uint8_t pga_min       = 0;  // 0
+		const uint8_t lna_min       = 0;  // 0
+		const uint8_t mixer_min     = 0;  // 0
+		const uint8_t pga_min       = 0;  // 0
 
-	const uint8_t lna_short_max = 3;  // 3
+		const uint8_t lna_short_max = 3;  // 3
-	const uint8_t lna_max       = 7;  // 5
+		const uint8_t lna_max       = 7;  // 5
-	const uint8_t mixer_max     = 3;  // 3
+		const uint8_t mixer_max     = 3;  // 3
-	const uint8_t pga_max       = 7;  // 7
+		const uint8_t pga_max       = 7;  // 7
+	#else
+		// just one register changes
+		const uint8_t lna_short_min = 0;
+		const uint8_t lna_min       = 2;
+		const uint8_t mixer_min     = 3;
+		const uint8_t pga_min       = 6;
+
+		const uint8_t lna_short_max = 3;
+		const uint8_t lna_max       = 2;
+		const uint8_t mixer_max     = 3;
+		const uint8_t pga_max       = 6;
+	#endif
 
 	uint8_t lna_short = lna_short_min;
 	uint8_t lna       = lna_min;
@@ -244,37 +258,90 @@ void create_gain_table(const char *filename)
 		return;
 
 	fprintf(file, "\n");
-	fprintf(file, "\tconst t_am_fix_gain_table am_fix_gain_table[] =\n");
+	fprintf(file, "\tstatic const t_am_fix_gain_table am_fix_gain_table[] =\n");
 	fprintf(file, "\t{\n");
-	fprintf(file, "\t\t{.lna_short = 3, .lna = 2, .mixer = 3, .pga = 6},      //  0 0dB -14dB  0dB  -3dB .. -17dB original\n\n");
 
-	for (unsigned int i = 0; i < gain_table.size(); i++)
+	#if 0
+		fprintf(file, "\t\t{.lna_short = 3, .lna = 2, .mixer = 3, .pga = 6},      //  0 0dB -14dB  0dB  -3dB .. -17dB original\n\n");
+
+		for (unsigned int i = 0; i < gain_table.size(); i++)
+		{
+			char s[1024];
+
+			const t_gain_table entry = gain_table[i];
+
+			sprintf(s, "\t\t{%u, %u, %u, %u},         // %3u .. %3ddB %3ddB %2ddB %3ddB .. %3ddB",
+				entry.lna_short,
+				entry.lna,
+				entry.mixer,
+				entry.pga,
+				1 + i,
+				entry.lna_short_dB,
+				entry.lna_dB,
+				entry.mixer_dB,
+				entry.pga_dB,
+				entry.sum_dB);
+
+			if (i == original_index)
+				strcat(s, " original");
+
+			fprintf(file, "%s\n", s);
+		}
+	#else
 	{
-		char s[1024];
+		//BK4819_WriteRegister(BK4819_REG_13, ((uint16_t)gains.lna_short << 8) | ((uint16_t)gains.lna << 5) | ((uint16_t)gains.mixer << 3) | ((uint16_t)gains.pga << 0));
 
-		const t_gain_table entry = gain_table[i];
+		uint16_t reg_val;
+		int16_t  sum_dB;
 
-		sprintf(s, "\t\t{%u, %u, %u, %u},         // %3u .. %3ddB %3ddB %2ddB %3ddB .. %3ddB",
+		reg_val = ((uint16_t)orig_lna_short << 8) | ((uint16_t)orig_lna << 5) | ((uint16_t)orig_mixer << 3) | ((uint16_t)orig_pga << 0);
-			entry.lna_short,
+		sum_dB  = lna_short_dB[orig_lna_short] + lna_dB[orig_lna] + mixer_dB[orig_mixer] + pga_dB[orig_pga];
-			entry.lna,
+		fprintf(file, "\t\t{0x%04X, %-3d},       //   0 ..   %u %u %u %u .. 0dB -14dB  0dB  -3dB .. -17dB original\n\n",
-			entry.mixer,
+			reg_val,
-			entry.pga,
+			sum_dB,
-			1 + i,
+			orig_lna_short,
-			entry.lna_short_dB,
+			orig_lna,
-			entry.lna_dB,
+			orig_mixer,
-			entry.mixer_dB,
+			orig_pga);
-			entry.pga_dB,
-			entry.sum_dB);
 
-		if (i == original_index)
+		for (unsigned int i = 0; i < gain_table.size(); i++)
-			strcat(s, " original");
+		{
+			char s[1024];
 
-		fprintf(file, "%s\n", s);
+			const t_gain_table entry = gain_table[i];
+
+			reg_val = ((uint16_t)entry.lna_short << 8) | ((uint16_t)entry.lna << 5) | ((uint16_t)entry.mixer << 3) | ((uint16_t)entry.pga << 0);
+			sum_dB  = lna_short_dB[entry.lna_short] + lna_dB[entry.lna] + mixer_dB[entry.mixer] + pga_dB[entry.pga];
+
+			sprintf(s, "\t\t{0x%04X, %-3d},         // %3u .. %u %u %u %u .. %3ddB %3ddB %2ddB %3ddB .. %3ddB",
+				reg_val,
+				sum_dB,
+
+				1 + i,
+
+				entry.lna_short,
+				entry.lna,
+				entry.mixer,
+				entry.pga,
+
+				entry.lna_short_dB,
+				entry.lna_dB,
+				entry.mixer_dB,
+				entry.pga_dB,
+
+				entry.sum_dB);
+
+			if (i == original_index)
+				strcat(s, " original");
+
+			fprintf(file, "%s\n", s);
+		}
 	}
+	#endif
 
 	fprintf(file, "\t};\n\n");
 
-	fprintf(file, "\tconst unsigned int original_index = %u;\n", 1 + original_index);
+	fprintf(file, "\tstatic const unsigned int original_index = %u;\n", 1 + original_index);
 
 	fclose(file);
 }

version.c

@@ -4,7 +4,7 @@
 #ifdef GIT_HASH
 	#define VER     GIT_HASH
 #else
-	#define VER     "231002"
+	#define VER     "231004"
 #endif
 
 #ifndef ONE_OF_ELEVEN_VER