Skip to content

Commit

Permalink
autoISF3.0
Browse files Browse the repository at this point in the history 
coreData Perform&Wait
autoISF History & CoreData
autoISF Config
update autoISF link to docs
fix oref1 prefs - missing settings
also duplicate Exercise Control into autoISF settings
fix save of enable autoISF
Popup texts autoISF
autoisf 3.0 docs
reorder prefs to align with autoISF quick guide
BG isf adaption message
include autoISF in Algo Stats
  • Loading branch information
@mountrcg
mountrcg committed May 26, 2024
1 parent ae3c3c6 commit ada7099
Show file tree
Hide file tree
Showing 16 changed files with 1,373 additions and 401 deletions.
2 changes: 1 addition & 1 deletion Config.xcconfig
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
APP_DISPLAY_NAME = Trio
APP_VERSION = 0.1.0
APP_BUILD_NUMBER = 1
COPYRIGHT_NOTICE =
COPYRIGHT_NOTICE = autoISF 3.0
DEVELOPER_TEAM = ##TEAM_ID##
BUNDLE_IDENTIFIER = org.nightscout.$(DEVELOPMENT_TEAM).trio
APP_GROUP_ID = group.com.$(DEVELOPMENT_TEAM).loopkit.LoopGroup
Expand Down
17 changes: 17 additions & 0 deletions Core_Data.xcdatamodeld/Core_Data.xcdatamodel/contents
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22757" systemVersion="23E224" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
<entity name="AutoISF" representedClassName="AutoISF" syncable="YES" codeGenerationType="class">
<attribute name="acce_ratio" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="autoISF_ratio" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="bg" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="bg_ratio" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="delta_ratio" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="dura_ratio" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="insulin_req" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="isf" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="pp_ratio" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="rate" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="sensitivity_ratio" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="smb" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="smb_ratio" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="tbr" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="timestamp" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
</entity>
<entity name="BGaverages" representedClassName="BGaverages" syncable="YES" codeGenerationType="class">
<attribute name="average" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
<attribute name="average_1" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
Expand Down
39 changes: 39 additions & 0 deletions FreeAPS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@
448B6FCB252BD4796E2960C0 /* PumpSettingsEditorDataFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0274EE6439B1C3ED70730D41 /* PumpSettingsEditorDataFlow.swift */; };
45252C95D220E796FDB3B022 /* ConfigEditorDataFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F8A87AA037BD079BA3528BA /* ConfigEditorDataFlow.swift */; };
45717281F743594AA9D87191 /* ConfigEditorRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 920DDB21E5D0EB813197500D /* ConfigEditorRootView.swift */; };
4963E5482A0D400700500170 /* autoISFTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4963E5472A0D400700500170 /* autoISFTableView.swift */; };
5075C1608E6249A51495C422 /* TargetsEditorProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BDEA2DC60EDE0A3CA54DC73 /* TargetsEditorProvider.swift */; };
53F2382465BF74DB1A967C8B /* PumpConfigProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8630D58BDAD6D9C650B9B39 /* PumpConfigProvider.swift */; };
5A2325522BFCBF55003518CA /* NightscoutUploadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A2325512BFCBF55003518CA /* NightscoutUploadView.swift */; };
Expand Down Expand Up @@ -295,6 +296,10 @@
CE1F6DDB2BAE08B60064EB8D /* TidepoolManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1F6DDA2BAE08B60064EB8D /* TidepoolManager.swift */; };
CE1F6DE72BAF1A180064EB8D /* BuildDetails.plist in Resources */ = {isa = PBXBuildFile; fileRef = CE1F6DE62BAF1A180064EB8D /* BuildDetails.plist */; };
CE1F6DE92BAF37C90064EB8D /* TidepoolConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1F6DE82BAF37C90064EB8D /* TidepoolConfigView.swift */; };
CE1F2B9A2B011CC0002EDCA0 /* AutoISFConfDataFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1F2B992B011CC0002EDCA0 /* AutoISFConfDataFlow.swift */; };
CE1F2B9C2B011CCF002EDCA0 /* AutoISFConfProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1F2B9B2B011CCF002EDCA0 /* AutoISFConfProvider.swift */; };
CE1F2B9E2B011CDE002EDCA0 /* AutoISFConfStateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1F2B9D2B011CDE002EDCA0 /* AutoISFConfStateModel.swift */; };
CE1F2BA12B011CF5002EDCA0 /* AutoISFConfRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1F2BA02B011CF5002EDCA0 /* AutoISFConfRootView.swift */; };
CE2FAD3A297D93F0001A872C /* BloodGlucoseExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE2FAD39297D93F0001A872C /* BloodGlucoseExtensions.swift */; };
CE48C86428CA69D5007C0598 /* OmniBLEPumpManagerExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE48C86328CA69D5007C0598 /* OmniBLEPumpManagerExtensions.swift */; };
CE48C86628CA6B48007C0598 /* OmniPodManagerExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE48C86528CA6B48007C0598 /* OmniPodManagerExtensions.swift */; };
Expand Down Expand Up @@ -762,6 +767,7 @@
3F8A87AA037BD079BA3528BA /* ConfigEditorDataFlow.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ConfigEditorDataFlow.swift; sourceTree = "<group>"; };
42369F66CF91F30624C0B3A6 /* BasalProfileEditorProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BasalProfileEditorProvider.swift; sourceTree = "<group>"; };
44080E4709E3AE4B73054563 /* ConfigEditorProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ConfigEditorProvider.swift; sourceTree = "<group>"; };
4963E5472A0D400700500170 /* autoISFTableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = autoISFTableView.swift; sourceTree = "<group>"; };
4DD795BA46B193644D48138C /* TargetsEditorRootView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = TargetsEditorRootView.swift; sourceTree = "<group>"; };
505E09DC17A0C3D0AF4B66FE /* ISFEditorStateModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ISFEditorStateModel.swift; sourceTree = "<group>"; };
5A2325512BFCBF55003518CA /* NightscoutUploadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NightscoutUploadView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -824,6 +830,10 @@
CE1F6DDA2BAE08B60064EB8D /* TidepoolManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TidepoolManager.swift; sourceTree = "<group>"; };
CE1F6DE62BAF1A180064EB8D /* BuildDetails.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = BuildDetails.plist; sourceTree = "<group>"; };
CE1F6DE82BAF37C90064EB8D /* TidepoolConfigView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TidepoolConfigView.swift; sourceTree = "<group>"; };
CE1F2B992B011CC0002EDCA0 /* AutoISFConfDataFlow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoISFConfDataFlow.swift; sourceTree = "<group>"; };
CE1F2B9B2B011CCF002EDCA0 /* AutoISFConfProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoISFConfProvider.swift; sourceTree = "<group>"; };
CE1F2B9D2B011CDE002EDCA0 /* AutoISFConfStateModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoISFConfStateModel.swift; sourceTree = "<group>"; };
CE1F2BA02B011CF5002EDCA0 /* AutoISFConfRootView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoISFConfRootView.swift; sourceTree = "<group>"; };
CE2FAD39297D93F0001A872C /* BloodGlucoseExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BloodGlucoseExtensions.swift; sourceTree = "<group>"; };
CE398D012977349800DF218F /* CryptoKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CryptoKit.framework; path = System/Library/Frameworks/CryptoKit.framework; sourceTree = SDKROOT; };
CE398D17297C9EE800DF218F /* G7SensorKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = G7SensorKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -1126,6 +1136,7 @@
isa = PBXGroup;
children = (
19F95FF929F1102A00314DDC /* StatRootView.swift */,
4963E5472A0D400700500170 /* autoISFTableView.swift */,
19A9102F2A24BF6300C8951B /* StatsView.swift */,
19A910372A24EF3200C8951B /* ChartsView.swift */,
);
Expand Down Expand Up @@ -1155,6 +1166,7 @@
isa = PBXGroup;
children = (
CEE9A64D2BBB411C00EB5194 /* Calibrations */,
CE1F2B982B011C58002EDCA0 /* AutoISF */,
190EBCC229FF134900BA767D /* StatConfig */,
CE94597C29E9E1CD0047C9C6 /* WatchConfig */,
19F95FF129F10F9C00314DDC /* Stat */,
Expand Down Expand Up @@ -2066,6 +2078,25 @@
path = Bolus;
sourceTree = "<group>";
};
CE1F2B982B011C58002EDCA0 /* AutoISF */ = {
isa = PBXGroup;
children = (
CE1F2B9F2B011CE2002EDCA0 /* View */,
CE1F2B992B011CC0002EDCA0 /* AutoISFConfDataFlow.swift */,
CE1F2B9B2B011CCF002EDCA0 /* AutoISFConfProvider.swift */,
CE1F2B9D2B011CDE002EDCA0 /* AutoISFConfStateModel.swift */,
);
path = AutoISF;
sourceTree = "<group>";
};
CE1F2B9F2B011CE2002EDCA0 /* View */ = {
isa = PBXGroup;
children = (
CE1F2BA02B011CF5002EDCA0 /* AutoISFConfRootView.swift */,
);
path = View;
sourceTree = "<group>";
};
CE7CA3422A064973004BE681 /* Shortcuts */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2470,7 +2501,10 @@
388E597225AD9CF10019842D /* json in Resources */,
38DF178E27733E6800B3528F /* Assets.xcassets in Resources */,
19DA48E829CD339B00EEA1E7 /* Assets.xcassets in Resources */,
388E596F25AD96040019842D /* javascript_disf in Resources */,
388E596F25AD96040019842D /* javascript_disf in Resources */,
388E596F25AD96040019842D /* javascript in Resources */,
B9CAAEFC2AE70836000F68BC /* branch.txt in Resources */,
1927C8E62744606D00347C69 /* InfoPlist.strings in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -2585,6 +2619,7 @@
38AEE73D25F0200C0013F05B /* FreeAPSSettings.swift in Sources */,
38FCF3FD25E997A80078B0D1 /* PumpHistoryStorage.swift in Sources */,
38D0B3B625EBE24900CB6E88 /* Battery.swift in Sources */,
4963E5482A0D400700500170 /* autoISFTableView.swift in Sources */,
38C4D33725E9A1A300D30B77 /* DispatchQueue+Extensions.swift in Sources */,
F90692CF274B999A0037068D /* HealthKitDataFlow.swift in Sources */,
CE7CA3552A064973004BE681 /* ListStateIntent.swift in Sources */,
Expand All @@ -2598,6 +2633,7 @@
382C134B25F14E3700715CE1 /* BGTargets.swift in Sources */,
38AEE75725F0F18E0013F05B /* CarbsStorage.swift in Sources */,
38B4F3CA25E502E200E76A18 /* SwiftNotificationCenter.swift in Sources */,
CE1F2B9A2B011CC0002EDCA0 /* AutoISFConfDataFlow.swift in Sources */,
38AEE75225F022080013F05B /* SettingsManager.swift in Sources */,
3894873A2614928B004DF424 /* DispatchTimer.swift in Sources */,
3895E4C625B9E00D00214B37 /* Preferences.swift in Sources */,
Expand Down Expand Up @@ -2663,6 +2699,7 @@
38A0363B25ECF07E00FCBB52 /* GlucoseStorage.swift in Sources */,
65070A332BFDCB83006F213F /* TidepoolStartView.swift in Sources */,
190EBCC629FF138000BA767D /* StatConfigProvider.swift in Sources */,
CE1F2BA12B011CF5002EDCA0 /* AutoISFConfRootView.swift in Sources */,
38E98A2725F52C9300C0CED0 /* CollectionIssueReporter.swift in Sources */,
E00EEC0427368630002FF094 /* SecurityAssembly.swift in Sources */,
3811DEE825CA063400A708ED /* Injected.swift in Sources */,
Expand Down Expand Up @@ -2753,6 +2790,7 @@
CE1F6DDB2BAE08B60064EB8D /* TidepoolManager.swift in Sources */,
BD2B464E0745FBE7B79913F4 /* NightscoutConfigProvider.swift in Sources */,
9825E5E923F0B8FA80C8C7C7 /* NightscoutConfigStateModel.swift in Sources */,
CE1F2B9E2B011CDE002EDCA0 /* AutoISFConfStateModel.swift in Sources */,
38A43598262E0E4900E80935 /* FetchAnnouncementsManager.swift in Sources */,
642F76A05A4FF530463A9FD0 /* NightscoutConfigRootView.swift in Sources */,
AD3D2CD42CD01B9EB8F26522 /* PumpConfigDataFlow.swift in Sources */,
Expand All @@ -2766,6 +2804,7 @@
2BE9A6FA20875F6F4F9CD461 /* PumpSettingsEditorProvider.swift in Sources */,
6B9625766B697D1C98E455A2 /* PumpSettingsEditorStateModel.swift in Sources */,
19A910362A24D6D700C8951B /* DateFilter.swift in Sources */,
CE1F2B9C2B011CCF002EDCA0 /* AutoISFConfProvider.swift in Sources */,
A0B8EC8CC5CD1DD237D1BCD2 /* PumpSettingsEditorRootView.swift in Sources */,
E06B911A275B5EEA003C04B6 /* Array+Extension.swift in Sources */,
38EA0600262091870064E39B /* BolusProgressViewStyle.swift in Sources */,
Expand Down
Loading

0 comments on commit ada7099

Please sign in to comment.