Index: dialin/dg/ro_pump.py =================================================================== diff -u -r818d439ae9c03d90902013ae07872e4e58f52890 -r9f62767726810e6b166b8f3ee197443b9223b74d --- dialin/dg/ro_pump.py (.../ro_pump.py) (revision 818d439ae9c03d90902013ae07872e4e58f52890) +++ dialin/dg/ro_pump.py (.../ro_pump.py) (revision 9f62767726810e6b166b8f3ee197443b9223b74d) @@ -72,6 +72,14 @@ """ return self.target_pressure_psi + def get_target_flow_rate(self): + """ + Gets the target flow rate (lpm) + + @return: The measured flow rate (float) + """ + return self.target_flow_lpm + def get_measured_flow_rate(self): """ Gets the measured flow rate (lpm) @@ -105,7 +113,7 @@ return self.measured_raw_flow_rate_with_conc_pumps_mlp @publish(["target_pressure_psi", "measured_flow_rate_lpm", "pwm_duty_cycle_pct", "ro_pump_state", - "feedback_duty_cycle_pct", "measured_raw_flow_rate_with_conc_pumps_mlp"]) + "target_flow_lpm", "feedback_duty_cycle_pct", "measured_raw_flow_rate_with_conc_pumps_mlp"]) def _handler_ro_pump_sync(self, message): """ Handles published ro pump data messages. RO pump data are captured @@ -115,19 +123,19 @@ @return: None """ - self.target_pressure_psi = struct.unpack('f', bytearray( + self.target_pressure_psi = struct.unpack('