Simplified LCR code a bit

Split modem into modem and serializer
Frequency string formatter

firmware/application/ui_modemsetup.cpp

@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2016 Furrtek
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "ui_modemsetup.hpp"
+#include "ui_receiver.hpp"
+
+#include "portapack.hpp"
+#include "string_format.hpp"
+
+#include "portapack_shared_memory.hpp"
+#include "portapack_persistent_memory.hpp"
+
+#include <cstring>
+#include <stdio.h>
+
+using namespace portapack;
+using namespace modems;
+
+namespace ui {
+
+void ModemSetupView::focus() {
+	button_setfreq.focus();
+}
+
+void ModemSetupView::update_freq(rf::Frequency f) {
+	persistent_memory::set_tuned_frequency(f);
+
+	button_setfreq.set_text(to_string_short_freq(f, 4));
+}
+
+ModemSetupView::ModemSetupView(
+	NavigationView& nav
+)
+{
+	using name_t = std::string;
+	using value_t = int32_t;
+	using option_t = std::pair<name_t, value_t>;
+	using options_t = std::vector<option_t>;
+	options_t modem_options;
+	size_t i;
+	
+	add_children({
+		&labels,
+		&button_setfreq,
+		&field_baudrate,
+		&field_mark,
+		&field_space,
+		&field_bw,
+		&field_repeat,
+		&options_modem,
+		&button_set_modem,
+		&sym_format,
+		&button_save
+	});
+	
+	for (i = 0; i < MODEM_DEF_COUNT; i++) {
+		if (modem_defs[i].modulation == AFSK)
+			modem_options.emplace_back(std::make_pair(modem_defs[i].name, i));
+	}
+	
+	options_modem.set_options(modem_options);
+	options_modem.set_selected_index(0);
+	
+	sym_format.set_symbol_list(0, "6789");		// Data bits
+	sym_format.set_symbol_list(1, "NEo");		// Parity
+	sym_format.set_symbol_list(2, "012");		// Stop bits
+	sym_format.set_symbol_list(3, "ML");		// MSB/LSB first
+	
+	sym_format.set_sym(0, persistent_memory::serial_format().data_bits - 6);
+	sym_format.set_sym(1, persistent_memory::serial_format().parity);
+	sym_format.set_sym(2, persistent_memory::serial_format().stop_bits);
+	sym_format.set_sym(3, persistent_memory::serial_format().bit_order);
+	
+	update_freq(persistent_memory::tuned_frequency());
+	
+	field_mark.set_value(persistent_memory::afsk_mark_freq());
+	field_space.set_value(persistent_memory::afsk_space_freq());
+	field_bw.set_value(persistent_memory::modem_bw() / 1000);
+	field_repeat.set_value(persistent_memory::modem_repeat());
+	
+	button_setfreq.on_select = [this, &nav](Button&) {
+		auto new_view = nav.push<FrequencyKeypadView>(persistent_memory::tuned_frequency());
+		new_view->on_changed = [this](rf::Frequency f) {
+			update_freq(f);
+		};
+	};
+	
+	field_baudrate.set_value(persistent_memory::modem_baudrate());
+	
+	button_set_modem.on_select = [this, &nav](Button&) {
+		size_t modem_def_index = options_modem.selected_index();
+		
+		field_mark.set_value(modem_defs[modem_def_index].mark_freq);
+		field_space.set_value(modem_defs[modem_def_index].space_freq);
+		field_baudrate.set_value(modem_defs[modem_def_index].baudrate);
+	};
+
+	button_save.on_select = [this,&nav](Button&) {
+		serial_format_t serial_format;
+		
+		persistent_memory::set_afsk_mark(field_mark.value());
+		persistent_memory::set_afsk_space(field_space.value());
+		
+		persistent_memory::set_modem_baudrate(field_baudrate.value());
+		persistent_memory::set_modem_bw(field_bw.value() * 1000);
+		persistent_memory::set_modem_repeat(field_repeat.value());
+		
+		serial_format.data_bits = sym_format.get_sym(0) + 6;
+		serial_format.parity = (parity_enum)sym_format.get_sym(1);
+		serial_format.stop_bits = sym_format.get_sym(2);
+		serial_format.bit_order = (order_enum)sym_format.get_sym(3);
+		
+		persistent_memory::set_serial_format(serial_format);
+		
+		nav.pop();
+	};
+}
+
+} /* namespace ui */