mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
Merge pull request #184 from meshtastic/default_cleanup
Default cleanup
This commit is contained in:
Garth Vander Houwen
GitHub
commit
cd630e1dc6
14 changed files with 73 additions and 70 deletions
|
|
@ -137,9 +137,9 @@ struct BluetoothConfig: View {
|
|||
|
||||
self.bleManager.context = context
|
||||
|
||||
self.enabled = node!.bluetoothConfig?.enabled ?? true
|
||||
self.mode = Int(node!.bluetoothConfig?.mode ?? 0)
|
||||
self.fixedPin = String(node!.bluetoothConfig?.fixedPin ?? 123456)
|
||||
self.enabled = node?.bluetoothConfig?.enabled ?? true
|
||||
self.mode = Int(node?.bluetoothConfig?.mode ?? 0)
|
||||
self.fixedPin = String(node?.bluetoothConfig?.fixedPin ?? 123456)
|
||||
self.hasChanges = false
|
||||
self.initialLoad = false
|
||||
}
|
||||
|
|
|
|||
|
|
@ -141,9 +141,9 @@ struct DeviceConfig: View {
|
|||
|
||||
self.bleManager.context = context
|
||||
|
||||
self.deviceRole = Int(node!.deviceConfig?.role ?? 0)
|
||||
self.serialEnabled = (node!.deviceConfig?.serialEnabled ?? true)
|
||||
self.debugLogEnabled = node!.deviceConfig?.debugLogEnabled ?? false
|
||||
self.deviceRole = Int(node?.deviceConfig?.role ?? 0)
|
||||
self.serialEnabled = (node?.deviceConfig?.serialEnabled ?? true)
|
||||
self.debugLogEnabled = node?.deviceConfig?.debugLogEnabled ?? false
|
||||
self.hasChanges = false
|
||||
self.initialLoad = false
|
||||
}
|
||||
|
|
|
|||
|
|
@ -127,10 +127,10 @@ struct DisplayConfig: View {
|
|||
|
||||
self.bleManager.context = context
|
||||
|
||||
self.gpsFormat = Int(node!.displayConfig?.gpsFormat ?? 0)
|
||||
self.screenOnSeconds = Int(node!.displayConfig?.screenOnSeconds ?? 0)
|
||||
self.screenCarouselInterval = Int(node!.displayConfig?.screenCarouselInterval ?? 0)
|
||||
self.compassNorthTop = node!.displayConfig?.compassNorthTop ?? false
|
||||
self.gpsFormat = Int(node?.displayConfig?.gpsFormat ?? 0)
|
||||
self.screenOnSeconds = Int(node?.displayConfig?.screenOnSeconds ?? 0)
|
||||
self.screenCarouselInterval = Int(node?.displayConfig?.screenCarouselInterval ?? 0)
|
||||
self.compassNorthTop = node?.displayConfig?.compassNorthTop ?? false
|
||||
self.hasChanges = false
|
||||
self.initialLoad = false
|
||||
}
|
||||
|
|
|
|||
|
|
@ -125,12 +125,12 @@ struct LoRaConfig: View {
|
|||
if self.initialLoad{
|
||||
|
||||
|
||||
self.hopLimit = Int(node!.loRaConfig?.hopLimit ?? 0)
|
||||
self.region = Int(node!.loRaConfig?.regionCode ?? 0)
|
||||
self.usePreset = node!.loRaConfig?.usePreset ?? true
|
||||
self.modemPreset = Int(node!.loRaConfig?.modemPreset ?? 0)
|
||||
self.txEnabled = node!.loRaConfig?.txEnabled ?? true
|
||||
self.txPower = Int(node!.loRaConfig?.txPower ?? 0)
|
||||
self.hopLimit = Int(node?.loRaConfig?.hopLimit ?? 0)
|
||||
self.region = Int(node?.loRaConfig?.regionCode ?? 0)
|
||||
self.usePreset = node?.loRaConfig?.usePreset ?? true
|
||||
self.modemPreset = Int(node?.loRaConfig?.modemPreset ?? 0)
|
||||
self.txEnabled = node?.loRaConfig?.txEnabled ?? true
|
||||
self.txPower = Int(node?.loRaConfig?.txPower ?? 0)
|
||||
|
||||
self.hasChanges = false
|
||||
self.initialLoad = false
|
||||
|
|
|
|||
|
|
@ -290,16 +290,16 @@ struct CannedMessagesConfig: View {
|
|||
if self.initialLoad{
|
||||
|
||||
self.bleManager.context = context
|
||||
self.enabled = node!.cannedMessageConfig?.enabled ?? false
|
||||
self.sendBell = node!.cannedMessageConfig?.sendBell ?? false
|
||||
self.rotary1Enabled = node!.cannedMessageConfig?.rotary1Enabled ?? false
|
||||
self.updown1Enabled = node!.cannedMessageConfig?.updown1Enabled ?? false
|
||||
self.inputbrokerPinA = Int(node!.cannedMessageConfig?.inputbrokerPinA ?? 0)
|
||||
self.inputbrokerPinB = Int(node!.cannedMessageConfig?.inputbrokerPinB ?? 0)
|
||||
self.inputbrokerPinPress = Int(node!.cannedMessageConfig?.inputbrokerPinPress ?? 0)
|
||||
self.inputbrokerEventCw = Int(node!.cannedMessageConfig?.inputbrokerEventCw ?? 0)
|
||||
self.inputbrokerEventCcw = Int(node!.cannedMessageConfig?.inputbrokerEventCcw ?? 0)
|
||||
self.inputbrokerEventPress = Int(node!.cannedMessageConfig?.inputbrokerEventPress ?? 0)
|
||||
self.enabled = node?.cannedMessageConfig?.enabled ?? false
|
||||
self.sendBell = node?.cannedMessageConfig?.sendBell ?? false
|
||||
self.rotary1Enabled = node?.cannedMessageConfig?.rotary1Enabled ?? false
|
||||
self.updown1Enabled = node?.cannedMessageConfig?.updown1Enabled ?? false
|
||||
self.inputbrokerPinA = Int(node?.cannedMessageConfig?.inputbrokerPinA ?? 0)
|
||||
self.inputbrokerPinB = Int(node?.cannedMessageConfig?.inputbrokerPinB ?? 0)
|
||||
self.inputbrokerPinPress = Int(node?.cannedMessageConfig?.inputbrokerPinPress ?? 0)
|
||||
self.inputbrokerEventCw = Int(node?.cannedMessageConfig?.inputbrokerEventCw ?? 0)
|
||||
self.inputbrokerEventCcw = Int(node?.cannedMessageConfig?.inputbrokerEventCcw ?? 0)
|
||||
self.inputbrokerEventPress = Int(node?.cannedMessageConfig?.inputbrokerEventPress ?? 0)
|
||||
self.hasChanges = false
|
||||
self.initialLoad = false
|
||||
}
|
||||
|
|
|
|||
|
|
@ -186,12 +186,12 @@ struct ExternalNotificationConfig: View {
|
|||
|
||||
self.bleManager.context = context
|
||||
|
||||
self.enabled = node!.externalNotificationConfig?.enabled ?? false
|
||||
self.alertBell = node!.externalNotificationConfig?.alertBell ?? false
|
||||
self.alertMessage = node!.externalNotificationConfig?.alertMessage ?? false
|
||||
self.active = node!.externalNotificationConfig?.active ?? false
|
||||
self.output = Int(node!.externalNotificationConfig?.output ?? 0)
|
||||
self.outputMilliseconds = Int(node!.externalNotificationConfig?.outputMilliseconds ?? 0)
|
||||
self.enabled = node?.externalNotificationConfig?.enabled ?? false
|
||||
self.alertBell = node?.externalNotificationConfig?.alertBell ?? false
|
||||
self.alertMessage = node?.externalNotificationConfig?.alertMessage ?? false
|
||||
self.active = node?.externalNotificationConfig?.active ?? false
|
||||
self.output = Int(node?.externalNotificationConfig?.output ?? 0)
|
||||
self.outputMilliseconds = Int(node?.externalNotificationConfig?.outputMilliseconds ?? 0)
|
||||
|
||||
self.hasChanges = false
|
||||
self.initialLoad = false
|
||||
|
|
|
|||
|
|
@ -196,12 +196,12 @@ struct MQTTConfig: View {
|
|||
|
||||
self.bleManager.context = context
|
||||
|
||||
self.enabled = (node!.mqttConfig?.enabled ?? false)
|
||||
self.address = node!.mqttConfig?.address ?? ""
|
||||
self.username = node!.mqttConfig?.username ?? ""
|
||||
self.password = node!.mqttConfig?.password ?? ""
|
||||
self.encryptionEnabled = (node!.mqttConfig?.encryptionEnabled ?? false)
|
||||
self.jsonEnabled = (node!.mqttConfig?.jsonEnabled ?? false)
|
||||
self.enabled = (node?.mqttConfig?.enabled ?? false)
|
||||
self.address = node?.mqttConfig?.address ?? ""
|
||||
self.username = node?.mqttConfig?.username ?? ""
|
||||
self.password = node?.mqttConfig?.password ?? ""
|
||||
self.encryptionEnabled = (node?.mqttConfig?.encryptionEnabled ?? false)
|
||||
self.jsonEnabled = (node?.mqttConfig?.jsonEnabled ?? false)
|
||||
|
||||
self.hasChanges = false
|
||||
self.initialLoad = false
|
||||
|
|
|
|||
|
|
@ -146,9 +146,9 @@ struct RangeTestConfig: View {
|
|||
if self.initialLoad{
|
||||
|
||||
self.bleManager.context = context
|
||||
self.enabled = node!.rangeTestConfig?.enabled ?? false
|
||||
self.save = node!.rangeTestConfig?.save ?? false
|
||||
self.sender = Int(node!.rangeTestConfig?.sender ?? 0)
|
||||
self.enabled = node?.rangeTestConfig?.enabled ?? false
|
||||
self.save = node?.rangeTestConfig?.save ?? false
|
||||
self.sender = Int(node?.rangeTestConfig?.sender ?? 0)
|
||||
self.hasChanges = false
|
||||
self.initialLoad = false
|
||||
}
|
||||
|
|
|
|||
|
|
@ -163,13 +163,13 @@ struct SerialConfig: View {
|
|||
|
||||
self.bleManager.context = context
|
||||
|
||||
self.enabled = node!.serialConfig?.enabled ?? false
|
||||
self.echo = node!.serialConfig?.echo ?? false
|
||||
self.rxd = Int(node!.serialConfig?.rxd ?? 0)
|
||||
self.txd = Int(node!.serialConfig?.txd ?? 0)
|
||||
self.baudRate = Int(node!.serialConfig?.baudRate ?? 0)
|
||||
self.timeout = Int(node!.serialConfig?.timeout ?? 0)
|
||||
self.mode = Int(node!.serialConfig?.mode ?? 0)
|
||||
self.enabled = node?.serialConfig?.enabled ?? false
|
||||
self.echo = node?.serialConfig?.echo ?? false
|
||||
self.rxd = Int(node?.serialConfig?.rxd ?? 0)
|
||||
self.txd = Int(node?.serialConfig?.txd ?? 0)
|
||||
self.baudRate = Int(node?.serialConfig?.baudRate ?? 0)
|
||||
self.timeout = Int(node?.serialConfig?.timeout ?? 0)
|
||||
self.mode = Int(node?.serialConfig?.mode ?? 0)
|
||||
|
||||
self.hasChanges = false
|
||||
self.initialLoad = false
|
||||
|
|
|
|||
|
|
@ -189,11 +189,11 @@ struct TelemetryConfig: View {
|
|||
if self.initialLoad{
|
||||
|
||||
self.bleManager.context = context
|
||||
self.deviceUpdateInterval = Int(node!.telemetryConfig?.deviceUpdateInterval ?? 0)
|
||||
self.environmentUpdateInterval = Int(node!.telemetryConfig?.environmentUpdateInterval ?? 0)
|
||||
self.environmentMeasurementEnabled = node!.telemetryConfig?.environmentMeasurementEnabled ?? false
|
||||
self.environmentScreenEnabled = node!.telemetryConfig?.environmentScreenEnabled ?? false
|
||||
self.environmentDisplayFahrenheit = node!.telemetryConfig?.environmentDisplayFahrenheit ?? false
|
||||
self.deviceUpdateInterval = Int(node?.telemetryConfig?.deviceUpdateInterval ?? 0)
|
||||
self.environmentUpdateInterval = Int(node?.telemetryConfig?.environmentUpdateInterval ?? 0)
|
||||
self.environmentMeasurementEnabled = node?.telemetryConfig?.environmentMeasurementEnabled ?? false
|
||||
self.environmentScreenEnabled = node?.telemetryConfig?.environmentScreenEnabled ?? false
|
||||
self.environmentDisplayFahrenheit = node?.telemetryConfig?.environmentDisplayFahrenheit ?? false
|
||||
self.hasChanges = false
|
||||
self.initialLoad = false
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ struct NetworkConfig: View {
|
|||
@State var wifiSsid = ""
|
||||
@State var wifiPsk = ""
|
||||
@State var wifiMode = 0
|
||||
@State var ntpServer = ""
|
||||
|
||||
var body: some View {
|
||||
|
||||
|
|
@ -162,10 +163,10 @@ struct NetworkConfig: View {
|
|||
|
||||
self.bleManager.context = context
|
||||
|
||||
self.wifiEnabled = (node!.networkConfig?.wifiEnabled ?? false)
|
||||
self.wifiSsid = node!.networkConfig?.wifiSsid ?? ""
|
||||
self.wifiPsk = node!.networkConfig?.wifiPsk ?? ""
|
||||
self.wifiMode = Int(node!.networkConfig?.wifiMode ?? 0)
|
||||
self.wifiEnabled = (node?.networkConfig?.wifiEnabled ?? false)
|
||||
self.wifiSsid = node?.networkConfig?.wifiSsid ?? ""
|
||||
self.wifiPsk = node?.networkConfig?.wifiPsk ?? ""
|
||||
self.wifiMode = Int(node?.networkConfig?.wifiMode ?? 0)
|
||||
|
||||
self.hasChanges = false
|
||||
self.initialLoad = false
|
||||
|
|
|
|||
|
|
@ -284,13 +284,13 @@ struct PositionConfig: View {
|
|||
if self.initialLoad{
|
||||
|
||||
self.bleManager.context = context
|
||||
self.smartPositionEnabled = node!.positionConfig?.smartPositionEnabled ?? true
|
||||
self.deviceGpsEnabled = node!.positionConfig?.deviceGpsEnabled ?? true
|
||||
self.fixedPosition = node!.positionConfig?.fixedPosition ?? false
|
||||
self.gpsUpdateInterval = Int(node!.positionConfig?.gpsUpdateInterval ?? 30)
|
||||
self.gpsAttemptTime = Int(node!.positionConfig?.gpsAttemptTime ?? 30)
|
||||
self.positionBroadcastSeconds = Int(node!.positionConfig?.positionBroadcastSeconds ?? 900)
|
||||
self.positionFlags = Int(node!.positionConfig?.positionFlags ?? 3)
|
||||
self.smartPositionEnabled = node?.positionConfig?.smartPositionEnabled ?? true
|
||||
self.deviceGpsEnabled = node?.positionConfig?.deviceGpsEnabled ?? true
|
||||
self.fixedPosition = node?.positionConfig?.fixedPosition ?? false
|
||||
self.gpsUpdateInterval = Int(node?.positionConfig?.gpsUpdateInterval ?? 30)
|
||||
self.gpsAttemptTime = Int(node?.positionConfig?.gpsAttemptTime ?? 30)
|
||||
self.positionBroadcastSeconds = Int(node?.positionConfig?.positionBroadcastSeconds ?? 900)
|
||||
self.positionFlags = Int(node?.positionConfig?.positionFlags ?? 3)
|
||||
|
||||
let pf = PositionFlags(rawValue: self.positionFlags)
|
||||
|
||||
|
|
|
|||
|
|
@ -210,7 +210,6 @@ struct Settings: View {
|
|||
// Store Forward Config - Not Working, TBEAM Only
|
||||
|
||||
}
|
||||
.disabled(!(bleManager.connectedPeripheral?.subscribed ?? true))
|
||||
.onAppear {
|
||||
|
||||
self.bleManager.context = context
|
||||
|
|
|
|||
|
|
@ -77,14 +77,17 @@ struct ShareChannels: View {
|
|||
}
|
||||
VStack {
|
||||
|
||||
Text("Number of Channels: \(node!.myInfo!.maxChannels)").font(.title2)
|
||||
Text("Number of Channels: \(node?.myInfo?.maxChannels ?? 0)").font(.title2)
|
||||
|
||||
ForEach(node!.myInfo!.channels?.array.sorted(by: { ($0 as! ChannelEntity).index < ($1 as! ChannelEntity).index }) as! [ChannelEntity], id: \.self) { (channel: ChannelEntity) in
|
||||
if node != nil {
|
||||
|
||||
VStack {
|
||||
ForEach(node!.myInfo!.channels?.array.sorted(by: { ($0 as! ChannelEntity).index < ($1 as! ChannelEntity).index }) as! [ChannelEntity], id: \.self) { (channel: ChannelEntity) in
|
||||
|
||||
|
||||
Text("Channel: \(channel.index) Name: \(channel.name ?? "")")
|
||||
VStack {
|
||||
|
||||
|
||||
Text("Channel: \(channel.index) Name: \(channel.name ?? "")")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue