Index: dialin/dg/ro_pump.py =================================================================== diff -u -r7b2d65304d1cc925e5000d9621fa195ce6a08cf1 -r832c90d58ce012f8c4dbfb3cfaa6fcf631724dbb --- dialin/dg/ro_pump.py (.../ro_pump.py) (revision 7b2d65304d1cc925e5000d9621fa195ce6a08cf1) +++ dialin/dg/ro_pump.py (.../ro_pump.py) (revision 832c90d58ce012f8c4dbfb3cfaa6fcf631724dbb) @@ -56,8 +56,8 @@ self.can_interface.register_receiving_publication_function(channel_id, msg_id, self.handler_ro_pump_sync) - self.target_pressure = 0 - self.measured_flow_rate = 0.0 + self.target_pressure_psi = 0 + self.measured_flow_rate_lpm = 0.0 self.pwm_duty_cycle_pct = 0.0 def handler_ro_pump_sync(self, message): @@ -76,8 +76,8 @@ pwm = struct.unpack('f', bytearray( message['message'][self.START_POS_PWM:self.END_POS_PWM])) - self.target_pressure = tgt[0] - self.measured_blood_flow_rate = flow[0] + self.target_pressure_psi = tgt[0] + self.measured_flow_rate_lpm = flow[0] self.pwm_duty_cycle_pct = pwm[0] def cmd_ro_pump_set_point_override(self, pressure, reset=NO_RESET): @@ -122,7 +122,7 @@ """ Constructs and sends the RO rate override command - \param flow: float - flow rate (in mL/min) to override with + \param flow: float - flow rate (in L/min) to override with \param reset: integer - 1 to reset a previous override, 0 to override \returns 1 if successful, zero otherwise """ @@ -148,7 +148,7 @@ else: str_res = str(flo) print( - "RO flow rate overridden to " + str_res + " mL/min: " + + "RO flow rate overridden to " + str_res + " L/min: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]