Index: DDDefs.h =================================================================== diff -u -rf23a62567aa86da41eb79ee8fdd97d8e58c92beb -rc3be414784df4406b4eacbb565e2d8d5d097eca8 --- DDDefs.h (.../DDDefs.h) (revision f23a62567aa86da41eb79ee8fdd97d8e58c92beb) +++ DDDefs.h (.../DDDefs.h) (revision c3be414784df4406b4eacbb565e2d8d5d097eca8) @@ -7,8 +7,8 @@ * * @file DDDefs.h * -* @author (last) Santhosh Reddy -* @date (last) 30-Jul-2026 +* @author (last) suresh +* @date (last) 18-Aug-2026 * * @author (original) Sean Nash * @date (original) 01-Aug-2024 @@ -197,6 +197,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 @@ -297,10 +299,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 @@ -448,6 +450,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 }; @@ -596,4 +601,73 @@ typedef enum Conductivity_Sensors CONDUCTIVITY_SENSORS_T; ///< Type for conductivity sensor enumeration. /**@}*/ +/** + * @addtogroup PressureSensor + * @{ + */ + +/// Enumeration of pressure sensors monitored by this module. +typedef enum PressureSensors +{ + D9_PRES = 0, ///< Hydraulics outlet pressure (PHo/Pn) + FIRST_DD_PRESSURE_SENSOR = D9_PRES, ///< Start of DD pressure sensor group + D66_PRES, ///< Dry Bicarb pressure (PDB/PCb) + D51_PRES, ///< Spent Dialysate pressure (PDs) + D18_PRES, ///< Fresh Dialysate pressure (PDf) + D41_PRES, ///< Transmembrane pressure (Ptm) + D87_PRES, ///< Dialysate pressure + LAST_DD_PRESSURE_SENSOR = D87_PRES, ///< End of DD pressure sensor group + M3_PRES, ///< Water inlet pressure after regulator (PR0) + FIRST_IO_PRESSURE_SENSOR = M3_PRES, ///< Start of IO pressure sensor group + LAST_IO_PRESSURE_SENSOR = M3_PRES, ///< End of IO pressure sensor group + P8_PRES, ///< Water inlet pressure before conductivity sensor + FIRST_FP_PRESSURE_SENSOR = P8_PRES, ///< Start of FP pressure sensor group + P13_PRES, ///< Pressure before RO filter + P17_PRES, ///< Pressure after RO filter + P46_PRES, ///< Pressure after sediment filter + LAST_FP_PRESSURE_SENSOR = P46_PRES, ///< End of FP pressure sensor group + NUM_OF_PRESSURE_SENSORS ///< Number of pressure sensors +} PRESSURE_SENSORS_T; + +/**@}*/ + +/** + * @addtogroup TemperatureSensors + * @{ + */ + +/// Enumeration of temperature sensors. +typedef enum TemperatureSensors +{ + D1_TEMP = 0, ///< First temp sensor to scan + TEMPSENSORS_FIRST = D1_TEMP, ///< Heat exchanger Inlet temperature sensor + D78_TEMP, ///< Heat exchanger Outlet temperature sensor + D4_TEMP, ///< Hydraulics primary heater temperature sensor + D50_TEMP, ///< Trimmer heater temperature sensor + D99_TEMP, ///< Temperature sensor + BRD_TEMP, ///< DD board temperature sensor ( thermistor ) + NUM_OF_TEMPERATURE_SENSORS ///< Number of temperature sensors +} TEMPERATURE_SENSORS_T; + +/**@}*/ + +/**@}*/ + +/** + * @addtogroup ConcentratePumps + * @{ + */ + +/// Enumeration of concentrate pumps. +typedef enum ConcentratePumps +{ + D11_PUMP = 0, ///< Acid concentrate pump + CONCENTRATEPUMPS_FIRST = D11_PUMP, ///< First concentrate pump in list + D10_PUMP, ///< Bicarbonate concentrate pump + D76_PUMP, ///< ultrafiltration pump + NUM_OF_CONCENTRATE_PUMPS ///< Number of concentrate pumps +} CONCENTRATE_PUMPS_T; + +/**@}*/ + #endif