Few improvements in ui_transmitter (#332)

* ui_transmitter : Added rf_amp field
* ui_transmitter : Added color grading depending on gain settings
* Removed TransmitterModel::set_rf_amp(bool) call from every apps loading ui_transmit
* transmitter_model : RF_amp disabled by default
* APRS Tx app : Fixed frequency keypad not showing up
* Morse Tx app : Removed TransmitterModel::set_lna() and TransmitterModel::set_vga() calls
This commit is contained in:
Aurélien Hernandez
2020-04-16 23:58:06 +02:00
committed by GitHub
parent d65a8929bc
commit 3dfbdc844c
15 changed files with 93 additions and 43 deletions

View File

@@ -240,7 +240,6 @@ void LGEView::start_tx() {
tx_view.set_dirty();
}
transmitter_model.set_sampling_rate(2280000);
transmitter_model.set_rf_amp(true);
transmitter_model.set_baseband_bandwidth(1750000);
transmitter_model.enable();

View File

@@ -310,7 +310,6 @@ void ADSBTxView::start_tx() {
generate_frames();
transmitter_model.set_sampling_rate(4000000U);
transmitter_model.set_rf_amp(true);
transmitter_model.set_baseband_bandwidth(10000000);
transmitter_model.enable();

View File

@@ -58,7 +58,6 @@ void APRSTXView::start_tx() {
transmitter_model.set_tuning_frequency(persistent_memory::tuned_frequency());
transmitter_model.set_sampling_rate(AFSK_TX_SAMPLERATE);
transmitter_model.set_rf_amp(true);
transmitter_model.set_baseband_bandwidth(1750000);
transmitter_model.enable();
@@ -108,7 +107,10 @@ APRSTXView::APRSTXView(NavigationView& nav) {
};
tx_view.on_edit_frequency = [this, &nav]() {
return;
auto new_view = nav.push<FrequencyKeypadView>(receiver_model.tuning_frequency());
new_view->on_changed = [this](rf::Frequency f) {
receiver_model.set_tuning_frequency(f);
};
};
tx_view.on_start = [this]() {

View File

@@ -37,7 +37,6 @@ void BHTView::focus() {
void BHTView::start_tx() {
baseband::shutdown();
transmitter_model.set_rf_amp(true);
transmitter_model.set_baseband_bandwidth(1750000);
if (target_system == XYLOS) {

View File

@@ -68,7 +68,6 @@ void CoasterPagerView::start_tx() {
generate_frame();
transmitter_model.set_sampling_rate(2280000);
transmitter_model.set_rf_amp(true);
transmitter_model.set_baseband_bandwidth(1750000);
transmitter_model.enable();

View File

@@ -186,7 +186,6 @@ void KeyfobView::start_tx() {
size_t bitstream_length = generate_frame();
transmitter_model.set_sampling_rate(OOK_SAMPLERATE);
transmitter_model.set_rf_amp(true);
transmitter_model.set_baseband_bandwidth(1750000);
transmitter_model.enable();

View File

@@ -130,7 +130,6 @@ void LCRView::start_tx(const bool scan) {
transmitter_model.set_tuning_frequency(persistent_memory::tuned_frequency());
transmitter_model.set_sampling_rate(AFSK_TX_SAMPLERATE);
transmitter_model.set_rf_amp(true);
transmitter_model.set_baseband_bandwidth(1750000);
transmitter_model.enable();

View File

@@ -63,7 +63,6 @@ void MicTXView::set_tx(bool enable) {
if (enable) {
transmitting = true;
configure_baseband();
transmitter_model.set_rf_amp(true);
transmitter_model.enable();
portapack::pin_i2s0_rx_sda.mode(3); // This is already done in audio::init but gets changed by the CPLD overlay reprogramming
//gpio_tx.write(1);
@@ -75,7 +74,6 @@ void MicTXView::set_tx(bool enable) {
} else {
transmitting = false;
configure_baseband();
transmitter_model.set_rf_amp(false);
transmitter_model.disable();
//gpio_tx.write(0);
//led_tx.off();
@@ -207,7 +205,6 @@ MicTXView::MicTXView(
field_va_decay.set_value(1000);
transmitter_model.set_sampling_rate(sampling_rate);
transmitter_model.set_rf_amp(false);
transmitter_model.set_baseband_bandwidth(1750000);
set_tx(false);

View File

@@ -100,7 +100,6 @@ bool MorseView::start_tx() {
progressbar.set_max(symbol_count);
transmitter_model.set_sampling_rate(1536000U);
transmitter_model.set_rf_amp(true);
transmitter_model.set_baseband_bandwidth(1750000);
transmitter_model.enable();

View File

@@ -79,9 +79,6 @@ bool POCSAGTXView::start_tx() {
progressbar.set_max(total_frames);
transmitter_model.set_sampling_rate(2280000);
transmitter_model.set_rf_amp(true);
transmitter_model.set_lna(40);
transmitter_model.set_vga(40);
transmitter_model.set_baseband_bandwidth(1750000);
transmitter_model.enable();

View File

@@ -204,7 +204,6 @@ void RDSView::start_tx() {
frame_datetime.clear();
transmitter_model.set_sampling_rate(2280000U);
transmitter_model.set_rf_amp(true);
transmitter_model.set_baseband_bandwidth(1750000);
transmitter_model.enable();

View File

@@ -166,7 +166,6 @@ void SSTVTXView::start_tx() {
prepare_scanline(); // Preload one scanline
transmitter_model.set_sampling_rate(3072000U);
transmitter_model.set_rf_amp(true);
transmitter_model.set_baseband_bandwidth(1750000);
transmitter_model.enable();