Index: DDDefs.h =================================================================== diff -u -r622c6745b1adaeff233e57a3779757b12d60b08c -r95b26747824594c0e36cb198002c61660a575a22 --- DDDefs.h (.../DDDefs.h) (revision 622c6745b1adaeff233e57a3779757b12d60b08c) +++ DDDefs.h (.../DDDefs.h) (revision 95b26747824594c0e36cb198002c61660a575a22) @@ -379,7 +379,7 @@ D3_VALV, ///< Valve Hydraulics Inlet (D3) D80_VALV, ///< Valve Dry Bicarb (D80) D81_VALV, ///< Valve De-scaler (D81) - D85_VALV, ///< Valve Dry - Bicarb (D85) + D85_VALV, ///< Valve DryBicart vent (D85) LAST_HYD_VALVE = D85_VALV, ///< End of Hydraulics valve of group FIRST_BC_VALVE, ///< Start of Balancing Chamber valve group D23_VALV = FIRST_BC_VALVE, ///< Balancing chamber Valve 1 (D23) @@ -487,6 +487,32 @@ }; typedef enum Spent_Chamber_Fill_Exec_States SPENT_CHAMBER_FILL_EXEC_STATE_T; ///< Type for spent chamber fill exec state enumeration + +/// Enumeration of DryBicart fill exec states. +enum Dry_Bicart_Fill_Exec_States +{ + DRY_BICART_START_STATE = 0, ///< Initial state of dry bicart fill + DRY_BICART_FILL_WATER_START_STATE, ///< Dry bicart fill start state + DRY_BICART_FILL_WATER_END_STATE, ///< Dry bicart fill end state + DRY_BICART_DEGAS_START_STATE, ///< Dry bicart vent start state + DRY_BICART_DEGAS_END_STATE, ///< Dry bicart vent end state + DRY_BICART_FILL_DURATION_CHECK_STATE, ///< Dry bicart fill duration check state + DRY_BICART_FILL_COMPLETE_STATE, ///< Dry bicart fill complete state + NUM_OF_DRY_BICART_FILL_EXEC_STATES ///< Number of dry bicart fill states +}; +typedef enum Dry_Bicart_Fill_Exec_States DRY_BICART_FILL_EXEC_STATE_T; ///< Type for dry bicart fill exec state enumeration + +/// Enumeration of Bicarb chamber fill exec states. +enum Bicarb_Chamber_F_Fill_Exec_States +{ + BICARB_CHAMBER_START_STATE = 0, ///< Initial state of Chamber F fill + BICARB_CHAMBER_CHECK_LEVEL_STATE, ///< Bicarb Chamber check level state + BICARB_CHAMBER_FILL_STATE, ///< Bicarb Chamber fill start state + BICARB_CHAMBER_PRESSURE_CHECK_STATE, ///< Bicarb Chamber pressure check start state + NUM_OF_BICARB_CHAMBER_FILL_EXEC_STATES ///< Number of Bicarb chamber fill state +}; +typedef enum Bicarb_Chamber_F_Fill_Exec_States BICARB_CHAMBER_FILL_EXEC_STATE_T; ///< Type for bicarb chamber fill exec state enumeration + /**@}*/ #endif Index: MsgDefs.h =================================================================== diff -u -r622c6745b1adaeff233e57a3779757b12d60b08c -r95b26747824594c0e36cb198002c61660a575a22 --- MsgDefs.h (.../MsgDefs.h) (revision 622c6745b1adaeff233e57a3779757b12d60b08c) +++ MsgDefs.h (.../MsgDefs.h) (revision 95b26747824594c0e36cb198002c61660a575a22) @@ -141,6 +141,7 @@ MSG_ID_TD_DATE_AND_TIME_RESPONSE = 0x6D, ///< TD date and time response MSG_ID_DD_DATE_AND_TIME_REQUEST = 0x6E, ///< DD date and time request MSG_ID_DD_DATE_AND_TIME_RESPONSE = 0x6F, ///< DD date and time response + MSG_ID_DD_DRY_BICART_DATA = 0x70, ///< DD dry bicart data MSG_ID_FP_RO_REJECTION_RATIO_DATA = 0x71, ///< FP broadcast RO Rejection ratio data MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST = 0x72, ///< UI pressure limits change request MSG_ID_TD_PRESSURE_LIMITS_CHANGE_RESPONSE = 0x73, ///< TD pressure limits change response @@ -353,7 +354,11 @@ MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA053, ///< DD rinse pump broadcast data override request MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST = 0xA054, ///< DD rinse pump PWM percent override request MSG_ID_DD_RINSE_PUMP_TURN_ON_OFF_REQUEST = 0xA055, ///< DD rinse pump turn on/off request - MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA056, ///< DD set conductivity model to conductivity sensors ( also applies to FP conductivity sensors ) + MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA056, + MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA057, ///< DD dry bicart broadcast data overrride request + MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST = 0xA058, ///< DD dry bicart fill cycle max count overrride request + MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST = 0xA059, ///< DD dry bicart fill request overrride request + MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST = 0xA05A, ///< DD bicarb chamber fill request overrride request 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