Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-10-01 01:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #705 from Brumi-2021/Bias_DC_Voltage_not_working_in_TPMS_&_ERT_#700

Browse Source 
Adding Bias dc voltage not working in tpms & ert (previous issue #700)
This commit is contained in:
Erwin Ried 2022-09-05 10:14:47 +02:00 committed by GitHub
commit d87e9853a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/application/apps/ert_app.cpp
View File

@ -113,8 +113,12 @@ ERTAppView::ERTAppView(NavigationView&) {
field_rf_amp.set_value(app_settings.rx_amp); field_rf_amp.set_value(app_settings.rx_amp);
} }
receiver_model.set_tuning_frequency(initial_target_frequency);
receiver_model.set_sampling_rate(sampling_rate);
receiver_model.set_baseband_bandwidth(baseband_bandwidth);
receiver_model.enable(); // Before using radio::enable(), but not updating Ant.DC-Bias.
radio::enable({ /* radio::enable({
initial_target_frequency, initial_target_frequency,
sampling_rate, sampling_rate,
baseband_bandwidth, baseband_bandwidth,
@ -122,7 +126,7 @@ ERTAppView::ERTAppView(NavigationView&) {
receiver_model.rf_amp(), receiver_model.rf_amp(),
static_cast<int8_t>(receiver_model.lna()), static_cast<int8_t>(receiver_model.lna()),
static_cast<int8_t>(receiver_model.vga()), static_cast<int8_t>(receiver_model.vga()),
}); }); */
logger = std::make_unique<ERTLogger>(); logger = std::make_unique<ERTLogger>();
if( logger ) { if( logger ) {
@ -135,7 +139,7 @@ ERTAppView::~ERTAppView() {
// save app settings // save app settings
settings.save("rx_ert", &app_settings); settings.save("rx_ert", &app_settings);
radio::disable(); receiver_model.disable(); // to switch off all, including DC bias and change flag enabled_
baseband::shutdown(); baseband::shutdown();
} }

11
firmware/application/apps/tpms_app.cpp
View File

@ -161,7 +161,12 @@ TPMSAppView::TPMSAppView(NavigationView&) {
} }
else options_band.set_by_value(receiver_model.tuning_frequency()); else options_band.set_by_value(receiver_model.tuning_frequency());
radio::enable({ receiver_model.set_tuning_frequency(tuning_frequency());
receiver_model.set_sampling_rate(sampling_rate);
receiver_model.set_baseband_bandwidth(baseband_bandwidth);
receiver_model.enable(); // Before using radio::enable(), but not updating Ant.DC-Bias.
/* radio::enable({
tuning_frequency(), tuning_frequency(),
sampling_rate, sampling_rate,
baseband_bandwidth, baseband_bandwidth,
@ -169,7 +174,7 @@ TPMSAppView::TPMSAppView(NavigationView&) {
receiver_model.rf_amp(), receiver_model.rf_amp(),
static_cast<int8_t>(receiver_model.lna()), static_cast<int8_t>(receiver_model.lna()),
static_cast<int8_t>(receiver_model.vga()), static_cast<int8_t>(receiver_model.vga()),
}); }); */
options_band.on_change = [this](size_t, OptionsField::value_t v) { options_band.on_change = [this](size_t, OptionsField::value_t v) {
this->on_band_changed(v); this->on_band_changed(v);
@ -200,7 +205,7 @@ TPMSAppView::~TPMSAppView() {
app_settings.rx_frequency = target_frequency_; app_settings.rx_frequency = target_frequency_;
settings.save("rx_tpms", &app_settings); settings.save("rx_tpms", &app_settings);
radio::disable(); receiver_model.disable(); // to switch off all, including DC bias and change flag enabled_
baseband::shutdown(); baseband::shutdown();
} }