From 97e69af44ae1c01e005b341541d4b727ebe865b8 Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Mon, 15 Jan 2024 18:13:31 -0800
Subject: [PATCH] go back to .cardinal interpolationmode

---
 Meshtastic/Helpers/BLEManager.swift           | 2 ++
 Meshtastic/Views/Nodes/DeviceMetricsLog.swift | 4 +---
 Meshtastic/Views/Settings/Firmware.swift      | 8 +++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift
index d65053af..15604737 100644
--- a/Meshtastic/Helpers/BLEManager.swift
+++ b/Meshtastic/Helpers/BLEManager.swift
@@ -1116,10 +1116,12 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
 		meshPacket.id = UInt32.random(in: UInt32(UInt8.max)..<UInt32.max)
 		meshPacket.priority =  MeshPacket.Priority.reliable
 		meshPacket.wantAck = true
+		meshPacket.channel = UInt32(0)
 		var dataMessage = DataMessage()
 		dataMessage.payload = try! adminPacket.serializedData()
 		dataMessage.portnum = PortNum.adminApp
 		meshPacket.decoded = dataMessage
+		automaticallyReconnect = false
 		let messageDescription = "🚀 Sent enter DFU mode Admin Message to: \(toUser.longName ?? "unknown".localized) from: \(fromUser.longName ?? "unknown".localized)"
 		if sendAdminMessageToRadio(meshPacket: meshPacket, adminDescription: messageDescription, fromUser: fromUser, toUser: toUser) {
 			return true
diff --git a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift
index 1dab8c04..b3d338e0 100644
--- a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift
+++ b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift
@@ -33,9 +33,7 @@ struct DeviceMetricsLog: View {
 					GroupBox(label: Label("\(deviceMetrics.count) Readings Total", systemImage: "chart.xyaxis.line")) {
 
 						Chart {
-
 							ForEach(chartData, id: \.self) { point in
-
 								Plot {
 									LineMark(
 										x: .value("x", point.time!),
@@ -45,7 +43,7 @@ struct DeviceMetricsLog: View {
 								.accessibilityLabel("Line Series")
 								.accessibilityValue("X: \(point.time!), Y: \(point.batteryLevel)")
 								.foregroundStyle(batteryChartColor)
-								.interpolationMethod(.catmullRom(alpha: 1.0))
+								.interpolationMethod(.cardinal)
 
 								Plot {
 									PointMark(
diff --git a/Meshtastic/Views/Settings/Firmware.swift b/Meshtastic/Views/Settings/Firmware.swift
index c7123198..c0141523 100644
--- a/Meshtastic/Views/Settings/Firmware.swift
+++ b/Meshtastic/Views/Settings/Firmware.swift
@@ -109,7 +109,13 @@ struct Firmware: View {
 							Button {
 								let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral?.num ?? 0, context: context)
 								if connectedNode != nil {
-									if !bleManager.sendEnterDfuMode(fromUser: connectedNode!.user!, toUser: node!.user!) {
+									
+									if bleManager.sendEnterDfuMode(fromUser: connectedNode!.user!, toUser: node!.user!) {
+										DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+											bleManager.automaticallyReconnect = false
+											bleManager.disconnectPeripheral()
+										}
+									} else {
 										print("Enter DFU Failed")
 									}
 								}