Added builder for signal managers to code generator

Author: Baldwin

openxc/generator/coder.py

@@ -32,6 +32,7 @@ def build_source(self):
         lines.extend(self._build_messages())
         lines.extend(self._build_signal_states())
         lines.extend(self._build_signals())
+        lines.extend(self._build_signal_managers())
         lines.extend(self._build_initializers())
         lines.extend(self._build_loop())
         lines.extend(self._build_commands())
@@ -235,16 +236,41 @@ def _build_signals(self):
 
         def block(message_set):
             lines = []
-            i = 1
+            i = 0
             for signal in message_set.all_signals():
                 if not signal.enabled:
                     LOG.warning("Skipping disabled signal '%s' (in 0x%x)" % (
                         signal.generic_name, signal.message.id))
                     continue
-                signal.array_index = i - 1
+                if signal.array_index is None:
+                    signal.array_index = i++
                 lines.append(" " * 8 + "%s" % signal)
                 LOG.info("Added signal '%s'" % signal.generic_name)
-                i += 1
+            return lines
+
+        lines.extend(self._message_set_lister(block))
+        lines.append("};")
+        lines.append("")
+
+        return lines
+
+    def _build_signal_managers(self):
+        lines = []
+        lines.append("SignalManager SIGNAL_MANAGERS[][MAX_SIGNAL_COUNT] = {")
+
+        def block(message_set):
+            lines = []
+            i = 0
+            for signal in message_set.all_signals();
+                if not signal.enabled:
+                    LOG.warning("Skipping manager for disabled signal '%s' (in 0x%x)" % (
+                        signal.generic_name, signal.message.id))
+                    continue
+                if signal.array_index is None:
+                    signal.array_index = i++
+                signal_arr_str = "SIGNALS[%d][%d]" % (signal.message_set.index, signal.array_index)
+                lines.append(" " * 8 + "{signal: &%s, frequencyClock: {%s.frequency}}," % signal_arr_str)
+                LOG.info("Added signal manager '%s'" % signal.generic_name)
             return lines
 
         lines.extend(self._message_set_lister(block))

openxc/generator/signals.cpp.footer

@@ -18,6 +18,10 @@ const CanSignal* openxc::signals::getSignals() {
     return SIGNALS[getActiveMessageSet()->index];
 }
 
+SignalManager* openxc::signals::getSignalManagers() {
+    return SIGNAL_MANAGERS[getActiveMessageSet()->index];
+}
+
 int openxc::signals::getSignalCount() {
     return getActiveMessageSet()->signalCount;
 }