Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -rafb299e7aca45969aed5075bc951b97058ddb2b6 -r3715028b608b10e1d440a8a738c8a4f70d3d411b --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision afb299e7aca45969aed5075bc951b97058ddb2b6) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 3715028b608b10e1d440a8a738c8a4f70d3d411b) @@ -329,7 +329,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 } return unique(DialinEnum('DDConductivitySensorNames', members)) @@ -366,7 +367,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 Conductivity Level Sensor + 'NUM_OF_LEVELS': 4, # Number of Level Sensors } return unique(DialinEnum('DDLevelSensorNames', members)) @@ -399,7 +401,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 } return unique(DialinEnum('DDPressureSensorNames', members)) @@ -437,36 +440,43 @@ '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(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 - '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 + 'D99_TEMP': 4, # D98(D99) Conductivity sensor temperature value + 'BRD_TEMP': 5, # Barometric temperature sensor + 'D16_TEMP': 6, # D16(D17) Conductivity sensor temperature value + 'D28_TEMP': 7, # D28(D27) Conductivity sensor temperature value + 'D30_TEMP': 8, # D30(D29) Conductivity sensor temperature value + 'D44_TEMP': 9, # D44(D43) Conductivity sensor temperature value + 'D75_TEMP': 10, # D75(D74) Conductivity sensor temperature value + 'D4_AVG_TEMP': 11, # D4 Filtered value + 'D50_AVG_TEMP': 12, # D50 Filtered value + 'D99_AVG_TEMP': 13, # D99 Filtered value + 'D28_AVG_TEMP': 14, # D28 Filtered value + 'D30_AVG_TEMP': 15, # D30 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 } created_enum = DialinEnum('DDTemperatureSensorNames', members) # Add aliases extend_enum(created_enum, 'FIRST_PRESSURE_SENSOR', created_enum.D9_TEMP.value) extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.D87_TEMP.value if GlobalVariables().HW_BETA_1_9 == True else created_enum.D41_TEMP.value) extend_enum(created_enum, 'FIRST_CONDUCTIVITY_SENSOR', created_enum.D16_TEMP.value) - extend_enum(created_enum, 'LAST_CONDUCTIVITY_SENSOR', created_enum.D99_TEMP.value if GlobalVariables().HW_BETA_1_9 == True else created_enum.D75_TEMP.value) + extend_enum(created_enum, 'LAST_CONDUCTIVITY_SENSOR', created_enum.D75_TEMP.value) + extend_enum(created_enum, 'FIRST_AVERAGE_SENSOR', created_enum.D4_AVG_TEMP.value) + extend_enum(created_enum, 'LAST_AVERAGE_SENSOR', created_enum.D30_AVG_TEMP.value) # Add aliases to be searchable (listed when pressed TAB) created_enum._member_names_.append('FIRST_PRESSURE_SENSOR') created_enum._member_names_.append('LAST_PRESSURE_SENSOR') created_enum._member_names_.append('FIRST_CONDUCTIVITY_SENSOR') created_enum._member_names_.append('LAST_CONDUCTIVITY_SENSOR') + created_enum._member_names_.append('FIRST_AVERAGE_SENSOR') + created_enum._member_names_.append('FIRST_AVERAGE_SENSOR') return created_enum @@ -488,7 +498,7 @@ '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 + 'D85_VALV': 15, # Valve De-scaler (D85) 'D23_VALV': 16, # Balancing chamber Valve 1 (D23) 'D19_VALV': 17, # Balancing chamber Valve 2 (D19) 'D25_VALV': 18, # Balancing chamber Valve 3 (D25)