Skip to content

Display charging indicator #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marionbarker merged 1 commit into from
Apr 16, 2025
+12 −6
Merged

Display charging indicator #393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions LoopFollow/Controllers/Nightscout/DeviceStatus.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ extension MainViewController {
self.evaluateNotLooping()
}
}

func evaluateNotLooping() {
guard let statusStackView = LoopStatusLabel.superview as? UIStackView else { return }

Expand Down Expand Up @@ -88,10 +88,10 @@ extension MainViewController {
TaskScheduler.shared.rescheduleTask(id: .deviceStatus, to: Date().addingTimeInterval(5 * 60))
return
}

//Process the current data first
let lastDeviceStatus = jsonDeviceStatus[0] as [String : AnyObject]?

//pump and uploader
let formatter = ISO8601DateFormatter()
formatter.formatOptions = [.withFullDate,
Expand All @@ -110,10 +110,16 @@ extension MainViewController {

if let uploader = lastDeviceStatus?["uploader"] as? [String: AnyObject],
let upbat = uploader["battery"] as? Double {
infoManager.updateInfoData(type: .battery, value: String(format: "%.0f", upbat) + "%")
let batteryText: String
if let isCharging = uploader["isCharging"] as? Bool, isCharging {
batteryText = "⚡️ " + String(format: "%.0f", upbat) + "%"
} else {
batteryText = String(format: "%.0f", upbat) + "%"
}
infoManager.updateInfoData(type: .battery, value: batteryText)
UserDefaultsRepository.deviceBatteryLevel.value = upbat
let timestamp = uploader["timestamp"] as? Date ?? Date()

let timestamp = uploader["timestamp"] as? Date ?? Date()
let currentBattery = DataStructs.batteryStruct(batteryLevel: upbat, timestamp: timestamp)
deviceBatteryData.append(currentBattery)

Expand Down Expand Up @@ -162,7 +168,7 @@ extension MainViewController {
// Start the timer based on the timestamp
let now = dateTimeUtils.getNowTimeIntervalUTC()
let secondsAgo = now - UserDefaultsRepository.alertLastLoopTime.value

DispatchQueue.main.async {
if secondsAgo >= (20 * 60) {
TaskScheduler.shared.rescheduleTask(
Expand Down