Index: AlarmDefs.h =================================================================== diff -u -rbffe88639295cf011420a49a9470563e67e598a5 -r6cd177056ca543350cf5c247f8fc18cca839a17d --- AlarmDefs.h (.../AlarmDefs.h) (revision bffe88639295cf011420a49a9470563e67e598a5) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 6cd177056ca543350cf5c247f8fc18cca839a17d) @@ -212,6 +212,7 @@ ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE = 174, ///< HD blood leak detector self-test failure alarm ALARM_ID_HD_BLOOD_LEAK_DETECTOR_FAULT = 175, ///< HD blood leak detector fault ALARM_ID_DG_LOAD_CELLS_INVALID_CALIBRATION = 176, ///< DG load cells invalid calibration + ALARM_ID_HD_VOLTAGE_OUT_OF_RANGE = 177, ///< HD monitored voltage is out of range NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -494,6 +495,7 @@ { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE }, // ALARM_ID_HD_BLOOD_LEAK_DETECTOR_FAULT { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE }, // ALARM_ID_DG_LOAD_CELLS_INVALID_CALIBRATION + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_VOLTAGE_OUT_OF_RANGE // Priority Rank Escalate In Escalate To Fault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck }; Index: MsgDefs.h =================================================================== diff -u -r23a14171a61f2afeaa58902360af3983e80ed8d9 -r6cd177056ca543350cf5c247f8fc18cca839a17d --- MsgDefs.h (.../MsgDefs.h) (revision 23a14171a61f2afeaa58902360af3983e80ed8d9) +++ MsgDefs.h (.../MsgDefs.h) (revision 6cd177056ca543350cf5c247f8fc18cca839a17d) @@ -152,6 +152,8 @@ MSG_ID_HD_BLOOD_LEAK_STATE = 0x78, ///< HD broadcast of blood leak state MSG_ID_DG_START_STOP_FLUSH = 0x79, ///< DG start/stop flush mode MSG_ID_DG_FLUSH_DATA = 0x7A, ///< DG flush data publish + MSG_ID_HD_VOLTAGES_DATA = 0x7B, ///< HD voltages data publish + MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE = 0x7C, ///< HD response to UI set alarm audio volume request #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -207,7 +209,7 @@ MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER = 0x802D, ///< Set a treatment parameter (will change actual setting, not an override) MSG_ID_HD_VALVES_HOME = 0x802E, ///< Home an HD Valve MSG_ID_HD_VALVES_POSITION_OVERRIDE = 0x802F, ///< Set an HD valve to a position in counts - MSG_ID_HD_VALVES_SET_AIR_TRAP_VALVE = 0x8030, ///< Set the HD blood trap valve status + MSG_ID_HD_VALVES_SET_AIR_TRAP_VALVE = 0x8030, ///< Set the HD air trap valve status MSG_ID_HD_VALVES_SET_PWM_OVERRIDE = 0x8031, ///< Set an HD valve PWM MSG_ID_HD_AIR_TRAP_SEND_INTERVAL_OVERRIDE = 0x8032, ///< HD air trap data broadcast interval override request MSG_ID_HD_AIR_TRAP_LEVEL_SENSOR_OVERRIDE = 0x8033, ///< HD air trap level sensor override request @@ -239,6 +241,8 @@ MSG_ID_HD_BLOOD_LEAK_STATUS_DETECTOR_OVERRIDE = 0x804D, ///< HD blood leak status detector override request MSG_ID_HD_BLOOD_LEAK_STATE_SEND_INTERVAL_OVERRIDE = 0x804E, ///< HD blood leak state broadcast interval override request MSG_ID_HD_BLOOD_LEAK_STATE_DETECTOR_OVERRIDE = 0x804F, ///< HD blood leak state detector override request + MSG_ID_HD_MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE = 0x8050, ///< HD monitored voltages publish interval override request + MSG_ID_HD_MONITORED_VOLTAGES_OVERRIDE = 0x8051, ///< HD monitored voltage 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 @@ -265,7 +269,8 @@ MSG_ID_DG_ACCEL_OVERRIDE = 0xA017, ///< DG accelerometer sensor override request MSG_ID_DG_ACCEL_MAX_OVERRIDE = 0xA018, ///< DG accelerometer sensor max. override request MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE = 0xA019, ///< DG accelerometer data broadcast interval override request - MSG_ID___AVAILABLE_11 = 0xA01A, ///< This msg ID is available for use + MSG_ID___AVAILABLE_11 = 0xA01A, ///< This msg ID is available for use + MSG_ID___AVAILABLE_16 = 0xA01B, ///< This msg ID is available for use MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE = 0xA01C, ///< Drain pump set delta pressure override MSG_ID___AVAILABLE_12 = 0xA01D, ///< This msg ID is available for use MSG_ID___AVAILABLE_13 = 0xA01E, ///< This msg ID is available for use