Index: DGDefs.h =================================================================== diff -u -r246dc9dfcbd5cdc8960c113b4c1f049db73ce3ca -rdabc6da0de0a2a4c7d92384a95032573f9965aee --- DGDefs.h (.../DGDefs.h) (revision 246dc9dfcbd5cdc8960c113b4c1f049db73ce3ca) +++ DGDefs.h (.../DGDefs.h) (revision dabc6da0de0a2a4c7d92384a95032573f9965aee) @@ -188,8 +188,19 @@ /// Enumeration of flush mode states. enum DG_Flush_States { - DG_FLUSH_STATE_START = 0, ///< Start flush mode state - NUM_OF_DG_FLUSH_STATES ///< Number of flush mode states + DG_FLUSH_STATE_START = 0, ///< Flush, start mode state + DG_FLUSH_STATE_DRAIN_R1, ///< Flush, drain reservoir 1 state + DG_FLUSH_STATE_DRAIN_R2, ///< Flush, drain reservoir 2 state + DG_FLUSH_STATE_FLUSH_DRAIN, ///< Flush, flush drain state + DG_FLUSH_STATE_FLUSH_DIALYSATE, ///< Flush, flush dialysate state + DG_FLUSH_STATE_FLUSH_CONCENTRATE_STRAWS, ///< Flush, flush concentrate straws state + DG_FLUSH_STATE_FLUSH_R1_TO_R2, ///< Flush, flush reservoir 1 to reservoir 2 state + DG_FLUSH_STATE_FLUSH_R2_TO_R1, ///< Flush, flush reservoir 2 to reservoir 1 state + DG_FLUSH_STATE_FLUSH_CIRCULATION, ///< Flush, flush circulation state + DG_FLUSH_STATE_CANCEL_BASIC_PATH, ///< Flush, cancel basic path state + DG_FLUSH_STATE_CANCEL_WATER_PATH, ///< Flush, cancel water path state + DG_FLUSH_STATE_COMPLETE, ///< Flush, complete mode state + NUM_OF_DG_FLUSH_STATES ///< Number of flush mode states }; typedef enum DG_Flush_States DG_FLUSH_STATE_T; ///< Type for DG flush mode states enumeration @@ -325,6 +336,7 @@ DG_RESERVOIR_BELOW_TARGET = 0, ///< Reservoir below target DG_RESERVOIR_ABOVE_TARGET, ///< Reservoir above target DG_RESERVOIR_REACHED_TARGET, ///< Reservoir reached target + DG_RESERVOIR_NOT_REACHED_TARGET, ///< Reservoir not reached to target (timeout) NUM_OF_DG_RESERVOIR_STATUS ///< Number of reservoir status } DG_RESERVOIR_STATUS_T; // Currently is used in mode heat disinfect and mode flush Index: MsgDefs.h =================================================================== diff -u -re4dee34da24914019a3cf84bebf762d8c4ebdc50 -rdabc6da0de0a2a4c7d92384a95032573f9965aee --- MsgDefs.h (.../MsgDefs.h) (revision e4dee34da24914019a3cf84bebf762d8c4ebdc50) +++ MsgDefs.h (.../MsgDefs.h) (revision dabc6da0de0a2a4c7d92384a95032573f9965aee) @@ -84,7 +84,7 @@ MSG_ID_DG_ACCELEROMETER_DATA = 0x34, ///< DG broadcast of accelerometer data MSG_ID_UI_NEW_TREATMENT_PARAMS = 0x35, ///< UI request to validate new treatment parameter set MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE = 0x36, ///< HD response to new treatment parameters set - MSG_ID_DG_HEAT_DISINFECT_DATA = 0x37, ///< DG heat disinfection publish data + MSG_ID_DG_HEAT_DISINFECT_DATA = 0x37, ///< DG heat disinfect publish data MSG_ID_UI_INITIATE_TREATMENT_REQUEST = 0x38, ///< UI user request to initiate a treatment MSG_ID_HD_INITIATE_TREATMENT_RESPONSE = 0x39, ///< HD response to user request to initiate a treatment MSG_ID_HD_VALVES_DATA = 0x3A, ///< HD broadcast of valves data @@ -146,6 +146,8 @@ MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE = 0x76, ///< HD response to UI treatment log data request MSG_ID_HD_POST_TREATMENT_STATE = 0x77, ///< HD broadcast of post-treatment state 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 #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -261,10 +263,10 @@ 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_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE = 0xA01C, ///< Drain pump set delta pressure override - MSG_ID_HEAT_DISINFECT_RECIRC_PATH_DURATION_MINS = 0xA01D, ///< Heat disinfection recirculation path duration in minutes - MSG_ID_HEAT_DISINFECT_R1_TO_R2_DURATION_MINS = 0xA01E, ///< Heat disinfection reservoir 1 to reservoir 2 duration in minutes - MSG_ID_HEAT_DISINFECT_R2_TO_R1_DURATION_MINS = 0xA01F, ///< Heat disinfection reservoir 2 to reservoir 1 duration in minutes - MSG_ID_HEAT_DISINFECT_NO_OF_CYCLES_TO_RUN = 0xA020, ///< Heat disinfection number of cycles to run + MSG_ID___AVAILABLE_12 = 0xA01D, ///< This msg ID is available for use + MSG_ID___AVAILABLE_13 = 0xA01E, ///< This msg ID is available for use + MSG_ID___AVAILABLE_14 = 0xA01F, ///< This msg ID is available for use + MSG_ID___AVAILABLE_15 = 0xA020, ///< This msg ID is available for use MSG_ID_HEAT_DISINFECT_PUBLISH_INTERVAL_OVERRIDE = 0xA021, ///< Heat disinfection data publish interval override request MSG_ID_DG_SOFTWARE_RESET_REQUEST = 0xA022, ///< DG reset request MSG_ID_DG_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE = 0xA023, ///< DG concentrate pump measured speed override request @@ -296,6 +298,7 @@ MSG_ID_DG_SEND_SCHEDULED_RUNS_RECORD = 0xA03E, ///< DG send scheduled runs to CAN bus to be received in Dialin (equivalent to publish) MSG_ID_DG_FLUID_LEAK_SEND_INTERVAL_OVERRIDE = 0xA03F, ///< DG fluid leak state broadcast interval override request MSG_ID_DG_FLUID_LEAK_STATE_DETECTOR_OVERRIDE = 0xA040, ///< DG fluid leak state detector override request + MSG_ID_DG_FLUSH_PUBLISH_INTERVAL_OVERRIDE = 0xA041, ///< DG flush mode data publish interval override MSG_ID_HD_DEBUG_EVENT = 0xFFF1, ///< HD debug event text to be logged in event log MSG_ID_DG_DEBUG_EVENT = 0xFFF2, ///< DG debug event text to be logged in event log