Closes #29

core/dbc_decoder.h

@@ -17,6 +17,7 @@
 #include <vector>
 
 #include "decode_database.h"
+#include "multiplex_graph.h"
 
 /**
  * @brief Raw CAN frame used for runtime or trace decoding.
@@ -128,18 +129,14 @@ private:
 
     static bool IsValidDefinition(const DecodeSignal &signal, std::uint8_t dlc);
 
-    struct SelectorState {
-        const DecodeSignal *definition = nullptr;
-        bool valid = false;
-        bool available = false;
-        std::uint64_t value = 0U;
-    };
-
-    static SelectorState ReadSelector(const DecodeFrame &definition, const RawCanFrame &frame);
+    static SignalDecodeStatus ActivationStatus(std::size_t index,
+                                               const DecodeFrame &definition,
+                                               const RawCanFrame &frame,
+                                               const dbc_detail::MultiplexGraph &graph);
     static DecodedSignalValue DecodeOneSignal(const DecodeSignal &signal,
                                               std::uint8_t dlc,
                                               const RawCanFrame &frame,
-                                              const SelectorState &selector);
+                                              SignalDecodeStatus activation);
 
     static bool ExtractUnsigned(const std::vector<std::uint8_t> &data,
                                 const DecodeSignal &signal,