Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r173e4fbf9bd750bccb2e758eb1c7ef36ed8db5a0 -r647f8950c1a9f936e16a7b51e36f582c3d03a40e
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 173e4fbf9bd750bccb2e758eb1c7ef36ed8db5a0)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 647f8950c1a9f936e16a7b51e36f582c3d03a40e)
@@ -41,7 +41,7 @@
 
 #define PUMP_RUN_SELF_TEST_TIME_MS                          ( 15 * MS_PER_SECOND )                  ///< Self-test time to run pumps in ms.
 #define PUMP_SELF_TEST_FLOW_RATE_ML_MIN                     100                                     ///< Self-test pump flow rate in mL/min.
-#define SYRINGE_PUMP_OCCLUSION_CHECK_DELAY                  ( 3 * MS_PER_SECOND )                   ///< Delay 3 seconds then check for syringe pump prime occlusion.
+#define SYRINGE_PUMP_OCCLUSION_CHECK_DELAY                  ( 1 * MS_PER_SECOND )                   ///< Delay 3 seconds then check for syringe pump prime occlusion.
 
 #define BLOOD_PUMP_RUN_TIME_PRESSURE_SELF_TEST              ( 5 * MS_PER_SECOND )                   ///< Pressure self-test time to run blood pump in ms.
 #define NORMALIZED_PRESSURE_SELF_TEST_TIME                  ( 4 * MS_PER_SECOND )                   ///< Time to wait for pressure to normalize in ms.
@@ -70,6 +70,9 @@
 
 #define SELF_TEST_TIME_DATA_PUB_INTERVAL                    ( MS_PER_SECOND )                       ///< Interval (ms/task time) at which self-test time data is published on the CAN bus.
 
+#define NORMAL_PRESSURE_LOWER_BOUNDARY                      -10.0F                                  ///< Lower boundary (mmHg) for pressure check before dry self tests
+#define NORMAL_PRESSURE_UPPER_BOUNDARY                      10.0F                                   ///< Upper boundary (mmHg) for pressure check before dry self tests
+
 /// Multiplier to conver flow (mL/min) into volume (mL) for period of general task interval.
 static const F32 SELF_TEST_FLOW_INTEGRATOR = ( ( 1.0F * TASK_GENERAL_INTERVAL ) / ( SEC_PER_MIN * MS_PER_SECOND ) );
 
@@ -326,7 +329,7 @@
         }
         else
         {
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
+//            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
         }
     }
 }
@@ -878,16 +881,19 @@
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE;
     BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
 
+
+    SEND_EVENT_WITH_2_U32_DATA(HD_EVENT_DRY_SELF_TEST_CARTRIDGE_RESULT,(U32)ADVBubbleStatus,(U32)BUBBLE_DETECTED)
+
     if ( ( BUBBLE_DETECTED == ADVBubbleStatus ) &&
          ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) &&
          ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) )
     {
         state = DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE;
     }
-    else
-    {
-        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
-    }
+//    else
+//    {
+//        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
+//    }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {
@@ -915,11 +921,23 @@
         state = DRY_SELF_TESTS_STOPPED_STATE;
         setupForSelfTestsStop();
     }
+
     else
     { // TODO - wait 1 sec before taking pressure readings and beginning pressure check
         previousNormalArterialPressure = getFilteredArterialPressure();
         previousNormalVenousPressure = getFilteredVenousPressure();
 
+        // Check to see if sensor is within normal ranges before we execute pressure sensor tests
+        if ( previousNormalArterialPressure <= NORMAL_PRESSURE_LOWER_BOUNDARY || previousNormalArterialPressure >= NORMAL_PRESSURE_UPPER_BOUNDARY )
+        {
+            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, previousNormalArterialPressure );
+        }
+
+        if ( previousNormalVenousPressure <= NORMAL_PRESSURE_LOWER_BOUNDARY || previousNormalVenousPressure >= NORMAL_PRESSURE_UPPER_BOUNDARY )
+        {
+            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, previousNormalVenousPressure );
+        }
+
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
         setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
         setValvePosition( VBA, VALVE_POSITION_B_OPEN );
@@ -948,7 +966,7 @@
 
     // End the test when reaching target pressure or time out
     if ( ( TRUE == didTimeout( pressureSelfTestBloodPumpRunStartTime, BLOOD_PUMP_RUN_TIME_PRESSURE_SELF_TEST ) ) ||
-         ( ARTERIAL_PRESSURE_SELF_TEST_LOW_LIMIT_MMHG >= arterialPressure ) || ( VENOUS_PRESSURE_SELF_TEST_HIGH_LIMIT_MMHG <= venousPressure ) )
+       ( ( ARTERIAL_PRESSURE_SELF_TEST_LOW_LIMIT_MMHG >= arterialPressure ) && ( VENOUS_PRESSURE_SELF_TEST_HIGH_LIMIT_MMHG <= venousPressure ) ) )
     {
         signalBloodPumpHardStop();
         // Test pass when reading positive arterial pressure and negative venous pressure
@@ -1030,8 +1048,8 @@
             {
                 if ( TRUE == isSyringePumpPrimed() )
                 {
+                    syringeOcclusionDelayStartTime = getMSTimerCount();   // Get the current time to check for occlusion after 1 second has elapsed
                     state = DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE;
-                    syringeOcclusionDelayStartTime = getMSTimerCount();   // Get the current time to check for occlusion after 3 seconds has elapsed
                 }
                 else
                 {
@@ -1425,6 +1443,9 @@
         }
 #endif
 
+        SEND_EVENT_WITH_2_F32_DATA( HD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT, resOneDiffAfterDisplacement,resOneDiffAfterDisplacement )
+        SEND_EVENT_WITH_2_F32_DATA( HD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT, integratedVolumeDiff,WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE )
+
         if ( ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement ) <= WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G ) &&
              ( ( integratedVolumeDiff <= integrateVolumeToleranceG ) ||
                ( integratedVolumeToTargetPercent <= WET_SELF_TEST_INTEGRATED_VOLUME_PCT_TOLERANCE ) ) )
@@ -1560,6 +1581,10 @@
             integrateVolumeToleranceG = 50.0F;
         }
 #endif
+
+        SEND_EVENT_WITH_2_F32_DATA( HD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT, resOneDiffAfterDisplacement, resOneDiffAfterDisplacement )
+        SEND_EVENT_WITH_2_F32_DATA( HD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT, integratedVolumeToTargetPercent, WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE )
+
         if ( ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement ) <= WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G ) &&
              ( ( integratedVolumeDiff <= integrateVolumeToleranceG ) ||
                ( integratedVolumeToTargetPercent <= WET_SELF_TEST_INTEGRATED_VOLUME_PCT_TOLERANCE ) ) )