Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -r44e3f5623aeafcb704c4cd2d0e4af953e5579a8d -rd2774cbe954e861f6ec31d44134e74c8e9d66f22 --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 44e3f5623aeafcb704c4cd2d0e4af953e5579a8d) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision d2774cbe954e861f6ec31d44134e74c8e9d66f22) @@ -95,11 +95,11 @@ @unique class FPPressureSensorNames(DialinEnum): - M1_PRES = 0 # Water inlet pressure before regulator - M3_PRES = 1 # Water inlet pressure after regulator - P8_PRES = 2 # Water inlet pressure before the conductivity sensor - P13_PRES = 3 # Pressure before the RO filter - P17_PRES = 4 # Pressure after the RO filter + M3_PRES = 0 # Water inlet pressure before regulator + 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 + P46_PRES = 4 # Pressure after the RO filter NUM_OF_FP_PRES_SENSORS = 5 # Number of Pressure Sensors @unique Index: leahi_dialin/fp/modules/pressure_sensors.py =================================================================== diff -u -r00412d78bda4176d5c45a3778cb90ad907928965 -rd2774cbe954e861f6ec31d44134e74c8e9d66f22 --- leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 00412d78bda4176d5c45a3778cb90ad907928965) +++ leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision d2774cbe954e861f6ec31d44134e74c8e9d66f22) @@ -47,11 +47,11 @@ self._handler_pressure_sync) self.fp_pressures = { - FPPressureSensorNames.M1_PRES.name: 0.0, FPPressureSensorNames.M3_PRES.name: 0.0, FPPressureSensorNames.P8_PRES.name: 0.0, FPPressureSensorNames.P13_PRES.name: 0.0, - FPPressureSensorNames.P17_PRES.name: 0.0 + FPPressureSensorNames.P17_PRES.name: 0.0, + FPPressureSensorNames.P46_PRES.name: 0.0 } self.fp_pressure_timestamp = 0.0 @@ -66,15 +66,15 @@ @return: none """ - self.fp_pressures[FPPressureSensorNames.M1_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] self.fp_pressures[FPPressureSensorNames.M3_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] self.fp_pressures[FPPressureSensorNames.P8_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] self.fp_pressures[FPPressureSensorNames.P13_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] self.fp_pressures[FPPressureSensorNames.P17_PRES.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] + self.fp_pressures[FPPressureSensorNames.P46_PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] self.fp_pressure_timestamp = timestamp