Index: DDDefs.h =================================================================== diff -u -r622c6745b1adaeff233e57a3779757b12d60b08c -reb9d4ed680f8ef420915e08edeae7c765e01df59 --- DDDefs.h (.../DDDefs.h) (revision 622c6745b1adaeff233e57a3779757b12d60b08c) +++ DDDefs.h (.../DDDefs.h) (revision eb9d4ed680f8ef420915e08edeae7c765e01df59) @@ -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_INITIAL_FILL, ///< DD Pre-Gen DryBicart Initial Fill 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 }; @@ -379,7 +380,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) @@ -489,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 Index: MsgDefs.h =================================================================== diff -u -r653a65cc16d7123fd52122ab0814228a7fda20b9 -reb9d4ed680f8ef420915e08edeae7c765e01df59 --- MsgDefs.h (.../MsgDefs.h) (revision 653a65cc16d7123fd52122ab0814228a7fda20b9) +++ MsgDefs.h (.../MsgDefs.h) (revision eb9d4ed680f8ef420915e08edeae7c765e01df59) @@ -8,8 +8,8 @@ * * @file MsgDefs.h * -* @author (last) Michael Garthwaite -* @date (last) 27-Jan-2026 +* @author (last) Varshini Nagabooshanam +* @date (last) 04-Feb-2026 * * @author (original) Sean Nash * @date (original) 01-Aug-2024 @@ -181,6 +181,17 @@ MSG_ID_TD_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_RESPONSE = 0x95, ///< TD adjust disposables removal confirm response MSG_ID_FP_FILTER_FLUSH_DEF_DATA = 0x96, ///< FP Filter Flush Defeatured broadcast data MSG_ID_TD_BLOOD_PRIME_PROGRESS_DATA = 0x97, ///< TD broadcast of blood prime progress + MSG_ID_UI_BLOOD_PRIME_CMD_REQUEST = 0x98, ///< UI blood prime command request + MSG_ID_TD_BLOOD_PRIME_CMD_RESPONSE = 0x99, ///< TD blood prime command response + MSG_ID_TD_ISOLATED_UF_DATA = 0x9A, ///< TD isolated UF data + MSG_ID_UI_ISOLATED_UF_DURATION_CHANGE_REQUEST = 0x9B, ///< UI isolated UF duration change request + MSG_ID_TD_ISOLATED_UF_DURATION_CHANGE_RESPONSE = 0x9C, ///< TD isolated UF duration change response + MSG_ID_UI_ISOLATED_UF_VOLUME_GOAL_CHANGE_REQUEST = 0x9D, ///< UI isolated UF volume goal change request + MSG_ID_TD_ISOLATED_UF_VOLUME_GOAL_CHANGE_RESPONSE = 0x9E, ///< TD isolated UF volume goal change response + MSG_ID_UI_ISOLATED_UF_CONFIRM_REQUEST = 0x9F, ///< UI isolated UF confirm request + MSG_ID_TD_ISOLATED_UF_CONFIRM_RESPONSE = 0xA0, ///< TD isolated UF confirm response + MSG_ID_UI_ADJUST_START_TREATMENT_REQUEST = 0xA1, ///< UI adjust start treatment request + MSG_ID_TD_ADJUST_START_TREATMENT_RESPONSE = 0xA2, ///< TD adjust start treatment response // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID