Merge pull request #939 from openaps/soontobedev

Fixing merge conflicts with soontobedev into dev

docs/docs/Customize-Iterate/bluetooth-tethering-edison.md

@@ -157,7 +157,7 @@ Device AA:BB:CC:DD:EE:FF Samsung S7
 
 * If you get a `Can't change local name on hci0: Network is down (100)` error, start over with `killall` and wait longer between steps.
 
-* Make sure your phone's hotspot is enabled (but don't let anything connect via wifi).
+* Make sure your phone's hotspot is enabled, but don't let anything connect via wifi (you have to switch on the personal hotspot toggle, but then immediately back out of the personal hotspot screen before anything connects to your hotspot via wifi).
 
 * Now, try to establish a Bluetooth Network connection with your phone:
 

docs/docs/Gear Up/edison.md

@@ -83,5 +83,12 @@ There are a few 3D-printed cases that are being designed, so check back here for
 * [Robert Silvers' case for Explorer and 2000 or 2500 mAh battery](http://www.thingiverse.com/thing:2291125)
 
 ### Soft Cases 
-* [TallyGear soft case](http://www.tallygear.com/index.php?route=product/category&path=90) - these are the soft cases Dana uses ([see this example](https://twitter.com/danamlewis/status/792782116140388353)). To order, just pick the pattern/fabric for a Dexcom G4/G5 case (per the link) and put that you want it OpenAPS sized or 2x3" in the notes.
+* [TallyGear soft case](http://www.tallygear.com/index.php?route=product/category&path=120) - these are the soft cases Dana uses ([see this example](https://twitter.com/danamlewis/status/792782116140388353)). The OpenAPS-sized case can be made any any pattern/fabric she uses elsewhere on the site.
 
+# Next steps after you get your hardware
+
+Once you've gotten your equipment, you'll want to head to the "[Setting Up Your Intel Edison](http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-0/setup-edison.html)" page. **Note that this page has setup instructions for all types of computers, and also has the most thorough troubleshooting section**. There is also an Edison setup page for Mac specifically ([see the Mac-Edison page here](http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-0/edison-explorer-board-Mac.html)) and for PC specifically ([see the PC-Edison page here](http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-0/windows-edison.html)). Even with the Mac or PC specific pages, you may find the main page with all setup types to have the most thorough troubleshooting section if you run into any trouble. 
+
+* If you bought an Edison un-flashed from Amazon, etc. you will start at the top of one of those pages to flash your Edison with Jubilinux. 
+* If you bought a pre-flashed Edison with Jubilinux, [you can skip down to the section of the docs here where you will log in to the Edison as root](http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-0/setup-edison.html#initial-edison-setup) and go on from there. (That's a link to the page with all setups; but you can find the same section in the Mac or PC page listed above). 
+* **Note**: If you don't know how to log in to your Edison as root, [you may find this page for accessing your rig](http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-2/accessing-your-rig.html) to be a good read first.

docs/docs/walkthrough/phase-0/edison-explorer-board-Mac.md

@@ -50,6 +50,8 @@ Let’s start by downloading the updated operating system (it’s called Jubilin
 
 Now we move to the Edison.  You’ll see two microB USB ports on your explorer board.  One is labeled OTG (that’s for flashing) and one is labeled UART (that’s for logging into the Edison from a computer).  We will need to use both to flash.  We’re going to plug both of those into our computer’s USB ports using the cables listed in the parts list (Dexcom’s charging cable will work too). 
 
+Note: Before starting to flash an Edison using a Mac, if you are using a Macbook with a USB-C Hub you may encounter some issues with the flashing process, including the wireless LAN setup not functioning correctly, so if you have an option to use a PC or Laptop with directly connected USB cables, it may be better to do so.
+
 ![Explorer Board rig with two cables and red light on](../../Images/Edison/ExplorerBoard_two_charging_cables.png) 
 
 Once you plug in the cables, you should see your Edison board in your Finder as a connected “device” (similar to what you would see if you plug in a USB thumb drive).  If you don’t…try different cables.  If your USB port is bad and not recognizing the device, you may need to [reset your SMC first](https://support.apple.com/en-au/HT201295) (it’s not hard to do, takes 2 minutes.)

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

@@ -180,3 +180,10 @@ List of people who are working on closed loops:
 - Kyle Larsen (Provo, UT)
 - Ben Fowler (Huntsville, AL)
 - Giuseppe Acito (Roma, Italy)
+- Mark M (Chicago, IL)
+- Chris Reilly (Detroit, MI)
+- Rod Snyder (Morgantown, WV, USA)
+- John Murray (Pinellas Park, FL, USA)
+- Shirley Steinmacher (son, Salt Lake City, UT, USA)
+- Michael Spradling (Raleigh, NC)
+- Tore Bjørndalen (Norway, Oppegård)