Index: DGDefs.h =================================================================== diff -u -r269510bfb521e7d394e709f25b4029ec47eddd9e -rfa5c4d6c8d31116be2270e447a3793a3113c905c --- DGDefs.h (.../DGDefs.h) (revision 269510bfb521e7d394e709f25b4029ec47eddd9e) +++ DGDefs.h (.../DGDefs.h) (revision fa5c4d6c8d31116be2270e447a3793a3113c905c) @@ -424,16 +424,16 @@ DG_CHEM_DISINFECT_FLUSH_STATE_COMPLETE, ///< Chemical disinfect flush, complete state NUM_OF_DG_CHEM_DISINFECT_FLUSH_STATES ///< Number of chemical disinfect flush mode states }; -typedef enum DG_Chem_States DG_CHEM_DISINFECT_FLUSH_STATE_T; ///< Type for DG chemical disinfect flush states enumeration +typedef enum DG_Chem_Flush_States DG_CHEM_DISINFECT_FLUSH_STATE_T; ///< Type for DG chemical disinfect flush states enumeration -/// Enumeration of chemical disinfect mode UI states +/// Enumeration of chemical disinfect flush mode UI states enum DG_Chem_Flush_UI_States { - CHEM_DISINFECT_FLUSH_UI_STATE_NOT_RUNNING = 0, ///< Chemical disinfect UI, not running state - CHEM_DISINFECT_FLUSH_UI_STATE_FLUSH_AFTER_DISINFECT, ///< Chemical disinfect UI, flush after disinfect state - CHEM_DISINFECT_FLUSH_UI_STATE_CANCEL_FLUSH, ///< Chemical disinfect UI, cancel disinfect state - CHEM_DISINFECT_FLUSH_UI_STATE_COMPLETE, ///< Chemical disinfect UI, complete state - NUM_OF_CHEM_DISINFECT_FLUSH_UI_STATES ///< Number of chemical disinfect UI states + CHEM_DISINFECT_FLUSH_UI_STATE_NOT_RUNNING = 0, ///< Chemical disinfect flush UI, not running state + CHEM_DISINFECT_FLUSH_UI_STATE_FLUSH_AFTER_DISINFECT, ///< Chemical disinfect flush UI, flush after disinfect state + CHEM_DISINFECT_FLUSH_UI_STATE_CANCEL_FLUSH, ///< Chemical disinfect flush UI, cancel disinfect state + CHEM_DISINFECT_FLUSH_UI_STATE_COMPLETE, ///< Chemical disinfect flush UI, complete state + NUM_OF_CHEM_DISINFECT_FLUSH_UI_STATES ///< Number of chemical disinfect flush UI states }; typedef enum DG_Chem_Flush_UI_States DG_CHEM_DISINFECT_FLUSH_UI_STATE_T; ///< Type for DG chemical disinfect UI states enumeration @@ -495,6 +495,8 @@ DG_CMD_START_CHEM_DISINFECT = 14, ///< Command to request DG to start chemical disinfect DG_CMD_STOP_CHEM_DISINFECT = 15, ///< Command to request DG to stop chemical disinfect DG_CMD_REQUEST_CONC_MIXING_RATIOS = 16, ///< Command to request DG to send the concentrate pumps mixing ratios + DG_CMD_START_CHEM_DISINFECT_FLUSH = 17, ///< Command to request DG to start chemical disinfect + DG_CMD_STOP_CHEM_DISINFECT_FLUSH = 18, ///< Command to request DG to stop chemical disinfect 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 -rbddc751747716be8fcf707bf506d094f88a665ec -rfa5c4d6c8d31116be2270e447a3793a3113c905c --- HDDefs.h (.../HDDefs.h) (revision bddc751747716be8fcf707bf506d094f88a665ec) +++ HDDefs.h (.../HDDefs.h) (revision fa5c4d6c8d31116be2270e447a3793a3113c905c) @@ -106,24 +106,28 @@ /// Sub-mode states while in standby mode enum HD_Standby_States { - STANDBY_START_STATE = 0, ///< Start standby (home actuators). - STANDBY_WAIT_FOR_TREATMENT_STATE, ///< Wait for treatment. - STANDBY_WAIT_FOR_DISINFECT_STATE, ///< Wait for UI to send disinfect option. + STANDBY_START_STATE = 0, ///< Start standby (home actuators). + STANDBY_WAIT_FOR_TREATMENT_STATE, ///< Wait for treatment. + STANDBY_WAIT_FOR_DISINFECT_STATE, ///< Wait for UI to send disinfect option. - STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE, ///< Wait for DG flush command response. - STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE, ///< Wait for DG flush to start. - STANDBY_DG_FLUSH_IN_PROGRESS_STATE, ///< DG flush operation is in progress + STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE, ///< Wait for DG flush command response. + STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE, ///< Wait for DG flush to start. + STANDBY_DG_FLUSH_IN_PROGRESS_STATE, ///< DG flush operation is in progress - STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_CMD_RESPONSE_STATE, ///< Wait for DG heat disinfect command response. - STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_TO_START_STATE, ///< Wait for DG heat disinfect to start. - STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE, ///< DG heat disinfect operation is in progress. + STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_CMD_RESPONSE_STATE, ///< Wait for DG heat disinfect command response. + STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_TO_START_STATE, ///< Wait for DG heat disinfect to start. + STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE, ///< DG heat disinfect operation is in progress. - STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_CMD_RESPONSE_STATE, ///< Wait for DG chemical disinfect command response. - STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_TO_START_STATE, ///< Wait for DG chemical disinfect to start. - STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE, ///< DG chemical disinfect operation is in progress - NUM_OF_STANDBY_STATES ///< Number of standby states (sub-modes) + STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_CMD_RESPONSE_STATE, ///< Wait for DG chemical disinfect command response. + STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_TO_START_STATE, ///< Wait for DG chemical disinfect to start. + STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE, ///< DG chemical disinfect operation is in progress + + STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_FLUSH_CMD_RESPONSE_STATE, ///< Wait for DG chemical disinfect flush command response. + STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_FLUSH_TO_START_STATE, ///< Wait for DG chemical disinfect flush to start. + STANDBY_DG_CHEM_DISINFECT_FLUSH_IN_PROGRESS_STATE, ///< DG chemical disinfect flush operation is in progress + NUM_OF_STANDBY_STATES ///< Number of standby states (sub-modes) }; -typedef enum HD_Standby_States HD_STANDBY_STATE_T; ///< Type for HD standby states enumeration +typedef enum HD_Standby_States HD_STANDBY_STATE_T; ///< Type for HD standby states enumeration /**@}*/ Index: MsgDefs.h =================================================================== diff -u -r08e1637a87576d92ddbfa29e91a852cd26451a70 -rfa5c4d6c8d31116be2270e447a3793a3113c905c --- MsgDefs.h (.../MsgDefs.h) (revision 08e1637a87576d92ddbfa29e91a852cd26451a70) +++ MsgDefs.h (.../MsgDefs.h) (revision fa5c4d6c8d31116be2270e447a3793a3113c905c) @@ -221,6 +221,11 @@ MSG_ID_DG_CPLD_STATUS = 0xBD, ///< DG CPLD Status MSG_ID_HD_BATTERY_MANAGEMENT_DATA = 0xBE, ///< HD battery management logging data MSG_ID_HD_BATTERY_STATUS_DATA = 0xBF, ///< HD battery status logging data + MSG_ID_DG_CHEM_DISINFECT_FLUSH_DATA = 0xC0, ///< DG chemical disinfect flush logging data + MSG_ID_DG_CHEM_DISINFECT_FLUSH_TIME_DATA = 0xC1, ///< DG broadcast of chemical disinfect flush mode time data + MSG_ID_DG_START_STOP_CHEM_DISINFECT_FLUSH = 0xC2, ///< DG start/stop chemical disinfect flush + MSG_ID_UI_CHEM_DISINFECT_FLUSH_CONFIRM = 0xC3, ///< UI confirmation of chemical disinfect flush start + MSG_ID_HD_CHEM_DISINFECT_FLUSH_CONFIRM_RESPONSE = 0xC4, ///< HD response to confirmation of chemical disinfect flush start #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing