Index: firmware/App/Controllers/BPModule.c
===================================================================
diff -u -ra8396c9e402372dd7c6ad9df69d5b5fb500a66bf -r521a6440cea9f66e5c3ad9af1f0b79d30977e774
--- firmware/App/Controllers/BPModule.c	(.../BPModule.c)	(revision a8396c9e402372dd7c6ad9df69d5b5fb500a66bf)
+++ firmware/App/Controllers/BPModule.c	(.../BPModule.c)	(revision 521a6440cea9f66e5c3ad9af1f0b79d30977e774)
@@ -90,29 +90,21 @@
     switch ( bpModuleState )
     {
         case BP_MODULE_IDLE_STATE:
-        {
             bpModuleState = handleBPModuleIdleState();
             break;
-        }
 
         case BP_MODULE_MEASURE_STATE:
-        {
             bpModuleState = handleBPModuleMeasureState();
             break;
-        }
 
         case BP_MODULE_CHECK_STATE:
-        {
             bpModuleState = handleBPModuleCheckState();
             break;
-        }
 
         default:
-        {
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_TD_BP_MODULE_STATE, bpModuleState );
             bpModuleState = BP_MODULE_IDLE_STATE;
             break;
-        }
     }
 }
 
@@ -248,6 +240,7 @@
     else if ( TRUE == hasBPDriverError() )
     {
         nextState = BP_MODULE_IDLE_STATE;
+        activateAlarm( ALARM_ID_TD_BP_MODULE_ERROR );
     }
 
     return nextState;
Index: firmware/App/Drivers/BPDriver.c
===================================================================
diff -u -ra8396c9e402372dd7c6ad9df69d5b5fb500a66bf -r521a6440cea9f66e5c3ad9af1f0b79d30977e774
--- firmware/App/Drivers/BPDriver.c	(.../BPDriver.c)	(revision a8396c9e402372dd7c6ad9df69d5b5fb500a66bf)
+++ firmware/App/Drivers/BPDriver.c	(.../BPDriver.c)	(revision 521a6440cea9f66e5c3ad9af1f0b79d30977e774)
@@ -33,7 +33,6 @@
 #define BP_RESP_CODE_BPDATA              0x07                                       ///< Blood pressure response code indicating BP data is available.
 #define BP_MODULE_BUSY_CLEAR             0
 
-
 /// Blood pressure driver states.
 typedef enum
 {
Index: firmware/App/Services/FpgaTD.c
===================================================================
diff -u -ra8396c9e402372dd7c6ad9df69d5b5fb500a66bf -r521a6440cea9f66e5c3ad9af1f0b79d30977e774
--- firmware/App/Services/FpgaTD.c	(.../FpgaTD.c)	(revision a8396c9e402372dd7c6ad9df69d5b5fb500a66bf)
+++ firmware/App/Services/FpgaTD.c	(.../FpgaTD.c)	(revision 521a6440cea9f66e5c3ad9af1f0b79d30977e774)
@@ -207,7 +207,7 @@
     U08 h10Control;                             ///< Reg 33.  H10 Syringe pump control register.
     U32 h10Speed;                               ///< Reg 34.  H10 Syringe pump time between step toggle (1/2 step period).
     U16 h10DACData;                             ///< Reg 38.  H10 Syringe pump DAC data (12 bits).
-    U16 h10DACControl;                          ///< Reg 40.  H10 Syringe pump ADC and DAC control register.
+    U08 h10DACControl;                          ///< Reg 40.  H10 Syringe pump ADC and DAC control register.
     U16 nibpCtl;                                ///< Reg 41.  NIBP control register.
     U16 nibpInflate;                            ///< Reg 42.  NIBP inflate pressure register.
     U32 h5SetSpeed;                             ///< Reg 44.  H5 ejector motor set speed.
@@ -1343,7 +1343,7 @@
 }
 
 /*********************************************************************//**
-<<<<<<< HEAD
+* @brief
 * The setNIBPCommand function sets the FPGA NIBP command bits and pulses
 * the command ready bit to notify the FPGA that a new NIBP command is
 * available.
@@ -1359,6 +1359,7 @@
 }
 
 /*********************************************************************//**
+* @brief
 * The setNIBPInflatePressure function sets the initial NIBP cuff inflate
 * pressure register.
 * @details \b Inputs: pressure
@@ -1450,6 +1451,7 @@
 }
 
 /*********************************************************************//**
+* @brief
 * The getNIBPCuffPressure function returns the FPGA NIBP cuff pressure.
 * @details \b Inputs: fpgaSensorReadings.cuffPressure
 * @details \b Outputs: none
@@ -1461,6 +1463,7 @@
 }
 
 /*********************************************************************//**
+* @brief
 * The getNIBPSystolicPressure function returns the FPGA systolic blood
 * pressure measurement.
 * @details \b Inputs: fpgaSensorReadings.bpSystolic
@@ -1473,6 +1476,7 @@
 }
 
 /*********************************************************************//**
+* @brief
 * The getNIBPDiastolicPressure function returns the FPGA diastolic blood
 * pressure measurement.
 * @details \b Inputs: fpgaSensorReadings.bpDiastolic
@@ -1485,6 +1489,7 @@
 }
 
 /*********************************************************************//**
+* @brief
 * The getNIBPHeartRate function returns the FPGA heart rate measurement.
 * @details \b Inputs: fpgaSensorReadings.bpHr
 * @details \b Outputs: none
@@ -1496,6 +1501,7 @@
 }
 
 /*********************************************************************//**
+ * @brief
  * The getFPGASyringePumpADCReadCounter function gets the latest syringe pump
  * ADC read counter.  Counter is 8-bit and rolls over when exceeding 255.
  * @details \b Inputs: fpgaSensorReadings