Index: firmware/App/Monitors/Pressures.c
===================================================================
diff -u -r64f2edc1b7ec8edda7e500b10c09c2a54dc70fc9 -r961784c895cb8f551a2623cd02dcbfe42d04b7c2
--- firmware/App/Monitors/Pressures.c	(.../Pressures.c)	(revision 64f2edc1b7ec8edda7e500b10c09c2a54dc70fc9)
+++ firmware/App/Monitors/Pressures.c	(.../Pressures.c)	(revision 961784c895cb8f551a2623cd02dcbfe42d04b7c2)
@@ -466,6 +466,9 @@
  *************************************************************************/
 void execPressure( void )
 {
+    // Update pressure readings
+    readPressureSensors();
+
     // State machine
     switch ( pressureState )
     {
@@ -498,7 +501,7 @@
 {
     PRESSURE_STATE_T result = PRESSURE_WAIT_FOR_POST_STATE;
 
-    if ( PRESSURE_TEST_STATE_COMPLETE == pressurePostState )
+//    if ( PRESSURE_TEST_STATE_COMPLETE == pressurePostState )  // TODO - restore later
     {
         result = PRESSURE_CONTINUOUS_READ_STATE;
     }
@@ -517,8 +520,8 @@
 static PRESSURE_STATE_T handlePressureContReadState( void )
 {
     PRESSURE_STATE_T result = PRESSURE_CONTINUOUS_READ_STATE;
-    F32 fpgaArtPres = getPressure( PRESSURE_SENSOR_ARTERIAL ) - arterialPressureOffset;
-    F32 fpgaVenPres = getPressure( PRESSURE_SENSOR_VENOUS ) - venousPressureOffset;
+    F32 fpgaArtPres = getPressure( H2_PRES ) - arterialPressureOffset;
+    F32 fpgaVenPres = getPressure( H14_PRES ) - venousPressureOffset;
 
     // Filter inline pressure readings
     filterInlinePressureReadings( fpgaArtPres, fpgaVenPres );
@@ -946,14 +949,14 @@
 
 /*********************************************************************//**
  * @brief
- * The publishPressureData function publishes pressure/occlusion data at the
- * set interval.
- * @details \b Message \b Sent: MSG_ID_PRESSURE_DATA
+ * The publishPressureData function publishes pressure data at the set
+ * interval.
+ * @details \b Message \b Sent: MSG_ID_TD_PRESSURE_DATA
  * @details \b Inputs: pressureDataPublicationTimerCounter, currPresLimitsState,
  * currentArterialMinLimit, currentArterialMaxLimit, currentVenousMinLimit,
  * currentVenousMaxLimit, longFilteredArterialPressure, longFilteredVenousPressure,
  * shortFilteredArterialPressure, shortFilteredVenousPressure
- * @details \b Outputs: Pressure/occlusion data are published to CAN bus.
+ * @details \b Outputs: Pressure data are published to CAN bus.
  * @return none
  *************************************************************************/
 static void publishPressureData( void )
@@ -963,17 +966,17 @@
     {
         PRESSURE_DATA_T data;
 
-        data.arterialPressure           = getFilteredArterialPressure();
-        data.venousPressure             = getFilteredVenousPressure();
+        data.h2Pressure           = getFilteredArterialPressure();
+        data.h14Pressure             = getFilteredVenousPressure();
         data.presLimitState             = currPresLimitsState;
-        data.artMinLimit                = currentArterialMinLimit;
-        data.artMaxLimit                = currentArterialMaxLimit;
-        data.venMinLimit                = currentVenousMinLimit;
-        data.venMaxLimit                = currentVenousMaxLimit;
-        data.arterialLongFilterPres     = longFilteredArterialPressure;
-        data.venousLongFilterPres       = longFilteredVenousPressure;
+        data.h2MinLimit                = currentArterialMinLimit;
+        data.h2MaxLimit                = currentArterialMaxLimit;
+        data.h14MinLimit                = currentVenousMinLimit;
+        data.h14MaxLimit                = currentVenousMaxLimit;
+        data.h2LongFilterPres     = longFilteredArterialPressure;
+        data.h14LongFilterPres       = longFilteredVenousPressure;
 
-        broadcastData( MSG_ID_PRESSURE_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)&data, sizeof( PRESSURE_DATA_T ) );
+        broadcastData( MSG_ID_TD_PRESSURE_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)&data, sizeof( PRESSURE_DATA_T ) );
         pressureDataPublicationTimerCounter = 0;
     }
 }