Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r6e0b0571d3f4064c8d7bb2b737e326c460780759 -rd2697fb12fc381fed6e7fb0820ec6486513243f6 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 6e0b0571d3f4064c8d7bb2b737e326c460780759) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision d2697fb12fc381fed6e7fb0820ec6486513243f6) @@ -190,7 +190,8 @@ D29_COND = 2 # Water, Bicarbonate, and Acid Collective Conductivity Sensor D43_COND = 3 # Self Test Conductivity Sensor (not used for dialysate conductivity) D74_COND = 4 # Water and Bicarbonate Collective Conductivity Sensor - NUM_OF_CONDUCTIVITY_SENSORS = 5 # Number of Conductivity Sensors + D98_COND = 5 # D98 Conductivity Sensor + NUM_OF_CONDUCTIVITY_SENSORS = 6 # Number of Conductivity Sensors @unique class DDDialysatePumpsEnum(DialinEnum): @@ -288,7 +289,8 @@ 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 @@ -304,21 +306,24 @@ 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 @unique class DDValveStates(DialinEnum): @@ -342,23 +347,23 @@ D3_VALV = 12 # Valve Hydraulics Inlet (D3) D80_VALV = 13 # Valve Dry Bicarb (D80) D81_VALV = 14 # Valve De-scaler (D81) - RSRVD_SPACE1 = 15 # This space has been reserved - D23_VALV = 16 # Balancing chamber Valve 1 (D23) - D19_VALV = 17 # Balancing chamber Valve 2 (D19) - D25_VALV = 18 # Balancing chamber Valve 3 (D25) - D21_VALV = 19 # Balancing chamber Valve 4 (D21) - D24_VALV = 20 # Balancing chamber Valve 5 (D24) - D20_VALV = 21 # Balancing chamber Valve 6 (D20) - 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 - SPARE3_VALV = 27 # Spare Valve 3 - SPARE4_VALV = 28 # Spare Valve 4 - SPARE5_VALV = 29 # Spare Valve 5 - SPARE6_VALV = 30 # Spare Valve 6 - SPARE7_VALV = 31 # Spare Valve 7 + D83_VALV = 15 # Valve De-scaler (D83) + D88_VALV = 16 # Valve De-scaler (D88) + D91_VALV = 17 # Valve De-scaler (D91) + D95_VALV = 18 # Valve De-scaler (D95) + D100_VALV = 19 # Valve De-scaler (D100) + RSRVD_SPACE1 = 20 # This space has been reserved + D23_VALV = 21 # Balancing chamber Valve 1 (D23) + D19_VALV = 22 # Balancing chamber Valve 2 (D19) + D25_VALV = 23 # Balancing chamber Valve 3 (D25) + D21_VALV = 24 # Balancing chamber Valve 4 (D21) + D24_VALV = 25 # Balancing chamber Valve 5 (D24) + D20_VALV = 26 # Balancing chamber Valve 6 (D20) + D26_VALV = 27 # Balancing chamber Valve 7 (D26) + D22_VALV = 28 # Balancing chamber Valve 8 (D22) + D79_PMP_VALV = 29 # D79 pump mapped to spare valve 0 + SPARE1_VALV = 30 # Spare Valve 1 + SPARE2_VALV = 31 # Spare Valve 2 NUM_OF_DD_VALVES = 32 # Number of Valves for the DD @unique