Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rbc30c54270ec51f947b129da3c7daad54ec4eb5f -r313982ccc772f1bbe182877dff7e00381b04e0f4
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision bc30c54270ec51f947b129da3c7daad54ec4eb5f)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 313982ccc772f1bbe182877dff7e00381b04e0f4)
@@ -401,7 +401,7 @@
     // Allow water inlet to hydraulics chamber
     if ( TRUE == hydChamberWaterInletControl() )
     {
-        // if water level, temp is range, move to pressure check state
+        // if water level is met, move to pressure check state
         setModeGenDStateTransition( DD_GEND_HYD_CHAMBER_PRESSURE_CHECK_STATE );
         state = DD_GEND_HYD_CHAMBER_PRESSURE_CHECK_STATE;
     }
@@ -451,10 +451,10 @@
 static DD_GEND_MODE_STATE_T handleGenDFreshDialysatePressureCheckState( void )
 {
     DD_GEND_MODE_STATE_T state  = DD_GEND_FRESH_DIALYSATE_PRESSURE_CHECK_STATE;
-    F32 hydPressure = getFilteredPressure( PRESSURE_SENSOR_FRESH_DIALYSATE );
+    F32 hydPressure = getFilteredPressure( D18_PRES );
 
-    // Hydraulics chamber postive pressure is in range ( 23 to 25 psi )
-    if ( ( hydPressure >= HYD_CHAMBER_TARGET_POS_PRESS_MIN_PSI ) && ( hydPressure <= HYD_CHAMBER_TARGET_POS_PRESS_MAX_PSI ) )
+    // Hydraulics chamber postive pressure is in range
+    if ( ( hydPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( hydPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) )
     {
         // Proceed to next state
         setModeGenDStateTransition( DD_GEND_SPENT_DIALYSATE_PRESSURE_CHECK_STATE );
@@ -482,10 +482,10 @@
 static DD_GEND_MODE_STATE_T handleGenDSpentDialysatePressureCheckState( void )
 {
     DD_GEND_MODE_STATE_T state  = DD_GEND_SPENT_DIALYSATE_PRESSURE_CHECK_STATE;
-    F32 spentdialPressure = getFilteredPressure( PRESSURE_SENSOR_SPENT_DIALYSATE );
+    F32 spentdialPressure = getFilteredPressure( D51_PRES );
 
-    // Spent dialysate pressure is in range ( 29 to 30 psi )
-    if ( ( spentdialPressure >= SPENT_DIAL_TARGET_POS_PRESS_MIN_PSI ) && ( spentdialPressure <= SPENT_DIAL_TARGET_POS_PRESS_MAX_PSI ) )
+    // Spent dialysate pressure is in range
+    if ( ( spentdialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentdialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) )
     {
         // Proceed to next state
         transitionToBalChamberFill();
@@ -648,6 +648,26 @@
 
 /*********************************************************************//**
  * @brief
+ * The getGenDilaysateTargetTemperature function gets the target dialysate
+ * temperature.
+ * @details \b Inputs: getGenDilaysateTargetTemperature
+ * @details \b Outputs: none
+ * @return the target dialysate temperature for the treatment.
+ *************************************************************************/
+static F32 getGenDilaysateTargetTemperature( void )
+{
+    F32 result = targetHydChamberFluidTemp.data;
+
+    if ( OVERRIDE_KEY == targetHydChamberFluidTemp.override )
+    {
+        result = targetHydChamberFluidTemp.ovData;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The publishGenDialysateModeData function broadcasts the generate dialysate
  * mode data at defined interval.
  * @details \b Inputs: genDialysateDataPublicationTimerCounter
@@ -664,13 +684,12 @@
 
         data.genDialysateExecState              = (U32)getCurrentGenDialysateState();
         data.isDialDelInProgress                = (BOOL)getDialDeliveryProgressStatus();
-        data.floaterLevel1                      = (U32)getLevelStatus( FLOATER_1 );
-        data.floaterLevel2                      = (U32)getLevelStatus( FLOATER_2 );
-        data.BiCarbLevel                        = (U32)getLevelStatus( BICARB_LEVEL );
-        data.SpentChamberLevel                  = (U32)getLevelStatus( SPENT_DIALYSATE_LEVEL );
-        data.hydNegativePressure                = getFilteredPressure( PRESSURE_SENSOR_HYDRAULICS_OUTLET );
-        data.hydPositivePressure                = getFilteredPressure( PRESSURE_SENSOR_FRESH_DIALYSATE );
-        data.spentDialysatePressure             = getFilteredPressure( PRESSURE_SENSOR_SPENT_DIALYSATE );
+        data.d6Level                            = (U32)getLevelStatus( D6_LEVL );
+        data.d63Level                           = (U32)getLevelStatus( D63_LEVL );
+        data.d46Level                           = (U32)getLevelStatus( D46_LEVL );
+        data.d9Pressure                         = getFilteredPressure( D9_PRES );
+        data.d18Pressure                        = getFilteredPressure( D18_PRES );
+        data.d51Pressure                        = getFilteredPressure( D51_PRES );
         data.isDialysateGoodtoDeliver           = (BOOL)getDialGoodToDeliverStatus();
 
         broadcastData( MSG_ID_DD_GEN_DIALYSATE_MODE_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( GEN_DIALYSATE_MODE_DATA_T ) );