Index: DDDefs.h =================================================================== diff -u -r6dcd6474798082bd6125fa7609c5b9d1e90c7b04 -rc90526b4ad2b98e1f081064d75406fb37eb036ef --- DDDefs.h (.../DDDefs.h) (revision 6dcd6474798082bd6125fa7609c5b9d1e90c7b04) +++ DDDefs.h (.../DDDefs.h) (revision c90526b4ad2b98e1f081064d75406fb37eb036ef) @@ -7,8 +7,8 @@ * * @file DDDefs.h * -* @author (last) “Raghu -* @date (last) 14-Oct-2025 +* @author (last) Varshini Nagabooshanam +* @date (last) 26-Dec-2025 * * @author (original) Sean Nash * @date (original) 01-Aug-2024 @@ -307,7 +307,8 @@ DD_EVENT_SUB_MODE_CHANGE, ///< DD Op sub-mode change event DD_EVENT_OPERATION_STATUS, ///< DD operation status event DD_EVENT_D6_LEVL_CHANGE, ///< DD floater level change event - DD_EVENT_D63_LEVL_CHANGE, ///< DD bicarb level change event + DD_EVENT_D63_LEVL_CHANGE, ///< DD bicarb upper level change event + DD_EVENT_D98_LEVL_CHANGE, ///< DD bicarb lower level change event DD_EVENT_D46_LEVL_CHANGE, ///< DD spent dialysate air seperation level change event DD_EVENT_TD_COMMUNICATION_LOSS, ///< DD TD communication loss DD_EVENT_TEMPERATURE_DRIFT, ///< DD dialysate temperature drift @@ -378,8 +379,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) @@ -392,12 +393,12 @@ LAST_BC_VALVE = D22_VALV, ///< End of Balancing Chamber valve group D79_PMP_VALV, ///< D79 Pump mapped to Spare valve 0 FIRST_SP_VALVE = D79_PMP_VALV, ///< First spare valve - SPARE1_VALV, ///< Spare Valve 1 - SPARE2_VALV, ///< Spare Valve 2 + D83_VALV, ///< D83 Valve mapped to Spare valve 1 + D91_VALV, ///< D91 Valve mapped to Spare valve 2 SPARE3_VALV, ///< Spare Valve 3 SPARE4_VALV, ///< Spare Valve 4 SPARE5_VALV, ///< Spare Valve 5 - SPARE6_VALV, ///< Spare Valve 6 + D100_VALV, ///< D100 Valve mapped to Spare valve 6 SPARE7_VALV, ///< Spare Valve 7 LAST_SP_VALVE = SPARE7_VALV, ///< Last spare valve LAST_DD_VALVE = LAST_SP_VALVE, ///< Last DD valve @@ -486,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 -re0fef9b3673e66f7a01ec8c2701c2388e32f0227 -rc90526b4ad2b98e1f081064d75406fb37eb036ef --- MsgDefs.h (.../MsgDefs.h) (revision e0fef9b3673e66f7a01ec8c2701c2388e32f0227) +++ MsgDefs.h (.../MsgDefs.h) (revision c90526b4ad2b98e1f081064d75406fb37eb036ef) @@ -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 @@ -339,6 +340,10 @@ 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_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA056, ///< DD dry bicart broadcast data overrride request + MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST = 0xA057, ///< DD dry bicart fill cycle max count overrride request + MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST = 0xA058, ///< DD dry bicart fill request overrride request + MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST = 0xA059, ///< 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