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' into app-routing

Browse source
This commit is contained in:
Garth Vander Houwen 2024-07-17 09:15:46 -07:00 • committed by GitHub
commit 233518ebbf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
238 changed files with 244 additions and 1197 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -106,6 +106,6 @@ struct PaxCounterConfig: View {
private func setPaxValues() {
enabled = node?.paxCounterConfig?.enabled ?? enabled
paxcounterUpdateInterval = Int(node?.paxCounterConfig?.updateInterval ?? 900)
paxcounterUpdateInterval = Int(node?.paxCounterConfig?.updateInterval ?? 1800)
}
}

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

@ -42,7 +42,7 @@ struct TelemetryConfig: View {
}
.pickerStyle(DefaultPickerStyle())
.listRowSeparator(.hidden)
Text("How often device metrics are sent out over the mesh. Default is 15 minutes.")
Text("How often device metrics are sent out over the mesh. Default is 30 minutes.")
.foregroundColor(.gray)
.font(.callout)
.listRowSeparator(.visible)
@ -55,7 +55,7 @@ struct TelemetryConfig: View {
}
.pickerStyle(DefaultPickerStyle())
.listRowSeparator(.hidden)
Text("How often sensor metrics are sent out over the mesh. Default is 15 minutes.")
Text("How often sensor metrics are sent out over the mesh. Default is 30 minutes.")
.foregroundColor(.gray)
.font(.callout)
}
@ -91,7 +91,7 @@ struct TelemetryConfig: View {
}
.pickerStyle(DefaultPickerStyle())
.listRowSeparator(.hidden)
Text("How often power metrics are sent out over the mesh. Default is 15 minutes.")
Text("How often power metrics are sent out over the mesh. Default is 30 minutes.")
.foregroundColor(.gray)
.font(.callout)
.listRowSeparator(.visible)
@ -183,13 +183,13 @@ struct TelemetryConfig: View {
}
}
func setTelemetryValues() {
self.deviceUpdateInterval = Int(node?.telemetryConfig?.deviceUpdateInterval ?? 900)
self.environmentUpdateInterval = Int(node?.telemetryConfig?.environmentUpdateInterval ?? 900)
self.deviceUpdateInterval = Int(node?.telemetryConfig?.deviceUpdateInterval ?? 1800)
self.environmentUpdateInterval = Int(node?.telemetryConfig?.environmentUpdateInterval ?? 1800)
self.environmentMeasurementEnabled = node?.telemetryConfig?.environmentMeasurementEnabled ?? false
self.environmentScreenEnabled = node?.telemetryConfig?.environmentScreenEnabled ?? false
self.environmentDisplayFahrenheit = node?.telemetryConfig?.environmentDisplayFahrenheit ?? false
self.powerMeasurementEnabled = node?.telemetryConfig?.powerMeasurementEnabled ?? false
self.powerUpdateInterval = Int(node?.telemetryConfig?.powerUpdateInterval ?? 900)
self.powerUpdateInterval = Int(node?.telemetryConfig?.powerUpdateInterval ?? 1800)
self.powerScreenEnabled = node?.telemetryConfig?.powerScreenEnabled ?? false
self.hasChanges = false
}