Deploying to gh-pages from @ bfefed9 🚀

_sources/ex-commandstation/get-started/purchasing.rst.txt

@@ -47,11 +47,11 @@ You will need to find or purchase:
 
 #. a supported **Arduino board** |BR| We recommend the `Elegoo Mega 2560 <https://www.amazon.com/ELEGOO-ATmega2560-ATMEGA16U2-Projects-Compliant/dp/B01H4ZLZLQ/>`_ |BR| |BR|
 #. a supported **Motor Driver**  |BR| We recommend either our own :doc:`EX-MotorShield8874 </reference/hardware/motorboards/ex-motor-shield-8874>` or the `Arduino Motor Shield Rev3 <https://store.arduino.cc/collections/shields/products/arduino-motor-shield-rev3>`_ |BR| |BR|
-#. a supported **WiFi shield** |BR| We recommend the `Makerfabs ESP8266 WiFi Shield <https://www.makerfabs.com/esp8266-wifi-shield.html>`_ |BR| :dcc-ex-red-bold:`WARNING`: Most ESP8266 WiFi options, including the Makerfabs WiFi Shield, are now shipping with an incompatible AT firmware version. This can be corrected, but is probably beyond Conductor level and requires additional hardware. |BR| See :doc:`/support/wifi-at-version` for more information. |BR| We are currently investigating other options. |BR| |BR|
+#. a supported **WiFi shield** |BR| We recommend the `EX-WiFi Shield 8266 (aka Makerfabs WiFi Shield) <https://www.tindie.com/products/dccex/ex-wifishield-8266-with-jumpers/>`_ or from `Makerfabs <https://www.makerfabs.com/esp8266-wifi-shield.html>`_ |BR| |BR|
 #. Two (2) Male to Female **Jumpers leads** |BR| |BR|
 #. a 9-14v DC :doc:`power supply </reference/hardware/power-supplies>` for the motor shield |BR| We recommend `12V 5Amp Power Supply for the Track <https://www.amazon.com/LEDMO-Power-Supply-Transformers-Adapter/dp/B01461MOGQ/>`_ |BR| |BR|
 #. a 2.5mm x 5.5mm Female DC Plug to **Screw Terminal (optional, but recommended)** to connect the motor shield power supply |BR| |BR|
-#. a **7-9v DC power supply** |BR| for the Arduino - be sure it is **tip positive** such as `this one on amazon <https://www.amazon.com/Adapter-Arduino-Schwinn-Elliptical-Recumbent/dp/B06Y1LF8T5/ref=sr_1_2_sspa>`_ (while it is connected to the PC, this is not needed) |BR| |BR|
+#. a **7-9v DC power supply** |BR| for the Arduino - be sure it is **tip positive** such as `this one on amazon <https://www.amazon.com/Adapter-Arduino-Schwinn-Elliptical-Recumbent/dp/B06Y1LF8T5/ref=sr_1_2_sspa>`_ (while it is connected to the PC, this is not needed) NOTE: You do not need this power supply if you use the EX-MotorShield 8874. It powers the Arduino|BR| |BR|
 #. any **computer** running Windows, macOS, or Linux (only needed for the initial install of the software) |BR| |BR|
 #. a **USB Cable** from the computer to the Arduino |BR| |BR|
 #. a **piece of track** to run trains or program on |BR| |BR|
@@ -65,7 +65,7 @@ You will need to find or purchase:
 
 .. note:: 
 
-  You can also find more detailed hardware information in the :doc:`/reference/hardware/index` section.
+  You can also find more detailed hardware information in the :doc:`/reference/hardware/index` section. Check our list of dealers to find some products locally to you.
 
 |force-break|
 

_sources/reference/hardware/motorboards/ex-motor-shield-8874.rst.txt

@@ -76,7 +76,7 @@ How can I get one?
 
 Units may be purchased from the following sources:
 
-* In the US from the `DCC-EX Tindie Store <https://www.tindie.com/products/dccex/ex-motorshield8874/>`_ or...
+* In the US from the `DCC-EX Tindie Store <https://www.tindie.com/stores/dccex/>`_ or...
 * from `Smart Hobby, LLC <https://www.smarthobbyllc.com/>`_. You can also find Smart Hobby on Facebook
 * In the UK from `Chesterfield Model Making & Miniature Electronics <https://chesterfield-models.co.uk/product/semify-dcc-ex-motor-shield/>`_
 * In Europe from `Semify's Web Store <https://www.semify-eda.com/ex-motorshield8874/>`_ (based in Austria)

_sources/reference/hardware/wifi-boards/makerfabs-esp8266.rst.txt

@@ -3,9 +3,11 @@
 .. include:: /include/include-hardware.rst
 |EX-CS-LOGO|
 
-*******************************************
-Makerfabs ESP8266 WiFi Shield (recommended)
-*******************************************
+***************************************************
+EX-WiFiShield 8266 (recommended)
+***************************************************
+
+AKA Makerfabs ESP8266 WiFi Shield
 
 |conductor| |tinkerer| |engineer|
 
@@ -15,16 +17,10 @@ Makerfabs ESP8266 WiFi Shield (recommended)
       :depth: 1
       :local:
 
-.. warning:: 
-   :class: warning-float-right
-
-   Please be aware that the Espressif AT firmware currently being shipped with these devices **will probably NOT work** with |EX-CS| out of the box.
-
-   This can be corrected, but is probably beyond Conductor level and requires additional hardware.  
+   This board is a joint project with |DCC-EX| and Makerabs and is designed to work out of the box. Make sure to purchase from DCC-EX or any of our dealers or standard parts suppliers.
 
-   See :doc:`/support/wifi-at-version` for details on how to check the version and how to correct it if needed.
 
-   We are currently investigating other options.
+   If for any reason you wish to update the firmware in the future, pleas see :doc:`/support/wifi-at-version` for details on how to check the version and how to change it.
 
 .. 
    We like this board here at |DCC-EX|. It is simple, inexpensive, easy to use, and it works.
@@ -40,7 +36,7 @@ Installing the board follows the same procedure in the :doc:`section on assembly
 Remove the plastic jumpers
 ==========================
 
-Note the two black plastic jumpers: we need to remove both of them. You can pull them off with your fingers or needle nose pliers and either stick them in a drawer or move them to the side by having them connect via one side to any of the row of Rx pins. The other end of the connector will just hang out over the Wifi Board.
+Note the two black plastic jumpers: we need to remove both of them. You can pull them off with your fingers or needle nose pliers and either stick them in a drawer or move them to the side by having them connect via one side to any of the row of Rx pins. The other end of the connector will just hang out over the Wifi Board. If you purchase from DCC-EX or one of our dealers, you may find that they have already done this for you.
 
 
 .. figure:: /_static/images/assembly/wifi_pins.jpg
@@ -52,7 +48,7 @@ Note the two black plastic jumpers: we need to remove both of them. You can pull
 Align the boards
 ================
 
-Turn the board so that the tab end is to the left and the power connectors on the other boards are to the right. You will be looking at the left side of the shield. Align it so that the pins align starting with the tab end of the boards. The Rx, Tx, 2, 3, 4, 5, 6, 7 pins on the Motor Shield line up with the 0 through 7 pins on the Makerfabs WiFi Board. Start to get this row partially seated so all the pins are lined up with the holes. Note that there are more holes than pins. The two header holes closest to the power connectors will be empty.
+Turn the board so that the tab end is to the left and the power connectors on the other boards are to the right. You will be looking at the left side of the shield. Align it so that the pins align starting with the tab end of the boards. The Rx, Tx, 2, 3, 4, 5, 6, 7 pins on the Motor Shield line up with the 0 through 7 pins on the EX-WiFi Board. Start to get this row partially seated so all the pins are lined up with the holes. Note that there are more holes than pins. The two header holes closest to the power connectors will be empty.
 
 
 .. figure:: /_static/images/assembly/wifi_seat1.jpg
@@ -86,7 +82,7 @@ Install the jumper wires
 
 We now need to connect The Transmit (Tx) and Receive (Rx) pins on the ESP8266 to the Rx and Tx pins for Serial1 on the Mega. The Mega has one serial port connected to the USB port, and then 3 extra ones we can access from pins on the board. You can think of Tx as "talking" and Rx as "listening". That will help you remember that if one thing is talking, the other has to use its ears to listen. So we must connect the Tx of the WiFi board to Rx1 on the Mega and the Rx pin on the WiFi Board to Tx1 on the Mega.
 
-There are three rows of pins on the Makerfabs WiFi shield. The middle pins each connect to one of the first 8 pins on the header. Pin 0 goes to header pin 0, pin 1 goes to header pin 1, and so on. We aren't going to need those. With the plastic jumpers removed, nothing will be connected to any of those pins on the WiFi Board, and therefore not connected down to the Mega through the Motor Shield.
+There are three rows of pins on the WiFi shield. The middle pins each connect to one of the first 8 pins on the header. Pin 0 goes to header pin 0, pin 1 goes to header pin 1, and so on. We aren't going to need those. With the plastic jumpers removed, nothing will be connected to any of those pins on the WiFi Board, and therefore not connected down to the Mega through the Motor Shield.
 
 ALL of the pins in the row marked Tx (the row closest to the header) are connected to the Tx pin of the ESP8266. ALL of the pins in the row marked Rx (the row closest to the middle of the board) are connected to the Rx pin on the ESP8266.
 

about/about.html

@@ -150,7 +150,7 @@
 </ul>
 </li>
 <li class="toctree-l3"><a class="reference internal" href="../ex-commandstation/advanced-setup/supported-wifi/index.html">Supported WiFi Shields and Boards</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="../reference/hardware/wifi-boards/makerfabs-esp8266.html">Makerfabs ESP8266 WiFi Shield (recommended)</a></li>
+<li class="toctree-l4"><a class="reference internal" href="../reference/hardware/wifi-boards/makerfabs-esp8266.html">EX-WiFiShield 8266 (recommended)</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../reference/hardware/wifi-boards/duinopeak-esp8266.html">Duinopeak ESP8266 WiFi Expansion Board</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../reference/hardware/wifi-boards/esp-01.html">ESP-01 and ESP-01s</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../reference/hardware/wifi-boards/mega-wifi.html">Mega+WiFi Combo Board</a></li>
@@ -426,7 +426,7 @@
 </ul>
 </li>
 <li class="toctree-l3"><a class="reference internal" href="../reference/hardware/wifi-boards.html">WiFi Boards</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="../reference/hardware/wifi-boards/makerfabs-esp8266.html">Makerfabs ESP8266 WiFi Shield (recommended)</a></li>
+<li class="toctree-l4"><a class="reference internal" href="../reference/hardware/wifi-boards/makerfabs-esp8266.html">EX-WiFiShield 8266 (recommended)</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../reference/hardware/wifi-boards/duinopeak-esp8266.html">Duinopeak ESP8266 WiFi Expansion Board</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../reference/hardware/wifi-boards/esp-01.html">ESP-01 and ESP-01s</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../reference/hardware/wifi-boards/wangtongze-board.html">WangTongze Board</a></li>

about/contributing/development.html

@@ -150,7 +150,7 @@
 </ul>
 </li>
 <li class="toctree-l3"><a class="reference internal" href="../../ex-commandstation/advanced-setup/supported-wifi/index.html">Supported WiFi Shields and Boards</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/makerfabs-esp8266.html">Makerfabs ESP8266 WiFi Shield (recommended)</a></li>
+<li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/makerfabs-esp8266.html">EX-WiFiShield 8266 (recommended)</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/duinopeak-esp8266.html">Duinopeak ESP8266 WiFi Expansion Board</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/esp-01.html">ESP-01 and ESP-01s</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/mega-wifi.html">Mega+WiFi Combo Board</a></li>
@@ -426,7 +426,7 @@
 </ul>
 </li>
 <li class="toctree-l3"><a class="reference internal" href="../../reference/hardware/wifi-boards.html">WiFi Boards</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/makerfabs-esp8266.html">Makerfabs ESP8266 WiFi Shield (recommended)</a></li>
+<li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/makerfabs-esp8266.html">EX-WiFiShield 8266 (recommended)</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/duinopeak-esp8266.html">Duinopeak ESP8266 WiFi Expansion Board</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/esp-01.html">ESP-01 and ESP-01s</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/wangtongze-board.html">WangTongze Board</a></li>

about/contributing/donate.html

@@ -150,7 +150,7 @@
 </ul>
 </li>
 <li class="toctree-l3"><a class="reference internal" href="../../ex-commandstation/advanced-setup/supported-wifi/index.html">Supported WiFi Shields and Boards</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/makerfabs-esp8266.html">Makerfabs ESP8266 WiFi Shield (recommended)</a></li>
+<li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/makerfabs-esp8266.html">EX-WiFiShield 8266 (recommended)</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/duinopeak-esp8266.html">Duinopeak ESP8266 WiFi Expansion Board</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/esp-01.html">ESP-01 and ESP-01s</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/mega-wifi.html">Mega+WiFi Combo Board</a></li>
@@ -426,7 +426,7 @@
 </ul>
 </li>
 <li class="toctree-l3"><a class="reference internal" href="../../reference/hardware/wifi-boards.html">WiFi Boards</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/makerfabs-esp8266.html">Makerfabs ESP8266 WiFi Shield (recommended)</a></li>
+<li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/makerfabs-esp8266.html">EX-WiFiShield 8266 (recommended)</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/duinopeak-esp8266.html">Duinopeak ESP8266 WiFi Expansion Board</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/esp-01.html">ESP-01 and ESP-01s</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/wangtongze-board.html">WangTongze Board</a></li>

about/contributing/github.html

@@ -150,7 +150,7 @@
 </ul>
 </li>
 <li class="toctree-l3"><a class="reference internal" href="../../ex-commandstation/advanced-setup/supported-wifi/index.html">Supported WiFi Shields and Boards</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/makerfabs-esp8266.html">Makerfabs ESP8266 WiFi Shield (recommended)</a></li>
+<li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/makerfabs-esp8266.html">EX-WiFiShield 8266 (recommended)</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/duinopeak-esp8266.html">Duinopeak ESP8266 WiFi Expansion Board</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/esp-01.html">ESP-01 and ESP-01s</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/mega-wifi.html">Mega+WiFi Combo Board</a></li>
@@ -426,7 +426,7 @@
 </ul>
 </li>
 <li class="toctree-l3"><a class="reference internal" href="../../reference/hardware/wifi-boards.html">WiFi Boards</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/makerfabs-esp8266.html">Makerfabs ESP8266 WiFi Shield (recommended)</a></li>
+<li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/makerfabs-esp8266.html">EX-WiFiShield 8266 (recommended)</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/duinopeak-esp8266.html">Duinopeak ESP8266 WiFi Expansion Board</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/esp-01.html">ESP-01 and ESP-01s</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/wangtongze-board.html">WangTongze Board</a></li>

about/contributing/index.html

@@ -150,7 +150,7 @@
 </ul>
 </li>
 <li class="toctree-l3"><a class="reference internal" href="../../ex-commandstation/advanced-setup/supported-wifi/index.html">Supported WiFi Shields and Boards</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/makerfabs-esp8266.html">Makerfabs ESP8266 WiFi Shield (recommended)</a></li>
+<li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/makerfabs-esp8266.html">EX-WiFiShield 8266 (recommended)</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/duinopeak-esp8266.html">Duinopeak ESP8266 WiFi Expansion Board</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/esp-01.html">ESP-01 and ESP-01s</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/mega-wifi.html">Mega+WiFi Combo Board</a></li>
@@ -426,7 +426,7 @@
 </ul>
 </li>
 <li class="toctree-l3"><a class="reference internal" href="../../reference/hardware/wifi-boards.html">WiFi Boards</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/makerfabs-esp8266.html">Makerfabs ESP8266 WiFi Shield (recommended)</a></li>
+<li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/makerfabs-esp8266.html">EX-WiFiShield 8266 (recommended)</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/duinopeak-esp8266.html">Duinopeak ESP8266 WiFi Expansion Board</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/esp-01.html">ESP-01 and ESP-01s</a></li>
 <li class="toctree-l4"><a class="reference internal" href="../../reference/hardware/wifi-boards/wangtongze-board.html">WangTongze Board</a></li>