Index: leahi_dialin/ro/modules/pressure_sensors.py =================================================================== diff -u -r8c0c7ee456674a5b9c7c407cc03deee0c23993f2 -rfd6afc8cae0125a31ecde91cb364dc55b3afb2d9 --- leahi_dialin/ro/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 8c0c7ee456674a5b9c7c407cc03deee0c23993f2) +++ leahi_dialin/ro/modules/pressure_sensors.py (.../pressure_sensors.py) (revision fd6afc8cae0125a31ecde91cb364dc55b3afb2d9) @@ -50,6 +50,7 @@ self.pressure_sensor_water_inlet_pre_cond = 0.0 self.pressure_sensor_pre_ro_filter = 0.0 self.pressure_sensor_post_ro_filter = 0.0 + self.pressure_sensor_pre_ro_pump = 0.0 @publish([ @@ -59,6 +60,7 @@ "pressure_sensor_water_inlet_pre_cond", "pressure_sensor_pre_ro_filter", "pressure_sensor_post_ro_filter", + "pressure_sensor_pre_ro_pump", ]) def _handler_pressure_sync(self, message, timestamp=0.0): """ @@ -79,12 +81,15 @@ message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) post_ro = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) + pre_rop = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) self.pressure_sensor_water_inlet_pre_reg = pre_reg_wi[0] self.pressure_sensor_water_inlet_post_reg = post_reg_wi[0] self.pressure_sensor_water_inlet_pre_cond = pre_cond_wi[0] self.pressure_sensor_pre_ro_filter = pre_ro[0] self.pressure_sensor_post_ro_filter = post_ro[0] + self.pressure_sensor_pre_ro_pump = pre_rop[0] self.ro_pressure_timestamp = timestamp def cmd_pressure_sensor_override(self, pressure: float, sensor: int, reset: int = NO_RESET) -> int: Index: tests/test_ro.py =================================================================== diff -u -rabb4a5d8265656b4045fe456b24bdad67e02facb -rfd6afc8cae0125a31ecde91cb364dc55b3afb2d9 --- tests/test_ro.py (.../test_ro.py) (revision abb4a5d8265656b4045fe456b24bdad67e02facb) +++ tests/test_ro.py (.../test_ro.py) (revision fd6afc8cae0125a31ecde91cb364dc55b3afb2d9) @@ -54,7 +54,8 @@ ", PRo, " + '{:9.2f}'.format(ro.pressures.pressure_sensor_water_inlet_post_reg) + \ ", PC2o, " + '{:9.2f}'.format(ro.pressures.pressure_sensor_water_inlet_pre_cond) + \ ", PPo, " + '{:9.2f}'.format(ro.pressures.pressure_sensor_pre_ro_filter) + \ - ", PMp, " + '{:9.2f}'.format(ro.pressures.pressure_sensor_post_ro_filter) + ", PMp, " + '{:9.2f}'.format(ro.pressures.pressure_sensor_post_ro_filter) + \ + ", PPi, " + '{:9.2f}'.format(ro.pressures.pressure_sensor_pre_ro_pump) # valves = ", VWi, " + '{:4d}'.format(ro.valves.valve_state_VWI) + \ # ", VFb, " + '{:4d}'.format(ro.valves.valve_state_VFB) + \ # ", VFf, " + '{:4d}'.format(ro.valves.valve_state_VFF) + \