Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r02eb470cf6682c89062c8a62eaf0a08a2728b18a -r5f783280400baab74941d3fd4d3e3d5a97bd06ee --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 02eb470cf6682c89062c8a62eaf0a08a2728b18a) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 5f783280400baab74941d3fd4d3e3d5a97bd06ee) @@ -7,8 +7,8 @@ # # @file dd_defs.py # -# @author (last) Dara Navaei -# @date (last) 08-Feb-2024 +# @author (last) Zoltan Miskolci +# @date (last) 09-Jan-2026 # @author (original) Peter Lucia # @date (original) 22-Jun-2021 # @@ -184,7 +184,7 @@ NUM_OF_D10_D11_CONCENTRATE_PUMP_ATTRIBUTES = 9 # Number of Acid (D11) and Bicarbonate (D10) Concentrate Pump Attributes @unique -class DDConductivitySensorsEnum(DialinEnum): +class DDConductivitySensorNames(DialinEnum): D17_COND = 0 # Closed Loop Control of Dosing for D74 Conductivity Sensor D27_COND = 1 # Closed Loop Control of Dosing for D29 Conductivity Sensor D29_COND = 2 # Water, Bicarbonate, and Acid Collective Conductivity Sensor @@ -264,7 +264,8 @@ D6_LEVEL = 0 # floater switch low, medium and high status D63_LEVEL = 1 # bicarb level low or high status D46_LEVEL = 2 # Spent dialysate air separation chamber level low or high status - NUM_OF_LEVELS = 3 # Number of Level Sensors + D98_LEVEL = 3 # D98 Conductive Level Sensor + NUM_OF_LEVELS = 4 # Number of Level Sensors @unique class DDPistonPumpsEnum(DialinEnum): @@ -288,37 +289,43 @@ D51_PRES = 2 # Spent Dialysate pressure (PDs) D18_PRES = 3 # Fresh Dialysate pressure (PDf) D41_PRES = 4 # Transmembrane pressure (Ptm) - NUM_OF_PRESSURE_SENSORS = 5 # Number of pressure sensors + D87_PRES = 5 # D87 Pressure sensor + NUM_OF_PRESSURE_SENSORS = 6 # Number of pressure sensors -COND_SENSOR_INDEX_OFFSET = 6 # Conductivity Sensor Index Offset for the Temperature Readings -PRES_SENSOR_INDEX_OFFSET = 15 # Pressure Sensors Offset for Temperature Readings - @unique class DDROPermeateStates(DialinEnum): NUM_OF_RO_PERMEATE_STATES = 0 # TODO: populate with RO Permeate states -@unique class DDTemperaturesNames(DialinEnum): D1_TEMP = 0 # Heat exchanger Inlet temperature sensor D78_TEMP = 1 # Heat exchanger Outlet temperature sensor D4_TEMP = 2 # Hydraulics primary heater temperature sensor D50_TEMP = 3 # Trimmer heater temperature sensor BRD_TEMP = 4 # Barometric temperature sensor - D16_TEMP = 5 # D16 Conductivity sensor temperature value - D28_TEMP = 6 # D28 Conductivity sensor temperature value - D30_TEMP = 7 # D30 Conductivity sensor temperature value - D44_TEMP = 8 # D44 Conductivity sensor temperature value - D75_TEMP = 9 # D75 Conductivity sensor temperature value - D4_AVG_TEMP = 10 # D4 Filtered value - D50_AVG_TEMP = 11 # D50 Filtered value - D28_AVG_TEMP = 12 # D28 Filtered value - D30_AVG_TEMP = 13 # D30 Filtered value - D9_TEMP = 14 # D9 Pressure sensor temperature value - D66_TEMP = 15 # D66 Pressure sensor temperature value - D51_TEMP = 16 # D51 Pressure sensor temperature value - D18_TEMP = 17 # D18 Pressure sensor temperature value - D41_TEMP = 18 # D41 Pressure sensor temperature value - NUM_OF_TEMP_SENSORS = 19 # Number of Temperature Sensors + D16_TEMP = 5 # D16(D17) Conductivity sensor temperature value + D28_TEMP = 6 # D28(D27) Conductivity sensor temperature value + D30_TEMP = 7 # D30(D29) Conductivity sensor temperature value + D44_TEMP = 8 # D44(D43) Conductivity sensor temperature value + D75_TEMP = 9 # D75(D74) Conductivity sensor temperature value + D99_TEMP = 10 # D99(D98) Conductivity sensor temperature value + D4_AVG_TEMP = 11 # D4 Filtered value + D50_AVG_TEMP = 12 # D50 Filtered value + D28_AVG_TEMP = 13 # D28 Filtered value + D30_AVG_TEMP = 14 # D30 Filtered value + D99_AVG_TEMP = 15 # D99 Filtered value + D9_TEMP = 16 # D9 Pressure sensor temperature value + D66_TEMP = 17 # D66 Pressure sensor temperature value + D51_TEMP = 18 # D51 Pressure sensor temperature value + D18_TEMP = 19 # D18 Pressure sensor temperature value + D41_TEMP = 20 # D41 Pressure sensor temperature value + D87_TEMP = 21 # D87 Pressure sensor temperature value + NUM_OF_TEMP_SENSORS = 22 # Number of Temperature Sensors + FIRST_PRESSURE_SENSOR = D9_TEMP # First Pressure Sensor + LAST_PRESSURE_SENSOR = D87_TEMP # Last Pressure Sensor + FIRST_CONDUCTIVITY_SENSOR = D16_TEMP # First Conductivity Sensor + LAST_CONDUCTIVITY_SENSOR = D99_TEMP # Last Conductivity Sensor + FIRST_TEMPERATURE_SENSOR = D1_TEMP # First Pre Sensor + LAST_TEMPERATURE_SENSOR = BRD_TEMP # Last Flow Sensor @unique class DDValveStates(DialinEnum): @@ -352,21 +359,15 @@ D26_VALV = 22 # Balancing chamber Valve 7 (D26) D22_VALV = 23 # Balancing chamber Valve 8 (D22) D79_PMP_VALV = 24 # D79 pump mapped to spare valve 0 - SPARE1_VALV = 25 # Spare Valve 1 - SPARE2_VALV = 26 # Spare Valve 2 + D83_VALV = 25 # Valve De-scaler (D83) + D91_VALV = 26 # Valve De-scaler (D91) SPARE3_VALV = 27 # Spare Valve 3 SPARE4_VALV = 28 # Spare Valve 4 SPARE5_VALV = 29 # Spare Valve 5 - SPARE6_VALV = 30 # Spare Valve 6 + D100_VALV = 30 # Valve De-scaler (D100) SPARE7_VALV = 31 # Spare Valve 7 - M4_VALV = 32 # First IO valve (M4) - M12_VALV = 33 # Last IO valve IO valve (M12) - P11_VALV = 34 # First FP Valve (P11) - P33_VALV = 35 # FP Valve (P33) - P34_VALV = 36 # FP Valve (P34) - P37_VALV = 37 # FP Valve (P37) - P39_VALV = 38 # FP Valve (P39) - P6_VALV = 39 # Last FP Valve (P6) + FIRST_DD_VALVE = D14_VALV, # First DD valve + LAST_DD_VALVE = SPARE7_VALV, # Last DD valve NUM_OF_DD_VALVES = 40 # Number of Valves for the DD @unique