(Draft) Merge dev into main

[tmhastings]

todo:

• address outstanding issues
• adequate testing in vitro and in vivo
• bump version
• reset alive branch to main

Trio

expand details

This app splits from Artificial-Pancreas/iAPS at v2.3.3 on the main branch and this commit. Very minimal UI changes were made in this initial update, but while it may look and for the most part seem the same as iAPS v2.3.3, you can see from the number of commits and files/lines of code changed in this PR that there are extensive changes under the hood. These changes were done to ensure it is truly open source, peer-reviewed and tested, to keep it in line with updates from Loop's submodules (the stuff that connects your pump, CGM, and services), to fix some bugs, and to add a few new features.

The Team

expand details

Trio is a collaborative project set up by members of the DIY community who welcome a peer reviewed, Open Source iOS implementation of the Oref/APS algorithm.

The team consists of:

• Software architects
• Developers
• Code reviewers
• Designers
• Testers
• Documentation specialists
• Project managers / agile coaches

Anyone who wants to contribute is welcome to join the team!

The Name

expand details

“Trio” is inspired by several joint efforts:

• Algorithm/CGM/Pump: the three components that make up your DIY loop
• Basal/CR/ISF: the three main settings that, when tuned, treat your TxD
• Carbs/Fat/Protein: the three main food components that impact your blood glucose
• FAX/iAPS/Trio: the three stages of Oref/APS leading to the birth of Trio
• In true DIY fashion, make the Trio definition individualized to you

Hosted by The Nightscout Foundation

expand details

The most obvious change is that the repository location has changed to be housed by Nightscout and AndroidAPS. The Nightscout Foundation has a long track record of facilitating innovation in DIY diabetes technology and stoking collaboration between many developers and projects. This will keep Trio in the hands of the community rather than a single individual, and ensure all development is peer-reviewed and tested before being released.

New Bundle ID

expand details

If you're currently using iAPS, another big change is the app's Bundle ID, which is now org.nightscout.TEAMID.trio. This means Trio will not overwrite the iAPS app on your iPhone, but all settings must be re-entered and all devices re-connected. Trio will need about 24 hours of data before the dynamic features can be enabled.

If you're using Omnipod DASH or Eros, you will have to pair a new pod to start using Trio, but all other devices can transfer mid-session.

New App Group

expand details

Instead of using the Loop's App Group, group.com.TEAMID.loopkit.LoopGroup, Trio uses its own, group.org.nightscout.TEAMID.trio.trio-app-group. This prevents settings from being retained when deleting and reinstalling Trio while Loop or iAPS is also installed. You still need to delete xDrip4iOS to completely reset settings, though.

New Icons

expand details

New icons have been created as a symbol of the name Trio. (by @tmhastings), plus some old ones (by @tqb43)

Default Setting Changes

expand details

• Default CGM: None (instead of Nightscout)
• Show high/low lines on main chart: On (instead of Off)
• High value for main chart lines and statistics: 180 (instead of 145)
• Sensitivity Raises Target: Off (instead of On)
• Minimum Safety Threshold: 60 (instead of 65, which keeps it more in line with Oref0)

(by @MikePlante1 with input from @bjornoleh and many others)

Sigmoid Adjustment Factor

expand details

With Dynamic ISF toggled on, the effects of Adjustment Factor vary drastically between having Sigmoid turned on and off. Because of this, we've split the Adjustment Factor in two and given Sigmoid its own setting. This allows Adjustment Factor to be defaulted to 0.8 with Sigmoid turned off and to 0.5 with Sigmoid turned on. (by @MikePlante1)

External Insulin & Glucose

expand details

External insulin entry (to log non-pump insulin, eg. from an insulin pen) has been moved to the History screen rather than the Bolus screen. External insulin entries will display a warning if amount is larger than Max Bolus setting and will not be allowed if over three times the Max Bolus setting. The History screen also now displays if a bolus was an SMB or External, and uses swipe gestures to delete entries. (by @BrianWieder with many cherry picks from @dnzxy)

History (Treatments)	History (Glucose)
Log External Insulin	Log Glucose

Distinguish Manual Glucose Readings

expand details

Manually entered glucose readings are now more noticeable in both the history and the main chart. (by @mountrcg)

Chart	History

Edit Profile Overrides & Temp Targets

expand details

Swiping left on a saved profile override or temp target now gives you the option to edit or delete. Selecting to edit will open a new page where you can change the name and/or any of the settings. (by @dsnallfot)

Option to Edit/Delete	Editing a Profile Override

LoopKit Submodules

expand details

The code that's used to connect to pumps, CGMs, and other things was taken from their implementations in Loop. This update changes where that code is housed from within this app to point to the code in @LoopKit or @loopandlearn's repositories. This allows for a better development as it makes it easy to see the differences between the code used in Trio vs the code being used in LoopKit and allows updates in the LoopKit repo to easily be pulled into Trio. (by @bjornoleh with help from @marionbarker and @bjornoleh)

Oref

expand details

This part is rather technical. Oref (the algorithm from OpenAPS that drives Trio) is written in the JavaScript programming language. In order to perform well in an iOS app, the algorithm is implemented in a minimized format. Until the algorithm is rewritten into the Swift programming language, it needs to be like this to ensure performance. The source code used to build the minimized files is now included in this repo as well as a separate repo trio-oref. This work is quite extensive and has been done and peer-reviewed by several contributors: (beautified/reconstructed by @JeremyStorring and updated by @bjornoleh, @mountrcg, @avouspierre, @MikePlante1, @tmhastings)

Schedule SMBs Off in Profile Overrides

expand details

The Schedule when SMBs are Off option in profile overrides has been improved to make it easier to understand and use. Now, if you want to disable SMBs for the entire time the override is active, toggle on Always Disable SMBs, but if you want to specify a timeframe for SMBs to be disabled, you can toggle off Always Disable SMBs toggle on Schedule when SMBs are Off and set the timeframe. Note that setting a timeframe of 22-6 would disable SMBs from 22:00 (10PM) through 5:59 as long as the override is active during that time.

Restart Bug Squashed

expand details

Since the beginning of FAX, there was a bug where restarting a phone could potentially cause a loss of pump or cgm connection. This was especially detrimental for Omnipod users, as there's no way to reconnect it after it's lost. The fix for this from LoopKit has now been added to Trio. (by @dnzxy, @kskandis, @avouspierre)

Apple Health Fix

expand details

The 2.3.3 version of iAPS had a bug with Apple Health. This part of the code was re-written and fixed (by @AndreasStokholm), then thoroughly tested and peer-reviewed by the team. Feel free to toggle Apple Health back on if you'd like.

Fix Multiple Meal Entry Bug

expand details

Some people have had the app freeze while entering a meal and mistakenly entered the same meal multiple times without realizing it. The Save and continue is now disabled as soon as it’s pressed to prevent that from happening. (by @MikePlante1)

Omnipod Fixes

expand details

Code has been updated to avoid triggering the Critical Pod Fault 049 (0x31) error which caused a pod poss. (by @marionbarker and @itsmojo)

Fix mmol/L Glucose Target Bug

expand details

The bug causing glucose target to not be settable to certain mmol/L values has been fixed. (cherry-picked from @Jon-b-m by @Sjoerd-Bo3)

Tidepool Integration

expand details

Tidepool can now be uploaded to directly from Trio instead of using Apple Health and the Tidepool app on your iPhone. Note that if both are enabled, you will see duplicate entries in Tidepool, and even after turning one off, you could still see up to a week of duplicate data. (by @avouspierre)

Dexcom Share Integration

expand details

Dexcom Share has been fixed so it can now be used as a CGM source. Also, if you use Dexcom G6 as your CGM and you enter your Dexcom Share credentials at the bottom in ⚙️ > CGM > CGM Configuration, missed readings should backfill in Trio from Dexcom Share. Keep in mind, though, when you change G6 transmitters Trio will continue to pull readings from Dexcom Share causing you to rely on internet for readings until you update your G6 Transmitter ID in Trio. (by @avouspierre)

Meal Settings

expand details

There is a new section in settings called Meal Settings. In it, you'll find Max Carbs (which used to be in Pump Settings), Max Fat, Max Protein, and the Fat and Protein Conversion Settings that used to be found in it's own section. (by @bjornoleh)

⚙️	Meal Settings

Max Macros

expand details

• Two new settings added: Max Fat & Max Protein
• Both are defaulted to 250g to match Max Carbs' default
• Label of Carbohydrate limit changed to Limit Per Entry for Meal Settings
• Shortened grams to g for the meal entry screen
• If carbs, fat, or protein exceed their limit:
• Changes g to ⚠️
• Disables submit button, changes text to red, and replaces with warning

PR.226.mov

Max Bolus

expand details

Manually entering a bolus larger than the Max Bolus setting used to just deliver the max bolus amount, but now this setting prevents the bolus from being delivered until the amount is lower than the max setting. (cherry-picked from @Jon-b-m and modified by @MikePlante1 with input from @bjornoleh)

Also now displays the value read from the pump instead of from settings to ensure the correct value is shown. Important for Medtronic pumps and in the future for Dana pumps. (by @bastiaanv and ported by @dnzxy)

Live Activities (Dynamic Island & Lockscreen Widget)

expand details

Live Activities have been added to show relevant data without opening Trio. This displays glucose, delta, and trend on the lock screen (iOS 16.2+) as well as in the Dynamic Island (iPhone 14+). Optionally, a glucose graph and current IOB & COB can also be displayed. Consistently updated every 5 minutes with every loop cycle. (cherry-picked from @nas10, @polscm32 and ported by @MikePlante1)

Turn Live Activity on and switch between display options by going to ⚙️ > Notifications

Live Activity	Screenshot
Lockscreen (simple)
Lockscreen (detailed)
Dynamic Island
Dynamic Island (long press)

Dexcom ONE+

expand details

Added support for Dexcom ONE+ (taken from this Zulip discussion)

Nightscout Menu Updated

expand details

The menu for Nightscout has been updated to include sub-menus. The new Fetch Treatments toggle controls whether Trio will fetch carbs and temp targets from Nightscout. The duplicate Remote Control toggle has also been removed from Preferences. (by @dsnallfot)

⚙️ > Nightscout	Connect
Upload	Fetch and Remote Control

Import Settings From Nightscout

expand details

Fixed this so it now also works for mg/dL. Also now allows importing from settings saved to Nightscout from Loop and will use the center of your correction range from Loop for the target range in Trio. (by @kskandis and @MikePlante1)

Settings imported:

• Basal Profile
• Target Glucose
• Insulin Sensitivities
• Carb Ratio
• DIA

Improve Nightscout Uploads

expand details

Previously, only enacted loop cycles were uploaded to Nightscout, which caused information gaps from loop cycles that were just suggested but not actually enacted for one reason or another. Now suggested loop cycles will also be uploaded as well. (by @bjornoleh and suggested by @scottleibrand)

Fat & Protein Upload to Nightscout

expand details

Fat & Protein are now uploaded to Nightscout when you announce them in Trio. (by @aug0211)

FPU Conversion

expand details

Oref ignores any carb entry less than 1.0g. This used to happen when Interval In Minutes was set low and/or the amount of fat and protein was small. Now, the carb entries that were converted from fat & protein are saved to ensure they are always at least 1g each and not ignored by oref. (by @dnzxy)

For example, with the default Meal Settings, 10g of protein and 5g of fat used to converted into 7 entries of 0.7g carbs. Now, it will be converted into 5 entries of 1g carbs.

Statistics Range

expand details

The statistics screen now includes the high and low values in the normal range instead of the high and low ranges. This matches the colors of the glucose dots that were already being used on the Statistics screen. (by @MikePlante1)

For this example in a simulator, I kept high/low to the default 70/180 and manually entered these values:

Readings
Trio (standing)	Trio (laying)
iAPS 2.3.3 (standing)	iAPS 2.3.3 (laying)

Pump Status Icons

expand details

New icons are displayed when your pod status has a warning or critical message. This will help highlight when a problem occurs with the pump to help make the user aware of the issue. (by @avouspierre)

Pump Warning	Pump Critical

Display icons/buttons when no pump/CGM is selected

expand details

When there is no pump or CGM selected, a button is displayed that will take you to the selection screen for pump or CGM. This does not affect instances where a pump or CGM *is* selected and just not paired. (by @avouspierre)

When Omnipod is removed as a pump source, it will now display Add pump rather than the erroneous No pod warning. (by @kskandis)

Confirm Bolus Faster on Apple Watch

expand details

An option has been added in ⚙️ > Watch to require less of a turn of the Apple Watch crown to confirm a bolus. (by @MikePlante1, who likes to confirm boluses with his nose)

Screen.Recording.2024-06-18.at.2.05.20.PM.mov

Hide Keyboard Button for Meal Notes

expand details

There is now a button to dismiss the keyboard when the textfield for Note is selected in the meal entry screen.

Eventual Glucose Rounding for mmol/L

expand details

Eventual Glucose now rounds to 1 decimal place for mmol/L users instead of 2 on the main screen as well as the watch app.

Tests Enabled

expand details

Added ability to run tests on Trio and submodules. (by @avouspierre)

Browser Build Updates

expand details

Browser Build updated to new Apple/GitHub standards. (by @bjornoleh) TestFlight Expiration is now displayed in Settings. (by @bjorkert) Gemfile updated. (by @mountrcg)

Guardrails

expand details

Guardrails to prevent preferences from being set outside a reasonable range can now be set in the code, although no guardrails have been added yet at this time. (by @JeremyStorring)

To add a guardrail, add minVal and/or maxVal to the type in FreeAPS/Sources/Modules/PreferencesEditor/PreferencesEditorStateModel.swift. For example, to restrict Minimum Safety Threshold from 60-120, use the following:

Field(
    displayName: NSLocalizedString("Minimum Safety Threshold (mg/dL)", comment: "Minimum Safety Threshold"),
        type: .decimal(keypath: \.threshold_setting, minVal: 60, maxVal: 120),
        infoText: NSLocalizedString(
            "All insulin will be suspended if your glucose is predicted to drop below the safety threshold.\n\nMust be set between 60-120 mg/dL.\nTo convert from mmol/L, multiply by 18.\n\nNote: Basal may be resumed if there's negative IOB and glucose is rising faster than predicted.",
        comment: "Minimum Safety Threshold"
    ),
    settable: self
)

Removed Stats Upload

expand details

Removed the option to upload Statistics to Nightscout, since it is no longer compatible with the website this feature was added for before. (by @MikePlante1)

List of individual PRs included in this large PR:

expand details

• Docs enhancements #1
• Update Documents #3
• Merge dev into current-oref #5
• feat(sensors): Support for new Dexcom One+ sensors #6
• NightscoutManager.swift: Upload both suggested and enacted to NS #14
• Loopkit dev using submodules only and CGM plugin systems #15
• Get BUNDLE_IDENTIFIER from Config.xcconfig for use in Fastfile #17
• Update App Name and Logos #19
• Backport HealthKit fix to earlier version #22
• Allow to run tests in OiAPS #26
• Fastlane/GH build improvements: Add sync action and keepalive action, #28
• Feat: App display name, BundleID and reset of version number #31
• Config.xcconfig: #include? "../../ConfigOverride.xcconfig" #34
• Merge dev into loopkit_dev_submodules #36
• Dev #39
• Update URL scheme for Open-iAPS #41
• Bump jmespath from 1.4.0 to 1.6.2 #42
• Dev #43
• Add issue templates #46
• Dev #48
• Dev #50
• Dev #52
• Remove actualDate as introduced in #22 #55
• Loopkit dev submodules #59
• Remove actual date #60
• NightscoutManager.swift: Upload both suggested and enacted to NS #61
• Current oref #62
• Update Fastfile #63
• Submodule updates for the alpha branch #66
• Update with tide pool + calibration + CGM home screen  #67
• Update oref0 to include reversion of actualDate #68
• Live activities alpha #72
• Update Fastfile: fix for LiveActivity #74
• Live activities alpha #75
• Add branch name and commit hash to the "What to test" field in TestFlight #76
• Typo: succeded -> succeeded #78
• Current oref #79
• Display "external insulin" as treatment type #80
• fix issues with double close menu and seems fix issues on greyed buttons #81
• Update strings for icon selector to Open-iAPS #82
• Update strings for icon selector to Open-iAPS #83
• Merge pull request #55 from bjornoleh/remove_actualDate #86
• Add button to open the CGM app in settings view and fix heartbeat pump #89
• Update submodules #90
• Dev #91
• External insulin dialog #93
• try to fix calibration error in first start #94
• Temp target duration fix #95
• Update text of Non-Pump in comments to external  #97
• Update submodules: OmniBLE, OmniKit and TidepoolService #99
• Utilize max bolus limit in Bolus module #100
• Add SMB flag and display SMBs in history. #101
• Temp target duration fix #103
• Remove external insulin event #110
• Fix SAGE uploads in NS for Libre Transmitter #112
• Add separate setting for sigmoid adjustment factor #114
• Replace "non-pump" with "external" in two strings #116
• Merge alpha into dev #117
• Fix units error in basal for TidePool #118
• Rename smbIsAlwaysOff to smbIsScheduledOff (alpha) #120
• Dev #121
• Update submodule OmniBLE and OmniKit #122
• Icons & Complications update #124
• Merge dev into alpha #125
• Rename FreeAPS X scheme to Open-iAPS #127
• Update submodule G7SensorKit and MinimedKit to use appName #128
• Fix lane upgrade fastlane #134
• fix token definition #135
• Rework History Sheet #140
• Fix the default CGM with a fresh install. #141
• Update PreferencesEditorStateModel.swift #143
• Update PreferencesEditorStateModel.swift #143
• modify text to Open-iAPS #148
• [CGM Config View] - Nightscout button #149
• Scrub Stats Upload #150
• use APP_DISPLAY_NAME instead of hard-coded name for watch app #151
• fix resistanceLowersTarget #155
• Update Defaults (high, rulerMarks, maxCarbs, sensitivityRaisesTarget) #156
• Update app name to Trio #157
• Cleanup unused code from LA commit #160
• Testflight expire date #163
• Restore identifier #164
• Rename directory for copy of .js files to trio-oref, update oref0 source files after updating script for Trio #165
• Update Issue templates for GitHub #166
• Missing Trio renames #168
• Commit missing details for #163 #169
• fix importing settings from Nightscout #170
• update Max Bolus exceeded label #172
• Rename Fat And Protein settings to Meal Settings, move Max Carbs to Meal Settings #173
• Update alive to dev #176
-- 2024-05-13: Repository opened for beta testing --
• build_trio.yml: use actions/upload-artifact@v4 #179
• Update README.md: Create ConfigOverride.xcconfig by command line #180
• “Add pump” button when pump has not been configured #184
• LiveActivity.swift: widget URL string "Trio://" #197
• Update(issue templates): More readable styling and expansion of questions #202
• Restore tests (replaces PR #147) #206
• dismiss keyboard when clicking note for meal entries #215
• Display Pump Status Highlight Message in home view #218
• Add toggle to allow downloads from Nightscout (And improve NS Config UI) #221
• Remove duplicate "Remote control" toggle from preferences #224
• Update submodule G7SensorKit: update SHA to LoopKit, no change to code #225
• Prevent entries for Carbs, Fat, Protein, and Bolus that exceed Max settings #226
• Add Tidepool navigation view (fix missing chevron) #227
• Reset profile override name textbox after saving #230
• Added ability to add min and max values to decimals in preferences page #232
• Enable editing of preset profile overrides #235
• Enable editing of preset temp targets #236
• Refactor and optimize storeCarbs function to limit carb equivalents of FPU conversion to 1.0 grams #240
• Ensure meal is only saved once #248
• Remove unused Import Settings in JSON that cause errors decoding JSON #249
• Set median of lower and upper correction range bound when importing L… #253
• Minimum Safety Threshold update #260
• Migrate fix for PumpManager: Use pump limit from pumpManager instead of UI #266
• Add an option to confirm boluses faster on Apple Watch #275
• Port over pump loss fix via LoopKit/Loop#1702 #277
• Merge alpha into dev #279
• Merge dev into alpha #280
• Submodule updates for Trio: OmniBLE, OmniKit #281
• Fix the dexcom share in Trio #282
• PreferencesEditorDataFlow: commit Xcode auto formatting related to #232 #284
• add observer on pump deactivated to initialize pump status #285
• Resolve issue #289: implement NS-provided display of fat/protein #290
• Merge dev into alpha #292
• use Trio specific names and update instructions in testflight.md  #297
• testflight.md: Add the optional instructions for modifying automated build and sync #299
• Adding CODEOWNERS to the Repo #306
• Update CODEOWNERS #307
• Merging CodeOwners Into Alpha #308
• Live activity improvements #310
• Eventual BG with 1 decimal in the app and in the watch app #320
• Fix for setting of BG Targets #321
• feat(issuemanagement): automatically adding the project to the issue types bug and needs triage #322
• Stale Issues #323
• update submodule MinimedKit, update SHA, no change to code #326
• update submodule CGMBLEKit: no change in function #330
• add manual glucose value visualization to chart and history #332
• Merge alpha into dev #333
• Update alpha with dev  #334
• Rework DecimalTextField Struct and Toolbar #337
• direct user where to flip Upload Glucose toggle #338
• gemfile update #340
• fix(projectmanagment): only run in nightscout repo, use of general token, rename #342

Go Team!🎉

expand details

Thank you to the following developers who have added commits to this PR and the initial version of Trio: @AndreasStokholm, @avouspierre, @bjorkert, @bjornoleh, @BrianWieder, @dnzxy, @dsnallfot, @JeremyStorring, @kskandis, @kylmcw, @lifeguardz, @marionbarker, @MikePlante1, @mountrcg, @polscm32, @Sjoerd-Bo3, @tmhastings

A heartfelt thank you to everyone who has played a crucial role behind the scenes with their valuable contributions in discussions, project management, coaching, documentation, testing, and more:

• Dana Lewis (@danamlewis) and Scott Leibrand (@scottleibrand) for their unwavering support and guidance regarding our Oref inquiries.
• Tim Street for his invaluable insights into the implementation of Oref code.
• Tim Gunn (@Tornado-Tim) for his dedicated efforts in setting up and maintaining the Nightscout hosting of the Trio repository.
• Auggie Fisher (@aug0211) for generously sharing the Discord server for Trio and providing ongoing support for both current and future developments of Trio's caregiver implementation.
• Pete Wilkins (@petewilkins) for optimizing the Trio Discord home base throughout development and in anticipation of future discussions.
• Marion Barker (@marionbarker) for her invaluable contributions, including creating the Build Scripts for Trio, enhancing documentation, and offering expertise in various areas not fully reflected on Github.
• Mike Plante (@MikePlante1) for getting involved in many different aspects of the release and development.
• Sjoerd Bozon (@Sjoerd-Bo3) and Bjørn Ole (@bjornoleh) for their tireless efforts in driving collaboration and continuously advancing the project.
• Kelsey Huss (@kelseyhuss) for stepping up without hesitation to communicate progress to the community.
• Theresa Hastings (@tmhastings) for pulling all the strings, getting the right people involved and spending much of her days on this project one way or another. Without you this would never have happened!
• Tom Barrows (@tqb43) for sharing your branding and logo expertise and providing support to users in the Facebook group.
• Magnus Reintz (@t1dude) for his consistent availability (🦇) and invaluable assistance with Facebook community management, clear language and translation management.
• Jonas Hummelstrand for his commitment to maintaining open communication on Facebook, even during challenging times.
• Dan (@dnzxy) for consistently fostering discourse aimed at enhancing and enriching the DIY community and Trio project.
• To Dan, Marvin, Andreas, Mike, Tom, Magnus, Kelsey, and Theresa, Trio owes you its inception. Your proactive approach and DIY spirit didn't just recognize the critical safety aspect but also reshaped the implementation of Oref on iOS. Your bold actions turned necessity into reality. Thank you for your invaluable contributions.