Index: DDDefs.h =================================================================== diff -u -r185ad5cca2af2107663a62d2fe9b42e0e5dc8bd4 -r29983b9e940328f10b3e09246ea6f39f7b11c33f --- DDDefs.h (.../DDDefs.h) (revision 185ad5cca2af2107663a62d2fe9b42e0e5dc8bd4) +++ DDDefs.h (.../DDDefs.h) (revision 29983b9e940328f10b3e09246ea6f39f7b11c33f) @@ -7,8 +7,8 @@ * * @file DDDefs.h * -* @author (last) Raghu Kallala -* @date (last) 23-Feb-2026 +* @author (last) Santhosh Reddy +* @date (last) 06-Jul-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 { @@ -316,13 +331,19 @@ 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_CAL_RECORD_UPDATE, - DD_EVENT_SYSTEM_RECORD_UPDATE, - DD_EVENT_SERVICE_UPDATE, - DD_EVENT_INSTIT_RECORD_UPDATE, - DD_EVENT_USAGE_INFO_UPDATE, - DD_EVENT_LAST = DD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT, ///< DD last event in list + 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_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 + DD_EVENT_CALIBRATION_RECORD_UPDATE, ///< DD NVM Calibration Record Change Event + DD_EVENT_SYSTEM_RECORD_UPDATE, ///< DD NVM System Record Change Event + 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 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 @@ -334,7 +355,9 @@ 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_P25_LEVL_CHANGE, ///< FP floater level change event + 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 @@ -434,14 +457,14 @@ /// 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 + BAL_CHAMBER_STATE1_FILL_DETECT_COMPLETE, ///< Balancing Chamber state 1 fill detect complete state BAL_CHAMBER_STATE1_FILL_END, ///< Balancing Chamber state 1 fill end state BAL_CHAMBER_STATE2_FILL_START, ///< Balancing chamber state 2 fill start state BAL_CHAMBER_STATE2_BICARB_ACID_DOSING_CNTRL, ///< Balancing Chamber state 2 Bicarb and acid dosing control state - BAL_CHAMBER_STATE2_VALVES_CLOSE, ///< Balancing Chamber state 2 valves close state + BAL_CHAMBER_STATE2_FILL_DETECT_COMPLETE, ///< Balancing Chamber state 2 fill detect complete state BAL_CHAMBER_STATE2_FILL_END, ///< Balancing Chamber state 2 fill end state NUM_OF_BAL_CHAMBER_EXEC_STATES ///< Number of balancing chamber states }; @@ -459,22 +482,6 @@ /**@}*/ /** - * @addtogroup Ultrafiltraion - * @{ - */ - -/// Enumeration of ultra filtration exec states. -enum Ultra_filtration_Exec_States -{ - DD_UF_PAUSED = 0, ///< Ultrafiltration pasued state - DD_UF_RUNNING, ///< Ultrafiltration running state - NUM_OF_UF_EXEC_STATES ///< Number of ultrafiltration exec states -}; -typedef enum Ultra_filtration_Exec_States UF_EXEC_STATE_T; ///< Type for ultrafiltration exec state enumeration - -/**@}*/ - -/** * @addtogroup SpentChamberFill * @{ */ @@ -520,26 +527,52 @@ 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_SUPPLY_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 +/// Enumeration of DryBicart drain 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 + 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 drybicart depressurize exec states +enum Dry_Bicart_Depressurize_Exec_States +{ + DRY_BICART_DEPRESSURIZE_START_STATE = 0, ///< Initial state of dry bicart depressurise + DRY_BICART_DEPRESSURIZE_VENT_START_STATE, ///< Dry bicart depressurize vent start state + DRY_BICART_DEPRESSURIZE_VENT_END_STATE, ///< Dry bicart depressurize vent end state + NUM_OF_DRY_BICART_DEPRESSURIZE_EXEC_STATES +}; +typedef enum Dry_Bicart_Depressurize_Exec_States DRY_BICART_DEPRESSURIZE_EXEC_STATE_T; ///< Type for dry bicart depressurize 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