Merge pull request #909 from meshtastic/packets-bad

Packets bad
meshtastic · Sep 1, 2024 · 2441255 · 2441255
2 parents 9264559 + bff9903
commit 2441255
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -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/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

diff --git 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)