Move callback call to decoder

Author: bessman

src/pyccp/daq.py

@@ -139,25 +139,18 @@ def __init__(
         None.
         """
         self._number = number
-        self.elements = elements
+        self.elements = {e.name: e for e in elements}
         self._assign_element_numbers()
-        self._callbacks = {e.name: e.callback for e in elements if e.callback}
         super().__init__(
             frame_id=number,
             name=str(number),
             length=length,
-            signals=self.elements,
+            signals=elements,
         )
 
-    def decode(self, data, **kwargs):
-        decoded = super().decode(data, **kwargs)
-        for k, v in decoded.items():
-            if k in self._callbacks:
-                self._callbacks[k](v)
-
     def _assign_element_numbers(self):
         start_byte = 0
-        for e in self.elements:
+        for e in self.elements.values():
             e.start_byte = start_byte
             start_byte += e.size
 
@@ -166,15 +159,6 @@ def number(self):
         """Get the ODT number."""
         return self._number
 
-    @property
-    def elements(self):
-        """Get Element in the ODT."""
-        return self._signals
-
-    @elements.setter
-    def elements(self, value):
-        self._signals = value
-
 
 class DAQList:
     def __init__(
@@ -194,13 +178,13 @@ def __init__(
         self.apply()
 
     def update(self):
-        elements = (e for odt in self.odts for e in odt.elements)
+        elements = (e for odt in self.odts for e in list(odt.elements.values()))
         self.event_channels = {e.event_channel for e in elements}
 
     def apply(self):
         self.update()
         for i, odt in enumerate(self.odts):
-            for j, e in enumerate(odt.elements):
+            for j, e in enumerate(list(odt.elements.values())):
                 self._node.set_daq_ptr(
                     daq_list_number=self.number,
                     odt_number=i,

src/pyccp/decoder.py

@@ -1,7 +1,7 @@
 import enum
 import queue
 import logging
-from typing import Dict, List
+from typing import Callable, Dict, List, Union
 
 import can
 import cantools
@@ -60,11 +60,7 @@ def on_message_received(self, msg: can.Message):
 class DAQDecoder(can.Listener):
     """Decode incoming messages."""
 
-    def __init__(
-        self,
-        dto_id: int,
-        decoders: List[cantools.database.can.Message],
-    ):
+    def __init__(self, dto_id: int, decoders: List[cantools.database.can.Message]):
         self.dto_id = dto_id
         self.decoders = decoders
         self.queue = queue.Queue()
@@ -80,6 +76,11 @@ def on_message_received(self, msg: can.Message) -> None:
             msg.data[MessageByte.DTO_PID] in (odt.number for odt in self.decoders)
         ):
             pid = msg.data[MessageByte.DTO_PID]
-            decoded = self.decoders[pid].decode(msg.data)
+            decoder = self.decoders[pid]
+            decoded = decoder.decode(msg.data[MessageByte.DAQ_DATA_START :])
+            for element_name, value in decoded.items():
+                element = decoder.elements[element_name]
+                if element.callback:
+                    element.callback(element, decoded)
             self.queue.put(decoded)
             _logger.debug(f"Received DAQ#{pid}: {decoded}")