Merge branch 'main' into 2.5.8

meshtastic · Oct 5, 2024 · 386042b · 386042b
2 parents 691fcad + 51c8e16
commit 386042b
Show file tree

Hide file tree

Showing 15 changed files with 929 additions and 181 deletions.
diff --git a/Localizable.xcstrings b/Localizable.xcstrings
@@ -194,6 +194,9 @@
     },
     "256 bit" : {
 
+    },
+    "A Trace Route was sent, no response has been received." : {
+
     },
     "about" : {
       "localizations" : {
@@ -17579,6 +17582,9 @@
     },
     "Rotary 1" : {
 
+    },
+    "Route Back: %@" : {
+
     },
     "Route Lines" : {
 
@@ -20156,7 +20162,7 @@
     "Store and forward clients can request history from routers on the network." : {
 
     },
-    "Store and forward router devices must also be in the router or router client device role and requires a ESP32 device with PSRAM." : {
+    "Store and forward router devices require a ESP32 device with PSRAM." : {
 
     },
     "storeforward" : {
@@ -21859,14 +21865,27 @@
     "Trace Route Log" : {
 
     },
-    "Trace route received directly by %@" : {
-
+    "Trace route received directly by %@ with a SNR of %@ dB" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Trace route received directly by %1$@ with a SNR of %2$@ dB"
+          }
+        }
+      }
     },
     "Trace Route Sent" : {
 
     },
     "Trace route sent to %@" : {
 
+    },
+    "Trace route to %@ was not sent." : {
+
+    },
+    "Trace Route was rate limited. You can send a trace route a maximum of once every thirty seconds." : {
+
     },
     "Traffic" : {
 

diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj
@@ -100,6 +100,7 @@
 		DD6193752862F6E600E59241 /* ExternalNotificationConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD6193742862F6E600E59241 /* ExternalNotificationConfig.swift */; };
 		DD6193772862F90F00E59241 /* CannedMessagesConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD6193762862F90F00E59241 /* CannedMessagesConfig.swift */; };
 		DD6193792863875F00E59241 /* SerialConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD6193782863875F00E59241 /* SerialConfig.swift */; };
+		DD6D5A332CA1178300ED3032 /* TraceRoute.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD6D5A322CA1178300ED3032 /* TraceRoute.swift */; };
 		DD6F65722C6AB8EC0053C113 /* SecureInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD6F65712C6AB8EC0053C113 /* SecureInput.swift */; };
 		DD6F65742C6CB80A0053C113 /* View.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD6F65732C6CB80A0053C113 /* View.swift */; };
 		DD6F65762C6EA5490053C113 /* AckErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD6F65752C6EA5490053C113 /* AckErrors.swift */; };
@@ -365,6 +366,8 @@
 		DD6193762862F90F00E59241 /* CannedMessagesConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CannedMessagesConfig.swift; sourceTree = "<group>"; };
 		DD6193782863875F00E59241 /* SerialConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SerialConfig.swift; sourceTree = "<group>"; };
 		DD68BAE72C417A74004C01A0 /* MeshtasticDataModelV 40.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MeshtasticDataModelV 40.xcdatamodel"; sourceTree = "<group>"; };
+		DD6D5A322CA1178300ED3032 /* TraceRoute.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TraceRoute.swift; sourceTree = "<group>"; };
+		DD6D5A342CA13BA600ED3032 /* MeshtasticDataModelV 45.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MeshtasticDataModelV 45.xcdatamodel"; sourceTree = "<group>"; };
 		DD6F65712C6AB8EC0053C113 /* SecureInput.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureInput.swift; sourceTree = "<group>"; };
 		DD6F65732C6CB80A0053C113 /* View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = View.swift; sourceTree = "<group>"; };
 		DD6F65752C6EA5490053C113 /* AckErrors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AckErrors.swift; sourceTree = "<group>"; };
@@ -747,6 +750,14 @@
 			path = Module;
 			sourceTree = "<group>";
 		};
+		DD6D5A312CA1176A00ED3032 /* Layouts */ = {
+			isa = PBXGroup;
+			children = (
+				DD6D5A322CA1178300ED3032 /* TraceRoute.swift */,
+			);
+			path = Layouts;
+			sourceTree = "<group>";
+		};
 		DD6F65772C6EAB860053C113 /* Help */ = {
 			isa = PBXGroup;
 			children = (
@@ -901,6 +912,7 @@
 		DDC2E18726CE24E40042C5E4 /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				DD6D5A312CA1176A00ED3032 /* Layouts */,
 				C9483F6B2773016700998F6B /* MapKitMap */,
 				DDC2E18D26CE25CB0042C5E4 /* Helpers */,
 				DD47E3D726F2F21A00029299 /* Bluetooth */,
@@ -1433,6 +1445,7 @@
 				DD6F65742C6CB80A0053C113 /* View.swift in Sources */,
 				DD1933762B0835D500771CD5 /* PositionAltitudeChart.swift in Sources */,
 				DD415828285859C4009B0E59 /* TelemetryConfig.swift in Sources */,
+				DD6D5A332CA1178300ED3032 /* TraceRoute.swift in Sources */,
 				DDB6CCFB2AAF805100945AF6 /* NodeMapSwiftUI.swift in Sources */,
 				BCB613872C69A0FB00485544 /* AppIntentErrors.swift in Sources */,
 				DD73FD1128750779000852D6 /* PositionLog.swift in Sources */,
@@ -1686,7 +1699,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.5.7;
+				MARKETING_VERSION = 2.5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = YES;
@@ -1720,7 +1733,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.5.7;
+				MARKETING_VERSION = 2.5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = YES;
@@ -1752,7 +1765,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.5.7;
+				MARKETING_VERSION = 2.5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1785,7 +1798,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.5.7;
+				MARKETING_VERSION = 2.5.8;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1897,6 +1910,7 @@
 		DD3CC6BA28E366DF00FA9159 /* Meshtastic.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
+				DD6D5A342CA13BA600ED3032 /* MeshtasticDataModelV 45.xcdatamodel */,
 				DD7CF8DA2C93663C008BD10E /* MeshtasticDataModelV 44.xcdatamodel */,
 				DD7E235F2C7AA3E50078ACDF /* MeshtasticDataModelV 43.xcdatamodel */,
 				DD1BD0F12C61D3AD008C0C70 /* MeshtasticDataModelV 42.xcdatamodel */,
@@ -1942,7 +1956,7 @@
 				DD5D0A9A2931AD6B00F7EA61 /* MeshtasticDataModelV2.xcdatamodel */,
 				DD3CC6BB28E366DF00FA9159 /* MeshtasticDataModel.xcdatamodel */,
 			);
-			currentVersion = DD7CF8DA2C93663C008BD10E /* MeshtasticDataModelV 44.xcdatamodel */;
+			currentVersion = DD6D5A342CA13BA600ED3032 /* MeshtasticDataModelV 45.xcdatamodel */;
 			name = Meshtastic.xcdatamodeld;
 			path = Meshtastic/Meshtastic.xcdatamodeld;
 			sourceTree = "<group>";

diff --git a/Meshtastic/Extensions/CoreData/NodeInfoEntityExtension.swift b/Meshtastic/Extensions/CoreData/NodeInfoEntityExtension.swift
@@ -23,7 +23,7 @@ extension NodeInfoEntity {
 	}
 
 	var hasPositions: Bool {
-		return positions?.count ?? 0 > 0
+		return self.positions?.count ?? 0 > 0
 	}
 
 	var hasDeviceMetrics: Bool {

diff --git a/Meshtastic/Extensions/CoreData/TraceRouteEntityExtension.swift b/Meshtastic/Extensions/CoreData/TraceRouteEntityExtension.swift
@@ -10,36 +10,6 @@ import CoreLocation
 import MapKit
 import SwiftUI
 
-extension TraceRouteEntity {
-
-	var latitude: Double? {
-
-		let d = Double(latitudeI)
-		if d == 0 {
-			return 0
-		}
-		return d / 1e7
-	}
-
-	var longitude: Double? {
-
-		let d = Double(longitudeI)
-		if d == 0 {
-			return 0
-		}
-		return d / 1e7
-	}
-
-	var coordinate: CLLocationCoordinate2D? {
-		if latitudeI != 0 && longitudeI != 0 {
-			let coord = CLLocationCoordinate2D(latitude: latitude!, longitude: longitude!)
-			return coord
-		} else {
-		   return nil
-		}
-	}
-}
-
 extension TraceRouteHopEntity {
 
 	var latitude: Double? {