Merge branch '2.7.6' into firmware-updates

# Conflicts:
#	Localizable.xcstrings
#	Meshtastic.xcodeproj/project.pbxproj
#	Meshtastic.xcworkspace/xcshareddata/swiftpm/Package.resolved

Author: jake-b

Localizable.xcstrings

@@ -114,6 +114,7 @@
 		B3E905B12B71F7F300654D07 /* TextMessageField.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3E905B02B71F7F300654D07 /* TextMessageField.swift */; };
 		BC10380F2DD4334400B00BFA /* AddContactIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC10380E2DD4333C00B00BFA /* AddContactIntent.swift */; };
 		BC6B45FF2CB2F98900723CEB /* SaveChannelSettingsIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC6B45FE2CB2F98900723CEB /* SaveChannelSettingsIntent.swift */; };
+		BCA9A82C2EC802CF00166292 /* CompassView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCA9A82B2EC802CF00166292 /* CompassView.swift */; };
 		BCB35B4F2E5FC42500B04F60 /* MessageNodeIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCB35B4E2E5FC41E00B04F60 /* MessageNodeIntent.swift */; };
 		BCB613812C67290800485544 /* SendWaypointIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCB613802C67290800485544 /* SendWaypointIntent.swift */; };
 		BCB613832C672A2600485544 /* MessageChannelIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCB613822C672A2600485544 /* MessageChannelIntent.swift */; };
@@ -447,6 +448,7 @@
 		B3E905B02B71F7F300654D07 /* TextMessageField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextMessageField.swift; sourceTree = "<group>"; };
 		BC10380E2DD4333C00B00BFA /* AddContactIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddContactIntent.swift; sourceTree = "<group>"; };
 		BC6B45FE2CB2F98900723CEB /* SaveChannelSettingsIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SaveChannelSettingsIntent.swift; sourceTree = "<group>"; };
+		BCA9A82B2EC802CF00166292 /* CompassView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompassView.swift; sourceTree = "<group>"; };
 		BCB35B4E2E5FC41E00B04F60 /* MessageNodeIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageNodeIntent.swift; sourceTree = "<group>"; };
 		BCB613802C67290800485544 /* SendWaypointIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendWaypointIntent.swift; sourceTree = "<group>"; };
 		BCB613822C672A2600485544 /* MessageChannelIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageChannelIntent.swift; sourceTree = "<group>"; };
@@ -1457,6 +1459,7 @@
 				8D3F8A3E2D44BB02009EAAA4 /* PowerMetrics.swift */,
 				237B46952DC8F1C100B22D99 /* RateLimitedButton.swift */,
 				23A1AFB62E42BD2500E46C96 /* RXTXIndicatorView.swift */,
+				BCA9A82B2EC802CF00166292 /* CompassView.swift */,
 				23C2BD2A2EE8993800F6A997 /* DeviceHardwareImage.swift */,
 				23C2BE242EE9A8E100F6A997 /* SupportedHardwareBadge.swift */,
 			);
@@ -2039,6 +2042,7 @@
 				DDD94A502845C8F5004A87A0 /* DateTimeText.swift in Sources */,
 				23C2BE312EEB823900F6A997 /* NRFDFUSheet.swift in Sources */,
 				DDB6ABE228B13FB500384BA1 /* PositionConfigEnums.swift in Sources */,
+				BCA9A82C2EC802CF00166292 /* CompassView.swift in Sources */,
 				DD994B69295F88B60013760A /* IntervalEnums.swift in Sources */,
 				23D316932E5618D2002FA4FB /* AsyncGate.swift in Sources */,
 				23FF00B62E323C75001DF095 /* AccessoryManager+Connect.swift in Sources */,

Meshtastic.xcodeproj/project.pbxproj

@@ -267,7 +267,7 @@ actor SequentialSteps {
 	var isRunning: Bool = false
 	var externalError: Error?
 
-	init(maxRetries: Int = 1, retryDelay: Duration = .seconds(5), @StepsBuilder _ builder: () -> [Step]) {
+	init(maxRetries: Int = 3, retryDelay: Duration = .seconds(3), @StepsBuilder _ builder: () -> [Step]) {
 		self.maxRetries	= maxRetries
 		self.retryDelay = retryDelay
 		self.steps = builder()
@@ -353,7 +353,7 @@ actor SequentialSteps {
 		}
 		isRunning = false
 		return
-		//throw AccessoryError.tooManyRetries
+		throw AccessoryError.tooManyRetries
 	}
 
 	func cancel() {

Meshtastic.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1814,7 +1814,7 @@ extension AccessoryManager {
 
 	public func sendNodeDBReset(fromUser: UserEntity, toUser: UserEntity) async throws {
 		var adminPacket = AdminMessage()
-		adminPacket.nodedbReset = 5
+		adminPacket.nodedbReset = true
 		if fromUser != toUser {
 			adminPacket.sessionPasskey = toUser.userNode?.sessionPasskey ?? Data()
 		}

Meshtastic.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -578,6 +578,8 @@ class AccessoryManager: ObservableObject, MqttClientProxyManagerDelegate {
 					Logger.mesh.info("🕸️ MESH PACKET received for ATAK Forwarder App UNHANDLED UNHANDLED")
 				case .simulatorApp:
 					Logger.mesh.info("🕸️ MESH PACKET received for Simulator App UNHANDLED UNHANDLED")
+				case .storeForwardPlusplusApp:
+					Logger.mesh.info("🕸️ MESH PACKET received for SFPP App UNHANDLED UNHANDLED")
 				case .audioApp:
 					Logger.mesh.info("🕸️ MESH PACKET received for Audio App UNHANDLED UNHANDLED")
 				case .tracerouteApp:

Meshtastic/Accessory/Accessory Manager/AccessoryManager+Connect.swift

@@ -164,39 +164,27 @@ class BLETransport: Transport {
 		}
 	}
 
-	private let peripheralsQueue = DispatchQueue(label: "com.meshtastic.peripheralAccess", qos: .default)
-
 	func didDiscover(peripheral: CBPeripheral, rssi: NSNumber) {
-
 		guard !restoreInProgress else { return }
-
-		// Use the queue to ensure thread-safe access to the dictionary
-		peripheralsQueue.async {
-			let id = peripheral.identifier
-			let isNew = self.discoveredPeripherals[id] == nil
-			
-			// Update the dictionary
-			if isNew {
-				self.discoveredPeripherals[id] = (peripheral, Date())
-			} else {
-				self.discoveredPeripherals[id]?.lastSeen = Date()
-			}
-			
-			let device = Device(id: id,
-								name: peripheral.name ?? "Unknown",
-								transportType: .ble,
-								identifier: id.uuidString,
-								rssi: rssi.intValue)
-			
-			// Safely yield results
-			if isNew {
-				Logger.transport.debug("🛜 [BLE] Did Discover new device: \(peripheral.name ?? "Unknown", privacy: .public) (\(peripheral.identifier, privacy: .public))")
-				self.discoveredDeviceContinuation?.yield(.deviceFound(device))
-			} else {
-				let rssiVal = rssi.intValue
-				let deviceId = id
-				self.discoveredDeviceContinuation?.yield(.deviceReportedRssi(deviceId, rssiVal))
-			}
+		
+		let id = peripheral.identifier
+		let isNew = discoveredPeripherals[id] == nil
+		if isNew {
+			discoveredPeripherals[id] = (peripheral, Date())
+		}
+		let device = Device(id: id,
+							name: peripheral.name ?? "Unknown",
+							transportType: .ble,
+							identifier: id.uuidString,
+							rssi: rssi.intValue)
+		if isNew {
+			Logger.transport.debug("🛜 [BLE] Did Discover new device: \(peripheral.name ?? "Unknown", privacy: .public) (\(peripheral.identifier, privacy: .public))")
+			discoveredDeviceContinuation?.yield(.deviceFound(device))
+		} else {
+			let rssiVal = rssi.intValue
+			let deviceId = id
+			discoveredPeripherals[id]?.lastSeen = Date()
+			discoveredDeviceContinuation?.yield(.deviceReportedRssi(deviceId, rssiVal))
 		}
 	}
 

Meshtastic/Accessory/Accessory Manager/AccessoryManager+ToRadio.swift

@@ -313,6 +313,7 @@ enum ModemPresets: Int, CaseIterable, Identifiable {
 	case longFast = 0
 	case longSlow = 1
 	case longModerate = 7
+	case longTurbo = 9
 	case medSlow = 3
 	case medFast = 4
 	case shortSlow = 5
@@ -328,6 +329,8 @@ enum ModemPresets: Int, CaseIterable, Identifiable {
 			return "Long Range - Slow".localized
 		case .longModerate:
 			return "Long Range - Moderate".localized
+		case .longTurbo:
+			return "Long Range - Turbo".localized
 		case .medSlow:
 			return "Medium Range - Slow".localized
 		case .medFast:
@@ -348,6 +351,8 @@ enum ModemPresets: Int, CaseIterable, Identifiable {
 			return "LongSlow"
 		case .longModerate:
 			return "LongModerate"
+		case .longTurbo:
+			return "LongTurbo"
 		case .medSlow:
 			return "MediumSlow"
 		case .medFast:
@@ -366,6 +371,8 @@ enum ModemPresets: Int, CaseIterable, Identifiable {
 			return -17.5
 		case .longSlow:
 			return -7.5
+		case .longTurbo:
+			return -12.5
 		case .longModerate:
 			return -17.5
 		case .medSlow:
@@ -388,6 +395,8 @@ enum ModemPresets: Int, CaseIterable, Identifiable {
 			return Config.LoRaConfig.ModemPreset.longSlow
 		case .longModerate:
 			return Config.LoRaConfig.ModemPreset.longModerate
+		case .longTurbo:
+			return Config.LoRaConfig.ModemPreset.longTurbo
 		case .medSlow:
 			return Config.LoRaConfig.ModemPreset.mediumSlow
 		case .medFast:

Meshtastic/Accessory/Accessory Manager/AccessoryManager.swift

@@ -55,7 +55,7 @@ extension ChannelEntity {
 		channel.settings.psk = self.psk ?? Data()
 		channel.role = Channel.Role(rawValue: Int(self.role)) ?? Channel.Role.secondary
 		channel.settings.moduleSettings.positionPrecision = UInt32(self.positionPrecision)
-		channel.settings.moduleSettings.isClientMuted = self.mute
+		channel.settings.moduleSettings.isMuted = self.mute
 		return channel
 	}
 }