Skip to content

Prefer structured ISF/CR from device status over reason string #677

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

Open
bjorkert wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Prefer structured ISF/CR from device status over reason string #677

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
11 changes: 9 additions & 2 deletions LoopFollow/Controllers/Nightscout/DeviceStatusOpenAPS.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ extension MainViewController {
// ISF
let profileISF = profileManager.currentISF()
var enactedISF: HKQuantity?
if let enactedISFValue = enactedOrSuggested["ISF"] as? Double {
// Some uploaders (e.g. Trio Swift oref with dynamic ISF) report a
// placeholder 0 in the structured ISF field; treat that as missing.
if let enactedISFValue = enactedOrSuggested["ISF"] as? Double, enactedISFValue != 0 {
enactedISF = HKQuantity(unit: .milligramsPerDeciliter, doubleValue: enactedISFValue)
}
if let profileISF = profileISF, let enactedISF = enactedISF, profileISF != enactedISF {
Expand All @@ -44,9 +46,14 @@ extension MainViewController {
}

// Carb Ratio (CR)
// Prefer the structured CR field; fall back to parsing it out of the
// reason string for uploaders that don't expose it (a CR of 0 is never
// valid, so it's treated as missing).
let profileCR = profileManager.currentCarbRatio()
var enactedCR: Double?
if let reasonString = enactedOrSuggested["reason"] as? String {
if let structuredCR = enactedOrSuggested["CR"] as? Double, structuredCR != 0 {
enactedCR = structuredCR
} else if let reasonString = enactedOrSuggested["reason"] as? String {
let pattern = "CR: (\\d+(?:\\.\\d+)?)"
if let regex = try? NSRegularExpression(pattern: pattern) {
let nsString = reasonString as NSString
Expand Down
Loading