Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r8bd1ae47aa13a843aa8abd6321ddc050deacb4a6 -r37a9fd8f15e413db5337371a7d1a1cb65567af7c
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 8bd1ae47aa13a843aa8abd6321ddc050deacb4a6)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 37a9fd8f15e413db5337371a7d1a1cb65567af7c)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* 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.
 *
 * @file    SystemCommMessages.h
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      06-Nov-2021
+* @author  (last)      Darren Cox
+* @date    (last)      10-Mar-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -37,6 +37,7 @@
 #include "ModePreTreat.h"
 #include "ModeStandby.h"
 #include "ModeTreatment.h"
+#include "ModeTreatmentParams.h"
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
 #include "PresOccl.h"
@@ -254,6 +255,9 @@
 // MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM
 void handleConsumableInstallConfirm( MESSAGE_T *message );
 
+// MSG_ID_UI_INSTALLATION_CONFIRM_RESPONSE
+BOOL sendConsumableInstallCmdResponse( BOOL accepted, U32 reason );
+
 // MSG_ID_UI_INSTALLATION_CONFIRM
 void handleInstallationConfirm( MESSAGE_T *message );
 
@@ -350,7 +354,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 +363,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 +404,31 @@
 // 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 );
+
+// MSG_ID_HD_SEND_SW_CONFIG_RECORD
+BOOL sendHDSWConfigRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* swRcrdAddress );
+
+// MSG_ID_HD_GET_SW_CONFIG_RECORD
+void handleGetHDSoftwareConfigRecord( MESSAGE_T *message );
+
+// MSG_ID_HD_SET_SW_CONFIG_RECORD
+void handleSetHDSoftwareConfigRecord( 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 );
@@ -655,6 +666,9 @@
 // MSG_ID_HD_SYRINGE_PUMP_MEASURED_RATE_OVERRIDE:
 void handleTestSyringePumpMeasuredRateOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_HD_SYRINGE_PUMP_HEPRIN_BOLUS_TARGET_RATE_OVERRIDE:
+void handleTestSyringePumpHeprinBolusTargetRateOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_HD_SYRINGE_PUMP_MEASURED_FORCE_OVERRIDE:
 void handleTestSyringePumpMeasuredForceOverrideRequest( MESSAGE_T *message );
 
@@ -763,6 +777,18 @@
 // 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 );
+
+// MSG_ID_HD_FANS_DUTY_CYCLE_OVERRIDE
+void handleSetFansDutyCycleOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_REQ_CURRENT_TREATMENT_PARAMETERS
+void handleTestCurrentTreamtmentParametersRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_RES_CURRENT_TREATMENT_PARAMETERS
+BOOL sendTestCurrentTreatmentParametersResponse(CURRENT_TREATMENT_PARAMS_DATA_PAYLOAD_T current_params);
+
 /**@}*/
 
 #endif