Update strings #113
Merged
Update strings #113
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
* Profiles. Save profiles as presets. Use Button from Home View to stop/open profile settings. Overrride settings deleted from settings. Open with profiles button instead. * Bug fixes * Deleted some unnecessary CoreData saving code. * Localization fixes and translations from iAPS Crowdin translators (Thank you all Crowdin translators!).
(cherry picked from commit 6d0226b)
…heet. (cherry picked from commit f7ecb89)
(cherry picked from commit 4d22482)
(cherry picked from commit 62a52e0)
(cherry picked from commit 9aeef26)
(cherry picked from commit 2f4a861)
Add more for layingTIR chart. Reformat Laying Chart. Typo in Swedish. (cherry picked from commit f359faa)
(cherry picked from commit 162734a)
Formatting.
Check for empty loops
(cherry picked from commit c74ab7c)
(cherry picked from commit 113018b)
(cherry picked from commit ce6081e)
(cherry picked from commit b6f1490)
When entering carbs and coming to the bolus recommendation screen, use the EventualBG instead of the minPredBG when computing recommended bolus. Only used when directly combined with carbs. If not everything else is as before. To not make things overly complicated I'm using this new bolus recommendation for Watch App also, but always, until I find a neat way of collecting the manual state from the BolusStateModel. For testing. Tested for about a week without any dramatic adverse effects, but needs more testing from more users.
…rt in stat view. (cherry picked from commit 3d89a5b)
(cherry picked from commit 6355999)
Refactored the new bolus calculator. Now just using one formula (using two was too confusing). Removed many of the restrictions ad replaced those with warnings and alerts instead, making it possible to bolus even when BG is falling or glucose predicted below target. The Eventual BG still needs to be over target for a recommendations. This limit is not removed. Added logging and error strings from oref0 to iAPS. New bolus pop-up and new bolus alerts. To do: UI polish.
(cherry picked from commit debb8a2)
(cherry picked from commit ef13125)
Ported from the xdripswift repo
(cherry picked from commit 3a09cb4)
2. Localize the error strings from oref0. (cherry picked from commit 3f8e09f)
Remove unused argument. Remove old string variable.
(cherry picked from commit fcd491a)
Jon-b-m
pushed a commit
that referenced
this pull request
Mar 7, 2024
* Backport of OmniBLE #114 and OmniKit #27 (fixes Loop issue #2117) UI fixes and improvements for various pod setup restart situations + Gracefully handle restarts when prime or insert cannula is in progress + Have the view model init funcs test for and handle resume cases + Improved PodPairer to include the pumpManager podCommState var + Fix PodPairer.podIsActivated to properly handle a paired pod + Start with pairAndPrime state when prime has not finalized + Update PairPodViewModelState priming value to use an optional + Rename func & enum names from pair to pairAndPrime for clarity + Improved CannulaInserter to include cannulaInsertionSuccessfullyStarted var * For an in-progress insert cannula compute a wait time on remaining bolus + Fix checkCannulaInsertionFinished() to use checkingInsertion state + Add cannulaInsertionSuccessfullyStarted var to podState + Update PairPodViewModelState priming value to use an optional + Update PumpStatusHighlight to "Finish Setup" while activating a paired pod New resetPerPodPumpManagerState func called when starting/forgetting pod + Reset podAttachmentConfirmed state variable for each new pod + Reset state.acknowledgedTimeOffsetAlert var in case it gets used + Reset all per pod PumpManagerAlerts for each new pod + Use retractAlert func to handle the state.activeAlerts removal + Add comment noting that podCommState.deactivating value is never returned + Add some missing state initializion for simulator in OmniKit jumpStartPod() * Updates to virtually eliminate user retries on pod setup resumes + Have PairAndPrime ViewModel do an automatic retry on error + Have InsertCannula ViewModel do an automatic retry on error + Add resumingPodSetup func to attempt a getStatus and sleep on errors + Added some improved and updated pumpManager comments + Have pumpManager detect pod setup resumes to invoke resumingPodSetup() + Added additional isConnected handling to OmniBLE resumingPodSetup() + Correct & relocate OmniKit insulinType guard as per OmniBLE + Update OmniKit SessionsRunResult variable use to match OmniBLE * Updates to virtually eliminate user retries on pod setup resumes + Have PairAndPrime ViewModel do an automatic retry on error + Have InsertCannula ViewModel do an automatic retry on error + Add resumingPodSetup func to attempt a getStatus and sleep on errors + Added some improved and updated pumpManager comments + Have pumpManager detect pod setup resumes to invoke resumingPodSetup() + Added additional isConnected handling to OmniBLE resumingPodSetup() + Correct & relocate OmniKit insulinType guard as per OmniBLE + Update OmniKit SessionsRunResult variable use to match OmniBLE
mountrcg
pushed a commit
to mountrcg/iAPS
that referenced
this pull request
Mar 8, 2024
…ncreas#27 (fixes Loop issue #2117) (Artificial-Pancreas#554) * Backport of OmniBLE Artificial-Pancreas#114 and OmniKit Artificial-Pancreas#27 (fixes Loop issue #2117) UI fixes and improvements for various pod setup restart situations + Gracefully handle restarts when prime or insert cannula is in progress + Have the view model init funcs test for and handle resume cases + Improved PodPairer to include the pumpManager podCommState var + Fix PodPairer.podIsActivated to properly handle a paired pod + Start with pairAndPrime state when prime has not finalized + Update PairPodViewModelState priming value to use an optional + Rename func & enum names from pair to pairAndPrime for clarity + Improved CannulaInserter to include cannulaInsertionSuccessfullyStarted var * For an in-progress insert cannula compute a wait time on remaining bolus + Fix checkCannulaInsertionFinished() to use checkingInsertion state + Add cannulaInsertionSuccessfullyStarted var to podState + Update PairPodViewModelState priming value to use an optional + Update PumpStatusHighlight to "Finish Setup" while activating a paired pod New resetPerPodPumpManagerState func called when starting/forgetting pod + Reset podAttachmentConfirmed state variable for each new pod + Reset state.acknowledgedTimeOffsetAlert var in case it gets used + Reset all per pod PumpManagerAlerts for each new pod + Use retractAlert func to handle the state.activeAlerts removal + Add comment noting that podCommState.deactivating value is never returned + Add some missing state initializion for simulator in OmniKit jumpStartPod() * Updates to virtually eliminate user retries on pod setup resumes + Have PairAndPrime ViewModel do an automatic retry on error + Have InsertCannula ViewModel do an automatic retry on error + Add resumingPodSetup func to attempt a getStatus and sleep on errors + Added some improved and updated pumpManager comments + Have pumpManager detect pod setup resumes to invoke resumingPodSetup() + Added additional isConnected handling to OmniBLE resumingPodSetup() + Correct & relocate OmniKit insulinType guard as per OmniBLE + Update OmniKit SessionsRunResult variable use to match OmniBLE * Updates to virtually eliminate user retries on pod setup resumes + Have PairAndPrime ViewModel do an automatic retry on error + Have InsertCannula ViewModel do an automatic retry on error + Add resumingPodSetup func to attempt a getStatus and sleep on errors + Added some improved and updated pumpManager comments + Have pumpManager detect pod setup resumes to invoke resumingPodSetup() + Added additional isConnected handling to OmniBLE resumingPodSetup() + Correct & relocate OmniKit insulinType guard as per OmniBLE + Update OmniKit SessionsRunResult variable use to match OmniBLE
mountrcg
pushed a commit
to mountrcg/iAPS
that referenced
this pull request
Mar 20, 2024
…ncreas#27 (fixes Loop issue #2117) (Artificial-Pancreas#554) * Backport of OmniBLE Artificial-Pancreas#114 and OmniKit Artificial-Pancreas#27 (fixes Loop issue #2117) UI fixes and improvements for various pod setup restart situations + Gracefully handle restarts when prime or insert cannula is in progress + Have the view model init funcs test for and handle resume cases + Improved PodPairer to include the pumpManager podCommState var + Fix PodPairer.podIsActivated to properly handle a paired pod + Start with pairAndPrime state when prime has not finalized + Update PairPodViewModelState priming value to use an optional + Rename func & enum names from pair to pairAndPrime for clarity + Improved CannulaInserter to include cannulaInsertionSuccessfullyStarted var * For an in-progress insert cannula compute a wait time on remaining bolus + Fix checkCannulaInsertionFinished() to use checkingInsertion state + Add cannulaInsertionSuccessfullyStarted var to podState + Update PairPodViewModelState priming value to use an optional + Update PumpStatusHighlight to "Finish Setup" while activating a paired pod New resetPerPodPumpManagerState func called when starting/forgetting pod + Reset podAttachmentConfirmed state variable for each new pod + Reset state.acknowledgedTimeOffsetAlert var in case it gets used + Reset all per pod PumpManagerAlerts for each new pod + Use retractAlert func to handle the state.activeAlerts removal + Add comment noting that podCommState.deactivating value is never returned + Add some missing state initializion for simulator in OmniKit jumpStartPod() * Updates to virtually eliminate user retries on pod setup resumes + Have PairAndPrime ViewModel do an automatic retry on error + Have InsertCannula ViewModel do an automatic retry on error + Add resumingPodSetup func to attempt a getStatus and sleep on errors + Added some improved and updated pumpManager comments + Have pumpManager detect pod setup resumes to invoke resumingPodSetup() + Added additional isConnected handling to OmniBLE resumingPodSetup() + Correct & relocate OmniKit insulinType guard as per OmniBLE + Update OmniKit SessionsRunResult variable use to match OmniBLE * Updates to virtually eliminate user retries on pod setup resumes + Have PairAndPrime ViewModel do an automatic retry on error + Have InsertCannula ViewModel do an automatic retry on error + Add resumingPodSetup func to attempt a getStatus and sleep on errors + Added some improved and updated pumpManager comments + Have pumpManager detect pod setup resumes to invoke resumingPodSetup() + Added additional isConnected handling to OmniBLE resumingPodSetup() + Correct & relocate OmniKit insulinType guard as per OmniBLE + Update OmniKit SessionsRunResult variable use to match OmniBLE
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.
No description provided.