set position source

meshtastic · Aug 30, 2024 · bda868b · bda868b
1 parent 01b354e
commit bda868b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj
@@ -1686,7 +1686,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.5.2;
+				MARKETING_VERSION = 2.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = YES;
@@ -1721,7 +1721,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.5.2;
+				MARKETING_VERSION = 2.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = YES;
@@ -1753,7 +1753,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.5.2;
+				MARKETING_VERSION = 2.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1786,7 +1786,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.5.2;
+				MARKETING_VERSION = 2.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift
@@ -1153,7 +1153,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
 	}
 
 	@MainActor
-	public func getPositionFromPhoneGPS(destNum: Int64) -> Position? {
+	public func getPositionFromPhoneGPS(destNum: Int64, fixedPosition: Bool) -> Position? {
 		var positionPacket = Position()
 		if #available(iOS 17.0, macOS 14.0, *) {
 
@@ -1172,7 +1172,6 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
 			positionPacket.timestamp = UInt32(timestamp.timeIntervalSince1970)
 			positionPacket.altitude = Int32(lastLocation.altitude)
 			positionPacket.satsInView = UInt32(LocationsHandler.satsInView)
-
 			let currentSpeed = lastLocation.speed
 			if currentSpeed > 0 && (!currentSpeed.isNaN || !currentSpeed.isInfinite) {
 				positionPacket.groundSpeed = UInt32(currentSpeed)
@@ -1181,6 +1180,14 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
 			if (currentHeading > 0  && currentHeading <= 360) && (!currentHeading.isNaN || !currentHeading.isInfinite) {
 				positionPacket.groundTrack = UInt32(currentHeading)
 			}
+			/// Set location source for time
+			if !fixedPosition {
+				/// From GPS treat time as good
+				positionPacket.locationSource = Position.LocSource.locExternal
+			} else {
+				/// From GPS, but time can be old and have drifted
+				positionPacket.locationSource = Position.LocSource.locManual
+			}
 
 		} else {
 
@@ -1199,14 +1206,22 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
 			if (currentHeading > 0  && currentHeading <= 360) && (!currentHeading.isNaN || !currentHeading.isInfinite) {
 				positionPacket.groundTrack = UInt32(currentHeading)
 			}
+			/// Set location source for time
+			if !fixedPosition {
+				/// From GPS treat time as good
+				positionPacket.locationSource = Position.LocSource.locExternal
+			} else {
+				/// From GPS, but time can be old and have drifted
+				positionPacket.locationSource = Position.LocSource.locManual
+			}
 		}
 		return positionPacket
 	}
 
 	@MainActor
 	public func setFixedPosition(fromUser: UserEntity, channel: Int32) -> Bool {
 		var adminPacket = AdminMessage()
-		guard let positionPacket = getPositionFromPhoneGPS(destNum: fromUser.num) else {
+		guard let positionPacket = getPositionFromPhoneGPS(destNum: fromUser.num, fixedPosition: true) else {
 			return false
 		}
 		adminPacket.setFixedPosition = positionPacket
@@ -1261,7 +1276,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
 	@MainActor
 	public func sendPosition(channel: Int32, destNum: Int64, wantResponse: Bool) -> Bool {
 		let fromNodeNum = connectedPeripheral.num
-		guard let positionPacket = getPositionFromPhoneGPS(destNum: destNum) else {
+		guard let positionPacket = getPositionFromPhoneGPS(destNum: destNum, fixedPosition: false) else {
 			Logger.services.error("Unable to get position data from device GPS to send to node")
 			return false
 		}