Skip to content

Update to match LoopKit-v2 api #745

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

Closed
wants to merge 2 commits into from
Closed

Update to match LoopKit-v2 api #745

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b626225
Update to match LoopKit-v2 api
Jun 18, 2018
060f104
Merge remote-tracking branch 'upstream/loopkit-v2' into loopkit-v2
Jun 19, 2018
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
4 changes: 2 additions & 2 deletions Loop/Managers/DeviceDataManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ final class DeviceDataManager {
if let status = latestPumpStatusFromMySentry {
return Double(status.batteryRemainingPercent) / 100
} else if let status = latestPumpStatus {
return batteryChemistry.chargeRemaining(at: status.batteryVolts)
return batteryChemistry.chargeRemaining(voltage: status.batteryVolts)
} else {
return statusExtensionManager.context?.batteryPercentage
}
Expand Down Expand Up @@ -512,7 +512,7 @@ final class DeviceDataManager {
}

self.updateReservoirVolume(status.reservoir, at: date, withTimeLeft: nil)
let battery = NightscoutUploadKit.BatteryStatus(voltage: status.batteryVolts.value, status: BatteryIndicator(batteryStatus: status.batteryStatus))
let battery = NightscoutUploadKit.BatteryStatus(voltage: status.batteryVolts, status: BatteryIndicator(batteryStatus: status.batteryStatus))

nsPumpStatus = NightscoutUploadKit.PumpStatus(clock: date, pumpID: status.pumpID, iob: nil, battery: battery, suspended: status.suspended, bolusing: status.bolusing, reservoir: status.reservoir)
} catch let error {
Expand Down