Index: firmware/App/Controllers/BPModule.c
===================================================================
diff -u -r9b73ea7e6bae0b28591b132cd832c6a41633fc81 -r4f7855d894ddf2b62e7225050b5137d01862dd4b
--- firmware/App/Controllers/BPModule.c	(.../BPModule.c)	(revision 9b73ea7e6bae0b28591b132cd832c6a41633fc81)
+++ firmware/App/Controllers/BPModule.c	(.../BPModule.c)	(revision 4f7855d894ddf2b62e7225050b5137d01862dd4b)
@@ -202,9 +202,9 @@
  * @brief
  * The handleBPModuleIdleState function executes the BP module idle
  * state handling.
- * @details \b Inputs: requestAdultBPReading, requestPedsBPReading,
+ * @details \b Inputs: none
+ * @details \b Outputs: requestAdultBPReading, requestPedsBPReading,
  * requestAbortBPReading
- * @details \b Outputs: none
  * @return next BP module state
  ***************************************************************************/
 static BP_MODULE_STATE_T handleBPModuleIdleState( void )
Index: firmware/App/Drivers/BPDriver.c
===================================================================
diff -u -rdb1a5faaa7de9f8be163e2d5f5edae5e49f74f1e -r4f7855d894ddf2b62e7225050b5137d01862dd4b
--- firmware/App/Drivers/BPDriver.c	(.../BPDriver.c)	(revision db1a5faaa7de9f8be163e2d5f5edae5e49f74f1e)
+++ firmware/App/Drivers/BPDriver.c	(.../BPDriver.c)	(revision 4f7855d894ddf2b62e7225050b5137d01862dd4b)
@@ -163,9 +163,9 @@
 * @brief
 * The handleBPDriverIdleState function executes the BP driver idle
 * state handling.
-* @details \b Inputs: requestAdultBPMeasurement, requestPedsBPMeasurement,
+* @details \b Inputs: none
+* @details \b Outputs: requestAdultBPMeasurement, requestPedsBPMeasurement,
 * requestAbortBPMeasurement
-* @details \b Outputs: requestAdultBPMeasurement
 * @return next BP module state
 ***************************************************************************/
 static BP_DRIVER_STATE_T handleBPDriverIdleState( void )
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r006dbf3a7b5e1d4c5c811c6647dd4185205aa4c5 -r4f7855d894ddf2b62e7225050b5137d01862dd4b
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 006dbf3a7b5e1d4c5c811c6647dd4185205aa4c5)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 4f7855d894ddf2b62e7225050b5137d01862dd4b)
@@ -153,8 +153,6 @@
             break;
     }
 
-    execBPModule();
-
     return (U32)currentPreTreatmentState;
 }
 
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r82e0b3947c200cddb401f2eeb22db4a4711d174d -r4f7855d894ddf2b62e7225050b5137d01862dd4b
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 82e0b3947c200cddb401f2eeb22db4a4711d174d)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 4f7855d894ddf2b62e7225050b5137d01862dd4b)
@@ -182,7 +182,6 @@
     {
         // Initialize treatment mode each time we transition to it
         initTreatmentMode();
-        initBPModule();
         // Initialize treatment sub-modes each time we transition to treatment mode
         initBloodPrime();
         initDialysis();
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r006dbf3a7b5e1d4c5c811c6647dd4185205aa4c5 -r4f7855d894ddf2b62e7225050b5137d01862dd4b
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 006dbf3a7b5e1d4c5c811c6647dd4185205aa4c5)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 4f7855d894ddf2b62e7225050b5137d01862dd4b)
@@ -196,7 +196,7 @@
     SW_FAULT_ID_MODE_POST_TREATMENT_INVALID_STATE1 = 165,
     SW_FAULT_ID_MODE_POST_TX_AUTO_EJECT_INVALID_STATE = 166,
     SW_FAULT_ID_INVALID_FLUID_BOLUS_STATE = 167,
-    SW_FAULT_ID_PRE_TX_RECIRC_INVALID_STATE = 168
+    SW_FAULT_ID_PRE_TX_RECIRC_INVALID_STATE = 168,
     SW_FAULT_ID_INVALID_MESSAGE_PAYLOAD_LENGTH = 169,
     SW_FAULT_ID_TD_BP_DRIVER_STATE = 170,
     SW_FAULT_ID_TD_BP_MODULE_STATE = 171,
Index: firmware/App/Services/AlarmMgmtTD.c
===================================================================
diff -u -rdb1a5faaa7de9f8be163e2d5f5edae5e49f74f1e -r4f7855d894ddf2b62e7225050b5137d01862dd4b
--- firmware/App/Services/AlarmMgmtTD.c	(.../AlarmMgmtTD.c)	(revision db1a5faaa7de9f8be163e2d5f5edae5e49f74f1e)
+++ firmware/App/Services/AlarmMgmtTD.c	(.../AlarmMgmtTD.c)	(revision 4f7855d894ddf2b62e7225050b5137d01862dd4b)
@@ -240,7 +240,7 @@
             // If alarm is a fault (and not in service mode), request transition to fault mode
             if ( ( TRUE == props.alarmIsFault ) && ( getCurrentOperationMode() != MODE_SERV ) )
             {
-                //requestNewOperationMode( MODE_FAUL );
+                requestNewOperationMode( MODE_FAUL );
             }
 
             // If alarm has stop property, signal stop now
Index: firmware/App/Services/FpgaTD.c
===================================================================
diff -u -r80a7440462a8f87ee11ed62371baba2d87bb6d89 -r4f7855d894ddf2b62e7225050b5137d01862dd4b
--- firmware/App/Services/FpgaTD.c	(.../FpgaTD.c)	(revision 80a7440462a8f87ee11ed62371baba2d87bb6d89)
+++ firmware/App/Services/FpgaTD.c	(.../FpgaTD.c)	(revision 4f7855d894ddf2b62e7225050b5137d01862dd4b)
@@ -1604,8 +1604,8 @@
 /********************************************************************//**
  * @brief
  * The getNIBPControlStatus function returns the FPGA NIBP control status.
- * @details \b Inputs: fpgaSensorReadings
- * @details \b Outputs: none
+ * @details \b Inputs: none
+ * @details \b Outputs: fpgaSensorReadings
  * @return FPGA NIBP control status register.
  ***************************************************************************/
 U08 getNIBPControlStatus( void )
@@ -1616,8 +1616,8 @@
 /*********************************************************************//**
  * @brief
  * The getNIBPStatusResponse function returns the FPGA NIBP response status.
- * @details \b Inputs: fpgaSensorReadings
- * @details \b Outputs: none
+ * @details \b Inputs: none
+ * @details \b Outputs: fpgaSensorReadings
  * @return FPGA NIBP response status register.
  ***************************************************************************/
 U08 getNIBPStatusResponse( void )
@@ -1628,8 +1628,8 @@
 /*********************************************************************//**
 * @brief
 * The getNIBPCuffPressure function returns the FPGA NIBP cuff pressure.
-* @details \b Inputs: fpgaSensorReadings
-* @details \b Outputs: none
+* @details \b Inputs: none
+* @details \b Outputs: fpgaSensorReadings
 * @return NIBP cuff pressure in mmHg.
 *************************************************************************/
 S16 getNIBPCuffPressure( void )
@@ -1641,8 +1641,8 @@
 * @brief
 * The getNIBPSystolicPressure function returns the FPGA systolic blood
 * pressure measurement.
-* @details \b Inputs: fpgaSensorReadings
-* @details \b Outputs: none
+* @details \b Inputs: none
+* @details \b Outputs: fpgaSensorReadings
 * @return Systolic blood pressure in mmHg.
 *************************************************************************/
 U16 getNIBPSystolicPressure( void )
@@ -1654,8 +1654,8 @@
 * @brief
 * The getNIBPDiastolicPressure function returns the FPGA diastolic blood
 * pressure measurement.
-* @details \b Inputs: fpgaSensorReadings
-* @details \b Outputs: none
+* @details \b Inputs: none
+* @details \b Outputs: fpgaSensorReadings
 * @return Diastolic blood pressure in mmHg.
 *************************************************************************/
 U16 getNIBPDiastolicPressure( void )
@@ -1666,8 +1666,8 @@
 /*********************************************************************//**
 * @brief
 * The getNIBPHeartRate function returns the FPGA heart rate measurement.
-* @details \b Inputs: fpgaSensorReadings
-* @details \b Outputs: none
+* @details \b Inputs: none
+* @details \b Outputs: fpgaSensorReadings
 * @return Heart rate in BPM.
 *************************************************************************/
 U16 getNIBPHeartRate( void )
Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r82e0b3947c200cddb401f2eeb22db4a4711d174d -r4f7855d894ddf2b62e7225050b5137d01862dd4b
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 82e0b3947c200cddb401f2eeb22db4a4711d174d)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 4f7855d894ddf2b62e7225050b5137d01862dd4b)
@@ -18,6 +18,7 @@
 #include "AirPump.h"
 #include "AirTrap.h"
 #include "BloodFlow.h"
+#include "BPModule.h"
 #include "Ejector.h"
 #include "Messaging.h"
 #include "OperationModes.h"
@@ -107,6 +108,9 @@
         // Control air trap valve
         execAirTrapController();
 
+        // Control blood pressure vitals
+        execBPModule();
+
         // Control pinch valves
         execValvesController();
 
@@ -131,8 +135,6 @@
         // Manage data to be transmitted to other sub-systems
         execSystemCommTx();
 
-        // Montior blood pressure vitals
-        execBPModule();
     }
 
 #ifdef TASK_TIMING_OUTPUT_ENABLED
Index: firmware/source/sys_main.c
===================================================================
diff -u -r82e0b3947c200cddb401f2eeb22db4a4711d174d -r4f7855d894ddf2b62e7225050b5137d01862dd4b
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 82e0b3947c200cddb401f2eeb22db4a4711d174d)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 4f7855d894ddf2b62e7225050b5137d01862dd4b)
@@ -65,6 +65,7 @@
 #include "AirPump.h"
 #include "AirTrap.h"
 #include "BloodFlow.h"
+#include "BPModule.h"
 #include "Bubbles.h"
 #include "Buttons.h"
 #include "CpldInterface.h"
@@ -203,13 +204,12 @@
     initAirPump();
     initAirTrap();
     initBloodFlow();
+    initBPModule();
     initEjector();
     initSyringePump();
     initValves();
     // Initialize modes
     initOperationModes();
-    // Initialize blood pressure vitals
-    initBPModule();
 }
 
 /*************************************************************************