Merge branch 'master' into ardupilot

640.html

@@ -26,7 +26,7 @@
   <!-- Initializer -->
   <script>
     Flatdoc.run({
-      fetcher: Flatdoc.github('darkwaterio/docs', '640.md')
+      fetcher: Flatdoc.github('darkwaterfoundation/docs', '640.md')
     });
 
     $(document).on('flatdoc:ready', function() {
@@ -47,11 +47,12 @@
         <li><a href='/escape.html'>ESCAPE</a></li>
         <!--<li><a href='/soar.html'>Soar</a></li>-->
         <li><a href='/expansionadding.html'>Expansions</a></li>
+        <li><a href='https://community.darkwater.io/'>Support</a></li>
       </ul>
     </div>
     <div class='right'>
       <!-- GitHub buttons: see http://ghbtns.com -->
-      <iframe src="//ghbtns.com/github-btn.html?user=darkwaterio&amp;repo=docs&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="110" height="20"></iframe>
+      <iframe src="//ghbtns.com/github-btn.html?user=darkwaterfoundation&amp;repo=docs&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="110" height="20"></iframe>
     </div>
   </div>
 

640.md

@@ -188,12 +188,6 @@ Once you have your RC receiver connected to the board and bound (linked) to yur
 
 ![640 RC receiver](/images/rc640.png)
 
-## 640 Pinout
-
-The pins used by the 640 board are shown in the diagram below. All GND pins are linked so have all been marked.
-
-![640 Pinout](/images/640pinout.png)
-
 # Programming the 640
 
 ## Installing the Python libraries
@@ -201,7 +195,7 @@ The pins used by the 640 board are shown in the diagram below. All GND pins are
 The Python libraries for the 640 board and some example scripts are available via our GitHub repository. To install them open a terminal window on your Raspberry Pi (unless you are running with only the command line) and enter the following:
 
 ```bash
-$ git clone https://github.com/darkwaterio/darkwater_python_640.git
+$ git clone https://github.com/darkwaterfoundation/darkwater_python_640.git
 ```
 
 Next you need to navigate into the new directory so enter:

640advanced.html

@@ -26,7 +26,7 @@
   <!-- Initializer -->
   <script>
     Flatdoc.run({
-      fetcher: Flatdoc.github('darkwaterio/docs', '640advanced.md')
+      fetcher: Flatdoc.github('darkwaterfoundation/docs', '640advanced.md')
     });
 
     $(document).on('flatdoc:ready', function() {

640cplusplus.html

@@ -26,7 +26,7 @@
   <!-- Initializer -->
   <script>
     Flatdoc.run({
-      fetcher: Flatdoc.github('darkwaterio/docs', '640cplusplus.md')
+      fetcher: Flatdoc.github('darkwaterfoundation/docs', '640cplusplus.md')
     });
 
     $(document).on('flatdoc:ready', function() {

640gettingstarted.html

@@ -26,7 +26,7 @@
   <!-- Initializer -->
   <script>
     Flatdoc.run({
-      fetcher: Flatdoc.github('darkwaterio/docs', '640gettingstarted.md')
+      fetcher: Flatdoc.github('darkwaterfoundation/docs', '640gettingstarted.md')
     });
 
     $(document).on('flatdoc:ready', function() {

640python.html

@@ -26,7 +26,7 @@
   <!-- Initializer -->
   <script>
     Flatdoc.run({
-      fetcher: Flatdoc.github('darkwaterio/docs', '640python.md')
+      fetcher: Flatdoc.github('darkwaterfoundation/docs', '640python.md')
     });
 
     $(document).on('flatdoc:ready', function() {

640wiring.html

@@ -26,7 +26,7 @@
   <!-- Initializer -->
   <script>
     Flatdoc.run({
-      fetcher: Flatdoc.github('darkwaterio/docs', '640wiring.md')
+      fetcher: Flatdoc.github('darkwaterfoundation/docs', '640wiring.md')
     });
 
     $(document).on('flatdoc:ready', function() {

CNAME

@@ -1 +0,0 @@
-docs.darkwater.io

ardupilot.md

@@ -0,0 +1,83 @@
+# Getting started with ArduPilot
+
+ArduPilot can be used with the ESCAPE board to take it to the next level for operating everything from multicopters to full size tractors. More details [here at ardudpilot.org] (http://ardupilot.org)
+
+The ESCAPE board will need to be combined with either a SOAR board  or 9DOF expansion board as well as a MS5611 High resolution atmospheric pressure module (barometer). You can optionally add a serial GPS.
+
+Ideally you will need a version of Raspbian that has been compiled with a Real-Time kernel. Available for download from here.
+
+(Note please don't run 'sudo apt-get update' as this will overwrite the kernel)
+
+## Using our downloaded image
+
+Download our pre-prepared image that already contains compiled programs for either a Quadcopter, Rover or Plane
+
+
+## Rolling your own
+
+Use an SSH program to log onto the Raspberry Pi.
+
+Clone the Ardupilot source.
+
+```
+git clone https://github.com/diydrones/ardupilot.git
+cd ardupilot
+git submodule update --init
+```
+
+Waf is the preferred method of building code
+
+!!! Note
+	Waf should always be called from the ardupilot root directory.
+
+To keep access to Waf convenient, use the following alias from the root ardupilot directory:
+
+```
+alias waf="$PWD/modules/waf/waf-light"
+```
+
+Choose the board to be used:
+
+```
+waf configure --board=dark
+```
+
+### Build
+
+Now you can build your preferred vehicle. For quadcopter use the following command:
+
+```
+waf --targets bin/arducopter-quad
+```
+
+To build for other frame types replace quad with one of the following options
+
+```
+coax heli hexa octa octa-quad single tri y6
+```
+
+At the end of compilation a binary file with the name arducopter-quad will be placed in the following directory
+
+```
+ardupilot/build/dark/bin/ 
+```
+
+Other vehicle types can be built:
+
+```
+waf --targets bin/ardurover  
+```
+
+or
+
+```
+waf --targets bin/arduplane
+```
+
+
+
+ 
+
+
+
+ 

escape.html

@@ -26,7 +26,7 @@
   <!-- Initializer -->
   <script>
     Flatdoc.run({
-      fetcher: Flatdoc.github('darkwaterio/docs', 'escape.md')
+      fetcher: Flatdoc.github('darkwaterfoundation/docs', 'escape.md')
     });
 
     $(document).on('flatdoc:ready', function() {
@@ -56,11 +56,12 @@
         <li><a href='/escape.html'>ESCAPE</a></li>
         <!--<li><a href='/soar.html'>Soar</a></li>-->
         <li><a href='/expansionadding.html'>Expansions</a></li>
+        <li><a href='https://community.darkwater.io/'>Support</a></li>
       </ul>
     </div>
     <div class='right'>
       <!-- GitHub buttons: see http://ghbtns.com -->
-      <iframe src="//ghbtns.com/github-btn.html?user=darkwaterio&amp;repo=docs&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="110" height="20"></iframe>
+      <iframe src="//ghbtns.com/github-btn.html?user=darkwaterfoundation&amp;repo=docs&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="110" height="20"></iframe>
     </div>
   </div>
 

escape.md

@@ -187,30 +187,10 @@ Now that we have your ESCAPE board and Raspberry Pi setup, it's time to connect
 ![the ESCAPE board](/images/onlyescape.png)
 
 ## Connecting Servos
-
-Servos can be connected to the six servo connections to the right hand side of the board. The ESCAPE board is setup to provide power to the Servos from the Raspberry Pi's 5v power if the **Power** jumper is in place (and no power supply is connected to the external 5v connection), otherwise you will need to provide 5v from the external connection for the Servos.
-
-If you are using ESCs to also power motors, then you also attach the BEC coonection to one of the Servo connections to provide 5v for the Servos.
-
-![640 servo](/images/servoescape.png) 
-
 ## Connecting Motors
+## Connecting the power
 ## Connecting your RC receiver 
 
-The RC receiver is connected to the 3-pin connector on the far left of the board. Your Radio Control (RC) receiver should be capable of outputting CPPM or PPM-SUM signals. For some RC receivers need a jumper placed across two pins in order to enable this mode (as is the case with the D4R-II receiver displayed).
-
-Once you have your RC receiver connected to the board and bound (linked) to yur RC transmitter, you should run the C++ PPM decoder example code ([below](#programming-the-escape-installing-the-c-libraries)) to make sure that the signals are being received correctly.
-
-![ESCAPE RC receiver](/images/rcescape.png)
-
-## Advanced setup
-
-## ESCAPE Pinout
-
-The pins used by the ESCAPE board are shown in the diagram below. All GND pins are linked so have all been marked.
-
-![ESCAPE Pinout](/images/escapepinout.png)
-
 # Programming the ESCAPE
 
 ## Installing the Python libraries
@@ -218,7 +198,7 @@ The pins used by the ESCAPE board are shown in the diagram below. All GND pins a
 The Python libraries for the ESCAPE board and some example scripts are available via our GitHub repository. To install them open a terminal window on your Raspberry Pi (unless you are running with only the command line) and enter the following:
 
 ```bash
-$ git clone https://github.com/darkwaterio/darkwater_python_escape.git
+$ git clone https://github.com/darkwaterfoundation/darkwater_python_escape.git
 ```
 
 Next you need to navigate into the new directory so enter:

escapeadvanced.html

@@ -26,7 +26,7 @@
   <!-- Initializer -->
   <script>
     Flatdoc.run({
-      fetcher: Flatdoc.github('darkwaterio/docs', 'escapeadvanced.md')
+      fetcher: Flatdoc.github('darkwaterfoundation/docs', 'escapeadvanced.md')
     });
 
     $(document).on('flatdoc:ready', function() {

escapecplusplus.html

@@ -26,7 +26,7 @@
   <!-- Initializer -->
   <script>
     Flatdoc.run({
-      fetcher: Flatdoc.github('darkwaterio/docs', 'escapecplusplus.md')
+      fetcher: Flatdoc.github('darkwaterfoundation/docs', 'escapecplusplus.md')
     });
 
     $(document).on('flatdoc:ready', function() {

escapegettingstarted.html

@@ -26,7 +26,7 @@
   <!-- Initializer -->
   <script>
     Flatdoc.run({
-      fetcher: Flatdoc.github('darkwaterio/docs', 'escapegettingstarted.md')
+      fetcher: Flatdoc.github('darkwaterfoundation/docs', 'escapegettingstarted.md')
     });
 
     $(document).on('flatdoc:ready', function() {

escapepython.html

@@ -26,7 +26,7 @@
   <!-- Initializer -->
   <script>
     Flatdoc.run({
-      fetcher: Flatdoc.github('darkwaterio/docs', 'escapepython.md')
+      fetcher: Flatdoc.github('darkwaterfoundation/docs', 'escapepython.md')
     });
 
     $(document).on('flatdoc:ready', function() {

escapewiring.html

@@ -26,7 +26,7 @@
   <!-- Initializer -->
   <script>
     Flatdoc.run({
-      fetcher: Flatdoc.github('darkwaterio/docs', 'escapewiring.md')
+      fetcher: Flatdoc.github('darkwaterfoundation/docs', 'escapewiring.md')
     });
 
     $(document).on('flatdoc:ready', function() {

expansionadding.html

@@ -21,12 +21,12 @@
   <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.4.0/highlight.min.js"></script>
   <!-- Meta -->
   <meta content="Expansions - Adding expansion boards | Dark Water" property="og:title">
-  <meta content="Dark Water documentation." name="description">
+  <meta content="Dark Water Foundation documentation." name="description">
 
   <!-- Initializer -->
   <script>
     Flatdoc.run({
-      fetcher: Flatdoc.github('darkwaterio/docs', 'expansionadding.md')
+      fetcher: Flatdoc.github('darkwaterfoundation/docs', 'expansionadding.md')
     });
 
     $(document).on('flatdoc:ready', function() {
@@ -47,6 +47,7 @@
         <li><a href='/escape.html'>ESCAPE</a></li>
         <!--<li><a href='/soar.html'>Soar</a></li>-->
         <li><a href='/expansionadding.html'>Expansions</a></li>
+        <li><a href='https://community.darkwater.io/'>Support</a></li>
       </ul>
     </div>
     <div class='right'>

index.html

@@ -25,12 +25,12 @@
 
   <!-- Meta -->
   <meta content="Dark Water" property="og:title">
-  <meta content="Dark Water documentation." name="description">
+  <meta content="Dark Water Foundation documentation." name="description">
 
   <!-- Initializer -->
   <script>
     Flatdoc.run({
-      fetcher: Flatdoc.github('darkwaterio/docs', 'readme.md')
+      fetcher: Flatdoc.github('darkwaterfoundation/docs', 'readme.md')
     });
 
     $(document).on('flatdoc:ready', function() {
@@ -61,11 +61,12 @@
         <li><a href='/escape.html'>ESCAPE</a></li>
         <!--<li><a href='/soar.html'>Soar</a></li>-->
         <li><a href='/expansionadding.html'>Expansions</a></li>
+        <li><a href='https://community.darkwater.io/'>Support</a></li>
       </ul>
     </div>
     <div class='right'>
       <!-- GitHub buttons: see http://ghbtns.com -->
-      <iframe src="//ghbtns.com/github-btn.html?user=darkwaterio&amp;repo=docs&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="110" height="20"></iframe>
+      <iframe src="//ghbtns.com/github-btn.html?user=darkwaterfoundation&amp;repo=docs&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="110" height="20"></iframe>
     </div>
   </div>
 

readme.md

@@ -20,7 +20,7 @@ The 640 (Six for Zero) board is a DC and Stepper motor control board capable of
 - [Expanding](/expansionadding.html) adding extra expansion boards
 - [Get Advanced]() more advanced things you can do
 
-[Order a 640 board >](https://darkwater.io/product/640-dc-motor-control-board/)
+[Pre-Order a 640 board >](https://darkwater.io/product/640-dc-motor-control-board/)
 
 ## The ESCAPE board
 
@@ -38,7 +38,7 @@ The ESCAPE (ESC-cape) board was designed to provide a method of using brushless
 - [Expanding](/expansionadding.html) adding extra expansion boards
 - [Get Advanced]() more advanced things you can do
 
-[Order an ESCAPE board >](https://darkwater.io/product/escape-esc-powered-motor-control-board/)
+[Pre-Order an ESCAPE board >](https://darkwater.io/product/escape-esc-powered-motor-control-board/)
 
 ## The SOAR board
 
@@ -50,7 +50,7 @@ The SOAR board is a holder for advanced sensors. It is ideal for use with differ
 - [Adding an expansion board](/expansionadding.html) adding an expansion board
 - [Reading data]() reading the sensor data
 
-[Order a SOAR board >](https://darkwater.io/product/soar-expansion-board-holder/)
+[Pre-Order a SOAR board >](https://darkwater.io/product/soar-expansion-board-holder/)
 
 ## Tutorials
 

soar.html

@@ -26,7 +26,7 @@
   <!-- Initializer -->
   <script>
     Flatdoc.run({
-      fetcher: Flatdoc.github('darkwaterio/docs', 'soar.md')
+      fetcher: Flatdoc.github('darkwaterfoundation/docs', 'soar.md')
     });
 
     $(document).on('flatdoc:ready', function() {
@@ -47,11 +47,12 @@
         <li><a href='/escape.html'>ESCAPE</a></li>
         <!--<li><a href='/soar.html'>Soar</a></li>-->
         <li><a href='/expansionadding.html'>Expansions</a></li>
+        <li><a href='https://community.darkwater.io/'>Support</a></li>
       </ul>
     </div>
     <div class='right'>
       <!-- GitHub buttons: see http://ghbtns.com -->
-      <iframe src="//ghbtns.com/github-btn.html?user=darkwaterio&amp;repo=docs&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="110" height="20"></iframe>
+      <iframe src="//ghbtns.com/github-btn.html?user=darkwaterfoundation&amp;repo=docs&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="110" height="20"></iframe>
     </div>
   </div>
 

soargettingstarted.html

@@ -26,7 +26,7 @@
   <!-- Initializer -->
   <script>
     Flatdoc.run({
-      fetcher: Flatdoc.github('darkwaterio/docs', 'soargettingstarted.md')
+      fetcher: Flatdoc.github('darkwaterfoundation/docs', 'soargettingstarted.md')
     });
 
     $(document).on('flatdoc:ready', function() {

tutorial-quadcopter.html

@@ -30,7 +30,7 @@
   <!-- Initializer -->
   <script>
     Flatdoc.run({
-      fetcher: Flatdoc.github('darkwaterio/docs', 'quadcopter.md')
+      fetcher: Flatdoc.github('darkwaterfoundation/docs', 'quadcopter.md')
     });
 
     $(document).on('flatdoc:ready', function() {
@@ -56,7 +56,7 @@
     </div>
     <div class='right'>
       <!-- GitHub buttons: see http://ghbtns.com -->
-      <iframe src="//ghbtns.com/github-btn.html?user=darkwaterio&amp;repo=docs&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="110" height="20"></iframe>
+      <iframe src="//ghbtns.com/github-btn.html?user=darkwaterfoundation&amp;repo=docs&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="110" height="20"></iframe>
     </div>
   </div>