2022-06-12 01:25:42 -07:00
|
|
|
//
|
|
|
|
|
// DeviceSettings.swift
|
|
|
|
|
// Meshtastic Apple
|
|
|
|
|
//
|
|
|
|
|
// Copyright (c) Garth Vander Houwen 6/7/22.
|
|
|
|
|
//
|
|
|
|
|
|
2024-06-07 22:09:20 -05:00
|
|
|
import MeshtasticProtobufs
|
2024-06-03 02:17:55 -07:00
|
|
|
import OSLog
|
2024-06-07 22:09:20 -05:00
|
|
|
import SwiftUI
|
2022-06-12 01:25:42 -07:00
|
|
|
|
|
|
|
|
struct DisplayConfig: View {
|
2025-10-05 17:51:18 -07:00
|
|
|
|
2022-06-12 01:25:42 -07:00
|
|
|
@Environment(\.managedObjectContext) var context
|
Transports Interface to Support TCP for all Platforms and Serial on Mac (#1341)
* Initial implementation of transports
* Initial LogRadio implementation
* Fixes for Settings view (caused by debug commenting)
* Refinement of the object and actor model
* Connect view text and tab updates
* Fix mac catalyst and tests
* Warning and logging clean-up
* In progress commit
* Serial Transport and Reconnect draft work
* Serial transport and reconnection draft work
* Quick fix for BLE - still more work to do
* interim commit
* More in progress changes
* Minor improvements
* Pretty good initial implementation
* Bump version beyond the app store
* Fix for disconnection swipeAction
* Tweaks to TCPConnection implementation
* Retry for NONCE_ONLY_DB
* Revert json string change
* Simplified some of the API + "Anti-discovery"
* Tweaks for devices leaving the discovery process
* Bump version
* iOS26 Tweaks
* Tweaks and bug fixes
* Add link with slash sf symbol
* update symbol image on connect view
* BLE disconnect handling
* Log privacy attributes
* Onboarding and minor fixes.
* change database to nodes, add emoji to tcp logs
* Error handling improvements
* More logging emojis
* Suppressed unnecessary errors on disconnect
* Heartbeat emoji
* Add bluetooth symbol
* add privacy attributes to [TCP] logs, add custom bluetooth logo
* Improve routing logs
* Emoji for connect logs
* Heartbeat emoji
* Add CBCentralManagerScanOptionAllowDuplicatesKey options to central for bluetooth
* fix nav errors by switching from observableobject to state
* Update connection indicator icon
* fix for BLE disconnects
* Connection process fixes
* More fixes/tweaks to connection process
* Strict concurrency
* Fix some warnings, remove wifi warning
* delete stale keys
* interim commit
* Update privacy for log, fix wrong space
* fix a couple of linting items
* Switch to targeted
* interim commit
* BLE Signal strenth on connect view
* Remove BLE RSSI from long press menu
* Modem lights
* minor spacing tweak
* Additional BLE logging and a scanning fix.
* Discovery and BLE RSSI improvements
* Background suspension
* Update isConnected to enable UI during db load
* update protobufs
* Replace config if statements with switches, Fix unknown module config logging, make dark mode modem circle stroke color white so they are visible
* Additional logging cleanup
* hast
* Set unmessagable to true if the longname has the unmessagable emoji
* Connect error handling improvements
* Admin popup list icon and activity lights updates
* Revert use of .toolbar back to .navigationBarItems
* More public logging
* Better BLE error handling
* Node DB progress meter
* minor tweak to activity light interaction timing
* Fix comment linting, remove stale keys
* Remove stale keys
* Easy linting fixes
* Two more simple linting fixes
* clean up meshtasticapp
* More public logging
* Replay config
* Logging
* Fix for unselected node on Settings
* Tweak to progress meter based on device idiom
* Update protos
* Session replay redaction of messages
* Serial fix for old devices, and a let statement
* Mask text too
* Fix typo
* BLE poweredOff is now an auto-reconnectable error
* Update logging
* Fix for peerRemovedPairingInformation
* Logging for BLE peripheral:didUpdateValueFor errors.
* Fix for inconsistent swipe disconnect behavior
* periperal:didUpdateValueFor error handling
* Fix for BLEConnection continuation guarding
* BLEConnection actor deadlock on disconnect
* Heartbeat nonce
* Fix for swipe disconnect and task cancellation
* Fix for swipe actions not honoring .disabled()
* Tell BLETransport when BLEConnection is cancelled
* Update navigation logging
* Logging updates
* Bump version to 2.7.0
* Organize into folders and heartbeat stuff
* Minor improvements to manual TCP connection
* Auto-connect toggle
* Possible BLE bug, still waiting to see in logs
* Concurrency tweaks
* Concurrency improvements
* requestDeviceMetadata fix. fixes remote admin
* Minor typo fixes
* "All" button for log filters: category and level
* More robust continuation handling for BLE
* @FetchRequest based ChannelMessageList
* Update info.plist and device hardware file
* Move auto connect toggle to app settings and debug mode, tint properly with the accent color
* Add label to auto connect toggle
* Update log for node info received from ourselves over the mesh
* Remove unused scrollViewProxy
* Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update target for connect view
* Properly Set datadog environment
* Comment out ble manager
* Adjust cyclomatic complexity thresholds in .swiftlint.yml
* Linting fixes, delete ble manager
* Make session replay debug only
---------
Co-authored-by: jake-b <jake-b@users.noreply.github.com>
Co-authored-by: jake <jake@jakes-Mac-mini.local>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-08-27 08:09:02 -07:00
|
|
|
@EnvironmentObject var accessoryManager: AccessoryManager
|
2022-12-09 18:19:00 -08:00
|
|
|
@Environment(\.dismiss) private var goBack
|
2025-10-05 17:51:18 -07:00
|
|
|
|
2022-07-07 00:29:52 -07:00
|
|
|
var node: NodeInfoEntity?
|
2025-10-05 17:51:18 -07:00
|
|
|
|
2022-06-21 10:02:05 -07:00
|
|
|
@State var hasChanges = false
|
2022-06-12 22:07:58 -07:00
|
|
|
@State var screenOnSeconds = 0
|
|
|
|
|
@State var screenCarouselInterval = 0
|
|
|
|
|
@State var gpsFormat = 0
|
2022-08-07 08:31:39 -07:00
|
|
|
@State var compassNorthTop = false
|
2023-03-25 00:41:57 -07:00
|
|
|
@State var wakeOnTapOrMotion = false
|
2022-10-22 08:45:53 -07:00
|
|
|
@State var flipScreen = false
|
2022-12-11 14:14:08 -08:00
|
|
|
@State var oledType = 0
|
2023-01-25 23:01:45 -08:00
|
|
|
@State var displayMode = 0
|
2023-11-26 12:54:45 -08:00
|
|
|
@State var units = 0
|
2025-06-15 20:04:21 -07:00
|
|
|
@State var use12HourClock = false
|
2025-07-19 23:25:43 -07:00
|
|
|
@State var headingBold = false
|
2025-10-05 17:51:18 -07:00
|
|
|
|
2022-06-12 01:25:42 -07:00
|
|
|
var body: some View {
|
2022-12-30 11:08:59 -08:00
|
|
|
Form {
|
2024-02-17 22:39:22 -07:00
|
|
|
ConfigHeader(title: "Display", config: \.displayConfig, node: node, onAppear: setDisplayValues)
|
2025-10-05 17:51:18 -07:00
|
|
|
|
2022-12-30 11:08:59 -08:00
|
|
|
Section(header: Text("Device Screen")) {
|
2025-10-05 17:51:18 -07:00
|
|
|
|
2024-02-21 23:35:28 -08:00
|
|
|
Toggle(isOn: $compassNorthTop) {
|
|
|
|
|
Label("Always point north", systemImage: "location.north.circle")
|
2024-02-21 20:41:27 -08:00
|
|
|
Text("The compass heading on the screen outside of the circle will always point north.")
|
2022-12-30 11:08:59 -08:00
|
|
|
}
|
2025-07-20 00:47:42 -07:00
|
|
|
.tint(Color.accentColor)
|
2025-10-05 17:51:18 -07:00
|
|
|
|
2025-07-19 23:25:43 -07:00
|
|
|
Toggle(isOn: $use12HourClock) {
|
|
|
|
|
Label("12 Hour Clock", systemImage: "clock")
|
|
|
|
|
Text("Sets the screen clock format to 12-hour.")
|
2023-03-25 00:41:57 -07:00
|
|
|
}
|
2025-07-19 23:25:43 -07:00
|
|
|
.tint(Color.accentColor)
|
2025-10-05 17:51:18 -07:00
|
|
|
|
2025-07-19 23:25:43 -07:00
|
|
|
Toggle(isOn: $headingBold) {
|
|
|
|
|
Label("Bold Heading", systemImage: "bold")
|
|
|
|
|
Text("Bold the heading text on the screen.")
|
2022-12-30 11:08:59 -08:00
|
|
|
}
|
2025-07-19 23:25:43 -07:00
|
|
|
.tint(Color.accentColor)
|
2024-02-21 20:41:27 -08:00
|
|
|
VStack(alignment: .leading) {
|
2025-07-19 23:25:43 -07:00
|
|
|
Picker("Display Units", selection: $units ) {
|
|
|
|
|
ForEach(Units.allCases) { un in
|
|
|
|
|
Text(un.description)
|
2024-02-21 20:41:27 -08:00
|
|
|
}
|
2022-12-11 14:14:08 -08:00
|
|
|
}
|
2025-07-19 23:25:43 -07:00
|
|
|
Text("Units displayed on the device screen")
|
2024-02-21 20:41:27 -08:00
|
|
|
.foregroundColor(.gray)
|
2024-02-21 23:35:28 -08:00
|
|
|
.font(.callout)
|
2022-06-12 01:25:42 -07:00
|
|
|
}
|
2024-02-21 23:35:28 -08:00
|
|
|
.pickerStyle(DefaultPickerStyle())
|
2022-12-30 11:08:59 -08:00
|
|
|
}
|
2025-07-19 23:25:43 -07:00
|
|
|
Section(header: Text("Timing and Overrides")) {
|
2024-02-21 20:41:27 -08:00
|
|
|
VStack(alignment: .leading) {
|
|
|
|
|
Picker("Screen on for", selection: $screenOnSeconds ) {
|
|
|
|
|
ForEach(ScreenOnIntervals.allCases) { soi in
|
|
|
|
|
Text(soi.description)
|
|
|
|
|
}
|
2023-01-25 23:01:45 -08:00
|
|
|
}
|
2024-02-21 20:41:27 -08:00
|
|
|
Text("How long the screen remains on after the user button is pressed or messages are received.")
|
|
|
|
|
.foregroundColor(.gray)
|
2024-02-21 23:35:28 -08:00
|
|
|
.font(.callout)
|
2023-01-25 23:01:45 -08:00
|
|
|
}
|
2024-02-21 23:35:28 -08:00
|
|
|
.pickerStyle(DefaultPickerStyle())
|
2025-10-05 17:51:18 -07:00
|
|
|
|
2024-02-21 20:41:27 -08:00
|
|
|
VStack(alignment: .leading) {
|
|
|
|
|
Picker("Carousel Interval", selection: $screenCarouselInterval ) {
|
|
|
|
|
ForEach(ScreenCarouselIntervals.allCases) { sci in
|
|
|
|
|
Text(sci.description)
|
|
|
|
|
}
|
2023-01-25 23:01:45 -08:00
|
|
|
}
|
2025-10-05 17:51:18 -07:00
|
|
|
|
2024-02-21 20:41:27 -08:00
|
|
|
Text("Automatically toggles to the next page on the screen like a carousel, based the specified interval.")
|
|
|
|
|
.foregroundColor(.gray)
|
2024-02-21 23:35:28 -08:00
|
|
|
.font(.callout)
|
2023-01-25 23:01:45 -08:00
|
|
|
}
|
2024-02-21 23:35:28 -08:00
|
|
|
.pickerStyle(DefaultPickerStyle())
|
2025-10-05 17:51:18 -07:00
|
|
|
|
2025-07-19 23:25:43 -07:00
|
|
|
Toggle(isOn: $wakeOnTapOrMotion) {
|
|
|
|
|
Label("Wake Screen on tap or motion", systemImage: "gyroscope")
|
|
|
|
|
Text("Requires that there be an accelerometer on your device.")
|
|
|
|
|
}
|
|
|
|
|
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
|
2025-10-05 17:51:18 -07:00
|
|
|
|
2025-07-19 23:25:43 -07:00
|
|
|
Toggle(isOn: $flipScreen) {
|
|
|
|
|
Label("Flip Screen", systemImage: "pip.swap")
|
|
|
|
|
Text("Flip screen vertically")
|
|
|
|
|
}
|
|
|
|
|
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
|
2025-10-05 17:51:18 -07:00
|
|
|
|
2024-02-21 20:41:27 -08:00
|
|
|
VStack(alignment: .leading) {
|
2025-07-19 23:25:43 -07:00
|
|
|
Picker("Display Mode", selection: $displayMode ) {
|
|
|
|
|
ForEach(DisplayModes.allCases) { dm in
|
|
|
|
|
Text(dm.description)
|
2024-02-21 20:41:27 -08:00
|
|
|
}
|
2022-06-12 01:25:42 -07:00
|
|
|
}
|
2025-07-19 23:25:43 -07:00
|
|
|
Text("Override default screen layout.")
|
2024-02-21 20:41:27 -08:00
|
|
|
.foregroundColor(.gray)
|
2024-02-21 23:35:28 -08:00
|
|
|
.font(.callout)
|
2022-06-12 01:25:42 -07:00
|
|
|
}
|
2024-02-21 23:35:28 -08:00
|
|
|
.pickerStyle(DefaultPickerStyle())
|
2024-02-21 20:41:27 -08:00
|
|
|
VStack(alignment: .leading) {
|
2025-07-19 23:25:43 -07:00
|
|
|
Picker("OLED Type", selection: $oledType ) {
|
|
|
|
|
ForEach(OledTypes.allCases) { ot in
|
|
|
|
|
Text(ot.description)
|
2024-02-21 20:41:27 -08:00
|
|
|
}
|
2023-11-26 12:54:45 -08:00
|
|
|
}
|
2025-07-19 23:25:43 -07:00
|
|
|
Text("Override automatic OLED screen detection.")
|
2024-02-21 20:41:27 -08:00
|
|
|
.foregroundColor(.gray)
|
2024-02-21 23:35:28 -08:00
|
|
|
.font(.callout)
|
2023-11-26 12:54:45 -08:00
|
|
|
}
|
2024-02-21 23:35:28 -08:00
|
|
|
.pickerStyle(DefaultPickerStyle())
|
2022-06-12 01:25:42 -07:00
|
|
|
}
|
2022-12-30 11:08:59 -08:00
|
|
|
}
|
Transports Interface to Support TCP for all Platforms and Serial on Mac (#1341)
* Initial implementation of transports
* Initial LogRadio implementation
* Fixes for Settings view (caused by debug commenting)
* Refinement of the object and actor model
* Connect view text and tab updates
* Fix mac catalyst and tests
* Warning and logging clean-up
* In progress commit
* Serial Transport and Reconnect draft work
* Serial transport and reconnection draft work
* Quick fix for BLE - still more work to do
* interim commit
* More in progress changes
* Minor improvements
* Pretty good initial implementation
* Bump version beyond the app store
* Fix for disconnection swipeAction
* Tweaks to TCPConnection implementation
* Retry for NONCE_ONLY_DB
* Revert json string change
* Simplified some of the API + "Anti-discovery"
* Tweaks for devices leaving the discovery process
* Bump version
* iOS26 Tweaks
* Tweaks and bug fixes
* Add link with slash sf symbol
* update symbol image on connect view
* BLE disconnect handling
* Log privacy attributes
* Onboarding and minor fixes.
* change database to nodes, add emoji to tcp logs
* Error handling improvements
* More logging emojis
* Suppressed unnecessary errors on disconnect
* Heartbeat emoji
* Add bluetooth symbol
* add privacy attributes to [TCP] logs, add custom bluetooth logo
* Improve routing logs
* Emoji for connect logs
* Heartbeat emoji
* Add CBCentralManagerScanOptionAllowDuplicatesKey options to central for bluetooth
* fix nav errors by switching from observableobject to state
* Update connection indicator icon
* fix for BLE disconnects
* Connection process fixes
* More fixes/tweaks to connection process
* Strict concurrency
* Fix some warnings, remove wifi warning
* delete stale keys
* interim commit
* Update privacy for log, fix wrong space
* fix a couple of linting items
* Switch to targeted
* interim commit
* BLE Signal strenth on connect view
* Remove BLE RSSI from long press menu
* Modem lights
* minor spacing tweak
* Additional BLE logging and a scanning fix.
* Discovery and BLE RSSI improvements
* Background suspension
* Update isConnected to enable UI during db load
* update protobufs
* Replace config if statements with switches, Fix unknown module config logging, make dark mode modem circle stroke color white so they are visible
* Additional logging cleanup
* hast
* Set unmessagable to true if the longname has the unmessagable emoji
* Connect error handling improvements
* Admin popup list icon and activity lights updates
* Revert use of .toolbar back to .navigationBarItems
* More public logging
* Better BLE error handling
* Node DB progress meter
* minor tweak to activity light interaction timing
* Fix comment linting, remove stale keys
* Remove stale keys
* Easy linting fixes
* Two more simple linting fixes
* clean up meshtasticapp
* More public logging
* Replay config
* Logging
* Fix for unselected node on Settings
* Tweak to progress meter based on device idiom
* Update protos
* Session replay redaction of messages
* Serial fix for old devices, and a let statement
* Mask text too
* Fix typo
* BLE poweredOff is now an auto-reconnectable error
* Update logging
* Fix for peerRemovedPairingInformation
* Logging for BLE peripheral:didUpdateValueFor errors.
* Fix for inconsistent swipe disconnect behavior
* periperal:didUpdateValueFor error handling
* Fix for BLEConnection continuation guarding
* BLEConnection actor deadlock on disconnect
* Heartbeat nonce
* Fix for swipe disconnect and task cancellation
* Fix for swipe actions not honoring .disabled()
* Tell BLETransport when BLEConnection is cancelled
* Update navigation logging
* Logging updates
* Bump version to 2.7.0
* Organize into folders and heartbeat stuff
* Minor improvements to manual TCP connection
* Auto-connect toggle
* Possible BLE bug, still waiting to see in logs
* Concurrency tweaks
* Concurrency improvements
* requestDeviceMetadata fix. fixes remote admin
* Minor typo fixes
* "All" button for log filters: category and level
* More robust continuation handling for BLE
* @FetchRequest based ChannelMessageList
* Update info.plist and device hardware file
* Move auto connect toggle to app settings and debug mode, tint properly with the accent color
* Add label to auto connect toggle
* Update log for node info received from ourselves over the mesh
* Remove unused scrollViewProxy
* Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update target for connect view
* Properly Set datadog environment
* Comment out ble manager
* Adjust cyclomatic complexity thresholds in .swiftlint.yml
* Linting fixes, delete ble manager
* Make session replay debug only
---------
Co-authored-by: jake-b <jake-b@users.noreply.github.com>
Co-authored-by: jake <jake@jakes-Mac-mini.local>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-08-27 08:09:02 -07:00
|
|
|
.disabled(!accessoryManager.isConnected || node?.displayConfig == nil)
|
2025-10-05 17:51:18 -07:00
|
|
|
.safeAreaInset(edge: .bottom, alignment: .center) {
|
|
|
|
|
HStack(spacing: 0) {
|
|
|
|
|
SaveConfigButton(node: node, hasChanges: $hasChanges) {
|
|
|
|
|
if let deviceNum = accessoryManager.activeDeviceNum, let connectedNode = getNodeInfo(id: deviceNum, context: context) {
|
|
|
|
|
var dc = Config.DisplayConfig()
|
|
|
|
|
dc.screenOnSecs = UInt32(screenOnSeconds)
|
|
|
|
|
dc.autoScreenCarouselSecs = UInt32(screenCarouselInterval)
|
|
|
|
|
dc.compassNorthTop = compassNorthTop
|
|
|
|
|
dc.wakeOnTapOrMotion = wakeOnTapOrMotion
|
|
|
|
|
dc.flipScreen = flipScreen
|
|
|
|
|
dc.oled = OledTypes(rawValue: oledType)!.protoEnumValue()
|
|
|
|
|
dc.displaymode = DisplayModes(rawValue: displayMode)!.protoEnumValue()
|
|
|
|
|
dc.units = Units(rawValue: units)!.protoEnumValue()
|
|
|
|
|
dc.use12HClock = use12HourClock
|
|
|
|
|
dc.headingBold = headingBold
|
|
|
|
|
|
|
|
|
|
Task {
|
|
|
|
|
_ = try await accessoryManager.saveDisplayConfig(config: dc, fromUser: connectedNode.user!, toUser: node!.user!)
|
|
|
|
|
Task { @MainActor in
|
|
|
|
|
// Should show a saved successfully alert once I know that to be true
|
|
|
|
|
// for now just disable the button after a successful save
|
|
|
|
|
hasChanges = false
|
|
|
|
|
goBack()
|
|
|
|
|
}
|
|
|
|
|
}
|
Transports Interface to Support TCP for all Platforms and Serial on Mac (#1341)
* Initial implementation of transports
* Initial LogRadio implementation
* Fixes for Settings view (caused by debug commenting)
* Refinement of the object and actor model
* Connect view text and tab updates
* Fix mac catalyst and tests
* Warning and logging clean-up
* In progress commit
* Serial Transport and Reconnect draft work
* Serial transport and reconnection draft work
* Quick fix for BLE - still more work to do
* interim commit
* More in progress changes
* Minor improvements
* Pretty good initial implementation
* Bump version beyond the app store
* Fix for disconnection swipeAction
* Tweaks to TCPConnection implementation
* Retry for NONCE_ONLY_DB
* Revert json string change
* Simplified some of the API + "Anti-discovery"
* Tweaks for devices leaving the discovery process
* Bump version
* iOS26 Tweaks
* Tweaks and bug fixes
* Add link with slash sf symbol
* update symbol image on connect view
* BLE disconnect handling
* Log privacy attributes
* Onboarding and minor fixes.
* change database to nodes, add emoji to tcp logs
* Error handling improvements
* More logging emojis
* Suppressed unnecessary errors on disconnect
* Heartbeat emoji
* Add bluetooth symbol
* add privacy attributes to [TCP] logs, add custom bluetooth logo
* Improve routing logs
* Emoji for connect logs
* Heartbeat emoji
* Add CBCentralManagerScanOptionAllowDuplicatesKey options to central for bluetooth
* fix nav errors by switching from observableobject to state
* Update connection indicator icon
* fix for BLE disconnects
* Connection process fixes
* More fixes/tweaks to connection process
* Strict concurrency
* Fix some warnings, remove wifi warning
* delete stale keys
* interim commit
* Update privacy for log, fix wrong space
* fix a couple of linting items
* Switch to targeted
* interim commit
* BLE Signal strenth on connect view
* Remove BLE RSSI from long press menu
* Modem lights
* minor spacing tweak
* Additional BLE logging and a scanning fix.
* Discovery and BLE RSSI improvements
* Background suspension
* Update isConnected to enable UI during db load
* update protobufs
* Replace config if statements with switches, Fix unknown module config logging, make dark mode modem circle stroke color white so they are visible
* Additional logging cleanup
* hast
* Set unmessagable to true if the longname has the unmessagable emoji
* Connect error handling improvements
* Admin popup list icon and activity lights updates
* Revert use of .toolbar back to .navigationBarItems
* More public logging
* Better BLE error handling
* Node DB progress meter
* minor tweak to activity light interaction timing
* Fix comment linting, remove stale keys
* Remove stale keys
* Easy linting fixes
* Two more simple linting fixes
* clean up meshtasticapp
* More public logging
* Replay config
* Logging
* Fix for unselected node on Settings
* Tweak to progress meter based on device idiom
* Update protos
* Session replay redaction of messages
* Serial fix for old devices, and a let statement
* Mask text too
* Fix typo
* BLE poweredOff is now an auto-reconnectable error
* Update logging
* Fix for peerRemovedPairingInformation
* Logging for BLE peripheral:didUpdateValueFor errors.
* Fix for inconsistent swipe disconnect behavior
* periperal:didUpdateValueFor error handling
* Fix for BLEConnection continuation guarding
* BLEConnection actor deadlock on disconnect
* Heartbeat nonce
* Fix for swipe disconnect and task cancellation
* Fix for swipe actions not honoring .disabled()
* Tell BLETransport when BLEConnection is cancelled
* Update navigation logging
* Logging updates
* Bump version to 2.7.0
* Organize into folders and heartbeat stuff
* Minor improvements to manual TCP connection
* Auto-connect toggle
* Possible BLE bug, still waiting to see in logs
* Concurrency tweaks
* Concurrency improvements
* requestDeviceMetadata fix. fixes remote admin
* Minor typo fixes
* "All" button for log filters: category and level
* More robust continuation handling for BLE
* @FetchRequest based ChannelMessageList
* Update info.plist and device hardware file
* Move auto connect toggle to app settings and debug mode, tint properly with the accent color
* Add label to auto connect toggle
* Update log for node info received from ourselves over the mesh
* Remove unused scrollViewProxy
* Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update target for connect view
* Properly Set datadog environment
* Comment out ble manager
* Adjust cyclomatic complexity thresholds in .swiftlint.yml
* Linting fixes, delete ble manager
* Make session replay debug only
---------
Co-authored-by: jake-b <jake-b@users.noreply.github.com>
Co-authored-by: jake <jake@jakes-Mac-mini.local>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-08-27 08:09:02 -07:00
|
|
|
}
|
2022-06-21 10:02:05 -07:00
|
|
|
}
|
|
|
|
|
}
|
2022-06-12 01:25:42 -07:00
|
|
|
}
|
2025-05-03 08:58:33 -07:00
|
|
|
.navigationTitle("Display Config")
|
2024-08-11 09:07:22 -07:00
|
|
|
.navigationBarItems(
|
|
|
|
|
trailing: ZStack {
|
Transports Interface to Support TCP for all Platforms and Serial on Mac (#1341)
* Initial implementation of transports
* Initial LogRadio implementation
* Fixes for Settings view (caused by debug commenting)
* Refinement of the object and actor model
* Connect view text and tab updates
* Fix mac catalyst and tests
* Warning and logging clean-up
* In progress commit
* Serial Transport and Reconnect draft work
* Serial transport and reconnection draft work
* Quick fix for BLE - still more work to do
* interim commit
* More in progress changes
* Minor improvements
* Pretty good initial implementation
* Bump version beyond the app store
* Fix for disconnection swipeAction
* Tweaks to TCPConnection implementation
* Retry for NONCE_ONLY_DB
* Revert json string change
* Simplified some of the API + "Anti-discovery"
* Tweaks for devices leaving the discovery process
* Bump version
* iOS26 Tweaks
* Tweaks and bug fixes
* Add link with slash sf symbol
* update symbol image on connect view
* BLE disconnect handling
* Log privacy attributes
* Onboarding and minor fixes.
* change database to nodes, add emoji to tcp logs
* Error handling improvements
* More logging emojis
* Suppressed unnecessary errors on disconnect
* Heartbeat emoji
* Add bluetooth symbol
* add privacy attributes to [TCP] logs, add custom bluetooth logo
* Improve routing logs
* Emoji for connect logs
* Heartbeat emoji
* Add CBCentralManagerScanOptionAllowDuplicatesKey options to central for bluetooth
* fix nav errors by switching from observableobject to state
* Update connection indicator icon
* fix for BLE disconnects
* Connection process fixes
* More fixes/tweaks to connection process
* Strict concurrency
* Fix some warnings, remove wifi warning
* delete stale keys
* interim commit
* Update privacy for log, fix wrong space
* fix a couple of linting items
* Switch to targeted
* interim commit
* BLE Signal strenth on connect view
* Remove BLE RSSI from long press menu
* Modem lights
* minor spacing tweak
* Additional BLE logging and a scanning fix.
* Discovery and BLE RSSI improvements
* Background suspension
* Update isConnected to enable UI during db load
* update protobufs
* Replace config if statements with switches, Fix unknown module config logging, make dark mode modem circle stroke color white so they are visible
* Additional logging cleanup
* hast
* Set unmessagable to true if the longname has the unmessagable emoji
* Connect error handling improvements
* Admin popup list icon and activity lights updates
* Revert use of .toolbar back to .navigationBarItems
* More public logging
* Better BLE error handling
* Node DB progress meter
* minor tweak to activity light interaction timing
* Fix comment linting, remove stale keys
* Remove stale keys
* Easy linting fixes
* Two more simple linting fixes
* clean up meshtasticapp
* More public logging
* Replay config
* Logging
* Fix for unselected node on Settings
* Tweak to progress meter based on device idiom
* Update protos
* Session replay redaction of messages
* Serial fix for old devices, and a let statement
* Mask text too
* Fix typo
* BLE poweredOff is now an auto-reconnectable error
* Update logging
* Fix for peerRemovedPairingInformation
* Logging for BLE peripheral:didUpdateValueFor errors.
* Fix for inconsistent swipe disconnect behavior
* periperal:didUpdateValueFor error handling
* Fix for BLEConnection continuation guarding
* BLEConnection actor deadlock on disconnect
* Heartbeat nonce
* Fix for swipe disconnect and task cancellation
* Fix for swipe actions not honoring .disabled()
* Tell BLETransport when BLEConnection is cancelled
* Update navigation logging
* Logging updates
* Bump version to 2.7.0
* Organize into folders and heartbeat stuff
* Minor improvements to manual TCP connection
* Auto-connect toggle
* Possible BLE bug, still waiting to see in logs
* Concurrency tweaks
* Concurrency improvements
* requestDeviceMetadata fix. fixes remote admin
* Minor typo fixes
* "All" button for log filters: category and level
* More robust continuation handling for BLE
* @FetchRequest based ChannelMessageList
* Update info.plist and device hardware file
* Move auto connect toggle to app settings and debug mode, tint properly with the accent color
* Add label to auto connect toggle
* Update log for node info received from ourselves over the mesh
* Remove unused scrollViewProxy
* Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update target for connect view
* Properly Set datadog environment
* Comment out ble manager
* Adjust cyclomatic complexity thresholds in .swiftlint.yml
* Linting fixes, delete ble manager
* Make session replay debug only
---------
Co-authored-by: jake-b <jake-b@users.noreply.github.com>
Co-authored-by: jake <jake@jakes-Mac-mini.local>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-08-27 08:09:02 -07:00
|
|
|
ConnectedDevice(deviceConnected: accessoryManager.isConnected, name: accessoryManager.activeConnection?.device.shortName ?? "?")
|
2025-10-05 17:51:18 -07:00
|
|
|
|
2024-08-11 09:07:22 -07:00
|
|
|
}
|
|
|
|
|
)
|
2024-09-04 10:06:34 -07:00
|
|
|
.onFirstAppear {
|
|
|
|
|
// Need to request a DisplayConfig from the remote node before allowing changes
|
Transports Interface to Support TCP for all Platforms and Serial on Mac (#1341)
* Initial implementation of transports
* Initial LogRadio implementation
* Fixes for Settings view (caused by debug commenting)
* Refinement of the object and actor model
* Connect view text and tab updates
* Fix mac catalyst and tests
* Warning and logging clean-up
* In progress commit
* Serial Transport and Reconnect draft work
* Serial transport and reconnection draft work
* Quick fix for BLE - still more work to do
* interim commit
* More in progress changes
* Minor improvements
* Pretty good initial implementation
* Bump version beyond the app store
* Fix for disconnection swipeAction
* Tweaks to TCPConnection implementation
* Retry for NONCE_ONLY_DB
* Revert json string change
* Simplified some of the API + "Anti-discovery"
* Tweaks for devices leaving the discovery process
* Bump version
* iOS26 Tweaks
* Tweaks and bug fixes
* Add link with slash sf symbol
* update symbol image on connect view
* BLE disconnect handling
* Log privacy attributes
* Onboarding and minor fixes.
* change database to nodes, add emoji to tcp logs
* Error handling improvements
* More logging emojis
* Suppressed unnecessary errors on disconnect
* Heartbeat emoji
* Add bluetooth symbol
* add privacy attributes to [TCP] logs, add custom bluetooth logo
* Improve routing logs
* Emoji for connect logs
* Heartbeat emoji
* Add CBCentralManagerScanOptionAllowDuplicatesKey options to central for bluetooth
* fix nav errors by switching from observableobject to state
* Update connection indicator icon
* fix for BLE disconnects
* Connection process fixes
* More fixes/tweaks to connection process
* Strict concurrency
* Fix some warnings, remove wifi warning
* delete stale keys
* interim commit
* Update privacy for log, fix wrong space
* fix a couple of linting items
* Switch to targeted
* interim commit
* BLE Signal strenth on connect view
* Remove BLE RSSI from long press menu
* Modem lights
* minor spacing tweak
* Additional BLE logging and a scanning fix.
* Discovery and BLE RSSI improvements
* Background suspension
* Update isConnected to enable UI during db load
* update protobufs
* Replace config if statements with switches, Fix unknown module config logging, make dark mode modem circle stroke color white so they are visible
* Additional logging cleanup
* hast
* Set unmessagable to true if the longname has the unmessagable emoji
* Connect error handling improvements
* Admin popup list icon and activity lights updates
* Revert use of .toolbar back to .navigationBarItems
* More public logging
* Better BLE error handling
* Node DB progress meter
* minor tweak to activity light interaction timing
* Fix comment linting, remove stale keys
* Remove stale keys
* Easy linting fixes
* Two more simple linting fixes
* clean up meshtasticapp
* More public logging
* Replay config
* Logging
* Fix for unselected node on Settings
* Tweak to progress meter based on device idiom
* Update protos
* Session replay redaction of messages
* Serial fix for old devices, and a let statement
* Mask text too
* Fix typo
* BLE poweredOff is now an auto-reconnectable error
* Update logging
* Fix for peerRemovedPairingInformation
* Logging for BLE peripheral:didUpdateValueFor errors.
* Fix for inconsistent swipe disconnect behavior
* periperal:didUpdateValueFor error handling
* Fix for BLEConnection continuation guarding
* BLEConnection actor deadlock on disconnect
* Heartbeat nonce
* Fix for swipe disconnect and task cancellation
* Fix for swipe actions not honoring .disabled()
* Tell BLETransport when BLEConnection is cancelled
* Update navigation logging
* Logging updates
* Bump version to 2.7.0
* Organize into folders and heartbeat stuff
* Minor improvements to manual TCP connection
* Auto-connect toggle
* Possible BLE bug, still waiting to see in logs
* Concurrency tweaks
* Concurrency improvements
* requestDeviceMetadata fix. fixes remote admin
* Minor typo fixes
* "All" button for log filters: category and level
* More robust continuation handling for BLE
* @FetchRequest based ChannelMessageList
* Update info.plist and device hardware file
* Move auto connect toggle to app settings and debug mode, tint properly with the accent color
* Add label to auto connect toggle
* Update log for node info received from ourselves over the mesh
* Remove unused scrollViewProxy
* Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update target for connect view
* Properly Set datadog environment
* Comment out ble manager
* Adjust cyclomatic complexity thresholds in .swiftlint.yml
* Linting fixes, delete ble manager
* Make session replay debug only
---------
Co-authored-by: jake-b <jake-b@users.noreply.github.com>
Co-authored-by: jake <jake@jakes-Mac-mini.local>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-08-27 08:09:02 -07:00
|
|
|
if let deviceNum = accessoryManager.activeDeviceNum, let node {
|
|
|
|
|
if let connectedNode = getNodeInfo(id: deviceNum, context: context) {
|
|
|
|
|
if node.num != deviceNum {
|
2024-09-05 19:31:29 -07:00
|
|
|
if UserDefaults.enableAdministration {
|
|
|
|
|
/// 2.5 Administration with session passkey
|
|
|
|
|
let expiration = node.sessionExpiration ?? Date()
|
|
|
|
|
if expiration < Date() || node.displayConfig == nil {
|
Transports Interface to Support TCP for all Platforms and Serial on Mac (#1341)
* Initial implementation of transports
* Initial LogRadio implementation
* Fixes for Settings view (caused by debug commenting)
* Refinement of the object and actor model
* Connect view text and tab updates
* Fix mac catalyst and tests
* Warning and logging clean-up
* In progress commit
* Serial Transport and Reconnect draft work
* Serial transport and reconnection draft work
* Quick fix for BLE - still more work to do
* interim commit
* More in progress changes
* Minor improvements
* Pretty good initial implementation
* Bump version beyond the app store
* Fix for disconnection swipeAction
* Tweaks to TCPConnection implementation
* Retry for NONCE_ONLY_DB
* Revert json string change
* Simplified some of the API + "Anti-discovery"
* Tweaks for devices leaving the discovery process
* Bump version
* iOS26 Tweaks
* Tweaks and bug fixes
* Add link with slash sf symbol
* update symbol image on connect view
* BLE disconnect handling
* Log privacy attributes
* Onboarding and minor fixes.
* change database to nodes, add emoji to tcp logs
* Error handling improvements
* More logging emojis
* Suppressed unnecessary errors on disconnect
* Heartbeat emoji
* Add bluetooth symbol
* add privacy attributes to [TCP] logs, add custom bluetooth logo
* Improve routing logs
* Emoji for connect logs
* Heartbeat emoji
* Add CBCentralManagerScanOptionAllowDuplicatesKey options to central for bluetooth
* fix nav errors by switching from observableobject to state
* Update connection indicator icon
* fix for BLE disconnects
* Connection process fixes
* More fixes/tweaks to connection process
* Strict concurrency
* Fix some warnings, remove wifi warning
* delete stale keys
* interim commit
* Update privacy for log, fix wrong space
* fix a couple of linting items
* Switch to targeted
* interim commit
* BLE Signal strenth on connect view
* Remove BLE RSSI from long press menu
* Modem lights
* minor spacing tweak
* Additional BLE logging and a scanning fix.
* Discovery and BLE RSSI improvements
* Background suspension
* Update isConnected to enable UI during db load
* update protobufs
* Replace config if statements with switches, Fix unknown module config logging, make dark mode modem circle stroke color white so they are visible
* Additional logging cleanup
* hast
* Set unmessagable to true if the longname has the unmessagable emoji
* Connect error handling improvements
* Admin popup list icon and activity lights updates
* Revert use of .toolbar back to .navigationBarItems
* More public logging
* Better BLE error handling
* Node DB progress meter
* minor tweak to activity light interaction timing
* Fix comment linting, remove stale keys
* Remove stale keys
* Easy linting fixes
* Two more simple linting fixes
* clean up meshtasticapp
* More public logging
* Replay config
* Logging
* Fix for unselected node on Settings
* Tweak to progress meter based on device idiom
* Update protos
* Session replay redaction of messages
* Serial fix for old devices, and a let statement
* Mask text too
* Fix typo
* BLE poweredOff is now an auto-reconnectable error
* Update logging
* Fix for peerRemovedPairingInformation
* Logging for BLE peripheral:didUpdateValueFor errors.
* Fix for inconsistent swipe disconnect behavior
* periperal:didUpdateValueFor error handling
* Fix for BLEConnection continuation guarding
* BLEConnection actor deadlock on disconnect
* Heartbeat nonce
* Fix for swipe disconnect and task cancellation
* Fix for swipe actions not honoring .disabled()
* Tell BLETransport when BLEConnection is cancelled
* Update navigation logging
* Logging updates
* Bump version to 2.7.0
* Organize into folders and heartbeat stuff
* Minor improvements to manual TCP connection
* Auto-connect toggle
* Possible BLE bug, still waiting to see in logs
* Concurrency tweaks
* Concurrency improvements
* requestDeviceMetadata fix. fixes remote admin
* Minor typo fixes
* "All" button for log filters: category and level
* More robust continuation handling for BLE
* @FetchRequest based ChannelMessageList
* Update info.plist and device hardware file
* Move auto connect toggle to app settings and debug mode, tint properly with the accent color
* Add label to auto connect toggle
* Update log for node info received from ourselves over the mesh
* Remove unused scrollViewProxy
* Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update target for connect view
* Properly Set datadog environment
* Comment out ble manager
* Adjust cyclomatic complexity thresholds in .swiftlint.yml
* Linting fixes, delete ble manager
* Make session replay debug only
---------
Co-authored-by: jake-b <jake-b@users.noreply.github.com>
Co-authored-by: jake <jake@jakes-Mac-mini.local>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-08-27 08:09:02 -07:00
|
|
|
Task {
|
|
|
|
|
do {
|
|
|
|
|
Logger.mesh.info("⚙️ Empty or expired display config requesting via PKI admin")
|
|
|
|
|
try await accessoryManager.requestDisplayConfig(fromUser: connectedNode.user!, toUser: node.user!)
|
|
|
|
|
} catch {
|
|
|
|
|
Logger.mesh.error("🚨 Display config request failed")
|
|
|
|
|
}
|
|
|
|
|
}
|
2024-09-05 19:31:29 -07:00
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
/// Legacy Administration
|
2025-05-13 06:19:27 -07:00
|
|
|
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
|
2024-09-04 10:06:34 -07:00
|
|
|
}
|
|
|
|
|
}
|
2023-01-31 22:08:03 -08:00
|
|
|
}
|
|
|
|
|
}
|
2022-06-21 10:02:05 -07:00
|
|
|
}
|
2024-10-06 08:50:12 -07:00
|
|
|
.onChange(of: screenOnSeconds) { oldScreenSecs, newScreenSecs in
|
|
|
|
|
if oldScreenSecs != newScreenSecs && newScreenSecs != node?.displayConfig?.screenOnSeconds ?? -1 { hasChanges = true }
|
2022-06-21 10:02:05 -07:00
|
|
|
}
|
2024-10-06 08:50:12 -07:00
|
|
|
.onChange(of: screenCarouselInterval) { oldCarouselSecs, newCarouselSecs in
|
|
|
|
|
if oldCarouselSecs != newCarouselSecs && newCarouselSecs != node?.displayConfig?.screenCarouselInterval ?? -1 { hasChanges = true }
|
2022-06-21 10:02:05 -07:00
|
|
|
}
|
2024-10-06 08:50:12 -07:00
|
|
|
.onChange(of: compassNorthTop) { oldCompassNorthTop, newCompassNorthTop in
|
|
|
|
|
if oldCompassNorthTop != newCompassNorthTop && newCompassNorthTop != node?.displayConfig?.compassNorthTop { hasChanges = true }
|
2022-08-07 08:31:39 -07:00
|
|
|
}
|
2024-10-06 08:50:12 -07:00
|
|
|
.onChange(of: wakeOnTapOrMotion) { oldWakeOnTapOrMotion, newWakeOnTapOrMotion in
|
|
|
|
|
if oldWakeOnTapOrMotion != newWakeOnTapOrMotion && newWakeOnTapOrMotion != node?.displayConfig?.wakeOnTapOrMotion { hasChanges = true }
|
2023-03-25 00:41:57 -07:00
|
|
|
}
|
2024-10-06 08:50:12 -07:00
|
|
|
.onChange(of: flipScreen) { oldFlipScreen, newFlipScreen in
|
|
|
|
|
if oldFlipScreen != newFlipScreen && newFlipScreen != node?.displayConfig?.flipScreen { hasChanges = true }
|
2022-10-22 08:45:53 -07:00
|
|
|
}
|
2024-10-06 08:50:12 -07:00
|
|
|
.onChange(of: oledType) { oldOledType, newOledType in
|
|
|
|
|
if oldOledType != newOledType && newOledType != node?.displayConfig?.oledType ?? -1 { hasChanges = true }
|
2022-12-11 14:14:08 -08:00
|
|
|
}
|
2024-10-06 08:50:12 -07:00
|
|
|
.onChange(of: displayMode) { oldDisplayMode, newDisplayMode in
|
|
|
|
|
if oldDisplayMode != newDisplayMode && newDisplayMode != node?.displayConfig?.displayMode ?? -1 { hasChanges = true }
|
2023-01-25 23:01:45 -08:00
|
|
|
}
|
2024-10-06 08:50:12 -07:00
|
|
|
.onChange(of: units) { oldUnits, newUnits in
|
|
|
|
|
if oldUnits != newUnits && newUnits != node?.displayConfig?.units ?? -1 { hasChanges = true }
|
2023-11-26 12:54:45 -08:00
|
|
|
}
|
2025-06-15 20:04:21 -07:00
|
|
|
.onChange(of: use12HourClock) { oldUse12HourClock, newUse12HourClock in
|
|
|
|
|
if oldUse12HourClock != newUse12HourClock && newUse12HourClock != node?.displayConfig?.use12HClock { hasChanges = true }
|
|
|
|
|
}
|
2025-07-19 23:25:43 -07:00
|
|
|
.onChange(of: headingBold) { oldHeadingBold, newHeadingBold in
|
|
|
|
|
if oldHeadingBold != newHeadingBold && newHeadingBold != node?.displayConfig?.headingBold { hasChanges = true }
|
|
|
|
|
}
|
2022-06-12 01:25:42 -07:00
|
|
|
}
|
2023-03-19 18:37:23 -07:00
|
|
|
func setDisplayValues() {
|
2025-07-19 23:25:43 -07:00
|
|
|
self.screenOnSeconds = Int(node?.displayConfig?.screenOnSeconds ?? 0)
|
|
|
|
|
self.screenCarouselInterval = Int(node?.displayConfig?.screenCarouselInterval ?? 0)
|
|
|
|
|
self.compassNorthTop = node?.displayConfig?.compassNorthTop ?? false
|
|
|
|
|
self.wakeOnTapOrMotion = node?.displayConfig?.wakeOnTapOrMotion ?? false
|
|
|
|
|
self.flipScreen = node?.displayConfig?.flipScreen ?? false
|
|
|
|
|
self.oledType = Int(node?.displayConfig?.oledType ?? 0)
|
|
|
|
|
self.displayMode = Int(node?.displayConfig?.displayMode ?? 0)
|
|
|
|
|
self.units = Int(node?.displayConfig?.units ?? 0)
|
|
|
|
|
self.headingBold = node?.displayConfig?.headingBold ?? false
|
2025-07-21 16:46:55 -07:00
|
|
|
self.use12HourClock = node?.displayConfig?.use12HClock ?? false
|
2025-07-21 11:43:52 -07:00
|
|
|
self.hasChanges = false
|
2023-03-19 18:37:23 -07:00
|
|
|
}
|
2022-06-12 01:25:42 -07:00
|
|
|
}
|