Index: firmware/App/Services/FpgaRO.c
===================================================================
diff -u -rc9aa3971be05f25a7b0d7124e57cc60617c90ad7 -rd4d21b42ee8bd292a6d9f7966fe37abe0271dfda
--- firmware/App/Services/FpgaRO.c	(.../FpgaRO.c)	(revision c9aa3971be05f25a7b0d7124e57cc60617c90ad7)
+++ firmware/App/Services/FpgaRO.c	(.../FpgaRO.c)	(revision d4d21b42ee8bd292a6d9f7966fe37abe0271dfda)
@@ -199,7 +199,7 @@
     if ( FPGA_EXPECTED_ID == fpgaHeader.fpgaId )
     {
         // Check FPGA compatibility w/ firmware
-        if ( TD_FPGA_COMPATIBILITY_REV == fpgaSensorReadings.compatibilityRev )
+        if ( RO_FPGA_COMPATIBILITY_REV == fpgaSensorReadings.compatibilityRev )
         {
             result = SELF_TEST_STATUS_PASSED;
         }
@@ -386,10 +386,7 @@
  *************************************************************************/
 void setROPumpPWMPct( U16 pwm )
 {
-   if ( pwm <= MAX_RO_PUMP_PWM )
-   {
-       fpgaActuatorSetPoints.roPumpPWMDutyCyclePct = pwm;
-   }
+   fpgaActuatorSetPoints.roPumpPWMDutyCyclePct = pwm;
 }
 
 /*********************************************************************//**
@@ -418,106 +415,253 @@
     return fpgaSensorReadings.roPumpTachCount;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPRiRawPressure function gets the PRi pressure reading.
+ * @details \b Inputs: fpgaSensorReadings.pressurePri
+ * @details \b Outputs: none
+ * @return PRi pressure
+ *************************************************************************/
 S16 getFPGAPRiRawPressure( void )
 {
     return fpgaSensorReadings.pressurePri;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPRiRawTemperature function gets the PRi sensor temperature reading.
+ * @details \b Inputs: fpgaSensorReadings.temperaturePri
+ * @details \b Outputs: none
+ * @return PRi sensor temperature
+ *************************************************************************/
 S16 getFPGAPRiRawTemperature( void )
 {
     return fpgaSensorReadings.temperaturePri;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPRiReadCount function gets the PRi sensor read count.
+ * @details \b Inputs: fpgaSensorReadings.readCountPri
+ * @details \b Outputs: none
+ * @return PRi sensor read count
+ *************************************************************************/
 U08 getFPGAPRiReadCount( void )
 {
     return fpgaSensorReadings.readCountPri;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPRiErrorCount function gets the PRi sensor error count.
+ * @details \b Inputs: fpgaSensorReadings.errorCountPri
+ * @details \b Outputs: none
+ * @return PRi sensor error count
+ *************************************************************************/
 U08 getFPGAPRiErrorCount( void )
 {
     return fpgaSensorReadings.errorCountPri;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPRoRawPressure function gets the PRo pressure reading.
+ * @details \b Inputs: fpgaSensorReadings.pressurePro
+ * @details \b Outputs: none
+ * @return PRo pressure
+ *************************************************************************/
 S16 getFPGAPRoRawPressure( void )
 {
-    return fpgaSensorReadings.pressurePri;
+    return fpgaSensorReadings.pressurePro;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPRoRawTemperature function gets the PRo sensor temperature.
+ * @details \b Inputs: fpgaSensorReadings.temperaturePro
+ * @details \b Outputs: none
+ * @return PRo sensor temperature
+ *************************************************************************/
 S16 getFPGAPRoRawTemperature( void )
 {
-    return fpgaSensorReadings.temperaturePri;
+    return fpgaSensorReadings.temperaturePro;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPRoReadCount function gets the PRo sensor read count.
+ * @details \b Inputs: fpgaSensorReadings.readCountPro
+ * @details \b Outputs: none
+ * @return PRo sensor read count
+ *************************************************************************/
 U08 getFPGAPRoReadCount( void )
 {
-    return fpgaSensorReadings.readCountPri;
+    return fpgaSensorReadings.readCountPro;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPRoErrorCount function gets the PRo sensor error count.
+ * @details \b Inputs: fpgaSensorReadings.errorCountPro
+ * @details \b Outputs: none
+ * @return PRo sensor error count
+ *************************************************************************/
 U08 getFPGAPRoErrorCount( void )
 {
-    return fpgaSensorReadings.errorCountPri;
+    return fpgaSensorReadings.errorCountPro;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPC2oRawPressure function gets the PC2o pressure reading.
+ * @details \b Inputs: fpgaSensorReadings.pressurePc2o
+ * @details \b Outputs: none
+ * @return PC2o pressure
+ *************************************************************************/
 S16 getFPGAPC2oRawPressure( void )
 {
-    return fpgaSensorReadings.pressurePri;
+    return fpgaSensorReadings.pressurePc2o;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPC2oRawTemperature function gets the PC2o sensor temperature.
+ * @details \b Inputs: fpgaSensorReadings.temperaturePc2o
+ * @details \b Outputs: none
+ * @return PC2o sensor temperature
+ *************************************************************************/
 S16 getFPGAPC2oRawTemperature( void )
 {
-    return fpgaSensorReadings.temperaturePri;
+    return fpgaSensorReadings.temperaturePc2o;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPC2oReadCount function gets the PC2o sensor read count.
+ * @details \b Inputs: fpgaSensorReadings.readCountPc2o
+ * @details \b Outputs: none
+ * @return PC2o sensor read count
+ *************************************************************************/
 U08 getFPGAPC2oReadCount( void )
 {
-    return fpgaSensorReadings.readCountPri;
+    return fpgaSensorReadings.readCountPc2o;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPC2oErrorCount function gets the PC2o sensor error count.
+ * @details \b Inputs: fpgaSensorReadings.errorCountPc2o
+ * @details \b Outputs: none
+ * @return PC2o sensor error count
+ *************************************************************************/
 U08 getFPGAPC2oErrorCount( void )
 {
-    return fpgaSensorReadings.errorCountPri;
+    return fpgaSensorReadings.errorCountPc2o;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPPoRawPressure function gets the PPo pressure reading.
+ * @details \b Inputs: fpgaSensorReadings.pressurePpo
+ * @details \b Outputs: none
+ * @return PPo pressure
+ *************************************************************************/
 S16 getFPGAPPoRawPressure( void )
 {
-    return fpgaSensorReadings.pressurePri;
+    return fpgaSensorReadings.pressurePpo;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPPoRawTemperature function gets the PPo sensor temperature.
+ * @details \b Inputs: fpgaSensorReadings.temperaturePpo
+ * @details \b Outputs: none
+ * @return PPo sensor temperature
+ *************************************************************************/
 S16 getFPGAPPoRawTemperature( void )
 {
-    return fpgaSensorReadings.temperaturePri;
+    return fpgaSensorReadings.temperaturePpo;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPPoReadCount function gets the PPo sensor read count.
+ * @details \b Inputs: fpgaSensorReadings.readCountPpo
+ * @details \b Outputs: none
+ * @return PPo sensor read count
+ *************************************************************************/
 U08 getFPGAPPoReadCount( void )
 {
-    return fpgaSensorReadings.readCountPri;
+    return fpgaSensorReadings.readCountPpo;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPPoErrorCount function gets the PPo sensor error count.
+ * @details \b Inputs: fpgaSensorReadings.errorCountPpo
+ * @details \b Outputs: none
+ * @return PPo sensor error count
+ *************************************************************************/
 U08 getFPGAPPoErrorCount( void )
 {
-    return fpgaSensorReadings.errorCountPri;
+    return fpgaSensorReadings.errorCountPpo;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPMpRawPressure function gets the PMp pressure reading.
+ * @details \b Inputs: fpgaSensorReadings.pressurePmp
+ * @details \b Outputs: none
+ * @return PMp pressure
+ *************************************************************************/
 S16 getFPGAPMpRawPressure( void )
 {
-    return fpgaSensorReadings.pressurePri;
+    return fpgaSensorReadings.pressurePmp;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPMpRawTemperature function gets the PMp sensor temperature.
+ * @details \b Inputs: fpgaSensorReadings.temperaturePmp
+ * @details \b Outputs: none
+ * @return PMp sensor temperature
+ *************************************************************************/
 S16 getFPGAPMpRawTemperature( void )
 {
-    return fpgaSensorReadings.temperaturePri;
+    return fpgaSensorReadings.temperaturePmp;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPMpReadCount function gets the PMp sensor read count.
+ * @details \b Inputs: fpgaSensorReadings.readCountPmp
+ * @details \b Outputs: none
+ * @return PMp sensor read count
+ *************************************************************************/
 U08 getFPGAPMpReadCount( void )
 {
-    return fpgaSensorReadings.readCountPri;
+    return fpgaSensorReadings.readCountPmp;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAPMpErrorCount function gets the PMp sensor error count.
+ * @details \b Inputs: fpgaSensorReadings.errorCountPmp
+ * @details \b Outputs: none
+ * @return PMp sensor error count
+ *************************************************************************/
 U08 getFPGAPMpErrorCount( void )
 {
-    return fpgaSensorReadings.errorCountPri;
+    return fpgaSensorReadings.errorCountPmp;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAFloaterState function gets the floater level state.
+ * @details \b Inputs: fpgaSensorReadings.levelSwitch
+ * @details \b Outputs: none
+ * @return floater level state
+ *************************************************************************/
 U08 getFPGAFloaterState( void )
 {
     return fpgaSensorReadings.levelSwitch;