consolidate info about hardware into edison section & pi section, inc…

…luding parts, how to put them together, antenna info for edison

docs/docs/Build Your Rig/step-1-flashing.md

@@ -82,7 +82,8 @@ The above instructions are based on [these instructions](https://software.intel.
 
 ## 3. Connecting cables to the Explorer Board and starting console
 
-Now we move to the rig. You'll need to connect two cables from the rig to your computer. Follow the [console login directions](../Build Your Rig/logging-into-rig-serial) to get set up. 
+Now we move to the rig. You'll need to connect two cables from the rig to your computer. 
+Follow the [console login directions](<../Build Your Rig/logging-into-rig-serial:Accessing your online rig via SSH>) to get set up. 
 
 Once you get to the login prompt, log in using the username "root" (all lowercase) and no password. This will have us ready to reboot from the command line when we are ready. This is your "console window" - keep it open.
 

docs/docs/Build Your Rig/step-2-wifi-dependencies.md

@@ -12,15 +12,12 @@ The directions for this step depend on which type of rig you are using:
 
 To get your first wifi connection set up and install OpenAPS, you'll need to log in to the rig via the console. Follow the [console login directions](../Build Your Rig/logging-into-rig-serial) to get a console window open, then the rest of the instructions below.
 
-
 ### Bootstrap script
 
 If you're not already, make sure you're logged into your rig via root. You should see `root@jubilinux` on the command prompt.
 
 The box below is the Bootstrap script, which will set up your first wifi network connection and install dependencies.  Copy this text (all of it in the box): 
 
-TODO: this differs from the scripts in oref0, see if I can pull directly from there - otherwise either update or only link
-
 ```
 #!/bin/bash
 (
@@ -80,14 +77,11 @@ Now that step 2 is done, the bootstrap script will then continue to run awhile l
 
 At the completion, you will be prompted to press `enter` if you want to continue the setup script (oref0-setup).  If you don't have time to run the setup script (a fresh install of setup script can take about an hour to run), then you can cancel and come back to it later.  Regardless of your answer, you should now return to [the Setup Script section](http://openaps.readthedocs.io/en/latest/docs/Build%20Your%20Rig/OpenAPS-install.html#run-oref0-setup) for finishing step 4.
 
-Now that you have a wifi connection to your rig, you can log in to it using 
-
+Now that you have a wifi connection to your rig, you have the option of [logging into it using SSH](../While%20You%20Wait%20For%20Gear/monitoring-OpenAPS#accessing-your-online-rig-via-ssh) from a computer on the same network, rather than using a cable. 
 
+### Manual instructions for Intel Edison
 
-### Manual instructions
-
-Below are the manual instructions for reference only - it is strongly recommended that you use the easy setup scripts instead.
-
+Below are the manual instructions for reference only - it is strongly recommended that you use the bootstrap script above instead.
 
 #### Initial Edison Setup
 
@@ -160,15 +154,15 @@ network={
 
 The networks you enter here are the wifi networks that your rig will be able to use to stay connected to internet. After getting your initial wireless connection set up, you can return to [the instructions for adding additional wireless connections ](http://openaps.readthedocs.io/en/latest/docs/Customize%20Iterate/on-the-go-wifi-adding.html) to add more options to your rig at any point.
 
-![Wifi edit screen](../../Images/Edison/Wifi_add.png)
+![Wifi edit screen](../Images/Edison/Wifi_add.png)
 
 On a Mac, if you experience any erratic behavior while using the screen editor, such as the cursor overwriting or deleting adjacent words when typing or even when using the cursor arrow keys, this may be due to incorrectly set Mac Terminal window settings. Try going to the "Shell" on the menu bar above and selecting "Show Inspector." Ensure the Columns setting is set to "80" and the Rows setting is set to "25."
 
 Press Esc and then type ':wq' and press Enter to write the file and quit.
 
 Run `ifup wlan0` to make sure you can connect to wifi.  A successful connection should look similar (IP address numbers will be different than mine):
 
-![ifup wlan0 example](../../Images/Edison/ifup_wlan0.png)
+![ifup wlan0 example](../Images/Edison/ifup_wlan0.png)
 
 Make sure you see a message showing you are successfully connected, then `reboot` to apply the wifi changes and (hopefully) get online.
 
@@ -180,7 +174,7 @@ Note: If you are reflashing an Edison, you might get a scary looking error about
 
 Run `ifconfig wlan0` to determine the IP address of the wireless interface, in case you need it to SSH below.  Alternatively, if you know how to login to your router, you can also see the Edison's IP address there.
 
-![IP address](../../Images/Edison/ip_address.png)
+![IP address](../Images/Edison/ip_address.png)
 
 Leave the serial window open in case you can't get in via SSH and need to fix your wifi config.
 
@@ -238,6 +232,7 @@ and add to the end of the file:
 ```    
 
 
+
 ## Raspberry Pi instructions
 
 Note: there are two key ways to setup a Pi rig. One uses Pi Bakery, the other is a manual method. If your Pi Bakery process does not work, just use [Option B](#Option-B). 

docs/docs/Customize-Iterate/usability-considerations.md

@@ -94,18 +94,6 @@ The use of Temporary Targets can provide additional fine tuning of insulin contr
 
 Temporary Targets can be set in advance by setting a future date/time stamp in Nightscout when you set them.  For example, a parent may wish to set a week's worth of Eating Soon or Activity Modes in advance of a regular school week.  This may be particularly helpful for meals or activity (i.e. gym class) which are regularly scheduled but for which you may have difficulty remembering to trigger the Temporary Target at the right time.  Scheduled or remotely activated Temporary Targets can also be very useful in supporting children in optimal management at school or other locations where there may not be an adult who is in a position to set the Temporary Target each time it is needed. It's also helpful even for adult PWDs when traveling; a loved one at home in a different time zone can set temp targets as needed to help direct the rig's activity while the PWD might be asleep or otherwise occupied.<br>
 
-## How do I improve the range of my Edison/Explorer Board?
-
-There are two options for improving the range of an Explorer Board. The easiest way is to purchase a "wire whip" antenna to add to your rig. [Here is one available at Mouser (915MHz only)](https://www.mouser.com/ProductDetail/620-66089-0930?R=66089-0930virtualkey65480000virtualkey620-66089-0930) or for 866/868 MHz [also availabe at Mouser](https://www.mouser.at/ProductDetail/Anaren/66089-0830?qs=pH7abCSN9NPb5X5zwyxl2w==). You can buy one [at Enhanced Radio Devices](https://www.enhancedradio.com/collections/all) as well, you may consider ordering it with your Explorer Board. It physically clips on to your rig. The picture below shows the antenna clipped on and extended from the board; but you can experiment with wrapping the antenna around your rig to fit in your preferred case to see various impacts to the range. 
-
-![Image of Antenna](../Images/antenna1.jpg)
-
-The other option is to tune the existing on-board antenna by cutting it. The antenna on the Explorer Block is a strip of copper underneath the green outer coating. The antenna is labeled A1. It will have its maximum power at 868 MHz. The antenna has a line across it at one point with a label that says "915". The antenna defaults to the 868 MHz range, which is what WW pumps use. If you have a US pump, mmtune will run and tune to something near 916MHz. Even with the 868 MHz antenna, you should get half a dozen feet or more of range on average.  If you (optionally) want to boost the range of your antenna by a couple more feet, then you cut through the outer coating and the copper on that line with an X-ACTO knife. A single clean cut is sufficient, but if the cut doesn't look clean you could make two cuts and then dig out the circumscribed piece and then reseal the copper with nail polish. With that cut, the antenna will have maximum power near 915 MHz.
-
-If you're unsure whether you need to cut your Explorer Block's antenna, you probably don't.  And if you decide you need slightly more range after using the Edison+Explorer rig for a few weeks, you can always come back later and do so then.
-
-![Image of Antenna](../Images/antenna0.jpg)
-
 ## How do I switch between insulin types, or switch to Fiasp? What should I change?
 
 The most important setting for switching between insulin types in an OpenAPS rig is the "curve" type for duration of insulin activity. In oref0 0.6.0, most users will use the rapid-acting curve if they are using Humalog, Novolog, or similar. Fiasp users should use the "ultra-rapid" curve type. [See the preferences page here for more details on how to change your curve](http://openaps.readthedocs.io/en/latest/docs/While%20You%20Wait%20For%20Gear/preferences-and-safety-settings.html#curve-rapid-acting) in your `preferences.json` file (which you can edit with `edit-pref`).