Skip to content
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.

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

Merge alpha into dev #279

Merged
merged 19 commits into from
Jun 9, 2024
Merged

Merge alpha into dev #279

merged 19 commits into from
Jun 9, 2024

Conversation

bjornoleh
Copy link
Contributor

@bjornoleh bjornoleh commented Jun 8, 2024

This merge of the alpha branch into dev brings a breaking change for backwards compatibility:

You cannot revert from this without losing a paired pod!

PR #277 "Port over pump loss fix via LoopKit/Loop#1702" changes the storage of pump connection details from "UserDefaults" to binary plist files stored in the documents directory of the app. This is ported from Loop, and is an attempt to avoid a bug where the connection to a paired pod could be lost unexpectedly.

After having connected a pod with this version of the app, it is not possible to transfer the pod to an older version of the app, the connection to pod will be lost. It should be possible to recover by rebuilding a version that includes 8a682e3, this should bring the connected pod back.

Jeremy Storring and others added 17 commits June 1, 2024 17:06
Co-authored-by: Bastiaan Verhaar <bastiaanv@users.noreply.github.com>
Co-authored-by: kskandis <kskandis@users.noreply.github.com>
…ts method to delete pump state used for testing only
* revert get and clean property value to original
* add resetLoopDocuments method to delete pump state used for testing only
Added ability to add min and max values to decimals in preferences page
Add an option to confirm boluses faster on Apple Watch
PreferencesEditorDataFlow: commit Xcode auto formatting related to #232
Migrate fix for PumpManager: Use pump limit from pumpManager instead of UI
# You cannot revert from this without losing pod!
Port over pump loss fix via LoopKit/Loop#1702
@bjornoleh bjornoleh marked this pull request as ready for review June 8, 2024 22:45
@Sjoerd-Bo3 Sjoerd-Bo3 added this to the Trio 1.0 release milestone Jun 8, 2024
aug0211 and others added 2 commits June 9, 2024 09:59
…raph

- Resolves (Trio issue #289)[#289]
- Implements Nightscout's provided graph display for fat and protein in meal entries
- Trio had partially implemented this but did not pass fat and protein values to Nightscout (it dropped them but carried carbs)
- This PR follows the identical pattern used for carbs and carries fat and protein values along for NS to display
Resolve issue #289: implement NS-provided display of fat/protein
@bjornoleh
Copy link
Contributor Author

Merged alpha into dev locally to test on a phone (iPhone 13 mini, iOS 17.5.1)

  • Builds ok ✅
  • Runs ok during brief testing with NS CGM and sim pump ✅
  • No uncommitted changes ✅

Copy link
Contributor

@Sjoerd-Bo3 Sjoerd-Bo3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
Already running Live for a day :)

Copy link
Contributor

@dnzxy dnzxy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@bjornoleh
Copy link
Contributor Author

Merging with two approvals.

@bjornoleh bjornoleh merged commit 32b5e95 into dev Jun 9, 2024
1 check passed
@MikePlante1 MikePlante1 mentioned this pull request Jun 10, 2024
@MikePlante1 MikePlante1 mentioned this pull request Jun 10, 2024
4 tasks
mountrcg pushed a commit to mountrcg/Trio that referenced this pull request Jun 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

7 participants