Index: AlarmDefs.h =================================================================== diff -u -r37566dcadf6d3ece22b6bb5c325795a9cb2d0066 -r6dc8d3c87f43a268bc7c7343313affb57d2956fc --- AlarmDefs.h (.../AlarmDefs.h) (revision 37566dcadf6d3ece22b6bb5c325795a9cb2d0066) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 6dc8d3c87f43a268bc7c7343313affb57d2956fc) @@ -219,6 +219,7 @@ ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT = 181, ///< DG dialysate generation conductivity fault alarm ALARM_ID_DIALYSATE_TEMPERATURE_HIGH = 182, ///< HD dialysate temperature too high alarm ALARM_ID_DIALYSATE_TEMPERATURE_LOW = 183, ///< HD dialysate temperature too low alarm + ALARM_ID_DG_VOLTAGE_OUT_OF_RANGE = 184, ///< DG 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 @@ -508,6 +509,7 @@ { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE }, // ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT { ALARM_PRIORITY_LOW, 28, ALM_ESC_5_MIN, ALARM_ID_DIALYSATE_TEMPERATURE_TOO_HIGH, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIALYSATE_TEMPERATURE_HIGH { ALARM_PRIORITY_LOW, 29, ALM_ESC_5_MIN, ALARM_ID_DIALYSATE_TEMPERATURE_TOO_LOW, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIALYSATE_TEMPERATURE_LOW + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_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 -re528c2c05537f60fe2157890339d96ff06e9aa48 -r6dc8d3c87f43a268bc7c7343313affb57d2956fc --- MsgDefs.h (.../MsgDefs.h) (revision e528c2c05537f60fe2157890339d96ff06e9aa48) +++ MsgDefs.h (.../MsgDefs.h) (revision 6dc8d3c87f43a268bc7c7343313affb57d2956fc) @@ -155,6 +155,7 @@ 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 MSG_ID_HD_ALARM_INFORMATION = 0x7D, ///< HD alarm information broadcast message + MSG_ID_DG_VOLTAGES_DATA = 0x86, ///< DG voltages data publish #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -274,8 +275,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_17 = 0xA01B, ///< This msg ID is available for use + MSG_ID_DG_MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE = 0xA01A, ///< DG monitored voltages publish interval override request + MSG_ID_DG_MONITORED_VOLTAGES_OVERRIDE = 0xA01B, ///< DG monitored voltage override request 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