diff --git a/app/main.c b/app/main.c index 32a9868..43fc66e 100644 --- a/app/main.c +++ b/app/main.c @@ -212,7 +212,7 @@ void processFKeyFunction(const key_code_t Key) #if 0 g_tx_vfo->am_mode = (g_tx_vfo->am_mode + 1) & 1u; #else - if (++g_tx_vfo->am_mode >= 4) + if (++g_tx_vfo->am_mode >= 3) g_tx_vfo->am_mode = 0; #endif g_request_save_channel = 1; diff --git a/firmware.bin b/firmware.bin index 18b71a5..e067716 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index 5ba0372..82ae724 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ diff --git a/radio.c b/radio.c index e252792..62aee1f 100644 --- a/radio.c +++ b/radio.c @@ -715,6 +715,17 @@ void RADIO_setup_registers(bool switch_to_function_foreground) (g_eeprom.dac_gain << 0)); // AF DAC Gain (after Gain-1 and Gain-2) } + #ifdef ENABLE_VOICE + #ifdef MUTE_AUDIO_FOR_VOICE + if (g_voice_write_index == 0) + AUDIO_set_mod_mode(g_rx_vfo->am_mode); + #else + AUDIO_set_mod_mode(g_rx_vfo->am_mode); + #endif + #else + AUDIO_set_mod_mode(g_rx_vfo->am_mode); + #endif + interrupt_mask = BK4819_REG_3F_SQUELCH_FOUND | BK4819_REG_3F_SQUELCH_LOST; if (IS_NOT_NOAA_CHANNEL(g_rx_vfo->channel_save)) diff --git a/ui/main.c b/ui/main.c index cf79bee..5e3617c 100644 --- a/ui/main.c +++ b/ui/main.c @@ -846,8 +846,7 @@ void UI_DisplayMain(void) default: case 0: strcpy(str, "FM"); break; case 1: strcpy(str, "AM"); break; - case 2: strcpy(str, "LS"); break; - case 3: strcpy(str, "US"); break; + case 2: strcpy(str, "DS"); break; } } else diff --git a/ui/menu.c b/ui/menu.c index 9f8f503..cddd3f4 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -174,12 +174,11 @@ const unsigned int g_hidden_menu_count = 9; // *************************************************************************************** -const char g_sub_menu_mod_mode[4][4] = +const char g_sub_menu_mod_mode[3][4] = { "FM", "AM", - "LSB", - "USB" + "DSB" }; const char g_sub_menu_tx_power[3][7] = diff --git a/ui/menu.h b/ui/menu.h index 13cf7f3..7bd43fd 100644 --- a/ui/menu.h +++ b/ui/menu.h @@ -162,7 +162,7 @@ enum extern const t_menu_item g_menu_list[]; extern uint8_t g_menu_list_sorted[]; -extern const char g_sub_menu_mod_mode[4][4]; +extern const char g_sub_menu_mod_mode[3][4]; extern const char g_sub_menu_tx_power[3][7]; extern const char g_sub_menu_shift_dir[3][4]; extern const char g_sub_menu_bandwidth[2][7];