Skip to content

Conversation

bewest
Copy link
Member

@bewest bewest commented Apr 29, 2016

No description provided.

@bewest
Copy link
Member Author

bewest commented Apr 29, 2016

The master branch was changed outside of flow, causing these conflicts:

$ git checkout  dev 
Switched to branch 'dev'
bewest@bewest-MacBookPro:~/src/openaps/docs$ git merge master
Auto-merging docs/docs/walkthrough/phase-0/loops-in-progress.md
CONFLICT (content): Merge conflict in docs/docs/walkthrough/phase-0/loops-in-progress.md
Automatic merge failed; fix conflicts and then commit the result.
bewest@bewest-MacBookPro:~/src/openaps/docs$ git diff
diff --cc docs/docs/walkthrough/phase-0/loops-in-progress.md
index 39f6edb,f260a1d..0000000
--- a/docs/docs/walkthrough/phase-0/loops-in-progress.md
+++ b/docs/docs/walkthrough/phase-0/loops-in-progress.md
@@@ -11,5 -11,5 +11,10 @@@ List of people who are working on close
  - Chris Hannemann
  - Sarah Howard
  - Mike Stebbins
++<<<<<<< HEAD
 +- Scott Hanselman
 +- Greg Scull
++=======
+ - Aaron Michelson
+ - Jayson EWER --Intel Edison w/ TI--cc1111
++>>>>>>> master

Going to simply add everyone.

bewest and others added 10 commits April 28, 2016 18:30
Catching up dev.
Conflicts:
	docs/docs/walkthrough/phase-0/loops-in-progress.md
Removed discontinued acrylic case link and updated text to reflect singular example.
Add note describing battery alarms
Added first draft of instructions for configuration BLE tethering.
Added clarification about how unit conversion process works and also split the creation of `profile`report into different steps dependant upon if unit is used or not.
Expanded the instructions on configuring BLE tethering
rkresha and others added 10 commits May 17, 2016 09:46
This reverts commit f1bf27f.
Making note about flying with a closed loop
Adding usability considerations page
* Update Configure-Automatic-Sensitivity-Mode.md

Included more details for non programmers to follow.

* Update Configure-Automatic-Sensitivity-Mode.md

* Create Configuring Meal Assist

* Update Configuring Meal Assist

* Update Configure-Automatic-Sensitivity-Mode.md

Number of errors when trying to intergrate autosensitvity and meal assist set up related to inconsistent use of variables. 

Using Autosensitvity doc as the "right way" to handle the variables
@scottleibrand
Copy link
Contributor

Lots of improvements here. I think we should go ahead and merge, and get into a more rapid merge-to-master cadence for minor improvements like this.

Spazholio and others added 15 commits May 18, 2016 22:01
Just general cleanup, and adding some commands to create the requisite reports.
cleanup shell command and add part in about `sudo pip install recurrent`
Also removed attempts to bold in code blocks.
Add Rob Kresha to the loopers
# Conflicts:
#	docs/docs/walkthrough/phase-0/loops-in-progress.md
Revert some personalization
Can I close the loop with this pump_May 20 2016.jpg
Adding "Can I do OpenAPS with this pump?" image embedded at the top.
@danamlewis
Copy link
Contributor

Think this is ready to roll to get master updated with some of the latest fixes. Will merge shortly if no objections pop up.

* Update rpi.md

* Update rpi.md

* Update rpi.md
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.