Index: dialin/dg/flush.py =================================================================== diff -u -r2700dbd3c0ced061a3d8141eb00e9e3a7a3e2817 -recd245adee917edcb2977e109e25b8c98b3dc072 --- dialin/dg/flush.py (.../flush.py) (revision 2700dbd3c0ced061a3d8141eb00e9e3a7a3e2817) +++ dialin/dg/flush.py (.../flush.py) (revision ecd245adee917edcb2977e109e25b8c98b3dc072) @@ -19,10 +19,12 @@ DG_FLUSH_STATE_FLUSH_CONCENTRATE_STRAWS = 5 DG_FLUSH_STATE_FLUSH_R1_TO_R2 = 6 DG_FLUSH_STATE_FLUSH_R2_AND_DRAIN_R1 = 7 - DG_FLUSH_STATE_FLUSH_CIRCULATION = 8 - DG_FLUSH_STATE_CANCEL_BASIC_PATH = 9 - DG_FLUSH_STATE_CANCEL_WATER_PATH = 10 - DG_FLUSH_STATE_COMPLETE = 11 + DG_FLUSH_STATE_FLUSH_DRAIN_LINE = 8 + DG_FLUSH_STATE_FLUSH_CIRCULATION = 9 + DG_FLUSH_STATE_FLUSH_WITH_FRESH_WATER = 10 + DG_FLUSH_STATE_CANCEL_BASIC_PATH = 11 + DG_FLUSH_STATE_CANCEL_WATER_PATH = 12 + DG_FLUSH_STATE_COMPLETE = 13 class FlushMode(_AbstractSubSystem): @@ -41,13 +43,14 @@ self.flush_state = 0 self.overall_elapsed_time = 0 self.state_elapsed_time = 0 + self.flush_drain_line_volume = 0.0 if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id - msg_id = 0#MsgIds.MSG_ID_DG_FLUSH_DATA.value + msg_id = MsgIds.MSG_ID_DG_FLUSH_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_flush_sync) - @_publish(["flush_state", "overall_elapsed_time", "state_elapsed_time"]) + @_publish(["flush_state", "overall_elapsed_time", "state_elapsed_time", "flush_drain_line_volume"]) def _handler_flush_sync(self, message): """ Handles published flush message @@ -61,8 +64,11 @@ message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] state_elapsed_time = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] + drain_line_volume = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] self.flush_state = FlushStates(state).name self.overall_elapsed_time = int(elapsed_time / 1000) self.state_elapsed_time = int(state_elapsed_time / 1000) + self.flush_drain_line_volume = drain_line_volume