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.7 Fix up BLE disconnect timer, update preferred peripheral toggle to only save empty when there is a connected peripheral

Browse source
This commit is contained in:
Garth Vander Houwen 2021-10-22 20:58:20 -07:00
parent 62af489966
commit c11da9816e
3 changed files with 44 additions and 28 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.6;
MARKETING_VERSION = 1.26.7;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
@ -695,7 +695,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.26.6;
MARKETING_VERSION = 1.26.7;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;

58
MeshtasticClient/Helpers/BLEManager.swift
View file

@ -34,6 +34,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
var isDisconnectedByUser = false
var timeoutTimer: Timer?
var runCount = 0
private var meshLoggingEnabled: Bool = true
@ -103,30 +104,48 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
///
@objc func timeoutTimerFired(timer: Timer)
{
timer.invalidate()
//lastConnectionError = "BLE Connection timed out" //radio \(connectedPeripheral.peripheral.name ?? "Unknown")
if connectedPeripheral != nil {
self.centralManager?.cancelPeripheralConnection(connectedPeripheral.peripheral)
connectedNode = nil
connectedPeripheral = nil
guard let context = timer.userInfo as? [String: String] else { return }
let name = context["name", default: "Unknown"]
runCount += 1
if runCount == 5 {
timeoutTimer?.invalidate()
runCount = 0
if connectedPeripheral != nil {
self.centralManager?.cancelPeripheralConnection(connectedPeripheral.peripheral)
connectedNode = nil
connectedPeripheral = nil
}
print("BLE Timeout Timer Fired \(runCount) Time(s) Connection Failed: \(name)")
Logger.log("BLE Timeout Timer Fired \(runCount) Time(s) Connection Failed: \(name)")
}
else {
print("BLE Timeout Timer Fired \(runCount) Time(s): \(name)")
Logger.log("BLE Timeout Timer Fired \(runCount) Time(s): \(name)")
}
print("BLE-Timeout-Timer fired!")
Logger.log("BLE-Timeout-Timer fired!")
self.startScanning()
}
// Connect to a specific peripheral
func connectTo(peripheral: CBPeripheral) {
if meshLoggingEnabled { Logger.log("BLE Connecting: \(peripheral.name ?? "Unknown")") }
print("BLE Connecting: \(peripheral.name ?? "Unknown")")
stopScanning()
if self.connectedPeripheral != nil && self.connectedPeripheral.peripheral.state == CBPeripheralState.connected {
if self.connectedPeripheral != nil {
self.disconnectDevice()
}
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")")
let context = ["name": "@\(peripheral.name ?? "Unknown")"]
self.timeoutTimer = Timer.scheduledTimer(timeInterval: 1.0, target: self, selector: #selector(timeoutTimerFired), userInfo: context, repeats: true)
}
// Disconnect Device function
@ -196,16 +215,12 @@ 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) The app will automatically reconnect to the preferred radio if it reappears within 3 seconds."
lastConnectionError = "\(e.localizedDescription) The app will automatically reconnect to the preferred radio if it reappears within 5 seconds."
self.connectedNode = nil
self.connectedPeripheral = nil
if meshLoggingEnabled { Logger.log("BLE Reconnecting: \(peripheral.name ?? "Unknown")" ) }
print("Reconnecting to \(peripheral.name ?? "Unknown")")
self.connectTo(peripheral: peripheral)
// 2 second delay for device to power back on
//let _ = Timer.scheduledTimer(withTimeInterval: 3.0, repeats: false) { (timer) in
// }
}
else if errorCode == 7 { // The specified device has disconnected from us.
@ -249,8 +264,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
for service in services
{
if (service.uuid == meshtasticServiceCBUUID)
{
print("Meshtastic service discovered OK")

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

@ -21,7 +21,6 @@ struct Connect: View {
@EnvironmentObject var userSettings: UserSettings
@State var isPreferredRadio: Bool = false
var body: some View {
@ -35,7 +34,7 @@ struct Connect: View {
Section(header: Text("Connection Error").font(.title)) {
Text(bleManager.lastConnectionError).font(.subheadline).foregroundColor(.red)
Text(bleManager.lastConnectionError).font(.headline).foregroundColor(.red)
}
.textCase(nil)
}
@ -87,8 +86,11 @@ struct Connect: View {
userSettings.preferredPeripheralId = bleManager.connectedPeripheral!.peripheral.identifier.uuidString
} else {
userSettings.preferredPeripheralId = ""
userSettings.preferredPeripheralName = ""
if bleManager.connectedNode != nil {
userSettings.preferredPeripheralId = ""
userSettings.preferredPeripheralName = ""
}
}
}
}