Update OmniKit tidepool-merge with improvements from main#51
Merged
Conversation
+ Remove unneeded & redundant didSend() & didReceive() message logging + Improved and additional PodState debugDescription display for insulin values + Improved pod suspend testing when updating delivery status + Update suspended, bolusing, tempBasalRunning, extendedBolusRunning definitions for better efficency and clarity using @dnzxy suggestion on OmniBLE PR #123
+ Don't append an optional beep block to a getStatus with a pending unacknowledged command + Handle unacknowledged commands cases in acknowledgeAlerts(), beepConfig() & configureAlert() + Use checkCommandAgainstStatus() for seq # mismatch to determine insulin delivery status + Remove unneeded @discardResult attribute on various PodCommsSessions functions + Comment improvements and better source code synchronization between OmniKit and OmniBLE
Miscellaneous Omnipod code improvements & cleanup
Unacknowledged command handling fixes and PodCommsSession improvements
return clock icon when isClockOffset is true - fix for main branch
New resolveUnacknowledgedCommand() attempts a GetStatusCommand to resolve any unacknowledged command or throws .unacknowledgedCommandPending on failure. Have all PodCommSession funcs call resolveUnacknowledgedCommand() instead of failing if called with a pending unacknowledged command.
… code Fix deactivatePod() logic error to correctly handle an unacknowledged command Simplify logging by not including the calling function's name
…ecovery Improved unacknowledged command recovery
+ Fixes Trio issue #455, see for more details + Tweaks to runTemporaryBasalProgram() to avoid using stale podState + Change enactBolus() to use same updated pod suspended testing logic
Logic fix for 049 pod fault with concurrent temp basal commands
* add self.tryToValidateComms to handle uncertain comms; * ensure podSuspended is only returned when actually suspended
…extra debug logging
Fix for pump manager returns bogus podSuspended
Add link dependencies
itsmojo
approved these changes
May 8, 2025
Contributor
itsmojo
left a comment
itsmojo
left a comment
There was a problem hiding this comment.
From looking at all the file diffs (other than OmniPodPumpManager+UI.swift which I believe Marion was involved with), each change looks correct to match the current OmniKit main code from what I can recall. I didn't do verification to make sure that there weren't any additional recent changes to main that may also need to be included, but I trust that Marion did do this.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Purpose
Bring in improvements added to the main branch since the tidepool-merge branch was first pushed to LoopKit
Test
Start with a local clone using LoopWorkspace
tidepool-mergebranch:Confirmed that Eros pod can be selected but do not actually connect to a pod.