From 7df7461d31a3751e5a51d13a274cd1b2a5225483 Mon Sep 17 00:00:00 2001
From: OneOfEleven <OneOfEleven@users.noreply.github.com>
Date: Sun, 1 Oct 2023 09:14:19 +0100
Subject: [PATCH] Fix dual-watch so that TX only uses the main channel (black
 triangle)

---
 firmware.bin        | Bin 58764 -> 58764 bytes
 firmware.packed.bin | Bin 58782 -> 58782 bytes
 radio.c             |   4 ++--
 ui/main.c           |   1 +
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/firmware.bin b/firmware.bin
index 5cef49eba767d38bbfb502b6d99c18ce42197a1a..1bbe20030e75557643c7ce676319a9b18ee3bed6 100644
GIT binary patch
delta 48
zcmeA<&D?XEd4uju)(bAm4=Xnt&8%<}OENbyF-$Y(<zg_*H#F3RayK8ie})wRxBC$m

delta 48
zcmeA<&D?XEd4uju){74-U5qyy&8%<}OH4IOPBXXU<zg_*H#F3RayK8ie})wR%8wEE

diff --git a/firmware.packed.bin b/firmware.packed.bin
index e4a4b111aacc358f297332372afd5fc4a44b90c9..52864bc97de15445ca75128f7c5f42b7fcaa504e 100644
GIT binary patch
delta 64
zcmV-G0Kfm9%LAUv1F!}l2P&h3R8hTHvkf3Hc?I^RZQ2&ILYa6*7GAR{63{3NVr=G-
W1%Zz1$43Z`Dfkex(BI4j0&GK5o*MN4

delta 64
zcmV-G0Kfm9%LAUv1F!}l2PyG~0|x9?vkf3Hc?I_XH-B8SLYa6*7G2>jMTdC;Vr=G-
W1%Zz1#1#zLeyJX_(BI4j0@7GEE*kRy

diff --git a/radio.c b/radio.c
index 175807b..c817da9 100644
--- a/radio.c
+++ b/radio.c
@@ -915,8 +915,8 @@ void RADIO_PrepareTX(void)
 		gDualWatchCountdown_10ms = dual_watch_count_after_tx_10ms;
 		gScheduleDualWatch       = false;
 
-		if (!gRxVfoIsActive)
-		{
+		if (gRxVfoIsActive)
+		{	// use the TX vfo
 			gEeprom.RX_CHANNEL = gEeprom.TX_CHANNEL;
 			gRxVfo             = &gEeprom.VfoInfo[gEeprom.TX_CHANNEL];
 			gRxVfoIsActive     = true;
diff --git a/ui/main.c b/ui/main.c
index a2670f4..2ada8a1 100644
--- a/ui/main.c
+++ b/ui/main.c
@@ -124,6 +124,7 @@ bool center_line_is_free = true;
 
 		const int16_t      s9_dBm       = s0_dBm + (6 * 9);      // S9 .. 6dB/S-Point
 		const int16_t      bar_max_dBm  = s9_dBm + 30;           // S9+30dB
+//		const int16_t      bar_min_dBm  = s0_dBm + (6 * 0);      // S0
 		const int16_t      bar_min_dBm  = s0_dBm + (6 * 4);      // S4
 
 		// ************