Index: leahi_dialin/dd/modules/rinse_pump.py =================================================================== diff -u -r5f282b10ac6cbf77b3f5852af81c6d8b9094b561 -ra9aad7369cef41cac01cdc0b3288924e3361d2fb --- leahi_dialin/dd/modules/rinse_pump.py (.../rinse_pump.py) (revision 5f282b10ac6cbf77b3f5852af81c6d8b9094b561) +++ leahi_dialin/dd/modules/rinse_pump.py (.../rinse_pump.py) (revision a9aad7369cef41cac01cdc0b3288924e3361d2fb) @@ -47,10 +47,12 @@ self._handler_rinse_pump_sync) self.d79_state = 0 + self.d79_pump_pwm = 0.0 + self.d79_pump_rpm = 0 self.dd_rinse_pump_timestamp = 0 @publish(["msg_id_dd_rinse_pump_data", - "d79_state", + "d79_state", "d79_pump_pwm", "d79_pump_rpm", "dd_rinse_pump_timestamp"]) def _handler_rinse_pump_sync(self, message, timestamp=0.0): """ @@ -62,6 +64,10 @@ self.d79_state = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] + self.d79_pump_pwm = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] + self.d79_pump_rpm = struct.unpack('I', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] self.dd_rinse_pump_timestamp = timestamp