Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-01-11 23:39:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Recon and Level fix (#1250)

Browse Source 
* Level: Fix for SPEC to other modes
* Recon: Better difference between RAW and AUDIO. Launch Capture instead of audio in SPEC mode
This commit is contained in:
gullradriel 2023-07-07 22:21:48 +02:00 committed by GitHub
parent a60f4ce9a8
commit a09c0e4c2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/application/apps/ui_level.cpp
View File

@ -212,6 +212,12 @@ size_t LevelView::change_mode(freqman_index_t new_mod) {
default: default:
break; break;
} }
if (new_mod != SPEC_MODULATION) {
// reset receiver model to fix bug when going from SPEC to audio, the sound is distorded
receiver_model.set_sampling_rate(3072000);
receiver_model.set_baseband_bandwidth(1750000);
}
return step_mode.selected_index(); return step_mode.selected_index();
} }

17
firmware/application/apps/ui_recon.cpp
View File

@ -24,6 +24,7 @@
#include "ui_recon.hpp" #include "ui_recon.hpp"
#include "ui_fileman.hpp" #include "ui_fileman.hpp"
#include "file.hpp" #include "file.hpp"
#include "capture_app.hpp"
using namespace portapack; using namespace portapack;
using portapack::memory::map::backup_ram; using portapack::memory::map::backup_ram;
@ -38,6 +39,10 @@ void ReconView::set_loop_config(bool v) {
void ReconView::recon_stop_recording() { void ReconView::recon_stop_recording() {
if (is_recording) { if (is_recording) {
if (field_mode.selected_index_value() == SPEC_MODULATION)
button_audio_app.set_text("RAW");
else
button_audio_app.set_text("AUDIO");
button_audio_app.set_style(&Styles::white); button_audio_app.set_style(&Styles::white);
record_view->stop(); record_view->stop();
button_config.set_style(&Styles::white); // disable config while recording as it's causing an IO error pop up at exit button_config.set_style(&Styles::white); // disable config while recording as it's causing an IO error pop up at exit
@ -550,7 +555,10 @@ ReconView::ReconView(NavigationView& nav)
button_audio_app.on_select = [this](Button&) { button_audio_app.on_select = [this](Button&) {
auto settings = receiver_model.settings(); auto settings = receiver_model.settings();
settings.frequency_step = step_mode.selected_index_value(); settings.frequency_step = step_mode.selected_index_value();
nav_.replace<AnalogAudioView>(settings); if (field_mode.selected_index_value() == SPEC_MODULATION)
nav_.replace<CaptureAppView>();
else
nav_.replace<AnalogAudioView>(settings);
}; };
button_loop_config.on_select = [this](Button&) { button_loop_config.on_select = [this](Button&) {
@ -1102,6 +1110,10 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
// contents of a possible recon_start_recording(), but not yet since it's only called once // contents of a possible recon_start_recording(), but not yet since it's only called once
if (auto_record_locked && !is_recording) { if (auto_record_locked && !is_recording) {
button_audio_app.set_style(&Styles::red); button_audio_app.set_style(&Styles::red);
if (field_mode.selected_index_value() == SPEC_MODULATION)
button_audio_app.set_text("RAW REC");
else
button_audio_app.set_text("WAV REC");
record_view->start(); record_view->start();
button_config.set_style(&Styles::light_grey); // disable config while recording as it's causing an IO error pop up at exit button_config.set_style(&Styles::light_grey); // disable config while recording as it's causing an IO error pop up at exit
is_recording = true; is_recording = true;
@ -1421,10 +1433,13 @@ size_t ReconView::change_mode(freqman_index_t new_mod) {
break; break;
} }
if (new_mod != SPEC_MODULATION) { if (new_mod != SPEC_MODULATION) {
button_audio_app.set_text("AUDIO");
record_view->set_sampling_rate(recording_sampling_rate); record_view->set_sampling_rate(recording_sampling_rate);
// reset receiver model to fix bug when going from SPEC to audio, the sound is distorded // reset receiver model to fix bug when going from SPEC to audio, the sound is distorded
receiver_model.set_sampling_rate(3072000); receiver_model.set_sampling_rate(3072000);
receiver_model.set_baseband_bandwidth(1750000); receiver_model.set_baseband_bandwidth(1750000);
} else {
button_audio_app.set_text("RAW");
} }
field_mode.set_selected_index(new_mod); field_mode.set_selected_index(new_mod);