diff --git a/Makefile b/Makefile index 3ddb0ae..3e56543 100644 --- a/Makefile +++ b/Makefile @@ -8,19 +8,23 @@ ENABLE_CLANG := 0 ENABLE_SWD := 0 ENABLE_OVERLAY := 0 ENABLE_LTO := 1 +# # UART Programming 2.9 kB ENABLE_UART := 1 ENABLE_UART_DEBUG := 0 +# # AirCopy 2.5 kB ENABLE_AIRCOPY := 0 ENABLE_AIRCOPY_REMEMBER_FREQ := 1 ENABLE_AIRCOPY_RX_REBOOT := 0 +# # FM Radio 4.2 kB ENABLE_FMRADIO_64_76 := 0 ENABLE_FMRADIO_76_90 := 0 ENABLE_FMRADIO_76_108 := 0 ENABLE_FMRADIO_875_108 := 1 ENABLE_FMRADIO_64_108 := 0 +# # NOAA 1.2 kB ENABLE_NOAA := 0 # Voice 1.7 kB @@ -31,7 +35,8 @@ ENABLE_VOX := 1 ENABLE_VOX_MORE_SENSITIVE := 1 # Tx Alarm 600 B ENABLE_ALARM := 0 -ENABLE_TX_TONE_HZ := 1750 +ENABLE_TX_TONE_HZ := 1750 +# # MDC1200 2.8 kB ENABLE_MDC1200 := 0 ENABLE_MDC1200_SHOW_OP_ARG := 1 @@ -40,6 +45,7 @@ ENABLE_MDC1200_SIDE_BEEP := 1 ENABLE_PWRON_PASSWORD := 0 ENABLE_RESET_AES_KEY := 0 ENABLE_BIG_FREQ := 0 +# # DTMF_CALLING 2.8 kB ENABLE_DTMF_CALLING := 0 ENABLE_DTMF_LIVE_DECODER := 0 @@ -47,6 +53,7 @@ ENABLE_DTMF_TIMING_SETTINGS := 0 ENABLE_DTMF_CALL_FLASH_LIGHT := 0 # Kill and Revive 400 B ENABLE_DTMF_KILL_REVIVE := 0 +# ENABLE_SHOW_FREQ_IN_CHAN := 1 # small bold 580 B ENABLE_SMALL_BOLD := 1 @@ -56,6 +63,7 @@ ENABLE_SMALLEST_FONT := 0 ENABLE_TRIM_TRAILING_ZEROS := 0 ENABLE_WIDE_RX := 1 ENABLE_TX_WHEN_AM := 0 +# # Frequency calibration 188 B ENABLE_F_CAL_MENU := 0 # FM DEV CAL 250 B diff --git a/firmware.bin b/firmware.bin index 25d8c87..31f6a2d 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index 7c9469d..3b91ba3 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ diff --git a/ui/main.c b/ui/main.c index 8852755..46d1d3c 100644 --- a/ui/main.c +++ b/ui/main.c @@ -972,8 +972,8 @@ const char *state_list[] = {"", "BUSY", "BAT LOW", "TX DISABLE", "TIMEOUT", "ALA UI_PrintStringSmall("R", x, 0, y); x += 7 * 1; - if (tx_allowed && g_vfo_info[vfo_num].freq_config_rx.frequency != g_vfo_info[vfo_num].freq_config_tx.frequency) - { // offset symbol + //if (g_vfo_info[vfo_num].freq_config_rx.frequency != g_vfo_info[vfo_num].freq_config_tx.frequency) + { // offset direction symbol const char *dir_list[] = {"", "+", "-"}; const unsigned int i = g_vfo_info[vfo_num].channel.tx_offset_dir; UI_PrintStringSmall(dir_list[i], x, 0, y); @@ -981,7 +981,7 @@ const char *state_list[] = {"", "BUSY", "BAT LOW", "TX DISABLE", "TIMEOUT", "ALA x += 7 * 1; if (g_vfo_info[vfo_num].channel.tx_offset_dir != TX_OFFSET_FREQ_DIR_OFF) - { // TX/RX offset + { // TX/RX offset frequency const uint32_t ofs = g_vfo_info[vfo_num].channel.tx_offset; sprintf(str, "%u.%05u", ofs / 100000, ofs % 100000); NUMBER_trim_trailing_zeros(str); @@ -995,7 +995,6 @@ const char *state_list[] = {"", "BUSY", "BAT LOW", "TX DISABLE", "TIMEOUT", "ALA if (g_vfo_info[vfo_num].channel.dtmf_decoding_enable) strcpy(str, "DTMF"); UI_PrintStringSmall(str, LCD_WIDTH - (7 * 4), 0, y); - //x += 7 * 5; #endif }