Index: DDDefs.h =================================================================== diff -u -r6dcd6474798082bd6125fa7609c5b9d1e90c7b04 -r7f5c34c92560f954d2994019415bc7954f5ab562 --- DDDefs.h (.../DDDefs.h) (revision 6dcd6474798082bd6125fa7609c5b9d1e90c7b04) +++ DDDefs.h (.../DDDefs.h) (revision 7f5c34c92560f954d2994019415bc7954f5ab562) @@ -7,8 +7,8 @@ * * @file DDDefs.h * -* @author (last) “Raghu -* @date (last) 14-Oct-2025 +* @author (last) Raghu Kallala +* @date (last) 14-Apr-2026 * * @author (original) Sean Nash * @date (original) 01-Aug-2024 @@ -38,6 +38,7 @@ DD_MODE_HEAT, ///< Heat Disinfect mode DD_MODE_HCOL, ///< Heat Disinfect cooling mode DD_MODE_ROPS, ///< RO permeate sample mode + DD_MODE_UPDT, ///< Update mode DD_MODE_NLEG, ///< Not legal - an illegal mode transition occurred NUM_OF_DD_MODES ///< Number of DD operation modes }; @@ -114,6 +115,20 @@ }; typedef enum DD_Standby_Mode_States DD_STANDBY_MODE_STATE_T; ///< Type for DD standby mode states enumeration +/** + * @addtogroup DDUpdateMode + * @{ + */ + +/// Sub-mode states while in update mode +enum DD_Update_States +{ + DD_UPDATE_INIT_STATE = 0, ///< Start update state. + DD_UPDATE_RESET_MCU_STATE, ///< Reset MCU state. + NUM_OF_DD_UPDATE_STATES ///< Number of update states (sub-modes). +}; +typedef enum DD_Update_States DD_UPDATE_STATE_T; ///< Type for DD update states enumeration + /// Sub-mode states while in standby mode disinfect enum DD_Disinfect_States { @@ -137,6 +152,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 }; @@ -307,13 +323,15 @@ 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 DD_EVENT_BLOOD_LEAK_ZEROING_REQUEST, ///< DD blood leak zeroing request DD_EVENT_BLOOD_LEAK_ZEROING_REQUIRED, ///< DD blood leak zeroing required DD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES, ///< DD blood leak number of setpoint check failures + 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_LAST = DD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT, ///< DD last event in list FP_EVENT_STARTUP, ///< FP startup event @@ -327,7 +345,8 @@ FP_EVENT_PRE_GEN_DEF_CHANGE, ///< FP defeatured pre gen state change FP_EVENT_GENP_DEF_CHANGE, ///< FP defeatured pre gen state change FP_EVENT_FAULT_ALARM_TRIGGER, ///< FP event for alarms that would trigger - FP_EVENT_LAST = FP_EVENT_FAULT_ALARM_TRIGGER, ///< FP last event in list + FP_EVENT_OPERATION_STATUS, ///< FP operation status event + FP_EVENT_LAST = FP_EVENT_OPERATION_STATUS, ///< FP last event in list NUM_OF_DD_EVENT_IDS ///< Total number of DD events }; typedef enum DD_Event_List DD_EVENT_ID_T; ///< Type for DD event list enumeration @@ -378,8 +397,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) @@ -390,14 +409,14 @@ D26_VALV, ///< Balancing chamber Valve 7 (D26) D22_VALV, ///< Balancing chamber Valve 8 (D22) 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 - SPARE3_VALV, ///< Spare Valve 3 - SPARE4_VALV, ///< Spare Valve 4 + D88_79_VALV, ///< D88 Valve mapped to Spare valve 0 // TODO to be renamed to D88_VALV once Beta1.9 is obsolete + FIRST_SP_VALVE = D88_79_VALV, ///< First spare valve + D83_VALV, ///< D83 Valve mapped to Spare valve 1 + D91_VALV, ///< D91 Valve mapped to Spare valve 2 + D104_VALV, ///< D104 Valve mapped to Spare valve 3 + D95_VALV, ///< D95 Valve mapped to 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 @@ -413,7 +432,7 @@ P39_VALV, ///< Valve (P39) P6_VALV, ///< Valve (P6) LAST_FP_VALVE = P6_VALV, ///< Last FP valve - DD_NUM_OF_VALVES ///< Number of valves + DD_NUM_OF_VALVES ///< Number of DD valves }; typedef enum DD_Valves DD_VALVES_T; @@ -427,7 +446,7 @@ /// Enumeration of balancing chamber exec states. enum Balancing_Chamber_Exec_States { - BAL_CHAMBER_STATE_START = 0, ///< Initial state of balancing chamber + BAL_CHAMBER_STATE_IDLE = 0, ///< Initial state of balancing chamber BAL_CHAMBER_STATE1_FILL_START, ///< Balancing chamber state 1 fill start state BAL_CHAMBER_STATE1_BICARB_ACID_DOSING_CNTRL, ///< Balancing Chamber state 1 Bicarb and acid dosing control state BAL_CHAMBER_STATE1_VALVES_CLOSE, ///< Balancing Chamber state 1 valves close state @@ -488,4 +507,68 @@ /**@}*/ +/** + * @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 + +/// Enumeration of conductivity sensors. +enum Conductivity_Sensors +{ + D17_COND = 0, ///< Bicarb only conductivity sensor - 1 + FIRST_DD_COND_SENSOR = D17_COND, ///< First conductivity sensor + D27_COND, ///< Acid and Bicarb mix conductivity sensor - 1 + D29_COND, ///< Acid and Bicarb mix conductivity sensor - 2 + D43_COND, ///< Spent dialysate conductivity sensor + D74_COND, ///< Bicarb only conductivity sensor - 2 + LAST_DD_COND_SENSOR = D74_COND, ///< Last conductivity sensor + P9_COND, ///< Inlet water conductivity sensor + FIRST_FP_COND_SENSOR = P9_COND, ///< First FP conductivity sensor + P18_COND, ///< RO outlet water conductivity sensor + LAST_FP_COND_SENSOR = P18_COND, ///< Last FP conductivity sensor + NUM_OF_CONDUCTIVITY_SENSORS ///< Number of conductivity sensors +}; +typedef enum Conductivity_Sensors CONDUCTIVITY_SENSORS_T; ///< Type for conductivity sensor enumeration. +/**@}*/ + #endif