Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
@@ -1,6 +1,6 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
@@ -350,7 +350,7 @@
 // *********** public DG command functions **********
 
 // MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS
-BOOL sendDialysateTempTargetsToDG( F32 primary, F32 trimmer );
+BOOL sendDialysateHeatingParamsToDG( DG_CMD_DIALYSATE_HEATING_PARAMS_T *params );
 
 // MSG_ID_DG_SWITCH_RESERVOIR_CMD
 BOOL sendDGSwitchReservoirCommand( U32 activeReservoir );
@@ -359,7 +359,7 @@
 BOOL sendDGChangeValveSettingCommand( U32 valveSettingCmd );
 
 // MSG_ID_DG_FILL_CMD
-BOOL sendDGFillCommand( U32 cmd, U32 fillToVolumeMl );
+BOOL sendDGFillCommand( U32 cmd, U32 fillToVolumeMl, F32 targetFlowRateLPM );
 
 // MSG_ID_DG_DRAIN_CMD
 BOOL sendDGDrainCommand( DRAIN_RESERVOIR_CMD_PAYLOAD_T *drainCmdPtr );
@@ -400,24 +400,22 @@
 // MSG_ID_HD_SEND_SYSTEM_RECORD
 BOOL sendHDSystemRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* sysRcrdAddress );
 
-// MSG_ID_Hd_SEND_SERVICE_RECORD
+// MSG_ID_HD_SEND_SERVICE_RECORD
 BOOL sendHDServiceRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* srvcRcrdAddress );
 
+// MSG_ID_DG_REQUEST_CONCENTRATE_RATIOS
+BOOL sendDGConcentrateMixingRatiosRequest( void );
+
+// MSG_ID_DG_CONCENTRATE_MIXING_RATIOS_DATA
+void handleDGMixingRatios( MESSAGE_T *message );
+
 #ifdef EMC_TEST_BUILD
 // MSG_ID_CAN_ERROR_COUNT
 BOOL broadcastCANErrorCount( U32 count );
 #endif
 
 // *********** public test support message functions **********
 
-#ifdef DEBUG_ENABLED
-// DEBUG OUTPUT to debug UART
-BOOL sendDebugData( U08 *dbgData, U32 len );
-
-// Debug message to UI for logging
-void sendDebugDataToUI( U08 *str );
-#endif
-
 // MSG_TESTER_LOG_IN
 void handleTesterLogInRequest( MESSAGE_T *message );
 BOOL isTestingActivated( void );
@@ -763,6 +761,9 @@
 // MSG_ID_HD_STOP_RTC_CLOCK
 void handleStopHDRTCClock( MESSAGE_T *message );
 
+// MSG_ID_HD_FAN_RPM_ALARM_START_TIME_OVERRIDE
+void handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( MESSAGE_T *message );
+
 /**@}*/
 
 #endif