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

Fix assorted nulls

Browse source
This commit is contained in:
Garth Vander Houwen 2022-09-27 22:18:50 -07:00
parent 5ecf4a031c
commit 27a90c4dc4
13 changed files with 73 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift
View file

@ -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
}

12
Meshtastic/Views/Settings/Config/Module/ExternalNotificationConfig.swift
View file

@ -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

12
Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift
View file

@ -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

6
Meshtastic/Views/Settings/Config/Module/RangeTestConfig.swift
View file

@ -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
}

14
Meshtastic/Views/Settings/Config/Module/SerialConfig.swift
View file

@ -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

10
Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift
View file

@ -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
}