Merge branch 'master' into dev

Author: scottleibrand

docs/Resources/wifi.md

@@ -9,7 +9,7 @@ git clone https://github.com/TC2013/edison_wifi
 cd edison_wifi
 chmod 0755 /home/edison/src/edison_wifi/wifi.sh
 ```
-Next, add the script to your root cron. Note this is a different cron that what your loops runs on, so when you open it don't expect to see your loop and other items you've added.
+Next, add the script to your root cron. Note this is a different cron that what your loops runs on, so when you open it don't expect to see your loop and other items you have added.
   * Log in as root ```su root```
   * Edit your root cron ```crontab -e```
   * Add the following line ```1-59/2 * * * * /home/edison/src/edison_wifi/wifi.sh google.com 2>&1 | logger -t wifi-reset```

docs/docs/Resources/my-first-pr.md

@@ -9,7 +9,7 @@ It's actually not too hard to do one and it is a great way to contribute. This d
 * Then do a pull request, which is to ask the administrators of the repository to pull your changes back into the appropriate branch of the main repository.
 * They will do a quick review and merge your changes in, or comment if there are errors that need fixing first, or if it's a large enough change that it needs to go to another branch like dev for further work before being merged to master.
 
-OK, let's get started. For our example we are going to make an edit to the openaps docs repository.
+OK, let's get started. For our example we are going to make an edit to the openaps docs repository.  This does NOT need to be done in the linux environment.  This can be done on any Windows PC.
 
 1. Go to https://github.com/openaps/docs and hit Fork in the upper right to make your own copy of the repository.
 2. Github will automatically take you to your copy (notice in the address bar you are now in your own personal github directory)

docs/docs/Resources/troubleshooting.md

@@ -52,7 +52,7 @@ Once you're setting up your loop, you may also want to oref0-reset-usb (`oref0-r
 
 OpenAPS uses git as the logging mechanism, so it commits report changes on each report invoke. Sometimes, due to "unexpected" power-offs (battery dying, unplugging, etc.),the git repository gets broken. When it happens you will receive exceptions when running any report from openaps. As git logging is a safety/security measure, there is no way of disabling these commits.
 
-You may see an error that references a loose object, or a corrupted git repository. To fix a corrupted git repository you can run `oref0-fix-git-corruption.sh`, it will try to fix the repository, and in case when repository is definitely broken it copies the remainings in a safe place (`tmp`) and initializes a new git repo.
+You may see an error that references a loose object, or a corrupted git repository. To fix a corrupted git repository you can run `oref0-fix-git-corruption`, it will try to fix the repository, and in case when repository is definitely broken it copies the remainings in a safe place (`tmp`) and initializes a new git repo.
 
 To reset the whole git repository you can run `oref0-reset-git`.  It is currently recommended to run this command in cron so that if the repository gets corrupted it can quickly reset itself. 
 

docs/docs/walkthrough/phase-0/loops-in-progress.md

@@ -52,3 +52,6 @@ List of people who are working on closed loops:
 - Luuc Verburgh (Eindhoven, The Netherlands)
 - Julie Raines (Poughkeepsie, NY)
 - Brandon Parrish (Augusta, GA)
+- Katie Ellison (Bellevue, WA)
+- Sarah Easter (Georgetown, TX)
+- Terri Lyman (Prescott Valley, AZ)

docs/docs/walkthrough/phase-0/rpi.md

@@ -66,7 +66,7 @@ Write the Raspbian .img you extracted from the ZIP file above to the SD card usi
 * Next, connect your RPi2 to a monitor or T.V. using the included HDMI cable.
 * Finally connect your RPi2 using the power adapter.
 * You should see the GUI appear on sceen.
-* Configure WiFi per the instruction pamphlet included with your CanaKit.
+* Configure WiFi per the instruction pamphlet included with your CanaKit. For those not using the CanaKit, click the computer monitors next to the volume control in the upper-right side and there will be a drop-down menu of available WiFi networks.  You should see your home network.  If you have trouble connecting to the RPi2 via WiFi, check your router settings. The router may need to be switched from WEP to WPA2.
 * Once you have installed Rasbian and connected to WiFI, you can disconnect the mouse, keyboard and HDMI cable.
 
 Remember to keep your RPi2 plugged in, just disconnect the peripherals.  Also remember to never disconnect your RPi2 without shutting it down properly using the `sudo shutdown -h now` command.  If you are unable to access the Pi and must power it off without a shutdown, wait until the green light has stopped flashing (indicating the Pi is no longer writing to the SD card).

docs/docs/walkthrough/phase-1/openaps-to-nightscout.md

@@ -6,9 +6,10 @@ To view your data on your Nightscout site, start by doing the following:
 
 So this would be your actual https://myname.azurewebsites.net  or https://myname.herokuapp.com (without the carrots of course). Your API_SECRET is listed in your Azure or Heroku settings.
 
-To test this: `openaps use ns shell preflight`
+To test this: `openaps use ns shell preflight`\
+It should return "True"
 
-To get aliases:
+To get a good list of aliases:
 
 `curl -sg https://gist.githubusercontent.com/bewest/d3db9ca1c144b845382c885138a8f66e/raw/181c5d6f29cd6489ecc9630786cf2c4937ddde79/bewest-aliases.json > bewest-aliases.json`
 
@@ -37,13 +38,18 @@ At this point, you should see treatment circles, information about the battery,
 To verify what was uploaded to Nightscout:
 `cat nightscout/uploaded.json`
 
-Then for the status:
+Then to add the ns-status device to your openaps.ini:
 `oref0 device-helper ns-status 'ns-status $*' | openaps import`
 
-Then:
+Then test the ns-status device (Adjust the report directories as needed):
 `openaps use ns-status shell monitor/clock.json oref0-monitor/iob.json oref0-predict/oref0.json oref0-enacted/enacted-temp-basal.json monitor/battery.json monitor/reservoir.json monitor/status.json`
 
-You should see a lot of info. (Side note: the word "received" is spelled wrong.)
+You should see a lot of info. (Side note: the word "received" under the "enacted" heading is typoed.)\
+
+If you receive an error you have most likely not included all reports;\
+running `openaps use ns-status shell -h` will show positional arguements.
+These arguements are required; `clock iob suggested enacted battery reservoir status`
+you can also supplement additional reports (i.e., remainder).
 
 Make sure to save this as a report:
 `openaps report add nightscout/openaps-status.json JSON ns-status shell monitor/clock.json oref0-monitor/iob.json oref0-predict/oref0.json oref0-enacted/enacted-temp-basal.json monitor/battery.json monitor/reservoir.json monitor/status.json`

docs/docs/walkthrough/phase-1/using-openaps-tools.md

@@ -166,29 +166,21 @@ openaps use cgm oref0_glucose  --hours 2.0
 # for G5 consider this instead:
 openaps use cgm oref0_glucose  --no-raw --hours 2.0
 
-<<<<<<< HEAD:docs/docs/walkthrough/phase-2/using-openaps-tools.md
 (Note this step is not required if you are using a Medtronic CGM. The pump serves as the receiver and all of the pumping and glucose functionality are contained in the same openaps device.)
 
 For all Dexcom CGM systems:
-=======
-```
->>>>>>> 4f4f7e95e6641fab56ac7aa0abfb4c6e057a7bee:docs/docs/walkthrough/phase-1/using-openaps-tools.md
 
 Add as report:
 ```
 openaps report add raw-cgm/glucose-raw.json JSON cgm oref0_glucose  --hours 2.0
 # For G5:
 openaps report add raw-cgm/glucose-raw.json JSON cgm oref0_glucose  --no-raw --hours 2.0
 
-<<<<<<< HEAD:docs/docs/walkthrough/phase-2/using-openaps-tools.md
 For a Dexcom G5 system, you need to configure openaps specifically for the G5:
 
 `openaps use <my_dexcom_name> config --G5`
 
 NB: The above command can also be used to change from a G4 to G5 system in an already functioning loop. If that doesn't work, update openaps.
-=======
-```
->>>>>>> 4f4f7e95e6641fab56ac7aa0abfb4c6e057a7bee:docs/docs/walkthrough/phase-1/using-openaps-tools.md
 
 Ensure that the data is zoned correcty:
 ```

docs/docs/walkthrough/phase-1/visualization.md

@@ -21,12 +21,9 @@ to your OpenAPS implementation.
 
 OpenAPS requires the latest (currently dev) version of Nightscout, which can be
 found here: https://github.com/nightscout/cgm-remote-monitor/tree/dev. If you
-are already using Nightscout you might have to update your repository. Just go
-to the https://github.com/nightscout/cgm-remote-monitor repository and look for
-"updating my version". Once you have completed these steps, log on to Azure or
-Heroku and disconnect the deployment source. Thereafter choose your
+are already using Nightscout you might have to update your repository. To update your version and create a PR to your dev branch, use http://nightscout.github.io/pages/test-beta/?branch=dev and look for the "I'm ready" button. Once you have completed these steps, log on to Azure or Heroku and disconnect the deployment source. Thereafter choose your
 cgm-remote-monitor github repository as source again. You should take the dev
-branch of this repository especially if you plan to use the
+branch of this repository. The dev branch will also allow you to use the
 advanced-meal-assist feature.
 
 The steps discussed here are essentially the same for both Azure and Heroku users. Two configuration changes must be made to the Nightscout implementation: