Skip to content

dynamic carb absorption #507

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
merged 2 commits into from
Jul 18, 2017
Merged

dynamic carb absorption #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e17f09
dynamic carb absorption
ps2 Jul 1, 2017
5ee0f2f
Carb chart contrast
ps2 Jul 18, 2017
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
6 changes: 3 additions & 3 deletions Loop Status Extension/Base.lproj/MainInterface.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="64E-I5-5c4">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G24b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="64E-I5-5c4">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand Down Expand Up @@ -50,7 +50,7 @@
<constraint firstAttribute="trailing" secondItem="9iF-xY-Bh4" secondAttribute="trailing" constant="8" id="x9b-EB-fji"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GVu-hk-PBg" customClass="ChartContentView" customModule="LoopUI">
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GVu-hk-PBg" customClass="ChartContainerView" customModule="LoopUI">
<rect key="frame" x="0.0" y="110" width="359" height="110"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
Expand Down
2 changes: 1 addition & 1 deletion Loop Status Extension/StatusViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class StatusViewController: UIViewController, NCWidgetProviding {
}
}
@IBOutlet weak var subtitleLabel: UILabel!
@IBOutlet weak var glucoseChartContentView: LoopUI.ChartContentView!
@IBOutlet weak var glucoseChartContentView: LoopUI.ChartContainerView!

private lazy var charts: StatusChartsManager = {
let charts = StatusChartsManager(
Expand Down
40 changes: 34 additions & 6 deletions Loop.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions Loop/Assets.xcassets/Uploading.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "Uploading.pdf"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added Loop/Assets.xcassets/Uploading.imageset/Uploading.pdf
View file
Open in desktop
Binary file not shown.
332 changes: 317 additions & 15 deletions Loop/Base.lproj/Main.storyboard
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions Loop/Extensions/NSUserDefaults.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,20 @@ extension UserDefaults {
}
}

var insulinCounteractionEffects: [GlucoseEffectVelocity]? {
get {
guard let rawValue = array(forKey: Key.insulinCounteractionEffects.rawValue) as? [GlucoseEffectVelocity.RawValue] else {
return nil
}
return rawValue.flatMap {
GlucoseEffectVelocity(rawValue: $0)
}
}
set {
set(newValue?.map({ $0.rawValue }), forKey: Key.insulinCounteractionEffects.rawValue)
}
}

var insulinSensitivitySchedule: InsulinSensitivitySchedule? {
get {
if let rawValue = dictionary(forKey: Key.insulinSensitivitySchedule.rawValue) {
Expand Down
3 changes: 2 additions & 1 deletion Loop/Managers/DoseMath.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
//

import Foundation
import CarbKit
import HealthKit
import InsulinKit
import LoopKit


struct DoseMath {
enum DoseMath {
/// The allowed precision
static let basalStrokes: Double = 40

Expand Down
Loading