Skip to content
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

update submodule TidepoolSevice: align with LoopKit:dev version #357

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from

Conversation

marionbarker
Copy link
Contributor

Status:

Tested and it works.

Description:

This PR is an Index change for the TidepoolService submodule:

index a2ccad72..b2862562 160000
--- a/TidepoolService
+++ b/TidepoolService
@@ -1 +1 @@
-Subproject commit a2ccad72a55600c28549ab86ab1964c0d6558868
+Subproject commit b28625628e181b96f0db7ec3739d920a3c92465b

This is the Tidepool commit history for trio branch between previous commit and commit proposed by this PR.

b286256 fix merge conflict mistake
600e685 Merge branch 'dev' into trio
6e007cb Merge pull request #22 from LoopKit/manual-dose-upload
e914eec Upload manual doses as normal bolus for now
a2ccad7 Merge pull request #1 from marionbarker/non-pump-insulin

Details:

  • The previous commit used by Trio for TidepoolService used LoopKit/TidepoolService PR 21 for fixing the upload of non-pump insulin to Tidepool
    • This initial version (PR 21) was merged into the trio branch while the PR was still open at LoopKit
  • A different PR was created and merged into LoopKit/TidepoolService:dev
    • The code in PR 22 is slightly different but the effect is the same
  • This PR means the TidepoolService submodule used by Trio is identical to that used by Loop
  • The gist of both PR 21 and 22 was to correct a problem where non-pump (Loop) or external (Trio) insulin doses were not uploaded to Tidepool
  • Note that there is an open Issue 77 that is still open and is not affected by this PR
    • All boluses are still labeled as automatic in the Tidepool website display

Comparison with Loop

I confirmed that for Loop:

  • all automatic boluses are labeled as automatic in Tidepool and displayed with a darker blue
  • all boluses manually delivered by Loop or entered as non-pump insulin are unlabeled (therefore manual) and displayed as a lighter blue by Tidepool

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.

2 participants