meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

LIttle logging cleanup

Browse source
This commit is contained in:
Garth Vander Houwen 2024-06-06 15:45:54 -07:00
parent 52b9a2d4c0
commit c43cd4338d
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Meshtastic/Extensions/Logger.swift
View file

@ -51,7 +51,7 @@ extension OSLogEntryLog.Level {
var description: String {
switch self {
case .undefined: "undefined"
case .debug: "🐛 Debug"
case .debug: "🩺 Debug"
case .info: "ℹ️ Info"
case .notice: "⚠️ Notice"
case .error: "🚨 Error"

14
Meshtastic/Helpers/BLEManager.swift
View file

@ -62,7 +62,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
func startScanning() {
if isSwitchedOn {
centralManager.scanForPeripherals(withServices: [meshtasticServiceCBUUID], options: [CBCentralManagerScanOptionAllowDuplicatesKey: false])
Logger.services.info("✅ Scanning Started")
Logger.services.info("🟢 Started Scanning for BLE Devices")
}
}
@ -70,7 +70,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
func stopScanning() {
if centralManager.isScanning {
centralManager.stopScan()
Logger.services.info("🛑 Stopped Scanning")
Logger.services.info("🛑 Stopped Scanning for BLE Devices")
}
}
@ -492,7 +492,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
}
func peripheral(_ peripheral: CBPeripheral, didUpdateNotificationStateFor characteristic: CBCharacteristic, error: Error?) {
Logger.services.error("💥 didUpdateNotificationStateFor error: \(error?.localizedDescription ?? "Unknown")")
Logger.services.error("💥 BLE didUpdateNotificationStateFor error: \(error?.localizedDescription ?? "Unknown")")
}
// MARK: Data Read / Update Characteristic Event
@ -500,14 +500,13 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
if let error {
Logger.services.error("🚫 didUpdateValueFor Characteristic error \(error.localizedDescription)")
Logger.services.error("🚫 BLE didUpdateValueFor Characteristic error \(error.localizedDescription)")
let errorCode = (error as NSError).code
if errorCode == 5 || errorCode == 15 {
// BLE PIN connection errors
// 5 CBATTErrorDomain Code=5 "Authentication is insufficient."
// 15 CBATTErrorDomain Code=15 "Encryption is insufficient."
lastConnectionError = "🚨" + String.localizedStringWithFormat("ble.errorcode.pin %@".localized, error.localizedDescription)
Logger.services.error("💥 \(error.localizedDescription) Please try connecting again and check the PIN carefully.")
self.disconnectPeripheral(reconnect: false)
}
return
@ -803,7 +802,8 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
}
case FROMNUM_UUID:
Logger.services.info("🗞️ BLE (Notify) characteristic, value will be read next")
return
// Logger.services.info("🗞️ BLE (Notify) characteristic, value will be read next")
default:
Logger.services.error("Unhandled Characteristic UUID: \(characteristic.uuid)")
}
@ -3013,7 +3013,7 @@ extension BLEManager: CBCentralManagerDelegate {
default:
status = "default"
}
Logger.services.debug("📜 BLEManager status: \(status)")
Logger.services.debug("📜 BLE status: \(status)")
}
// Called each time a peripheral is discovered

2
Meshtastic/Views/Settings/AppLog.swift
View file

@ -94,7 +94,7 @@ struct AppLog: View {
}
}
)
.navigationBarTitle("Debug Logs", displayMode: .inline)
.navigationBarTitle("Debug Logs\(logs.isEmpty ? "" : " (\(logs.count))")", displayMode: .inline)
.toolbar {
if !logs.isEmpty {
ToolbarItem(placement: .navigationBarTrailing) {

2
Meshtastic/Views/Settings/Settings.swift
View file

@ -431,7 +431,7 @@ struct Settings: View {
Label {
Text("Debug Logs")
} icon: {
Image(systemName: "ladybug")
Image(systemName: "stethoscope")
}
}
.tag(SettingsSidebar.appLog)