Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r27ee509d072faa466186ebe4d1f105c76fb8c62b -rd3147dff7c95e3ab5a507591ce5b9e1e74911a19 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 27ee509d072faa466186ebe4d1f105c76fb8c62b) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision d3147dff7c95e3ab5a507591ce5b9e1e74911a19) @@ -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)) @@ -411,18 +414,19 @@ '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 - 'D99_TEMP': 10, # 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': 10, # D75(D74) Conductivity sensor temperature value + 'D99_TEMP': 11, # D98(D99) 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 + '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 @@ -437,22 +441,26 @@ '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 + 'D99_TEMP': 11, # D98(D99) 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) Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d -rd3147dff7c95e3ab5a507591ce5b9e1e74911a19 --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision d3147dff7c95e3ab5a507591ce5b9e1e74911a19) @@ -318,7 +318,8 @@ 'P8_PRES' : 1, # Water inlet pressure after regulator 'P13_PRES' : 2, # Water inlet pressure before the conductivity sensor 'P17_PRES' : 3, # Pressure before the RO filter - 'NUM_OF_FP_PRES_SENSORS' : 4, # Number of Pressure Sensors + 'P46_PRES' : 4, # Pressure after the RO filter + 'NUM_OF_FP_PRES_SENSORS' : 5, # Number of Pressure Sensors } return unique(DialinEnum('FPPressureSensorNames', members)) @@ -353,21 +354,22 @@ 'P8_TEMP' : 1, # Temperature before inlet conductivity sensor (P8) 'P13_TEMP' : 2, # Temperature before RO filter (P13) 'P17_TEMP' : 3, # Temperature after RO filter (P17) - 'P10_TEMP' : 4, # P10 temperature from inlet conductivity sensor. - 'P19_TEMP' : 5, # P19 temperature from outlet conductivity sensor. - 'P7_TEMP' : 6, # Temperature at p7 flow meter - 'P16_TEMP' : 7, # Temperature at p16 flow meter - 'P7_INTERNAL_TEMP' : 8, # Interal Temperature at p7 flow meter - 'P16_INTERNAL_TEMP' : 9, # Interal Temperature at p16 flow meter - 'NUM_OF_TEMPERATURE_SENSORS' : 10, # Number of Temperature Sensors + 'P46_TEMP' : 4, # Temperature after sediment filter (P46) + 'P10_TEMP' : 5, # P10 temperature from inlet conductivity sensor. + 'P19_TEMP' : 6, # P19 temperature from outlet conductivity sensor. + 'P7_TEMP' : 7, # Temperature at p7 flow meter + 'P16_TEMP' : 8, # Temperature at p16 flow meter + 'P7_INTERNAL_TEMP' : 9, # Interal Temperature at p7 flow meter + 'P16_INTERNAL_TEMP' : 10, # Interal Temperature at p16 flow meter + 'NUM_OF_TEMPERATURE_SENSORS' : 11, # Number of Temperature Sensors } # Create the enum created_enum = DialinEnum('FPTemperatureSensorNames', members) # Add aliases extend_enum(created_enum, 'FIRST_PRESSURE_SENSOR', created_enum.M3_TEMP.value) - extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.P46_TEMP.value if GlobalVariables().HW_BETA_1_9 == True else created_enum.P17_TEMP.value) + extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.P46_TEMP.value if GlobalVariables().HW_BETA_1_9 == True else created_enum.P46_TEMP.value) extend_enum(created_enum, 'FIRST_CONDUCTIVITY_SENSOR', created_enum.P10_TEMP.value) extend_enum(created_enum, 'LAST_CONDUCTIVITY_SENSOR', created_enum.P19_TEMP.value) extend_enum(created_enum, 'FIRST_FLOW_SENSOR', created_enum.P7_TEMP.value) Index: leahi_dialin/fp/modules/valves.py =================================================================== diff -u -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d -rd3147dff7c95e3ab5a507591ce5b9e1e74911a19 --- leahi_dialin/fp/modules/valves.py (.../valves.py) (revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d) +++ leahi_dialin/fp/modules/valves.py (.../valves.py) (revision d3147dff7c95e3ab5a507591ce5b9e1e74911a19) @@ -164,11 +164,12 @@ start = self.END_FP_VALVES_STATES end = start + 1 for valve_id in self.valves_sensed_states: + if valve_id.lower().startswith('num'): + continue valve_state_number = struct.unpack('B', bytearray(message['message'][start:end]))[0] self.valves_sensed_states[valve_id] = fp_enum_repository.FPValveStates(valve_state_number).name start = end end += 1 - self.fp_valves_states_timestamp = timestamp