Index: DDDefs.h =================================================================== diff -u -r18e2bed2d341627edb5c31c17a952d440bc4a85f -rbfdf1fb5beb20010983457ab4588684c25f50c13 --- DDDefs.h (.../DDDefs.h) (revision 18e2bed2d341627edb5c31c17a952d440bc4a85f) +++ DDDefs.h (.../DDDefs.h) (revision bfdf1fb5beb20010983457ab4588684c25f50c13) @@ -173,8 +173,10 @@ DD_GEND_STATE_START = 0, ///< Gen dialysate start state DD_GEND_DIALYSATE_BYPASS_STATE, ///< Gen dialysate - Bypass dialysate state DD_GEND_DIALYSATE_DELIVERY_STATE, ///< Gen dialysate - deliver dialysate state - DD_GEND_DIALYSATE_DELIVERY_PAUSE, ///< Gen dialysate - dialysate delivery pause state DD_GEND_ISOLATED_UF_STATE, ///< Gen dialysate - Isolated ultrafiltration state + DD_GEND_SPENT_CHAMBER_FILL_STATE, ///< Gen dialysate - spent chamber fill state + DD_GEND_BICARB_CHAMBER_FILL_STATE, ///< Gen dialysate - bicarb chamber fill 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 @@ -405,9 +407,11 @@ 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_VALVES_CLOSE, ///< Balancing Chamber state 1 valves close 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_VALVES_CLOSE, ///< Balancing Chamber state 2 valves close state BAL_CHAMBER_STATE2_FILL_END, ///< Balancing Chamber state 2 fill end state NUM_OF_BAL_CHAMBER_EXEC_STATES ///< Number of balancing chamber states }; @@ -440,4 +444,25 @@ /**@}*/ +/** + * @addtogroup SpentChamberFill + * @{ + */ + +/// Enumeration of Spent chamber fill exec states. +enum Spent_Chamber_Fill_Exec_States +{ + SPENT_CHAMBER_FILL_STATE_START = 0, ///< Initial state of spent chamber fill + SPENT_CHAMBER_FILL_STATE1_FILL_START, ///< Spent chamber fill state 1 fill start state + SPENT_CHAMBER_FILL_STATE1_DOSING_CNTRL, ///< Spent chamber fill state 1 dosing control + SPENT_CHAMBER_FILL_STATE1_FILL_END, ///< Spent chamber fill state 1 fill end state + SPENT_CHAMBER_FILL_STATE2_FILL_START, ///< Spent chamber fill state 2 fill start state + SPENT_CHAMBER_FILL_STATE2_DOSING_CNTRL, ///< Spent chamber fill state 2 dosing control + SPENT_CHAMBER_FILL_STATE2_FILL_END, ///< Spent chamber fill state 2 fill end state + NUM_OF_SPENT_CHAMBER_FILL_EXEC_STATES ///< Number of spent chamber fill states +}; +typedef enum Spent_Chamber_Fill_Exec_States SPENT_CHAMBER_FILL_EXEC_STATE_T; ///< Type for spent chamber fill exec state enumeration + +/**@}*/ + #endif Index: MsgDefs.h =================================================================== diff -u -r02353322959112f5280e042b0f17c1e6210f7d88 -rbfdf1fb5beb20010983457ab4588684c25f50c13 --- MsgDefs.h (.../MsgDefs.h) (revision 02353322959112f5280e042b0f17c1e6210f7d88) +++ MsgDefs.h (.../MsgDefs.h) (revision bfdf1fb5beb20010983457ab4588684c25f50c13) @@ -127,6 +127,7 @@ #ifdef __PUMPTEST__ MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0, ///< DD piston pump data #endif + // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TD_TESTER_MESSAGE, ///< TD tester log-in @@ -187,6 +188,9 @@ MSG_ID_TD_BLOOD_FLOW_ALPHA_Y_INTERCEPT_OVERRIDE_REQUEST = 0x8037, ///< TD override request for blood flow alpha Y intercept MSG_ID_TD_BLOOD_FLOW_WEAR_A_TERM_OVERRIDE_REQUEST = 0x8038, ///< TD override request for blood flow wear A term MSG_ID_TD_BLOOD_FLOW_WEAR_B_TERM_OVERRIDE_REQUEST = 0x8039, ///< TD override request for blood flow wear B term + MSG_ID_TD_SET_TEST_CONFIGURATION = 0x803A, ///< TD set test configuration + MSG_ID_TD_GET_TEST_CONFIGURATION = 0x803B, ///< TD get test configuration + MSG_ID_TD_RESET_ALL_TEST_CONFIGURATIONS = 0x803C, ///< TD reset all the configurations MSG_ID_FIRST_DD_TESTER_MESSAGE = 0xA000, ///< First DD test message ID MSG_ID_DD_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DD_TESTER_MESSAGE, ///< DD tester log-in @@ -256,11 +260,9 @@ MSG_ID_DD_SPENT_CHAMB_FILL_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA040, ///< DD stop pre-gen dialysate mode override request MSG_ID_DD_AVAILABLE_TO_USE_4 = 0xA041, ///< DD stop gen dialysate mode override request MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST = 0xA042, ///< DD set/reset safety shutdown override request -#ifdef __PUMPTEST__ - MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xAF00, ///< DD piston pump data publish interval override request - MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01, ///< DD piston pump start/stop override request - MSG_ID_DD_PISTON_PUMP_FILL_AFTER_DISPENSE_OVERRIDE_REQUEST = 0xAF02, ///< DD piston pump fill after dispense control -#endif + MSG_ID_DD_SET_TEST_CONFIGURATION = 0xA043, ///< DD set test configuration + MSG_ID_DD_GET_TEST_CONFIGURATION = 0xA044, ///< DD get test configuration + MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS = 0xA045, ///< DD reset all the configurations MSG_ID_FIRST_FP_TESTER_MESSAGE = 0xB000, ///< First FP test message ID MSG_ID_FP_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_FP_TESTER_MESSAGE, ///< FP tester log-in @@ -308,6 +310,9 @@ MSG_ID_FP_PERMEATE_TANK_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB02A, ///< FP Permeate Tank data publish interval override request MSG_ID_FP_ALARM_STATE_OVERRIDE_REQUEST = 0xB02B, ///< FP Alarm State override request MSG_ID_FP_ALARM_CLEAR_ALL_ALARMS_REQUEST = 0xB02C, ///< FP alarm clear request + MSG_ID_FP_SET_TEST_CONFIGURATION = 0xB02D, ///< FP set test configuration + MSG_ID_FP_GET_TEST_CONFIGURATION = 0xB02E, ///< FP get test configuration + MSG_ID_FP_RESET_ALL_TEST_CONFIGURATIONS = 0xB02F, ///< FP reset all the configurations 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