Index: DDDefs.h =================================================================== diff -u -r341dc99b597d811a91bd6324ceffca650e926a5f -r111b0dd32c0fa21b12ff25c96e810f2e8e623ab4 --- DDDefs.h (.../DDDefs.h) (revision 341dc99b597d811a91bd6324ceffca650e926a5f) +++ DDDefs.h (.../DDDefs.h) (revision 111b0dd32c0fa21b12ff25c96e810f2e8e623ab4) @@ -7,8 +7,8 @@ * * @file DDDefs.h * -* @author (last) Santhosh Reddy -* @date (last) 06-Jul-2026 +* @author (last) suresh +* @date (last) 18-Aug-2026 * * @author (original) Sean Nash * @date (original) 01-Aug-2024 @@ -150,9 +150,12 @@ /// Enumeration of Pre-Gen Dialysate mode states. enum DD_Pre_Gen_Dialysate_States { - 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_WAIT_FOR_FP_GEN = 0, ///< DD Pre-Gen wait for FP state. + DD_PRE_GEN_DIALYSATE_HYD_CHAMBER_FILL_CHECK, ///< DD Pre-Gen Dialysate hyrochamber fill check DD_PRE_GEN_DRY_BICART_INITIAL_FILL, ///< DD Pre-Gen DryBicart Initial Fill + DD_PRE_GEN_FILL_CHAMBER_F, ///< DD Pre-Gen Prime Chamber F + DD_PRE_GEN_PRIME_BICARB_LINE, ///< DD Pre-Gen Prime Bicarb line + DD_PRE_GEN_PRIME_ACID_LINE, ///< DD Pre-Gen Prime acid line 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 }; @@ -193,6 +196,8 @@ 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 + DD_GEND_SPENT_CHAMBER_VALV_OPEN_STATE, ///< Gen dialysate - spent chamber vent open state + DD_GEND_PRIME_FLUID_DISCARD_STATE, ///< Gen dialysate - prime fluid discard 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 @@ -293,10 +298,10 @@ /// Enumeration of available DD commands. enum DD_Command { - DD_CMD_NONE = 0, ///< Not a command - NUM_OF_DD_COMMANDS ///< Number of DD commands + DD_CMD_NONE = 0, ///< Not a command + NUM_OF_DD_COMMANDS ///< Number of DD commands }; -typedef enum DD_Command DD_COMMAND_T; ///< Type for DD commands enumeration +typedef enum DD_Command DD_COMMAND_T; ///< Type for DD commands enumeration /// Enumeration of general commands to DD sub-system. enum DD_General_Commands @@ -334,7 +339,8 @@ DD_EVENT_CPU_RAM_ERROR_STATUS, ///< DD CPU RAM error DD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT, ///< DD blood leak self test result DD_EVENT_BC_SWITCH_ONLY_MODE_CHANGE, ///< DD Balancing Chamber Switching Only status event - DD_EVENT_BC_STATE_CHANGE, ///< Balancing chamber state switch event + DD_EVENT_BC_STATE_CHANGE, ///< DD Balancing chamber state switch event + DD_EVENT_BC_FILL_TIMEOUT, ///< DD Balancing chamber fill timeout event DD_EVENT_HEATER_STATE_CHANGE, ///< DD heater state change event DD_EVENT_DRY_BICART_STATE_CHANGE, ///< DD Dry Bicart State change event DD_EVENT_UF_PUMP_ON_OFF, ///< DD UltraFiltration State change event @@ -343,7 +349,8 @@ DD_EVENT_SERVICE_RECORD_UPDATE, ///< DD NVM Service Record Change Event DD_EVENT_INSTITUTIONAL_RECORD_UPDATE, ///< DD NVM Institutional Record Change Event DD_EVENT_USAGE_INFO_RECORD_UPDATE, ///< DD NVM Usage Info Record Change Event - DD_EVENT_LAST = DD_EVENT_USAGE_INFO_RECORD_UPDATE, ///< DD last event in list + DD_EVENT_PRE_GEN_CHANGE, ///< DD Pre Gen state change + DD_EVENT_LAST = DD_EVENT_PRE_GEN_CHANGE, ///< DD last event in list FP_EVENT_STARTUP, ///< FP startup event FP_EVENT_FIRST = FP_EVENT_STARTUP, ///< FP first event in list FP_EVENT_OP_MODE_CHANGE, ///< FP Op mode change event @@ -442,6 +449,9 @@ P37_VALV, ///< Valve (P37) P39_VALV, ///< Valve (P39) P6_VALV, ///< Valve (P6) + P3_VALV, ///< Valve (P3) + P43_VALV, ///< Valve (P43) + P48_VALV, ///< Valve (P48) LAST_FP_VALVE = P6_VALV, ///< Last FP valve DD_NUM_OF_VALVES ///< Number of DD valves }; @@ -490,6 +500,7 @@ enum Spent_Chamber_Fill_Exec_States { SPENT_CHAMBER_FILL_STATE_START = 0, ///< Initial state of spent chamber fill + SPENT_CHAMBER_FILL_WAIT_PRESSURE_STABILIZE_STATE, ///< Pressure Stabilization Wait state 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 @@ -525,10 +536,10 @@ 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_SUPPLY_STATE, ///< Bicarb Chamber fill start state BICARB_CHAMBER_PRESSURE_CHECK_STATE, ///< Bicarb Chamber pressure check start state + 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_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 @@ -556,6 +567,20 @@ }; typedef enum Dry_Bicart_Depressurize_Exec_States DRY_BICART_DEPRESSURIZE_EXEC_STATE_T; ///< Type for dry bicart depressurize exec state enumeration +/// Enumeration of Bicarb chamber pre gen fill exec states. +enum Bicarb_Chamber_F_Pre_Gen_Fill_Exec_States +{ + PRE_GEN_BICARB_CHAMBER_START_STATE = 0, ///< Initial state of Chamber F fill + PRE_GEN_BICARB_CARTRIDGE_FILL_WATER_START_STATE, ///< Dry bicart fill water start state while dialysate delivery + PRE_GEN_BICARB_CARTRIDGE_FILL_WATER_END_STATE, ///< Dry bicart fill water end state while dialysate delivery + PRE_GEN_BICARB_CHAMBER_SUPPLY_STATE, ///< Bicarb Chamber fill start state + PRE_GEN_BICARB_CHAMBER_PRESSURE_CHECK_STATE, ///< Bicarb Chamber pressure check start state + PRE_GEN_BICARB_SUPPLY_VENT_START_STATE, ///< Bicarb Chamber supply vent cartridge and Chamber F start state + PRE_GEN_BICARB_SUPPLY_VENT_END_STATE, ///< Bicarb Chamber supply vent cartridge and Chamber F end state + NUM_OF_PRE_GEN_BICARB_CHAMBER_FILL_EXEC_STATES ///< Number of Bicarb chamber fill state +}; +typedef enum Bicarb_Chamber_F_Pre_Gen_Fill_Exec_States BICARB_CHAMBER_PRE_GEN_FILL_EXEC_STATE_T; ///< Type for bicarb chamber fill exec state enumeration + /// Enumeration of conductivity sensors. enum Conductivity_Sensors {