Started work on ACARS RX

Added ACARS frequencies file
Moved non-implemented apps menu items down

firmware/application/apps/acars_app.cpp

@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2018 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 "acars_app.hpp"
+
+#include "baseband_api.hpp"
+#include "portapack_persistent_memory.hpp"
+
+using namespace portapack;
+using namespace acars;
+
+#include "string_format.hpp"
+#include "utility.hpp"
+
+void ACARSLogger::log_raw_data(const acars::Packet& packet, const uint32_t frequency) {
+	std::string entry = "Raw: F:" + to_string_dec_uint(frequency) + "Hz ";
+	
+	// Raw hex dump of all the bytes
+	for (size_t c = 0; c < packet.length(); c += 8)
+		entry += to_string_hex(packet.read(c, 8), 8) + " ";
+	
+	log_file.write_entry(packet.received_at(), entry);
+}
+
+/*void ACARSLogger::log_decoded(
+	const acars::Packet& packet,
+	const std::string text) {
+	
+	log_file.write_entry(packet.timestamp(), text);
+}*/
+
+namespace ui {
+
+void ACARSAppView::update_freq(rf::Frequency f) {
+	set_target_frequency(f);
+	portapack::persistent_memory::set_tuned_frequency(f);	// Maybe not ?
+}
+
+ACARSAppView::ACARSAppView(NavigationView& nav) {
+	baseband::run_image(portapack::spi_flash::image_tag_acars);
+
+	add_children({
+		&rssi,
+		&channel,
+		&field_rf_amp,
+		&field_lna,
+		&field_vga,
+		&field_frequency,
+		&check_log,
+		&console
+	});
+	
+	receiver_model.set_sampling_rate(2457600);
+	receiver_model.set_baseband_bandwidth(1750000);
+	receiver_model.enable();
+	
+	field_frequency.set_value(receiver_model.tuning_frequency());
+	update_freq(receiver_model.tuning_frequency());
+	field_frequency.set_step(receiver_model.frequency_step());
+	field_frequency.on_change = [this](rf::Frequency f) {
+		update_freq(f);
+	};
+	field_frequency.on_edit = [this, &nav]() {
+		// TODO: Provide separate modal method/scheme?
+		auto new_view = nav.push<FrequencyKeypadView>(receiver_model.tuning_frequency());
+		new_view->on_changed = [this](rf::Frequency f) {
+			update_freq(f);
+			field_frequency.set_value(f);
+		};
+	};
+	
+	check_log.set_value(logging);
+	check_log.on_select = [this](Checkbox&, bool v) {
+		logging = v;
+	};
+	
+	logger = std::make_unique<ACARSLogger>();
+	if (logger)
+		logger->append("acars.txt");
+}
+
+ACARSAppView::~ACARSAppView() {
+	receiver_model.disable();
+	baseband::shutdown();
+}
+
+void ACARSAppView::focus() {
+	field_frequency.focus();
+}
+
+// Useless ?
+void ACARSAppView::set_parent_rect(const Rect new_parent_rect) {
+	View::set_parent_rect(new_parent_rect);
+}
+
+void ACARSAppView::on_packet(const acars::Packet& packet) {
+	std::string alphanum_text = "";
+	
+	if (!packet.is_valid())
+		console.writeln("\n\x1B\x0INVALID PACKET");
+	else {
+		std::string console_info;
+		
+		console_info = "\n" + to_string_datetime(packet.received_at(), HM);
+		console_info += " REG:" + packet.registration_number();
+		
+		console.write(console_info);
+	}
+	
+	// Log raw data whatever it contains
+	if (logger && logging)
+		logger->log_raw_data(packet, target_frequency());
+}
+
+void ACARSAppView::set_target_frequency(const uint32_t new_value) {
+	target_frequency_ = new_value;
+	receiver_model.set_tuning_frequency(new_value);
+}
+
+uint32_t ACARSAppView::target_frequency() const {
+	return target_frequency_;
+}
+
+} /* namespace ui */

firmware/application/apps/acars_app.hpp

@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2018 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.
+ */
+
+#ifndef __ACARS_APP_H__
+#define __ACARS_APP_H__
+
+#include "ui_widget.hpp"
+#include "ui_receiver.hpp"
+#include "ui_rssi.hpp"
+
+#include "log_file.hpp"
+
+#include "acars_packet.hpp"
+
+class ACARSLogger {
+public:
+	Optional<File::Error> append(const std::string& filename) {
+		return log_file.append(filename);
+	}
+	
+	void log_raw_data(const acars::Packet& packet, const uint32_t frequency);
+	//void log_decoded(const acars::Packet& packet, const std::string text);
+
+private:
+	LogFile log_file { };
+};
+
+namespace ui {
+
+class ACARSAppView : public View {
+public:
+	ACARSAppView(NavigationView& nav);
+	~ACARSAppView();
+
+	void set_parent_rect(const Rect new_parent_rect) override;
+	void focus() override;
+
+	std::string title() const override { return "ACARS RX"; };
+
+private:
+	bool logging { false };
+
+	RFAmpField field_rf_amp {
+		{ 13 * 8, 0 * 16 }
+	};
+	LNAGainField field_lna {
+		{ 15 * 8, 0 * 16 }
+	};
+	VGAGainField field_vga {
+		{ 18 * 8, 0 * 16 }
+	};
+	RSSI rssi {
+		{ 21 * 8, 0, 6 * 8, 4 },
+	};
+	Channel channel {
+		{ 21 * 8, 5, 6 * 8, 4 },
+	};
+	
+	FrequencyField field_frequency {
+		{ 0 * 8, 0 * 8 },
+	};
+	Checkbox check_log {
+		{ 22 * 8, 21 },
+		3,
+		"LOG",
+		true
+	};
+
+	Console console {
+		{ 0, 4 * 16, 240, 240 }
+	};
+
+	std::unique_ptr<ACARSLogger> logger { };
+
+	uint32_t target_frequency_ { };
+	
+	void update_freq(rf::Frequency f);
+
+	void on_packet(const acars::Packet& packet);
+
+	uint32_t target_frequency() const;
+	void set_target_frequency(const uint32_t new_value);
+	
+	MessageHandlerRegistration message_handler_packet {
+		Message::ID::ACARSPacket,
+		[this](Message* const p) {
+			const auto message = static_cast<const ACARSPacketMessage*>(p);
+			const acars::Packet packet { message->packet };
+			this->on_packet(packet);
+		}
+	};
+
+};
+
+} /* namespace ui */
+
+#endif/*__ACARS_APP_H__*/

firmware/application/apps/pocsag_app.cpp

@@ -25,8 +25,6 @@
 #include "baseband_api.hpp"
 #include "portapack_persistent_memory.hpp"
 
-#include "pocsag.hpp"
-
 using namespace portapack;
 using namespace pocsag;
 

firmware/application/apps/ui_freqman.cpp

@@ -112,7 +112,7 @@ void FreqManBaseView::refresh_list() {
 		
 		for (size_t n = 0; n < database.size(); n++) {
 			menu_view.add_item({
-				freqman_item_string(database[n], 26),
+				freqman_item_string(database[n], 30),
 				ui::Color::white(),
 				nullptr,
 				[this](){
@@ -212,7 +212,7 @@ FrequencyLoadView::FrequencyLoadView(
 	});
 	
 	// Resize menu view to fill screen
-	menu_view.set_parent_rect({ 0, 3 * 8, 240, 29 * 8 });
+	menu_view.set_parent_rect({ 0, 3 * 8, 240, 30 * 8 });
 	
 	// Just to allow exit on left
 	menu_view.on_left = [&nav, this]() {

firmware/application/apps/ui_freqman.hpp

@@ -39,8 +39,6 @@ public:
 
 	void focus() override;
 	
-	std::string title() const override { return "Freq. manager"; };
-	
 protected:
 	using option_t = std::pair<std::string, int32_t>;
 	using options_t = std::vector<option_t>;
@@ -89,6 +87,8 @@ class FrequencySaveView : public FreqManBaseView {
 public:
 	FrequencySaveView(NavigationView& nav, const rf::Frequency value);
 
+	std::string title() const override { return "Save frequency"; };
+	
 private:
 	std::string desc_buffer { };
 	rf::Frequency value_ { };
@@ -126,6 +126,8 @@ public:
 	
 	FrequencyLoadView(NavigationView& nav);
 
+	std::string title() const override { return "Load frequency"; };
+	
 private:
 	void refresh_widgets(const bool v);
 };
@@ -135,6 +137,8 @@ public:
 	FrequencyManagerView(NavigationView& nav);
 	~FrequencyManagerView();
 
+	std::string title() const override { return "Freq. manager"; };
+	
 private:
 	std::string desc_buffer { };