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

Adopt OSLog for logging and replace the majority of calls to print()

Browse source
This commit is contained in:
Blake McAnally 2024-05-31 16:42:34 -05:00
parent 79e23d561e
commit 4c7cd0d923
65 changed files with 418 additions and 401 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift
View file

@ -233,7 +233,7 @@ struct CannedMessagesConfig: View {
setCannedMessagesValues()
// Need to request a CannedMessagesModuleConfig from the remote node before allowing changes
if bleManager.connectedPeripheral != nil && node?.cannedMessageConfig == nil {
print("empty canned messages module config")
logger.info("empty canned messages module config")
let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral.num, context: context)
if node != nil && connectedNode != nil {
_ = bleManager.requestCannedMessagesModuleConfig(fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode?.myInfo?.adminIndex ?? 0)

2
Meshtastic/Views/Settings/Config/Module/DetectionSensorConfig.swift
View file

@ -189,7 +189,7 @@ struct DetectionSensorConfig: View {
setDetectionSensorValues()
// Need to request a Detection Sensor Module Config from the remote node before allowing changes
if bleManager.connectedPeripheral != nil && node?.detectionSensorConfig == nil {
print("empty detection sensor module config")
logger.info("empty detection sensor module config")
let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral.num, context: context)
if node != nil && connectedNode != nil {
_ = bleManager.requestDetectionSensorModuleConfig(fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode?.myInfo?.adminIndex ?? 0)

2
Meshtastic/Views/Settings/Config/Module/ExternalNotificationConfig.swift
View file

@ -199,7 +199,7 @@ struct ExternalNotificationConfig: View {
setExternalNotificationValues()
// Need to request a TelemetryModuleConfig from the remote node before allowing changes
if bleManager.connectedPeripheral != nil && node?.externalNotificationConfig == nil {
print("empty external notification module config")
logger.info("empty external notification module config")
let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral.num, context: context)
if node != nil && connectedNode != nil {
_ = bleManager.requestExternalNotificationModuleConfig(fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode?.myInfo?.adminIndex ?? 0)

8
Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift
View file

@ -361,7 +361,7 @@ struct MQTTConfig: View {
setMqttValues()
// Need to request a TelemetryModuleConfig from the remote node before allowing changes
if bleManager.connectedPeripheral != nil && node?.mqttConfig == nil {
print("empty mqtt module config")
logger.info("empty mqtt module config")
let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral.num, context: context)
if node != nil && connectedNode != nil {
_ = bleManager.requestMqttModuleConfig(fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode?.myInfo?.adminIndex ?? 0)
@ -379,8 +379,8 @@ struct MQTTConfig: View {
let region = RegionCodes(rawValue: Int(node?.loRaConfig?.regionCode ?? 0))?.topic
defaultTopic = "msh/" + (region ?? "UNSET")
geocoder.reverseGeocodeLocation(LocationsHandler.shared.locationsArray.first!, completionHandler: {(placemarks, error) in
if error != nil {
print("Failed to reverse geocode location")
if let error {
logger.error("Failed to reverse geocode location: \(error.localizedDescription)")
return
}
@ -412,7 +412,7 @@ struct MQTTConfig: View {
nearbyTopics.append(neightborhoodTopic)
}
} else {
print("No Location")
logger.debug("No Location")
}
})
}

2
Meshtastic/Views/Settings/Config/Module/RangeTestConfig.swift
View file

@ -81,7 +81,7 @@ struct RangeTestConfig: View {
setRangeTestValues()
// Need to request a RangeTestModule Config from the remote node before allowing changes
if bleManager.connectedPeripheral != nil && node?.rangeTestConfig == nil {
print("empty range test module config")
logger.debug("empty range test module config")
let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral.num, context: context)
if node != nil && connectedNode != nil {
_ = bleManager.requestRangeTestModuleConfig(fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode?.myInfo?.adminIndex ?? 0)

2
Meshtastic/Views/Settings/Config/Module/SerialConfig.swift
View file

@ -137,7 +137,7 @@ struct SerialConfig: View {
setSerialValues()
// Need to request a SerialModuleConfig from the remote node before allowing changes
if bleManager.connectedPeripheral != nil && node?.serialConfig == nil {
print("empty serial module config")
logger.debug("empty serial module config")
let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral.num, context: context)
if node != nil && connectedNode != nil {
_ = bleManager.requestSerialModuleConfig(fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode?.myInfo?.adminIndex ?? 0)

4
Meshtastic/Views/Settings/Config/Module/StoreForwardConfig.swift
View file

@ -116,7 +116,7 @@ struct StoreForwardConfig: View {
do {
try context.save()
} catch {
print("Failed to save isRouter")
logger.error("Failed to save isRouter: \(error.localizedDescription)")
}
}
@ -147,7 +147,7 @@ struct StoreForwardConfig: View {
// Need to request a Detection Sensor Module Config from the remote node before allowing changes
if bleManager.connectedPeripheral != nil && node?.storeForwardConfig == nil {
print("empty store and forward module config")
logger.debug("empty store and forward module config")
let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral.num, context: context)
if node != nil && connectedNode != nil {
_ = bleManager.requestStoreAndForwardModuleConfig(fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode?.myInfo?.adminIndex ?? 0)

2
Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift
View file

@ -134,7 +134,7 @@ struct TelemetryConfig: View {
setTelemetryValues()
// Need to request a TelemetryModuleConfig from the remote node before allowing changes
if bleManager.connectedPeripheral != nil && node?.telemetryConfig == nil {
print("empty telemetry module config")
logger.info("empty telemetry module config")
let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral.num, context: context)
if node != nil && connectedNode != nil {
_ = bleManager.requestTelemetryModuleConfig(fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode?.myInfo?.adminIndex ?? 0)