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

Merge branch 'main'

Browse source
This commit is contained in:
Garth Vander Houwen 2022-09-12 21:55:45 -07:00
commit 1fa0a80d42
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Meshtastic/Helpers/BLEManager.swift
View file

@ -240,9 +240,20 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
self.timeoutTimer!.invalidate()
}
// Map the peripheral to the connectedNode and connectedPeripheral ObservedObjects
// Map the peripheral to the connectedPeripheral ObservedObjects
connectedPeripheral = peripherals.filter({ $0.peripheral.identifier == peripheral.identifier }).first
connectedPeripheral.peripheral.delegate = self
if connectedPeripheral != nil {
connectedPeripheral.peripheral.delegate = self
}
else {
// we are null just disconnect and start over
self.lastConnectionError = "Bluetooth connection error, please try again."
self.disconnectPeripheral()
return
}
// Discover Services
peripheral.discoverServices([meshtasticServiceCBUUID, DFUSERVICE_UUID])

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

@ -262,7 +262,7 @@ struct Connect: View {
.navigationViewStyle(StackNavigationViewStyle())
.sheet(isPresented: $invalidVersion) {
InvalidVersion(errorText: "1.3 ALPHA PREVIEW this version of the app supports only version \(minimumVersion) and above. Your device has been disconnected.")
InvalidVersion(errorText: "1.3 Beta this version of the app supports only version \(minimumVersion) and above. Your device has been disconnected.")
}
.onChange(of: (self.bleManager.connectedVersion)) { ic in

2
Meshtastic/Views/Bluetooth/InvalidVersion.swift
View file

@ -22,7 +22,7 @@ struct InvalidVersion: View {
.font(.title2)
.padding()
Text("Version 1.3 includes breaking changes to devices and the client apps. The version 1.3 app does not support 1.2 nodes, there are two builds for 1.2 under Versions & Build Groups in TestFlight that will be available until early September 2022.")
Text("Version 1.3 includes breaking changes to devices and the client apps. The version 1.3 app does not support 1.2 nodes, there is one build for 1.2 under Versions & Build Groups in TestFlight that will be available until the end of November 2022.")
.font(.callout)
.padding()