Index: DDDefs.h =================================================================== diff -u -rb758eb2b792a0c2d321c7e4bce744d3f55810f4f -r653a65cc16d7123fd52122ab0814228a7fda20b9 --- DDDefs.h (.../DDDefs.h) (revision b758eb2b792a0c2d321c7e4bce744d3f55810f4f) +++ DDDefs.h (.../DDDefs.h) (revision 653a65cc16d7123fd52122ab0814228a7fda20b9) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2024-2026 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file DDDefs.h * -* @author (last) Vinayakam Mani -* @date (last) 30-Jul-2024 +* @author (last) Varshini Nagabooshanam +* @date (last) 23-Jan-2026 * -* @author (original) Vinayakam Mani -* @date (original) 30-Jul-2024 +* @author (original) Sean Nash +* @date (original) 01-Aug-2024 * ***************************************************************************/ @@ -137,6 +137,7 @@ { DD_PRE_GEN_DIALYSATE_HYD_CHAMBER_FILL_CHECK = 0, ///< DD Pre-Gen Dialysate hyrochamber fill check DD_PRE_GEN_WET_SELF_TEST, ///< DD Pre-Gen WetSelf Test + DD_PRE_GEN_DRY_BICART_FILL_CHECK, ///< DD Pre-Gen DryBicart Initial Fill Check DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND, ///< DD Pre-Gen Dialysate Wait for Gen Dialysate state transition NUM_OF_DD_PRE_GEN_DIALYSATE_STATES ///< Number of Pre-Gen Dialysate mode states }; @@ -307,7 +308,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 +380,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 +394,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 @@ -488,4 +490,51 @@ /**@}*/ +/** + * @addtogroup DryBicart + * @{ + */ + +/// 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_CARTRIDGE_FILL_WATER_START_STATE, ///< Dry bicart fill water start state while dialysate delivery + BICARB_CARTRIDGE_FILL_WATER_END_STATE, ///< Dry bicart fill water end state while dialysate delivery + 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 + BICARB_SUPPLY_VENT_START_STATE, ///< Bicarb Chamber supply vent cartridge and Chamber F start state + BICARB_SUPPLY_VENT_END_STATE, ///< Bicarb Chamber supply vent cartridge and Chamber F end 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 + +//Enumeration of Bicarb chmaber drain mode exec states +enum Dry_Bicart_Drain_Exec_States +{ + DRY_BICART_DRAIN_START_STATE = 0, ///< Initial state of dry bicart drain + DRY_BICART_FLUID_DRAIN_STATE, ///< Dry bicart fluid drain state + DRY_BICART_FLUID_DRAIN_DURATION_CHECK_STATE, ///< Dry bicart drain duration check state + DRY_BICART_FLUID_DRAIN_END_STATE, ///< Dry bicart drain end state + NUM_OF_DRY_BICART_DRAIN_EXEC_STATES +}; +typedef enum Dry_Bicart_Drain_Exec_States DRY_BICART_DRAIN_EXEC_STATE_T; ///< Type for dry bicart fill exec state enumeration + +/**@}*/ + #endif