Skip to content
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

Fallback on suggested if enacted is not present #345

Merged
merged 2 commits into from
Dec 29, 2024
Merged

Fallback on suggested if enacted is not present #345

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91ea26d
Fallback on suggested if enacted is not present
bjorkert Dec 22, 2024
b9b3bad
Notlooping only based on enacted devicestatus
bjorkert Dec 22, 2024
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
45 changes: 27 additions & 18 deletions LoopFollow/Controllers/Nightscout/DeviceStatusOpenAPS.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,41 @@ extension MainViewController {
func DeviceStatusOpenAPS(formatter: ISO8601DateFormatter, lastDeviceStatus: [String: AnyObject]?, lastLoopRecord: [String: AnyObject]) {
if let createdAtString = lastDeviceStatus?["created_at"] as? String,
let lastLoopTime = formatter.date(from: createdAtString)?.timeIntervalSince1970 {
UserDefaultsRepository.alertLastLoopTime.value = lastLoopTime
ObservableUserDefaults.shared.device.value = lastDeviceStatus?["device"] as? String ?? ""
if lastLoopRecord["failureReason"] != nil {
LoopStatusLabel.text = "X"
latestLoopStatusString = "X"
evaluateNotLooping(lastLoopTime: UserDefaultsRepository.alertLastLoopTime.value)
} else {
guard let enacted = lastLoopRecord["enacted"] as? [String: AnyObject] else {
guard let enactedOrSuggested = lastLoopRecord["enacted"] as? [String: AnyObject] ?? lastLoopRecord["suggested"] as? [String: AnyObject] else {
LoopStatusLabel.text = "↻"
latestLoopStatusString = "↻"
evaluateNotLooping(lastLoopTime: lastLoopTime)
evaluateNotLooping(lastLoopTime: UserDefaultsRepository.alertLastLoopTime.value)
return
}
let wasEnacted = true

// Updated
if let enactedTimestamp = enacted["timestamp"] as? String,
let enactedTime = formatter.date(from: enactedTimestamp)?.timeIntervalSince1970 {
var wasEnacted : Bool
if let enacted = lastLoopRecord["enacted"] as? [String: AnyObject] {
wasEnacted = NSDictionary(dictionary: enacted).isEqual(to: enactedOrSuggested)
} else {
wasEnacted = false
}

if wasEnacted {
UserDefaultsRepository.alertLastLoopTime.value = lastLoopTime
evaluateNotLooping(lastLoopTime: UserDefaultsRepository.alertLastLoopTime.value)
}

if let timestamp = enactedOrSuggested["timestamp"] as? String,
let enactedTime = formatter.date(from: timestamp)?.timeIntervalSince1970 {
let formattedTime = Localizer.formatTimestampToLocalString(enactedTime)
infoManager.updateInfoData(type: .updated, value: formattedTime)
}

// ISF
let profileISF = profileManager.currentISF()
var enactedISF: HKQuantity?
if let enactedISFValue = enacted["ISF"] as? Double {
if let enactedISFValue = enactedOrSuggested["ISF"] as? Double {
var determinedISFUnit: HKUnit = .milligramsPerDeciliter
if enactedISFValue < 15 {
determinedISFUnit = .millimolesPerLiter
Expand All @@ -51,7 +61,7 @@ extension MainViewController {
// Carb Ratio (CR)
let profileCR = profileManager.currentCarbRatio()
var enactedCR: Double?
if let reasonString = enacted["reason"] as? String {
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 All @@ -75,10 +85,10 @@ extension MainViewController {
}

// COB
if let cobMetric = CarbMetric(from: enacted, key: "COB") {
if let cobMetric = CarbMetric(from: enactedOrSuggested, key: "COB") {
infoManager.updateInfoData(type: .cob, value: cobMetric)
latestCOB = cobMetric
} else if let reasonString = enacted["reason"] as? String {
} else if let reasonString = enactedOrSuggested["reason"] as? String {
// Fallback: Extract COB from reason string
let cobPattern = "COB: (\\d+(?:\\.\\d+)?)"
if let cobRegex = try? NSRegularExpression(pattern: cobPattern),
Expand All @@ -101,29 +111,29 @@ extension MainViewController {
}

// Insulin Required
if let insulinReqMetric = InsulinMetric(from: enacted, key: "insulinReq") {
if let insulinReqMetric = InsulinMetric(from: enactedOrSuggested, key: "insulinReq") {
infoManager.updateInfoData(type: .recBolus, value: insulinReqMetric)
UserDefaultsRepository.deviceRecBolus.value = insulinReqMetric.value
} else {
UserDefaultsRepository.deviceRecBolus.value = 0
}

// Autosens
if let sens = enacted["sensitivityRatio"] as? Double {
if let sens = enactedOrSuggested["sensitivityRatio"] as? Double {
let formattedSens = String(format: "%.0f", sens * 100.0) + "%"
infoManager.updateInfoData(type: .autosens, value: formattedSens)
}

// Eventual BG
if let eventualBGValue = enacted["eventualBG"] as? Double {
if let eventualBGValue = enactedOrSuggested["eventualBG"] as? Double {
let eventualBGQuantity = HKQuantity(unit: .milligramsPerDeciliter, doubleValue: eventualBGValue)
PredictionLabel.text = Localizer.formatQuantity(eventualBGQuantity)
}

// Target
let profileTargetHigh = profileManager.currentTargetHigh()
var enactedTarget: HKQuantity?
if let enactedTargetValue = enacted["current_target"] as? Double {
if let enactedTargetValue = enactedOrSuggested["current_target"] as? Double {
var targetUnit = HKUnit.milligramsPerDeciliter
if enactedTargetValue < 40 {
targetUnit = .millimolesPerLiter
Expand All @@ -145,14 +155,14 @@ extension MainViewController {
}

// TDD
if let tddMetric = InsulinMetric(from: enacted, key: "TDD") {
if let tddMetric = InsulinMetric(from: enactedOrSuggested, key: "TDD") {
infoManager.updateInfoData(type: .tdd, value: tddMetric)
}

let predictioncolor = UIColor.systemGray
PredictionLabel.textColor = predictioncolor
topPredictionBG = UserDefaultsRepository.minBGScale.value
if let predbgdata = enacted["predBGs"] as? [String: AnyObject] {
if let predbgdata = enactedOrSuggested["predBGs"] as? [String: AnyObject] {
let predictionTypes: [(type: String, colorName: String, dataIndex: Int)] = [
("ZT", "ZT", 12),
("IOB", "Insulin", 13),
Expand Down Expand Up @@ -218,7 +228,6 @@ extension MainViewController {
latestLoopStatusString = "↻"
}
}
evaluateNotLooping(lastLoopTime: lastLoopTime)
}
}
}