TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-10-21 15:29:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
# Conflicts:
#	firmware/application/bitmap.hpp
#	firmware/application/receiver_model.cpp
#	firmware/application/receiver_model.hpp
#	firmware/application/touch.hpp
#	firmware/application/ui_setup.cpp
#	firmware/baseband/proc_ais.hpp
#	firmware/baseband/proc_ert.hpp
#	firmware/bootstrap/CMakeLists.txt
#	firmware/common/portapack_persistent_memory.cpp
#	firmware/common/portapack_persistent_memory.hpp
This commit is contained in:
furrtek
2016-08-17 02:55:34 +02:00
parent e686c7437e 16a6d7efe0
commit 45a754645e
43 changed files with 1089 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/application/ui_lcr.cpp
View File

@@ -247,7 +247,6 @@ void LCRView::start_tx(const bool scan) {
afsk_format = 0;
}
transmitter_model.set_tuning_frequency(portapack::persistent_memory::tuned_frequency());
transmitter_model.set_baseband_configuration({
.mode = 0,
@@ -281,7 +280,7 @@ LCRView::LCRView(NavigationView& nav) {
baseband::run_image(portapack::spi_flash::image_tag_afsk);
strcpy(rgsb, &scan_list[options_scanlist.selected_index()].addresses[0]);
strcpy(rgsb, &scan_list[0].addresses[0]);
add_children({ {
&text_recap,
@@ -298,6 +297,8 @@ LCRView::LCRView(NavigationView& nav) {
&button_clear
} });
options_scanlist.set_selected_index(0);
const auto button_setam_fn = [this, &nav](Button& button) {
this->on_button_setam(nav, button);
};