diff --git a/Makefile b/Makefile index a712ca0..3c6f18f 100644 --- a/Makefile +++ b/Makefile @@ -33,16 +33,18 @@ ENABLE_REDUCE_LOW_MID_TX_POWER := 1 # Tx Alarm 0.6 kB ENABLE_ALARM := 0 ENABLE_TX1750 := 0 +# MDC1200 0.892 kB ENABLE_MDC1200 := 1 ENABLE_PWRON_PASSWORD := 0 ENABLE_RESET_AES_KEY := 1 -ENABLE_BIG_FREQ := 0 -ENABLE_SMALL_BOLD := 1 -# trim trailing 44B +ENABLE_BIG_FREQ := 1 +ENABLE_SMALL_BOLD := 0 +# trim trailing 0.044 kB ENABLE_TRIM_TRAILING_ZEROS := 1 ENABLE_KEEP_MEM_NAME := 1 ENABLE_WIDE_RX := 1 ENABLE_TX_WHEN_AM := 0 +# Freq calibration 0.188 kB ENABLE_F_CAL_MENU := 0 ENABLE_TX_UNLOCK := 0 ENABLE_CTCSS_TAIL_PHASE_SHIFT := 1 @@ -58,7 +60,8 @@ ENABLE_KILL_REVIVE := 0 # AM Fix 0.8 kB ENABLE_AM_FIX := 1 ENABLE_AM_FIX_SHOW_DATA := 0 -ENABLE_SQUELCH_MORE_SENSITIVE := 0 +# Squelch 0.012 kB .. can't be right ? +ENABLE_SQUELCH_MORE_SENSITIVE := 1 ENABLE_SQ_OPEN_WITH_UP_DN_BUTTS := 1 ENABLE_FASTER_CHANNEL_SCAN := 1 ENABLE_COPY_CHAN_TO_VFO_TO_CHAN := 1 diff --git a/firmware.bin b/firmware.bin index e61c4c7..a75afef 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index e814809..4f6a118 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ diff --git a/mdc1200.c b/mdc1200.c index 15d2f2b..efd90f8 100644 --- a/mdc1200.c +++ b/mdc1200.c @@ -16,7 +16,8 @@ // >= 24-bit pre-amble // 40-bit sync // -static const uint8_t pre_amble[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0xCC}; +//static const uint8_t pre_amble[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0xCC}; +static const uint8_t pre_amble[] = {0x00, 0x00, 0x00, 0x00, 0x00}; static const uint8_t sync[] = {0x07, 0x09, 0x2a, 0x44, 0x6f}; /* diff --git a/ui/main.c b/ui/main.c index 885745a..1dab67f 100644 --- a/ui/main.c +++ b/ui/main.c @@ -398,6 +398,32 @@ void UI_update_rssi(const int16_t rssi, const int vfo) // *************************************************************************** +void big_freq(const uint32_t frequency, const unsigned int x, const unsigned int line) +{ + char str[9]; + + NUMBER_ToDigits(frequency, str); + + // show the main large frequency digits + UI_DisplayFrequency(str, x, line, false, false); + + // show the remaining 2 small frequency digits + #ifdef ENABLE_TRIM_TRAILING_ZEROS + { + unsigned int small_num = 2; + if (str[7] == 0) + { + small_num--; + if (str[6] == 0) + small_num--; + } + UI_Displaysmall_digits(small_num, str + 6, x + 81, line + 1, true); + } + #else + UI_Displaysmall_digits(2, str + 6, x + 81, line + 1, true); + #endif +} + void UI_DisplayMain(void) { #ifndef ENABLE_BIG_FREQ @@ -663,28 +689,7 @@ void UI_DisplayMain(void) case MDF_FREQUENCY: // just channel frequency #ifdef ENABLE_BIG_FREQ - - NUMBER_ToDigits(frequency, str); - - // show the main large frequency digits - UI_DisplayFrequency(str, x, line, false, false); - - // show the remaining 2 small frequency digits - #ifdef ENABLE_TRIM_TRAILING_ZEROS - { - unsigned int small_num = 2; - if (str[7] == 0) - { - small_num--; - if (str[6] == 0) - small_num--; - } - UI_Displaysmall_digits(small_num, str + 6, x + 81, line + 1, true); - } - #else - UI_Displaysmall_digits(2, str + 6, x + 81, line + 1, true); - #endif - + big_freq(frequency, x, line); #else // show the frequency in the main font sprintf(str, "%03u.%05u", frequency / 100000, frequency % 100000); @@ -743,7 +748,8 @@ void UI_DisplayMain(void) // if (IS_FREQ_CHANNEL(g_eeprom.screen_channel[vfo_num])) { // frequency mode #ifdef ENABLE_BIG_FREQ - + big_freq(frequency, x, line); +/* NUMBER_ToDigits(frequency, str); // 8 digits // show the main large frequency digits @@ -764,7 +770,7 @@ void UI_DisplayMain(void) #else UI_Displaysmall_digits(2, str + 6, x + 81, line + 1, true); #endif - +*/ #else // show the frequency in the main font