Skip to content

nate/fix/LOOP-1927/manual-glucose-entry #17

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
nhamming merged 3 commits into from
Sep 22, 2020
Merged

nate/fix/LOOP-1927/manual-glucose-entry #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97bf60e
updates to align with renaming in LoopKit
nhamming Sep 22, 2020
7dc1351
removed glucose range categorization
nhamming Sep 22, 2020
c2301c5
clean up
nhamming Sep 22, 2020
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 CGMBLEKit/Glucose+SensorDisplayable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation
import LoopKit


extension Glucose: SensorDisplayable {
extension Glucose: GlucoseDisplayable {
public var isStateValid: Bool {
return state == .known(.ok) && status == .ok
}
Expand Down Expand Up @@ -67,7 +67,7 @@ extension Glucose: SensorDisplayable {
}

// TODO Placeholders. This functionality will come with LOOP-1311
public var glucoseValueType: GlucoseValueType? {
public var glucoseRangeCategory: GlucoseRangeCategory? {
return nil
}
}
4 changes: 2 additions & 2 deletions CGMBLEKit/TransmitterManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,14 @@ public class TransmitterManager: TransmitterDelegate {
return dataIsFresh
}

public var sensorState: SensorDisplayable? {
public var glucoseDisplay: GlucoseDisplayable? {
let transmitterDate = latestReading?.readDate ?? .distantPast
let shareDate = shareManager.latestBackfill?.startDate ?? .distantPast

if transmitterDate >= shareDate {
return latestReading
} else {
return shareManager.sensorState
return shareManager.glucoseDisplay
}
}

Expand Down