From a0265a43114b254bbb627eed8156c9c7ecdf177b Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Wed, 3 Aug 2022 07:28:11 -0700 Subject: [PATCH] Fix telemetry title, remove messages from logging --- Meshtastic/Helpers/BLEManager.swift | 1 + Meshtastic/Helpers/MeshPackets.swift | 4 ++-- Meshtastic/Views/Nodes/TelemetryLog.swift | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift index 0e093920..636b0f35 100644 --- a/Meshtastic/Helpers/BLEManager.swift +++ b/Meshtastic/Helpers/BLEManager.swift @@ -1214,6 +1214,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph var dataMessage = DataMessage() dataMessage.payload = try! adminPacket.serializedData() dataMessage.portnum = PortNum.adminApp + dataMessage.wantResponse = wantResponse meshPacket.decoded = dataMessage diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift index 5d1febfc..d03afff3 100644 --- a/Meshtastic/Helpers/MeshPackets.swift +++ b/Meshtastic/Helpers/MeshPackets.swift @@ -1422,7 +1422,7 @@ func textMessageAppPacket(packet: MeshPacket, connectedNode: Int64, meshLogging: if let messageText = String(bytes: packet.decoded.payload, encoding: .utf8) { - if meshLogging { MeshLogger.log("💬 Message received for text message app \(messageText)") } + if meshLogging { MeshLogger.log("💬 Message received for text message app") } let messageUsers: NSFetchRequest = NSFetchRequest.init(entityName: "UserEntity") messageUsers.predicate = NSPredicate(format: "num IN %@", [packet.to, packet.from]) @@ -1496,7 +1496,7 @@ func textMessageAppPacket(packet: MeshPacket, connectedNode: Int64, meshLogging: ] manager.schedule() - if meshLogging { MeshLogger.log("💬 iOS Notification Scheduled for text message from \(newMessage.fromUser?.longName ?? "Unknown") \(messageText)") } + if meshLogging { MeshLogger.log("💬 iOS Notification Scheduled for text message from \(newMessage.fromUser?.longName ?? "Unknown")") } } } catch { diff --git a/Meshtastic/Views/Nodes/TelemetryLog.swift b/Meshtastic/Views/Nodes/TelemetryLog.swift index b6e5fd05..d60f72c5 100644 --- a/Meshtastic/Views/Nodes/TelemetryLog.swift +++ b/Meshtastic/Views/Nodes/TelemetryLog.swift @@ -177,7 +177,7 @@ struct TelemetryLog: View { Spacer() Text("Device Metrics") - .font(.title) + .font(.title3) Spacer() } @@ -234,7 +234,6 @@ struct TelemetryLog: View { } else if tel.metricsType == 1 { // Environment Metrics - let tempReadingType = (!(node.telemetryConfig?.environmentDisplayFahrenheit ?? true)) ? "°C" : "°F"