Index: DDDefs.h =================================================================== diff -u -r83743c433516c53e32ee0807b25401965848f6a3 -r9a74417b0c3c1c13f2fc6e048ba4bb127724ad64 --- DDDefs.h (.../DDDefs.h) (revision 83743c433516c53e32ee0807b25401965848f6a3) +++ DDDefs.h (.../DDDefs.h) (revision 9a74417b0c3c1c13f2fc6e048ba4bb127724ad64) @@ -61,7 +61,6 @@ DD_POST_STATE_DIALYSATE_PUMPS, ///< Dialysate pumps POST state DD_POST_STATE_CONCENTRATE_PUMPS, ///< Concentrate pumps POST state DD_POST_STATE_CONDUCTIVITY_SENSORS, ///< Conductivity sensors POST state - DD_POST_STATE_THERMISTORS, ///< Thermistors POST state DD_POST_STATE_WATCHDOG, ///< Watchdog POST test state DD_POST_STATE_SAFETY_SHUTDOWN, ///< Safety shutdown POST test state DD_POST_STATE_COMPLETED, ///< POST completed successfully state @@ -98,9 +97,6 @@ enum DD_Standby_Mode_States { DD_STANDBY_MODE_STATE_IDLE = 0, ///< Idle standby mode state - DD_STANDBY_MODE_STATE_FLUSH_FILTER, ///< Sample water flush filter state - DD_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE, ///< Sample water flush filter idle state - DD_STANDBY_MODE_STATE_SAMPLE_WATER, ///< Sample water state DD_STANDBY_MODE_STATE_PAUSE, ///< Pause state NUM_OF_DD_STANDBY_MODE_STATES ///< Number of standby mode states }; @@ -120,6 +116,27 @@ /**@}*/ /** + * @addtogroup DDGenDialysateMode + * @{ + */ + +/// Enumeration of GenDialysate mode states. +enum DD_GenD_Mode_States +{ + DD_GEND_STATE_START = 0, ///< Gen dialysate start state + DD_GEND_HYD_CHAMBER_WATER_INLET_CHECK_STATE, ///< Gen dialysate Hydraulic chamber water inlet check state + DD_GEND_HYD_CHAMBER_PRESSURE_CHECK_STATE, ///< Gen dialysate Hydraulic chamber pressure check state + DD_GEND_FRESH_DIALYSATE_PRESSURE_CHECK_STATE, ///< Gen dialysate fresh dialysate pressure check state + DD_GEND_SPENT_DIALYSATE_PRESSURE_CHECK_STATE, ///< Gen dialysate spent dialysate pressure check state + DD_GEND_DIALYSATE_DELIVERY_STATE, ///< Gen dialysate - dialysate delivery state + DD_GEND_DIALYSATE_DELIVERY_PAUSE, ///< Gen dialysate - dialysate delivery pause state + NUM_OF_DD_GEND_MODE_STATES ///< Number of gen dialysate states +}; +typedef enum DD_GenD_Mode_States DD_GEND_MODE_STATE_T; ///< Type for DD gen dialysate mode states enumeration + +/**@}*/ + +/** * @addtogroup DDHeatDisinfectMode * @{ */ @@ -222,6 +239,7 @@ DD_EVENT_FLOATER_2_LEVEL_CHANGE, ///< DD floater 2 level change event DD_EVENT_BICARB_LEVEL_CHANGE, ///< DD bicarb level change event DD_EVENT_SPENT_DIALYSATE_LEVEL_CHANGE, ///< DD spent dialysate air seperation level change event + DD_EVENT_TD_COMMUNICATION_LOSS, ///< DD TD communication loss NUM_OF_DD_EVENT_IDS ///< Total number of DD events }; typedef enum DD_Event_List DD_EVENT_ID_T; ///< Type for DD event list enumeration @@ -245,4 +263,36 @@ /**@}*/ +/** + * @addtogroup BalancingChamber + * @{ + */ + +/// Enumeration of balancing chamber exec states. +enum Balancing_Chamber_Exec_States +{ + BAL_CHAMBER_STATE_START = 0, ///< Initial state of balancing chamber + BAL_CHAMBER_STATE1_FILL_START, ///< Balancing chamber state 1 fill start state + BAL_CHAMBER_STATE1_BICARB_ACID_DOSING_CNTRL, ///< Balancing Chamber state 1 Bicarb and acid dosing control state + BAL_CHAMBER_STATE1_FILL_END, ///< Balancing Chamber state 1 fill end state + BAL_CHAMBER_STATE2_FILL_START, ///< Balancing chamber state 2 fill start state + BAL_CHAMBER_STATE2_BICARB_ACID_DOSING_CNTRL, ///< Balancing Chamber state 2 Bicarb and acid dosing control state + BAL_CHAMBER_STATE2_FILL_END, ///< Balancing Chamber state 2 fill end state + BAL_CAHMBER_DIAL_DELVIERY_BYPASS_CHECK, ///< Balancing Chamber dialysate delivery bypass check + BAL_CHAMBER_DIAL_DELIVERY_PAUSE, ///< Balancing Chamber dialysate delivery pause + NUM_OF_BAL_CHAMBER_EXEC_STATES ///< Number of balancing chamber states +}; +typedef enum Balancing_Chamber_Exec_States BAL_CHAMBER_EXEC_STATE_T; ///< Type for balancing chamber exec state enumeration + +/// Enumeration of balancing chamber states. +enum Balancing_Chamber_Switching_States +{ + BAL_CHAMBER_SW_STATE1 = 0, ///< Balancing chamber switching state 1 (V2,V5 and V3, V8 open, rest closed) + BAL_CHAMBER_SW_STATE2, ///< Balancing chamber switching state 2 ( V1,V6 and V4, V7 open, rest closed) + NUM_OF_BAL_CHAMBER_SW ///< Number of balancing chamber states +}; +typedef enum Balancing_Chamber_Switching_States BAL_CHAMBER_SW_STATE_T; ///< Type for balancing chamber Switching state enumeration + +/**@}*/ + #endif Index: MsgDefs.h =================================================================== diff -u -r83743c433516c53e32ee0807b25401965848f6a3 -r9a74417b0c3c1c13f2fc6e048ba4bb127724ad64 --- MsgDefs.h (.../MsgDefs.h) (revision 83743c433516c53e32ee0807b25401965848f6a3) +++ MsgDefs.h (.../MsgDefs.h) (revision 9a74417b0c3c1c13f2fc6e048ba4bb127724ad64) @@ -71,6 +71,8 @@ MSG_ID_DIALYSATE_PUMPS_DATA = 0x27, ///< DD dialysate pumps data MSG_ID_DD_HEATERS_DATA = 0x28, ///< DD heaters data MSG_ID_DD_LEVEL_DATA = 0x29, ///< DD level data + MSG_ID_DD_BAL_CHAMBER_DATA = 0x2A, ///< DD balancing chamber data + MSG_ID_DD_GEN_DIALYSATE_MODE_DATA = 0X2B, ///< DD Generate dialysate mode data // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID @@ -135,7 +137,19 @@ MSG_ID_DD_HEATERS_DUTY_CYCLE_OVERRIDE_REQUEST = 0xA024, ///< DD heaters dutycycle override request MSG_ID_DD_LEVELS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA025, ///< DD levels data publish interval override request MSG_ID_DD_LEVELS_STATUS_OVERRIDE_REQUEST = 0xA026, ///< DD levels status override request + MSD_ID_DD_TD_COMMUNICATION_STATUS_OVERRIDE_REQUEST = 0xA027, ///< DD TD CAN Communication status override request + MSG_ID_DD_OP_MODE_STATUS_OVERRIDE_REQUEST = 0xA028, ///< DD operation mode status override request + MSG_ID_DD_SET_OPERATION_MODE_OVERRIDE_REQUEST = 0xA029, ///< DD set new operation mode override request + MSG_ID_DD_START_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA02A, ///< DD start gen dialysate mode override request + MSG_ID_DD_DIALYSATE_PUMPS_START_OVERRIDE_REQUEST = 0xA022, ///< DD dialysate pumps start override request + MSG_ID_DD_DIALYSATE_PUMPS_STOP_OVERRIDE_REQUEST = 0xA023, ///< DD dialysate pumps stop override request + MSG_ID_DD_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA024, ///< DD generate dialysate mode data publish interval override request + MSG_ID_DD_CONCENTRATE_PUMPS_START_OVERRIDE_REQUEST = 0xA025, ///< DD Concentrate pumps start override request + MSG_ID_DD_HEATERS_START_OVERRIDE_REQUEST = 0xA026, ///< DD Heaters start override request + MSG_ID_DD_HEATERS_STOP_OVERRIDE_REQUEST = 0xA027, ///< DD Heaters stop override request + MSG_ID_DD_VALVES_OPEN_CLOSE_STATE_OVERRIDE_REQUEST = 0xA028, ///< DD Valves open/close state override request + MSG_ID_TD_DEBUG_EVENT = 0xFFF1, ///< TD debug event text to be logged in event log MSG_ID_DD_DEBUG_EVENT = 0xFFF2, ///< DD debug event text to be logged in event log