diff --git a/firmware/application/apps/ui_mictx.cpp b/firmware/application/apps/ui_mictx.cpp index 3e4cec04..2c7fa5f6 100644 --- a/firmware/application/apps/ui_mictx.cpp +++ b/firmware/application/apps/ui_mictx.cpp @@ -51,7 +51,7 @@ void MicTXView::focus() { field_rxfrequency.focus(); break; default: - field_va.focus(); + check_va.focus(); break; } } @@ -60,24 +60,56 @@ void MicTXView::update_vumeter() { vumeter.set_value(audio_level); } +void MicTXView::update_tx_icon() { + tx_icon.set_foreground(transmitting ? Color::red() : Color::black()); + tx_icon.set_background(transmitting ? Color::yellow() : Color::black()); +} + void MicTXView::on_tx_progress(const bool done) { // Roger beep played, stop transmitting if (done) set_tx(false); } +uint8_t MicTXView::shift_bits(void) { + uint8_t shift_bits_s16{4}; // shift bits factor to the captured ADC S16 audio sample. + + if (audio::debug::codec_name() == "WM8731") { + switch (ak4951_alc_and_wm8731_boost_GUI) { + case 0: // +12 dB’s respect reference level orig fw 1.5.x fw FM : when +20dB's boost ON) and shift bits (>>8), + shift_bits_s16 = 6; // now mic-boost on (+20dBs) and shift bits (>>6), +20+12=32 dB’s (orig fw +20 dBs+ 0dBs)=> +12dB's respect ref. + break; + case 1: // +06 dB’s reference level, (when +20dB's boost ON) + shift_bits_s16 = 7; // now mic-boost on (+20dBs) and shift bits (>>7), +20+06=26 dB’s (orig fw +20 dBs+ 0dBs) => +06dB's respect ref. + break; + case 2: + shift_bits_s16 = 4; // +04 dB’s respect ref level, (when +20dB's boost OFF) + break; // now mic-boost off (+00dBs) shift bits (4) (+0+24dB's)=24 dBs => +04dB's respect ref. + case 3: + shift_bits_s16 = 5; // -02 dB’s respect ref level, (when +20dB's boost OFF) + break; // now mic-boost off (+00dBs) shift bits (5) (+0+18dB's)=18 dBs => -02dB's respect ref. + case 4: + shift_bits_s16 = 6; // -08 dB’s respect ref level, (when +20dB's boost OFF) + break; // now mic-boost off (+00dBs) shift bits (6) (+0+12dB's)=12 dBs => -08dB's respect ref. + } + } else { + shift_bits_s16 = 8; // Initialized default fixed >>8_FM for FM tx mod, shift audio data for AK4951, using top 8 bits s16 data (>>8) + } + return shift_bits_s16; +} + void MicTXView::configure_baseband() { // TODO: Can this use the transmitter model instead? baseband::set_audiotx_config( sampling_rate / 20, // Update vu-meter at 20Hz transmitting ? transmitter_model.channel_bandwidth() : 0, - mic_gain, - shift_bits_s16, // to be used in dsp_modulate + mic_gain_x10 / 10.0, + shift_bits(), // to be used in dsp_modulate TONES_F2D(tone_key_frequency(tone_key_index), sampling_rate), - enable_am, - enable_dsb, - enable_usb, - enable_lsb); + (mic_mod_index == MIC_MOD_AM), + (mic_mod_index == MIC_MOD_DSB), + (mic_mod_index == MIC_MOD_USB), + (mic_mod_index == MIC_MOD_LSB)); } void MicTXView::set_tx(bool enable) { @@ -101,15 +133,24 @@ void MicTXView::set_tx(bool enable) { transmitting = false; configure_baseband(); transmitter_model.disable(); - if (rx_enabled) { // If audio RX is enabled and we've been transmitting - rxaudio(true); // Turn back on audio RX + + if (rx_enabled) { + rxaudio(true); // Turn back on audio RX + + // TODO FIXME: this isn't working: vu meter isn't going to 0: vumeter.set_value(0); // Reset vumeter vumeter.dirty(); // Force to refresh vumeter. } } } + update_tx_icon(); } +bool MicTXView::tx_button_held() { + const auto switches_state = get_switches_state(); + return switches_state[(size_t)ui::KeyEvent::Select]; +}; + void MicTXView::do_timing() { if (va_enabled) { if (!transmitting) { @@ -131,7 +172,8 @@ void MicTXView::do_timing() { if ((decay_timer >> 8) >= decay_ms) { decay_timer = 0; attack_timer = 0; - set_tx(false); + if (!button_touch && !tx_button_held()) + set_tx(false); } else { decay_timer += lcd_frame_duration; } @@ -141,42 +183,39 @@ void MicTXView::do_timing() { } } else { // Check for PTT release - const auto switches_state = get_switches_state(); - if (!switches_state[4] && transmitting && !button_touch) // Select button + if (transmitting && !button_touch && !tx_button_held()) set_tx(false); } } -void MicTXView::rxaudio(bool is_on) { - if (is_on) { +void MicTXView::rxaudio(bool enable) { + if (enable) { audio::input::stop(); baseband::shutdown(); - if (enable_am || enable_usb || enable_lsb || enable_dsb) { // "NFM/FM", 0, " WFM ", 1, " AM ", 2, " USB ", 3, " LSB ", 4, " DSB-SC", 5 - baseband::run_image(portapack::spi_flash::image_tag_am_audio); - receiver_model.set_modulation(ReceiverModel::Mode::AMAudio); // that AM demodulation engine is common to all Amplitude mod : AM/USB/LSB/DSB (2,3,4,5) - if (options_mode.selected_index() < 5) // We will be called here with 2,3,4,5. We treat here demod. filter 2,3,4; (excluding DSB-C case (5) it is treated more down). - receiver_model.set_am_configuration(options_mode.selected_index() - 1); // selecting proper filter(2,3,4). 2-1=1=>6k-AM(1), 3-1=2=>+3k-USB(2), 4-1=3=>-3K-LSB(3), - } else { // We are in NFM/FM or WFM (NFM BW:8k5 or 11k / FM BW 16k / WFM BW:200k) - - if (enable_wfm) { // WFM, BW 200Khz aprox, or the two new addional BW filters (180k, 40k) + switch (mic_mod_index) { + case MIC_MOD_NFM: // NFM BW:8k5 or 11k / FM BW 16k + baseband::run_image(portapack::spi_flash::image_tag_nfm_audio); + receiver_model.set_modulation(ReceiverModel::Mode::NarrowbandFMAudio); + // receiver_model.set_nbfm_configuration(n); is called above, depending user's selection (8k5, 11k, 16k). + break; + case MIC_MOD_WFM: // WFM, BW 200Khz aprox, or the two new addional BW filters (180k, 40k) baseband::run_image(portapack::spi_flash::image_tag_wfm_audio); receiver_model.set_modulation(ReceiverModel::Mode::WidebandFMAudio); - // receiver_model.set_wfm_configuration(n); // it is called above, depending user's selection (200k, 180k, 0k). - } else { // NFM BW:8k5 or 11k / FM BW 16k - baseband::run_image(portapack::spi_flash::image_tag_nfm_audio); - receiver_model.set_modulation(ReceiverModel::Mode::NarrowbandFMAudio); // - // receiver_model.set_nbfm_configuration(n); is called above, depending user's selection (8k5, 11k, 16k). - } + // receiver_model.set_wfm_configuration(n); is called above, depending user's selection (200k, 180k, 0k). + break; + case MIC_MOD_AM: + case MIC_MOD_DSB: + case MIC_MOD_USB: + case MIC_MOD_LSB: + baseband::run_image(portapack::spi_flash::image_tag_am_audio); + receiver_model.set_modulation(ReceiverModel::Mode::AMAudio); // that AM demodulation engine is common to all Amplitude mod : AM/USB/LSB/DSB (2,3,4,5) + if (options_mode.selected_index() < 5) // We will be called here with 2,3,4,5. We treat here demod. filter 2,3,4; (excluding DSB-C case (5) it is treated more down). + receiver_model.set_am_configuration(options_mode.selected_index() - 1); // selecting proper filter(2,3,4). 2-1=1=>6k-AM(1), 3-1=2=>+3k-USB(2), 4-1=3=>-3K-LSB(3), + break; } - if (bool_same_F_tx_rx_enabled) // when stop TX, define to which freq RX we return - receiver_model.set_target_frequency(tx_frequency); // Update freq also for RX = TX - else - receiver_model.set_target_frequency(rx_frequency); // Now with separate freq controls! - receiver_model.set_lna(rx_lna); - receiver_model.set_vga(rx_vga); - receiver_model.set_rf_amp(rx_amp); + receiver_model.set_target_frequency(bool_same_F_tx_rx_enabled ? tx_frequency : rx_frequency); receiver_model.enable(); audio::output::start(); } else { // These incredibly convoluted steps are required for the vumeter to reappear when stopping RX. @@ -192,8 +231,76 @@ void MicTXView::rxaudio(bool is_on) { } } -void MicTXView::set_ptt_visibility(bool v) { - tx_button.hidden(!v); +void MicTXView::set_rxbw_options(void) { + using option_t = std::pair; + using options_t = std::vector; + options_t rxbw; // Aux structure to change dynamically field_rxbw contents + + switch (mic_mod_index) { + case MIC_MOD_NFM: + freqman_set_bandwidth_option(NFM_MODULATION, field_rxbw); // restore dynamic field_rxbw value with NFM options from freqman_db.cpp + field_rxbw.set_by_value(receiver_model.nbfm_configuration()); + break; + case MIC_MOD_WFM: + freqman_set_bandwidth_option(WFM_MODULATION, field_rxbw); // restore dynamic field_rxbw value with WFM options from freqman_db.cpp + field_rxbw.set_by_value(receiver_model.wfm_configuration()); + break; + case MIC_MOD_AM: + rxbw.emplace_back("DSB 9k", 0); // we offer in AM DSB two audio BW 9k / 6k. + rxbw.emplace_back("DSB 6k", 1); + field_rxbw.set_options(rxbw); // store that aux GUI option to the field_rxbw. + break; + case MIC_MOD_DSB: + rxbw.emplace_back("USB+3k", 0); // added dynamically two options (index 0,1) to that DSB-SC case to the field_rxbw value. + rxbw.emplace_back("LSB-3k", 1); + field_rxbw.set_options(rxbw); // store that aux GUI option to the field_rxbw. + break; + case MIC_MOD_USB: + rxbw.emplace_back("USB+3k", 0); // locked a fixed option, to display it. + field_rxbw.set_options(rxbw); // store that aux GUI option to the field_rxbw. + break; + case MIC_MOD_LSB: + rxbw.emplace_back("LSB-3k", 0); // locked a fixed option, to display it. + field_rxbw.set_options(rxbw); // store that aux GUI option to the field_rxbw. + break; + } +} + +void MicTXView::set_rxbw_defaults(bool use_app_settings) { + if (use_app_settings) { + field_bw.set_value(transmitter_model.channel_bandwidth() / 1000); + field_rxbw.set_by_value(rxbw_index); + } else if (mic_mod_index == MIC_MOD_NFM) { + field_bw.set_value(10); // NFM TX bw 10k, RX bw 16k (2) default + field_rxbw.set_by_value(2); + } else if (mic_mod_index == MIC_MOD_WFM) { + field_bw.set_value(75); // WFM TX bw 75K, RX bw 200k (0) default + field_rxbw.set_by_value(0); + } + // field_bw is hidden in other modulation cases +} + +void MicTXView::update_receiver_rxbw(void) { + // In Previous fw versions, that nbfm_configuration(n) was done in any mode (FM/AM/SSB/DSB)...strictly speaking only need it in (NFM/FM) + // In AM TX mode, we will allow both independent RX audio BW : AM 9K (9K00AE3 / AM 6K (6K00AE3). (In AM option v can be 0 (9k), 1 (6k) + // In DSB-SC TX mode, we will allow both independent RX SSB demodulation (USB / LSB side band). in that submenu, v is 0 (SSB1 USB) or 1 (SSB2 LSB) + switch (mic_mod_index) { + case MIC_MOD_NFM: + receiver_model.set_nbfm_configuration(rxbw_index); // we are in NFM/FM case, we need to select proper NFM/FM RX channel filter, NFM BW 8K5(0), NFM BW 11K(1), FM BW 16K (2) + break; + case MIC_MOD_WFM: + receiver_model.set_wfm_configuration(rxbw_index); // we are in WFM case, we need to select proper WFB RX BW filter, WFM BW 200K(0), WFM BW 180K(1), WFM BW 40K(2) + break; + case MIC_MOD_AM: + receiver_model.set_am_configuration(rxbw_index); // we are in AM TX mode, we need to select proper AM full path config AM-9K filter. 0+0 =>AM-9K(0), 0+1=1 =>AM-6K(1), + break; + case MIC_MOD_USB: + case MIC_MOD_LSB: + break; // change can't happen in these modes because there's only one BW choice + case MIC_MOD_DSB: + receiver_model.set_am_configuration(rxbw_index + 2); // we are in DSB-SC TX mode, we need to select proper SSB filter. 0+2 =>usb(2), 1+2=3 =>lsb(3), + break; + } } MicTXView::MicTXView( @@ -202,420 +309,260 @@ MicTXView::MicTXView( baseband::run_image(portapack::spi_flash::image_tag_mic_tx); - if (audio::debug::codec_name() == "WM8731") { - add_children({&labels_WM8731, // we have audio codec WM8731, same MIC menu as original. - &vumeter, - &options_gain, // MIC GAIN float factor on the GUI. - &options_wm8731_boost_mode, - // &check_va, - &field_va, - &field_va_level, - &field_va_attack, - &field_va_decay, - &field_bw, - &tx_view, // it already integrates previous rfgain, rfamp. - &options_mode, - &field_frequency, - &options_tone_key, - &check_rogerbeep, - &check_mic_to_HP, // check box to activate "hear mic" - &check_common_freq_tx_rx, // added to handle common or separate freq- TX/RX - &check_rxactive, - &field_volume, - &field_rxbw, - &field_squelch, - &field_rxfrequency, - &field_rxlna, - &field_rxvga, - &field_rxamp, - &tx_button}); + bool wm = (audio::debug::codec_name() == "WM8731"); + add_children({&labels_both, + wm ? &labels_WM8731 : &labels_AK4951, // enable ALC if AK4951 + &vumeter, + &options_gain, // MIC GAIN float factor on the GUI. + wm ? &options_wm8731_boost_mode : &options_ak4951_alc_mode, + &check_va, + &field_va_level, + &field_va_attack, + &field_va_decay, + &field_bw, + &tx_view, // it already integrates previous rfgain, rfamp. + &options_mode, + &field_frequency, + &options_tone_key, + &check_rogerbeep, + &check_mic_to_HP, // check box to activate "hear mic" + &check_common_freq_tx_rx, // added to handle common or separate freq- TX/RX + &check_rxactive, + &field_volume, + &field_rxbw, + &field_squelch, + &field_rxfrequency, + &field_rxlna, + &field_rxvga, + &field_rxamp, + &tx_button, + &tx_icon}); - } else { - add_children({&labels_AK4951, // we have audio codec AK4951, enable Automatic Level Control - &vumeter, - &options_gain, - &options_ak4951_alc_mode, - // &check_va, - &field_va, - &field_va_level, - &field_va_attack, - &field_va_decay, - &field_bw, - &tx_view, // it already integrates previous rfgain, rfamp. - &options_mode, - &field_frequency, - &options_tone_key, - &check_rogerbeep, - &check_mic_to_HP, // check box to activate "hear mic" - &check_common_freq_tx_rx, // added to handle common or separate freq- TX/RX - &check_rxactive, - &field_volume, - &field_rxbw, - &field_squelch, - &field_rxfrequency, - &field_rxlna, - &field_rxvga, - &field_rxamp, - &tx_button}); - } + set_rxbw_options(); + set_rxbw_defaults(settings_.loaded()); tone_keys_populate(options_tone_key); + options_tone_key.set_selected_index(tone_key_index); options_tone_key.on_change = [this](size_t i, int32_t) { tone_key_index = i; }; - options_tone_key.set_selected_index(0); + + check_rogerbeep.set_value(rogerbeep_enabled); + check_rogerbeep.on_select = [this](Checkbox&, bool v) { + rogerbeep_enabled = v; + }; + + field_rxlna.set_value(receiver_model.lna()); + field_rxlna.on_change = [this](int32_t v) { + receiver_model.set_lna(v); + }; + + field_rxvga.set_value(receiver_model.vga()); + field_rxvga.on_change = [this](int32_t v) { + receiver_model.set_vga(v); + }; + + field_rxamp.set_value(receiver_model.rf_amp()); + field_rxamp.on_change = [this](int32_t v) { + receiver_model.set_rf_amp(v); + }; options_gain.on_change = [this](size_t, int32_t v) { - mic_gain = v / 10.0; + mic_gain_x10 = v; configure_baseband(); }; - options_gain.set_selected_index(1); // x1.0 preselected default. + options_gain.set_by_value(mic_gain_x10); // x1.0 preselected default. + + field_rxbw.on_change = [this](size_t, int32_t v) { + rxbw_index = v; + update_receiver_rxbw(); + }; + field_rxbw.set_by_value(rxbw_index); + + field_squelch.set_value(receiver_model.squelch_level()); + field_squelch.on_change = [this](int32_t v) { + receiver_model.set_squelch_level(v); + }; if (audio::debug::codec_name() == "WM8731") { options_wm8731_boost_mode.on_change = [this](size_t, int8_t v) { - switch (v) { - case 0: // +12 dB’s respect reference level orig fw 1.5.x fw FM : when +20dB's boost ON) and shift bits (>>8), - shift_bits_s16 = 6; // now mic-boost on (+20dBs) and shift bits (>>6), +20+12=32 dB’s (orig fw +20 dBs+ 0dBs)=> +12dB's respect ref. - break; - case 1: // +06 dB’s reference level, (when +20dB's boost ON) - shift_bits_s16 = 7; // now mic-boost on (+20dBs) and shift bits (>>7), +20+06=26 dB’s (orig fw +20 dBs+ 0dBs) => +06dB's respect ref. - break; - case 2: - shift_bits_s16 = 4; // +04 dB’s respect ref level, (when +20dB's boost OFF) - break; // now mic-boost off (+00dBs) shift bits (4) (+0+24dB's)=24 dBs => +04dB's respect ref. - case 3: - shift_bits_s16 = 5; // -02 dB’s respect ref level, (when +20dB's boost OFF) - break; // now mic-boost off (+00dBs) shift bits (5) (+0+18dB's)=18 dBs => -02dB's respect ref. - case 4: - shift_bits_s16 = 6; // -08 dB’s respect ref level, (when +20dB's boost OFF) - break; // now mic-boost off (+00dBs) shift bits (6) (+0+12dB's)=12 dBs => -08dB's respect ref. - } ak4951_alc_and_wm8731_boost_GUI = v; // 0..4, WM8731_boost dB's options, (combination boost on/off, and effective gain in captured data >>x) audio::input::start(ak4951_alc_and_wm8731_boost_GUI, mic_to_HP_enabled); // Detected (WM8731), set up the proper wm_boost on/off, 0..4 (0,1) boost_on, (2,3,4) boost_off,and the check box "Hear Mic" configure_baseband(); // to update in real time, sending msg, var-parameters >>shift_bits FM msg, to audio_tx from M0 to M4 Proc - }; - options_wm8731_boost_mode.set_selected_index(3); // preset GUI index 3 as default WM -> -02 dB's. + if (!settings_.loaded()) { + ak4951_alc_and_wm8731_boost_GUI = 3; // preset GUI index 3 as default WM -> -02 dB's + } + options_wm8731_boost_mode.set_selected_index(ak4951_alc_and_wm8731_boost_GUI); } else { - shift_bits_s16 = 8; // Initialized default fixed >>8_FM for FM tx mod, shift audio data for AK4951, using top 8 bits s16 data (>>8) options_ak4951_alc_mode.on_change = [this](size_t, int8_t v) { ak4951_alc_and_wm8731_boost_GUI = v; // 0..11, AK4951 Mic -Automatic volume Level Control options, audio::input::start(ak4951_alc_and_wm8731_boost_GUI, mic_to_HP_enabled); // Detected (AK4951) ==> Set up proper ALC mode from 0..11 options, and the check box "Hear Mic" configure_baseband(); // sending fixed >>8_FM, var-parameters msg, to audiotx from this M0 to M4 process. }; + if (!settings_.loaded()) + ak4951_alc_and_wm8731_boost_GUI = 0; + options_ak4951_alc_mode.set_selected_index(ak4951_alc_and_wm8731_boost_GUI); } - // options_ak4951_alc_mode.set_selected_index(0); - + // WARNING: transmitter_model.set_target_frequency() and receiver_model.set_target_frequency() both update the same tuning freq, but one has an offset! tx_frequency = transmitter_model.target_frequency(); - field_frequency.set_value(transmitter_model.target_frequency()); - field_frequency.set_step(receiver_model.frequency_step()); field_frequency.on_change = [this](rf::Frequency f) { tx_frequency = f; - if (!rx_enabled) { // not activated receiver. just update freq TX + if (!rx_enabled) transmitter_model.set_target_frequency(f); - } else { // activated receiver. - if (bool_same_F_tx_rx_enabled) // user selected common freq- TX = RX - receiver_model.set_target_frequency(f); // Update common freq also for RX - } + else if (bool_same_F_tx_rx_enabled) + receiver_model.set_target_frequency(f); + // else tuning freq will be updated when rx is enabled, transmitting starts, or when rx_frequency is changed (if rx_enabled) }; field_frequency.on_edit = [this, &nav]() { focused_ui = 0; // TODO: Provide separate modal method/scheme? auto new_view = nav.push(tx_frequency); new_view->on_changed = [this](rf::Frequency f) { - tx_frequency = f; - if (!rx_enabled) { - transmitter_model.set_target_frequency(f); - } else { - if (bool_same_F_tx_rx_enabled) - receiver_model.set_target_frequency(f); // Update freq also for RX - } this->field_frequency.set_value(f); - set_dirty(); }; }; + field_frequency.set_value(tx_frequency); - field_bw.on_change = [this](uint32_t v) { - transmitter_model.set_channel_bandwidth(v * 1000); - }; - field_bw.set_value(10); // pre-default first time, TX deviation FM for NFM / FM + // TODO: would be nice if frequency step was configurable in this app + field_frequency.set_step(receiver_model.frequency_step()); - // now, no need direct update, field_rfgain, field_rfamp (it is done in ui_transmitter.cpp) - - options_mode.on_change = [this](size_t, int32_t v) { // { "NFM/FM", 0 }, { " WFM ", 1 }, { "AM", 2 }, { "USB", 3 }, { "LSB", 4 }, { "DSB", 5 } - enable_am = false; - enable_usb = false; - enable_lsb = false; - enable_dsb = false; - enable_wfm = false; - - using option_t = std::pair; - using options_t = std::vector; - options_t rxbw; // Aux structure to change dynamically field_rxbw contents, - - switch (v) { - case 0: //{ "FM", 0 } - enable_am = false; - enable_usb = false; - enable_lsb = false; - enable_dsb = false; - field_bw.set_value(10); // pre-default deviation FM for WFM - // field_bw.set_value(transmitter_model.channel_bandwidth() / 1000); - // if (rx_enabled) - rxaudio(rx_enabled); // Update now if we have RX audio on - options_tone_key.hidden(0); // we are in FM mode, we should have active the Key-tones & CTCSS option. - - freqman_set_bandwidth_option(NFM_MODULATION, field_rxbw); // restore dynamic field_rxbw value with NFM options from freqman_db.cpp - field_rxbw.set_by_value(2); // // bw 16k (2) default - field_rxbw.hidden(0); // we are in FM mode, we need to allow the user set up of the RX NFM BW selection (8K5, 11K, 16K) - field_bw.hidden(0); // we are in FM mode, we need to allow FM deviation parameter, in non FM mode. - break; - case 1: //{ "WFM", 1 } - enable_am = false; - enable_usb = false; - enable_lsb = false; - enable_dsb = false; - enable_wfm = true; - field_bw.set_value(75); // pre-default deviation FM for WFM - // field_bw.set_value(transmitter_model.channel_bandwidth() / 1000); - // if (rx_enabled) - rxaudio(rx_enabled); // Update now if we have RX audio on - options_tone_key.hidden(0); // we are in WFM mode, we should have active the Key-tones & CTCSS option. - - freqman_set_bandwidth_option(WFM_MODULATION, field_rxbw); // restore dynamic field_rxbw value with WFM options from freqman_db.cpp - field_rxbw.set_by_value(0); // bw 200k (0) default - field_rxbw.hidden(0); // we are in WFM mode, we need to show to the user the selected BW WFM filter. - field_bw.hidden(0); // we are in WFM mode, we need to allow WFM deviation parameter, in non FM mode. - break; - case 2: //{ "AM", 2 } - enable_am = true; - rxaudio(rx_enabled); // Update now if we have RX audio on - options_tone_key.set_selected_index(0); // we are NOT in FM mode, we reset the possible previous key-tones &CTCSS selection. - set_dirty(); // Refresh display - options_tone_key.hidden(1); // we hide that Key-tones & CTCSS input selecction, (no meaning in AM/DSB/SSB). - - rxbw.emplace_back("DSB 9k", 0); // we offer in AM DSB two audio BW 9k / 6k. - rxbw.emplace_back("DSB 6k", 1); - field_rxbw.set_options(rxbw); // store that aux GUI option to the field_rxbw. - - field_rxbw.hidden(0); // we show fixed RX AM BW 6Khz - field_bw.hidden(1); // we hide the FM TX deviation parameter, in non FM mode. - check_rogerbeep.hidden(0); // make visible again the "rogerbeep" selection. - break; - case 3: //{ "USB", 3 } - enable_usb = true; - rxaudio(rx_enabled); // Update now if we have RX audio on - check_rogerbeep.set_value(false); // reset the possible activation of roger beep, because it is not compatible with SSB, by now. - check_rogerbeep.hidden(1); // hide that roger beep selection. - - rxbw.emplace_back("USB+3k", 0); // locked a fixed option, to display it. - field_rxbw.set_options(rxbw); // store that aux GUI option to the field_rxbw. - - set_dirty(); // Refresh display - break; - case 4: //{ "LSB", 4 } - enable_lsb = true; - rxaudio(rx_enabled); // Update now if we have RX audio on - check_rogerbeep.set_value(false); // reset the possible activation of roger beep, because it is not compatible with SSB, by now. - check_rogerbeep.hidden(1); // hide that roger beep selection. - - rxbw.emplace_back("LSB-3k", 0); // locked a fixed option, to display it. - field_rxbw.set_options(rxbw); // store that aux GUI option to the field_rxbw. - - set_dirty(); // Refresh display - break; - case 5: //{ "DSB-SC", 5 } - enable_dsb = true; - rxaudio(rx_enabled); // Update now if we have RX audio on - check_rogerbeep.hidden(0); // make visible again the "rogerbeep" selection. - - rxbw.emplace_back("USB+3k", 0); // added dynamically two options (index 0,1) to that DSB-SC case to the field_rxbw value. - rxbw.emplace_back("LSB-3k", 1); - - field_rxbw.set_options(rxbw); // store that aux GUI option to the field_rxbw. - - break; - } - // configure_baseband(); - }; - - /* - check_va.on_select = [this](Checkbox&, bool v) { - va_enabled = v; - text_ptt.hidden(v); //hide / show PTT text - check_rxactive.hidden(v); //hide / show the RX AUDIO - set_dirty(); //Refresh display - }; - */ - field_va.set_selected_index(1); - field_va.on_change = [this](size_t, int32_t v) { - switch (v) { - case 0: - va_enabled = 0; - this->set_ptt_visibility(0); - check_rxactive.hidden(0); - ptt_enabled = 0; - break; - case 1: - va_enabled = 0; - this->set_ptt_visibility(1); - check_rxactive.hidden(0); - ptt_enabled = 1; - break; - case 2: - if (!rx_enabled) { - va_enabled = 1; - this->set_ptt_visibility(0); - check_rxactive.hidden(1); - ptt_enabled = 0; - } else { - field_va.set_selected_index(1); - } - break; - } - set_dirty(); - }; - - check_rogerbeep.on_select = [this](Checkbox&, bool v) { - rogerbeep_enabled = v; - }; - - check_mic_to_HP.on_select = [this](Checkbox&, bool v) { - mic_to_HP_enabled = v; - if (mic_to_HP_enabled) - audio::input::loopback_mic_to_hp_enable(); - else - audio::input::loopback_mic_to_hp_disable(); - if (mic_to_HP_enabled) { // When user click to "hear mic to HP", we will select the higher acoustic sound Option MODE ALC or BOOST- - if (audio::debug::codec_name() == "WM8731") { - options_wm8731_boost_mode.set_selected_index(0); // In WM we always go to Boost +12 dB’s respect reference level - } else if (ak4951_alc_and_wm8731_boost_GUI == 0) // In AK we are changing only that ALC index =0, because in that option, there is no sound. - options_ak4951_alc_mode.set_selected_index(1); // alc_mode =0 , means no ALC,no DIGITAL filter block (by passed), and that mode has no loopback mode. - } - }; - - check_common_freq_tx_rx.on_select = [this](Checkbox&, bool v) { - bool_same_F_tx_rx_enabled = v; - field_rxfrequency.hidden(v); // Hide or show separated freq RX field. (When no hide user can enter down indep. freq for RX) - set_dirty(); // Refresh GUI interface - receiver_model.set_target_frequency(v ? tx_frequency : rx_frequency); // To go to the proper tuned freq. when toggling it - }; - - field_va_level.on_change = [this](int32_t v) { - va_level = v; - vumeter.set_mark(v); - }; - field_va_level.set_value(40); - - field_va_attack.on_change = [this](int32_t v) { - attack_ms = v; - }; - field_va_attack.set_value(500); - - field_va_decay.on_change = [this](int32_t v) { - decay_ms = v; - }; - field_va_decay.set_value(1000); - - check_rxactive.on_select = [this](Checkbox&, bool v) { - // vumeter.set_value(0); //Start with a clean vumeter - rx_enabled = v; - check_mic_to_HP.hidden(rx_enabled); // Togle Hide / show "Hear Mic" checkbox depending if we activate or not the receiver. (if RX on => no visible "Mic Hear" option) - if ((rx_enabled) && (transmitting)) - check_mic_to_HP.set_value(transmitting); // Once we activate the "Rx audio" in reception time we disable "Hear Mic", but we allow it again in TX time. - - // check_va.hidden(v); //Hide or show voice activation - rxaudio(v); // Activate-Deactivate audio RX (receiver) accordingly - set_dirty(); // Refresh interface - }; - - field_rxbw.on_change = [this](size_t, int32_t v) { - if (!(enable_am || enable_usb || enable_lsb || enable_dsb || enable_wfm)) { - // In Previous fw versions, that nbfm_configuration(n) was done in any mode (FM/AM/SSB/DSB)...strictly speaking only need it in (NFM/FM) - receiver_model.set_nbfm_configuration(v); // we are in NFM/FM case, we need to select proper NFM/FM RX channel filter, NFM BW 8K5(0), NFM BW 11K(1), FM BW 16K (2) - } else { // we are not in NFM/FM mode. (we could be in any of the rest : AM /USB/LSB/DSB-SC) - if (enable_am) { // we are in AM TX mode, we will allow both independent RX audio BW : AM 9K (9K00AE3 / AM 6K (6K00AE3). (In AM option v can be 0 (9k), 1 (6k) - receiver_model.set_am_configuration(v); // we are in AM TX mode, we need to select proper AM full path config AM-9K filter. 0+0 =>AM-9K(0), 0+1=1 =>AM-6K(1), - } - if (enable_dsb) { // we are in DSB-SC in TX mode, we will allow both independent RX SSB demodulation (USB / LSB side band). in that submenu, v is 0 (SSB1 USB) or 1 (SSB2 LSB) - receiver_model.set_am_configuration(v + 2); // we are in DSB-SC TX mode, we need to select proper SSB filter. 0+2 =>usb(2), 1+2=3 =>lsb(3), - } - if (enable_wfm) { - receiver_model.set_wfm_configuration(v); // we are in WFM case, we need to select proper WFB RX BW filter, WFM BW 200K(0), WFM BW 180K(1), WFM BW 40K(2) - } - } - }; - - field_squelch.on_change = [this](int32_t v) { - receiver_model.set_squelch_level(100 - v); - }; - field_squelch.set_value(0); - receiver_model.set_squelch_level(0); - - rx_frequency = receiver_model.target_frequency(); + // WARNING: transmitter_model.set_target_frequency() and receiver_model.set_target_frequency() both update the same tuning freq, but one has an offset! field_rxfrequency.set_value(rx_frequency); - field_rxfrequency.set_step(receiver_model.frequency_step()); field_rxfrequency.on_change = [this](rf::Frequency f) { // available when field rxfrequency not hidden => user selected separated freq RX/TX- rx_frequency = f; if (rx_enabled) - receiver_model.set_target_frequency(f); + receiver_model.set_target_frequency(rx_frequency); }; field_rxfrequency.on_edit = [this, &nav]() { // available when field rxfrequency not hidden => user selected separated freq RX/TX- focused_ui = 1; // TODO: Provide separate modal method/scheme? auto new_view = nav.push(rx_frequency); new_view->on_changed = [this](rf::Frequency f) { - rx_frequency = f; - if (rx_enabled) - receiver_model.set_target_frequency(f); this->field_rxfrequency.set_value(f); - set_dirty(); }; }; - rx_lna = receiver_model.lna(); - field_rxlna.on_change = [this](int32_t v) { - rx_lna = v; - if (rx_enabled) - receiver_model.set_lna(v); - }; - field_rxlna.set_value(rx_lna); + // TODO: would be nice if frequency step was configurable in this app + field_rxfrequency.set_step(receiver_model.frequency_step()); - rx_vga = receiver_model.vga(); - field_rxvga.on_change = [this](int32_t v) { - rx_vga = v; - if (rx_enabled) - receiver_model.set_vga(v); + check_common_freq_tx_rx.on_select = [this](Checkbox&, bool v) { + bool_same_F_tx_rx_enabled = v; + field_rxfrequency.hidden(v); + set_dirty(); + receiver_model.set_target_frequency(bool_same_F_tx_rx_enabled ? tx_frequency : rx_frequency); // To go to the proper tuned freq. when toggling it }; - field_rxvga.set_value(rx_vga); + check_common_freq_tx_rx.set_value(bool_same_F_tx_rx_enabled); - rx_amp = receiver_model.rf_amp(); - field_rxamp.on_change = [this](int32_t v) { - rx_amp = v; - if (rx_enabled) - receiver_model.set_rf_amp(rx_amp); + field_bw.on_change = [this](uint32_t v) { + transmitter_model.set_channel_bandwidth(v * 1000); }; - field_rxamp.set_value(rx_amp); + field_bw.set_value(transmitter_model.channel_bandwidth() / 1000); // pre-default first time, TX deviation FM for NFM / FM + + // now, no need direct update, field_rfgain, field_rfamp (it is done in ui_transmitter.cpp) + + options_mode.on_change = [this](size_t, int32_t v) { + mic_mod_index = v; + + // update bw & tone key visibility - only visible in NFM/WFM modes + if ((mic_mod_index == MIC_MOD_NFM) || (mic_mod_index == MIC_MOD_WFM)) { + field_bw.hidden(false); + options_tone_key.hidden(false); + } else { + field_bw.hidden(true); + options_tone_key.set_selected_index(0); + options_tone_key.hidden(true); + } + + // update rogerbeep visibility - disable in USB/LSB modes + if ((mic_mod_index == MIC_MOD_USB) || (mic_mod_index == MIC_MOD_LSB)) { + check_rogerbeep.set_value(false); + check_rogerbeep.hidden(true); + } else { + check_rogerbeep.hidden(false); + } + + // update squelch visibility - only visible in NFM mode + field_squelch.hidden(mic_mod_index != MIC_MOD_NFM); + + // update bandwidth + set_rxbw_options(); + set_rxbw_defaults(false); + field_rxbw.hidden(false); + set_dirty(); // Refresh display + + rxaudio(rx_enabled); // Update now if we have RX audio on + // configure_baseband(); + }; + options_mode.set_selected_index(mic_mod_index); + + check_mic_to_HP.on_select = [this](Checkbox&, bool v) { + mic_to_HP_enabled = v; + if (mic_to_HP_enabled) { // When user click to "hear mic to HP", we will select the higher acoustic sound Option MODE ALC or BOOST- + audio::input::loopback_mic_to_hp_enable(); + if (audio::debug::codec_name() == "WM8731") { + options_wm8731_boost_mode.set_selected_index(0); // In WM we always go to Boost +12 dB’s respect reference level + } else if (ak4951_alc_and_wm8731_boost_GUI == 0) // In AK we are changing only that ALC index =0, because in that option, there is no sound. + options_ak4951_alc_mode.set_selected_index(1); // alc_mode =0 , means no ALC,no DIGITAL filter block (by passed), and that mode has no loopback mode. + } else { + audio::input::loopback_mic_to_hp_disable(); + } + }; + check_mic_to_HP.set_value(mic_to_HP_enabled); + + check_rxactive.on_select = [this](Checkbox&, bool v) { + // vumeter.set_value(0); //Start with a clean vumeter + rx_enabled = v; + check_mic_to_HP.hidden(rx_enabled); // Toggle Hide / show "Hear Mic" checkbox depending if we activate or not the receiver. (if RX on => no visible "Mic Hear" option) + if ((rx_enabled) && (transmitting)) + check_mic_to_HP.set_value(transmitting); // Once we activate the "Rx audio" in reception time we disable "Hear Mic", but we allow it again in TX time. + + if (rx_enabled) + check_va.set_value(false); // Disallow voice activation during RX audio (for now) - Future TODO: Should allow VOX during RX audio + + rxaudio(v); // Activate-Deactivate audio RX (receiver) accordingly + set_dirty(); // Refresh interface + }; + check_rxactive.set_value(rx_enabled); tx_button.on_select = [this](Button&) { - if (ptt_enabled && !transmitting) { + if (!transmitting) { set_tx(true); } }; tx_button.on_touch_release = [this](Button&) { - if (button_touch) { - button_touch = false; - set_tx(false); - } + button_touch = false; }; tx_button.on_touch_press = [this](Button&) { - if (!transmitting) { - button_touch = true; - } + button_touch = true; }; + field_va_level.on_change = [this](int32_t v) { + va_level = v; + vumeter.set_mark(v); + }; + field_va_level.set_value(va_level); + + field_va_attack.set_value(attack_ms); + field_va_attack.on_change = [this](int32_t v) { + attack_ms = v; + }; + + field_va_decay.set_value(decay_ms); + field_va_decay.on_change = [this](int32_t v) { + decay_ms = v; + }; + + check_va.on_select = [this](Checkbox&, bool v) { + va_enabled = v; + if (va_enabled) + check_rxactive.set_value(false); // Disallow RX-audio in VOX mode (for now) - Future TODO: Should allow VOX during RX audio + }; + check_va.set_value(va_enabled); + // These shouldn't be necessary, but because // this app uses both transmitter_model and directly // configures the baseband, these end up being required. @@ -626,6 +573,11 @@ MicTXView::MicTXView( audio::set_rate(audio::Rate::Hz_24000); audio::input::start(ak4951_alc_and_wm8731_boost_GUI, mic_to_HP_enabled); // set up ALC mode (AK4951) or set up mic_boost ON/OFF (WM8731). and the check box "Hear Mic" + + // Workaround for bad RX reception when app first started -- shouldn't be necessary: + // Trigger receiver to update modulation. + if (rx_enabled) + receiver_model.set_squelch_level(receiver_model.squelch_level()); } MicTXView::MicTXView( @@ -634,16 +586,15 @@ MicTXView::MicTXView( : MicTXView(nav) { // Try to use the modulation/bandwidth from RX settings. // TODO: These concepts should be merged so there's only one. - // TODO: enums/constants for these indexes. switch (override.mode) { case ReceiverModel::Mode::AMAudio: - options_mode.set_selected_index(2); + options_mode.set_selected_index(MIC_MOD_AM); break; case ReceiverModel::Mode::NarrowbandFMAudio: - options_mode.set_selected_index(0); + options_mode.set_selected_index(MIC_MOD_NFM); break; case ReceiverModel::Mode::WidebandFMAudio: - options_mode.set_selected_index(1); + options_mode.set_selected_index(MIC_MOD_WFM); break; // Unsupported modulations. @@ -653,6 +604,8 @@ MicTXView::MicTXView( break; } + check_common_freq_tx_rx.set_value(true); // freq passed from other app is in tx_frequency, so set rx_frequency=tx_frequency + // TODO: bandwidth selection is tied too tightly to the UI // controls. It's not possible to set the bandwidth here without // refactoring. Also options_mode seems to have a category error. @@ -660,12 +613,12 @@ MicTXView::MicTXView( MicTXView::~MicTXView() { audio::input::stop(); - transmitter_model.set_target_frequency(tx_frequency); - transmitter_model.disable(); if (rx_enabled) { // Also turn off both (audio rx if enabled, and disable mic_loop to HP) rxaudio(false); audio::input::loopback_mic_to_hp_disable(); // Leave Mic audio off in the main menu (as original audio path, otherwise we had No audio in next "Audio App") } + transmitter_model.set_target_frequency(tx_frequency); // Set tx_frequency here to be saved in app_settings (might not match rx_frequency) + transmitter_model.disable(); baseband::shutdown(); } diff --git a/firmware/application/apps/ui_mictx.hpp b/firmware/application/apps/ui_mictx.hpp index 4df94208..e9843e13 100644 --- a/firmware/application/apps/ui_mictx.hpp +++ b/firmware/application/apps/ui_mictx.hpp @@ -70,68 +70,85 @@ class MicTXView : public View { static constexpr uint32_t lcd_frame_duration = (256 * 1000UL) / 60; // 1 frame @ 60fps in ms .8 fixed point /60 void update_vumeter(); + bool tx_button_held(); void do_timing(); void set_tx(bool enable); - // void on_target_frequency_changed(rf::Frequency f); void on_tx_progress(const bool done); + void update_tx_icon(); + uint8_t shift_bits(void); void configure_baseband(); - + void set_rxbw_options(void); + void set_rxbw_defaults(bool use_app_settings); + void update_receiver_rxbw(void); void rxaudio(bool is_on); - void set_ptt_visibility(bool v); - RxRadioState rx_radio_state_{}; TxRadioState tx_radio_state_{ 0 /* frequency */, 1750000 /* bandwidth */, sampling_rate /* sampling rate */ }; - app_settings::SettingsManager settings_{ - "tx_mic", app_settings::Mode::RX_TX, - app_settings::Options::UseGlobalTargetFrequency}; - bool transmitting{false}; + enum Mic_Modulation : uint32_t { + MIC_MOD_NFM = 0, + MIC_MOD_WFM = 1, + MIC_MOD_AM = 2, + MIC_MOD_USB = 3, + MIC_MOD_LSB = 4, + MIC_MOD_DSB = 5, + }; + + // Settings + uint32_t mic_mod_index{0}; + uint32_t rxbw_index{0}; bool va_enabled{false}; - bool ptt_enabled{true}; bool rogerbeep_enabled{false}; bool mic_to_HP_enabled{false}; bool bool_same_F_tx_rx_enabled{false}; + rf::Frequency rx_frequency{0}; bool rx_enabled{false}; - uint32_t tone_key_index{}; - float mic_gain{1.0}; + uint32_t tone_key_index{0}; + uint32_t mic_gain_x10{1}; uint8_t ak4951_alc_and_wm8731_boost_GUI{0}; + uint32_t va_level{40}; + uint32_t attack_ms{500}; + uint32_t decay_ms{1000}; + app_settings::SettingsManager settings_{ + "tx_mic", + app_settings::Mode::RX_TX, + app_settings::Options::UseGlobalTargetFrequency, + { + {"mic_mod_index"sv, &mic_mod_index}, + {"rxbw_index"sv, &rxbw_index}, + {"same_F_tx_rx"sv, &bool_same_F_tx_rx_enabled}, + {"mic_rx_frequency"sv, &rx_frequency}, + {"rx_enabled"sv, &rx_enabled}, + {"mic_gain_x10"sv, &mic_gain_x10}, + {"mic_to_HP"sv, &mic_to_HP_enabled}, + {"alc_and_boost"sv, &ak4951_alc_and_wm8731_boost_GUI}, + {"va_level"sv, &va_level}, + {"attack_ms"sv, &attack_ms}, + {"decay_ms"sv, &decay_ms}, + {"vox"sv, &va_enabled}, + {"rogerbeep"sv, &rogerbeep_enabled}, + {"tone_key_index"sv, &tone_key_index}, + }}; + + rf::Frequency tx_frequency{0}; + bool transmitting{false}; uint32_t audio_level{0}; - uint32_t va_level{}; - uint32_t attack_ms{}; - uint32_t decay_ms{}; uint32_t attack_timer{0}; uint32_t decay_timer{0}; int32_t tx_gain{47}; bool rf_amp{false}; - int32_t rx_lna{32}; - int32_t rx_vga{32}; - bool rx_amp{false}; - rf::Frequency tx_frequency{0}; - rf::Frequency rx_frequency{0}; int32_t focused_ui{2}; bool button_touch{false}; - uint8_t shift_bits_s16{4}; // shift bits factor to the captured ADC S16 audio sample. - // AM TX Stuff - // TODO: Some of this stuff is mutually exclusive. Need a better representation. - bool enable_am{false}; - bool enable_dsb{false}; - bool enable_usb{false}; - bool enable_lsb{false}; - bool enable_wfm{false}; // added to distinguish in the FM mode, RX BW : NFM (8K5, 11K), FM (16K), WFM(200K) - - Labels labels_WM8731{ + Labels labels_both{ {{3 * 8, 1 * 8}, "MIC-GAIN:", Color::light_grey()}, - {{17 * 8, 1 * 8}, "Boost", Color::light_grey()}, {{3 * 8, 3 * 8}, "F:", Color::light_grey()}, {{15 * 8, 3 * 8}, "FM TXBW: kHz", Color::light_grey()}, // to be more symetric and consistent to the below FM RXBW {{18 * 8, (5 * 8)}, "Mode:", Color::light_grey()}, // now, no need to handle GAIN, Amp here It is handled by ui_transmitter.cpp - {{3 * 8, 8 * 8}, "TX Activation:", Color::light_grey()}, // we delete { { 3 * 8, 5 * 8 }, "GAIN:", Color::light_grey() }, {{4 * 8, 10 * 8}, "LVL:", Color::light_grey()}, // we delete { {11 * 8, 5 * 8 }, "Amp:", Color::light_grey() }, {{12 * 8, 10 * 8}, "ATT:", Color::light_grey()}, {{20 * 8, 10 * 8}, "DEC:", Color::light_grey()}, @@ -144,25 +161,10 @@ class MicTXView : public View { {{5 * 8, (27 * 8) + 2}, "LNA:", Color::light_grey()}, {{12 * 8, (27 * 8) + 2}, "VGA:", Color::light_grey()}, {{19 * 8, (27 * 8) + 2}, "AMP:", Color::light_grey()}}; + Labels labels_WM8731{ + {{17 * 8, 1 * 8}, "Boost", Color::light_grey()}}; Labels labels_AK4951{ - {{3 * 8, 1 * 8}, "MIC-GAIN:", Color::light_grey()}, - {{17 * 8, 1 * 8}, "ALC", Color::light_grey()}, - {{3 * 8, 3 * 8}, "F:", Color::light_grey()}, - {{15 * 8, 3 * 8}, "FM TXBW: kHz", Color::light_grey()}, - {{18 * 8, (5 * 8)}, "Mode:", Color::light_grey()}, // now, no need to handle GAIN, Amp here It is handled by ui_transmitter.cpp - {{3 * 8, 8 * 8}, "TX Activation:", Color::light_grey()}, // we delete { { 3 * 8, 5 * 8 }, "GAIN:", Color::light_grey() }, - {{4 * 8, 10 * 8}, "LVL:", Color::light_grey()}, // we delete { {11 * 8, 5 * 8 }, "Amp:", Color::light_grey() }, - {{12 * 8, 10 * 8}, "ATT:", Color::light_grey()}, - {{20 * 8, 10 * 8}, "DEC:", Color::light_grey()}, - {{3 * 8, (13 * 8) - 5}, "TONE KEY:", Color::light_grey()}, - {{3 * 8, (18 * 8) - 1}, "======== Receiver ========", Color::green()}, - {{(5 * 8), (23 * 8) + 2}, "VOL:", Color::light_grey()}, - {{14 * 8, (23 * 8) + 2}, "RXBW:", Color::light_grey()}, // we remove the label "FM" because we will display all MOD types RX_BW. - {{20 * 8, (25 * 8) + 2}, "SQ:", Color::light_grey()}, - {{5 * 8, (25 * 8) + 2}, "F_RX:", Color::light_grey()}, - {{5 * 8, (27 * 8) + 2}, "LNA:", Color::light_grey()}, - {{12 * 8, (27 * 8) + 2}, "VGA:", Color::light_grey()}, - {{19 * 8, (27 * 8) + 2}, "AMP:", Color::light_grey()}}; + {{17 * 8, 1 * 8}, "ALC", Color::light_grey()}}; VuMeter vumeter{ {0 * 8, 1 * 8, 2 * 8, 33 * 8}, @@ -225,28 +227,19 @@ class MicTXView : public View { {24 * 8, 5 * 8}, 6, { - {"NFM/FM", 0}, - {" WFM ", 1}, - {" AM ", 2}, // in fact that TX mode = AM -DSB with carrier. - {" USB ", 3}, - {" LSB ", 4}, - {"DSB-SC", 5} // We are TX Double Side AM Band with suppressed carrier, and allowing in RX both indep SSB lateral band (USB/LSB). + {"NFM/FM", MIC_MOD_NFM}, + {" WFM ", MIC_MOD_WFM}, + {" AM ", MIC_MOD_AM}, // in fact that TX mode = AM -DSB with carrier. + {" USB ", MIC_MOD_USB}, + {" LSB ", MIC_MOD_LSB}, + {"DSB-SC", MIC_MOD_DSB} // We are TX Double Side AM Band with suppressed carrier, and allowing in RX both indep SSB lateral band (USB/LSB). }}; - /* - Checkbox check_va { - { 3 * 8, (10 * 8) - 4 }, - 7, - "Voice activation", - false - }; - */ - OptionsField field_va{ - {17 * 8, 8 * 8}, - 4, - {{" OFF", 0}, - {" PTT", 1}, - {"AUTO", 2}}}; + Checkbox check_va{ + {3 * 8, 8 * 7}, + 10, + "VOX enable", + false}; NumberField field_va_level{ {8 * 8, 10 * 8}, @@ -293,7 +286,7 @@ class MicTXView : public View { Checkbox check_common_freq_tx_rx{ {18 * 8, (21 * 8) - 7}, 8, - "F TX=RX", + "F RX=TX", false}; AudioVolumeField field_volume{ @@ -347,9 +340,15 @@ class MicTXView : public View { Button tx_button{ {10 * 8, 30 * 8, 10 * 8, 5 * 8}, - "TX", + "PTT TX", true}; + Image tx_icon{ + {6 * 8, 31 * 8 + 4, 16, 16}, + &bitmap_icon_microphone, + Color::black(), + Color::black()}; + MessageHandlerRegistration message_handler_lcd_sync{ Message::ID::DisplayFrameSync, [this](const Message* const) {