Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
Update the G7SensorKit loopandlearn fork, trio branch to include the final changes made by LoopKit / G7SensorKit PR 34 to improve G7 connectivity.
Method
Fix any merge conflicts between the previous PR 33 that did provide some improvements, but has been closed in favor of PR 34.
Expected code differences
After this merge, expected differences between LoopKit / G7SensorKit main and loopandlearn / G7SensorKit trio is that the trio branch defaults G7 upload to enabled whereas LoopKit has it disabled. Trio has a master upload glucose switch in the Nightscout screen; Loop does not.