Index: AlarmDefs.h =================================================================== diff -u -ra939fd0358c96b2bbd880705518b5f40be104888 -rc14a9f333a93e3add3003fa3c566edc321e27d04 --- AlarmDefs.h (.../AlarmDefs.h) (revision a939fd0358c96b2bbd880705518b5f40be104888) +++ AlarmDefs.h (.../AlarmDefs.h) (revision c14a9f333a93e3add3003fa3c566edc321e27d04) @@ -156,6 +156,7 @@ ALARM_ID_PRIME_COMPLETED_MEDIUM_PRIORITY = 118, ///< HD prime completed medium priority alarm ALARM_ID_PRIME_COMPLETED_HIGH_PRIORITY = 119, ///< HD prime completed high priority alarm ALARM_ID_PRIME_OUT_OF_TIME = 120, ///< HD prime out of time alarm + ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT = 121, ///< HD requests DG command with invalid parameter fault NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -367,6 +368,7 @@ { ALARM_PRIORITY_MEDIUM, 4, ALM_ESC_30_MIN, ALARM_ID_PRIME_COMPLETED_HIGH_PRIORITY, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_PRIME_COMPLETED_MEDIUM_PRIORITY { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, FALSE, FALSE, TRUE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_PRIME_COMPLETED_HIGH_PRIORITY { ALARM_PRIORITY_LOW, 4, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE }, // ALARM_ID_PRIME_OUT_OF_TIME + { ALARM_PRIORITY_LOW, 4, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT // Priority Rank Escalate In Escalate To Fault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew UsrAck }; Index: DGDefs.h =================================================================== diff -u -r1ea146115c041879f1ef9b07013fa5c550eff68c -rc14a9f333a93e3add3003fa3c566edc321e27d04 --- DGDefs.h (.../DGDefs.h) (revision 1ea146115c041879f1ef9b07013fa5c550eff68c) +++ DGDefs.h (.../DGDefs.h) (revision c14a9f333a93e3add3003fa3c566edc321e27d04) @@ -263,13 +263,14 @@ /// Enumeration of available DG commands. enum DG_Command { - DG_CMD_SWITCH_RESERVOIR = 0, ///< Command to request DG switch reservoirs - DG_CMD_START_DRAIN = 1, ///< Command to request DG to start drain - DG_CMD_STOP_DRAIN = 2, ///< Command to request DG to stop drain - DG_CMD_START_FILL = 3, ///< Command to request DG to start fill - DG_CMD_STOP_FILL = 4, ///< Command to request DG to stop fill - DG_CMD_START_TRIMMER_HEATER = 5, ///< Command to request DG to start trimmer heater - DG_CMD_STOP_TRIMMER_HEATER = 6, ///< Command to request DG to stop trimmer heater + DG_CMD_NONE = 0, ///< Not a command + DG_CMD_SWITCH_RESERVOIR = 1, ///< Command to request DG switch reservoirs + DG_CMD_START_DRAIN = 2, ///< Command to request DG to start drain + DG_CMD_STOP_DRAIN = 3, ///< Command to request DG to stop drain + DG_CMD_START_FILL = 4, ///< Command to request DG to start fill + DG_CMD_STOP_FILL = 5, ///< Command to request DG to stop fill + DG_CMD_START_TRIMMER_HEATER = 6, ///< Command to request DG to start trimmer heater + DG_CMD_STOP_TRIMMER_HEATER = 7, ///< Command to request DG to stop trimmer heater NUM_OF_DG_COMMANDS ///< Number of DG commands }; typedef enum DG_Command DG_COMMAND_T; ///< Type for DG commands enumeration Index: HDDefs.h =================================================================== diff -u -r1ea146115c041879f1ef9b07013fa5c550eff68c -rc14a9f333a93e3add3003fa3c566edc321e27d04 --- HDDefs.h (.../HDDefs.h) (revision 1ea146115c041879f1ef9b07013fa5c550eff68c) +++ HDDefs.h (.../HDDefs.h) (revision c14a9f333a93e3add3003fa3c566edc321e27d04) @@ -157,6 +157,7 @@ HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE, ///< Wait for reservoir 2 fill complete HD_PRIME_DIALYSATE_BYPASS_STATE, ///< Dialysate bypass fluid path state HD_PRIME_WET_SELF_TESTS_STATE, ///< Perform wet self-tests after priming complete + HD_PRIME_PAUSE, ///< Prime pause state, waits to be resumed NUM_OF_HD_PRIME_STATES ///< Number of prime sub-mode states }; typedef enum HD_Pre_Treatment_Prime_States HD_PRE_TREATMENT_PRIME_STATE_T; ///< Type for HD pre-treatment prime sub-mode states enumeration