From 68587bdba35a8069856dd866788293a06c3ef9fb Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 30 Sep 2022 21:06:52 -0700 Subject: [PATCH] Bluetooth connect page connected radio context menu --- Meshtastic/Views/Bluetooth/Connect.swift | 13 +++++++++---- Meshtastic/Views/Settings/MeshLog.swift | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Meshtastic/Views/Bluetooth/Connect.swift b/Meshtastic/Views/Bluetooth/Connect.swift index e62f3766..a6b5d53f 100644 --- a/Meshtastic/Views/Bluetooth/Connect.swift +++ b/Meshtastic/Views/Bluetooth/Connect.swift @@ -121,10 +121,15 @@ struct Connect: View { } .contextMenu{ - Text("My Node Info") - Label("Bitrate \(String(format: "%.2f", bleManager.connectedPeripheral.bitrate ?? 0.00))", systemImage: "pencil.circle") - Text("Ch. Utilization \(String(format: "%.2f", bleManager.connectedPeripheral.channelUtilization ?? 0.00))") - Text("Air Time \(String(format: "%.2f", bleManager.connectedPeripheral.airTime ?? 0.00))") + Text("Num: \(String(bleManager.connectedPeripheral.num))") + Text("Short Name: \(bleManager.connectedPeripheral.shortName)") + Text("Long Name: \(bleManager.connectedPeripheral.longName)") + Text("Unique Code: \(bleManager.connectedPeripheral.lastFourCode)") + Text("Max Channels: \(String(bleManager.connectedPeripheral.maxChannels))") + Text("Bitrate: \(String(format: "%.2f", bleManager.connectedPeripheral.bitrate ?? 0.00))") + Text("Ch. Utilization: \(String(format: "%.2f", bleManager.connectedPeripheral.channelUtilization ?? 0.00))") + Text("Air Time: \(String(format: "%.2f", bleManager.connectedPeripheral.airTime ?? 0.00))") + Text("RSSI: \(bleManager.connectedPeripheral.rssi)") } } else { diff --git a/Meshtastic/Views/Settings/MeshLog.swift b/Meshtastic/Views/Settings/MeshLog.swift index b9cfd355..a2db3e19 100644 --- a/Meshtastic/Views/Settings/MeshLog.swift +++ b/Meshtastic/Views/Settings/MeshLog.swift @@ -26,8 +26,8 @@ struct MeshLog: View { lineCount += 1 } - var startingLog = 0 // Set the record to start with if we have more lines than the limit + var startingLog = 0 if lineCount > lineLimit { startingLog = lineCount - lineLimit }