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
30 changes: 17 additions & 13 deletions LoopFollow/Controllers/Nightscout/BGData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ extension MainViewController {
if graphHours > 24, IsNightscoutEnabled() {
self.webLoadNSBGData(dexData: data)
} else {
self.ProcessDexBGData(data: data, sourceName: "Dexcom")
self.ProcessDexBGData(data: self.deduplicateBGReadings(data), sourceName: "Dexcom")
}
}
}
Expand Down Expand Up @@ -70,18 +70,7 @@ extension MainViewController {
nsData[i].date.round(FloatingPointRoundingRule.toNearestOrEven)
}

var nsData2: [ShareGlucoseData] = []
var lastAddedTime = Double.infinity
var lastAddedSGV: Int?
let minInterval: Double = 30

for reading in nsData {
if (lastAddedSGV == nil || lastAddedSGV != reading.sgv) || (lastAddedTime - reading.date >= minInterval) {
nsData2.append(reading)
lastAddedTime = reading.date
lastAddedSGV = reading.sgv
}
}
var nsData2 = self.deduplicateBGReadings(nsData)

// merge NS and Dex data if needed; use recent Dex data and older NS data
var sourceName = "Nightscout"
Expand Down Expand Up @@ -117,6 +106,21 @@ extension MainViewController {
}
}

/// Removes consecutive duplicate readings (same SGV within 30 s). Expects newest-first input.
func deduplicateBGReadings(_ readings: [ShareGlucoseData]) -> [ShareGlucoseData] {
var result: [ShareGlucoseData] = []
var lastTime = Double.infinity
var lastSGV: Int?
for reading in readings {
if lastSGV == nil || lastSGV != reading.sgv || lastTime - reading.date >= 30 {
result.append(reading)
lastTime = reading.date
lastSGV = reading.sgv
}
}
return result
}

/// Processes incoming BG data.
func ProcessDexBGData(data: [ShareGlucoseData], sourceName: String) {
let graphHours = 24 * Storage.shared.downloadDays.value
Expand Down
Loading