wpilibsuite · Daltz333 · Dec 2, 2020 · Nov 22, 2020 · Nov 22, 2020 · Nov 22, 2020
diff --git a/...es/radio-programming/adapter-settings.png → ...orio-troubleshooting/adapter-settings.png b/...es/radio-programming/adapter-settings.png → ...orio-troubleshooting/adapter-settings.png
diff --git a/...o-programming/disable-network-adapter.png → ...oubleshooting/disable-network-adapter.png b/...o-programming/disable-network-adapter.png → ...oubleshooting/disable-network-adapter.png
diff --git a/...rogramming/network-and-sharing-center.png → ...leshooting/network-and-sharing-center.png b/...rogramming/network-and-sharing-center.png → ...leshooting/network-and-sharing-center.png
diff --git a/...es/radio-programming/network-internet.png → ...orio-troubleshooting/network-internet.png b/...es/radio-programming/network-internet.png → ...orio-troubleshooting/network-internet.png
diff --git a/.../radio-programming/open-control-panel.png → ...io-troubleshooting/open-control-panel.png b/.../radio-programming/open-control-panel.png → ...io-troubleshooting/open-control-panel.png
diff --git a/...o-programming/settings-change-adapter.png → ...oubleshooting/settings-change-adapter.png b/...o-programming/settings-change-adapter.png → ...oubleshooting/settings-change-adapter.png
diff --git a/...programming/settings-network-internet.png → ...bleshooting/settings-network-internet.png b/...programming/settings-network-internet.png → ...bleshooting/settings-network-internet.png
diff --git a/...es/radio-programming/start-menu-win10.png → ...orio-troubleshooting/start-menu-win10.png b/...es/radio-programming/start-menu-win10.png → ...orio-troubleshooting/start-menu-win10.png
diff --git a/source/docs/networking/networking-introduction/roborio-network-troubleshooting.rst b/source/docs/networking/networking-introduction/roborio-network-troubleshooting.rst
@@ -1,13 +1,40 @@
 roboRIO Network Troubleshooting
 ===============================
 
-The roboRIO and the 2015 FRC tools use dynamic IP addresses (DHCP) for network connectivity. This article describes steps for troubleshooting networking connectivity between your PC and your roboRIO
+The roboRIO and FRC tools use dynamic IP addresses (DHCP) for network connectivity. This article describes steps for troubleshooting networking connectivity between your PC and your roboRIO
 
-Ping roboRIO
-------------
+Ping the roboRIO using mDNS
+---------------------------
 
 The first step to identifying roboRIO networking issues is to isolate if it is an application issue or a general network issue. To do this, click **Start -> type cmd -> press Enter** to open the command prompt. Type ``ping roboRIO-####-FRC.local`` where #### is your team number (with no leading zeroes) and press enter. If the ping succeeds, the issue is likely with the specific application, verify your team number configuration in the application, and check your firewall configuration.
 
+Ping the roboRIO IP Address
+---------------------------
+
+If there is no response, try pinging ``10.TE.AM.2`` (:ref:`TE.AM IP Notation <docs/networking/networking-introduction/ip-configurations:TE.AM IP Notation>`) using the command prompt as described above. If this works, you have an issue resolving the mDNS address on your PC. The two most common causes are not having an mDNS resolver installed on the system and a DNS server on the network that is trying to resolve the .local address using regular DNS.
+
+- Verify that you have an mDNS resolver installed on your system. On Windows, this is typically fulfilled by the NI FRC Game Tools. For more information on mDNS resolvers, see the :ref:`roboRIO Networking article <docs/software/roborio-info/roborio-web-dashboard:roboRIO Web Dashboard>`.
+- Disconnect your computer from any other networks and make sure you have the OM5P-AN configured as an access point, using the :ref:`FRC Radio Configuration Utility <docs/zero-to-robot/step-3/radio-programming:Programming your Radio>`. Removing any other routers from the system will help verify that there is not a DNS server causing the issue.
+
+Ping Fails
+----------
+
+.. tabs::
+
+   .. group-tab:: Windows 10
+
+      .. image:: images/roborio-troubleshooting/win10-dhcp.png
+         :alt: Windows 10 image of the adapter setting
+
+      If pinging the IP address directly fails, you may have an issue with the network configuration of the PC. The PC should be configured to **Automatic**. To check this, click :guilabel:`Start` -> :guilabel:`Settings` -> :guilabel:`Network & Internet`. Depending on your network, select :guilabel:`Wifi` or :guilabel:`Ethernet`. Then click on your connected network. Scroll down to **IP settings** and click :guilabel:`Edit` and ensure the :guilabel:`Automatic (DHCP)` option is selected.
+
+   .. group-tab:: Windows 7
+
+      .. image:: images/roborio-troubleshooting/control-panel-dhcp.png
+         :alt: Windows 7 image of the adapter setting
+
+      If pinging the IP address directly fails, you may have an issue with the network configuration of the PC. The PC should be configured to **Obtain an Address Automatically** (also known as DHCP). To check this, click :guilabel:`Start` -> :guilabel:`Control Panel` -> :guilabel:`Network Connections` -> :guilabel:`Change adapter settings`, then right click on the appropriate interface (usually Local Area Connection for Ethernet or Wireless Network Connection for wireless) and select :guilabel:`Properties`. Click :guilabel:`Internet Protocol Version 4`, then click :guilabel:`Properties`. Make sure both radio buttons are set to :guilabel:`Obtain automatically`.
+
 USB Connection Troubleshooting
 ------------------------------
 
@@ -16,7 +43,7 @@ If you are attempting to troubleshoot the USB connection, try pinging the roboRI
 If this ping succeeds, but the .local ping fails, it is likely that either the roboRIO hostname is configured incorrectly, or you are connected to a DNS server which is attempting to resolve the .local address.
 
 - Verify that your roboRIO has been :ref:`imaged for your team number <docs/zero-to-robot/step-3/imaging-your-roborio:Imaging your roboRIO>`. This sets the hostname used by mDNS.
-- Disconnect your computer from all other networks including Ethernet and WiFi. It is possible that one of these networks contains a DNS server that is attempting to resolve the .local address.
+- :ref:`Disable all other network adapters <docs/networking/networking-introduction/roborio-network-troubleshooting:Disabling Network Adapters>`
 
 Ethernet Connection
 -------------------
@@ -25,37 +52,50 @@ Ethernet Connection
 
 If you are troubleshooting an Ethernet connection, it may be helpful to first make sure that you can connect to the roboRIO using the USB connection. Using the USB connection, open the :ref:`roboRIO webdashboard <docs/software/roborio-info/roborio-web-dashboard:roboRIO Web Dashboard>` and verify that the roboRIO has an IP address on the ethernet interface. If you are tethering to the roboRIO directly this should be a self-assigned ``169.*.*.*`` address, if you are connected to the OM5P-AN radio, it should be an address of the form ``10.TE.AM.XX`` where TEAM is your four digit FRC team number. If the only IP address here is the USB address, verify the physical roboRIO ethernet connection.
 
-Ping the roboRIO IP address
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Disabling Network Adapters
+--------------------------
 
-If there is an IP address in the step above, try pinging this IP address using the command prompt as described above. If this works, you have an issue resolving the mDNS address on your PC. The two most common causes are not having an mDNS resolver installed on the system and a DNS server on the network that is trying to resolve the .local address using regular DNS.
-
-- Verify that you have an mDNS resolver installed on your system. On Windows, this is typically fulfilled by the NI FRC Game Tools. For more information on mDNS resolvers, see the :doc:`roboRIO Networking article <networking-basics>`.
-- Disconnect your computer from any other networks and make sure you have the OM5P-AN configured as an access point, using the :ref:`FRC Radio Configuration Utility <docs/zero-to-robot/step-3/radio-programming:Programming your Radio>`. Removing any other routers from the system will help verify that there is not a DNS server causing the issue.
-
-Ping fails
-^^^^^^^^^^
+This is not always the same as turning the adapters off with a physical button or putting the PC into airplane mode. The following steps provide more detail on how to disable adapters.
 
 .. tabs::
 
    .. group-tab:: Windows 10
 
-      .. image:: images/roborio-troubleshooting/win10-dhcp.png
-         :alt: Windows 10 image of the adapter setting
+      .. image:: images/roborio-troubleshooting/start-menu-win10.png
 
-      If pinging the IP address directly fails, you may have an issue with the network configuration of the PC. The PC should be configured to **Automatic**. To check this, click :guilabel:`Start` -> :guilabel:`Settings` -> :guilabel:`Network & Internet`. Depending on your network, select :guilabel:`Wifi` or :guilabel:`Ethernet`. Then click on your connected network. Scroll down to **IP settings** and click :guilabel:`Edit` and ensure the :guilabel:`Automatic (DHCP)` option is selected.
+      Open the Settings application by clicking on the settings icon.
+
+      .. image:: images/roborio-troubleshooting/settings-network-internet.png
+
+      Choose the :guilabel:`Network & Internet` category.
+
+      .. image:: images/roborio-troubleshooting/settings-change-adapter.png
+
+      Click on :guilabel:`Change adapter options`.
 
    .. group-tab:: Windows 7
 
-      .. image:: images/roborio-troubleshooting/control-panel-dhcp.png
-         :alt: Windows 7 image of the adapter setting
+      .. image:: images/roborio-troubleshooting/open-control-panel.png
 
-      If pinging the IP address directly fails, you may have an issue with the network configuration of the PC. The PC should be configured to **Obtain an Address Automatically** (also known as DHCP). To check this, click :guilabel:`Start` -> :guilabel:`Control Panel` -> :guilabel:`Network Connections` -> :guilabel:`Change adapter settings`, then right click on the appropriate interface (usually Local Area Connection for Ethernet or Wireless Network Connection for wireless) and select :guilabel:`Properties`. Click :guilabel:`Internet Protocol Version 4`, then click :guilabel:`Properties`. Make sure both radio buttons are set to :guilabel:`Obtain automatically`.
+      Open the Control Panel by going to :guilabel:`Start` -> :guilabel:`Control Panel`
 
-Other things to check
----------------------
+      .. image:: images/roborio-troubleshooting/network-internet.png
 
-Other possibilities that may cause issues include:
+      Choose the :guilabel:`Network and Internet` category.
 
-- Proxies. Having a proxy enabled may cause issues with the roboRIO networking.
+      .. image:: images/roborio-troubleshooting/network-and-sharing-center.png
+
+      Click :guilabel:`Network and Sharing Center`
+
+.. image:: images/roborio-troubleshooting/adapter-settings.png
 
+On the left pane, click :guilabel:`Change Adapter Settings`.
+
+.. image:: images/roborio-troubleshooting/disable-network-adapter.png
+
+For each adapter other than the one connected to the radio, right click on the adapter and select :guilabel:`Disable` from the menu.
+
+Proxies
+-------
+
+- Proxies. Having a proxy enabled may cause issues with the roboRIO networking.
diff --git a/source/docs/zero-to-robot/step-3/imaging-your-roborio.rst b/source/docs/zero-to-robot/step-3/imaging-your-roborio.rst
@@ -93,7 +93,8 @@ If you are unable to image your roboRIO, troubleshooting steps include:
 
 - Try running the roboRIO Imaging Tool as Administrator by right-clicking on the Desktop icon to launch it.
 - Try accessing the roboRIO webpage with a web-browser at ``http://172.22.11.2/`` and/or verify that the NI network adapter appears in your list of Network Adapters in the Control Panel. If not, try re-installing the NI FRC Game Tools or try a different PC.
+- :ref:`Disable all other network adapters <docs/networking/networking-introduction/roborio-network-troubleshooting:Disabling Network Adapters>`
 - Make sure your firewall is turned off.
-- Try a different PC
 - Some teams have experienced an issue where imaging fails if the device name of the computer you're using has a dash (``-``) in it. Try renaming the computer (or using a different PC).
 - Try booting the roboRIO into Safe Mode by pressing and holding the reset button for at least 5 seconds.
+- Try a different PC
diff --git a/source/docs/zero-to-robot/step-3/radio-programming.rst b/source/docs/zero-to-robot/step-3/radio-programming.rst
@@ -5,8 +5,8 @@ This guide will show you how to use the FRC Radio Configuration Utility software
 
 Before you begin using the software:
 
-1. Disable WiFi connections on your computer, as it may prevent the configuration utility from properly communicating with the bridge
-2. Make sure no devices are connected to your computer via ethernet, other than the wireless bridge.
+1. :ref:`Disable all other network adapters <docs/networking/networking-introduction/roborio-network-troubleshooting:Disabling Network Adapters>`
+2. Plug directly from your computer into the wireless bridge and make sure no other devices are connected to your computer via ethernet.
 
 .. warning:: The OM5P-AN and AC use the same power plug as the D-Link DAP1522, however they are 12V radios. Wire the radio to the 12V 2A terminals on the VRM (center-pin positive).
 
@@ -125,7 +125,7 @@ If you need to load the FRC firmware (or reset the radio), you can do so using t
 5. Press the Load Firmware button
 6. When prompted, plug in the radio power. The software should detect the radio, load the firmware and prompt you when complete.
 
-.. warning:: If you see an error about NPF name, try disabling all adapters other than the one being used to program the radio. If only one adapter is found, the tool should attempt to use that one. See the steps in :ref:`Troubleshooting: Disabling Network Adapters <docs/zero-to-robot/step-3/radio-programming:Troubleshooting: Disabling Network Adapters>` for more info.
+.. warning:: If you see an error about NPF name, try disabling all adapters other than the one being used to program the radio. If only one adapter is found, the tool should attempt to use that one. See the steps in :ref:`Disabling Network Adapters <docs/networking/networking-introduction/roborio-network-troubleshooting:Disabling Network Adapters>` for more info.
 
    Teams may also see this error with foreign language Operating Systems. If you experience issues loading firmware or programming on a foreign language OS, try using an English OS, such as on the KOP provided PC or setting the Locale setting to "en_us" as described on `this page <https://www.java.com/en/download/help/locale.xml>`_.
 
@@ -187,45 +187,9 @@ Configuration Errors
 
 If an error occurs during the configuration process, follow the instructions in the error message to correct the problem.
 
-Troubleshooting: Disabling Network Adapters
--------------------------------------------
+Troubleshooting
+---------------
 
-If you get an error message about "NPF adapter" when attempting to load firmware, you need to disable all other adapters. This is not always the same as turning the adapters off with a physical button or putting the PC into airplane mode. The following steps provide more detail on how to disable adapters.
-
-.. tabs::
-
-   .. group-tab:: Windows 10
-
-      .. image:: images/radio-programming/start-menu-win10.png
-
-      Open the Settings application by clicking on the settings icon.
-
-      .. image:: images/radio-programming/settings-network-internet.png
-
-      Choose the :guilabel:`Network & Internet` category.
-
-      .. image:: images/radio-programming/settings-change-adapter.png
-
-      Click on :guilabel:`Change adapter options`.
-
-   .. group-tab:: Windows 7
-
-      .. image:: images/radio-programming/open-control-panel.png
-
-      Open the Control Panel by going to :guilabel:`Start` -> :guilabel:`Control Panel`
-
-      .. image:: images/radio-programming/network-internet.png
-
-      Choose the :guilabel:`Network and Internet` category.
-
-      .. image:: images/radio-programming/network-and-sharing-center.png
-
-      Click :guilabel:`Network and Sharing Center`
-
-.. image:: images/radio-programming/adapter-settings.png
-
-On the left pane, click :guilabel:`Change Adapter Settings`.
-
-.. image:: images/radio-programming/disable-network-adapter.png
-
-For each adapter other than the one connected to the radio, right click on the adapter and select :guilabel:`Disable` from the menu.
+- :ref:`Disable all other network adapters <docs/networking/networking-introduction/roborio-network-troubleshooting:Disabling Network Adapters>`
+- Make sure you wait long enough the power light has stayed solid for 10 seconds.
+- Make sure you have the correct network interface.