Skip to content

Conversation

@marionbarker
Copy link
Contributor

Purpose

Bring in improvements added to the dev 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 dev into tidepool-merge for Loop in that local clone
  • Because there were conflicts, configure a new branch update_tidepool-merge to hold the code modified from dev branch of Loop
    • Resolve the conflicts by accepting the tidepool-merge versions for Loop files:
      • Loop/View Controllers/CarbAbsorptionViewController.swift
      • Loop/View Controllers/StatusTableViewController.swift
  • Open Xcode workspace and build with modified Loop

Confirm operation is nominal.

bjorkert and others added 13 commits October 9, 2024 09:58
Adjust provisioning profile path in script for Xcode 16 compatibility
update progressCell for bolus display
Force reload from UserDefaults for Algorithm Experiments
* Configure the version number in LoopWorkspace, not Loop
   * enable VersionOveride to be placed in LoopWorkspace
* report the LoopWorkspace branch in Settings
* reorder search for version override, add note about version for DIY Loop
…2163)

The 'predicted' dataset on the 'glucose change' graph was calculated using insulin counteraction effects that had been truncated to the width of the chart. This meant that carb entries early in the timeline may not have dynamic carb absorption applied as the implied ICE was zero for the first part of the carb entry's history.
Signed-off-by: Jörg Schömer <[email protected]>
@marionbarker marionbarker requested a review from ps2 May 7, 2025 18:09
Copy link
Collaborator

@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 83b0f07 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.

6 participants