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

Finish up share channels view

Browse source
This commit is contained in:
Garth Vander Houwen 2022-10-10 18:59:33 -07:00
parent 4df2f4614b
commit 1742ec3b48
2 changed files with 38 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Meshtastic/Helpers/BLEManager.swift
View file

@ -29,7 +29,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
@Published var connectedPeripheral: Peripheral!
@Published var lastConnectionError: String
@Published var minimumVersion = "1.3.42"
@Published var minimumVersion = "1.3.43"
@Published var connectedVersion: String
@Published var invalidVersion = false
@Published var preferredPeripheral = false

45
Meshtastic/Views/Settings/ShareChannels.swift
View file

@ -53,6 +53,7 @@ struct ShareChannels: View {
var node: NodeInfoEntity?
@State private var channelsUrl = "https://www.meshtastic.org/e/#"
var qrCodeImage = QrCodeImage()
var body: some View {
@ -240,11 +241,34 @@ struct ShareChannels: View {
GenerateChannelSet()
}
}
.onChange(of: includeChannel1) { includeCh1 in
GenerateChannelSet()
}
.onChange(of: includeChannel2) { includeCh2 in
GenerateChannelSet()
}
.onChange(of: includeChannel3) { includeCh3 in
GenerateChannelSet()
}
.onChange(of: includeChannel4) { includeCh4 in
GenerateChannelSet()
}
.onChange(of: includeChannel5) { includeCh5 in
GenerateChannelSet()
}
.onChange(of: includeChannel6) { includeCh6 in
GenerateChannelSet()
}
.onChange(of: includeChannel7) { includeCh7 in
GenerateChannelSet()
}
}
.navigationViewStyle(StackNavigationViewStyle())
}
}
func GenerateChannelSet() {
channelSet = ChannelSet()
var loRaConfig = Config.LoRaConfig()
loRaConfig.region = RegionCodes(rawValue: Int(node!.loRaConfig!.regionCode))!.protoEnumValue()
@ -262,17 +286,22 @@ struct ShareChannels: View {
for ch in node!.myInfo!.channels!.array as! [ChannelEntity] {
if ch.role > 0 {
var channelSettings = ChannelSettings()
channelSettings.name = ch.name!
channelSettings.psk = ch.psk ?? Data()
channelSettings.id = UInt32(ch.id)
channelSettings.uplinkEnabled = ch.uplinkEnabled
channelSettings.downlinkEnabled = ch.downlinkEnabled
channelSet.settings.append(channelSettings)
if ch.index == 0 || ch.index == 1 && includeChannel1 || ch.index == 2 && includeChannel2 || ch.index == 3 && includeChannel3 ||
ch.index == 4 && includeChannel4 || ch.index == 5 && includeChannel5 || ch.index == 6 && includeChannel6 || ch.index == 7 && includeChannel7 {
var channelSettings = ChannelSettings()
channelSettings.name = ch.name!
channelSettings.psk = ch.psk ?? Data()
channelSettings.id = UInt32(ch.id)
channelSettings.uplinkEnabled = ch.uplinkEnabled
channelSettings.downlinkEnabled = ch.downlinkEnabled
channelSet.settings.append(channelSettings)
}
}
}
let settingsString = try! channelSet.serializedData().base64EncodedString()
channelsUrl = "https://www.meshtastic.org/e/#" + settingsString.dropLast(2)
channelsUrl = ("https://www.meshtastic.org/e/#" + settingsString.dropLast(2))
}
}