From 7fa92868d79b3c37f289d5d97443ea151ebef973 Mon Sep 17 00:00:00 2001
From: Jonathan Elder <john.elder.h@gmail.com>
Date: Sat, 6 Jun 2020 11:45:19 -0700
Subject: [PATCH 1/2] Scanner update

Renamed scanner squelch to trigger
Added squelch for audio output
---
 firmware/application/apps/ui_scanner.cpp | 12 ++++++++++--
 firmware/application/apps/ui_scanner.hpp | 17 +++++++++++++----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/firmware/application/apps/ui_scanner.cpp b/firmware/application/apps/ui_scanner.cpp
index 02b36370b..4ba63ffd7 100644
--- a/firmware/application/apps/ui_scanner.cpp
+++ b/firmware/application/apps/ui_scanner.cpp
@@ -104,6 +104,7 @@ ScannerView::ScannerView(
 		&field_rf_amp,
 		&field_volume,
 		&field_bw,
+		&field_trigger,
 		&field_squelch,
 		&field_wait,
 		//&record_view,
@@ -143,10 +144,17 @@ ScannerView::ScannerView(
 	};
 	field_wait.set_value(5);
 
+	field_trigger.on_change = [this](int32_t v) {
+		trigger = v;
+	};
+	field_trigger.set_value(30);
+	
+	field_squelch.set_value(receiver_model.squelch_level());
 	field_squelch.on_change = [this](int32_t v) {
 		squelch = v;
+		receiver_model.set_squelch_level(v);
 	};
-	field_squelch.set_value(30);
+
 
 	field_volume.set_value((receiver_model.headphone_volume() - audio::headphone::volume_range().max).decibel() + 99);
 	field_volume.on_change = [this](int32_t v) {
@@ -175,7 +183,7 @@ void ScannerView::on_statistics_update(const ChannelStatistics& statistics) {
 	if (timer <= wait)
 		timer++;
 	
-	if (max_db < -squelch) {
+	if (max_db < -trigger) {
 		if (timer == wait) {
 			//audio::output::stop();
 			scan_thread->set_scanning(true);
diff --git a/firmware/application/apps/ui_scanner.hpp b/firmware/application/apps/ui_scanner.hpp
index 52e48e290..6d5c84f2b 100644
--- a/firmware/application/apps/ui_scanner.hpp
+++ b/firmware/application/apps/ui_scanner.hpp
@@ -66,6 +66,7 @@ private:
 	void handle_retune(uint32_t i);
 	
 	std::vector<rf::Frequency> frequency_list { };
+	int32_t trigger { 0 };
 	int32_t squelch { 0 };
 	uint32_t timer { 0 };
 	uint32_t wait { 0 };
@@ -73,8 +74,8 @@ private:
 	
 	Labels labels {
 		{ { 0 * 8, 0 * 16 }, "LNA:   VGA:   AMP:  VOL:", Color::light_grey() },
-		{ { 0 * 8, 1 * 16 }, "BW:    SQUELCH:  /99 WAIT:", Color::light_grey() },
-		{ { 0 * 8, 3 * 16 }, "Work in progress...", Color::light_grey() }
+		{ { 0 * 8, 1 * 16 }, "BW:    TR:  /99 SQ:  /99 WT:", Color::light_grey() },
+		{ { 0 * 8, 3 * 16 }, "Work in progress!", Color::light_grey() }
 	};
 	
 	LNAGainField field_lna {
@@ -107,8 +108,16 @@ private:
 		}
 	};
 
+	NumberField field_trigger {
+		{ 10 * 8, 1 * 16 },
+		2,
+		{ 0, 99 },
+		1,
+		' ',
+	};
+	
 	NumberField field_squelch {
-		{ 15 * 8, 1 * 16 },
+		{ 19 * 8, 1 * 16 },
 		2,
 		{ 0, 99 },
 		1,
@@ -116,7 +125,7 @@ private:
 	};
 
 	NumberField field_wait {
-		{ 26 * 8, 1 * 16 },
+		{ 28 * 8, 1 * 16 },
 		2,
 		{ 0, 99 },
 		1,

From 81d5ac4923094dffe53e24a1f32498bdd1c92062 Mon Sep 17 00:00:00 2001
From: eried <1091420+eried@users.noreply.github.com>
Date: Sun, 7 Jun 2020 04:33:47 +0200
Subject: [PATCH 2/2] Update ui_scanner.hpp

---
 firmware/application/apps/ui_scanner.hpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/firmware/application/apps/ui_scanner.hpp b/firmware/application/apps/ui_scanner.hpp
index 6d5c84f2b..02abe1ace 100644
--- a/firmware/application/apps/ui_scanner.hpp
+++ b/firmware/application/apps/ui_scanner.hpp
@@ -73,9 +73,9 @@ private:
 	freqman_db database { };
 	
 	Labels labels {
-		{ { 0 * 8, 0 * 16 }, "LNA:   VGA:   AMP:  VOL:", Color::light_grey() },
-		{ { 0 * 8, 1 * 16 }, "BW:    TR:  /99 SQ:  /99 WT:", Color::light_grey() },
-		{ { 0 * 8, 3 * 16 }, "Work in progress!", Color::light_grey() }
+		{ { 0 * 8, 0 * 16 }, "LNA:    TRIGGER:  /99   VOL:", Color::light_grey() },
+		{ { 0 * 8, 1 * 16 }, "VGA:    SQUELCH:  /99   AMP:", Color::light_grey() },
+		{ { 0 * 8, 2 * 16 }, " BW:       WAIT:", Color::light_grey() },
 	};
 	
 	LNAGainField field_lna {
@@ -83,15 +83,15 @@ private:
 	};
 
 	VGAGainField field_vga {
-		{ 11 * 8, 0 * 16 }
+		{ 4 * 8, 1 * 16 }
 	};
 	
 	RFAmpField field_rf_amp {
-		{ 18 * 8, 0 * 16 }
+		{ 28 * 8, 1 * 16 }
 	};
 	
 	NumberField field_volume {
-		{ 24 * 8, 0 * 16 },
+		{ 28 * 8, 0 * 16 },
 		2,
 		{ 0, 99 },
 		1,
@@ -99,7 +99,7 @@ private:
 	};
 
 	OptionsField field_bw {
-		{ 3 * 8, 1 * 16 },
+		{ 4 * 8, 2 * 16 },
 		3,
 		{
 			{ "8k5", 0 },
@@ -109,7 +109,7 @@ private:
 	};
 
 	NumberField field_trigger {
-		{ 10 * 8, 1 * 16 },
+		{ 16 * 8, 0 * 16 },
 		2,
 		{ 0, 99 },
 		1,
@@ -117,7 +117,7 @@ private:
 	};
 	
 	NumberField field_squelch {
-		{ 19 * 8, 1 * 16 },
+		{ 16 * 8, 1 * 16 },
 		2,
 		{ 0, 99 },
 		1,
@@ -125,7 +125,7 @@ private:
 	};
 
 	NumberField field_wait {
-		{ 28 * 8, 1 * 16 },
+		{ 16 * 8, 2 * 16 },
 		2,
 		{ 0, 99 },
 		1,