Update ui_about_simple.cpp

Added a couple snap values to the calls app.

README.md

@@ -1,3 +1,5 @@
+> ⚠ **BEFORE BUYING YOURS:** ⚠ Beware of hardware mods that use a custom firmware, which are [NOT COMPATIBLE](https://github.com/eried/portapack-mayhem/issues/264) with older forks, and they do not follow the license. **ASK THE SELLER if the unit works with an specific firmware, for example, pointing to the [![GitHub release (latest by date)](https://img.shields.io/github/v/release/eried/portapack-mayhem?label=latest%20release&style=social)](https://github.com/eried/portapack-mayhem/releases/latest) on this repository**
+
 # PortaPack Mayhem
 
 [![Build Status](https://travis-ci.com/eried/portapack-mayhem.svg?branch=master)](https://travis-ci.com/eried/portapack-mayhem) [![buddy pipeline](https://app.buddy.works/eried/portapack/pipelines/pipeline/252276/badge.svg?token=48cd59d53de0589a8fbe26bc751d77a59a011cf72581da049343879402991c34 "buddy pipeline")](https://app.buddy.works/eried/portapack/pipelines/pipeline/252276) [![CodeScene Code Health](https://codescene.io/projects/8381/status-badges/code-health)](https://codescene.io/projects/8381) [![GitHub All Releases](https://img.shields.io/github/downloads/eried/portapack-mayhem/total)](https://github.com/eried/portapack-mayhem/releases) [![GitHub Releases](https://img.shields.io/github/downloads/eried/portapack-mayhem/latest/total)](https://github.com/eried/portapack-mayhem/releases/latest) [![Docker Hub Pulls](https://img.shields.io/docker/pulls/eried/portapack.svg)](https://hub.docker.com/r/eried/portapack) [![Discord Chat](https://img.shields.io/discord/719669764804444213.svg)](https://discord.gg/tuwVMv3)  [![Check bounties!](https://img.shields.io/bountysource/team/portapack-mayhem/activity?color=%2333ccff&label=bountysource%20%28USD%29&style=plastic)](https://www.bountysource.com/teams/portapack-mayhem/issues)
@@ -39,7 +41,7 @@ This fork (**Mayhem**) uses *major.minor.release* [semantic versioning](https://
 ## What about Havoc/GridRF/jamesshao8/jboone's?
 * jboone's PortaPack: the [vanilla](https://en.wikipedia.org/wiki/Vanilla_software) experience
 * Havoc: It was the most popular fork of jboone's PortaPack, currrently, it is not being maintained nor updated
-* jamesshao8: He keeps his own version of the fork, while not attached as a fork to anything
+* jamesshao8: He keeps his own version of the fork, while not attached as a fork to anything. Latest functions do not follow the license and are not being published with source code, so keep this in mind
 * GridRF: They sell PortaPack clones with their own firmware based on a old version, which has no sourcecode available
 
 ## How can I collaborate

dockerfile

@@ -18,7 +18,7 @@ RUN apt-get update && \
 	apt-get -qy autoremove
 
 #Install current pip from PyPa
-RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
+RUN curl https://bootstrap.pypa.io/pip/3.4/get-pip.py -o get-pip.py && \
 	python get-pip.py
 
 #Fetch additional dependencies from Python 2.x pip

dockerfile-nogit

@@ -15,7 +15,7 @@ RUN apt-get update && \
 	apt-get -qy autoremove
 
 #Install current pip from PyPa
-RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
+RUN curl https://bootstrap.pypa.io/pip/3.4/get-pip.py -o get-pip.py && \
 	python3 get-pip.py
 
 #Fetch additional dependencies from Python 3.x pip
@@ -38,4 +38,4 @@ RUN mkdir ~/bin && cd ~/bin && \
 	for tool in gcc g++ cpp c++;do ln -s $(which ccache) arm-none-eabi-$tool;done
 
 CMD cd .. && cd build && \
-    cmake .. && make firmware
+    cmake .. && make firmware

firmware/application/CMakeLists.txt

@@ -140,6 +140,7 @@ set(CPPSRC
 	${COMMON}/png_writer.cpp
 	${COMMON}/pocsag.cpp
 	${COMMON}/pocsag_packet.cpp
+	${COMMON}/aprs_packet.cpp
 	${COMMON}/portapack_io.cpp
 	${COMMON}/portapack_persistent_memory.cpp
 	${COMMON}/portapack_shared_memory.cpp
@@ -218,6 +219,7 @@ set(CPPSRC
 	apps/ui_adsb_rx.cpp
 	apps/ui_adsb_tx.cpp
 	apps/ui_afsk_rx.cpp
+	apps/ui_aprs_rx.cpp
 	apps/ui_btle_rx.cpp
 	apps/ui_nrf_rx.cpp
 	apps/ui_aprs_tx.cpp
@@ -231,6 +233,7 @@ set(CPPSRC
 	apps/ui_keyfob.cpp
 	apps/ui_lcr.cpp
 	apps/lge_app.cpp
+	apps/ui_looking_glass_app.cpp
 	apps/ui_mictx.cpp
 	apps/ui_modemsetup.cpp
 	apps/ui_morse.cpp

firmware/application/apps/analog_tv_app.cpp

@@ -199,7 +199,7 @@ void AnalogTvView::on_show_options_rf_gain() {
 void AnalogTvView::on_show_options_modulation() {
 	std::unique_ptr<Widget> widget;
 
-	const auto modulation = static_cast<ReceiverModel::Mode>(receiver_model.modulation());
+	static_cast<ReceiverModel::Mode>(receiver_model.modulation());
 	tv.show_audio_spectrum_view(true);
 	
 	set_options_widget(std::move(widget));
@@ -216,6 +216,7 @@ void AnalogTvView::on_reference_ppm_correction_changed(int32_t v) {
 }
 
 void AnalogTvView::on_headphone_volume_changed(int32_t v) {
+	(void)v; //avoid warning
 	//tv::TVView::set_headphone_volume(this,v);
 }
 

firmware/application/apps/analog_tv_app.hpp

@@ -107,7 +107,7 @@ private:
 
 	std::unique_ptr<Widget> options_widget { };
 
-	tv::TVWidget tv { true };
+	tv::TVWidget tv { };
 
 	void on_tuning_frequency_changed(rf::Frequency f);
 	void on_baseband_bandwidth_changed(uint32_t bandwidth_hz);

firmware/application/apps/ert_app.hpp

@@ -50,6 +50,8 @@ struct ERTKey {
 	{
 	}
 
+	ERTKey( const ERTKey& other ) = default;
+
 	ERTKey& operator=(const ERTKey& other) {
 		id = other.id;
 		commodity_type = other.commodity_type;

firmware/application/apps/pocsag_app.hpp

@@ -90,7 +90,8 @@ private:
 		{
 			{ "512bps ", 0 },
 			{ "1200bps", 1 },
-			{ "2400bps", 2 }
+			{ "2400bps", 2 },
+			{ "3200bps", 3 }
 		}
 	};
 	OptionsField options_phase {

firmware/application/apps/soundboard_app.cpp

@@ -110,7 +110,11 @@ void SoundBoardView::start_tx(const uint32_t id) {
 		1536000 / 20,		// Update vu-meter at 20Hz
 		transmitter_model.channel_bandwidth(),
 		0,	// Gain is unused
-		TONES_F2D(tone_key_frequency(tone_key_index), 1536000)
+		TONES_F2D(tone_key_frequency(tone_key_index), 1536000),
+		0, //AM
+		0, //DSB
+		0, //USB
+		0 //LSB
 	);
 	baseband::set_sample_rate(sample_rate);
 	
@@ -130,6 +134,7 @@ void SoundBoardView::start_tx(const uint32_t id) {
 }*/
 
 void SoundBoardView::on_tx_progress(const uint32_t progress) {
+	(void)progress ; // avoid warning
 	//progressbar.set_value(progress);
 }
 

firmware/application/apps/ui_about_simple.cpp

@@ -28,9 +28,11 @@ namespace ui
                 console.writeln("\x1B\x06Mayhem:\x1B\x10");
                 console.writeln("eried,euquiq,gregoryfenton");
                 console.writeln("johnelder,jwetzell,nnemanjan00");
-                console.writeln("N0vaPixel,klockee,jamesshao8");
-                console.writeln("ITAxReal,rascafr,mcules");
-                console.writeln("dqs105,strijar");
+                console.writeln("N0vaPixel,klockee,GullCode");
+                console.writeln("jamesshao8,ITAxReal,rascafr");
+                console.writeln("mcules,dqs105,strijar");
+                console.writeln("zhang00963,RedFox-Fr");
+                console.writeln("East2West,fossum");
                 console.writeln("");
                 break;
 
@@ -74,4 +76,4 @@ namespace ui
         button_ok.focus();
     }
 
-} /* namespace ui */
+} /* namespace ui */

firmware/application/apps/ui_aprs_rx.cpp

@@ -0,0 +1,409 @@
+/*
+ * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2017 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_aprs_rx.hpp"
+
+#include "audio.hpp"
+#include "rtc_time.hpp"
+#include "baseband_api.hpp"
+#include "string_format.hpp"
+#include "portapack_persistent_memory.hpp"
+
+using namespace portapack;
+
+void APRSLogger::log_raw_data(const std::string& data) {
+	rtc::RTC datetime;
+	rtcGetTime(&RTCD1, &datetime);
+	
+	log_file.write_entry(datetime, data);
+}
+
+namespace ui {
+
+template<>
+void RecentEntriesTable<APRSRecentEntries>::draw(
+	const Entry& entry,
+	const Rect& target_rect,
+	Painter& painter,
+	const Style& style
+) {
+	char aged_color;
+	Color target_color;
+	auto entry_age = entry.age;
+	
+	target_color = Color::green();
+
+	aged_color = 0x10;
+	std::string entry_string = "\x1B";
+	entry_string += aged_color;
+	
+	entry_string += entry.source_formatted;
+	entry_string.append(10 - entry.source_formatted.size(),' ');
+	entry_string += "       ";
+	entry_string += (entry.hits <= 999 ? to_string_dec_uint(entry.hits, 4) : "999+");
+	entry_string += " ";
+	entry_string += entry.time_string;
+	
+	painter.draw_string(
+		target_rect.location(),
+		style,
+		entry_string
+	);
+	
+	if (entry.has_position){
+		painter.draw_bitmap(target_rect.location() + Point(12 * 8, 0), bitmap_target, target_color, style.background);
+	}
+}
+
+
+void APRSRxView::focus() {
+	options_region.focus();
+}
+
+void APRSRxView::update_freq(rf::Frequency f) {
+	receiver_model.set_tuning_frequency(f);
+}
+
+APRSRxView::APRSRxView(NavigationView& nav, Rect parent_rect) : View(parent_rect) {
+	baseband::run_image(portapack::spi_flash::image_tag_aprs_rx);
+	
+	add_children({
+		&rssi,
+		&channel,
+		&field_rf_amp,
+		&field_lna,
+		&field_vga,
+		&options_region,
+		&field_frequency,
+		&record_view,
+		&console
+	});
+	
+	// DEBUG
+	record_view.on_error = [&nav](std::string message) {
+		nav.display_modal("Error", message);
+	};
+
+	record_view.set_sampling_rate(24000);
+
+	options_region.on_change = [this](size_t, int32_t i) {		
+		if (i == 0){
+			field_frequency.set_value(144390000);			
+		}
+		if(i == 1){
+			field_frequency.set_value(144800000);
+		}
+		if(i == 2){
+			field_frequency.set_value(145175000);
+		}		
+	};
+	
+	field_frequency.set_value(receiver_model.tuning_frequency());
+	field_frequency.set_step(100);
+	field_frequency.on_change = [this](rf::Frequency f) {
+		update_freq(f);
+	};
+	field_frequency.on_edit = [this, &nav]() {
+		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);
+		};
+	};
+	
+	options_region.set_selected_index(0, true);
+	
+	logger = std::make_unique<APRSLogger>();
+	if (logger)
+		logger->append("APRS_RX_LOG.TXT");
+	
+	baseband::set_aprs(1200);
+	
+	audio::set_rate(audio::Rate::Hz_24000);
+	audio::output::start();
+	
+	receiver_model.set_sampling_rate(3072000);
+	receiver_model.set_baseband_bandwidth(1750000);
+	receiver_model.set_modulation(ReceiverModel::Mode::NarrowbandFMAudio);
+	receiver_model.enable();
+}
+
+void APRSRxView::on_packet(const APRSPacketMessage* message){
+	std::string str_console = "\x1B";
+
+	aprs::APRSPacket packet = message->packet;
+
+	std::string stream_text = packet.get_stream_text();
+	str_console += (char)((console_color++ & 3) + 9);		
+	str_console += stream_text;
+
+	if(logger){
+		logger->log_raw_data(stream_text);
+	}
+	
+	//if(reset_console){ //having more than one console causes issues when switching tabs where one is disabled, and the other enabled breaking the scoll setup.
+	//	console.on_hide();
+	//	console.on_show();
+	//	reset_console = false;
+	//}
+
+	console.writeln(str_console);
+}
+
+void APRSRxView::on_data(uint32_t value, bool is_data) {
+	std::string str_console = "\x1B";
+	std::string str_byte = "";
+	
+	if (is_data) {
+		// Colorize differently after message splits
+		str_console += (char)((console_color & 3) + 9);		
+
+		if (value == '\n') {
+			// Message split
+			console.writeln("");
+			console_color++;
+			
+			if (logger) {
+				logger->log_raw_data(str_log);
+				str_log = "";
+			}
+		}
+		else {
+			if ((value >= 32) && (value < 127)) {
+				str_console += (char)value;							// Printable
+				str_byte += (char)value;
+			} else {
+				str_console += "[" + to_string_hex(value, 2) + "]";	// Not printable
+				str_byte += "[" + to_string_hex(value, 2) + "]";
+			}
+
+			console.write(str_console);
+		
+			if (logger) str_log += str_byte;
+		}
+	} else {
+
+	}
+}
+
+void APRSRxView::on_show(){
+	//some bug where the display scroll area is set to the entire screen when switching from the list tab with details showing back to the stream view.
+	//reset_console = true;	
+}
+
+APRSRxView::~APRSRxView() {
+	audio::output::stop();
+	receiver_model.disable();
+	baseband::shutdown();
+}
+
+void APRSTableView::on_show_list() {
+	details_view.hidden(true);
+	recent_entries_view.hidden(false);	
+	send_updates = false;
+	focus();
+}
+
+void APRSTableView::on_show_detail(const APRSRecentEntry& entry) {
+	recent_entries_view.hidden(true);
+	details_view.hidden(false);
+	details_view.set_entry(entry);
+	details_view.update();
+	details_view.focus();
+	detailed_entry_key = entry.key();
+	send_updates = true;
+}
+
+APRSTableView::APRSTableView(NavigationView& nav, Rect parent_rec) : View(parent_rec),  nav_ {nav}  {
+	add_children({		
+		&recent_entries_view,
+		&details_view
+	});
+
+	hidden(true);
+
+	details_view.hidden(true);
+	
+	recent_entries_view.set_parent_rect({0, 0, 240, 280});
+	details_view.set_parent_rect({0, 0, 240, 280});
+	
+	recent_entries_view.on_select = [this](const APRSRecentEntry& entry) {
+		this->on_show_detail(entry);
+	};
+
+	details_view.on_close = [this]() {
+		this->on_show_list();
+	};
+
+
+/*	for(size_t i = 0; i <32 ; i++){
+		std::string id = "test" + i;
+		auto& entry = ::on_packet(recent, i);			
+		entry.set_source_formatted(id);	
+	}
+
+	recent_entries_view.set_dirty(); 	*/
+
+	/*
+
+	std::string str1 = "test1";
+	std::string str12 = "test2";
+	std::string str13 = "test2";
+
+	auto& entry = ::on_packet(recent, 0x1);			
+	entry.set_source_formatted(str1);	
+
+	auto& entry2 = ::on_packet(recent, 0x2);			
+	entry2.set_source_formatted(str12);	
+
+	auto& entry3 = ::on_packet(recent, 0x2);			
+	entry2.set_source_formatted(str13);	
+
+	recent_entries_view.set_dirty(); 	
+
+	*/
+}
+
+void APRSTableView::on_pkt(const APRSPacketMessage* message){
+	aprs::APRSPacket packet = message->packet;
+	rtc::RTC datetime;	
+	std::string str_timestamp;
+	std::string source_formatted = packet.get_source_formatted();
+	std::string info_string = packet.get_stream_text();
+
+	rtcGetTime(&RTCD1, &datetime);
+	auto& entry = ::on_packet(recent, packet.get_source());		
+	entry.reset_age();
+	entry.inc_hit();
+	str_timestamp = to_string_datetime(datetime, HMS);
+	entry.set_time_string(str_timestamp);
+	entry.set_info_string(info_string);
+
+	entry.set_source_formatted(source_formatted);
+
+	if(entry.has_position && !packet.has_position()){ 
+		//maintain position info
+	}
+	else {
+		entry.set_has_position(packet.has_position());
+		entry.set_pos(packet.get_position());
+	}	
+
+	if( entry.key() == details_view.entry().key() ) {
+		details_view.set_entry(entry);
+		details_view.update();		
+	}
+
+	recent_entries_view.set_dirty(); 			
+}
+
+void APRSTableView::on_show(){
+	on_show_list();
+}
+
+void APRSTableView::on_hide(){
+	details_view.hidden(true);
+}
+
+void APRSTableView::focus(){
+	recent_entries_view.focus();
+}
+
+APRSTableView::~APRSTableView(){
+
+}
+
+void APRSDetailsView::focus() {
+	button_done.focus();
+}
+
+void APRSDetailsView::set_entry(const APRSRecentEntry& entry){
+	entry_copy = entry;
+}
+
+void APRSDetailsView::update() {	
+	if(!hidden()){		
+		uint32_t age = entry_copy.age;
+		
+		console.clear(true);
+		console.write(entry_copy.info_string);
+
+		button_see_map.hidden(!entry_copy.has_position);
+	}	
+	
+	if (send_updates)
+		geomap_view->update_position(entry_copy.pos.latitude, entry_copy.pos.longitude, 0);
+}
+
+APRSDetailsView::~APRSDetailsView() {
+}
+
+APRSDetailsView::APRSDetailsView(
+	NavigationView& nav	
+) 
+{	
+	add_children({
+		&console,
+		&button_done,
+		&button_see_map
+	});
+
+	button_done.on_select = [this, &nav](Button&) {
+		console.clear(true);
+		this->on_close();
+	};
+
+	button_see_map.on_select = [this, &nav](Button&) {
+		geomap_view = nav.push<GeoMapView>(
+			entry_copy.source_formatted,			
+			0, //entry_copy.pos.altitude,
+			GeoPos::alt_unit::FEET,
+			entry_copy.pos.latitude,
+			entry_copy.pos.longitude,			
+			0, /*entry_copy.velo.heading,*/
+			[this]() {
+				send_updates = false;
+				hidden(false);
+				update();
+			});		
+		send_updates = true;
+		hidden(true);
+		
+	};
+};
+
+APRSRXView::APRSRXView(NavigationView& nav) : nav_ {nav} {
+	add_children({
+		&tab_view,
+		&view_stream,
+		&view_table
+	});
+}
+
+void APRSRXView::focus(){
+	tab_view.focus();
+}
+
+APRSRXView::~APRSRXView() {
+	
+}
+} /* namespace ui */

firmware/application/apps/ui_aprs_rx.hpp

@@ -0,0 +1,276 @@
+/*
+ * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2017 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 __UI_APRS_RX_H__
+#define __UI_APRS_RX_H__
+
+#include "ui.hpp"
+#include "ui_navigation.hpp"
+#include "ui_receiver.hpp"
+#include "ui_record_view.hpp"	// DEBUG
+#include "ui_geomap.hpp"
+
+#include "recent_entries.hpp"
+#include "ui_tabview.hpp"
+
+#include "log_file.hpp"
+#include "utility.hpp"
+
+class APRSLogger {
+public:
+	Optional<File::Error> append(const std::string& filename) {
+		return log_file.append(filename);
+	}
+	
+	void log_raw_data(const std::string& data);
+
+private:
+	LogFile log_file { };
+};
+
+namespace ui {
+
+struct APRSRecentEntry {
+	using Key = uint64_t;
+	
+	static constexpr Key invalid_key = 0xffffffffffffffff;
+	
+	uint16_t hits { 0 };
+	uint32_t age { 0 };	
+	
+	uint64_t source;
+	std::string source_formatted { "        " };
+	std::string time_string { "" };
+	std::string info_string { "" };
+	
+	aprs::aprs_pos pos;
+	bool has_position = false;
+	APRSRecentEntry(uint64_t src)
+	{
+		source = src;
+	}
+
+	Key key() const {
+		return source;
+	}
+	
+	void set_source_formatted(std::string& new_source) {
+		source_formatted = new_source;
+	}
+	
+	void inc_hit() {
+		hits++;
+	}
+	
+	void set_info_string(std::string& new_info_string) {
+		info_string = new_info_string;
+	}
+	
+	void set_time_string(std::string& new_time_string) {
+		time_string = new_time_string;
+	}
+
+	void set_pos(aprs::aprs_pos pos_in){
+		pos = pos_in;
+	}
+	
+	void set_has_position(bool has_pos){
+		has_position = has_pos;
+	}
+
+	void reset_age() {
+		age = 0;
+	}
+	
+	void inc_age() {
+		age++;
+	}
+};
+
+class APRSDetailsView : public View {
+public:
+	APRSDetailsView(NavigationView&);
+	~APRSDetailsView();
+
+	APRSDetailsView(const APRSDetailsView&) = delete;
+	APRSDetailsView(APRSDetailsView&&) = delete;
+	APRSDetailsView& operator=(const APRSDetailsView&) = delete;
+	APRSDetailsView& operator=(APRSDetailsView&&) = delete;
+	
+	void focus() override;
+	
+	void update();			
+	void set_entry(const APRSRecentEntry& entry);
+
+	const APRSRecentEntry& entry() const { return entry_copy; };
+
+	std::string title() const override { return "Details"; };
+	std::function<void(void)> on_close { };
+	
+private:
+	APRSRecentEntry entry_copy { 0 };	
+	GeoMapView* geomap_view { nullptr };
+	bool send_updates { false };
+	
+	Console console {
+		{ 0, 0 * 16, 240, 224 }		
+	};
+
+	Button button_done {
+		{ 160, 14 * 16, 8 * 8, 3 * 16 },
+		"Close"
+	};
+	
+	Button button_see_map {
+		{ 80, 14 * 16, 8 * 8, 3 * 16 },
+		"Map"
+	};
+};
+
+using APRSRecentEntries = RecentEntries<APRSRecentEntry>;
+
+class APRSTableView: public View {
+public:
+	APRSTableView(NavigationView& nav, Rect parent_rec);
+	~APRSTableView();
+
+	void on_show() override;
+	void on_hide() override;
+	void focus() override;
+	void on_pkt(const APRSPacketMessage* message);
+
+	std::string title() const override { return "Stations"; };
+private:
+	NavigationView& nav_;
+	const RecentEntriesColumns columns { {
+		{ "Source", 9 },
+		{ "Loc", 6 },
+		{ "Hits", 4 },
+		{ "Time", 8 }
+	} };
+	APRSRecentEntries recent { };
+	RecentEntriesView<RecentEntries<APRSRecentEntry>> recent_entries_view { columns, recent };
+	APRSDetailsView details_view { nav_ };
+	uint32_t detailed_entry_key { 0 };
+	bool send_updates { false };
+
+	void on_show_list();
+	void on_show_detail(const APRSRecentEntry& entry);
+};
+
+class APRSRxView : public View {
+public:
+	APRSRxView(NavigationView& nav, Rect parent_rect);
+	~APRSRxView();
+
+	void on_show() override;
+	void focus() override;
+
+	std::string title() const override { return "APRS RX"; };
+	void on_packet(const APRSPacketMessage* message);
+	
+private:
+	void on_data(uint32_t value, bool is_data);
+	bool reset_console = false;
+	
+	uint8_t console_color { 0 };
+	std::string str_log { "" };
+
+	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 },
+	};
+
+	OptionsField options_region {
+		{ 0 * 8, 0 * 8 },
+		3,
+		{
+			{ "NA ", 0 },
+			{ "EUR", 1 },
+			{ "AUS", 2 }
+		}
+	};
+	
+	FrequencyField field_frequency {
+		{ 3 * 8, 0 * 16 },
+	};
+	
+	// DEBUG
+	RecordView record_view {
+		{ 0 * 8, 1 * 16, 30 * 8, 1 * 16 },
+		u"AFS_????", RecordView::FileType::WAV, 4096, 4
+	};
+	
+	Console console {
+		{ 0, 2 * 16, 240, 240 }
+	};
+
+	void update_freq(rf::Frequency f);
+	
+	std::unique_ptr<APRSLogger> logger { };
+};
+
+class APRSRXView : public View {
+public:
+	APRSRXView(NavigationView& nav);
+	~APRSRXView();
+
+	void focus() override;
+	
+	std::string title() const override { return "APRS RX"; };
+
+private:
+	NavigationView& nav_;
+	Rect view_rect = { 0, 3 * 8, 240, 280 };
+	
+	APRSRxView view_stream { nav_, view_rect };
+	APRSTableView view_table { nav_, view_rect };
+	
+	TabView tab_view {
+		{ "Stream", Color::cyan(), &view_stream },
+		{ "List", Color::yellow(), &view_table }
+	};
+
+	MessageHandlerRegistration message_handler_packet {
+		Message::ID::APRSPacket,
+		[this](Message* const p) {
+			const auto message = static_cast<const APRSPacketMessage*>(p);
+			this->view_stream.on_packet(message);
+			this->view_table.on_pkt(message);
+		}
+	};
+};
+
+} /* namespace ui */
+
+#endif/*__UI_APRS_RX_H__*/

firmware/application/apps/ui_aprs_tx.hpp

@@ -82,6 +82,7 @@ private:
 		6,
 		SymField::SYMFIELD_ALPHANUM
 	};
+	
 	NumberField num_ssid_dest {
 		{ 19 * 8, 2 * 16 },
 		2,

firmware/application/apps/ui_debug.cpp

@@ -121,7 +121,8 @@ void TemperatureWidget::paint(Painter& painter) {
 }
 
 TemperatureWidget::temperature_t TemperatureWidget::temperature(const sample_t sensor_value) const {
-	return -35 + sensor_value * 4;  //max2837 datasheet temp 25ºC has sensor value: 15
+	/*It seems to be a temperature difference of 25C*/
+	return -40 +(sensor_value * 4.31)+25;  //max2837 datasheet temp 25ºC has sensor value: 15
 }
 
 std::string TemperatureWidget::temperature_str(const temperature_t temperature) const {

firmware/application/apps/ui_fileman.cpp

@@ -216,6 +216,7 @@ FileSaveView::FileSaveView(
 }*/
 
 void FileLoadView::refresh_widgets(const bool v) {
+	(void)v; //avoid unused warning
 	set_dirty();
 }
 

firmware/application/apps/ui_jammer.cpp

@@ -274,6 +274,7 @@ void JammerView::start_tx() {
 		transmitter_model.enable();
 
 		baseband::set_jammer(true, (JammerType)options_type.selected_index(), options_speed.selected_index_value());
+		mscounter = 0; //euquiq: Reset internal ms counter for do_timer()
 	} else {
 		if (out_of_ranges)
 			nav_.display_modal("Error", "Jamming bandwidth too large.\nMust be less than 24MHz.");
@@ -289,6 +290,59 @@ void JammerView::stop_tx() {
 	radio::disable();
 	baseband::set_jammer(false, JammerType::TYPE_FSK, 0);
 	jamming = false;
+	cooling = false;
+}
+
+//called each 1/60th of second
+void JammerView::on_timer() {
+	if (++mscounter == 60) {
+		mscounter = 0;
+		if (jamming) 
+		{
+			if (cooling) 
+			{
+				if (++seconds >= field_timepause.value()) 
+				{	//Re-start TX
+					transmitter_model.enable();
+					button_transmit.set_text("STOP");
+					baseband::set_jammer(true, (JammerType)options_type.selected_index(), options_speed.selected_index_value());
+					
+					int32_t jitter_amount = field_jitter.value();
+					if (jitter_amount) 
+					{
+						lfsr_v = lfsr_iterate(lfsr_v);
+						jitter_amount = (jitter_amount / 2) - (lfsr_v & jitter_amount);
+						mscounter += jitter_amount;
+					}
+
+					cooling = false;
+					seconds = 0;
+				}
+			} 
+			else 
+			{
+				if (++seconds >= field_timetx.value()) //Start cooling period:
+				{
+					transmitter_model.disable();
+					button_transmit.set_text("PAUSED");
+					baseband::set_jammer(false, JammerType::TYPE_FSK, 0);
+					
+					int32_t jitter_amount = field_jitter.value();
+					if (jitter_amount) 
+					{
+						lfsr_v = lfsr_iterate(lfsr_v);
+						jitter_amount = (jitter_amount / 2) - (lfsr_v & jitter_amount);
+						mscounter += jitter_amount;
+					}
+
+					cooling = true;
+					seconds = 0;
+				}
+			}
+
+		}
+
+	}
 }
 	
 JammerView::JammerView(
@@ -309,6 +363,9 @@ JammerView::JammerView(
 		&text_range_total,
 		&options_speed,
 		&options_hop,
+		&field_timetx,
+		&field_timepause,
+		&field_jitter,
 		&button_transmit
 	});
 	
@@ -321,8 +378,11 @@ JammerView::JammerView(
 	options_hop.set_selected_index(1);		// 50ms
 	button_transmit.set_style(&style_val);
 
+	field_timetx.set_value(30);
+	field_timepause.set_value(1);
+
 	button_transmit.on_select = [this](Button&) {
-		if (jamming)
+		if (jamming || cooling)
 			stop_tx();
 		else
 			start_tx();

firmware/application/apps/ui_jammer.hpp

@@ -28,6 +28,7 @@
 #include "transmitter_model.hpp"
 #include "message.hpp"
 #include "jammer.hpp"
+#include "lfsr_random.hpp"
 
 using namespace jammer;
 
@@ -57,78 +58,11 @@ private:
 		.foreground = Color::grey(),
 	};
 	
-	/*static constexpr jammer_range_t range_presets[] = {
-		// GSM900 Orange
-		{ true, 935000000, 945000000 },		// BW:10M
-		// GSM1800 Orange
-		{ true, 1808000000, 1832000000 },	// BW:24M
-		
-		// GSM900 SFR
-		{ true, 950000000, 960000000 },		// BW:10M
-		// GSM1800 SFR
-		{ true, 1832000000, 1853000000 },	// BW:21M
-		
-		// GSM900 Bouygues
-		{ true, 925000000, 935000000 },		// BW:10M
-		// GSM1800 Bouygues
-		{ true, 1858000000, 1880000000 },	// BW:22M
-		
-		// GSM900 Free
-		{ true, 945000000, 950000000 },		// BW:5M
-		
-		// GSM-R
-		{ true, 921000000, 925000000 },		// BW:4M
-		
-		// DECT
-		{ true, 1880000000, 1900000000 },	// BW: 20MHz
-		
-		// PMV AFSK
-		{ true, 162930000, 162970000 },		// BW: 40kHz
-		
-		// ISM 433
-		{ true, 433050000, 434790000 },		// Center: 433.92MHz BW: 0.2%
-		
-		// ISM 868
-		{ true, 868000000, 868200000 },		// Center: 868.2MHz BW: 40kHz
-		
-		// GPS L1
-		{ true, 1575420000 - 500000, 1575420000 + 500000 },		// BW: 1MHz
-		// GPS L2
-		{ true, 1227600000 - 1000000, 1227600000 + 1000000 },	// BW: 2MHz
-		
-		// WLAN 2.4G CH1
-		{ true, 2412000000 - 11000000, 2412000000 + 11000000},	// BW: 22MHz
-		// WLAN 2.4G CH2
-		{ true, 2417000000 - 11000000, 2417000000 + 11000000},	// BW: 22MHz
-		// WLAN 2.4G CH3
-		{ true, 2422000000 - 11000000, 2422000000 + 11000000},	// BW: 22MHz
-		// WLAN 2.4G CH4
-		{ true, 2427000000 - 11000000, 2427000000 + 11000000},	// BW: 22MHz
-		// WLAN 2.4G CH5
-		{ true, 2432000000 - 11000000, 2432000000 + 11000000},	// BW: 22MHz
-		// WLAN 2.4G CH6
-		{ true, 2437000000 - 11000000, 2437000000 + 11000000},	// BW: 22MHz
-		// WLAN 2.4G CH7
-		{ true, 2442000000 - 11000000, 2442000000 + 11000000},	// BW: 22MHz
-		// WLAN 2.4G CH8
-		{ true, 2447000000 - 11000000, 2447000000 + 11000000},	// BW: 22MHz
-		// WLAN 2.4G CH9
-		{ true, 2452000000 - 11000000, 2452000000 + 11000000},	// BW: 22MHz
-		// WLAN 2.4G CH10
-		{ true, 2457000000 - 11000000, 2457000000 + 11000000},	// BW: 22MHz
-		// WLAN 2.4G CH11
-		{ true, 2462000000 - 11000000, 2462000000 + 11000000},	// BW: 22MHz
-		// WLAN 2.4G CH12
-		{ true, 2467000000 - 11000000, 2467000000 + 11000000},	// BW: 22MHz
-		// WLAN 2.4G CH13
-		{ true, 2472000000 - 11000000, 2472000000 + 11000000},	// BW: 22MHz
-	};*/
-	
 	Labels labels {
-		{ { 2 * 8, 9 * 8 + 4 }, "Start", Color::light_grey() },
-		{ { 23 * 8, 9 * 8 + 4 }, "Stop", Color::light_grey() },
-		{ { 12 * 8, 6 * 8 }, "Center", Color::light_grey() },
-		{ { 12 * 8 + 4, 14 * 8 }, "Width", Color::light_grey() }
+		{ { 2 * 8, 8 * 8 + 4 }, "Start", Color::light_grey() },
+		{ { 23 * 8, 8 * 8 + 4 }, "Stop", Color::light_grey() },
+		{ { 12 * 8, 5 * 8 - 4}, "Center", Color::light_grey() },
+		{ { 12 * 8 + 4, 13 * 8 }, "Width", Color::light_grey() }
 	};
 	
 	Checkbox check_enabled {
@@ -143,19 +77,19 @@ private:
 	};
 	
 	Button button_start {
-		{ 0 * 8, 6 * 16, 11 * 8, 28 },
+		{ 0 * 8, 11 * 8, 11 * 8, 28 },
 		""
 	};
 	Button button_stop {
-		{ 19 * 8, 6 * 16, 11 * 8, 28 },
+		{ 19 * 8, 11 * 8, 11 * 8, 28 },
 		""
 	};
 	Button button_center {
-		{ 76, 4 * 16, 11 * 8, 28 },
+		{ 76, 4 * 15 - 4, 11 * 8, 28 },
 		""
 	};
 	Button button_width {
-		{ 76, 8 * 16, 11 * 8, 28 },
+		{ 76, 8 * 15, 11 * 8, 28 },
 		""
 	};
 };
@@ -178,12 +112,17 @@ private:
 	NavigationView& nav_;
 	
 	void start_tx();
+	void on_timer();
 	void stop_tx();
 	void set_jammer_channel(uint32_t i, uint32_t width, uint64_t center, uint32_t duration);
 	void on_retune(const rf::Frequency freq, const uint32_t range);
 	
 	JammerChannel * jammer_channels = (JammerChannel*)shared_memory.bb_data.data;
 	bool jamming { false };
+	bool cooling { false };		//euquiq: Indicates jammer in cooldown
+	uint16_t seconds = 0;		//euquiq: seconds counter for toggling tx / cooldown
+	int16_t mscounter = 0;		//euquiq: Internal ms counter for do_timer()
+	lfsr_word_t lfsr_v = 1;		//euquiq: Used to generate "random" Jitter
 	
 	static constexpr Style style_val {
 		.font = font::fixed_8x16,
@@ -209,13 +148,19 @@ private:
 	};
 	
 	Labels labels {
-		{ { 3 * 8, 12 * 16 }, "Type:", Color::light_grey() },
-		{ { 2 * 8, 13 * 16 }, "Speed:", Color::light_grey() },
-		{ { 5 * 8, 14 * 16 }, "Hop:", Color::light_grey() }
+		{ { 2 * 8, 23 * 8 }, "Type:", Color::light_grey() },
+		{ { 1 * 8, 25 * 8 }, "Speed:", Color::light_grey() },
+		{ { 3 * 8, 27 * 8 }, "Hop:", Color::light_grey() },
+		{ { 4 * 8, 29 * 8 }, "TX:", Color::light_grey() },
+		{ { 1 * 8, 31 * 8 }, "Sle3p:", Color::light_grey() }, 	//euquiq: Token of appreciation to TheSle3p, which made this ehnancement a reality with his bounty.
+		{ { 0 * 8, 33 * 8 }, "Jitter:", Color::light_grey() },	//Maybe the repository curator can keep the "mystype" for some versions. 
+		{ { 11 * 8, 29 * 8 }, "Secs.", Color::light_grey() }, 
+		{ { 11 * 8, 31 * 8 }, "Secs.", Color::light_grey() },
+		{ { 11 * 8, 33 * 8 }, "/60", Color::light_grey() }
 	};
 	
 	OptionsField options_type {
-		{ 9 * 8, 12 * 16 },
+		{ 7 * 8, 23 * 8 },
 		8,
 		{
 			{ "Rand FSK", 0 },
@@ -226,16 +171,16 @@ private:
 	};
 	
 	Text text_range_number {
-		{ 22 * 8, 12 * 16, 2 * 8, 16 },
+		{ 16 * 8, 23 * 8, 2 * 8, 16 },
 		"--"
 	};
 	Text text_range_total {
-		{ 24 * 8, 12 * 16, 3 * 8, 16 },
+		{ 18 * 8, 23 * 8, 3 * 8, 16 },
 		"/--"
 	};
 	
 	OptionsField options_speed {
-		{ 9 * 8, 13 * 16 },
+		{ 7 * 8, 25 * 8 },
 		6,
 		{
 			{ "10Hz  ", 10 },
@@ -247,7 +192,7 @@ private:
 	};
 	
 	OptionsField options_hop {
-		{ 9 * 8, 14 * 16 },
+		{ 7 * 8, 27 * 8 },
 		5,
 		{
 			{ "10ms ", 1 },
@@ -259,9 +204,33 @@ private:
 			{ "10s  ", 1000 }
 		}
 	};
+
+	NumberField field_timetx {
+		{ 7 * 8, 29 * 8 },
+		3,
+		{ 1, 180 },
+		1,
+		' ',
+	};
+
+	NumberField field_timepause {
+		{ 8 * 8, 31 * 8 },
+		2,
+		{ 1, 60 },
+		1,
+		' ',
+	};
 	
+	NumberField field_jitter {
+		{ 8 * 8, 33 * 8 },
+		2,
+		{ 1, 60 },
+		1,
+		' ',
+	};
+
 	Button button_transmit {
-		{ 9 * 8, 16 * 16, 96, 48 },
+		{ 148, 212, 80, 80},
 		"START"
 	};
 	
@@ -272,6 +241,14 @@ private:
 			this->on_retune(message->freq, message->range);
 		}
 	};
+
+		MessageHandlerRegistration message_handler_frame_sync {
+		Message::ID::DisplayFrameSync,
+		[this](const Message* const) {
+			this->on_timer();
+		}
+	};
 };
 
 } /* namespace ui */
+

firmware/application/apps/ui_looking_glass_app.cpp

@@ -0,0 +1,336 @@
+/*
+ * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2020 euquiq
+ *
+ * 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_looking_glass_app.hpp"
+
+
+using namespace portapack;
+
+namespace ui
+{
+
+void GlassView::focus() {
+	field_marker.focus();
+}
+
+GlassView::~GlassView() {
+    receiver_model.set_sampling_rate(3072000); // Just a hack to avoid hanging other apps
+	receiver_model.disable();
+	baseband::shutdown();
+}
+
+void GlassView::on_lna_changed(int32_t v_db) {
+	receiver_model.set_lna(v_db);
+}
+
+void GlassView::on_vga_changed(int32_t v_db) {
+	receiver_model.set_vga(v_db);
+}
+
+void GlassView::add_spectrum_pixel(Color color)
+{
+    spectrum_row[pixel_index++] = color;
+    if (pixel_index == 240) //got an entire waterfall line
+    { 
+        const auto draw_y = display.scroll(1); //Scroll 1 pixel down
+        display.draw_pixels( {{0, draw_y}, {240, 1}}, spectrum_row); //new line at top
+        pixel_index = 0; //Start New cascade line
+    }
+}
+
+//Apparently, the spectrum object returns an array of 256 bins
+//Each having the radio signal power for it's corresponding frequency slot
+void GlassView::on_channel_spectrum(const ChannelSpectrum &spectrum)
+{
+    baseband::spectrum_streaming_stop();
+
+    // Convert bins of this spectrum slice into a representative max_power and when enough, into pixels
+    // Spectrum.db has 256 bins. Center 12 bins are ignored (DC spike is blanked) Leftmost and rightmost 2 bins are ignored
+    // All things said and done, we actually need 240 of those bins:
+    for(uint8_t bin = 0; bin < 240; bin++) 
+    {
+        if (bin < 120) {
+            if (spectrum.db[134 + bin] > max_power)
+                max_power = spectrum.db[134 + bin];
+        }         
+        else
+        {
+            if (spectrum.db[bin - 118] > max_power)
+                    max_power = spectrum.db[bin - 118];  
+        }
+
+        bins_Hz_size += each_bin_size;   //add this bin Hz count into the "pixel fulfilled bag of Hz"
+
+        if (bins_Hz_size >= marker_pixel_step) //new pixel fullfilled
+        {
+            if (min_color_power < max_power)
+                add_spectrum_pixel(spectrum_rgb3_lut[max_power]); //Pixel will represent max_power
+            else
+                add_spectrum_pixel(0);  //Filtered out, show black
+
+            max_power = 0;
+
+            if (!pixel_index) //Received indication that a waterfall line has been completed
+            {
+                bins_Hz_size = 0;  //Since this is an entire pixel line, we don't carry "Pixels into next bin"
+                break;
+            } else {
+                bins_Hz_size -= marker_pixel_step; //reset bins size, but carrying the eventual excess Hz into next pixel
+            }
+        }
+    }
+
+    if (pixel_index) 
+        f_center += LOOKING_GLASS_SLICE_WIDTH; //Move into the next bandwidth slice NOTE: spectrum.sampling_rate = LOOKING_GLASS_SLICE_WIDTH
+    else
+        f_center = f_center_ini; //Start a new sweep
+
+    receiver_model.set_tuning_frequency(f_center); //tune rx for this slice
+    baseband::spectrum_streaming_start();          //Do the RX
+}
+
+void GlassView::on_hide()
+{
+    baseband::spectrum_streaming_stop();
+    display.scroll_disable();
+}
+
+void GlassView::on_show()
+{
+    display.scroll_set_area( 109, 319); //Restart scroll on the correct coordinates
+    baseband::spectrum_streaming_start();
+}
+
+void GlassView::on_range_changed()
+{
+    f_min = field_frequency_min.value();
+    f_max = field_frequency_max.value();
+    search_span = f_max - f_min;
+
+    field_marker.set_range(f_min, f_max);              //Move the marker between range
+    field_marker.set_value(f_min + (search_span / 2)); //Put MARKER AT MIDDLE RANGE
+    text_range.set(to_string_dec_uint(search_span));
+
+    f_min = (f_min)*MHZ_DIV; //Transpose into full frequency realm
+    f_max = (f_max)*MHZ_DIV;
+    search_span = search_span * MHZ_DIV;
+
+    marker_pixel_step = search_span / 240;                                        //Each pixel value in Hz
+    text_marker_pm.set(to_string_dec_uint((marker_pixel_step / X2_MHZ_DIV) + 1)); // Give idea of +/- marker precision
+
+    int32_t marker_step = marker_pixel_step / MHZ_DIV;
+    if (!marker_step) 
+        field_marker.set_step(1); //in case selected range is less than 240 (pixels)
+    else
+        field_marker.set_step(marker_step); //step needs to be a pixel wide.
+
+    f_center_ini = f_min + (LOOKING_GLASS_SLICE_WIDTH / 2);    //Initial center frequency for sweep
+    f_center_ini += LOOKING_GLASS_SLICE_WIDTH;                 //euquiq: Why do I need to move the center ???!!! (shift needed for marker accuracy)
+
+    PlotMarker(field_marker.value()); //Refresh marker on screen
+
+    f_center = f_center_ini;                        //Reset sweep into first slice
+    pixel_index = 0;                                //reset pixel counter
+    max_power = 0;
+    bins_Hz_size = 0;                               //reset amount of Hz filled up by pixels
+    
+    baseband::set_spectrum(LOOKING_GLASS_SLICE_WIDTH, field_trigger.value());   
+    receiver_model.set_tuning_frequency(f_center_ini); //tune rx for this slice
+}
+
+void GlassView::PlotMarker(rf::Frequency fpos)
+{
+    int64_t pos = fpos * MHZ_DIV;
+    pos -= f_min;
+    pos = pos / marker_pixel_step; //Real pixel 
+
+    portapack::display.fill_rectangle({0, 100, 240, 8}, Color::black()); //Clear old marker and whole marker rectangle btw
+    portapack::display.fill_rectangle({(int16_t)pos - 2, 100, 5, 3}, Color::red()); //Red marker middle
+    portapack::display.fill_rectangle({(int16_t)pos - 1, 103, 3, 3}, Color::red()); //Red marker middle
+    portapack::display.fill_rectangle({(int16_t)pos, 106, 1, 2}, Color::red()); //Red marker middle
+}
+
+GlassView::GlassView(
+    NavigationView &nav) : nav_(nav)
+{
+    baseband::run_image(portapack::spi_flash::image_tag_wideband_spectrum);
+
+    add_children({&labels,
+                  &field_frequency_min,
+                  &field_frequency_max,
+                  &field_lna,
+                  &field_vga,
+                  &text_range,
+                  &filter_config,
+                  &field_rf_amp,
+                  &range_presets,
+                  &field_marker,
+                  &text_marker_pm,
+                  &field_trigger
+                });
+
+    load_Presets(); //Load available presets from TXT files (or default)
+    
+    field_frequency_min.set_value(presets_db[0].min);   //Defaults to first preset
+    field_frequency_min.on_change = [this](int32_t v) {
+        if (v >= field_frequency_max.value())
+            field_frequency_max.set_value(v + 240);
+        this->on_range_changed();
+    };
+
+    field_frequency_max.set_value(presets_db[0].max);   //Defaults to first preset
+    field_frequency_max.on_change = [this](int32_t v) {
+        if (v <= field_frequency_min.value())
+            field_frequency_min.set_value(v - 240);
+        this->on_range_changed();
+    };
+
+    field_lna.set_value(receiver_model.lna());
+    field_lna.on_change = [this](int32_t v) {
+        this->on_lna_changed(v);
+    };
+
+    field_vga.set_value(receiver_model.vga());
+    field_vga.on_change = [this](int32_t v_db) {
+        this->on_vga_changed(v_db);
+    };
+
+    filter_config.set_selected_index(0);
+	filter_config.on_change = [this](size_t n, OptionsField::value_t v) {
+		(void)n;
+		min_color_power = v;
+	};
+
+	range_presets.on_change = [this](size_t n, OptionsField::value_t v) {
+		(void)n;
+		field_frequency_min.set_value(presets_db[v].min,false);
+        field_frequency_max.set_value(presets_db[v].max,false);
+        this->on_range_changed();
+	};
+
+    field_marker.on_change = [this](int32_t v) {
+        PlotMarker(v); //Refresh marker on screen
+    };
+
+    field_marker.on_select = [this](NumberField&) {
+        f_center = field_marker.value();
+        f_center = f_center * MHZ_DIV;
+        receiver_model.set_tuning_frequency(f_center); //Center tune rx in marker freq.
+        receiver_model.set_frequency_step(MHZ_DIV); // Preset a 1 MHz frequency step into RX -> AUDIO
+        nav_.pop();
+		nav_.push<AnalogAudioView>(); //Jump into audio view
+    };
+
+    field_trigger.set_value(32);   //Defaults to 32, as normal triggering resolution
+    field_trigger.on_change = [this](int32_t v) {
+        baseband::set_spectrum(LOOKING_GLASS_SLICE_WIDTH, v);
+    };
+
+    display.scroll_set_area( 109, 319);
+    baseband::set_spectrum(LOOKING_GLASS_SLICE_WIDTH, field_trigger.value());	//trigger:
+    // Discord User jteich:  WidebandSpectrum::on_message to set the trigger value. In WidebandSpectrum::execute ,
+    // it keeps adding the output of the fft to the buffer until "trigger" number of calls are made, 
+    //at which time it pushes the buffer up with channel_spectrum.feed
+
+    on_range_changed();
+
+    receiver_model.set_modulation(ReceiverModel::Mode::SpectrumAnalysis);
+	receiver_model.set_sampling_rate(LOOKING_GLASS_SLICE_WIDTH); //20mhz
+    receiver_model.set_baseband_bandwidth(LOOKING_GLASS_SLICE_WIDTH); // possible values: 1.75/2.5/3.5/5/5.5/6/7/8/9/10/12/14/15/20/24/28MHz
+    receiver_model.set_squelch_level(0);
+	receiver_model.enable();
+}
+
+void GlassView::load_Presets() {
+	File presets_file; 		//LOAD /WHIPCALC/ANTENNAS.TXT from microSD
+	auto result = presets_file.open("LOOKINGGLASS/PRESETS.TXT");
+	presets_db.clear();			//Start with fresh db
+	if (result.is_valid()) {
+		presets_Default(); 		//There is no txt, store a default range
+	} else {
+
+		std::string line;		//There is a txt file
+		char one_char[1];		//Read it char by char
+		for (size_t pointer=0; pointer < presets_file.size();pointer++) {
+			presets_file.seek(pointer);
+			presets_file.read(one_char, 1);
+			if ((int)one_char[0] > 31) {			//ascii space upwards
+				line += one_char[0];				//Add it to the textline
+			}
+			else if (one_char[0] == '\n') {			//New Line
+				txtline_process(line);				//make sense of this textline
+				line.clear();						//Ready for next textline
+			} 
+		}
+		if (line.length() > 0) txtline_process(line);	//Last line had no newline at end ?
+		if (!presets_db.size()) presets_Default();		//no antenna on txt, use default
+    }
+
+    populate_Presets();
+}
+
+void GlassView::txtline_process(std::string& line) 
+{
+	if (line.find("#") != std::string::npos) return;	//Line is just a comment
+
+	size_t comma = line.find(",");          //Get first comma position
+    if (comma == std::string::npos) return; //No comma at all
+
+	size_t previous = 0;
+	preset_entry new_preset;
+
+    new_preset.min = std::stoi(line.substr(0,comma));
+    if (!new_preset.min) return;    //No frequency!
+    
+    previous = comma + 1;
+    comma = line.find(",",previous);		//Search for next delimiter
+    if (comma == std::string::npos) return; //No comma at all
+
+    new_preset.max = std::stoi(line.substr(previous,comma - previous));
+    if (!new_preset.max) return;    //No frequency!
+
+    new_preset.label = line.substr(comma + 1);
+    if (new_preset.label.size() == 0) return; //No label ?
+    
+    presets_db.push_back(new_preset);   //Add this preset.
+}
+
+void GlassView::populate_Presets() 
+{
+    using option_t = std::pair<std::string, int32_t>;
+	using options_t = std::vector<option_t>;
+    options_t entries;
+
+	for (preset_entry preset : presets_db) 
+        {	//go thru all available presets
+            entries.emplace_back(preset.label,entries.size());
+        }
+    range_presets.set_options(entries);
+}
+
+void GlassView::presets_Default() 
+{
+        presets_db.clear();
+        presets_db.push_back({2320, 2560, "DEFAULT WIFI 2.4GHz"});
+}
+
+}

firmware/application/apps/ui_looking_glass_app.hpp

@@ -0,0 +1,187 @@
+/*
+  * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
+  * Copyright (C) 2020 euquiq
+  *
+  * 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.hpp"
+ #include "portapack.hpp"
+ #include "baseband_api.hpp"
+ #include "receiver_model.hpp"
+ #include "ui_widget.hpp"
+ #include "ui_navigation.hpp"
+ #include "ui_receiver.hpp"
+ #include "string_format.hpp"
+ #include "analog_audio_app.hpp"
+ #include "spectrum_color_lut.hpp"
+
+ namespace ui
+ {
+     #define LOOKING_GLASS_SLICE_WIDTH	20000000 // Each slice bandwidth 20 MHz
+     #define MHZ_DIV	            1000000
+     #define X2_MHZ_DIV	        2000000
+
+     class GlassView : public View
+     {
+     public:
+         GlassView(NavigationView &nav);
+
+	 GlassView( const GlassView &);
+	 GlassView& operator=(const GlassView &nav);
+
+         ~GlassView();
+         std::string title() const override { return "Looking Glass"; };
+
+ 	    void on_show() override;
+ 	    void on_hide() override;
+         void focus() override;
+
+     private:
+     	NavigationView& nav_;
+
+        struct preset_entry
+        {
+            rf::Frequency min{};
+            rf::Frequency max{};
+            std::string label{};
+        };
+
+        std::vector<preset_entry> presets_db{};
+
+         void on_channel_spectrum(const ChannelSpectrum& spectrum);
+         void do_timers();
+         void on_range_changed();
+         void on_lna_changed(int32_t v_db);
+ 	    void on_vga_changed(int32_t v_db);
+         void add_spectrum_pixel(Color color);
+        void PlotMarker(rf::Frequency pos);
+        void load_Presets();
+        void txtline_process(std::string& line);
+        void populate_Presets();
+        void presets_Default();
+
+         rf::Frequency f_min { 0 }, f_max { 0 };
+         rf::Frequency search_span { 0 };
+         rf::Frequency f_center { 0 };
+         rf::Frequency f_center_ini { 0 };
+         rf::Frequency marker_pixel_step { 0 };
+         rf::Frequency each_bin_size { LOOKING_GLASS_SLICE_WIDTH  / 240 };
+         rf::Frequency bins_Hz_size { 0 };
+         uint8_t min_color_power { 0 };
+         uint32_t pixel_index { 0 };
+         std::array<Color, 240> spectrum_row = { 0 };
+         ChannelSpectrumFIFO* fifo { nullptr }; 
+         uint8_t max_power = 0;
+
+        Labels labels{
+            {{0, 0}, "MIN:     MAX:     LNA   VGA  ", Color::light_grey()},
+            {{0, 1 * 16}, " RANGE:     FILTER:      AMP:", Color::light_grey()},
+            {{0, 2 * 16}, "PRESET:", Color::light_grey()},
+            {{0, 3 * 16}, "MARKER:     MHz +/-    MHz", Color::light_grey()},
+             {{0, 4 * 16}, "RESOLUTION:    (fft trigger)", Color::light_grey()}
+        };
+
+         NumberField field_frequency_min {
+             { 4 * 8, 0 * 16 },
+             4,
+             { 0, 6960 },
+             240,
+             ' '
+         };
+
+         NumberField field_frequency_max {
+             { 13 * 8, 0 * 16 },
+             4,
+             { 240, 7200 },
+             240,
+             ' '
+         };
+
+         LNAGainField field_lna {
+             { 21 * 8, 0 * 16 }
+         };
+
+         VGAGainField field_vga {
+             { 27 * 8, 0 * 16 }
+         };
+
+         Text text_range{
+            {7 * 8, 1 * 16, 4 * 8, 16},
+            ""};
+
+        OptionsField filter_config{
+            {19 * 8, 1 * 16},
+            4,
+            {
+                {"OFF ", 0},
+                {"MID ", 118}, //85 +25 (110) + a bit more to kill all blue
+                {"HIGH", 202}, //168 + 25 (193)
+            }};
+
+        RFAmpField field_rf_amp{
+            {29 * 8, 1 * 16}};
+
+        OptionsField range_presets{
+            {7 * 8, 2 * 16},
+            20,
+            {
+                {" NONE (WIFI 2.4GHz)", 0},
+            }};
+
+        NumberField field_marker{
+            {7 * 8, 3 * 16},
+            4,
+            {0, 7200},
+            25,
+            ' '};
+
+        Text text_marker_pm{
+            {20 * 8, 3 * 16, 2 * 8, 16},
+            ""};
+
+        NumberField field_trigger{
+             {11 * 8, 4 * 16},
+             3,
+             {2, 128},
+             2,
+             ' '};
+
+
+     MessageHandlerRegistration message_handler_spectrum_config {
+ 		Message::ID::ChannelSpectrumConfig,
+ 		[this](const Message* const p) {
+ 			const auto message = *reinterpret_cast<const ChannelSpectrumConfigMessage*>(p);
+ 			this->fifo = message.fifo;
+ 		}
+ 	};
+ 	MessageHandlerRegistration message_handler_frame_sync {
+ 		Message::ID::DisplayFrameSync,
+ 		[this](const Message* const) {
+ 			if( this->fifo ) {
+ 				ChannelSpectrum channel_spectrum;
+ 				while( fifo->out(channel_spectrum) ) {
+ 					this->on_channel_spectrum(channel_spectrum);
+ 				}
+ 			}
+ 		}
+ 	};
+
+     };
+ } 
+ 

firmware/application/apps/ui_mictx.cpp

@@ -65,8 +65,13 @@ void MicTXView::configure_baseband() {
 		sampling_rate / 20,		// Update vu-meter at 20Hz
 		transmitting ? transmitter_model.channel_bandwidth() : 0,
 		mic_gain,
-		TONES_F2D(tone_key_frequency(tone_key_index), sampling_rate)
+		TONES_F2D(tone_key_frequency(tone_key_index), sampling_rate),
+		enable_am,
+		enable_dsb,
+		enable_usb,
+		enable_lsb
 	);
+
 }
 
 void MicTXView::set_tx(bool enable) {
@@ -143,8 +148,20 @@ void MicTXView::rxaudio(bool is_on) {
 	if (is_on) {
 		audio::input::stop();
 		baseband::shutdown();
-		baseband::run_image(portapack::spi_flash::image_tag_nfm_audio);
-		receiver_model.set_modulation(ReceiverModel::Mode::NarrowbandFMAudio);
+		
+		if (enable_am || enable_usb || enable_lsb || enable_dsb) {
+			baseband::run_image(portapack::spi_flash::image_tag_am_audio);
+			receiver_model.set_modulation(ReceiverModel::Mode::AMAudio);	
+			if (options_mode.selected_index() < 4)
+				receiver_model.set_am_configuration(options_mode.selected_index() - 1);
+			else
+				receiver_model.set_am_configuration(0);
+		}
+		else {
+			baseband::run_image(portapack::spi_flash::image_tag_nfm_audio);
+			receiver_model.set_modulation(ReceiverModel::Mode::NarrowbandFMAudio);
+			
+		}
 		receiver_model.set_sampling_rate(3072000);
 		receiver_model.set_baseband_bandwidth(1750000);	
 //		receiver_model.set_tuning_frequency(field_frequency.value()); //probably this too can be commented out.
@@ -155,15 +172,15 @@ void MicTXView::rxaudio(bool is_on) {
 		receiver_model.enable();
 		audio::output::start();
 	} else {	//These incredibly convoluted steps are required for the vumeter to reappear when stopping RX.
+		receiver_model.set_modulation(ReceiverModel::Mode::NarrowbandFMAudio); //This fixes something with AM RX...
 		receiver_model.disable();
 		baseband::shutdown();
+
 		baseband::run_image(portapack::spi_flash::image_tag_mic_tx);
-		audio::input::start();
-//		transmitter_model.enable();		
+		audio::output::stop();
+		audio::input::start();	
 		portapack::pin_i2s0_rx_sda.mode(3);
-//		transmitting = false;
 		configure_baseband();
-//		transmitter_model.disable();
 	}
 }
 
@@ -198,11 +215,13 @@ MicTXView::MicTXView(
 		&field_bw,
 		&field_rfgain,
 		&field_rfamp,
+		&options_mode,
 		&field_frequency,
 		&options_tone_key,
 		&check_rogerbeep,
 		&check_rxactive,
 		&field_volume,
+		&field_rxbw,
 		&field_squelch,
 		&field_rxfrequency,
 		&field_rxlna,
@@ -262,6 +281,42 @@ MicTXView::MicTXView(
 	};
 	field_rfamp.set_value(rf_amp ? 14 : 0);
 	
+	options_mode.on_change = [this](size_t, int32_t v) {
+		enable_am = false;
+		enable_usb = false;
+		enable_lsb = false;
+		enable_dsb = false;
+		switch(v) {
+			case 0:
+				enable_am = false;
+				enable_usb = false;
+				enable_lsb = false;
+				enable_dsb = false;
+				field_bw.set_value(transmitter_model.channel_bandwidth() / 1000);
+				//if (rx_enabled)
+				rxaudio(rx_enabled); //Update now if we have RX audio on
+				break;
+			case 1:
+				enable_am = true;
+				rxaudio(rx_enabled); //Update now if we have RX audio on
+				break;
+			case 2:
+				enable_usb = true;
+				rxaudio(rx_enabled); //Update now if we have RX audio on
+				break;
+			case 3:
+				enable_lsb = true;
+				rxaudio(rx_enabled); //Update now if we have RX audio on
+				break;
+			case 4:
+				enable_dsb = true;
+				rxaudio(rx_enabled); //Update now if we have RX audio on
+				break;
+		}
+		//configure_baseband();
+	};
+	
+	
 	/*
 	check_va.on_select = [this](Checkbox&, bool v) {
 		va_enabled = v;
@@ -331,6 +386,21 @@ MicTXView::MicTXView(
 	field_volume.set_value((receiver_model.headphone_volume() - audio::headphone::volume_range().max).decibel() + 99);
 	field_volume.on_change = [this](int32_t v) { this->on_headphone_volume_changed(v);	};
 
+	field_rxbw.on_change = [this](size_t, int32_t v) {
+		switch(v) {
+			case 0:
+				receiver_model.set_nbfm_configuration(0);
+				break;
+			case 1:
+				receiver_model.set_nbfm_configuration(1);
+				break;
+			case 2:
+				receiver_model.set_nbfm_configuration(2);
+				break;
+		}
+	};
+	field_rxbw.set_selected_index(2);
+
 	field_squelch.on_change = [this](int32_t v) { 
 		receiver_model.set_squelch_level(100 - v);	
 	};

firmware/application/apps/ui_mictx.hpp

@@ -99,19 +99,27 @@ private:
 	int32_t focused_ui { 2 };
 	bool button_touch { false };
 
+	//AM TX Stuff
+	bool enable_am { false };
+	bool enable_dsb { false };
+	bool enable_usb { false };
+	bool enable_lsb { false };
+
 	
 	Labels labels {
 		{ { 3 * 8, 1 * 8 }, "MIC. GAIN:", Color::light_grey() },
 		{ { 3 * 8, 3 * 8 }, "F:", Color::light_grey() },
-		{ { 15 * 8, 3 * 8 }, "BW:   kHz", Color::light_grey() },
+		{ { 15 * 8, 3 * 8 }, "BW:   FM kHz", Color::light_grey() },
 		{ { 3 * 8, 5 * 8 }, "GAIN:", Color::light_grey() },
 		{ {11 * 8, 5 * 8 }, "Amp:", Color::light_grey() },
+		{ { 18 * 8, (5 * 8) }, "Mode:", Color::light_grey() },
 		{ { 3 * 8, 8 * 8 }, "TX Activation:", Color::light_grey() },
 		{ { 4 * 8, 10 * 8 }, "LVL:", Color::light_grey() },
 		{ {12 * 8, 10 * 8 }, "ATT:", Color::light_grey() },
 		{ {20 * 8, 10 * 8 }, "DEC:", Color::light_grey() },
 		{ { 4 * 8, ( 13 * 8 ) - 2 }, "TONE KEY:", Color::light_grey() },
 		{ { 9 * 8, 23 * 8 }, "VOL:", Color::light_grey() },
+		{ {17 * 8, 23 * 8 }, "FM RXBW:", Color::light_grey() },
 		{ {17 * 8, 25 * 8 }, "SQ:", Color::light_grey() },
 		{ { 5 * 8, 25 * 8 }, "F:", Color::light_grey() },
 		{ { 5 * 8, 27 * 8 }, "LNA:", Color::light_grey()},
@@ -162,6 +170,18 @@ private:
 		14,
 		' '
 	};
+	
+	OptionsField options_mode {
+		{ 24 * 8, 5 * 8 },
+		3,
+		{
+			{ "FM", 0 },
+			{ "AM", 1 },
+			{ "USB", 2 },
+			{ "LSB", 3 },
+			{ "DSB", 4 }
+		}
+	};
 	/*
 	Checkbox check_va {
 		{ 3 * 8, (10 * 8) - 4 },
@@ -231,6 +251,16 @@ private:
 		' ',
 	};
 	
+	OptionsField field_rxbw {
+	       { 25 * 8, 23 * 8},
+	       3,
+	       {
+	       		{"8k5", 0},
+	       		{"11k", 1},
+	       		{"16k", 2}
+	       	}
+	};
+	
 	NumberField field_squelch {
 		{ 20 * 8, 25 * 8 },
 		2,

firmware/application/apps/ui_morse.cpp

@@ -226,6 +226,7 @@ MorseView::MorseView(
 	};
 
 	options_loop.on_change = [this](size_t i, uint32_t n) {
+		(void)i; //avoid unused warning
 		loop = n;
 	};
 	

firmware/application/apps/ui_scanner.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "ui_scanner.hpp"
+#include "ui_fileman.hpp"
 
 using namespace portapack;
 
@@ -171,7 +172,7 @@ void ScannerView::show_max() {		//show total number of freqs to scan
 
 ScannerView::ScannerView(
 	NavigationView& nav
-	) : nav_ { nav }
+	) : nav_ { nav } , loaded_file_name { "SCANNER" }
 {
 	add_children({
 		&labels,
@@ -182,6 +183,7 @@ ScannerView::ScannerView(
 		&field_bw,
 		&field_squelch,
 		&field_wait,
+		&button_load,
 		&rssi,
 		&text_cycle,
 		&text_max,
@@ -211,6 +213,25 @@ ScannerView::ScannerView(
 	frequency_range.max = stored_freq + 1000000;
 	button_manual_end.set_text(to_string_short_freq(frequency_range.max));
 
+	button_load.on_select = [this, &nav](Button&) {
+		// load txt files from the FREQMAN folder
+		auto open_view = nav.push<FileLoadView>(".TXT");
+		open_view->on_changed = [this](std::filesystem::path new_file_path) {
+
+			std::string dir_filter = "FREQMAN/";
+			std::string str_file_path = new_file_path.string();
+
+			if (str_file_path.find(dir_filter) != string::npos) { // assert file from the FREQMAN folder
+				scan_pause();
+				// get the filename without txt extension so we can use load_freqman_file fcn
+				std::string str_file_name = new_file_path.stem().string();
+				frequency_file_load(str_file_name, true);
+			} else {
+				nav_.display_modal("LOAD ERROR", "A valid file from\nFREQMAN directory is\nrequired.");
+			}
+		};
+	};
+
 	button_manual_start.on_select = [this, &nav](Button& button) {
 		auto new_view = nav_.push<FrequencyKeypadView>(frequency_range.min);
 		new_view->on_changed = [this, &button](rf::Frequency f) {
@@ -314,7 +335,8 @@ ScannerView::ScannerView(
 
 	button_add.on_select = [this](Button&) {  //frequency_list[current_index]
 		File scanner_file;
-		auto result = scanner_file.open("FREQMAN/SCANNER.TXT");	//First search if freq is already in txt
+		std::string freq_file_path = "FREQMAN/" + loaded_file_name + ".TXT";
+		auto result = scanner_file.open(freq_file_path);	//First search if freq is already in txt
 		if (!result.is_valid()) {
 			std::string frequency_to_add = "f=" 
 				+ to_string_dec_uint(frequency_list[current_index] / 1000) 
@@ -342,12 +364,12 @@ ScannerView::ScannerView(
 				big_display.set(frequency_list[current_index]);		//After showing an error
 			}
 			else {
-				auto result = scanner_file.append("FREQMAN/SCANNER.TXT"); //Second: append if it is not there
+				scanner_file.append(freq_file_path); //Second: append if it is not there
 				scanner_file.write_line(frequency_to_add + ",d=ADD FQ");
 			}
 		} else
 		{
-			nav_.display_modal("Error", "Cannot open SCANNER.TXT\nfor appending freq.");
+			nav_.display_modal("Error", "Cannot open " + loaded_file_name + ".TXT\nfor appending freq.");
 			big_display.set(frequency_list[current_index]);		//After showing an error
 		}
 	};
@@ -357,22 +379,42 @@ ScannerView::ScannerView(
 	field_squelch.on_change = [this](int32_t v) {	squelch = v;	}; 	field_squelch.set_value(-10);
 	field_volume.set_value((receiver_model.headphone_volume() - audio::headphone::volume_range().max).decibel() + 99);
 	field_volume.on_change = [this](int32_t v) { this->on_headphone_volume_changed(v);	};
+
 	// LEARN FREQUENCIES
 	std::string scanner_txt = "SCANNER";
-	if ( load_freqman_file(scanner_txt, database)  ) {
+	frequency_file_load(scanner_txt);
+}
+
+void ScannerView::frequency_file_load(std::string file_name, bool stop_all_before) {
+
+	// stop everything running now if required
+	if (stop_all_before) {
+		scan_thread->stop();
+		frequency_list.clear(); // clear the existing frequency list (expected behavior)
+		description_list.clear();
+		def_step = step_mode.selected_index_value();		//Use def_step from manual selector
+	}
+
+	if ( load_freqman_file(file_name, database)  ) {
+		loaded_file_name = file_name; // keep loaded filename in memory
 		for(auto& entry : database) {									// READ LINE PER LINE
 			if (frequency_list.size() < MAX_DB_ENTRY) {					//We got space!
 				if (entry.type == RANGE)  {								//RANGE	
 					switch (entry.step) {
-					case AM_US:	def_step = 10000;  	break ;
-					case AM_EUR:def_step = 9000;  	break ;
-					case NFM_1: def_step = 12500;  	break ;
-					case NFM_2: def_step = 6250;	break ;	
-					case FM_1:	def_step = 100000; 	break ;
-					case FM_2:	def_step = 50000; 	break ;
-					case N_1:	def_step = 25000;  	break ;
-					case N_2:	def_step = 250000; 	break ;
-					case AIRBAND:def_step= 8330;  	break ;
+						case AM_US:	def_step = 10000;  	break ;
+						case AM_EUR:def_step = 9000;  	break ;
+						case NFM_1: def_step = 12500;  	break ;
+						case NFM_2: def_step = 6250;	break ;	
+						case FM_1:	def_step = 100000; 	break ;
+						case FM_2:	def_step = 50000; 	break ;
+						case N_1:	def_step = 25000;  	break ;
+						case N_2:	def_step = 250000; 	break ;
+						case AIRBAND:   def_step= 8330;  	break ;
+						case ERROR_STEP:
+						case STEP_DEF:
+						default:
+							def_step = step_mode.selected_index_value(); //Use def_step from manual selector
+								 			break ;		
 					}
 					frequency_list.push_back(entry.frequency_a);		//Store starting freq and description
 					description_list.push_back("R" + to_string_short_freq(entry.frequency_a)
@@ -398,7 +440,8 @@ ScannerView::ScannerView(
 	} 
 	else 
 	{
-		desc_cycle.set(" NO SCANNER.TXT FILE ..." );
+		loaded_file_name = "SCANNER"; // back to the default frequency file
+		desc_cycle.set(" NO " + file_name + ".TXT FILE ..." );
 	}
 	audio::output::stop();
 	step_mode.set_by_value(def_step); //Impose the default step into the manual step selector
@@ -466,7 +509,9 @@ size_t ScannerView::change_mode(uint8_t new_mod) { //Before this, do a scan_thre
 	using option_t = std::pair<std::string, int32_t>;
 	using options_t = std::vector<option_t>;
 	options_t bw;
-	field_bw.on_change = [this](size_t n, OptionsField::value_t) {	};
+	field_bw.on_change = [this](size_t n, OptionsField::value_t) { 
+		(void)n;  //avoid unused warning 
+	};
 
 	switch (new_mod) {
 	case NFM:	//bw 16k (2) default
@@ -518,4 +563,4 @@ void ScannerView::start_scan_thread() {
 	scan_thread = std::make_unique<ScannerThread>(frequency_list);
 }
 
-} /* namespace ui */
+} /* namespace ui */

firmware/application/apps/ui_scanner.hpp

@@ -126,6 +126,7 @@ private:
 	void scan_pause();
 	void scan_resume();
 	void user_resume();
+	void frequency_file_load(std::string file_name, bool stop_all_before = false);
 
 	void on_statistics_update(const ChannelStatistics& statistics);
 	void on_headphone_volume_changed(int32_t v);
@@ -137,6 +138,7 @@ private:
 	uint32_t wait { 0 };
 	size_t	def_step { 0 };
 	freqman_db database { };
+	std::string loaded_file_name;
 	uint32_t current_index { 0 };
 	bool userpause { false };
 	
@@ -278,6 +280,11 @@ private:
 		"ADD FQ"
 	};
 
+	Button button_load {
+		{ 24 * 8, 3 * 16 - 8, 6 * 8, 22 },
+		"Load"
+	};
+
 	Button button_remove {
 		{ 168, (35 * 8) - 4, 72, 28 },
 		"DEL FQ"

firmware/application/apps/ui_search.hpp

@@ -212,12 +212,14 @@ private:
 		true
 	};
 	OptionsField options_snap {
-		{ 17 * 8, 15 * 8 },
-		7,
-		{
+		{ 17 * 8, 15 * 8 }, // Position
+		7,                  // Length
+		{                   // Options
 			{ "25kHz  ", 25000 },
 			{ "12.5kHz", 12500 },
-			{ "8.33kHz", 8333 }
+			{ "8.33kHz", 8333 },
+			{ "2.5kHz", 2500 },
+			{ "500Hz", 500 }
 		}
 	};
 	

firmware/application/apps/ui_settings.cpp

@@ -144,6 +144,10 @@ SetRadioView::SetRadioView(
 	}
 
 	add_children({
+		&check_clkout,
+		&field_clkout_freq,
+		&labels_clkout_khz,
+		&value_freq_step,
 		&labels_bias,
 		&check_bias,
 		&button_done,
@@ -151,11 +155,44 @@ SetRadioView::SetRadioView(
 	});
 
 	SetFrequencyCorrectionModel model {
-		static_cast<int8_t>(portapack::persistent_memory::correction_ppb() / 1000)
+		static_cast<int8_t>(portapack::persistent_memory::correction_ppb() / 1000) , 0
 	};
 
 	form_init(model);
 
+	check_clkout.set_value(portapack::persistent_memory::clkout_enabled());
+	check_clkout.on_select = [this](Checkbox&, bool v) {
+		clock_manager.enable_clock_output(v);
+		portapack::persistent_memory::set_clkout_enabled(v);
+		StatusRefreshMessage message { };
+		EventDispatcher::send_message(message);
+	};
+
+	field_clkout_freq.set_value(portapack::persistent_memory::clkout_freq());
+	value_freq_step.set_style(&style_text);
+
+	field_clkout_freq.on_select = [this](NumberField&) {
+		freq_step_khz++;
+		if(freq_step_khz > 3) {
+			freq_step_khz = 0;
+		}
+		switch(freq_step_khz) {
+			case 0:
+				value_freq_step.set("   |");
+				break;
+			case 1:
+				value_freq_step.set("  | ");
+				break;
+			case 2:
+				value_freq_step.set(" |  ");
+				break;
+			case 3:
+				value_freq_step.set("|   ");
+				break;
+		}
+		field_clkout_freq.set_step(pow(10, freq_step_khz));
+	};
+
 	check_bias.set_value(portapack::get_antenna_bias());
 	check_bias.on_select = [this](Checkbox&, bool v) {
 		portapack::set_antenna_bias(v);
@@ -166,6 +203,8 @@ SetRadioView::SetRadioView(
 	button_done.on_select = [this, &nav](Button&){
 		const auto model = this->form_collect();
 		portapack::persistent_memory::set_correction_ppb(model.ppm * 1000);
+		portapack::persistent_memory::set_clkout_freq(model.freq);
+		clock_manager.enable_clock_output(portapack::persistent_memory::clkout_enabled());
 		nav.pop();
 	};
 }
@@ -181,6 +220,7 @@ void SetRadioView::form_init(const SetFrequencyCorrectionModel& model) {
 SetFrequencyCorrectionModel SetRadioView::form_collect() {
 	return {
 		.ppm = static_cast<int8_t>(field_ppm.value()),
+		.freq = static_cast<uint32_t>(field_clkout_freq.value()),
 	};
 }
 

firmware/application/apps/ui_settings.hpp

@@ -114,6 +114,7 @@ private:
 
 struct SetFrequencyCorrectionModel {
 	int8_t ppm;
+	uint32_t freq;
 };
 
 class SetRadioView : public View {
@@ -130,6 +131,7 @@ private:
 		.background = Color::black(),
 		.foreground = Color::light_grey(),
 	};
+	uint8_t freq_step_khz = 3;
 
 	Text label_source {
 		{ 0, 1 * 16, 17 * 8, 16 },
@@ -147,8 +149,31 @@ private:
 	};
 
 	Labels labels_correction {
-		{ { 2 * 8, 4 * 16 }, "Frequency correction:", Color::light_grey() },
-		{ { 6 * 8, 5 * 16 }, "PPM", Color::light_grey() },
+		{ { 2 * 8, 3 * 16 }, "Frequency correction:", Color::light_grey() },
+		{ { 6 * 8, 4 * 16 }, "PPM", Color::light_grey() },
+	};
+
+	Checkbox check_clkout {
+		{ 18, (6 * 16 - 4) },
+		13,
+		"Enable CLKOUT"
+	};
+
+	NumberField field_clkout_freq {
+		{ 20 * 8, 6 * 16 },
+		5,
+		{ 10, 60000 },
+		1000,
+		' '
+	};
+
+	Labels labels_clkout_khz {
+		{ { 26 * 8, 6 * 16 }, "kHz", Color::light_grey() }
+	};
+
+	Text value_freq_step {
+		{ 21 * 8, (7 * 16 ), 4 * 8, 16 },
+		"|   "
 	};
 
 	Labels labels_bias {
@@ -159,7 +184,7 @@ private:
 	};
 
 	NumberField field_ppm {
-		{ 2 * 8, 5 * 16 },
+		{ 2 * 8, 4 * 16 },
 		3,
 		{ -50, 50 },
 		1,

firmware/application/apps/ui_sonde.hpp

@@ -68,9 +68,9 @@ private:
 	uint32_t target_frequency_ { 402700000 };
 	bool logging { false };
 	bool use_crc { false };
-	sonde::GPS_data gps_info;
-	sonde::temp_humid temp_humid_info;
-	std::string sonde_id;
+	sonde::GPS_data gps_info { };
+	sonde::temp_humid temp_humid_info { };
+	std::string sonde_id { };
 	
 	Labels labels {
 		{ { 4 * 8, 2 * 16 }, "Type:", Color::light_grey() },

firmware/application/baseband_api.cpp

@@ -130,6 +130,13 @@ void set_afsk(const uint32_t baudrate, const uint32_t word_length, const uint32_
 	send_message(&message);
 }
 
+void set_aprs(const uint32_t baudrate) {
+	const APRSRxConfigureMessage message {
+		baudrate
+	};
+	send_message(&message);
+}
+
 void set_btle(const uint32_t baudrate, const uint32_t word_length, const uint32_t trigger_value, const bool trigger_word) {
 	const BTLERxConfigureMessage message {
 		baudrate,
@@ -176,13 +183,18 @@ void kill_afsk() {
 }
 
 void set_audiotx_config(const uint32_t divider, const float deviation_hz, const float audio_gain,
-					const uint32_t tone_key_delta) {
+					const uint32_t tone_key_delta, const bool am_enabled, const bool dsb_enabled,
+					const bool usb_enabled, const bool lsb_enabled) {
 	const AudioTXConfigMessage message {
 		divider,
 		deviation_hz,
 		audio_gain,
 		tone_key_delta,
-		(float)persistent_memory::tone_mix() / 100.0f
+		(float)persistent_memory::tone_mix() / 100.0f,
+		am_enabled,
+		dsb_enabled,
+		usb_enabled,
+		lsb_enabled
 	};
 	send_message(&message);
 }

firmware/application/baseband_api.hpp

@@ -61,13 +61,15 @@ void set_tones_config(const uint32_t bw, const uint32_t pre_silence, const uint1
 void kill_tone();
 void set_sstv_data(const uint8_t vis_code, const uint32_t pixel_duration);
 void set_audiotx_config(const uint32_t divider, const float deviation_hz, const float audio_gain,
-					const uint32_t tone_key_delta);
+			const uint32_t tone_key_delta, const bool am_enabled, const bool dsb_enabled,
+			const bool usb_enabled, const bool lsb_enabled);
 void set_fifo_data(const int8_t * data);
 void set_pitch_rssi(int32_t avg, bool enabled);
 void set_afsk_data(const uint32_t afsk_samples_per_bit, const uint32_t afsk_phase_inc_mark, const uint32_t afsk_phase_inc_space,
 					const uint8_t afsk_repeat, const uint32_t afsk_bw, const uint8_t symbol_count);
 void kill_afsk();
 void set_afsk(const uint32_t baudrate, const uint32_t word_length, const uint32_t trigger_value, const bool trigger_word);
+void set_aprs(const uint32_t baudrate);
 
 void set_btle(const uint32_t baudrate, const uint32_t word_length, const uint32_t trigger_value, const bool trigger_word);
 

firmware/application/clock_manager.cpp

@@ -21,6 +21,7 @@
 
 #include "clock_manager.hpp"
 
+#include "portapack_persistent_memory.hpp"
 #include "portapack_io.hpp"
 
 #include "hackrf_hal.hpp"
@@ -463,3 +464,21 @@ void ClockManager::stop_audio_pll() {
 	cgu::pll0audio::power_down();
 	while( cgu::pll0audio::is_locked() );
 }
+
+void ClockManager::enable_clock_output(bool enable) {
+	if(enable) {
+		clock_generator.enable_output(clock_generator_output_clkout);
+		if(portapack::persistent_memory::clkout_freq() < 1000) {
+			clock_generator.set_ms_frequency(clock_generator_output_clkout, portapack::persistent_memory::clkout_freq() * 128000, si5351_vco_f, 7);
+		} else {
+			clock_generator.set_ms_frequency(clock_generator_output_clkout, portapack::persistent_memory::clkout_freq() * 1000, si5351_vco_f, 0);
+		}
+	} else {
+		clock_generator.disable_output(clock_generator_output_clkout);
+	}
+
+	if(enable)
+		clock_generator.set_clock_control(clock_generator_output_clkout, si5351_clock_control_common[clock_generator_output_clkout].ms_src(get_reference_clock_generator_pll(reference.source)).clk_pdn(ClockControl::ClockPowerDown::Power_On));
+	else
+		clock_generator.set_clock_control(clock_generator_output_clkout, ClockControl::power_off());
+}

firmware/application/clock_manager.hpp

@@ -79,6 +79,8 @@ public:
 
 	Reference get_reference() const;
 
+	void enable_clock_output(bool enable);
+
 private:
 	I2C& i2c0;
 	si5351::Si5351& clock_generator;

firmware/application/portapack.cpp

@@ -179,20 +179,23 @@ static PortaPackModel portapack_model() {
 	static Optional<PortaPackModel> model;
 
 	if( !model.is_valid() ) {
-		if( audio_codec_wm8731.detected() ) {
-			model = PortaPackModel::R1_20150901;
-		} else {
+		/*For the time being, it is impossible to distinguish the hardware of R1 and R2 from the software level*/
+		/*At this point, I2c is not ready.*/
+		//if( audio_codec_wm8731.detected() ) {
+		//	model = PortaPackModel::R1_20150901;
+		//} else {
 			model = PortaPackModel::R2_20170522;
-		}
+		//}
 	}
 
 	return model.value();
 }
 
 static audio::Codec* portapack_audio_codec() {
-	return (portapack_model() == PortaPackModel::R2_20170522)
-		? static_cast<audio::Codec*>(&audio_codec_ak4951)
-		: static_cast<audio::Codec*>(&audio_codec_wm8731)
+	/* I2C ready OK, Automatic recognition of audio chip */
+	return (audio_codec_wm8731.detected())
+		? static_cast<audio::Codec*>(&audio_codec_wm8731)
+		: static_cast<audio::Codec*>(&audio_codec_ak4951)
 		;
 }
 

firmware/application/protocols/aprs.cpp

@@ -38,9 +38,13 @@ void make_aprs_frame(const char * src_address, const uint32_t src_ssid,
 	char address[14] = { 0 };
 	
 	memcpy(&address[0], dest_address, 6);
-	address[6] = (dest_ssid & 15) << 1;
 	memcpy(&address[7], src_address, 6);
-	address[13] = (src_ssid & 15) << 1;
+	//euquiq: According to ax.25 doc section 2.2.13.x.x and 2.4.1.2
+	// SSID need bits 5.6 set, so later when shifted it will end up being 011xxxx0 (xxxx = SSID number)
+	// Notice that if need to signal usage of AX.25 V2.0, (dest_ssid | 112); (MSb will need to be set at the end)
+	address[6] = (dest_ssid | 48); 
+	address[13] = (src_ssid | 48);
+
 	
 	frame.make_ui_frame(address, 0x03, protocol_id_t::NO_LAYER3, payload);
 }

firmware/application/protocols/ax25.cpp

@@ -51,32 +51,37 @@ void AX25Frame::NRZI_add_bit(const uint32_t bit) {
 	}
 }
 
-void AX25Frame::add_byte(uint8_t byte, bool is_flag, bool is_data) {
-	uint32_t bit;
-	
+void AX25Frame::add_byte(uint8_t byte, bool is_flag, bool is_data)
+{
+	bool bit;
+
 	if (is_data)
 		crc_ccitt.process_byte(byte);
-	
-	for (uint32_t i = 0; i < 8; i++) {
+
+	for (uint32_t i = 0; i < 8; i++)
+	{
 		bit = (byte >> i) & 1;
-		
+
+		NRZI_add_bit(bit);
+
 		if (bit)
+		{
 			ones_counter++;
+			if ((ones_counter == 5) && (!is_flag))
+			{
+				NRZI_add_bit(0);
+				ones_counter = 0;
+			}
+		}
 		else
 			ones_counter = 0;
-		
-		if ((ones_counter == 6) && (!is_flag)) {
-			NRZI_add_bit(0);
-			ones_counter = 0;
-		}
-		
-		NRZI_add_bit(bit);
 	}
 }
 
-void AX25Frame::flush() {
+void AX25Frame::flush()
+{
 	if (bit_counter)
-		*bb_data_ptr = current_byte << (7 - bit_counter);
+		*bb_data_ptr = current_byte << (8 - bit_counter); //euquiq: This was 7 but there are 8 bits
 };
 
 void AX25Frame::add_flag() {

firmware/application/recent_entries.hpp

@@ -179,6 +179,24 @@ public:
 				}
 			}
 		}
+		else if( event == ui::KeyEvent::Up ) {
+			if(selected_key == recent.front().key()){
+				return false;
+			}
+			else {
+				advance(-1);
+				return true;
+			}
+		}
+		else if( event == ui::KeyEvent::Down ) {
+			if( selected_key == recent.back().key()) {
+				return false;
+			}
+			else {
+				advance(1);
+				return true;
+			}
+		}
 		return false;
 	}
 
@@ -264,7 +282,7 @@ public:
 		// TODO: What happens here shouldn't matter if I do proper damage detection!
 	}
 
-	void on_focus() override {
+	void focus() override {
 		_table.focus();
 	}
 

firmware/application/ui/ui_geomap.cpp

@@ -264,8 +264,13 @@ void GeoMapView::focus() {
 void GeoMapView::update_position(float lat, float lon, uint16_t angle) {
 	lat_ = lat;
 	lon_ = lon;
+	
+	// Stupid hack to avoid an event loop
+	geopos.set_report_change(false);
 	geopos.set_lat(lat_);
 	geopos.set_lon(lon_);
+	geopos.set_report_change(true);
+
 	geomap.set_angle(angle);
 	geomap.move(lon_, lat_);
 	geomap.set_dirty();

firmware/application/ui/ui_spectrum.cpp

@@ -94,13 +94,16 @@ void FrequencyScale::set_spectrum_sampling_rate(const int new_sampling_rate) {
 }
 
 void FrequencyScale::set_channel_filter(
-	const int pass_frequency,
-	const int stop_frequency
+	const int low_frequency, 
+	const int high_frequency, 
+	const int transition
 ) {
-	if( (channel_filter_pass_frequency != pass_frequency) ||
-		(channel_filter_stop_frequency != stop_frequency) ) {
-		channel_filter_pass_frequency = pass_frequency;
-		channel_filter_stop_frequency = stop_frequency;
+	if( (channel_filter_low_frequency != low_frequency) ||
+		(channel_filter_high_frequency != high_frequency) ||
+		(channel_filter_transition != transition) ) {
+		channel_filter_low_frequency = low_frequency;
+		channel_filter_high_frequency = high_frequency;
+		channel_filter_transition = transition;
 		set_dirty();
 	}
 }
@@ -184,41 +187,28 @@ void FrequencyScale::draw_frequency_ticks(Painter& painter, const Rect r) {
 }
 
 void FrequencyScale::draw_filter_ranges(Painter& painter, const Rect r) {
-	if( channel_filter_pass_frequency ) {
+	if( channel_filter_low_frequency != channel_filter_high_frequency ) {
 		const auto x_center = r.width() / 2;
 
-		const auto pass_offset = channel_filter_pass_frequency * spectrum_bins / spectrum_sampling_rate;
-		const auto stop_offset = channel_filter_stop_frequency * spectrum_bins / spectrum_sampling_rate;
+		const auto x_low = x_center + channel_filter_low_frequency * spectrum_bins / spectrum_sampling_rate;
+		const auto x_high = x_center + channel_filter_high_frequency * spectrum_bins / spectrum_sampling_rate;
 
-		const auto pass_x_lo = x_center - pass_offset;
-		const auto pass_x_hi = x_center + pass_offset;
+		if( channel_filter_transition ) {
+			const auto trans = channel_filter_transition * spectrum_bins / spectrum_sampling_rate;
 
-		if( channel_filter_stop_frequency ) {
-			const auto stop_x_lo = x_center - stop_offset;
-			const auto stop_x_hi = x_center + stop_offset;
-
-			const Rect r_stop_lo {
-				r.left() + stop_x_lo, r.bottom() - filter_band_height,
-				pass_x_lo - stop_x_lo, filter_band_height
+			const Rect r_all {
+				r.left() + x_low - trans, r.bottom() - filter_band_height,
+				x_high - x_low + trans*2, filter_band_height
 			};
 			painter.fill_rectangle(
-				r_stop_lo,
-				Color::yellow()
-			);
-
-			const Rect r_stop_hi {
-				r.left() + pass_x_hi, r.bottom() - filter_band_height,
-				stop_x_hi - pass_x_hi, filter_band_height
-			};
-			painter.fill_rectangle(
-				r_stop_hi,
+				r_all,
 				Color::yellow()
 			);
 		}
 
 		const Rect r_pass {
-			r.left() + pass_x_lo, r.bottom() - filter_band_height,
-			pass_x_hi - pass_x_lo, filter_band_height
+			r.left() + x_low, r.bottom() - filter_band_height,
+			x_high - x_low, filter_band_height
 		};
 		painter.fill_rectangle(
 			r_pass,
@@ -390,8 +380,9 @@ void WaterfallWidget::on_channel_spectrum(const ChannelSpectrum& spectrum) {
 	sampling_rate = spectrum.sampling_rate;
 	frequency_scale.set_spectrum_sampling_rate(sampling_rate);
 	frequency_scale.set_channel_filter(
-		spectrum.channel_filter_pass_frequency,
-		spectrum.channel_filter_stop_frequency
+		spectrum.channel_filter_low_frequency,
+		spectrum.channel_filter_high_frequency,
+		spectrum.channel_filter_transition
 	);
 }
 

firmware/application/ui/ui_spectrum.hpp

@@ -82,7 +82,7 @@ public:
 	bool on_key(const KeyEvent key) override;
 
 	void set_spectrum_sampling_rate(const int new_sampling_rate);
-	void set_channel_filter(const int pass_frequency, const int stop_frequency);
+	void set_channel_filter(const int low_frequency, const int high_frequency, const int transition);
 
 	void paint(Painter& painter) override;
 
@@ -96,8 +96,9 @@ private:
 	SignalToken signal_token_tick_second { };
 	int spectrum_sampling_rate { 0 };
 	const int spectrum_bins = std::tuple_size<decltype(ChannelSpectrum::db)>::value;
-	int channel_filter_pass_frequency { 0 };
-	int channel_filter_stop_frequency { 0 };
+	int channel_filter_low_frequency { 0 };
+	int channel_filter_high_frequency { 0 };
+	int channel_filter_transition { 0 };
 
 	void clear();
 	void clear_background(Painter& painter, const Rect r);

firmware/application/ui/ui_tv.cpp

@@ -182,7 +182,7 @@ void TVView::clear() {
 
 /* TVWidget *******************************************************/
 
-TVWidget::TVWidget(const bool cursor) {
+TVWidget::TVWidget() {
 	add_children({
 		&tv_view,
 		&field_xcorr

firmware/application/ui/ui_tv.hpp

@@ -92,7 +92,7 @@ class TVWidget : public View {
 public:
 	std::function<void(int32_t offset)> on_select { };
 	
-	TVWidget(const bool cursor = false);
+	TVWidget();
 
 	TVWidget(const TVWidget&) = delete;
 	TVWidget(TVWidget&&) = delete;

firmware/application/ui_navigation.cpp

@@ -34,6 +34,7 @@
 #include "ui_adsb_rx.hpp"
 #include "ui_adsb_tx.hpp"
 #include "ui_afsk_rx.hpp"
+#include "ui_aprs_rx.hpp"
 #include "ui_btle_rx.hpp"
 #include "ui_nrf_rx.hpp"
 #include "ui_aprs_tx.hpp"
@@ -81,7 +82,7 @@
 #include "tpms_app.hpp"
 
 #include "core_control.hpp"
-
+#include "ui_looking_glass_app.hpp"
 #include "file.hpp"
 #include "png_writer.hpp"
 
@@ -113,7 +114,7 @@ SystemStatusView::SystemStatusView(
 		&button_camera,
 		&button_sleep,
 		&button_bias_tee,
-		&image_clock_status,
+		&button_clock_status,
 		&sd_card_status_view,
 	});
 	
@@ -168,6 +169,10 @@ SystemStatusView::SystemStatusView(
 		DisplaySleepMessage message;
 		EventDispatcher::send_message(message);
 	};
+
+	button_clock_status.on_select = [this](ImageButton&) {
+		this->on_clk();
+	};
 }
 
 void SystemStatusView::refresh() {
@@ -188,11 +193,16 @@ void SystemStatusView::refresh() {
 	}
 	
 	if (portapack::clock_manager.get_reference().source == ClockManager::ReferenceSource::External) {
-		image_clock_status.set_bitmap(&bitmap_icon_clk_ext);
-		button_bias_tee.set_foreground(ui::Color::green());
+		button_clock_status.set_bitmap(&bitmap_icon_clk_ext);
+//		button_bias_tee.set_foreground(ui::Color::green());   Typo?
 	} else {
-		image_clock_status.set_bitmap(&bitmap_icon_clk_int);
-		button_bias_tee.set_foreground(ui::Color::light_grey());
+		button_clock_status.set_bitmap(&bitmap_icon_clk_int);
+//		button_bias_tee.set_foreground(ui::Color::green());
+	}
+	if(portapack::persistent_memory::clkout_enabled()) {
+		button_clock_status.set_foreground(ui::Color::green());
+	} else {
+		button_clock_status.set_foreground(ui::Color::light_grey());
 	}
 	
 	set_dirty();
@@ -302,6 +312,18 @@ void SystemStatusView::on_camera() {
 	}
 }
 
+void SystemStatusView::on_clk() {
+	bool v = portapack::persistent_memory::clkout_enabled();
+	if(v) {
+		v = false;
+	} else {
+		v = true;
+	}
+	portapack::clock_manager.enable_clock_output(v);
+	portapack::persistent_memory::set_clkout_enabled(v);
+	refresh();
+}
+
 void SystemStatusView::on_title() {
 	if(nav_.is_top())
 		nav_.push<AboutView>();
@@ -447,7 +469,8 @@ ReceiversMenuView::ReceiversMenuView(NavigationView& nav) {
 		{ "POCSAG", 	ui::Color::green(),		&bitmap_icon_pocsag,	[&nav](){ nav.push<POCSAGAppView>(); } },
 		{ "Radiosnde", 	ui::Color::green(),		&bitmap_icon_sonde,		[&nav](){ nav.push<SondeView>(); } },
 		{ "TPMS Cars", 	ui::Color::green(),		&bitmap_icon_tpms,		[&nav](){ nav.push<TPMSAppView>(); } },
-		/*{ "APRS", 		ui::Color::dark_grey(),	&bitmap_icon_aprs,		[&nav](){ nav.push<NotImplementedView>(); } },
+		{ "APRS", 		ui::Color::green(),		&bitmap_icon_aprs,		[&nav](){ nav.push<APRSRXView>(); } }
+		/*
 		{ "DMR", 		ui::Color::dark_grey(),	&bitmap_icon_dmr,		[&nav](){ nav.push<NotImplementedView>(); } },
 		{ "SIGFOX", 	ui::Color::dark_grey(),	&bitmap_icon_fox,		[&nav](){ nav.push<NotImplementedView>(); } }, // SIGFRXView
 		{ "LoRa", 		ui::Color::dark_grey(),	&bitmap_icon_lora,		[&nav](){ nav.push<NotImplementedView>(); } },
@@ -464,10 +487,10 @@ TransmittersMenuView::TransmittersMenuView(NavigationView& nav) {
 	add_items({
 		//{ "..",				ui::Color::light_grey(),&bitmap_icon_previous,	[&nav](){ nav.pop(); } },
 		{ "ADS-B [S]",		ui::Color::yellow(), 	&bitmap_icon_adsb,		[&nav](){ nav.push<ADSBTxView>(); } },
-		{ "APRS", 			ui::Color::orange(),	&bitmap_icon_aprs,		[&nav](){ nav.push<APRSTXView>(); } },
+		{ "APRS", 			ui::Color::green(),		&bitmap_icon_aprs,		[&nav](){ nav.push<APRSTXView>(); } },
 		{ "BHT Xy/EP", 		ui::Color::green(), 	&bitmap_icon_bht,		[&nav](){ nav.push<BHTView>(); } },
 		{ "GPS Sim",		ui::Color::yellow(),	&bitmap_icon_gps_sim,		[&nav](){ nav.push<GpsSimAppView>(); } },
-		{ "Jammer", 		ui::Color::yellow(),	&bitmap_icon_jammer,	[&nav](){ nav.push<JammerView>(); } },
+		{ "Jammer", 		ui::Color::green(),		&bitmap_icon_jammer,	[&nav](){ nav.push<JammerView>(); } },
 		{ "Key fob", 		ui::Color::orange(),	&bitmap_icon_keyfob,	[&nav](){ nav.push<KeyfobView>(); } },
 		{ "LGE tool", 		ui::Color::yellow(),	&bitmap_icon_lge,		[&nav](){ nav.push<LGEView>(); } },
 		{ "Morse",			ui::Color::green(),		&bitmap_icon_morse,		[&nav](){ nav.push<MorseView>(); } },
@@ -522,8 +545,9 @@ SystemMenuView::SystemMenuView(NavigationView& nav) {
 		{ "Capture",	ui::Color::red(),			&bitmap_icon_capture,	[&nav](){ nav.push<CaptureAppView>(); } },
 		{ "Replay",		ui::Color::green(),			&bitmap_icon_replay,	[&nav](){ nav.push<ReplayAppView>(); } },
 		{ "Calls",		ui::Color::yellow(),	    &bitmap_icon_search,	[&nav](){ nav.push<SearchView>(); } },
-		{ "Scanner",	ui::Color::green(),			&bitmap_icon_scanner,	[&nav](){ nav.push<ScannerView>(); } },
+		{ "Scanner",	ui::Color::yellow(),			&bitmap_icon_scanner,	[&nav](){ nav.push<ScannerView>(); } },
 		{ "Microphone",	ui::Color::yellow(),		&bitmap_icon_microphone,[&nav](){ nav.push<MicTXView>(); } },
+		{ "Looking Glass",	ui::Color::yellow(),		&bitmap_icon_looking,	[&nav](){ nav.push<GlassView>(); } },
 		{ "Tools",		ui::Color::cyan(),			&bitmap_icon_utilities,	[&nav](){ nav.push<UtilitiesMenuView>(); } },
 		{ "Options", 	ui::Color::cyan(),			&bitmap_icon_setup,	  	[&nav](){ nav.push<SettingsMenuView>(); } },
 		{ "Debug",		ui::Color::light_grey(),	&bitmap_icon_debug,		[&nav](){ nav.push<DebugMenuView>(); } },
@@ -603,7 +627,9 @@ SystemView::SystemView(
 		navigation_view.push<SystemMenuView>();
 		
 		if (portapack::persistent_memory::config_splash())
+		{
 			navigation_view.push<BMPView>();
+		}
 			status_view.set_back_enabled(false);
 			status_view.set_title_image_enabled(true);
 			status_view.set_dirty();

firmware/application/ui_navigation.hpp

@@ -180,7 +180,7 @@ private:
 		Color::dark_grey()
 	};
 	
-	Image image_clock_status {
+	ImageButton button_clock_status {
 		{ 27 * 8, 0 * 16,  2 * 8, 1 * 16 },
 		&bitmap_icon_clk_int,
 		Color::light_grey(),
@@ -198,6 +198,7 @@ private:
 	void on_camera();
 	void on_title();
 	void refresh();
+	void on_clk();
 	
 	MessageHandlerRegistration message_handler_refresh {
 		Message::ID::StatusRefresh,
@@ -213,7 +214,7 @@ public:
 	InformationView(NavigationView& nav);
 	
 private:
-	static constexpr auto version_string = "v1.2.2";
+	static constexpr auto version_string = "v1.3.1";
 	NavigationView& nav_;
 
 	Rectangle backdrop {

firmware/baseband/CMakeLists.txt

@@ -113,6 +113,8 @@ set(CPPSRC
 	baseband_stats_collector.cpp
 	dsp_decimate.cpp
 	dsp_demodulate.cpp
+	dsp_hilbert.cpp
+	dsp_modulate.cpp
 	dsp_goertzel.cpp
 	matched_filter.cpp
 	spectrum_collector.cpp
@@ -125,6 +127,7 @@ set(CPPSRC
 	${COMMON}/dsp_fft.cpp
 	${COMMON}/dsp_fir_taps.cpp
 	${COMMON}/dsp_iir.cpp
+	${COMMON}/dsp_sos.cpp
 	fxpt_atan2.cpp
 	rssi.cpp
 	rssi_dma.cpp
@@ -312,6 +315,14 @@ set(MODE_CPPSRC
 	proc_afskrx.cpp
 )
 DeclareTargets(PAFR afskrx)
+
+### APRS RX
+
+set(MODE_CPPSRC
+	proc_aprsrx.cpp
+)
+DeclareTargets(PAPR aprsrx)
+
 ### NRF RX
 
 set(MODE_CPPSRC

firmware/baseband/channel_stats_collector.hpp

@@ -35,7 +35,7 @@ class ChannelStatsCollector {
 public:
 	template<typename Callback>
 	void feed(const buffer_c16_t& src, Callback callback) {
-		auto src_p = src.p;
+		void *src_p = src.p;
 		while(src_p < &src.p[src.count]) {
 			const uint32_t sample = *__SIMD32(src_p)++;
 			const uint32_t mag_sq = __SMUAD(sample, sample);

firmware/baseband/dsp_hilbert.cpp

@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2020 Belousov Oleg
+ *
+ * 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 "dsp_hilbert.hpp"
+#include "dsp_sos_config.hpp"
+
+namespace dsp {
+
+HilbertTransform::HilbertTransform() {
+	n = 0;
+
+	sos_i.configure(half_band_lpf_config);
+	sos_q.configure(half_band_lpf_config);
+}
+
+void HilbertTransform::execute(float in, float &out_i, float &out_q) {
+	float a = 0, b = 0;
+	
+	switch (n) {
+		case 0:		a = in;		b = 0;		break;
+		case 1:		a = 0;		b = -in;	break;
+		case 2:		a = -in;	b = 0;		break;
+		case 3:		a = 0;		b = in;		break;
+	}
+	
+	float i = sos_i.execute(a) * 2.0f;
+	float q = sos_q.execute(b) * 2.0f;
+	
+	switch (n) {
+		case 0:		out_i = i;	out_q = q;	break;
+		case 1:		out_i = -q;	out_q = i;	break;
+		case 2:		out_i = -i;	out_q = -q;	break;
+		case 3:		out_i = q;	out_q = -i;	break;
+	}
+
+	n = (n + 1) % 4;
+}
+
+} /* namespace dsp */

firmware/baseband/dsp_hilbert.hpp

@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2020 Belousov Oleg
+ *
+ * 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 __DSP_HILBERT_H__
+#define __DSP_HILBERT_H__
+
+#include "dsp_sos.hpp"
+#include "dsp_types.hpp"
+
+namespace dsp {
+
+class HilbertTransform {
+public:
+
+	HilbertTransform();
+	void execute(float in, float &out_i, float &out_q);
+
+private:
+	uint8_t			n = 0;
+	SOSFilter<5>	sos_i;
+	SOSFilter<5>	sos_q;
+};
+
+} /* namespace dsp */
+
+#endif/*__DSP_HILBERT_H__*/

firmware/baseband/dsp_modulate.cpp

@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2020 Belousov Oleg
+ *
+ * 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 "dsp_modulate.hpp"
+#include "sine_table_int8.hpp"
+
+namespace dsp {
+namespace modulate {
+
+Modulator::~Modulator() {
+}
+
+Mode Modulator::get_mode() {
+	return mode;
+}
+
+void Modulator::set_mode(Mode new_mode) {
+	mode = new_mode;
+}
+
+void Modulator::set_over(uint32_t new_over) {
+    over = new_over;
+}
+
+///
+
+SSB::SSB() : hilbert() {
+	mode = Mode::LSB;
+}
+
+void SSB::execute(const buffer_s16_t& audio, const buffer_c8_t& buffer) {
+	int32_t		sample = 0;
+	int8_t		re = 0, im = 0;
+	
+	for (size_t counter = 0; counter < buffer.count; counter++) {
+		if (counter % 128 == 0) {
+			float	i = 0.0, q = 0.0;
+
+		    sample = audio.p[counter / over] >> 2;
+			//switch (mode) {
+				//case Mode::LSB:	
+			hilbert.execute(sample / 32768.0f, i, q);
+				//case Mode::USB:	hilbert.execute(sample / 32768.0f, q, i);
+				//default:	break;
+			//}
+
+			i *= 64.0f;
+			q *= 64.0f;
+			switch (mode) {
+				case Mode::LSB:	re = q;	im = i;	break;
+				case Mode::USB:	re = i;	im = q;	break;
+				default:	re = 0; im = 0;	break;
+			}
+			//re = q;
+			//im = i;
+			//break;
+		}
+		
+		buffer.p[counter] = { re, im };
+	}
+}
+
+///
+
+FM::FM() {
+	mode = Mode::FM;
+}
+
+void FM::set_fm_delta(uint32_t new_delta) {
+	fm_delta = new_delta;
+}
+
+void FM::execute(const buffer_s16_t& audio, const buffer_c8_t& buffer) {
+	int32_t		sample = 0;
+	int8_t		re, im;
+
+	for (size_t counter = 0; counter < buffer.count; counter++) {
+		if (counter % over == 0) {
+		    sample = audio.p[counter / over] >> 8;
+		    delta = sample * fm_delta;
+		}
+
+		phase += delta;
+		sphase = phase >> 24;
+
+		re = (sine_table_i8[(sphase + 64) & 255]);
+		im = (sine_table_i8[sphase]);
+		
+		buffer.p[counter] = { re, im };
+	}
+}
+
+AM::AM() {
+	mode = Mode::AM;
+}
+
+void AM::execute(const buffer_s16_t& audio, const buffer_c8_t& buffer) {
+	int32_t         sample = 0;
+	int8_t          re, im;
+	float		q = 0.0;
+	
+	for (size_t counter = 0; counter < buffer.count; counter++) {
+		if (counter % 128 == 0) {
+			sample = audio.p[counter / over] >> 2;
+		}
+
+		q = sample / 32768.0f;
+		q *= 64.0f;
+		switch (mode) {
+			case Mode::AM:	re = q + 20; im = q + 20;
+			case Mode::DSB:	re = q; im = q;
+			default:	break;
+		}
+		buffer.p[counter] = { re, im };
+	}
+}
+
+}
+}

firmware/baseband/dsp_modulate.hpp

@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2020 Belousov Oleg
+ *
+ * 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 __DSP_MODULATE_H__
+#define __DSP_MODULATE_H__
+
+#include "dsp_types.hpp"
+#include "dsp_hilbert.hpp"
+
+namespace dsp {
+namespace modulate {
+
+enum class Mode {
+	None,
+	AM,
+	DSB,
+	LSB,
+	USB,
+	FM
+};
+
+///
+
+class Modulator {
+public:
+	virtual void execute(const buffer_s16_t& audio, const buffer_c8_t& buffer) = 0;
+	virtual ~Modulator();
+
+	Mode get_mode();
+	void set_mode(Mode new_mode);
+
+    void set_over(uint32_t new_over);
+
+protected:
+    uint32_t    over = 1;
+	Mode	    mode = Mode::None;
+};
+
+///
+
+class SSB : public Modulator {
+public:
+	SSB();
+
+	virtual void execute(const buffer_s16_t& audio, const buffer_c8_t& buffer);
+
+private:
+	dsp::HilbertTransform	hilbert;
+};
+
+///
+
+class FM : public Modulator {
+public:
+	FM();
+
+	virtual void execute(const buffer_s16_t& audio, const buffer_c8_t& buffer);
+	void set_fm_delta(uint32_t new_delta);
+
+///
+
+private:
+	uint32_t	fm_delta { 0 };
+	uint32_t	phase { 0 }, sphase { 0 };
+	int32_t		sample { 0 }, delta { };
+};
+
+class AM : public Modulator {
+public:
+        AM();
+
+        virtual void execute(const buffer_s16_t& audio, const buffer_c8_t& buffer);
+};
+
+} /* namespace modulate */
+} /* namespace dsp */
+
+#endif/*__DSP_MODULATE_H__*/

firmware/baseband/proc_am_audio.cpp

@@ -35,7 +35,7 @@ void NarrowbandAMAudio::execute(const buffer_c8_t& buffer) {
 	const auto decim_0_out = decim_0.execute(buffer, dst_buffer);
 	const auto decim_1_out = decim_1.execute(decim_0_out, dst_buffer);
 
-	channel_spectrum.feed(decim_1_out, channel_filter_pass_f, channel_filter_stop_f);
+	channel_spectrum.feed(decim_1_out, channel_filter_low_f, channel_filter_high_f, channel_filter_transition);
 
 	const auto decim_2_out = decim_2.execute(decim_1_out, dst_buffer);
 	const auto channel_out = channel_filter.execute(decim_2_out, dst_buffer);
@@ -87,14 +87,15 @@ void NarrowbandAMAudio::configure(const AMConfigureMessage& message) {
 	constexpr size_t decim_2_output_fs = decim_2_input_fs / decim_2_decimation_factor;
 
 	constexpr size_t channel_filter_input_fs = decim_2_output_fs;
-	const size_t channel_filter_output_fs = channel_filter_input_fs / channel_filter_decimation_factor;
+	//const size_t channel_filter_output_fs = channel_filter_input_fs / channel_filter_decimation_factor;
 
 	decim_0.configure(message.decim_0_filter.taps, 33554432);
 	decim_1.configure(message.decim_1_filter.taps, 131072);
 	decim_2.configure(message.decim_2_filter.taps, decim_2_decimation_factor);
 	channel_filter.configure(message.channel_filter.taps, channel_filter_decimation_factor);
-	channel_filter_pass_f = message.channel_filter.pass_frequency_normalized * channel_filter_input_fs;
-	channel_filter_stop_f = message.channel_filter.stop_frequency_normalized * channel_filter_input_fs;
+	channel_filter_low_f = message.channel_filter.low_frequency_normalized * channel_filter_input_fs;
+	channel_filter_high_f = message.channel_filter.high_frequency_normalized * channel_filter_input_fs;
+	channel_filter_transition = message.channel_filter.transition_normalized * channel_filter_input_fs;
 	channel_spectrum.set_decimation_factor(1.0f);
 	modulation_ssb = (message.modulation == AMConfigureMessage::Modulation::SSB);
 	audio_output.configure(message.audio_hpf_config);

firmware/baseband/proc_am_audio.hpp

@@ -64,8 +64,9 @@ private:
 	dsp::decimate::FIRC16xR16x32Decim8 decim_1 { };
 	dsp::decimate::FIRAndDecimateComplex decim_2 { };
 	dsp::decimate::FIRAndDecimateComplex channel_filter { };
-	uint32_t channel_filter_pass_f = 0;
-	uint32_t channel_filter_stop_f = 0;
+	int32_t channel_filter_low_f = 0;
+	int32_t channel_filter_high_f = 0;
+	int32_t channel_filter_transition = 0;
 
 	bool modulation_ssb = false;
 	dsp::demodulate::AM demod_am { };

firmware/baseband/proc_am_tv.cpp

@@ -43,14 +43,15 @@ void WidebandFMAudio::execute(const buffer_c8_t& buffer) {
 	const buffer_c16_t buffer_c16 {spectrum.data(),spectrum.size(),buffer.sampling_rate};
 	channel_spectrum.feed(buffer_c16);
 
-        int8_t re, im;
-	int8_t mag;
+        int8_t re ;
+	//int8_t im;  
+	//int8_t mag;
 
         for (size_t i = 0; i < 128; i++) 
 	{
 		re = buffer.p[i].real();
-		im = buffer.p[i].imag();
-		mag = __builtin_sqrtf((re * re) + (im * im)) ;
+		//im = buffer.p[i].imag();
+		//mag = __builtin_sqrtf((re * re) + (im * im)) ;
 		const unsigned int v =  re + 127.0f; //timescope
 		audio_spectrum.db[i] = std::max(0U, std::min(255U, v));
 	}
@@ -75,6 +76,7 @@ void WidebandFMAudio::on_message(const Message* const message) {
 }
 
 void WidebandFMAudio::configure(const WFMConfigureMessage& message) {
+	(void)message; // avoid warning
 	configured = true;
 }
 

firmware/baseband/proc_aprsrx.cpp

@@ -0,0 +1,258 @@
+/*
+ * 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 "proc_aprsrx.hpp"
+#include "portapack_shared_memory.hpp"
+
+#include "event_m4.hpp"
+
+#include "stdio.h"
+
+void APRSRxProcessor::execute(const buffer_c8_t& buffer) {
+	// This is called at 3072000 / 2048 = 1500Hz
+
+	if (!configured) return;
+	
+	// FM demodulation
+	const auto decim_0_out = decim_0.execute(buffer, dst_buffer);				// 2048 / 8 = 256 (512 I/Q samples)
+	const auto decim_1_out = decim_1.execute(decim_0_out, dst_buffer);			// 256 / 8 = 32 (64 I/Q samples)
+	const auto channel_out = channel_filter.execute(decim_1_out, dst_buffer);	// 32 / 2 = 16 (32 I/Q samples)
+
+	feed_channel_stats(channel_out);
+	
+	auto audio = demod.execute(channel_out, audio_buffer);
+	
+	audio_output.write(audio);
+
+	// Audio signal processing
+	for (size_t c = 0; c < audio.count; c++) {
+
+		const int32_t sample_int = audio.p[c] * 32768.0f;
+		int32_t current_sample = __SSAT(sample_int, 16);
+		
+		current_sample /= 128;
+		
+		// Delay line put
+		delay_line[delay_line_index & 0x3F] = current_sample;
+		
+		// Delay line get, and LPF
+		sample_mixed = (delay_line[(delay_line_index - (samples_per_bit/2)) & 0x3F] * current_sample) / 4; 
+		sample_filtered = prev_mixed + sample_mixed + (prev_filtered / 2);
+		
+		delay_line_index++;
+		
+		prev_filtered = sample_filtered;
+		prev_mixed = sample_mixed;		
+
+		// Slice
+		sample_bits <<= 1;
+
+		uint8_t bit = (sample_filtered < -20) ? 1 : 0;
+		sample_bits |= bit;
+
+/*
+		int16_t scaled = bit == 1 ? 32767 : -32767;
+
+		if( stream ) {
+			const size_t bytes_to_write = sizeof(scaled) * 1;
+			const auto result = stream->write(&scaled, bytes_to_write);
+		}
+*/
+		
+		// Check for "clean" transition: either 0011 or 1100
+		if ((((sample_bits >> 2) ^ sample_bits) & 3) == 3) {
+			// Adjust phase
+			if (phase < 0x8000)
+				phase += 0x800;		// Is this a proper value ?
+			else
+				phase -= 0x800;
+		}
+		
+		phase += phase_inc;
+		
+		if (phase >= 0x10000) {
+			phase &= 0xFFFF;
+			
+			if (true) {			
+				uint8_t bit;					
+				if(__builtin_popcount(sample_bits & 0xFF) >= 0x05){
+					bit = 0x1;
+				}
+				else {
+					bit = 0x0;
+				}
+
+				if(parse_bit(bit)){
+					parse_packet();
+				}						
+			}
+		}
+	}
+}
+
+void APRSRxProcessor::parse_packet(){
+	//validate crc	
+	if(packet_buffer_size >= aprs::APRS_MIN_LENGTH){
+		uint16_t crc = 0xFFFF;
+
+		for(size_t i = 0; i < packet_buffer_size; i++){			
+			uint8_t byte = packet_buffer[i];
+			crc = ((crc >> 8) ^ crc_ccitt_tab[(crc ^ byte) & 0xFF]) & 0xFFFF;
+		}	
+
+		if(crc == 0xF0B8){		
+			parse_ax25();
+		}
+	}	
+}
+
+void APRSRxProcessor::parse_ax25(){	
+	aprs_packet.clear();
+	aprs_packet.set_valid_checksum(true);
+
+	for(size_t i = 0; i < packet_buffer_size; i++){
+		aprs_packet.set(i, packet_buffer[i]);
+	}
+
+	APRSPacketMessage packet_message { aprs_packet };
+	shared_memory.application_queue.push(packet_message);
+}
+
+bool APRSRxProcessor::parse_bit(const uint8_t current_bit){
+	uint8_t decoded_bit = ~(current_bit ^ last_bit) & 0x1;
+	last_bit = current_bit;
+
+	int16_t log = decoded_bit == 0 ? -32768 : 32767;
+				
+	//if( stream ) {
+	//	const size_t bytes_to_write = sizeof(log) * 1;
+//		const auto result = stream->write(&log, bytes_to_write);
+//	}
+
+	if(decoded_bit & 0x1){
+		if(ones_count < 8){
+			ones_count++;
+		}
+	}
+	else {
+		if(ones_count > 6){ //not valid
+			state = WAIT_FLAG;
+			current_byte = 0;
+			ones_count = 0;
+			byte_index = 0;
+			packet_buffer_size = 0;
+			return false;
+		}
+		else if(ones_count == 6){ //flag
+			bool done = false;
+			if(state == IN_FRAME){				
+				done = true;
+			}
+			else {
+				packet_buffer_size = 0;
+			}
+			state = WAIT_FRAME;
+			current_byte = 0;
+			ones_count = 0;
+			byte_index = 0;			
+
+			return done;
+		}
+		else if(ones_count == 5){ //bit stuff
+			ones_count = 0;
+			return false;
+		}
+		else {
+			ones_count = 0;
+		}
+	}
+
+	//store
+	current_byte = current_byte >> 1;
+	current_byte |= (decoded_bit == 0x1 ? 0x80 : 0x0);
+	byte_index++;
+
+	if(byte_index >= 8){
+		byte_index = 0;
+		if(state == WAIT_FRAME){
+			state = IN_FRAME;
+		}
+
+		if(state == IN_FRAME){	
+			if(packet_buffer_size + 1 >= 256){
+				state = WAIT_FLAG;
+				current_byte = 0;
+				ones_count = 0;
+				byte_index = 0;
+				packet_buffer_size = 0;
+				return false;
+			}
+			packet_buffer[packet_buffer_size++] = current_byte;
+		}
+	}
+
+	return false;
+}
+
+void APRSRxProcessor::on_message(const Message* const message) {
+	if (message->id == Message::ID::APRSRxConfigure)
+		configure(*reinterpret_cast<const APRSRxConfigureMessage*>(message));
+	if(message->id == Message::ID::CaptureConfig)
+		capture_config(*reinterpret_cast<const CaptureConfigMessage*>(message));	
+}
+
+void APRSRxProcessor::capture_config(const CaptureConfigMessage& message) {
+	if( message.config ) {
+		//stream = std::make_unique<StreamInput>(message.config);
+		audio_output.set_stream(std::make_unique<StreamInput>(message.config));
+	} else {
+		//stream.reset();
+		audio_output.set_stream(nullptr);		
+	}
+}
+
+void APRSRxProcessor::configure(const APRSRxConfigureMessage& message) {	
+	decim_0.configure(taps_11k0_decim_0.taps, 33554432);
+	decim_1.configure(taps_11k0_decim_1.taps, 131072);
+	channel_filter.configure(taps_11k0_channel.taps, 2);
+	demod.configure(audio_fs, 5000);
+
+	audio_output.configure(audio_24k_hpf_300hz_config, audio_24k_deemph_300_6_config, 0);
+	
+	samples_per_bit = audio_fs / message.baudrate;
+	
+	phase_inc = (0x10000 * message.baudrate) / audio_fs;
+	phase = 0;
+	
+	// Delay line
+	delay_line_index = 0;
+
+	state = WAIT_FLAG;
+	
+	configured = true;
+}
+
+int main() {
+	EventDispatcher event_dispatcher { std::make_unique<APRSRxProcessor>() };
+	event_dispatcher.run();
+	return 0;
+}

firmware/baseband/proc_aprsrx.hpp

@@ -0,0 +1,148 @@
+/*
+ * 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.
+ */
+
+#ifndef __PROC_APRSRX_H__
+#define __PROC_APRSRX_H__
+
+#include "baseband_processor.hpp"
+#include "baseband_thread.hpp"
+#include "rssi_thread.hpp"
+
+#include "dsp_decimate.hpp"
+#include "dsp_demodulate.hpp"
+#include "stream_input.hpp"
+
+#include "audio_output.hpp"
+
+#include "fifo.hpp"
+#include "message.hpp"
+
+#include  "aprs_packet.hpp"
+
+static uint16_t crc_ccitt_tab[256] = {
+    0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
+	0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
+	0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
+	0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
+	0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
+	0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
+	0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
+	0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
+	0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
+	0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
+	0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
+	0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
+	0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
+	0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
+	0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
+	0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
+	0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
+	0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
+	0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
+	0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
+	0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
+	0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
+	0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
+	0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
+	0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
+	0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
+	0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
+	0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
+	0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
+	0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
+	0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
+	0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
+};
+
+class APRSRxProcessor : public BasebandProcessor {
+public:
+	void execute(const buffer_c8_t& buffer) override;
+
+	void on_message(const Message* const message) override;
+	
+private:
+	static constexpr size_t baseband_fs = 3072000;
+	static constexpr size_t audio_fs = baseband_fs / 8 / 8 / 2;
+		
+	size_t samples_per_bit { };
+	
+	enum State {
+		WAIT_FLAG,
+		WAIT_FRAME,
+		IN_FRAME
+	};
+	
+	BasebandThread baseband_thread { baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Receive };
+	RSSIThread rssi_thread { NORMALPRIO + 10 };
+	
+	std::array<complex16_t, 512> dst { };
+	const buffer_c16_t dst_buffer {
+		dst.data(),
+		dst.size()
+	};
+	std::array<float, 32> audio { };
+	const buffer_f32_t audio_buffer {
+		audio.data(),
+		audio.size()
+	};
+	
+	// Array size ok down to 375 bauds (24000 / 375)
+	std::array<int32_t, 64> delay_line { 0 };
+	
+	dsp::decimate::FIRC8xR16x24FS4Decim8 decim_0 { };
+	dsp::decimate::FIRC16xR16x32Decim8 decim_1 { };
+	dsp::decimate::FIRAndDecimateComplex channel_filter { };
+	
+	std::unique_ptr<StreamInput> stream { };
+
+	dsp::demodulate::FM demod { };
+	
+	AudioOutput audio_output { };
+
+	State state { };
+	size_t delay_line_index { };	
+	uint32_t bit_counter { 0 };
+	uint32_t word_bits { 0 };
+	uint32_t sample_bits { 0 };
+	uint32_t phase { }, phase_inc { };
+	int32_t sample_mixed { }, prev_mixed { }, sample_filtered { }, prev_filtered { };
+	uint8_t last_bit;
+	uint8_t ones_count = 0;
+	uint8_t current_byte = 0;
+	uint8_t byte_index = 0;
+	uint8_t packet_buffer[256];
+	size_t packet_buffer_size = 0;
+
+	bool configured { false };
+	bool wait_start { };
+	bool bit_value { };
+
+	aprs::APRSPacket aprs_packet;
+
+	void configure(const APRSRxConfigureMessage& message);
+	void capture_config(const CaptureConfigMessage& message);
+	void parse_packet();
+	bool parse_bit(const uint8_t bit);
+	void parse_ax25();
+};
+
+#endif/*__PROC_TPMS_H__*/

firmware/baseband/proc_audiotx.hpp

@@ -50,7 +50,7 @@ private:
 	int32_t sample { 0 }, delta { };
 	int8_t re { 0 }, im { 0 };
 	
-	size_t progress_interval_samples, progress_samples = 0;
+	size_t progress_interval_samples = 0 , progress_samples = 0;
 	
 	bool configured { false };
 	uint32_t bytes_read { 0 };

firmware/baseband/proc_btlerx.cpp

@@ -53,7 +53,6 @@ void BTLERxProcessor::execute(const buffer_c8_t& buffer) {
 	auto audio_oversampled = demod.execute(buffer_c16, work_audio_buffer);*/
 	// Audio signal processing
 	for (size_t c = 0; c < audio_oversampled.count; c++) {
-		int result;
 
 		/*const int32_t sample_int = audio_oversampled.p[c] * 32768.0f;
 		int32_t current_sample = __SSAT(sample_int, 16);
@@ -107,9 +106,9 @@ void BTLERxProcessor::execute(const buffer_c8_t& buffer) {
 				uint8_t packet_data[500];
 				int packet_length;
 				uint32_t packet_crc;
-				uint32_t calced_crc;
+				//uint32_t calced_crc; // NOTE: restore when CRC is passing
 				uint64_t packet_addr_l;
-				uint32_t result;
+				//uint32_t result; // NOTE: restore when CRC is passing
 				uint8_t crc[3];
 				uint8_t packet_header_arr[2];
 
@@ -255,21 +254,21 @@ void BTLERxProcessor::execute(const buffer_c8_t& buffer) {
 				    counter = counter + 1;
 				}
 				for (v=0;v<3;v++) crc_result=(crc_result<<8)|crc[v];
-				calced_crc = crc_result;
+				//calced_crc = crc_result; // NOTE: restore when CRC is passing
 
 				packet_crc=0;
 				for (int c=0;c<3;c++) packet_crc=(packet_crc<<8)|packet_data[packet_length+2+c];
 
 				if (packet_addr_l==0x8E89BED6)
-				//if (packet_crc==calced_crc)
+				//if (packet_crc==calced_crc) // NOTE: restore when CRC is passing
 				{
 				    uint8_t mac_data[6];
 				    int counter = 0;
 				    for (int i = 7; i >= 2; i--) 
 				    {
 				        uint8_t byte_temp6 = (uint8_t) (((packet_data[i] * 0x0802LU & 0x22110LU) | (packet_data[i] * 0x8020LU & 0x88440LU)) * 0x10101LU >> 16);
-					//result = byte_temp6;
-					mac_data[counter] = byte_temp6;
+					//result = byte_temp6; // NOTE: restore when CRC is passing
+					mac_data[counter] = byte_temp6; 
 					counter = counter + 1;
 				    }
 
@@ -325,6 +324,7 @@ void BTLERxProcessor::on_message(const Message* const message) {
 }
 
 void BTLERxProcessor::configure(const BTLERxConfigureMessage& message) {	
+	(void)message; //avoid warning
 	decim_0.configure(taps_200k_wfm_decim_0.taps, 33554432);
 	decim_1.configure(taps_200k_wfm_decim_1.taps, 131072);
 	demod.configure(audio_fs, 5000);

firmware/baseband/proc_capture.cpp

@@ -44,7 +44,11 @@ void CaptureProcessor::execute(const buffer_c8_t& buffer) {
 
 	if( stream ) {
 		const size_t bytes_to_write = sizeof(*decimator_out.p) * decimator_out.count;
-		const auto result = stream->write(decimator_out.p, bytes_to_write);
+		const size_t written = stream->write(decimator_out.p, bytes_to_write);
+		if( written != bytes_to_write )
+		{
+			//TODO eventually report error somewhere
+		}
 	}
 
 	feed_channel_stats(channel);
@@ -52,7 +56,7 @@ void CaptureProcessor::execute(const buffer_c8_t& buffer) {
 	spectrum_samples += channel.count;
 	if( spectrum_samples >= spectrum_interval_samples ) {
 		spectrum_samples -= spectrum_interval_samples;
-		channel_spectrum.feed(channel, channel_filter_pass_f, channel_filter_stop_f);
+		channel_spectrum.feed(channel, channel_filter_low_f, channel_filter_high_f, channel_filter_transition);
 	}
 }
 
@@ -85,8 +89,9 @@ void CaptureProcessor::samplerate_config(const SamplerateConfigMessage& message)
 	size_t decim_1_input_fs = decim_0_output_fs;
 	size_t decim_1_output_fs = decim_1_input_fs / decim_1.decimation_factor;
 
-	channel_filter_pass_f = taps_200k_decim_1.pass_frequency_normalized * decim_1_input_fs;	// 162760.416666667
-	channel_filter_stop_f = taps_200k_decim_1.stop_frequency_normalized * decim_1_input_fs;	// 337239.583333333
+	channel_filter_low_f = taps_200k_decim_1.low_frequency_normalized * decim_1_input_fs;
+	channel_filter_high_f = taps_200k_decim_1.high_frequency_normalized * decim_1_input_fs;
+	channel_filter_transition = taps_200k_decim_1.transition_normalized * decim_1_input_fs;
 
 	spectrum_interval_samples = decim_1_output_fs / spectrum_rate_hz;
 	spectrum_samples = 0;

firmware/baseband/proc_capture.hpp

@@ -60,8 +60,9 @@ private:
 
 	dsp::decimate::FIRC8xR16x24FS4Decim4 decim_0 { };
 	dsp::decimate::FIRC16xR16x16Decim2 decim_1 { };
-	uint32_t channel_filter_pass_f = 0;
-	uint32_t channel_filter_stop_f = 0;
+	int32_t channel_filter_low_f = 0;
+	int32_t channel_filter_high_f = 0;
+	int32_t channel_filter_transition = 0;
 
 	std::unique_ptr<StreamInput> stream { };
 

firmware/baseband/proc_gps_sim.cpp

@@ -30,8 +30,9 @@
 #include "utility.hpp"
 
 ReplayProcessor::ReplayProcessor() {
-	channel_filter_pass_f = taps_200k_decim_1.pass_frequency_normalized * 1000000;	// 162760.416666667
-	channel_filter_stop_f = taps_200k_decim_1.stop_frequency_normalized * 1000000;	// 337239.583333333
+	channel_filter_low_f = taps_200k_decim_1.low_frequency_normalized * 1000000;
+	channel_filter_high_f = taps_200k_decim_1.high_frequency_normalized * 1000000;
+	channel_filter_transition = taps_200k_decim_1.transition_normalized * 1000000;
 	
 	spectrum_samples = 0;
 

firmware/baseband/proc_gps_sim.hpp

@@ -55,8 +55,9 @@ private:
 		baseband_fs 
 	};
 	
-	uint32_t channel_filter_pass_f = 0;
-	uint32_t channel_filter_stop_f = 0;
+	int32_t channel_filter_low_f = 0;
+	int32_t channel_filter_high_f = 0;
+	int32_t channel_filter_transition = 0;
 
 	std::unique_ptr<StreamOutput> stream { };
 

firmware/baseband/proc_mictx.cpp

@@ -35,6 +35,7 @@ void MicTXProcessor::execute(const buffer_c8_t& buffer){
 	if (!configured) return;
 	
 	audio_input.read_audio_buffer(audio_buffer);
+	modulator->execute(audio_buffer, buffer);
 
 	for (size_t i = 0; i < buffer.count; i++) {
 		
@@ -70,6 +71,7 @@ void MicTXProcessor::execute(const buffer_c8_t& buffer){
 			sample = beep_gen.process(0);
 		}
 		
+		/*
 		sample = tone_gen.process(sample);
 		
 		// FM
@@ -87,6 +89,7 @@ void MicTXProcessor::execute(const buffer_c8_t& buffer){
 		}
 		
 		buffer.p[i] = { re, im };
+		*/
 	}
 }
 
@@ -96,7 +99,40 @@ void MicTXProcessor::on_message(const Message* const msg) {
 	
 	switch(msg->id) {
 		case Message::ID::AudioTXConfig:
-			fm_delta = config_message.deviation_hz * (0xFFFFFFUL / baseband_fs);
+			if (fm_enabled) {
+				dsp::modulate::FM *fm = new dsp::modulate::FM();
+				
+				fm->set_fm_delta(config_message.deviation_hz * (0xFFFFFFUL / baseband_fs));
+				modulator = fm;
+			}
+			
+			if (usb_enabled) {
+				modulator = new dsp::modulate::SSB();
+				modulator->set_mode(dsp::modulate::Mode::USB);
+			}
+			
+			if (lsb_enabled) {
+				modulator = new dsp::modulate::SSB();
+				modulator->set_mode(dsp::modulate::Mode::LSB);
+			}
+			if (am_enabled) {
+				modulator = new dsp::modulate::AM();
+				modulator->set_mode(dsp::modulate::Mode::AM);
+			}
+			if (dsb_enabled) {
+				modulator = new dsp::modulate::AM();
+				modulator->set_mode(dsp::modulate::Mode::DSB);
+			}
+
+            modulator->set_over(baseband_fs / 24000);
+			
+			am_enabled = config_message.am_enabled;
+			usb_enabled = config_message.usb_enabled;
+			lsb_enabled = config_message.lsb_enabled;
+			dsb_enabled = config_message.dsb_enabled;
+			if (!am_enabled || !usb_enabled || !lsb_enabled || !dsb_enabled) {
+				fm_enabled = true;
+			}
 			
 			audio_gain = config_message.audio_gain;
 			divider = config_message.divider;

firmware/baseband/proc_mictx.hpp

@@ -27,6 +27,7 @@
 #include "baseband_thread.hpp"
 #include "audio_input.hpp"
 #include "tone_gen.hpp"
+#include "dsp_modulate.hpp"
 
 class MicTXProcessor : public BasebandProcessor {
 public:
@@ -50,7 +51,14 @@ private:
 	AudioInput audio_input { };
 	ToneGen tone_gen { };
 	ToneGen beep_gen { };
-	
+	dsp::modulate::Modulator *modulator;
+
+	bool am_enabled { false };
+	bool fm_enabled { true };
+	bool usb_enabled { false };
+	bool lsb_enabled { false };
+	bool dsb_enabled { false };
+
 	uint32_t divider { };
 	float audio_gain { };
 	uint64_t power_acc { 0 };

firmware/baseband/proc_nfm_audio.cpp

@@ -39,7 +39,7 @@ void NarrowbandFMAudio::execute(const buffer_c8_t& buffer) {
 	const auto decim_0_out = decim_0.execute(buffer, dst_buffer);
 	const auto decim_1_out = decim_1.execute(decim_0_out, dst_buffer);
 
-	channel_spectrum.feed(decim_1_out, channel_filter_pass_f, channel_filter_stop_f);
+	channel_spectrum.feed(decim_1_out, channel_filter_low_f, channel_filter_high_f, channel_filter_transition);
 
 	const auto channel_out = channel_filter.execute(decim_1_out, dst_buffer);
 
@@ -145,8 +145,9 @@ void NarrowbandFMAudio::configure(const NBFMConfigureMessage& message) {
 	decim_1.configure(message.decim_1_filter.taps, 131072);
 	channel_filter.configure(message.channel_filter.taps, message.channel_decimation);
 	demod.configure(demod_input_fs, message.deviation);
-	channel_filter_pass_f = message.channel_filter.pass_frequency_normalized * channel_filter_input_fs;
-	channel_filter_stop_f = message.channel_filter.stop_frequency_normalized * channel_filter_input_fs;
+	channel_filter_low_f = message.channel_filter.low_frequency_normalized * channel_filter_input_fs;
+	channel_filter_high_f = message.channel_filter.high_frequency_normalized * channel_filter_input_fs;
+	channel_filter_transition = message.channel_filter.transition_normalized * channel_filter_input_fs;
 	channel_spectrum.set_decimation_factor(1.0f);
 	audio_output.configure(message.audio_hpf_config, message.audio_deemph_config, (float)message.squelch_level / 100.0);
 	

firmware/baseband/proc_nfm_audio.hpp

@@ -73,8 +73,9 @@ private:
 	dsp::decimate::FIRC8xR16x24FS4Decim8 decim_0 { };
 	dsp::decimate::FIRC16xR16x32Decim8 decim_1 { };
 	dsp::decimate::FIRAndDecimateComplex channel_filter { };
-	uint32_t channel_filter_pass_f = 0;
-	uint32_t channel_filter_stop_f = 0;
+	int32_t channel_filter_low_f = 0;
+	int32_t channel_filter_high_f = 0;
+	int32_t channel_filter_transition = 0;
 	
 	// For CTCSS decoding
 	dsp::decimate::FIR64AndDecimateBy2Real ctcss_filter { };

firmware/baseband/proc_nrfrx.cpp

@@ -37,7 +37,6 @@ void NRFRxProcessor::execute(const buffer_c8_t& buffer) {
 	auto audio_oversampled = demod.execute(decim_0_out, work_audio_buffer);
 	// Audio signal processing
 	for (size_t c = 0; c < audio_oversampled.count; c++) {
-		int result;
                 int g_srate = 4; //4 for 250KPS
 		//int g_srate = 1; //1 for 1MPS, not working yet
 		int32_t current_sample = audio_oversampled.p[c]; //if I directly use this, some results can pass crc but not correct.
@@ -48,11 +47,8 @@ void NRFRxProcessor::execute(const buffer_c8_t& buffer) {
 
 		skipSamples = skipSamples - 1;
 
-
 		if (skipSamples<1)
 		{
-				
-
 			int32_t threshold_tmp=0;
 			for (int c=0;c<8*g_srate;c++)
 			{
@@ -272,6 +268,7 @@ void NRFRxProcessor::on_message(const Message* const message) {
 }
 
 void NRFRxProcessor::configure(const NRFRxConfigureMessage& message) {	
+	(void)message; //avoir unused warning
 	decim_0.configure(taps_200k_wfm_decim_0.taps, 33554432);
 	decim_1.configure(taps_200k_wfm_decim_1.taps, 131072);
 	demod.configure(audio_fs, 5000);

firmware/baseband/proc_pocsag.hpp

@@ -95,7 +95,7 @@ private:
 	bool configured = false;
 	rx_states rx_state { WAITING };
 	pocsag::BitRate bitrate { pocsag::BitRate::FSK1200 };
-	bool phase;
+	bool phase = false ;
 	uint32_t codeword_count { 0 };
 	pocsag::POCSAGPacket packet { };
 	

firmware/baseband/proc_replay.cpp

@@ -29,8 +29,9 @@
 #include "utility.hpp"
 
 ReplayProcessor::ReplayProcessor() {
-	channel_filter_pass_f = taps_200k_decim_1.pass_frequency_normalized * 1000000;	// 162760.416666667
-	channel_filter_stop_f = taps_200k_decim_1.stop_frequency_normalized * 1000000;	// 337239.583333333
+	channel_filter_low_f = taps_200k_decim_1.low_frequency_normalized * 1000000;
+	channel_filter_high_f = taps_200k_decim_1.high_frequency_normalized * 1000000;
+	channel_filter_transition = taps_200k_decim_1.transition_normalized * 1000000;
 	
 	spectrum_samples = 0;
 
@@ -70,7 +71,7 @@ void ReplayProcessor::execute(const buffer_c8_t& buffer) {
 	spectrum_samples += buffer.count;
 	if( spectrum_samples >= spectrum_interval_samples ) {
 		spectrum_samples -= spectrum_interval_samples;
-		channel_spectrum.feed(iq_buffer, channel_filter_pass_f, channel_filter_stop_f);
+		channel_spectrum.feed(iq_buffer, channel_filter_low_f, channel_filter_high_f, channel_filter_transition);
 		
 		txprogress_message.progress = bytes_read;	// Inform UI about progress
 		txprogress_message.done = false;

firmware/baseband/proc_replay.hpp

@@ -54,8 +54,9 @@ private:
 		baseband_fs / 8
 	};
 	
-	uint32_t channel_filter_pass_f = 0;
-	uint32_t channel_filter_stop_f = 0;
+	int32_t channel_filter_low_f = 0;
+	int32_t channel_filter_high_f = 0;
+	int32_t channel_filter_transition = 0;
 
 	std::unique_ptr<StreamOutput> stream { };
 

firmware/baseband/proc_wfm_audio.cpp

@@ -43,7 +43,7 @@ void WidebandFMAudio::execute(const buffer_c8_t& buffer) {
 	spectrum_samples += channel.count;
 	if( spectrum_samples >= spectrum_interval_samples ) {
 		spectrum_samples -= spectrum_interval_samples;
-		channel_spectrum.feed(channel, channel_filter_pass_f, channel_filter_stop_f);
+		channel_spectrum.feed(channel, channel_filter_low_f, channel_filter_high_f, channel_filter_transition);
 	}
 
 	/* 384kHz complex<int16_t>[256]
@@ -169,8 +169,9 @@ void WidebandFMAudio::configure(const WFMConfigureMessage& message) {
 
 	decim_0.configure(message.decim_0_filter.taps, 33554432);
 	decim_1.configure(message.decim_1_filter.taps, 131072);
-	channel_filter_pass_f = message.decim_1_filter.pass_frequency_normalized * decim_1_input_fs;
-	channel_filter_stop_f = message.decim_1_filter.stop_frequency_normalized * decim_1_input_fs;
+	channel_filter_low_f = message.decim_1_filter.low_frequency_normalized * decim_1_input_fs;
+	channel_filter_high_f = message.decim_1_filter.high_frequency_normalized * decim_1_input_fs;
+	channel_filter_transition = message.decim_1_filter.transition_normalized * decim_1_input_fs;
 	demod.configure(demod_input_fs, message.deviation);
 	audio_filter.configure(message.audio_filter.taps);
 	audio_output.configure(message.audio_hpf_config, message.audio_deemph_config);

firmware/baseband/proc_wfm_audio.hpp

@@ -67,8 +67,9 @@ private:
 	
 	dsp::decimate::FIRC8xR16x24FS4Decim4 decim_0 { };
 	dsp::decimate::FIRC16xR16x16Decim2 decim_1 { };
-	uint32_t channel_filter_pass_f = 0;
-	uint32_t channel_filter_stop_f = 0;
+	int32_t channel_filter_low_f = 0;
+	int32_t channel_filter_high_f = 0;
+	int32_t channel_filter_transition = 0;
 
 	dsp::demodulate::FM demod { };
 	dsp::decimate::DecimateBy2CIC4Real audio_dec_1 { };

firmware/baseband/proc_wideband_spectrum.cpp

@@ -53,7 +53,7 @@ void WidebandSpectrum::execute(const buffer_c8_t& buffer) {
 		};
 		channel_spectrum.feed(
 			buffer_c16,
-			0, 0
+			0, 0, 0
 		);
 		phase = 0;
 	} else {

firmware/baseband/spectrum_collector.cpp

@@ -78,12 +78,14 @@ void SpectrumCollector::set_decimation_factor(
 
 void SpectrumCollector::feed(
 	const buffer_c16_t& channel,
-	const uint32_t filter_pass_frequency,
-	const uint32_t filter_stop_frequency
+	const int32_t filter_low_frequency,
+	const int32_t filter_high_frequency,
+	const int32_t filter_transition
 ) {
 	// Called from baseband processing thread.
-	channel_filter_pass_frequency = filter_pass_frequency;
-	channel_filter_stop_frequency = filter_stop_frequency;
+	channel_filter_low_frequency = filter_low_frequency;
+	channel_filter_high_frequency = filter_high_frequency;
+	channel_filter_transition = filter_transition;
 
 	channel_spectrum_decimator.feed(
 		channel,
@@ -136,8 +138,9 @@ void SpectrumCollector::update() {
 
 		ChannelSpectrum spectrum;
 		spectrum.sampling_rate = channel_spectrum_sampling_rate;
-		spectrum.channel_filter_pass_frequency = channel_filter_pass_frequency;
-		spectrum.channel_filter_stop_frequency = channel_filter_stop_frequency;
+		spectrum.channel_filter_low_frequency = channel_filter_low_frequency;
+		spectrum.channel_filter_high_frequency = channel_filter_high_frequency;
+		spectrum.channel_filter_transition = channel_filter_transition;
 		for(size_t i=0; i<spectrum.db.size(); i++) {
 			const auto corrected_sample = spectrum_window_hamming_3(channel_spectrum, i);
 			const auto mag2 = magnitude_squared(corrected_sample * (1.0f / 32768.0f));

firmware/baseband/spectrum_collector.hpp

@@ -40,8 +40,9 @@ public:
 
 	void feed(
 		const buffer_c16_t& channel,
-		const uint32_t filter_pass_frequency,
-		const uint32_t filter_stop_frequency
+		const int32_t filter_low_frequency,
+		const int32_t filter_high_frequency,
+		const int32_t filter_transition
 	);
 
 private:
@@ -53,8 +54,9 @@ private:
 	bool streaming { false };
 	std::array<std::complex<float>, 256> channel_spectrum { };
 	uint32_t channel_spectrum_sampling_rate { 0 };
-	uint32_t channel_filter_pass_frequency { 0 };
-	uint32_t channel_filter_stop_frequency { 0 };
+	int32_t channel_filter_low_frequency { 0 };
+	int32_t channel_filter_high_frequency { 0 };
+	int32_t channel_filter_transition { 0 };
 
 	void post_message(const buffer_c16_t& data);
 

firmware/baseband/tv_collector.cpp

@@ -88,11 +88,9 @@ void TvCollector::post_message(const buffer_c16_t& data) {
 	// Called from baseband processing thread.
         float re, im;
 	float mag;
-        float max;
 	if( streaming && !channel_spectrum_request_update ) {
                 for(size_t i=0; i<256; i++) 
 		{
-			const auto s = data.p[i];
                         re = (float)(data.p[i].real());
 			im = (float)(data.p[i].imag());
 			mag = __builtin_sqrtf((re * re) + (im * im)) ;

firmware/chibios/os/kernel/src/chsys.c

@@ -119,7 +119,7 @@ void chSysInit(void) {
      serve interrupts in its context while keeping the lowest energy saving
      mode compatible with the system status.*/
   chThdCreateStatic(_idle_thread_wa, sizeof(_idle_thread_wa), IDLEPRIO,
-                    (tfunc_t)_idle_thread, NULL);
+                    (void *)_idle_thread, NULL);
 #endif
 }
 

firmware/common/adsb.cpp

@@ -319,14 +319,14 @@ void encode_frame_velo(ADSBFrame& frame, const uint32_t ICAO_address, const uint
 
 // Decoding method from dump1090
 adsb_vel decode_frame_velo(ADSBFrame& frame){
-	adsb_vel velo {false, 0, 0};
+	adsb_vel velo {false, 0, 0, 0};
 
 	uint8_t * frame_data = frame.get_raw_data();
 	uint8_t velo_type = frame.get_msg_sub();
 
 	if(velo_type >= 1 && velo_type <= 4){ //vertical rate is always present
 
-		velo.v_rate = (((frame_data[8] & 0x07 ) << 6) | ((frame_data[9]) >> 2) - 1) * 64;
+		velo.v_rate = (((frame_data[8] & 0x07 ) << 6) | ((frame_data[9] >> 2) - 1)) * 64;
 
 		if((frame_data[8] & 0x8) >> 3) velo.v_rate *= -1; //check v_rate sign
 	}

firmware/common/adsb_frame.hpp

@@ -69,7 +69,7 @@ public:
 	}
 
 	uint8_t * get_raw_data() const {
-		return (uint8_t* const)raw_data;
+		return (uint8_t* )raw_data;
 	}
 	
 	void make_CRC() {

firmware/common/ais_packet.hpp

@@ -42,6 +42,7 @@ struct DateTime {
 
 template<size_t FieldSize, int32_t DegMax, uint32_t NAValue>
 struct LatLonBase {
+	
 	constexpr LatLonBase(
 	) : LatLonBase { raw_not_available }
 	{
@@ -58,6 +59,8 @@ struct LatLonBase {
 	) : raw_ { other.raw_ }
 	{
 	}
+	
+	LatLonBase& operator=( const LatLonBase &)=default;
 
 	int32_t normalized() const {
 		return static_cast<int32_t>(raw() << sign_extend_shift) / (1 << sign_extend_shift);

firmware/common/aprs_packet.cpp

@@ -0,0 +1,27 @@
+/*
+ * 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 "aprs_packet.hpp"
+
+namespace aprs {
+
+} /* namespace zwave */

firmware/common/aprs_packet.hpp

@@ -0,0 +1,495 @@
+/*
+ * 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.
+ */
+
+#ifndef __APRS_PACKET_H__
+#define __APRS_PACKET_H__
+
+#include <cstdint>
+#include <cstddef>
+#include <cctype>
+
+#include "baseband.hpp"
+
+namespace aprs {
+
+const int APRS_MIN_LENGTH = 18; //14 bytes address, control byte and pid. 2 CRC.
+
+struct aprs_pos{
+	float latitude;
+	float longitude;	
+	uint8_t symbol_code;
+	uint8_t  sym_table_id;
+};
+
+enum ADDRESS_TYPE {
+	SOURCE,
+	DESTINATION,
+	REPEATER
+};
+
+class APRSPacket {
+public:
+	void set_timestamp(const Timestamp& value) {
+		timestamp_ = value;
+	}
+	
+	Timestamp timestamp() const {
+		return timestamp_;
+	}
+
+	void set(const size_t index, const uint8_t data) {		
+		payload[index] = data;
+
+		if(index + 1 > payload_size){
+			payload_size = index + 1;
+		}
+	}
+
+	uint32_t operator[](const size_t index) const {
+		return payload[index];
+	}
+	
+
+	uint8_t size() const {
+		return payload_size;
+	}
+
+	void set_valid_checksum(const bool valid) {
+		valid_checksum = valid;
+	}
+
+	bool is_valid_checksum() const {
+		return valid_checksum;
+	}
+
+	uint64_t get_source(){
+		uint64_t source = 0x0;
+
+		for(uint8_t i = SOURCE_START; i < SOURCE_START + ADDRESS_SIZE; i++){
+			source |= ( ((uint64_t)payload[i]) << ((i - SOURCE_START) * 8));
+		}
+
+		return source;
+	}
+
+	std::string get_source_formatted(){
+		parse_address(SOURCE_START, SOURCE);
+		return std::string(address_buffer);
+	}
+
+	std::string get_destination_formatted(){
+		parse_address(DESTINATION_START, DESTINATION);
+		return std::string(address_buffer);
+	}
+
+	std::string get_digipeaters_formatted(){
+		uint8_t position = DIGIPEATER_START;
+		bool has_more = parse_address(SOURCE_START, REPEATER);
+
+		std::string repeaters = "";
+		while(has_more){			
+			has_more = parse_address(position, REPEATER);	
+			repeaters += std::string(address_buffer);
+
+			position += ADDRESS_SIZE;
+
+			if(has_more){			
+				repeaters += ">";
+			}		
+		}
+
+		return repeaters;
+	}
+
+	uint8_t get_number_of_digipeaters(){
+		uint8_t position = DIGIPEATER_START;		
+		bool has_more = parse_address(SOURCE_START, REPEATER);
+		uint8_t repeaters = 0;
+		while(has_more){			
+			has_more = parse_address(position, REPEATER);	
+			position += ADDRESS_SIZE;
+			repeaters++;	
+		}
+
+		return repeaters;
+	}
+
+	uint8_t get_information_start_index(){
+		return DIGIPEATER_START + (get_number_of_digipeaters() * ADDRESS_SIZE) + 2;
+	}
+
+	std::string get_information_text_formatted(){
+		std::string information_text = "";
+		for(uint8_t i = get_information_start_index(); i < payload_size - 2; i++){
+			information_text += payload[i];
+		}
+
+		return information_text;
+	}
+
+	std::string get_stream_text(){
+		std::string stream = get_source_formatted() + ">" + get_destination_formatted() + ";" + get_digipeaters_formatted() + ";" + get_information_text_formatted();
+
+		return stream;
+	}
+
+	char get_data_type_identifier(){
+		char ident = '\0';
+		for(uint8_t i = get_information_start_index(); i < payload_size - 2; i++){
+			ident = payload[i];
+			break;
+		}
+		return ident;
+	}
+
+	bool has_position(){		
+		char ident = get_data_type_identifier();
+
+		return 
+			ident == '!' || 
+			ident == '=' || 
+			ident == '/' || 
+			ident == '@' || 
+			ident == ';' || 
+			ident == '`' ||
+			ident == '\''||
+			ident == 0x1d||
+			ident == 0x1c;
+	}
+
+	aprs_pos get_position(){
+		aprs::aprs_pos pos;
+
+		char ident = get_data_type_identifier();
+		std::string info_text = get_information_text_formatted();
+
+		std::string lat_str, lng_str;
+		char first;
+		//bool supports_compression = true;
+		bool is_mic_e_format = false;
+		std::string::size_type start;
+
+		switch(ident){
+			case '/':
+			case '@':
+				start = 8;
+				break;
+			case '=':
+			case '!':
+				start = 1;
+				break;
+			case ';':			
+				start = 18;
+				//supports_compression = false;
+				break;
+			case '`':
+			case '\'':
+			case 0x1c:
+			case 0x1d:
+				is_mic_e_format = true;
+				break;
+			default:
+				return pos;
+		}		
+		if(is_mic_e_format){
+			parse_mic_e_format(pos);
+		}
+		else {			
+			if(start < info_text.size()){
+				first = info_text.at(start);
+
+				if(std::isdigit(first)){
+					if(start + 18 < info_text.size()){
+						lat_str = info_text.substr(start, 8);
+						pos.sym_table_id = info_text.at(start + 8);
+						lng_str = info_text.substr(start + 9, 9);
+						pos.symbol_code = info_text.at(start + 18);
+
+						pos.latitude = parse_lat_str(lat_str);
+						pos.longitude = parse_lng_str(lng_str);
+					}
+					
+				}
+				else {
+					if(start + 9 < info_text.size()){
+						pos.sym_table_id = info_text.at(start);
+						lat_str = info_text.substr(start + 1, 4);
+						lng_str = info_text.substr(start + 5, 4);
+						pos.symbol_code = info_text.at(start + 9);
+
+						pos.latitude = parse_lat_str_cmp(lat_str);
+						pos.longitude = parse_lng_str_cmp(lng_str);	
+					}		
+				}
+			}			
+		}		
+
+		return pos;
+	}
+
+	void clear() {
+		payload_size = 0;
+	}
+
+private:
+	const uint8_t DIGIPEATER_START = 14;
+	const uint8_t SOURCE_START = 7;
+	const uint8_t DESTINATION_START = 0;
+	const uint8_t ADDRESS_SIZE = 7;
+
+	bool valid_checksum = false;
+	uint8_t payload[256];
+	char address_buffer[15];
+	uint8_t payload_size;
+	Timestamp timestamp_ { };
+
+	float parse_lat_str_cmp(const std::string& lat_str){
+		return 90.0 - ( (lat_str.at(0) - 33) * (91*91*91) + (lat_str.at(1) - 33) * (91*91) + (lat_str.at(2) - 33) * 91 + (lat_str.at(3)) ) / 380926.0;		
+	}
+
+	float parse_lng_str_cmp(const std::string& lng_str){
+		return -180.0 + ( (lng_str.at(0) - 33) * (91*91*91) + (lng_str.at(1) - 33) * (91*91) + (lng_str.at(2) - 33) * 91 + (lng_str.at(3)) ) / 190463.0;		
+	} 
+
+	uint8_t parse_digits(const std::string& str){
+		if(str.at(0) == ' '){
+			return 0;
+		}
+		uint8_t end = str.find_last_not_of(' ') + 1;
+		std::string sub = str.substr(0, end);
+
+		if(!is_digits(sub)){
+			return 0;
+		}
+		else {
+			return std::stoi(sub);
+		}
+	}
+
+	bool is_digits(const std::string& str){
+		return str.find_last_not_of("0123456789") == std::string::npos;
+	}
+
+	float parse_lat_str(const std::string& lat_str){
+		float lat = 0.0;
+
+		std::string str_lat_deg = lat_str.substr(0, 2);
+		std::string str_lat_min = lat_str.substr(2, 2);
+		std::string str_lat_hund = lat_str.substr(5, 2);
+		std::string dir = lat_str.substr(7, 1);
+
+		uint8_t lat_deg = parse_digits(str_lat_deg);
+		uint8_t lat_min = parse_digits(str_lat_min);
+		uint8_t lat_hund = parse_digits(str_lat_hund);
+
+		lat += lat_deg;
+		lat += (lat_min + (lat_hund/ 100.0))/60.0;
+
+		if(dir.c_str()[0] == 'S'){
+			lat = -lat;
+		}
+
+		return lat;
+
+	}
+
+	float parse_lng_str(std::string& lng_str){
+		float lng = 0.0;
+
+		std::string str_lng_deg = lng_str.substr(0, 3);
+		std::string str_lng_min = lng_str.substr(3, 2);
+		std::string str_lng_hund = lng_str.substr(6, 2);
+		std::string dir = lng_str.substr(8, 1);
+
+		uint8_t lng_deg = parse_digits(str_lng_deg);
+		uint8_t lng_min = parse_digits(str_lng_min);
+		uint8_t lng_hund = parse_digits(str_lng_hund);
+
+		lng += lng_deg;
+		lng += (lng_min + (lng_hund/ 100.0))/60.0;
+
+		if(dir.c_str()[0] == 'W'){
+			lng = -lng;
+		}
+
+		return lng;
+
+	}
+
+	void parse_mic_e_format(aprs::aprs_pos& pos){
+		std::string lat_str = "";
+		std::string lng_str = "";
+
+		bool is_north;
+		bool is_west;
+		uint8_t lng_offset;
+		for(uint8_t i = DESTINATION_START; i < DESTINATION_START + ADDRESS_SIZE - 1; i++){
+			uint8_t ascii = payload[i] >> 1;
+
+			lat_str += get_mic_e_lat_digit(ascii);
+
+			if(i - DESTINATION_START == 3){
+				lat_str += ".";
+			}
+			if(i - DESTINATION_START == 3){
+				is_north = is_mic_e_lat_N(ascii);
+			}
+			if(i - DESTINATION_START == 4){
+				lng_offset = get_mic_e_lng_offset(ascii);
+			}
+			if(i - DESTINATION_START == 5){
+				is_west = is_mic_e_lng_W(ascii);
+			}
+		}
+		if(is_north){
+			lat_str += "N";
+		}
+		else {
+			lat_str += "S";
+		}
+
+		pos.latitude = parse_lat_str(lat_str);	
+
+		float lng = 0.0;
+		uint8_t information_start = get_information_start_index() + 1;
+		for(uint8_t i = information_start; i < information_start + 3 && i < payload_size - 2; i++){
+			uint8_t ascii = payload[i];
+			
+			if(i - information_start == 0){ //deg
+				ascii -=28;
+				ascii += lng_offset;
+
+				if(ascii >= 180 && ascii <= 189){
+					ascii -= 80;
+				}
+				else if (ascii >= 190 && ascii <= 199){
+					ascii -= 190;
+				}
+
+				lng += ascii;
+			}	
+			else if(i - information_start == 1){ //min
+				ascii -= 28;
+				if(ascii >= 60){
+					ascii -= 60;
+				}
+				lng += ascii/60.0;
+			}	
+			else if(i - information_start == 2){ //hundredth minutes
+				ascii -= 28;
+
+				lng += (ascii/100.0)/60.0;
+			}	
+		}
+
+		if(is_west){
+			lng = -lng;
+		}
+
+		pos.longitude = lng;
+
+	}
+
+	uint8_t get_mic_e_lat_digit(uint8_t ascii){
+		if(ascii >= '0' && ascii <= '9'){
+			return ascii;
+		}
+		if(ascii >= 'A' && ascii <= 'J'){
+			return ascii - 17;
+		}
+		if(ascii >= 'P' && ascii <='Y'){
+			return ascii - 32;
+		}
+		if(ascii == 'K' || ascii == 'L' || ascii == 'Z'){
+			return ' ';
+		}
+
+		return '\0';
+	}
+
+	bool is_mic_e_lat_N(uint8_t ascii){
+		if(ascii >= 'P' && ascii <='Z'){
+			return true;
+		}		
+		return false; //not technical definition, but the other case is invalid
+	}
+
+	bool is_mic_e_lng_W(uint8_t ascii){
+		if(ascii >= 'P' && ascii <='Z'){
+			return true;
+		}		
+		return false; //not technical definition, but the other case is invalid
+	}
+
+	uint8_t get_mic_e_lng_offset(uint8_t ascii){
+		if(ascii >= 'P' && ascii <='Z'){
+			return 100;
+		}		
+		return 0; //not technical definition, but the other case is invalid
+	}
+
+	bool parse_address(uint8_t start, ADDRESS_TYPE address_type){
+		uint8_t byte = 0;
+		uint8_t has_more = false;
+		uint8_t ssid = 0;
+		uint8_t buffer_index = 0;
+
+		for(uint8_t i = start; i < start + ADDRESS_SIZE && i < payload_size - 2; i++){
+			byte = payload[i];
+
+			if(i - start == 6){
+				 has_more = (byte & 0x1) == 0;
+				 ssid = (byte >> 1) & 0x0F;
+
+				 if(ssid != 0 || address_type == REPEATER){
+				 	address_buffer[buffer_index++] = '-';				 	
+
+				 	if(ssid < 10){
+				 		address_buffer[buffer_index++] = '0' + ssid;				 		
+				 		address_buffer[buffer_index++] = '\0';
+				 	}
+				 	else {
+				 		address_buffer[buffer_index++] = '1';
+				 		address_buffer[buffer_index++] = '0' + ssid - 10;
+				 		address_buffer[buffer_index++] = '\0';
+				 	}
+				 }
+				 else {
+					 address_buffer[buffer_index++] = '\0';
+				 }
+			}
+			else {
+				byte >>= 1;
+
+				if(byte != ' '){
+					address_buffer[buffer_index++] = byte;		
+				}			
+			}
+		}
+
+		return has_more;
+	}
+};
+
+} /* namespace aprs */
+
+#endif/*__APRS_PACKET_H__*/

firmware/common/dsp_fir_taps.hpp

@@ -30,15 +30,17 @@
 
 template<size_t N>
 struct fir_taps_real {
-	float pass_frequency_normalized;
-	float stop_frequency_normalized; 
+	float low_frequency_normalized;
+	float high_frequency_normalized;
+	float transition_normalized;
 	std::array<int16_t, N> taps;
 };
 
 template<size_t N>
 struct fir_taps_complex {
-	float pass_frequency_normalized;
-	float stop_frequency_normalized; 
+	float low_frequency_normalized;
+	float high_frequency_normalized;
+	float transition_normalized;
 	std::array<complex16_t, N> taps;
 };
 
@@ -46,8 +48,9 @@ struct fir_taps_complex {
 
 // IFIR image-reject filter: fs=3072000, pass=8000, stop=344000, decim=8, fout=384000
 constexpr fir_taps_real<24> taps_16k0_decim_0 {
-	.pass_frequency_normalized =   8000.0f / 3072000.0f,
-	.stop_frequency_normalized = 344000.0f / 3072000.0f,
+	.low_frequency_normalized = -8000.0f / 3072000.0f,
+	.high_frequency_normalized = 8000.0f / 3072000.0f,
+	.transition_normalized = 336000.0f / 3072000.0f,
 	.taps = { {
 		     1,     67,    165,    340,    599,    944,   1361,   1820,
 		  2278,   2684,   2988,   3152,   3152,   2988,   2684,   2278,
@@ -57,8 +60,9 @@ constexpr fir_taps_real<24> taps_16k0_decim_0 {
 
 // IFIR prototype filter: fs=384000, pass=8000, stop=40000, decim=8, fout=48000
 constexpr fir_taps_real<32> taps_16k0_decim_1 {
-	.pass_frequency_normalized =  8000.0f / 384000.0f,
-	.stop_frequency_normalized = 40000.0f / 384000.0f,
+	.low_frequency_normalized = -8000.0f / 384000.0f,
+	.high_frequency_normalized = 8000.0f / 384000.0f,
+	.transition_normalized = 32000.0f / 384000.0f,
 	.taps = { {
 		   -26,   -125,   -180,   -275,   -342,   -359,   -286,    -90,
 		   250,    733,   1337,   2011,   2688,   3289,   3740,   3982,
@@ -69,8 +73,9 @@ constexpr fir_taps_real<32> taps_16k0_decim_1 {
 
 // Channel filter: fs=48000, pass=8000, stop=12400, decim=1, fout=48000
 constexpr fir_taps_real<32> taps_16k0_channel {
-	.pass_frequency_normalized =  8000.0f / 48000.0f,
-	.stop_frequency_normalized = 12400.0f / 48000.0f,
+	.low_frequency_normalized = -8000.0f / 48000.0f,
+	.high_frequency_normalized = 8000.0f / 48000.0f,
+	.transition_normalized = 4400.0f / 48000.0f,
 	.taps = { {
 		   -73,   -285,   -376,     -8,    609,    538,   -584,  -1387,
 		  -148,   2173,   1959,  -2146,  -5267,   -297,  12915,  24737,
@@ -83,8 +88,9 @@ constexpr fir_taps_real<32> taps_16k0_channel {
 
 // IFIR image-reject filter: fs=3072000, pass=5500, stop=341500, decim=8, fout=384000
 constexpr fir_taps_real<24> taps_11k0_decim_0 {
-	.pass_frequency_normalized =   5500.0f / 3072000.0f,
-	.stop_frequency_normalized = 341500.0f / 3072000.0f,
+	.low_frequency_normalized = -5500.0f / 3072000.0f,
+	.high_frequency_normalized = 5500.0f / 3072000.0f,
+	.transition_normalized = 336000.0f / 3072000.0f,
 	.taps = { {
 		    38,    102,    220,    406,    668,   1004,   1397,   1822,
 		  2238,   2603,   2875,   3020,   3020,   2875,   2603,   2238,
@@ -94,8 +100,9 @@ constexpr fir_taps_real<24> taps_11k0_decim_0 {
 
 // IFIR prototype filter: fs=384000, pass=5500, stop=42500, decim=8, fout=48000
 constexpr fir_taps_real<32> taps_11k0_decim_1 {
-	.pass_frequency_normalized =  5500.0f / 384000.0f,
-	.stop_frequency_normalized = 42500.0f / 384000.0f,
+	.low_frequency_normalized = -5500.0f / 384000.0f,
+	.high_frequency_normalized = 5500.0f / 384000.0f,
+	.transition_normalized = 37000.0f / 384000.0f,
 	.taps = { {
 		   -42,    -87,   -157,   -234,   -298,   -318,   -255,    -75,
 		   246,    713,   1306,   1976,   2656,   3265,   3724,   3971,
@@ -106,8 +113,9 @@ constexpr fir_taps_real<32> taps_11k0_decim_1 {
 
 // Channel filter: fs=48000, pass=5500, stop=8900, decim=1, fout=48000
 constexpr fir_taps_real<32> taps_11k0_channel {
-	.pass_frequency_normalized = 5500.0f / 48000.0f,
-	.stop_frequency_normalized = 8900.0f / 48000.0f,
+	.low_frequency_normalized = -5500.0f / 48000.0f,
+	.high_frequency_normalized = 5500.0f / 48000.0f,
+	.transition_normalized = 3400.0f / 48000.0f,
 	.taps = { {
 		   -68,   -345,   -675,   -867,   -582,    247,   1222,   1562,
 		   634,  -1379,  -3219,  -3068,    310,   6510,  13331,  17795,
@@ -120,8 +128,9 @@ constexpr fir_taps_real<32> taps_11k0_channel {
 
 // IFIR image-reject filter: fs=3072000, pass=4250, stop=340250, decim=8, fout=384000
 constexpr fir_taps_real<24> taps_4k25_decim_0 {
-	.pass_frequency_normalized =   4250.0f / 3072000.0f,
-	.stop_frequency_normalized = 340250.0f / 3072000.0f,
+	.low_frequency_normalized = -4250.0f / 3072000.0f,
+	.high_frequency_normalized = 4250.0f / 3072000.0f,
+	.transition_normalized = 33600.0f / 3072000.0f,
 	.taps = { {
 		    38,    103,    222,    409,    671,   1006,   1399,   1821,
 		  2236,   2599,   2868,   3012,   3012,   2868,   2599,   2236,
@@ -131,8 +140,9 @@ constexpr fir_taps_real<24> taps_4k25_decim_0 {
 
 // IFIR prototype filter: fs=384000, pass=4250, stop=43750, decim=8, fout=48000
 constexpr fir_taps_real<32> taps_4k25_decim_1 {
-	.pass_frequency_normalized =  4250.0f / 384000.0f,
-	.stop_frequency_normalized = 43750.0f / 384000.0f,
+	.low_frequency_normalized = -4250.0f / 384000.0f,
+	.high_frequency_normalized = 4250.0f / 384000.0f,
+	.transition_normalized = 39500.0f / 384000.0f,
 	.taps = { {
 		   -33,    -74,   -139,   -214,   -280,   -306,   -254,    -87,
 		   222,    682,   1274,   1951,   2644,   3268,   3741,   3996,
@@ -143,8 +153,9 @@ constexpr fir_taps_real<32> taps_4k25_decim_1 {
 
 // Channel filter: fs=48000, pass=4250, stop=7900, decim=1, fout=48000
 constexpr fir_taps_real<32> taps_4k25_channel {
-	.pass_frequency_normalized = 4250.0f / 48000.0f,
-	.stop_frequency_normalized = 7900.0f / 48000.0f,
+	.low_frequency_normalized = -4250.0f / 48000.0f,
+	.high_frequency_normalized = 4250.0f / 48000.0f,
+	.transition_normalized = 3650.0f / 48000.0f,
 	.taps = { {
 		   -58,    -14,    153,    484,    871,   1063,    770,   -141,
 		 -1440,  -2488,  -2435,   -614,   3035,   7771,  12226,  14927,
@@ -161,8 +172,6 @@ constexpr fir_taps_real<32> taps_4k25_channel {
  * sum(abs(taps)): 125270
  */
 /*constexpr fir_taps_real<64> taps_64_lp_025_025 {
-	.pass_frequency_normalized = 0.025f,
-	.stop_frequency_normalized = 0.025f,
 	.taps = { {
 		     0,      0,     -3,     -7,    -13,    -20,    -27,    -32,
 		   -34,    -33,    -25,    -10,     13,     47,     94,    152,
@@ -183,8 +192,9 @@ constexpr fir_taps_real<32> taps_4k25_channel {
  * sum(abs(taps)): 125270
  */
 constexpr fir_taps_real<64> taps_64_lp_025_025 {
-	.pass_frequency_normalized = 0.0125f,
-	.stop_frequency_normalized = 0.0125f,
+	.low_frequency_normalized = 0,
+	.high_frequency_normalized = 0,
+	.transition_normalized = 0,
 	.taps = { {
 		0, 0, 2, 6, 12, 20, 32, 46,
 		64, 85, 110, 138, 169, 204, 241, 281,
@@ -201,8 +211,9 @@ constexpr fir_taps_real<64> taps_64_lp_025_025 {
 
 // IFIR image-reject filter: fs=3072000, pass=3000, stop=339000, decim=8, fout=384000
 constexpr fir_taps_real<24> taps_6k0_decim_0 {
-	.pass_frequency_normalized =   3000.0f / 3072000.0f,
-	.stop_frequency_normalized = 339000.0f / 3072000.0f,
+	.low_frequency_normalized = -3000.0f / 3072000.0f,
+	.high_frequency_normalized = 3000.0f / 3072000.0f,
+	.transition_normalized = 336000.0f / 3072000.0f,
 	.taps = { {
 		    39,    104,    224,    412,    674,   1008,   1400,   1821,
 		  2234,   2594,   2863,   3006,   3006,   2863,   2594,   2234,
@@ -212,8 +223,9 @@ constexpr fir_taps_real<24> taps_6k0_decim_0 {
 
 // IFIR prototype filter: fs=384000, pass=3000, stop=45000, decim=8, fout=48000
 constexpr fir_taps_real<32> taps_6k0_decim_1 {
-	.pass_frequency_normalized =  3000.0f / 384000.0f,
-	.stop_frequency_normalized = 45000.0f / 384000.0f,
+	.low_frequency_normalized = -3000.0f / 384000.0f,
+	.high_frequency_normalized = 3000.0f / 384000.0f,
+	.transition_normalized = 43000.0f / 384000.0f,
 	.taps = { {
 		   -26,    -63,   -123,   -195,   -263,   -295,   -253,    -99,
 		   199,    651,   1242,   1927,   2633,   3273,   3760,   4023,
@@ -224,8 +236,9 @@ constexpr fir_taps_real<32> taps_6k0_decim_1 {
 
 // IFIR prototype filter: fs=48000, pass=3000, stop=6700, decim=4, fout=12000
 constexpr fir_taps_real<32> taps_6k0_decim_2 {
-	.pass_frequency_normalized = 3000.0f / 48000.0f,
-	.stop_frequency_normalized = 6700.0f / 48000.0f,
+	.low_frequency_normalized = -3000.0f / 48000.0f,
+	.high_frequency_normalized = 3000.0f / 48000.0f,
+	.transition_normalized = 3700.0f / 48000.0f,
 	.taps = { {
 		    95,    178,    247,    208,    -21,   -474,  -1080,  -1640,
 		 -1857,  -1411,    -83,   2134,   4978,   7946,  10413,  11815,
@@ -239,8 +252,9 @@ constexpr fir_taps_real<32> taps_6k0_decim_2 {
  * slightly larger than 32767 (33312).
  */
 constexpr fir_taps_complex<64> taps_6k0_dsb_channel {
-	.pass_frequency_normalized = 3000.0f / 12000.0f,
-	.stop_frequency_normalized = 3300.0f / 12000.0f,
+	.low_frequency_normalized = -3000.0f / 12000.0f,
+	.high_frequency_normalized = 3000.0f / 12000.0f,
+	.transition_normalized = 300.0f / 12000.0f,
 	.taps = { {
 		{    -69,      0 }, {   -140,      0 }, {    119,      0 }, {     89,      0 },
 		{   -132,      0 }, {   -134,      0 }, {    197,      0 }, {    167,      0 },
@@ -265,8 +279,9 @@ constexpr fir_taps_complex<64> taps_6k0_dsb_channel {
 
 // IFIR prototype filter: fs=12000, pass=3000, stop=3300, decim=1, fout=12000
 constexpr fir_taps_complex<64> taps_2k8_usb_channel {
-	.pass_frequency_normalized = 3000.0f / 12000.0f,
-	.stop_frequency_normalized = 3300.0f / 12000.0f,
+	.low_frequency_normalized = 0,
+	.high_frequency_normalized = 3000.0f / 12000.0f,
+	.transition_normalized = 300.0f / 12000.0f,
 	.taps = { {
 		{   -146,      0 }, {    -41,    -45 }, {     -1,     10 }, {    -95,     69 },
 		{   -194,    -41 }, {    -91,   -158 }, {     14,    -43 }, {   -150,     67 },
@@ -291,8 +306,9 @@ constexpr fir_taps_complex<64> taps_2k8_usb_channel {
 
 // IFIR prototype filter: fs=12000, pass=3000, stop=3300, decim=1, fout=12000
 constexpr fir_taps_complex<64> taps_2k8_lsb_channel {
-	.pass_frequency_normalized = 3000.0f / 12000.0f,
-	.stop_frequency_normalized = 3300.0f / 12000.0f,
+	.low_frequency_normalized = -3000.0f / 12000.0f,
+	.high_frequency_normalized = 0,
+	.transition_normalized = 300.0f / 12000.0f,
 	.taps = { {
 		{   -146,      0 }, {    -41,     45 }, {     -1,    -10 }, {    -95,    -69 },
 		{   -194,     41 }, {    -91,    158 }, {     14,     43 }, {   -150,    -67 },
@@ -316,8 +332,9 @@ constexpr fir_taps_complex<64> taps_2k8_lsb_channel {
 // USB AM 700Hz filter: fs=12000, start=600, end=800, width=200, stop=40db, decim=1, fout=12000
 
 constexpr fir_taps_complex<64> taps_0k7_usb_channel {
-	.pass_frequency_normalized = 3000.0f / 12000.0f,
-	.stop_frequency_normalized = 3300.0f / 12000.0f,
+	.low_frequency_normalized = 600.0f / 12000.0f,
+	.high_frequency_normalized = 800.0f / 12000.0f,
+	.transition_normalized = 200.0f / 12000.0f,
 	.taps = { {
 		{    531,      0 },	{    192,     73 },	{    181,    163 },	{    129,    254 },
 		{     34,    328 },	{    -97,    364 },	{   -251,    345 },	{   -403,    261 },
@@ -342,8 +359,9 @@ constexpr fir_taps_complex<64> taps_0k7_usb_channel {
 
 // IFIR image-reject filter: fs=3072000, pass=100000, stop=484000, decim=4, fout=768000
 constexpr fir_taps_real<24> taps_200k_wfm_decim_0 = {
-	.pass_frequency_normalized = 100000.0f / 3072000.0f,
-	.stop_frequency_normalized = 484000.0f / 3072000.0f,
+	.low_frequency_normalized = -100000.0f / 3072000.0f,
+	.high_frequency_normalized = 100000.0f / 3072000.0f,
+	.transition_normalized = 384000.0f / 3072000.0f,
 	.taps = { {
 		    48,    -18,   -151,   -364,   -557,   -548,   -139,    789,
 		  2187,   3800,   5230,   6071,   6071,   5230,   3800,   2187,
@@ -353,8 +371,9 @@ constexpr fir_taps_real<24> taps_200k_wfm_decim_0 = {
 
 // IFIR prototype filter: fs=768000, pass=100000, stop=284000, decim=2, fout=384000
 constexpr fir_taps_real<16> taps_200k_wfm_decim_1 = {
-	.pass_frequency_normalized = 100000.0f / 768000.0f,
-	.stop_frequency_normalized = 284000.0f / 768000.0f,
+	.low_frequency_normalized = -100000.0f / 768000.0f,
+	.high_frequency_normalized = 100000.0f / 768000.0f,
+	.transition_normalized = 184000.0f / 768000.0f,
 	.taps = { {
 		   -67,   -123,    388,    622,  -1342,  -2185,   4599,  14486,
 		 14486,   4599,  -2185,  -1342,    622,    388,   -123,    -67,
@@ -369,8 +388,9 @@ constexpr fir_taps_real<16> taps_200k_wfm_decim_1 = {
  * sum(abs(taps)): 125270
  */
 constexpr fir_taps_real<64> taps_64_lp_156_198 {
-	.pass_frequency_normalized = 0.156f,
-	.stop_frequency_normalized = 0.196f,
+	.low_frequency_normalized = -0.156f,
+	.high_frequency_normalized = 0.156f,
+	.transition_normalized = 0.04f,
 	.taps = { {
 	   -27,    166,    104,    -36,   -174,   -129,    109,    287,
 	   148,   -232,   -430,   -130,    427,    597,     49,   -716,
@@ -387,8 +407,9 @@ constexpr fir_taps_real<64> taps_64_lp_156_198 {
 
 // IFIR image-reject filter: fs=2457600, pass=100000, stop=407200, decim=4, fout=614400
 static constexpr fir_taps_real<24> taps_200k_decim_0 = {
-	.pass_frequency_normalized = 100000.0f / 2457600.0f,
-	.stop_frequency_normalized = 407200.0f / 2457600.0f,
+	.low_frequency_normalized = -100000.0f / 2457600.0f,
+	.high_frequency_normalized = 100000.0f / 2457600.0f,
+	.transition_normalized = 307200.0f / 2457600.0f,
 	.taps = { {
 	    90,     94,      4,   -240,   -570,   -776,   -563,    309,
 	  1861,   3808,   5618,   6710,   6710,   5618,   3808,   1861,
@@ -398,8 +419,9 @@ static constexpr fir_taps_real<24> taps_200k_decim_0 = {
 
 // IFIR prototype filter: fs=614400, pass=100000, stop=207200, decim=2, fout=307200
 static constexpr fir_taps_real<16> taps_200k_decim_1 = {
-	.pass_frequency_normalized = 100000.0f / 614400.0f,
-	.stop_frequency_normalized = 207200.0f / 614400.0f,
+	.low_frequency_normalized = -100000.0f / 614400.0f,
+	.high_frequency_normalized = 100000.0f / 614400.0f,
+	.transition_normalized = 107200.0f / 614400.0f,
 	.taps = { {
 		  -132,   -256,    545,    834,  -1507,  -2401,   4666,  14583,
 		 14583,   4666,  -2401,  -1507,    834,    545,   -256,   -132,

firmware/common/dsp_iir.cpp

@@ -55,3 +55,29 @@ void IIRBiquadFilter::execute(const buffer_f32_t& buffer_in, const buffer_f32_t&
 void IIRBiquadFilter::execute_in_place(const buffer_f32_t& buffer) {
 	execute(buffer, buffer);
 }
+
+void IIRBiquadDF2Filter::configure(const iir_biquad_df2_config_t& config) {
+	b0 = config[0] / config[3];
+	b1 = config[1] / config[3];
+	b2 = config[2] / config[3];
+	a1 = config[4] / config[3];
+	a2 = config[5] / config[3];
+}
+
+//  scipy.signal.sosfilt
+//
+//  x_n = x[i, n]  # make a temporary copy
+//  # Use direct II transposed structure:
+//  x[i, n] = b[s, 0] * x_n + zi[i, s, 0]
+//  zi[i, s, 0] = (b[s, 1] * x_n - a[s, 0] * x[i, n] + zi[i, s, 1])
+//  zi[i, s, 1] = (b[s, 2] * x_n - a[s, 1] * x[i, n])
+
+float IIRBiquadDF2Filter::execute(float x) {
+	float y;
+	
+	y = b0 * x + z0;
+	z0 = b1 * x - a1 * y + z1;
+	z1 = b2 * x - a2 * y;
+
+	return y;
+}

firmware/common/dsp_iir.hpp

@@ -31,6 +31,9 @@ struct iir_biquad_config_t {
 	std::array<float, 3> a;
 };
 
+// 0..2 - b, 3..5 - a
+typedef std::array<float, 6> iir_biquad_df2_config_t;
+
 constexpr iir_biquad_config_t iir_config_passthrough {
 	{ { 1.0f, 0.0f, 0.0f } },
 	{ { 0.0f, 0.0f, 0.0f } },
@@ -67,4 +70,21 @@ private:
 	std::array<float, 3> y { { 0.0f, 0.0f, 0.0f } };
 };
 
+class IIRBiquadDF2Filter {
+public:
+
+	void configure(const iir_biquad_df2_config_t& config);
+	float execute(float z);
+
+private:
+	float b0 = 0;
+	float b1 = 0;
+	float b2 = 0;
+	float a1 = 0;
+	float a2 = 0;
+
+	float z0 = 0;
+	float z1 = 0;
+};
+
 #endif/*__DSP_IIR_H__*/

firmware/common/dsp_sos.cpp

@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2020 Belousov Oleg
+ *
+ * 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 "dsp_sos.hpp"

firmware/common/dsp_sos.hpp

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2020 Belousov Oleg
+ *
+ * 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 __DSP_SOS_H__
+#define __DSP_SOS_H__
+
+#include "dsp_iir.hpp"
+
+#include <cstdint>
+#include <cstddef>
+
+template <size_t N>
+class SOSFilter {
+
+public:
+
+    void configure(const iir_biquad_df2_config_t config[N]) {
+        for (size_t i = 0; i < N; i++)
+            filters[i].configure(config[i]);
+    }
+
+    float execute(float value) {
+        for (auto &filter : filters)
+            value = filter.execute(value);
+        return value;
+    }
+
+private:
+
+    IIRBiquadDF2Filter filters[N];
+};
+
+#endif/*__DSP_SOS_H__*/

firmware/common/dsp_sos_config.hpp

@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2020 Belousov Oleg
+ *
+ * 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 __DSP_SOS_CONFIG_H__
+#define __DSP_SOS_CONFIG_H__
+
+#include "dsp_iir.hpp"
+
+// scipy.signal.iirfilter(ftype="ellip", N = 10, rp = 0.5, rs = 60.0, Wn = 0.5, btype = 'lowpass', output="sos")
+
+constexpr iir_biquad_df2_config_t half_band_lpf_config[5] = {
+	{ 0.02339042f,	0.0411599f,		0.02339042f,	1.0f,		-0.95317621f,	0.33446485f },
+	{ 1.0f,			0.82196114f,	1.0f,			1.0f,       -0.50327735f,	0.63611027f },
+	{ 1.0f,         0.32515305f,	1.0f,           1.0f,       -0.18144446f,   0.85269598f },
+	{ 1.0f,         0.14394122f,	1.0f,          	1.0f,       -0.04368236f,	0.94798064f },
+	{ 1.0f,         0.08720754,		1.0f,           1.0f,        0.00220944f,  	0.98743139f }
+};
+
+#endif/*__DSP_SOS_CONFIG_H__*/

firmware/common/field_reader.hpp

@@ -49,7 +49,7 @@ public:
 	/* The "start_bit" winds up being the MSB of the returned field value. */
 	/* The BitRemap functor determines which bits are read from the source
 	 * packet. */
-	uint32_t read(const size_t start_bit, const size_t length) const {
+	int32_t read(const size_t start_bit, const size_t length) const { //Euquiq: was uint32_t, used for calculating lat / lon in radiosondes, can be negative too
 		uint32_t value = 0;
 		for(size_t i=start_bit; i<(start_bit + length); i++) {
 			value = (value << 1) | data[bit_remap(i)];

firmware/common/message.hpp

@@ -36,6 +36,7 @@
 #include "adsb_frame.hpp"
 #include "ert_packet.hpp"
 #include "pocsag_packet.hpp"
+#include "aprs_packet.hpp"
 #include "sonde_packet.hpp"
 #include "tpms_packet.hpp"
 #include "jammer.hpp"
@@ -111,6 +112,8 @@ public:
 		AudioLevelReport = 51,
 		CodedSquelch = 52,
 		AudioSpectrum = 53,
+		APRSPacket = 54,
+		APRSRxConfigure = 55,
 		MAX
 	};
 
@@ -298,8 +301,9 @@ public:
 struct ChannelSpectrum {
 	std::array<uint8_t, 256> db { { 0 } };
 	uint32_t sampling_rate { 0 };
-	uint32_t channel_filter_pass_frequency { 0 };
-	uint32_t channel_filter_stop_frequency { 0 };
+	int32_t channel_filter_low_frequency { 0 };
+	int32_t channel_filter_high_frequency { 0 };
+	int32_t channel_filter_transition { 0 };
 };
 
 using ChannelSpectrumFIFO = FIFO<ChannelSpectrum>;
@@ -724,6 +728,18 @@ public:
 	const bool trigger_word;
 };
 
+class APRSRxConfigureMessage : public Message {
+public:
+	constexpr APRSRxConfigureMessage(
+		const uint32_t baudrate
+	) : Message { ID::APRSRxConfigure },
+		baudrate(baudrate)
+	{
+	}
+	
+	const uint32_t baudrate;
+};
+
 class BTLERxConfigureMessage : public Message {
 public:
 	constexpr BTLERxConfigureMessage(
@@ -855,13 +871,21 @@ public:
 		const float deviation_hz,
 		const float audio_gain,
 		const uint32_t tone_key_delta,
-		const float tone_key_mix_weight
+		const float tone_key_mix_weight,
+		const bool am_enabled,
+		const bool dsb_enabled,
+		const bool usb_enabled,
+		const bool lsb_enabled
 	) : Message { ID::AudioTXConfig },
 		divider(divider),
 		deviation_hz(deviation_hz),
 		audio_gain(audio_gain),
 		tone_key_delta(tone_key_delta),
-		tone_key_mix_weight(tone_key_mix_weight)
+		tone_key_mix_weight(tone_key_mix_weight),
+		am_enabled(am_enabled),
+		dsb_enabled(dsb_enabled),
+		usb_enabled(usb_enabled),
+		lsb_enabled(lsb_enabled)
 	{
 	}
 
@@ -870,6 +894,10 @@ public:
 	const float audio_gain;
 	const uint32_t tone_key_delta;
 	const float tone_key_mix_weight;
+	const bool am_enabled;
+	const bool dsb_enabled;
+	const bool usb_enabled;
+	const bool lsb_enabled;
 };
 
 class SigGenConfigMessage : public Message {
@@ -1001,6 +1029,19 @@ public:
 	const bool phase;
 };
 
+class APRSPacketMessage : public Message {
+public:
+	constexpr APRSPacketMessage(
+		const aprs::APRSPacket& packet
+	) : Message { ID::APRSPacket },
+		packet { packet }
+	{
+	}
+	
+	aprs::APRSPacket packet;
+};
+
+
 class ADSBConfigureMessage : public Message {
 public:
 	constexpr ADSBConfigureMessage(

firmware/common/pocsag.hpp

@@ -65,10 +65,11 @@ struct POCSAGState {
 	std::string output;
 };
 
-const pocsag::BitRate pocsag_bitrates[3] = {
+const pocsag::BitRate pocsag_bitrates[4] = {
 	pocsag::BitRate::FSK512,
 	pocsag::BitRate::FSK1200,
-	pocsag::BitRate::FSK2400
+	pocsag::BitRate::FSK2400,
+	pocsag::BitRate::FSK3200
 };
 
 std::string bitrate_str(BitRate bitrate);

firmware/common/pocsag_packet.hpp

@@ -34,7 +34,8 @@ enum BitRate : uint32_t {
 	UNKNOWN,
 	FSK512 = 512,
 	FSK1200 = 1200,
-	FSK2400 = 2400
+	FSK2400 = 2400,
+	FSK3200 = 3200
 };
 
 enum PacketFlag : uint32_t {
@@ -87,7 +88,7 @@ public:
 private:
 	BitRate bitrate_ { UNKNOWN };
 	PacketFlag flag_ { NORMAL };
-	std::array <uint32_t, 16> codewords;
+	std::array <uint32_t, 16> codewords { 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0  };
 	Timestamp timestamp_ { };
 };
 

firmware/common/portapack_persistent_memory.cpp

@@ -63,6 +63,10 @@ using modem_repeat_range_t = range_t<int32_t>;
 constexpr modem_repeat_range_t modem_repeat_range { 1, 99 };
 constexpr int32_t modem_repeat_reset_value { 5 };
 
+using clkout_freq_range_t = range_t<uint32_t>;
+constexpr clkout_freq_range_t clkout_freq_range { 10, 60000 };
+constexpr uint32_t clkout_freq_reset_value { 10000 };
+
 /* struct must pack the same way on M4 and M0 cores. */
 struct data_t {
 	int64_t tuned_frequency;
@@ -193,7 +197,7 @@ void set_serial_format(const serial_format_t new_value) {
 	data->serial_format = new_value;
 }
 
-static constexpr uint32_t playdead_magic = 0x88d3bb57;
+/* static constexpr uint32_t playdead_magic = 0x88d3bb57;
 
 uint32_t playing_dead() {
 	return data->playing_dead;
@@ -216,47 +220,59 @@ uint32_t playdead_sequence() {
 void set_playdead_sequence(const uint32_t new_value) {
 	data->playdead_sequence = new_value;
 	data->playdead_magic = playdead_magic;
+} */
+
+// ui_config is an uint32_t var storing information bitwise
+// bits 0,1,2 store the backlight timer
+// bits 31, 30,29,28,27 stores the different single bit configs depicted below
+// bits on position 4 to 19 (16 bits) store the clkout frequency
+
+bool clkout_enabled() {
+	return data->ui_config & (1 << 27);
 }
 
 bool config_speaker() {
-	return (data->ui_config & 0x10000000UL) ? false : true; // Default true
+	return data->ui_config & (1 << 28);
 }
 bool stealth_mode() {
-	return (data->ui_config & 0x20000000UL) ? true : false;
-}
-
-void set_config_speaker(bool new_value) {
-	data->ui_config = (data->ui_config & ~0x10000000UL) | (!new_value << 28); 
-}
-
-void set_stealth_mode(const bool v) {
-	data->ui_config = (data->ui_config & ~0x20000000UL) | (v << 29);
-}
-
-bool config_splash() {
-	return (data->ui_config & 0x80000000UL) ? true : false;
+	return data->ui_config & (1 << 29);
 }
 
 bool config_login() {
-	return (data->ui_config & 0x40000000UL) ? true : false;
+	return data->ui_config & (1 << 30);
+}
+
+bool config_splash() {
+	return data->ui_config & (1 << 31);
 }
 
 uint32_t config_backlight_timer() {
 	const uint32_t timer_seconds[8] = { 0, 5, 15, 30, 60, 180, 300, 600 };
-
-	return timer_seconds[data->ui_config & 0x00000007UL];
+	return timer_seconds[data->ui_config & 7]; //first three bits, 8 possible values
 }
 
-void set_config_splash(bool v) {
-	data->ui_config = (data->ui_config & ~0x80000000UL) | (v << 31);
+void set_clkout_enabled(bool v) {
+	data->ui_config = (data->ui_config & ~(1 << 27)) | (v << 27);
+}
+
+void set_config_speaker(bool v) {
+	data->ui_config = (data->ui_config & ~(1 << 28)) | (v << 28);
+}
+
+void set_stealth_mode(bool v) {
+	data->ui_config = (data->ui_config & ~(1 << 29)) | (v << 29);
 }
 
 void set_config_login(bool v) {
-	data->ui_config = (data->ui_config & ~0x40000000UL) | (v << 30);
+	data->ui_config = (data->ui_config & ~(1 << 30)) | (v << 30);
+}
+
+void set_config_splash(bool v) {
+	data->ui_config = (data->ui_config & ~(1 << 31)) | (v << 31);
 }
 
 void set_config_backlight_timer(uint32_t i) {
-	data->ui_config = (data->ui_config & ~0x00000007UL) | (i & 7);
+	data->ui_config = (data->ui_config & ~7) | (i & 7);
 }
 
 /*void set_config_textentry(uint8_t new_value) {
@@ -287,5 +303,21 @@ void set_pocsag_ignore_address(uint32_t address) {
 	data->pocsag_ignore_address = address;
 }
 
+uint32_t clkout_freq() {
+	uint16_t freq = (data->ui_config & 0x000FFFF0) >> 4;
+	if(freq < clkout_freq_range.minimum || freq > clkout_freq_range.maximum) {
+		data->ui_config = (data->ui_config & ~0x000FFFF0) | clkout_freq_reset_value << 4;
+		return clkout_freq_reset_value;
+	}
+	else {
+		return freq;
+	}
+}
+
+void set_clkout_freq(uint32_t freq) {
+	data->ui_config = (data->ui_config & ~0x000FFFF0) | (clkout_freq_range.clip(freq) << 4);
+}
+
+
 } /* namespace persistent_memory */
 } /* namespace portapack */

firmware/common/portapack_persistent_memory.hpp

@@ -81,7 +81,7 @@ uint32_t config_backlight_timer();
 
 void set_config_splash(bool v);
 void set_config_login(bool v);
-void set_config_speaker(bool new_value); 
+void set_config_speaker(bool v); 
 void set_config_backlight_timer(uint32_t i);
 
 //uint8_t ui_config_textentry();
@@ -93,6 +93,11 @@ void set_pocsag_last_address(uint32_t address);
 uint32_t pocsag_ignore_address();
 void set_pocsag_ignore_address(uint32_t address);
 
+bool clkout_enabled();
+void set_clkout_enabled(bool v);
+uint32_t clkout_freq();
+void set_clkout_freq(uint32_t freq);
+
 } /* namespace persistent_memory */
 } /* namespace portapack */
 

firmware/common/sonde_packet.cpp

@@ -27,6 +27,9 @@
 
 namespace sonde {
 
+static uint8_t calibytes[51*16];	//need these vars to survive
+static uint8_t calfrchk[51];		//so subframes are preserved while populated
+
 //Defines for Vaisala RS41, from https://github.com/rs1729/RS/blob/master/rs41/rs41sg.c
 #define MASK_LEN 64
 

firmware/common/sonde_packet.hpp

@@ -32,9 +32,6 @@
 
 namespace sonde {
 
-	static uint8_t calibytes[51*16];	//need these vars to survive
-	static uint8_t calfrchk[51];		//so subframes are preserved while populated
-
 	struct GPS_data {
 		uint32_t alt { 0 };
 		float lat { 0 };
@@ -105,4 +102,4 @@ private:
 
 } /* namespace sonde */
 
-#endif/*__SONDE_PACKET_H__*/
+#endif/*__SONDE_PACKET_H__*/

firmware/common/spi_image.hpp

@@ -34,6 +34,7 @@ namespace portapack {
 namespace spi_flash {
 
 struct image_tag_t {
+
 	constexpr image_tag_t(
 	) : c { 0, 0, 0, 0 }
 	{
@@ -45,6 +46,14 @@ struct image_tag_t {
 	{
 	}
 
+	image_tag_t(const image_tag_t& other)
+	{
+		c[0] = other.c[0];
+		c[1] = other.c[1];
+		c[2] = other.c[2];
+		c[3] = other.c[3];
+	}
+
 	image_tag_t& operator=(const image_tag_t& other) {
 		c[0] = other.c[0];
 		c[1] = other.c[1];
@@ -68,6 +77,7 @@ private:
 constexpr image_tag_t image_tag_acars				{ 'P', 'A', 'C', 'A' };
 constexpr image_tag_t image_tag_adsb_rx				{ 'P', 'A', 'D', 'R' };
 constexpr image_tag_t image_tag_afsk_rx				{ 'P', 'A', 'F', 'R' };
+constexpr image_tag_t image_tag_aprs_rx				{ 'P', 'A', 'P', 'R' };
 constexpr image_tag_t image_tag_btle_rx				{ 'P', 'B', 'T', 'R' };
 constexpr image_tag_t image_tag_nrf_rx				{ 'P', 'N', 'R', 'R' };
 constexpr image_tag_t image_tag_ais					{ 'P', 'A', 'I', 'S' };

firmware/common/ui_widget.cpp

@@ -597,11 +597,14 @@ Console::Console(
 void Console::clear(bool clear_buffer = false) {
 	if(clear_buffer)
 		buffer.clear();
-		
-	display.fill_rectangle(
-		screen_rect(),
-		Color::black()
-	);
+
+	if(!hidden() && visible()){
+		display.fill_rectangle(
+			screen_rect(),
+			Color::black()
+		);
+	}
+	
 	pos = { 0, 0 };
 }
 
@@ -648,8 +651,7 @@ void Console::write(std::string message) {
 }
 
 void Console::writeln(std::string message) {
-	write(message);
-	write("\n");
+	write(message + "\n");
 	//crlf();
 }
 
@@ -658,18 +660,31 @@ void Console::paint(Painter&) {
 }
 
 void Console::on_show() {
-	const auto screen_r = screen_rect();
-	display.scroll_set_area(screen_r.top(), screen_r.bottom());
-	display.scroll_set_position(0);
+	enable_scrolling(true);
 	clear();
 	//visible = true;
 }
 
+bool Console::scrolling_enabled = false;
+
+void Console::enable_scrolling(bool enable){
+	if(enable){
+		const auto screen_r = screen_rect();
+		display.scroll_set_area(screen_r.top(), screen_r.bottom());
+		display.scroll_set_position(0);
+		scrolling_enabled = true;
+	}
+	else {
+		display.scroll_disable();
+		scrolling_enabled = false;
+	}	
+}
+
 void Console::on_hide() {
 	/* TODO: Clear region to eliminate brief flash of content at un-shifted
 	 * position?
 	 */
-	display.scroll_disable();
+	enable_scrolling(false);
 	//visible = false;
 }
 
@@ -682,6 +697,9 @@ void Console::crlf() {
 	pos = { 0, pos.y() + line_height };
 	const int32_t y_excess = pos.y() + line_height - sr.height();
 	if( y_excess > 0 ) {
+		if(!scrolling_enabled){
+			enable_scrolling(true);
+		}
 		display.scroll(-y_excess);
 		pos = { pos.x(), pos.y() - y_excess };
 
@@ -913,12 +931,12 @@ bool Button::on_touch(const TouchEvent event) {
 	case TouchEvent::Type::End:
 		set_highlighted(false);
 		set_dirty();
-		if( on_select && !instant_exec_ ) {
-			on_select(*this);
-		}
 		if( on_touch_release) {
 			on_touch_release(*this);
 		}
+		if( on_select && !instant_exec_ ) {
+			on_select(*this);
+		}
 		return true;
 
 	default:
@@ -1293,9 +1311,9 @@ size_t OptionsField::selected_index_value() const {
 	return options[selected_index_].second;
 }
 
-void OptionsField::set_selected_index(const size_t new_index) {
+void OptionsField::set_selected_index(const size_t new_index, bool trigger_change) {
 	if( new_index < options.size() ) {
-		if( new_index != selected_index() ) {
+		if( new_index != selected_index() || trigger_change) {
 			selected_index_ = new_index;
 			if( on_change ) {
 				on_change(selected_index(), options[selected_index()].second);

firmware/common/ui_widget.hpp

@@ -325,6 +325,7 @@ public:
 
 	void paint(Painter&) override;
 	
+	void enable_scrolling(bool enable);
 	void on_show() override;
 	void on_hide() override;
 
@@ -332,6 +333,7 @@ private:
 	//bool visible = false;
 	Point pos { 0, 0 };
 	std::string buffer { };
+	static bool scrolling_enabled;
 
 	void crlf();
 };
@@ -378,8 +380,8 @@ private:
 class Button : public Widget {
 public:
 	std::function<void(Button&)> on_select { };
-	std::function<void(Button&)> on_touch_release { nullptr }; // Executed when releasing touch, after on_select.
-	std::function<void(Button&)> on_touch_press { nullptr }; // Executed when touching, before on_select.
+	std::function<void(Button&)> on_touch_release { }; // Executed when releasing touch, after on_select.
+	std::function<void(Button&)> on_touch_press { }; // Executed when touching, before on_select.
 	std::function<bool(Button&, KeyEvent)> on_dir { };
 	std::function<void(Button&)> on_highlight { };
 
@@ -545,7 +547,7 @@ public:
 
 	size_t selected_index() const;
 	size_t selected_index_value() const;
-	void set_selected_index(const size_t new_index);
+	void set_selected_index(const size_t new_index, bool trigger_change = true);
 
 	void set_by_value(value_t v);
 

firmware/tools/generate_world_map.bin.py

@@ -33,6 +33,8 @@ pix = im.load()
 outfile.write(struct.pack('H', im.size[0]))
 outfile.write(struct.pack('H', im.size[1]))
 
+print("Generating: \t" + outfile.name + "\n from\t\t" + im.filename + "\n please wait...");
+
 for y in range (0, im.size[1]):
 	line = ''
 	for x in range (0, im.size[0]):
@@ -45,6 +47,8 @@ for y in range (0, im.size[1]):
 		# pixel_lcd = (pix[x, y][0] >> 5) << 5
 		# pixel_lcd |= (pix[x, y][1] >> 5) << 2
 		# pixel_lcd |= (pix[x, y][2] >> 6)
-		line += struct.pack('H', pixel_lcd)
-	outfile.write(line)
+		line += str(struct.pack('H', pixel_lcd))
+	outfile.write(line.encode('utf-8'))
 	print(str(y) + '/' + str(im.size[1]) + '\r', end="")
+
+print("Ready.");