From cfe52eb9311276be8a4ad91cafcbab722454e573 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 23 Feb 2024 09:08:49 -0800 Subject: [PATCH 1/3] Add back clearing of channels --- Meshtastic/Helpers/BLEManager.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift index 045fb762..d80dbd15 100644 --- a/Meshtastic/Helpers/BLEManager.swift +++ b/Meshtastic/Helpers/BLEManager.swift @@ -532,7 +532,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate connectedPeripheral.name = myInfo?.bleName ?? "unknown".localized connectedPeripheral.longName = myInfo?.bleName ?? "unknown".localized } - //tryClearExistingChannels() + tryClearExistingChannels() } // NodeInfo if decodedInfo.nodeInfo.num > 0 {// && !invalidVersion { From 35f99173ba549d94cbb35535eecbd886bbe01630 Mon Sep 17 00:00:00 2001 From: Wolfgang Nagele Date: Mon, 11 Mar 2024 21:41:44 +0100 Subject: [PATCH 2/3] Device metrics chart improvements --- Meshtastic/Views/Nodes/DeviceMetricsLog.swift | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift index e1e87b6a..269b3020 100644 --- a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift +++ b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift @@ -34,22 +34,25 @@ struct DeviceMetricsLog: View { Chart { ForEach(chartData, id: \.self) { point in - Plot { - LineMark( - x: .value("x", point.time!), - y: .value("y", point.batteryLevel) - ) + if point.batteryLevel != 101 { // Filter out magic charging value + Plot { + LineMark( + x: .value("x", point.time!), + y: .value("y", point.batteryLevel) + ) + } + .accessibilityLabel("Line Series") + .accessibilityValue("X: \(point.time!), Y: \(point.batteryLevel)") + .foregroundStyle(batteryChartColor) + .interpolationMethod(.linear) } - .accessibilityLabel("Line Series") - .accessibilityValue("X: \(point.time!), Y: \(point.batteryLevel)") - .foregroundStyle(batteryChartColor) - .interpolationMethod(.cardinal) Plot { PointMark( x: .value("x", point.time!), y: .value("y", point.channelUtilization) ) + .symbolSize(25) } .accessibilityLabel("Line Series") .accessibilityValue("X: \(point.time!), Y: \(point.channelUtilization)") @@ -64,6 +67,7 @@ struct DeviceMetricsLog: View { x: .value("x", point.time!), y: .value("y", point.airUtilTx) ) + .symbolSize(25) } .accessibilityLabel("Line Series") .accessibilityValue("X: \(point.time!), Y: \(point.airUtilTx)") From 676662bb4f9a19c1e7c6d0896b9ab47d7bdec06b Mon Sep 17 00:00:00 2001 From: Wolfgang Nagele Date: Thu, 14 Mar 2024 20:37:27 +0100 Subject: [PATCH 3/3] Drop filtering of 101% --- Meshtastic/Views/Nodes/DeviceMetricsLog.swift | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift index 269b3020..2c5fe248 100644 --- a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift +++ b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift @@ -34,18 +34,16 @@ struct DeviceMetricsLog: View { Chart { ForEach(chartData, id: \.self) { point in - if point.batteryLevel != 101 { // Filter out magic charging value - Plot { - LineMark( - x: .value("x", point.time!), - y: .value("y", point.batteryLevel) - ) - } - .accessibilityLabel("Line Series") - .accessibilityValue("X: \(point.time!), Y: \(point.batteryLevel)") - .foregroundStyle(batteryChartColor) - .interpolationMethod(.linear) + Plot { + LineMark( + x: .value("x", point.time!), + y: .value("y", point.batteryLevel) + ) } + .accessibilityLabel("Line Series") + .accessibilityValue("X: \(point.time!), Y: \(point.batteryLevel)") + .foregroundStyle(batteryChartColor) + .interpolationMethod(.linear) Plot { PointMark(