Index: AlarmDefs.h =================================================================== diff -u -r461ee85bbfe6745c3e0fe1249fb18a285a2f5fac -r626998cba6848e7b7dfebdb85e5223e600c4cf80 --- AlarmDefs.h (.../AlarmDefs.h) (revision 461ee85bbfe6745c3e0fe1249fb18a285a2f5fac) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 626998cba6848e7b7dfebdb85e5223e600c4cf80) @@ -121,6 +121,7 @@ ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE = 90, ///< Saline bolus volume check failure. ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT = 91, ///< FPGA reports failure reading arterial pressure sensor. ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT = 92, ///< FPGA reports failure reading venous pressure sensor. + ALARM_ID_UV_REACTOR_NOT_HEALTHY = 93, ///< UV reactor not healthy (either inlet or outlet) NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration Index: DGDefs.h =================================================================== diff -u -rd24a995b13c2e8d7e6a2e7b4b2b4b01974396b58 -r626998cba6848e7b7dfebdb85e5223e600c4cf80 --- DGDefs.h (.../DGDefs.h) (revision d24a995b13c2e8d7e6a2e7b4b2b4b01974396b58) +++ DGDefs.h (.../DGDefs.h) (revision 626998cba6848e7b7dfebdb85e5223e600c4cf80) @@ -196,8 +196,8 @@ DG_HEAT_DISINFECT_STATE_EVACUATE_DIALYSATE_FILL_WITH_WATER, ///< Heat disinfect, evacuate dialysate and fill with water DG_HEAT_DISINFECT_STATE_HEAT_WATER, ///< Heat disinfect, heater the stored water DG_HEAT_DISINFECT_STATE_DISINFECT_RECIRC_PATH, ///< Heat disinfect, heat disinfect recirculation path - DG_HEAT_DISINFECT_STATE_DISINFECT_RESERVOIR_1_TO_2, ///< Heat disinfect, heat disinfect reservoir 1 to 2 - DG_HEAT_DISINFECT_STATE_DISINFECT_RESERVOIR_2_TO_1, ///< Heat disinfect, heat disinfect reservoir 2 to 1 + DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2, ///< Heat disinfect, heat disinfect reservoir 1 to 2 + DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1, ///< Heat disinfect, heat disinfect reservoir 2 to 1 DG_HEAT_DISINFECT_STATE_DISINFECT_DRAIN_PATH, ///< Heat disinfect, heat disinfect drain path DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER_DEPRIME_RESERVOIRS, ///< Heat disinfect, fill with water and de-prime the reservoirs DG_HEAT_DISINFECT_STATE_COMPLETE, ///< Heat disinfect, complete Index: MsgDefs.h =================================================================== diff -u -r9cfa2561f3505cea3cc05b99cebc36bf60b88a52 -r626998cba6848e7b7dfebdb85e5223e600c4cf80 --- MsgDefs.h (.../MsgDefs.h) (revision 9cfa2561f3505cea3cc05b99cebc36bf60b88a52) +++ MsgDefs.h (.../MsgDefs.h) (revision 626998cba6848e7b7dfebdb85e5223e600c4cf80) @@ -95,6 +95,7 @@ MSG_ID_UI_ALARM_USER_ACTION = 0x40, ///< UI user has requested an alarm action MSG_ID_USER_UF_PAUSE_RESUME_RESPONSE = 0x41, ///< HD response to user request to pause or resume ultrafiltration MSG_ID_DG_CONCENTRATE_PUMP_DATA = 0x42, ///< DG broadcast of concentrate pump data + MSG_ID_DG_UV_REACTORS_DATA = 0x43, ///< DG broadcast UV reactors data #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -161,6 +162,7 @@ MSG_ID_BLOOD_PUMP_HOME_CMD = 0x8037, ///< Blood pump home command MSG_ID_DIAL_IN_PUMP_HOME_CMD = 0x8038, ///< Dialysate inlet pump home command MSG_ID_DIAL_OUT_PUMP_HOME_CMD = 0x8039, ///< Dialysate outlet pump home command + MSG_ID_DG_START_STOP_UV_REACTORS_OVERRIDE = 0x803A, ///< DG start/stop UV reactors override request MSG_ID_FIRST_DG_TESTER_MESSAGE = 0xA000, ///< First DG test message ID MSG_ID_DG_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DG_TESTER_MESSAGE, ///< DG tester log-in @@ -199,6 +201,7 @@ MSG_ID_DG_SOFTWARE_RESET_REQUEST = 0xA022, ///< DG reset request MSG_ID_DG_OPERATION_MODE_REQUEST = 0xA023, ///< DG operation mode request MSG_ID_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE = 0xA024, ///< Concentrate pumps' target speed override request + MSG_ID_UV_REACTORS_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA025, ///< UV reactors data publish interval override 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