Index: DDDefs.h =================================================================== diff -u -r713db476bacaa86bd5cc37dc6d99dc26bda05c8e -r511aa7bc7e282a9b25586176219ed016f24fa48f --- DDDefs.h (.../DDDefs.h) (revision 713db476bacaa86bd5cc37dc6d99dc26bda05c8e) +++ DDDefs.h (.../DDDefs.h) (revision 511aa7bc7e282a9b25586176219ed016f24fa48f) @@ -36,6 +36,7 @@ DD_MODE_GEND, ///< Generate Dialysate mode DD_MODE_POSG, ///< Post Dialysate Generation mode DD_MODE_HEAT, ///< Heat Disinfect mode + DD_MODE_FLUS, ///< Flush mode DD_MODE_HCOL, ///< Heat Disinfect cooling mode DD_MODE_ROPS, ///< RO permeate sample mode DD_MODE_UPDT, ///< Update mode @@ -293,11 +294,30 @@ /// Enumeration of available DD commands. enum DD_Command { - DD_CMD_NONE = 0, ///< Not a command - NUM_OF_DD_COMMANDS ///< Number of DD commands + DD_CMD_NONE = 0, ///< Not a command + DD_CMD_START_DISINFECT_SKIP, ///< Command to skip disinfection + DD_CMD_START_DISINFECT_FLUSH, ///< Command to request DD to start flush + DD_CMD_START_DISINFECT_HEAT, ///< Command to request DD to start heat disinfection + DD_CMD_START_DISINFECT_HEAT_CITRIC, ///< Command to request DD to start heat disinfection with citric + DD_CMD_START_DISINFECT_SUBSTITUTION_PORT, ///< Command to request DD to start substitution port disinfection + DD_CMD_GOTO_POST_GENERATE, ///< Command to request DD to transition to Post-Generate mode + DD_CMD_GOTO_STANDBY, ///< Command to request DD to transition to Standby mode + NUM_OF_DD_COMMANDS ///< Number of DD commands }; -typedef enum DD_Command DD_COMMAND_T; ///< Type for DD commands enumeration +typedef enum DD_Command DD_COMMAND_T; ///< Type for DD commands enumeration +/// Enumeration of available disinfection selections. +enum Disinfect_Selection +{ + DISINFECT_SEL_SKIP = 0, ///< Selection to skip disinfection + DISINFECT_SEL_FLUSH, ///< Selection for flush + DISINFECT_SEL_HEAT, ///< Selection for heat disinfection + DISINFECT_SEL_HEAT_CITRIC, ///< Selection for heat disinfection with citric + DISINFECT_SEL_SUBSTITUTION_PORT, ///< Selection for substitution port disinfection + NUM_OF_DISINFECT_SELECTIONS ///< Number of disinfection selections +}; +typedef enum Disinfect_Selection DISINFECT_SELECTION_T; ///< Type for disinfection selection enumeration + /// Enumeration of general commands to DD sub-system. enum DD_General_Commands { Index: MsgDefs.h =================================================================== diff -u -r88fc3de16df381af2aea7981fc542703843f4e06 -r511aa7bc7e282a9b25586176219ed016f24fa48f --- MsgDefs.h (.../MsgDefs.h) (revision 88fc3de16df381af2aea7981fc542703843f4e06) +++ MsgDefs.h (.../MsgDefs.h) (revision 511aa7bc7e282a9b25586176219ed016f24fa48f) @@ -266,6 +266,7 @@ MSG_ID_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR_RESPONSE = 0x128, ///< DD NVM Set Blood Leak Sensor Calibration Record Response. MSG_ID_TD_DD_REQUEST_SERVICE_RECORD_FROM_TD = 0x129, ///< TD request for DD service record information. MSG_ID_TD_DD_USAGE_INFO_REQUEST = 0x12A, ///< TD request for DD usage information. + MSG_ID_TD_DD_COMMAND_REQUEST = 0x12B, ///< TD command request to DD. // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID