diff --git a/.gitignore b/.gitignore
index 6a2b230273..7992ec4f8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
# Created by https://www.gitignore.io/api/linux,macos,windows,visualstudiocode
# Edit at https://www.gitignore.io/?templates=linux,macos,windows,visualstudiocode
+### Miscellaneous ###
+.wpilib/
+
### Sphinx ###
# Build directories
build/
diff --git a/source/docs/hardware/hardware-safety/index.rst b/source/docs/hardware/hardware-safety/index.rst
new file mode 100644
index 0000000000..b005ab26aa
--- /dev/null
+++ b/source/docs/hardware/hardware-safety/index.rst
@@ -0,0 +1,9 @@
+Hardware Safety
+===============
+
+This section describes some of the safety features built into the NI roboRIO Control System.
+
+.. toctree::
+ :maxdepth: 1
+
+ io_safety
diff --git a/source/docs/hardware/hardware-safety/io_safety.rst b/source/docs/hardware/hardware-safety/io_safety.rst
new file mode 100644
index 0000000000..fca92c6bb9
--- /dev/null
+++ b/source/docs/hardware/hardware-safety/io_safety.rst
@@ -0,0 +1,27 @@
+Input/Output Safety Mechanisms Built into the `FRC` Control System
+============================================================================
+
+roboRIO Control System
+^^^^^^^^^^^^^^^^^^^^^^
+
+There are multiple safety mechanisms on the robot that handle input / output operations while it is powered on.
+
+Robot side: there are multiple hardware and software components involved. Outputs of the RoboRIO (e.g. :term:`PWM` s) are controlled by the :term:`FPGA` hardware. :term:`NetComm` is a software daemon that talks to the DS, the FPGA, and the user program. Inside of the user process \(the team\’s robot program\), there\’s a NetComm :term:`DLL` component that talks to the FPGA, CAN, and the NetComm daemon. And of course there are CAN motor controllers on the CAN bus.
+
+- The FPGA has a system :term:`watchdog`. This watchdog will time out and force a “disable” of PWM motor outputs if NetComm hasn\’t told it it\’s received an enable packet in the last 125 `ms`.
+- The NetComm DLL in the user process will send a disable broadcast message on the CAN network and then stop sending keep-alive CAN messages after the disabled system watchdog signal is read back from the FPGA \(this is checked on a 20 `ms` loop\). REV pneumatics and motor controllers will stop immediately upon receipt of the disable broadcast. They also stop if no keep-alive is received for 100 `ms` \(pneumatics\) or 220 `ms` \(motor controllers\).
+- The PWM disable works by sending a single idle pulse to the motor controller at the start of the next 20 `ms` PWM cycle after the disable condition is set, and following that, stopping output on the PWM signal line.
+- When NetComm receives a control packet from the DS with enable set to true, it will immediately enable motors \(and restart the FPGA watchdog timer\).
+- A count of watchdog expiration events is sent by NetComm to the DS, so this data is in the DS log.
+
+Software Side:
+
+- The DS sends a control packet to the robot every 20 `ms`. This is on a high-priority timed loop. Other loops in the DS, including the joystick and GUI loops, run at lower priority. What this means is that under poor CPU conditions or rendering delays \(e.g. large amounts of console output\), it\’s possible for the DS to have internal delay between disable being clicked, a key being hit, or joystick inputs being read to those changes being reflected in the control packets being sent to the robot.
+- Control \(DS->Robot\) and status \(Robot->DS\) packets have an embedded sequence number. The DS uses these to compute round-trip-time and packet loss. A status packet that\’s returned is marked as “lost” if the RTT is greater than ~250 ms. This does not mean it was actually missing \(no response received\). The DS does keep a separate count of truly missing \(e.g. no response\) packets and disables \(starts sending control packets with enable=false\) after ~10 drops occur \(so I think this works out to ~450 ms, assuming it\’s 250+10*20\).
+- High CPU / GUI delays result in the DS continuing to send packets with enable=true for a period of time until that loop is notified a disable occurs.
+
+Known Issues / Potential Fault Conditions:
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- There is no upper limit to control lag. As long as packets keep arriving, they may be several seconds delayed from the DS, so a disable command from the DS would take the same amount of time to be reflected in robot operation. Once it\’s delayed, all controls, including disable/estop, will be delayed. We\’ve all seen delays increase either slowly or quickly\–the robot was controllable until it\’s suddenly much more laggy, or even been laggy from the start.
+- Packet buffering / wifi retransmits of control packets result in sporadic enable packets making it to the robot after some delay. The watchdog would disable after 125 `ms`, but a single enable packet would re-enable motors for another 125 `ms` at a time.
diff --git a/source/docs/software/frc-glossary.rst b/source/docs/software/frc-glossary.rst
index b5b016fd2c..e810e3af60 100644
--- a/source/docs/software/frc-glossary.rst
+++ b/source/docs/software/frc-glossary.rst
@@ -53,6 +53,9 @@ FRC Glossary
DHCP
Dynamic Host Configuration Protocol, the protocol that allows a central device to assign unique IP addresses to all other devices.
+ DLL
+ An acronym which stands for "Dynamic-Link Library", a shared library or resource used for programs or files within the Microsoft Windows operating system. See `Dynamic-link library ` for more information.
+
encapsulation
A software design pattern which uses a class to hide the implementation details of other classes. See `encapsulation `__ on Wikipedia for more info.
@@ -116,6 +119,9 @@ FRC Glossary
mutable
An object that can be modified after it is created.
+ NetComm
+ A software daemon running on the NI roboRIO controller to maintain communications with the Driver Station, :term:`FPGA`, and user program.
+
permanent-magnet DC motor
The classification of all legal motors for the FIRST robotics competition. This type of motor takes direct current as input, and uses it to create a magnetic field. In turn, this magnetic field interacts with a physical magnet to create a force that turns the output shaft. Electrical ("brushless") or mechanical ("brushed") means are used to ensure the electrically-generated magnetic field always points in a direction that creates forces when it interacts with the physical magnet, even as the motor's shaft rotates. See `permanent-magnet motor `__ on Wikipedia for more info.
@@ -131,6 +137,9 @@ FRC Glossary
pose
The collection of position and rotation information that describes how a rigid body is oriented in space, relative to some fixed reference point.
+ PWM
+ An acronym which stands for "Pulse Width Modulation", a method for motor controllers, sensors, and other components to transmit or receive their operational status. For motor controllers, PWM is often used to affect the power output to the motor or connected actuator. See :ref:`PWM` for more information.
+
RAII
Resource Acquisition Is Initialization; a language behavior (in C++, but not in Java) where holding a resource is tied to object lifetime.
@@ -178,3 +187,9 @@ FRC Glossary
transitory
In :term:`NetworkTables`, a :term:`topic` that will disappear after the last :term:`publisher` stops publishing.
+
+ user program
+ In the context of the roboRIO control system, the primary FRC runtime program that handles all communication and robot operations.
+
+ watchdog
+ A timer mechanism often built into embedded devices or software to monitor the runtime status of a program and reset it if crashes or errors occur. The watchdog will reset the main program if the timer itself is not reset, an activity which occurs during normal operations of the program.
diff --git a/source/docs/software/hardware-apis/motors/pwm-controllers.rst b/source/docs/software/hardware-apis/motors/pwm-controllers.rst
index e156f23dba..3549242895 100644
--- a/source/docs/software/hardware-apis/motors/pwm-controllers.rst
+++ b/source/docs/software/hardware-apis/motors/pwm-controllers.rst
@@ -1,5 +1,7 @@
.. include::
+.. _PWM:
+
PWM Motor Controllers in Depth
==============================
diff --git a/source/index.rst b/source/index.rst
index 4dff0f9525..d537371a21 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -385,6 +385,7 @@ Community translations can be found in a variety of languages in the bottom-left
docs/hardware/hardware-basics/index
docs/hardware/hardware-tutorials/index
+ docs/hardware/hardware-safety/index
docs/hardware/sensors/index
.. toctree::