Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -ra19a676d1e67bb3e1aca9e9bba49727f9d5f8b38 -r7c8ec681f8c5dc44674893b5c3924a6203f2c8d0
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision a19a676d1e67bb3e1aca9e9bba49727f9d5f8b38)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 7c8ec681f8c5dc44674893b5c3924a6203f2c8d0)
@@ -31,8 +31,10 @@
 
 // MSG_ID_DG_CHECK_IN
 void handleDGCheckIn( MESSAGE_T *message );
+
 // MSG_ID_UI_CHECK_IN
 void handleUICheckIn( MESSAGE_T *message );
+
 // MSG_ID_REQUEST_FW_VERSIONS
 void handleFWVersionRequest( MESSAGE_T *message );
 
@@ -43,6 +45,9 @@
 // MSG_ID_LOAD_CELL_READINGS
 void handleLoadCellReadingsFromDG( MESSAGE_T *message );
 
+// MSG_ID_DG_TEMPERATURE_DATA:
+void handleDGTemperatureData( MESSAGE_T *message );
+
 // MSG_ID_RO_PUMP_DATA:
 void handleROPumpData( MESSAGE_T *message );
 
@@ -60,29 +65,36 @@
 
 // MSG_ID_USER_UF_SETTINGS_CHANGE_REQUEST
 void handleChangeUFSettingsRequest( MESSAGE_T *message );
+
 // MSG_ID_USER_UF_SETTINGS_CHANGE_RESPONSE
-BOOL sendChangeUFSettingsResponse( BOOL accepted, U32 reason, F32 volume_mL, U32 time_min, F32 ufRate_mL_min, S32 timeDiff, F32 rateDiff );
+BOOL sendChangeUFSettingsResponse( BOOL accepted, U32 reason, F32 volume_mL, U32 time_min, F32 ufRate_mL_min, S32 timeDiff, F32 rateDiff, F32 oldUFRate_mL_min );
+
 // MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE
 void handleChangeUFSettingsConfirmation( MESSAGE_T *message );
 
+// MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE
+BOOL sendChangeUFSettingsOptionResponse( BOOL accepted, U32 reason, F32 volume_mL, U32 time_min, F32 ufRate_mL_min );
+
 // MSG_ID_USER_TREATMENT_TIME_CHANGE_REQUEST
 void handleChangeTreatmentDurationRequest( MESSAGE_T *message );
+
 // MSG_ID_USER_TREATMENT_TIME_CHANGE_RESPONSE
 BOOL sendChangeTreatmentDurationResponse( BOOL accepted, U32 reason, U32 time_min, F32 volume_mL );
 
 // MSG_ID_TREATMENT_PARAM_CHANGE_RANGES
-BOOL sendTreatmentParamsRangesToUI( U32 minTime, U32 maxTime, U32 minUFVol, U32 maxUFVol, U32 minDialRate, U32 maxDialRate );
+BOOL sendTreatmentParamsRangesToUI( U32 minTime, U32 maxTime, F32 minUFVol, F32 maxUFVol, U32 minDialRate, U32 maxDialRate );
 
 // MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST
 void handleChangeBloodDialysateRateChangeRequest( MESSAGE_T *message );
+
 // MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_RESPONSE
 BOOL sendChangeBloodDialysateRateChangeResponse( BOOL accepted, U32 reason, U32 bloodRate, U32 dialRate );
 
 // MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS
 BOOL sendDialysateTempTargetsToDG( F32 primary, F32 trimmer );
 
 // MSG_ID_DG_SWITCH_RESERVOIR_CMD
-BOOL sendDGSwitchReservoirCommand( DG_RESERVOIR_ID_T activeReservoir );
+BOOL sendDGSwitchReservoirCommand( U32 activeReservoir );
 
 // MSG_ID_DG_FILL_CMD
 BOOL sendDGFillCommand( U32 fillToVolumeMl );
@@ -96,13 +108,18 @@
 // MSG_ID_DG_SAMPLE_WATER_CMD
 BOOL sendDGSampleWaterCommand( void );
 
+// MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD
+BOOL sendDGStartStopTrimmerHeaterCommand( BOOL start );
+
 // MSG_ID_DG_OP_MODE:
 void handleDGOpMode( MESSAGE_T *message );
 
 // MSG_ID_ALARM_STATUS
 BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus );
+
 // MSG_ID_ALARM_TRIGGERED
 BOOL broadcastAlarmTriggered( U16 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
+
 // MSG_ID_ALARM_CLEARED
 BOOL broadcastAlarmCleared( U16 alarm );
 
@@ -131,8 +148,13 @@
 BOOL broadcastPowerOffWarning( void );
 
 // MSG_ID_HD_OP_MODE
-BOOL broadcastHDOperationMode( U32 mode );
+BOOL broadcastHDOperationMode( U32 mode, U32 subMode );
 
+#ifdef EMC_TEST_BUILD
+// MSG_ID_CAN_ERROR_COUNT
+BOOL broadcastCANErrorCount( U32 count );
+#endif
+
 // *********** public test support message functions **********
 
 #ifdef DEBUG_ENABLED
@@ -255,5 +277,8 @@
 // MSG_ID_DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE
 void handleTestDialOutLoadCellWeightOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_HD_SAFETY_SHUTDOWN_OVERRIDE:
+void handleTestHDSafetyShutdownOverrideRequest( MESSAGE_T *message );
+
 #endif