Merge dev into feat/dana #291
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also update color and language of Max Bolus exceeded
- Changes default of minimum safety threshold to `60` from `65` to match standard oref. - Changes name of setting from `Threshold Setting (mg/dL)` to `Minimum Safety Threshold (mg/dL)`. - Updates tooltip to improve clarity.
…lues to preferences
"If you use mmol/L," -> "To convert from mmol/L," Co-Authored-By: bjornoleh <63544115+bjornoleh@users.noreply.github.com>
Co-authored-by: Bastiaan Verhaar <bastiaanv@users.noreply.github.com>
- Adds two new settings: `maxFat` & `maxProtein` - default to 250g, same as `maxCarbs` - Change label of `Carbohydrate limit` to `Limit Per Entry` for Meal Settings - For meal entry module, shorten `grams` to `g` - If bolus, carbs, fat, or protein exceed their limit: - Change `U` or `g` to `⚠️ ` - Disable submit button, change text to red, and replace with warning
Removed: - `Max Bolus exceeded!` Added: - `exceeded` - `Max Bolus of` - `Max Carbs of` - `Max Fat of` - `Max Protein of` - `Max Carbs` - `Max Fat` - `Max Protein`
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
`Minimum Safety Threshold` update
Prevent entries for Carbs, Fat, Protein, and Bolus that exceed Max settings
Added ability to add min and max values to decimals in preferences page
Add an option to confirm boluses faster on Apple Watch
Merge dev into alpha
…MedianTarget Set median of lower and upper correction range bound when importing L…
Submodule updates for Trio: OmniBLE, OmniKit
PreferencesEditorDataFlow: commit Xcode auto formatting related to #232
Migrate fix for PumpManager: Use pump limit from pumpManager instead of UI
…vated add observer on pump deactivated to initialize pump status
# You cannot revert from this without losing pod! Port over pump loss fix via LoopKit/Loop#1702
…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
Merge alpha into dev
mountrcg
pushed a commit
to mountrcg/Trio
that referenced
this pull request
Aug 1, 2024
mountrcg
pushed a commit
to mountrcg/Trio
that referenced
this pull request
Aug 1, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merge of the dev branch into feat/dana 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.