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

linter updates

Browse source
This commit is contained in:
Garth Vander Houwen 2024-10-05 16:35:42 -07:00
parent a4d5aefca3
commit 3dcec505ff
7 changed files with 46 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -254,7 +254,7 @@ struct CannedMessagesConfig: View {
}
}
}
.onChange(of: configPreset) { newPreset in
.onChange(of: configPreset) { _, newPreset in
if newPreset == 1 {

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

@ -157,41 +157,29 @@ struct SerialConfig: View {
}
}
}
.onChange(of: enabled) {
if $0 != node?.serialConfig?.enabled { hasChanges = true }
.onChange(of: enabled) { oldEnabled, newEnabled in
if oldEnabled != newEnabled && newEnabled != node?.serialConfig?.enabled ?? false { hasChanges = true }
}
.onChange(of: echo) {
if $0 != node?.serialConfig?.echo { hasChanges = true }
.onChange(of: echo) { oldEcho, newEcho in
if oldEcho != newEcho && newEcho != node?.serialConfig?.echo ?? false { hasChanges = true }
}
.onChange(of: rxd) { newRxd in
if node != nil && node!.serialConfig != nil {
if newRxd != node!.serialConfig!.rxd { hasChanges = true }
}
.onChange(of: rxd) { oldRxd, newRxd in
if oldRxd != newRxd && newRxd != node?.serialConfig?.rxd ?? -1 { hasChanges = true }
}
.onChange(of: txd) { newTxd in
if node != nil && node!.serialConfig != nil {
if newTxd != node!.serialConfig!.txd { hasChanges = true }
}
.onChange(of: txd) { oldTxd, newTxd in
if oldTxd != newTxd && newTxd != node?.serialConfig?.txd ?? -1 { hasChanges = true }
}
.onChange(of: baudRate) { newBaud in
if node != nil && node!.serialConfig != nil {
if newBaud != node!.serialConfig!.baudRate { hasChanges = true }
}
.onChange(of: baudRate) { oldBaud, newBaud in
if oldBaud != newBaud && newBaud != node?.serialConfig?.baudRate ?? -1 { hasChanges = true }
}
.onChange(of: timeout) { newTimeout in
if node != nil && node!.serialConfig != nil {
if newTimeout != node!.serialConfig!.timeout { hasChanges = true }
}
.onChange(of: timeout) { oldTimeout, newTimeout in
if oldTimeout != newTimeout && newTimeout != node?.serialConfig?.timeout ?? -1 { hasChanges = true }
}
.onChange(of: overrideConsoleSerialPort) { newOverrideConsoleSerialPort in
if node != nil && node!.serialConfig != nil {
if newOverrideConsoleSerialPort != node!.serialConfig!.overrideConsoleSerialPort { hasChanges = true }
}
.onChange(of: overrideConsoleSerialPort) { oldOverrideConsoleSerialPort, newOverrideConsoleSerialPort in
if oldOverrideConsoleSerialPort != newOverrideConsoleSerialPort && newOverrideConsoleSerialPort != node?.serialConfig?.overrideConsoleSerialPort ?? false { hasChanges = true }
}
.onChange(of: mode) { newMode in
if node != nil && node!.serialConfig != nil {
if newMode != node!.serialConfig!.mode { hasChanges = true }
}
.onChange(of: mode) { oldMode, newMode in
if oldMode != newMode && newMode != node?.serialConfig?.mode ?? -1 { hasChanges = true }
}
}
}

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

@ -174,22 +174,16 @@ struct StoreForwardConfig: View {
if oldIsRouter != newIsRouter && newIsRouter != node!.storeForwardConfig!.isRouter { hasChanges = true }
}
.onChange(of: heartbeat) { oldHeartbeat, newHeartbeat in
if oldHeartbeat != newHeartbeat && newHeartbeat != node!.storeForwardConfig!.heartbeat { hasChanges = true }
if oldHeartbeat != newHeartbeat && newHeartbeat != node?.storeForwardConfig?.heartbeat ?? true { hasChanges = true }
}
.onChange(of: records) { oldRecords, newRecords in
if node != nil && node?.storeForwardConfig != nil {
if newRecords != node!.storeForwardConfig!.records { hasChanges = true }
}
if oldRecords != newRecords && newRecords != node!.storeForwardConfig?.records ?? -1 { hasChanges = true }
}
.onChange(of: historyReturnMax) { oldHistoryReturnMax, newHistoryReturnMax in
if node != nil && node?.storeForwardConfig != nil {
if newHistoryReturnMax != node!.storeForwardConfig!.historyReturnMax { hasChanges = true }
}
if oldHistoryReturnMax != newHistoryReturnMax && newHistoryReturnMax != node!.storeForwardConfig?.historyReturnMax ?? -1 { hasChanges = true }
}
.onChange(of: historyReturnWindow) { oldHistoryReturnWindow, newHistoryReturnWindow in
if node != nil && node?.storeForwardConfig != nil {
if newHistoryReturnWindow != node!.storeForwardConfig!.historyReturnWindow { hasChanges = true }
}
if oldHistoryReturnWindow != newHistoryReturnWindow && newHistoryReturnWindow != node!.storeForwardConfig?.historyReturnWindow ?? -1 { hasChanges = true }
}
}
func setStoreAndForwardValues() {

20
Meshtastic/Views/Settings/Config/PowerConfig.swift
View file

@ -148,25 +148,25 @@ struct PowerConfig: View {
}
}
}
.onChange(of: isPowerSaving) {
if $0 != node?.powerConfig?.isPowerSaving { hasChanges = true }
.onChange(of: isPowerSaving) { oldIsPowerSaving, newIsPowerSaving in
if oldIsPowerSaving != newIsPowerSaving && newIsPowerSaving != node?.powerConfig?.isPowerSaving { hasChanges = true }
}
.onChange(of: shutdownOnPowerLoss) { newShutdownOnPowerLoss in
.onChange(of: shutdownOnPowerLoss) { _, newShutdownOnPowerLoss in
if newShutdownOnPowerLoss {
hasChanges = true
}
}
.onChange(of: shutdownAfterSecs) {
if $0 != node?.powerConfig?.minWakeSecs ?? -1 { hasChanges = true }
.onChange(of: shutdownAfterSecs) { oldShutdownAfterSecs, newShutdownAfterSecs in
if oldShutdownAfterSecs != newShutdownAfterSecs && newShutdownAfterSecs != node?.powerConfig?.minWakeSecs ?? -1 { hasChanges = true }
}
.onChange(of: adcOverride) { _ in
.onChange(of: adcOverride) {
hasChanges = true
}
.onChange(of: adcMultiplier) { newAdcMultiplier in
if newAdcMultiplier != node?.powerConfig?.adcMultiplierOverride ?? -1 { hasChanges = true }
.onChange(of: adcMultiplier) { _, newAdcMultiplier in
if newAdcMultiplier != node?.powerConfig?.adcMultiplierOverride ?? -1 { hasChanges = true }
}
.onChange(of: waitBluetoothSecs) {
if $0 != node?.powerConfig?.waitBluetoothSecs ?? -1 { hasChanges = true }
.onChange(of: waitBluetoothSecs) { oldWaitBluetoothSecs, newWaitBluetoothSecs in
if oldWaitBluetoothSecs != newWaitBluetoothSecs && newWaitBluetoothSecs != node?.powerConfig?.waitBluetoothSecs ?? -1 { hasChanges = true }
}
.onChange(of: lsSecs) {
if $0 != node?.powerConfig?.lsSecs ?? -1 { hasChanges = true }