Update selected submodules

marionbarker commented 7 months ago

Background:

There are a number of open PR under LoopKit repositories that should be used with Open-iAPS. Some are OmniXXX features that were added to iAPS and have been backported to LoopKit. Some are bug fixes, e.g., MinimedKit, CGMBLEKit. Some provide improved features, e.g., dexcom share, G7SensorKit.

Until such time as these PR are merged into LoopKit, they are available under the loopandlearn organization.

This PR uses the SHA from loopandlearn, but there is no need to modify the .gitmodules. GitHub finds the correct version.

branch names on loopandlearn

This PR uses branches on loopandlearn submodules with the suffix _rc (release candidate) following the default branch name used by LoopKit, e.g., main_rc or dev_rc. The OmniXXX modules are different: the branch silent_pod_and_diagnostics for each repo was used to set up the PR to LoopKit for adding those features, so can be used directly.

Testing

Started with current-oref+submodules and built to test phone.

current session of DASH rPi simulator continued operating, did not have Silent Pod or Pod Diagnostics rows

Created new branch current-oref+submodules-mdb (sorry for lazy name) Updated the SHA for selected modules (detailed commands below) Made sure this version built

current session of DASH rPi simulator continued operating, the Silent Pod and Pod Diagnostics rows are present

round-trip

Push this branch to my repo. Did a round trip:

git clone --branch="current-oref+submodules-mdb" --recurse-submodules  https://github.com/marionbarker/Open-iAPS.git

Built app from download:

current session of DASH rPi simulator continued operating, the Silent Pod and Pod Diagnostics rows are present

Commands used to update the submodules:

This was done CLI:

git switch -c current-oref+submodules-mdb

git update-index --cacheinfo 160000 f27bc02511606bdeee238d73584351c091eb090b "CGMBLEKit"
git submodule update
git commit -m "update submodule CGMBLEKit: filter out future dates" CGMBLEKit

git update-index --cacheinfo 160000 5c57855753156f2d961a28e0fbf2f65bef0d0268 "G7SensorKit"
git submodule update
git commit -m "update submodule G7SensorKit: add One+ and link to G7 app" G7SensorKit

git update-index --cacheinfo 160000 aa82a184e8243d30dc3b488ae17fd31602a3bd80 "MinimedKit"
git submodule update
git commit -m "update submodule MinimedKit: bugfix: basal schedule, timechange" MinimedKit

git update-index --cacheinfo 160000 72b58a9f7b564635f1fc88bda0a163b5bce88fb0 "OmniBLE"
git submodule update
git commit -m "update submodule OmniBLE: add Silent Pod, Pod Diagnostics" OmniBLE

git update-index --cacheinfo 160000 68dd7f292d9db3f9fc142aea4438c823e0fb5805 "OmniKit"
git submodule update
git commit -m "update submodule OmniKit: add Silent Pod, Pod Diagnostics" OmniKit

git update-index --cacheinfo 160000 4db36350cec3449b9ac9a9c028892cbec564b79f "dexcom-share-client-swift"
git submodule update
git commit -m "update submodule dexcom-share-client-swift: add Japan and APAC servers" dexcom-share-client-swift

git push --set-upstream mdb current-oref+submodules-mdb

marionbarker commented 7 months ago

Please hold on this PR. There will be updates soon pointing to the LoopKit repositories instead of loopandlearn.

marionbarker commented 7 months ago

closing to configure a new PR against alpha branch.

MikePlante1 commented 7 months ago

For future reference, it looks to be easy to switch the target branch of a PR rather than have to close and open a new one.

marionbarker commented 7 months ago

@MikePlante1:

I did not realize I couldn't push to the nightscout repo. Otherwise, I would not have bothered to close and open a fresh PR.
I don't believe you can change the branch the PR is coming from, only the branch the PR is going to. (If I'm wrong on that one - let me know.)
My plan was to create a new branch in nightscout Open-iAPS and then people who don't have an invitation to my fork could see the branch. But that didn't work out.

nightscout / Trio