Index: DDDefs.h =================================================================== diff -u -rb758eb2b792a0c2d321c7e4bce744d3f55810f4f -r533a9ae8c09773e187fef3e8d290ed9387d6632a --- DDDefs.h (.../DDDefs.h) (revision b758eb2b792a0c2d321c7e4bce744d3f55810f4f) +++ DDDefs.h (.../DDDefs.h) (revision 533a9ae8c09773e187fef3e8d290ed9387d6632a) @@ -378,8 +378,8 @@ D3_VALV, ///< Valve Hydraulics Inlet (D3) D80_VALV, ///< Valve Dry Bicarb (D80) D81_VALV, ///< Valve De-scaler (D81) - LAST_HYD_VALVE = D81_VALV, ///< End of Hydraulics valve of group - RSRVD_SPACE1, ///< This space has been reserved + 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) D19_VALV, ///< Balancing chamber Valve 2 (D19) @@ -486,6 +486,22 @@ }; 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 + + /**@}*/ #endif Index: MsgDefs.h =================================================================== diff -u -r56e52c3d5bd4fb29980ce9a8300fd4056db9e1ee -r533a9ae8c09773e187fef3e8d290ed9387d6632a --- MsgDefs.h (.../MsgDefs.h) (revision 56e52c3d5bd4fb29980ce9a8300fd4056db9e1ee) +++ MsgDefs.h (.../MsgDefs.h) (revision 533a9ae8c09773e187fef3e8d290ed9387d6632a) @@ -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 // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID @@ -298,6 +299,9 @@ MSG_ID_DD_VOLTAGE_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA051, ///< DD monitored voltage data publish interval override request MSG_ID_DD_MONITORED_VOLTAGE_OVERRIDE_REQUEST = 0xA052, ///< DD monitored voltage override request MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA053, ///< DD Rinse pump broadcast data overrride request + MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA054, ///< DD dry bicart broadcast data overrride request + MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST = 0xA055, ///< DD dry bicart fill cycle max count overrride request + MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST = 0xA056, ///< DD dry bicart 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