Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r9eae2f683887bededd2240f51ddfc667d8c1d566 -r1fb618b05154994c6cb051be04d4abfb2277fbdb
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 9eae2f683887bededd2240f51ddfc667d8c1d566)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 1fb618b05154994c6cb051be04d4abfb2277fbdb)
@@ -158,8 +158,13 @@
     SW_FAULT_ID_INVALID_TEMPERATURE_SENSOR_SELECTED3 = 127,
     SW_FAULT_ID_DIALYSATE_MIX_EXEC_INVALID_STATE = 128,
     SW_FAULT_ID_MODE_UPDATE_INVALID_STATE = 129,
-    SW_FAULT_ID_SUBSTITUTION_PUMP_INVALID_ID = 130,
-    SW_FAULT_ID_SUBSTITUTION_PUMP_EXEC_INVALID_STATE = 131,
+    SW_FAULT_ID_PID_CTRL_INVALID_CONTROLLER1 = 130,
+    SW_FAULT_ID_PID_CTRL_INVALID_CONTROLLER2 = 131,
+    SW_FAULT_ID_PID_CTRL_INVALID_CONTROLLER3 = 132,
+    SW_FAULT_ID_PID_CTRL_INVALID_CONTROLLER4 = 133,
+    SW_FAULT_ID_PID_CTRL_INVALID_SIGNAL = 134,
+    SW_FAULT_ID_SUBSTITUTION_PUMP_INVALID_ID = 135,
+    SW_FAULT_ID_SUBSTITUTION_PUMP_EXEC_INVALID_STATE = 136,
     NUM_OF_SW_FAULT_IDS
 } DD_SW_FAULT_ID_T;
 
@@ -292,6 +297,8 @@
     FP_FAULT_ID_FP_INVALID_PERMEATE_TANK_STATE = 123,
     FP_FAULT_ID_FP_INVALID_INLET_PRESSURE_CHECK_STATE = 124,
     FP_FAULT_ID_FP_INVALID_RECOVERY_VALVE_STATE = 125,
+    FP_FAULT_ID_INVALID_FLUID_PUMP_ID5 = 126,
+    FP_FAULT_ID_INVALID_FLUID_PUMP_ID6 = 127,
     NUM_OF_FP_FAULT_IDS
 } FP_SW_FAULT_ID_T;
 
Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -r9eae2f683887bededd2240f51ddfc667d8c1d566 -r1fb618b05154994c6cb051be04d4abfb2277fbdb
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 9eae2f683887bededd2240f51ddfc667d8c1d566)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 1fb618b05154994c6cb051be04d4abfb2277fbdb)
@@ -251,7 +251,7 @@
     U16 temperatureP13;                         ///< Reg 674.  P13 temperature data.
     S16 pressureP17;                            ///< Reg 676.  P17 pressure data.
     U16 temperatureP17;                         ///< Reg 678.  P17 temperature data.
-    U16 p40PumpTachCount;                       ///< Reg 680.  P40 pump tachometer counter.
+    U16 p40PumpRPMCounts;                       ///< Reg 680.  P40 pump tachometer counter.
     U08 p25LevelSwitch;                         ///< Reg 682.  P25 level switch.
     U08 reserved4;                              ///< Reg 683.  Reserved.
     U32 conductivityP9Data;                     ///< Reg 684.  P9 conductivity sensor data.
@@ -371,7 +371,7 @@
     U16 temperatureP13;                         ///< Reg 634.  P13 temperature data.
     S16 pressureP17;                            ///< Reg 636.  P17 pressure data.
     U16 temperatureP17;                         ///< Reg 638.  P17 temperature data.
-    U16 p40PumpTachCount;                       ///< Reg 640.  P40 pump tachometer counter.
+    U16 p40PumpRPMCounts;                       ///< Reg 640.  P40 pump rpm counter.
     U08 p25LevelSwitch;                         ///< Reg 642.  P25 level switch.
     U08 fpgaGPIOStatus;                         ///< Reg 643.  GPIO Status
     U16 flowRateP7;                             ///< Reg 644.  P7 flow sensor rate.
@@ -3799,15 +3799,15 @@
 
 /*********************************************************************//**
  * @brief
- * The getFPGAP12PumpTachCount function gets the running 16-bit tachometer count
+ * The getFPGAP40PumpRPMCount function gets the running 16-bit rpm count
  * from the P40 pump hall sensor.
- * @details \b Inputs: p40PumpTachCount
+ * @details \b Inputs: p40PumpRPMCounts
  * @details \b Outputs: none
- * @return P40 pump tachometer count
+ * @return P40 pump rpm count
  *************************************************************************/
-U16 getFPGAP40PumpTachCount( void )
+U16 getFPGAP40PumpRPMCount( void )
 {
-    return GET_FPGA_SENSOR_FIELD( p40PumpTachCount );
+    return GET_FPGA_SENSOR_FIELD( p40PumpRPMCounts );
 }
 
 /*********************************************************************//**
Index: firmware/App/Services/FpgaDD.h
===================================================================
diff -u -r9eae2f683887bededd2240f51ddfc667d8c1d566 -r1fb618b05154994c6cb051be04d4abfb2277fbdb
--- firmware/App/Services/FpgaDD.h	(.../FpgaDD.h)	(revision 9eae2f683887bededd2240f51ddfc667d8c1d566)
+++ firmware/App/Services/FpgaDD.h	(.../FpgaDD.h)	(revision 1fb618b05154994c6cb051be04d4abfb2277fbdb)
@@ -321,7 +321,7 @@
 void setFPGAP40PumpEnable( BOOL enable );
 void setFPGAP40PumpPWM( U16 pwm );
 U16  getFPGAP40PumpPWM( void );
-U16  getFPGAP40PumpTachCount( void );
+U16  getFPGAP40PumpRPMCount( void );
 
 /**@}*/