Skip to content

Backport dev to next dev pr 164 163 167 - #168

Merged
marionbarker merged 4 commits into
next-devfrom
backport-dev-to-next-dev-PR-164-163-165
Sep 24, 2026
Merged

marionbarker merged 4 commits into
next-devfrom
backport-dev-to-next-dev-PR-164-163-165

Conversation

@marionbarker

Copy link
Copy Markdown
Contributor

Purpose:

Backport the last 3 PR from the dev branch to next dev.

Background

These PR were generated, tested and squash/merged to the dev branch, with the merging in the order shown.
Use cherry-pick to bring these into the next-dev branch

Details

dev branch recent history

gl = git log --oneline

OmnipodKit % gl -4
173ed51 (HEAD -> dev, origin/dev) Count only pairing candidates during pod discovery (#167)
79991df PKA updates to have an "When Open" base Pod Keep Alive level for all BLE pods (#163)
3962aa5 SIlence Pod changes for the non-silent beep black dot O5 pods (#164)
ce45e20 Merge pull request #162 from loopandlearn/translations_20260917

Apply cherry-pick to next-dev

quit xcode
Prepare new branch

git switch next-dev
git pull
git reset --hard
git switch -c backport-dev-to-next-dev-PR-164-163-165

Bring in PR 164

git cherry-pick 3962aa5
  • cherry-pick was clean
  • ensure it is buildable, then quit xcode, clean up changes created by building
  • git restore -- Localization/Localizable.xcstrings

Bring in PR 163

git cherry-pick 79991df
  • conflict resolution for localization (accept incoming)
  • conflict resolution for OmnipodKit/PumpManager/OmniPumpManager.swift
    • accept incoming then clean up the missed mayUseRileyLink modification
  • ensure it is buildable, then quit xcode

Bring in PR 165

git cherry-pick 173ed51
  • cherry-pick was clean
  • ensure it builds

Some localization changes did not get added with the last cherry pick.

  • commit the xcstrings changes following building (with Xcode 27)

itsmojo and others added 4 commits September 22, 2026 17:45
…BLE pods (#163)

* PKA when open now an internal only base level for wedging configurations

* Enforce a base "When Open" Pod Keep Alive mode for all BLE pod types

* Logic fixes for missing timer init & for no active pod, add defaultPodKeepAliveValue()

* Use new hasPairedNonFaultedPod var to test for the ability to do a read pod status
* Count only pairable pods during pairing discovery

The discovery loop raised tooManyPodsFound whenever more than one pod
peripheral was connected, and handed the first connected device to the
pairing session. discoverPods reconnects every known device before
scanning, so a user's previous pod that was still alive and known
counted as a second pod, and the error told them to move away from
pods that were their own.

Filter the connected devices on the advertisement's pairable flag
(pod id FFFF/FFFE for DASH, pdm id FFFFFFFE for O5), which each device
already stores. A device with no advertisement yet is not counted; the
scan fills it in for any pod that is advertising.

* Treat our own pod as a pairing candidate; pre-connect only our pod

devices holds every pod advert the scan has heard, not just ours:
didDiscover adds any parseable pod, and the DASH discovery filter
matches every DASH pod in range, paired or not. forgetPod prunes the
old pod, but the next scan re-adds it if it is still alive. On a
pairing retry discoverPods then pre-connected all of them, which is how
a second connected pod appeared and raised tooManyPodsFound.

Pre-connect only devices in autoConnectIDs, which is what the
pre-connect is for: resuming a pod that discovery already picked and
that may no longer advertise as pairable. Count that pod as a candidate
too, so resuming it still succeeds under the pairable filter from the
previous commit.
@marionbarker

Copy link
Copy Markdown
Contributor Author

Test

✅ build to test phone connected to a DASH pod
✅ build to my personal phone connected to an Omnipod 5 pod (does not have black dot firmware)

@ps2 ps2 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM!

@marionbarker marionbarker changed the title Backport dev to next dev pr 164 163 165 Backport dev to next dev pr 164 163 167 Sep 24, 2026
@marionbarker

Copy link
Copy Markdown
Contributor Author

Test

✅ successful test

Configuration

Used next-dev on my personal phone.
Built backport-dev-to-next-dev-PR-164-163-165 branch (it was really pr 167 not 165) of OmnipodKit on the personal phone.

Test Narrative

Upon first building:

  • ✅ pr 164: confirmed that the display for Silence Pod was appropriate for a non-black-dot Omnipod 5 pod (what I was wearing)
  • ✅ pr 163: confirmed the When Open is the top version of Pod Keep Alive shown and the PKA is below Pod Diagnostics line

Next Pod change

  • use a test phone connected to DASH pod, disable bluetooth on test phone, bring pod near personal phone
  • attempt to pair old pod nearby - got No founds found
  • ✅ pr 167: fill new DASH pod and got a successful pair first try while keeping both old and new pods close to personal phone

@marionbarker
marionbarker merged commit 35a1646 into next-dev Sep 24, 2026
compton-lac pushed a commit to lac-gh-org/LoopWorkspace that referenced this pull request Sep 24, 2026
Brings in loopandlearn/OmnipodKit#168 (backport of dev to next-dev):
- loopandlearn/OmnipodKit#167 Count only pairing candidates during pod discovery
- loopandlearn/OmnipodKit#163 Pod Keep Alive: a "When Open" base level for all BLE pods
- loopandlearn/OmnipodKit#164 Silence pod changes for the non-silent-beep black dot O5 pods
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.

3 participants