meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

V 1.26.6 Fix error messages for BLE connection errors

Browse source
This commit is contained in:
Garth Vander Houwen 2021-10-22 10:39:32 -07:00
parent 15608bb976
commit 62af489966
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Meshtastic Client.xcodeproj/project.pbxproj
View file

@ -668,7 +668,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.26.5;
MARKETING_VERSION = 1.26.6;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
@ -695,7 +695,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.26.5;
MARKETING_VERSION = 1.26.6;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;

10
MeshtasticClient/Helpers/BLEManager.swift
View file

@ -104,7 +104,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
@objc func timeoutTimerFired(timer: Timer)
{
timer.invalidate()
lastConnectionError = "BLE Connection timed out" //radio \(connectedPeripheral.peripheral.name ?? "Unknown")
//lastConnectionError = "BLE Connection timed out" //radio \(connectedPeripheral.peripheral.name ?? "Unknown")
if connectedPeripheral != nil {
self.centralManager?.cancelPeripheralConnection(connectedPeripheral.peripheral)
connectedNode = nil
@ -123,8 +123,8 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
self.disconnectDevice()
}
self.timeoutTimer = Timer.scheduledTimer(timeInterval: 2.0, target: self, selector: #selector(timeoutTimerFired), userInfo: nil, repeats: false)
self.centralManager?.connect(peripheral)
self.centralManager?.connect(peripheral)
self.timeoutTimer = Timer.scheduledTimer(timeInterval: 3.0, target: self, selector: #selector(timeoutTimerFired), userInfo: nil, repeats: false)
if meshLoggingEnabled { Logger.log("BLE Connecting: \(peripheral.name ?? "Unknown")") }
print("BLE Connecting: \(peripheral.name ?? "Unknown")")
}
@ -165,7 +165,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
func centralManager(_ central: CBCentralManager, didConnect peripheral: CBPeripheral) {
lastConnectionError = ""
timeoutTimer!.invalidate()
self.timeoutTimer!.invalidate()
peripheral.delegate = self
connectedPeripheral = peripherals.filter({ $0.peripheral.identifier == peripheral.identifier }).first
@ -196,7 +196,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
// Error Code 6: The connection has timed out unexpectedly.
// Happens when device is manually reset / powered off
lastConnectionError = " \(e.localizedDescription) Will automatically attempt to reconnect to the preferred radio if it reappears quickly."
lastConnectionError = "\(e.localizedDescription) The app will automatically reconnect to the preferred radio if it reappears within 3 seconds."
self.connectedNode = nil
self.connectedPeripheral = nil
self.connectTo(peripheral: peripheral)

2
MeshtasticClient/Views/Bluetooth/Connect.swift
View file

@ -35,7 +35,7 @@ struct Connect: View {
Section(header: Text("Connection Error").font(.title)) {
Text(bleManager.lastConnectionError).font(.title2).foregroundColor(.red)
Text(bleManager.lastConnectionError).font(.subheadline).foregroundColor(.red)
}
.textCase(nil)
}