From 0fe00b0db013e742c7c4a1e3814451b5dbca06f2 Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Sat, 31 Aug 2024 15:04:25 -0700
Subject: [PATCH 1/2] Adjust precision on channel form

---
 Meshtastic/Views/Settings/Channels/ChannelForm.swift | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Meshtastic/Views/Settings/Channels/ChannelForm.swift b/Meshtastic/Views/Settings/Channels/ChannelForm.swift
index d44d959e1..d0a111e5d 100644
--- a/Meshtastic/Views/Settings/Channels/ChannelForm.swift
+++ b/Meshtastic/Views/Settings/Channels/ChannelForm.swift
@@ -202,7 +202,9 @@ struct ChannelForm: View {
 			}
 			.onChange(of: channelKeySize) { _ in
 				if channelKeySize == -1 {
-					preciseLocation = false
+					if channelRole == 0 {
+						preciseLocation = false
+					}
 					channelKey = "AQ=="
 				}
 			}
@@ -211,7 +213,7 @@ struct ChannelForm: View {
 			}
 			.onChange(of: preciseLocation) { loc in
 				if loc == true {
-					if channelKey == "AQ==" {
+					if channelKey == "AQ==" && channelRole == 0 {
 						preciseLocation = false
 					} else {
 						positionPrecision = 32

From bff990357390cbedf03284524e501e7aeed96124 Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Sat, 31 Aug 2024 15:35:26 -0700
Subject: [PATCH 2/2] Packets bad.  GUVWAF has verified that these are bad
 packets, may have fixed a bug up stream in the process that was exposed by
 having the data available.

---
 Localizable.xcstrings                    | 6 +++---
 Meshtastic/Views/Bluetooth/Connect.swift | 2 +-
 Widgets/WidgetsLiveActivity.swift        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Localizable.xcstrings b/Localizable.xcstrings
index cf5fc247e..411af16d8 100644
--- a/Localizable.xcstrings
+++ b/Localizable.xcstrings
@@ -1428,6 +1428,9 @@
     },
     "Bad" : {
 
+    },
+    "Bad Packets: %d" : {
+
     },
     "Bandwidth" : {
 
@@ -6725,9 +6728,6 @@
     },
     "Drag & Drop is the recommended way to update firmware for NRF devices. If your iPhone or iPad is USB-C it will work with your regular USB-C charging cable, for lightning devices you need the Apple Lightning to USB camera adaptor." : {
 
-    },
-    "Dupe / Bad Packets: %d" : {
-
     },
     "echo" : {
       "localizations" : {
diff --git a/Meshtastic/Views/Bluetooth/Connect.swift b/Meshtastic/Views/Bluetooth/Connect.swift
index a7c7d5b8a..2a1eea84d 100644
--- a/Meshtastic/Views/Bluetooth/Connect.swift
+++ b/Meshtastic/Views/Bluetooth/Connect.swift
@@ -119,7 +119,7 @@ struct Connect: View {
 												.font(.caption)
 												.fontWeight(.medium)
 												.foregroundStyle(.secondary)
-											Text("Dupe / Bad Packets: \(localStats?.numPacketsRxBad ?? 0)")
+											Text("Bad Packets: \(localStats?.numPacketsRxBad ?? 0)")
 												.font(.caption)
 												.fontWeight(.medium)
 												.foregroundStyle(.secondary)
diff --git a/Widgets/WidgetsLiveActivity.swift b/Widgets/WidgetsLiveActivity.swift
index 14d9762f5..e61771290 100644
--- a/Widgets/WidgetsLiveActivity.swift
+++ b/Widgets/WidgetsLiveActivity.swift
@@ -81,7 +81,7 @@ struct WidgetsLiveActivity: Widget {
 						.font(.caption)
 						.foregroundStyle(.secondary)
 						.fixedSize()
-					Text("Dupe / Bad \(context.state.badReceivedPackets)")
+					Text("Bad \(context.state.badReceivedPackets)")
 						.font(.caption)
 						.foregroundStyle(.secondary)
 						.fixedSize()
@@ -215,7 +215,7 @@ struct NodeInfoView: View {
 				.foregroundStyle(.secondary)
 				.opacity(isLuminanceReduced ? 0.8 : 1.0)
 				.fixedSize()
-			Text("Dupe / Bad Packets: \(badReceivedPackets)")
+			Text("Bad Packets: \(badReceivedPackets)")
 				.font(.caption)
 				.fontWeight(.medium)
 				.foregroundStyle(.secondary)