diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj index e177193a..e2c2b813 100644 --- a/Meshtastic.xcodeproj/project.pbxproj +++ b/Meshtastic.xcodeproj/project.pbxproj @@ -964,7 +964,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.0.1; + MARKETING_VERSION = 2.0.2; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = YES; @@ -996,7 +996,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.0.1; + MARKETING_VERSION = 2.0.2; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = YES; diff --git a/Meshtastic/Export/WriteCsvFile.swift b/Meshtastic/Export/WriteCsvFile.swift index 6cf3da5e..f71206cd 100644 --- a/Meshtastic/Export/WriteCsvFile.swift +++ b/Meshtastic/Export/WriteCsvFile.swift @@ -7,22 +7,15 @@ import SwiftUI - func TelemetryToCsvFile(telemetry: [TelemetryEntity], metricsType: Int) -> String { - var csvString: String = "" - if metricsType == 0 { - // Create Device Metrics Header csvString = "Battery Level, Voltage, Channel Utilization, Airtime, Timestamp" - for dm in telemetry{ - if dm.metricsType == 0 { - csvString += "\n" - csvString += String("\(dm.batteryLevel) %") + csvString += String(dm.batteryLevel) csvString += ", " csvString += String(dm.voltage) csvString += ", " @@ -33,18 +26,13 @@ func TelemetryToCsvFile(telemetry: [TelemetryEntity], metricsType: Int) -> Strin csvString += dm.time?.formattedDate(format: "yyyy-MM-dd HH:mm:ss") ?? "Unknown Age" } } - } else if metricsType == 1 { - // Create Environment Telemetry Header csvString = "Temperature, Relative Humidity, Barometric Pressure, Gas Resistance, Voltage, Current" - for dm in telemetry{ - if dm.metricsType == 1 { - csvString += "\n" - csvString += String("\(dm.temperature)°") + csvString += String(dm.temperature) csvString += ", " csvString += String(dm.relativeHumidity) csvString += ", " @@ -60,19 +48,14 @@ func TelemetryToCsvFile(telemetry: [TelemetryEntity], metricsType: Int) -> Strin } } } - return csvString } func PositionToCsvFile(positions: [PositionEntity]) -> String { - var csvString: String = "" - // Create Position Header csvString = "SeqNo, Latitude, Longitude, Alt, Sats, Speed, Heading, SNR, Timestamp" - for pos in positions { - csvString += "\n" csvString += String(pos.seqNo) csvString += ", " @@ -90,9 +73,7 @@ func PositionToCsvFile(positions: [PositionEntity]) -> String { csvString += ", " csvString += String(pos.snr) csvString += ", " - csvString += pos.time?.formattedDate(format: "yyyy-MM-dd HH:mm:ss") ?? "Unknown Age" } - return csvString }