Index: leahi_dialin/fp/modules/ro_pump.py =================================================================== diff -u -rc3cb761794ec2dd44f4289b2d2441ff6bc037f6a -r7628b7a718a1b52c33f58a6003ef13cba4db5e5d --- leahi_dialin/fp/modules/ro_pump.py (.../ro_pump.py) (revision c3cb761794ec2dd44f4289b2d2441ff6bc037f6a) +++ leahi_dialin/fp/modules/ro_pump.py (.../ro_pump.py) (revision 7628b7a718a1b52c33f58a6003ef13cba4db5e5d) @@ -52,11 +52,15 @@ self.p12_target_pressure = 0.0 self.p12_target_flow = 0.0 self.p12_target_duty_cycle = 0.0 + self.p12_pump_duty_cycle_pct = 0.0 + self.p12_pump_fb_duty_cycle_pct = 0.0 + @publish(["ro_pump_timestamp", "p12_pump_state", "p12_pump_duty_cycle", "p12_pump_fb_duty_cycle", - "p12_pump_speed", "p12_target_pressure", "p12_target_flow", "p12_target_duty_cycle"]) + "p12_pump_speed", "p12_target_pressure", "p12_target_flow", "p12_target_duty_cycle", + "p12_pump_duty_cycle_pct", "p12_pump_fb_duty_cycle_pct" ]) def _handler_pump_sync(self, message, timestamp=0.0): """ Handles published FP ro pump data messages. FP ro pump data is captured @@ -80,6 +84,10 @@ message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] self.p12_target_duty_cycle = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] + self.p12_pump_duty_cycle_pct = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] + self.p12_pump_fb_duty_cycle_pct = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] self.ro_pump_timestamp = timestamp