Skip to content

Update OmniKit tidepool-merge with improvements from main #51

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

Merged
merged 21 commits into from
May 18, 2025

Conversation

marionbarker
Copy link
Collaborator

@marionbarker marionbarker commented May 7, 2025

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-merge branch:

  • Perform a test merge of main into tidepool-merge for OmniKit in that local clone
  • Open Xcode workspace and build with modified OmniKit

Confirmed that Eros pod can be selected but do not actually connect to a pod.

itsmojo and others added 21 commits November 17, 2024 15:42
+ 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
Fix for pump manager returns bogus podSuspended
Add link dependencies
@marionbarker marionbarker requested review from ps2 and itsmojo May 7, 2025 17:19
Copy link
Contributor

@itsmojo itsmojo left a comment

Choose a reason for hiding this comment

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

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.

Copy link
Contributor

@ps2 ps2 left a comment

Choose a reason for hiding this comment

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

LGTM!

@marionbarker marionbarker merged commit 0ebb478 into tidepool-merge May 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants