Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -rc78812412148e14aaf2ab5d003dc140feda5a68c -rafb299e7aca45969aed5075bc951b97058ddb2b6 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision c78812412148e14aaf2ab5d003dc140feda5a68c) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision afb299e7aca45969aed5075bc951b97058ddb2b6) @@ -353,12 +353,21 @@ def _create_dd_level_sensor_names(self): - members = { - '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 - } + if GlobalVariables().HW_BETA_1_9 == True: + members = { + '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 + 'D98_LEVEL': 3, # D98 Conductivity Level Sensor + 'NUM_OF_LEVELS': 4, # Number of Level Sensors + } + else: + members = { + '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 + } return unique(DialinEnum('DDLevelSensorNames', members)) @@ -402,13 +411,13 @@ 'D78_TEMP': 1, # Heat exchanger Outlet temperature sensor 'D4_TEMP': 2, # Hydraulics primary heater temperature sensor 'D50_TEMP': 3, # Trimmer heater temperature sensor - 'D99_TEMP': 4, # D98(D99) Conductivity sensor temperature value + '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': 20, # D75(D74) 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