From cce30cd9f7358f9032f3647d26ffe638126b0b49 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Tue, 27 Feb 2024 12:24:50 -0800 Subject: [PATCH] Fix logs for pax counter --- Meshtastic/Persistence/UpdateCoreData.swift | 2 +- .../Views/Settings/Config/PowerConfig.swift | 50 +++++++++---------- en.lproj/Localizable.strings | 1 + 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/Meshtastic/Persistence/UpdateCoreData.swift b/Meshtastic/Persistence/UpdateCoreData.swift index 5e711b32..c6b290a5 100644 --- a/Meshtastic/Persistence/UpdateCoreData.swift +++ b/Meshtastic/Persistence/UpdateCoreData.swift @@ -977,7 +977,7 @@ func upsertExternalNotificationModuleConfigPacket(config: Meshtastic.ModuleConfi func upsertPaxCounterModuleConfigPacket(config: Meshtastic.ModuleConfig.PaxcounterConfig, nodeNum: Int64, context: NSManagedObjectContext) { let logString = String.localizedStringWithFormat("mesh.log.paxcounter.config %@".localized, String(nodeNum)) - MeshLogger.log("📣 \(logString)") + MeshLogger.log("🧑‍🤝‍🧑 \(logString)") let fetchNodeInfoRequest: NSFetchRequest = NSFetchRequest.init(entityName: "NodeInfoEntity") fetchNodeInfoRequest.predicate = NSPredicate(format: "num == %lld", Int64(nodeNum)) diff --git a/Meshtastic/Views/Settings/Config/PowerConfig.swift b/Meshtastic/Views/Settings/Config/PowerConfig.swift index 28660143..11b8a71e 100644 --- a/Meshtastic/Views/Settings/Config/PowerConfig.swift +++ b/Meshtastic/Views/Settings/Config/PowerConfig.swift @@ -71,31 +71,31 @@ struct PowerConfig: View { } header: { Text("config.power.section.battery") } - Section { - Picker("config.power.wait.bluetooth.secs", selection: $waitBluetoothSecs) { - ForEach(PowerIntervals.allCases) { - Text($0.description) - } - } - .pickerStyle(DefaultPickerStyle()) - - Picker("config.power.ls.secs", selection: $lsSecs) { - ForEach(PowerIntervals.allCases) { - Text($0.description) - } - } - .pickerStyle(DefaultPickerStyle()) - - Picker("config.power.min.wake.secs", selection: $minWakeSecs) { - ForEach(PowerIntervals.allCases) { - Text($0.description) - } - } - .pickerStyle(DefaultPickerStyle()) - - } header: { - Text("config.power.section.sleep") - } +// Section { +// Picker("config.power.wait.bluetooth.secs", selection: $waitBluetoothSecs) { +// ForEach(PowerIntervals.allCases) { +// Text($0.description) +// } +// } +// .pickerStyle(DefaultPickerStyle()) +// +// Picker("config.power.ls.secs", selection: $lsSecs) { +// ForEach(PowerIntervals.allCases) { +// Text($0.description) +// } +// } +// .pickerStyle(DefaultPickerStyle()) +// +// Picker("config.power.min.wake.secs", selection: $minWakeSecs) { +// ForEach(PowerIntervals.allCases) { +// Text($0.description) +// } +// } +// .pickerStyle(DefaultPickerStyle()) +// +// } header: { +// Text("config.power.section.sleep") +// } } } .disabled(self.bleManager.connectedPeripheral == nil || node?.powerConfig == nil) diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings index 65eb915e..69961f21 100644 --- a/en.lproj/Localizable.strings +++ b/en.lproj/Localizable.strings @@ -207,6 +207,7 @@ "mesh.log.network.config %@"="Network config received: %@"; "mesh.log.nodeinfo.received %@"="Node info received for: %@"; "mesh.log.paxcounter %@"="PAX Counter message received from: %@"; +"mesh.log.paxcounter.config %@"="PAX Counter config received: %@"; "mesh.log.position.config %@"="Positon config received: %@"; "mesh.log.position.received %@"="Position Packet received from node: %@"; "mesh.log.power.config %@"="Power config received: %@";