Merge pull request #1 from eried/next

Sync with upstream

Author: arneluehrs

.gitignore

@@ -63,4 +63,10 @@ CMakeFiles/
 
 # Host OS leftovers
 .DS_Store
-/firmware/CMakeCache.txt
+/firmware/CMakeCache.txt
+
+# Python env
+env/
+
+# Other
+*.bak

LICENSE

@@ -0,0 +1,7 @@
+# License 
+Portapack Mayhem is distributed under [GPL v3.0](LICENSE), however some sub projects might have different (GPL v3.0 compatible) licenses.
+
+## Other Licenses (compatible with GPL v3.0)
+- Most of Portapack Mayhem is distributed under GPL-2.0-or-later. [license](LICENSE.GPL-2.0-or-later)
+- ChibiOS is distributed under GPL v3.0. [license](/firmware/chibios/license.txt)
+- Portapack-ChibiOS is distributed under Apache-2.0 [license](http://www.apache.org/licenses/LICENSE-2.0)

LICENSE.GPL-2.0-or-later

@@ -1,12 +1,12 @@
 # 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)
+[![Build Status](https://travis-ci.com/eried/portapack-mayhem.svg?branch=master)](https://travis-ci.com/eried/portapack-mayhem) [![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)
 
 This is a fork of the [Havoc](https://github.com/furrtek/portapack-havoc/) firmware, which itself was a fork of the [PortaPack](https://github.com/sharebrained/portapack-hackrf) firmware, an add-on for the [HackRF](http://greatscottgadgets.com/hackrf/). A fork is a derivate, in this case one that has extra features and fixes when compared to the older versions.
 
 [<img src="https://raw.githubusercontent.com/wiki/eried/portapack-mayhem/img/hw_overview_h2_front.png" height="400">](https://github.com/eried/portapack-mayhem/wiki/Hardware-overview) [<img src="https://raw.githubusercontent.com/wiki/eried/portapack-mayhem/img/hw_overview_h2_inside.png" height="400">](https://github.com/eried/portapack-mayhem/wiki/Hardware-overview#portapack-internals)
 
-*[PortaPack H2+HackRF+battery](https://s.click.aliexpress.com/e/_dZ7lA96) (clone) with a custom [3d printed case](https://github.com/eried/portapack-mayhem/wiki/H2-Enclosure)*
+*[PortaPack H2+HackRF+battery](https://s.click.aliexpress.com/e/_9zbXMk) (clone) with a custom [3d printed case](https://github.com/eried/portapack-mayhem/wiki/H2-Enclosure)*
 
 # Quick overview
 
@@ -20,13 +20,13 @@ This repository expands upon the previous work by many people and aims to consta
 
 ## Does it work on H1/H2 PortaPack?
 
-Yes, both devices are the [same](https://github.com/eried/portapack-mayhem/wiki/First-steps). The one I am using to test all changes is this [PortaPack H2+HackRF+battery](https://s.click.aliexpress.com/e/_dZ7lA96), which is a kit that includes everything you need. Sadly, the people making the H2 never made the updated schematics available, which is not ideal (and goes against the terms of the license). Most members of the community are using a clone of the [PortaPack H1+HackRF+metal case](https://s.click.aliexpress.com/e/_dS6liw4), which does not include any battery functionality, but it is a cheaper alternative.
+Yes, both devices are the [same](https://github.com/eried/portapack-mayhem/wiki/First-steps). The one I am using to test all changes is this [PortaPack H2+HackRF+battery](https://s.click.aliexpress.com/e/_9zbXMk), which is a kit that includes everything you need. Sadly, the people making the H2 never made the updated schematics available, which is not ideal (and goes against the terms of the license). Most members of the community are using a clone of the [PortaPack H1+HackRF+metal case](https://s.click.aliexpress.com/e/_dS6liw4), which does not include any battery functionality, but it is a cheaper alternative.
 
 To support the people behind the hardware, please buy a genuine [HackRF](https://greatscottgadgets.com/hackrf/) and [PortaPack](https://store.sharebrained.com/products/portapack-for-hackrf-one-kit).
 
 ## Where is the latest firmware?
 
-The current stable release is on the [![GitHub release (latest by date)](https://img.shields.io/github/v/release/eried/portapack-mayhem?label=Releases&style=social)](https://github.com/eried/portapack-mayhem/releases/latest) page. Follow the instructions you can find in the release description. There is also [nightly builds](https://github.com/eried/portapack-mayhem/releases/tag/nightly) generated periodically, which include the latest commits, but they may contain incomplete or buggy functionality.
+The current stable release is on the [![GitHub release (latest by date)](https://img.shields.io/github/v/release/eried/portapack-mayhem?label=Releases&style=social)](https://github.com/eried/portapack-mayhem/releases/latest) page. Follow the instructions you can find in the release description. 
 
 ## Is this the newest firmware for my PortaPack? 
 Most probably: **YES**. *If you find new features somewhere else, please [suggest](https://github.com/eried/portapack-mayhem/issues/new/choose) them*.

LICENSE.md

@@ -172,6 +172,7 @@ set(CPPSRC
 	irq_rtc.cpp
 	log_file.cpp
 	portapack.cpp
+	qrcodegen.cpp
 	radio.cpp
 	receiver_model.cpp
 	recent_entries.cpp
@@ -206,6 +207,7 @@ set(CPPSRC
 	ui/ui_channel.cpp
 	ui/ui_font_fixed_8x16.cpp
 	ui/ui_geomap.cpp
+        ui/ui_qrcode.cpp
 	ui/ui_menu.cpp
 	ui/ui_btngrid.cpp
 	ui/ui_receiver.cpp

README.md

@@ -59,7 +59,7 @@ static float latlon_float(const int32_t normalized) {
 static std::string mmsi(
 	const ais::MMSI& mmsi
 ) {
-	return to_string_dec_uint(mmsi, 9);
+	return to_string_dec_uint(mmsi, 9, '0'); // MMSI is always is always 9 characters pre-padded with zeros
 }
 
 static std::string navigational_status(const unsigned int value) {
@@ -240,7 +240,7 @@ AISRecentEntryDetailView::AISRecentEntryDetailView(NavigationView& nav) {
 
 void AISRecentEntryDetailView::update_position() {
 	if (send_updates)
-		geomap_view->update_position(ais::format::latlon_float(entry_.last_position.latitude.normalized()), ais::format::latlon_float(entry_.last_position.longitude.normalized()), (float)entry_.last_position.true_heading);
+		geomap_view->update_position(ais::format::latlon_float(entry_.last_position.latitude.normalized()), ais::format::latlon_float(entry_.last_position.longitude.normalized()), (float)entry_.last_position.true_heading, 0);
 }
 
 void AISRecentEntryDetailView::focus() {
@@ -307,17 +307,22 @@ AISAppView::AISAppView(NavigationView& nav) : nav_ { nav } {
 	recent_entry_detail_view.hidden(true);
 
 	target_frequency_ = initial_target_frequency;
+  
+    receiver_model.set_tuning_frequency(tuning_frequency());
+    receiver_model.set_sampling_rate(sampling_rate);
+    receiver_model.set_baseband_bandwidth(baseband_bandwidth);
+    receiver_model.enable();  // Before using radio::enable(), but not updating Ant.DC-Bias.
 
-	radio::enable({
+/*  radio::enable({     //  this can be removed, previous version,no DC-bias control.
 		tuning_frequency(),
 		sampling_rate,
 		baseband_bandwidth,
 		rf::Direction::Receive,
 		receiver_model.rf_amp(),
 		static_cast<int8_t>(receiver_model.lna()),
 		static_cast<int8_t>(receiver_model.vga()),
-	});
-
+	}); */
+	
 	options_channel.on_change = [this](size_t, OptionsField::value_t v) {
 		this->on_frequency_changed(v);
 	};
@@ -337,7 +342,8 @@ AISAppView::AISAppView(NavigationView& nav) : nav_ { nav } {
 }
 
 AISAppView::~AISAppView() {
-	radio::disable();
+/*	radio::disable();  */
+	receiver_model.disable();   // to switch off all, including DC bias.
 
 	baseband::shutdown();
 }

firmware/application/CMakeLists.txt

@@ -74,17 +74,58 @@ CaptureAppView::CaptureAppView(NavigationView& nav) {
 
 	option_bandwidth.on_change = [this](size_t, uint32_t base_rate) {
 		sampling_rate = 8 * base_rate;	// Decimation by 8 done on baseband side
-		
+  	    /* base_rate  is used for FFT calculation and display LCD, and also in  recording writing SD Card  rate. */
+		/* ex. sampling_rate values, 4Mhz, when recording 500 kHz (BW) and fs 8 Mhz , when selected 1 Mhz BW ...*/ 
+	    /* ex. recording 500kHz BW  to .C16 file, base_rate clock 500kHz x2(I,Q) x 2 bytes (int signed) =2MB/sec rate SD Card  */
+
 		waterfall.on_hide();
 		record_view.set_sampling_rate(sampling_rate);
 		receiver_model.set_sampling_rate(sampling_rate);
+       /* Set up  proper anti aliasing BPF bandwith in MAX2837 before ADC sampling according to the new added BW Options . */ 
+		
+		switch(sampling_rate) {   // we use the var fs (sampling_rate) , to set up BPF aprox < fs_max/2 by Nyquist theorem. 
+	  
+	  			case 0 ... 2000000:  //  BW Captured range  (0 <= 250kHz max )  fs = 8 x 250 kHz 
+					anti_alias_baseband_bandwidth_filter = 1750000;  // Minimum BPF MAX2837 for all those lower BW options.
+        	 		break;
+
+				case 4000000 ... 6000000:    // BW capture  range (500k ... 750kHz max )  fs_max = 8 x 750kHz = 6Mhz 
+     				//  BW 500k ... 750kHz   ,  ex. 500kHz   (fs = 8*BW =  4Mhz) , BW 600kHz (fs = 4,8Mhz) , BW  750 kHz (fs = 6Mhz)  
+					anti_alias_baseband_bandwidth_filter = 2500000;  // in some IC MAX2837 appear 2250000 , but both works similar. 
+					break;	
+
+				case 8800000:    // BW capture 1,1Mhz  fs = 8 x 1,1Mhz = 8,8Mhz . (1Mhz showed slightly higher noise background).
+					anti_alias_baseband_bandwidth_filter = 3500000;   
+        	 		break;
+
+			    case 14000000:   // BW capture 1,75Mhz  , fs = 8 x 1,75Mhz = 14Mhz 
+				    // good BPF ,good matching, but LCD making flicker , refresh rate should be < 20 Hz , but reasonable picture   
+         			anti_alias_baseband_bandwidth_filter = 5000000; 
+        			break;
+
+    			case 16000000:   // BW capture 2Mhz  , fs = 8 x 2Mhz = 16Mhz
+                     //  good BPF ,good matching, but LCD making flicker , refresh rate should be < 20 Hz , but reasonable picture   
+         			anti_alias_baseband_bandwidth_filter = 6000000; 
+        			break;
+   
+            	case 20000000:   // BW capture 2,5Mhz  , fs= 8 x 2,5 Mhz = 20Mhz
+         			//  good BPF ,good matching, but LCD making flicker , refresh rate should be < 20 Hz , but reasonable picture 
+					 anti_alias_baseband_bandwidth_filter = 7000000; 
+	   	         	break;
+		   	
+      			default:         // BW capture 2,75Mhz, fs = 8 x 2,75Mhz= 22Mhz max ADC sampling)  and others.  
+        			 //  We tested also 9Mhz FPB stightly too much noise floor , better 8Mhz 
+					 anti_alias_baseband_bandwidth_filter = 8000000;
+		}   
+		receiver_model.set_baseband_bandwidth(anti_alias_baseband_bandwidth_filter);
+							
+		
 		waterfall.on_show();
 	};
 
-	option_bandwidth.set_selected_index(7);		// 500k
+	option_bandwidth.set_selected_index(7);		// 500k,  Preselected starting default option 500kHz 
 
 	receiver_model.set_modulation(ReceiverModel::Mode::Capture);
-	receiver_model.set_baseband_bandwidth(baseband_bandwidth);
 	receiver_model.enable();
 
 	record_view.on_error = [&nav](std::string message) {

firmware/application/apps/ais_app.cpp

@@ -48,7 +48,7 @@ class CaptureAppView : public View {
 	static constexpr ui::Dim header_height = 3 * 16;
 
 	uint32_t sampling_rate = 0;
-	static constexpr uint32_t baseband_bandwidth = 2500000;
+	uint32_t anti_alias_baseband_bandwidth_filter = 2500000; // we rename the previous var , and change type static constexpr to normal var.
 
 	void on_tuning_frequency_changed(rf::Frequency f);
 
@@ -95,7 +95,14 @@ class CaptureAppView : public View {
 			{ " 50k ", 50000 },
 			{ "100k ", 100000 },
 			{ "250k ", 250000 },
-			{ "500k ", 500000 }
+			{ "500k ", 500000 },   // Previous Limit bandwith Option with perfect micro SD write .C16 format operaton.
+			{ "600k ", 600000 },   // That extended option is still possible to record with FW version Mayhem v1.41 (< 2,5MB/sec)  
+ 			{ "750k ", 750000 },   // From that BW onwards, the LCD is ok, but the recorded file is auto decimated,(not real file size) 
+			{ "1100k", 1100000 },
+	       	{ "1750k", 1750000 },
+			{ "2000k", 2000000 },
+			{ "2500k", 2500000 },
+			{ "2750k", 2750000 }    // That is our max Capture option , to keep using later / 8 decimation (22Mhz sampling  ADC)
 		}
 	};