Index: AlarmDefs.h =================================================================== diff -u -r94be3a1a3e35ac04a57e8ba17999e61eea555d6f -r1b62e2c7aff12fee792cd8e0914718d90a946ae5 --- AlarmDefs.h (.../AlarmDefs.h) (revision 94be3a1a3e35ac04a57e8ba17999e61eea555d6f) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 1b62e2c7aff12fee792cd8e0914718d90a946ae5) @@ -605,8 +605,8 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_NVDATA_EEPROM_OPS_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 799, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE , FALSE, FALSE, ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW, 0, ALARM_ID_NO_ALARM }, Index: MsgDefs.h =================================================================== diff -u -r48ed2dcdf3dd2c2a3b642ccb1acb765b41132af2 -r1b62e2c7aff12fee792cd8e0914718d90a946ae5 --- MsgDefs.h (.../MsgDefs.h) (revision 48ed2dcdf3dd2c2a3b642ccb1acb765b41132af2) +++ MsgDefs.h (.../MsgDefs.h) (revision 1b62e2c7aff12fee792cd8e0914718d90a946ae5) @@ -202,6 +202,7 @@ MSG_ID_DG_CONCENTRATE_MIXING_RATIOS_DATA = 0xAA, ///< DG concentrate mixing ratios data MSG_ID_DG_SCHEDULED_RUNS_DATA = 0xAB, ///< DG scheduled runs data MSG_ID_DG_SCHEDULED_RUNS_INFO = 0xAC, ///< DG scheduled runs info to be sent to the UI and Dialin + MSG_ID_DG_DIALYSATE_FILL_DATA = 0xAD, ///< DG broadcast dialysate data during fill mode #ifdef EMC_TEST_BUILD @@ -411,6 +412,8 @@ MSG_ID_DG_SET_SW_CONFIG_RECORD = 0xA04B, ///< DG set software configuration record MSG_ID_DG_SEND_SW_CONFIG_RECORD = 0xA04C, ///< DG send software configuration record MSG_ID_DG_FANS_DUTY_CYCLE_OVERRIDE = 0xA04D, ///< DG fans duty cycle override request + MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE = 0xA04F, ///< DG used acid volume override in mL + MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE = 0xA050, ///< DG used bicarb volume override in mL MSG_ID_HD_DEBUG_EVENT = 0xFFF1, ///< HD debug event text to be logged in event log MSG_ID_DG_DEBUG_EVENT = 0xFFF2, ///< DG debug event text to be logged in event log