Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions Sources/NightscoutKit/Models/UploaderStatus.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,24 @@ public struct UploaderStatus {
public let battery: Int?
public let name: String
public let timestamp: Date
public let isCharging: Bool?

public init(name: String, timestamp: Date, battery: Float? = nil) {
public init(name: String, timestamp: Date, battery: Float? = nil, isCharging: Bool? = nil) {
let intBattery: Int?
if let battery = battery , battery >= 0 {
intBattery = Int(battery * 100)
} else {
intBattery = nil
}

self.init(name: name, timestamp: timestamp, battery: intBattery)
self.init(name: name, timestamp: timestamp, battery: intBattery, isCharging: isCharging)
}

public init(name: String, timestamp: Date, battery: Int? = nil) {
public init(name: String, timestamp: Date, battery: Int? = nil, isCharging: Bool? = nil) {
self.name = name
self.timestamp = timestamp
self.battery = battery
self.isCharging = isCharging
}

public var dictionaryRepresentation: [String: Any] {
Expand All @@ -41,6 +43,10 @@ public struct UploaderStatus {
rval["battery"] = battery
}

if let isCharging = isCharging {
rval["isCharging"] = isCharging
}

return rval
}
}