Initial changes for generator updates

Author: Baldwin

openxc/generator/coder.py

@@ -231,7 +231,7 @@ def _build_signals(self):
         lines = []
         lines.append("const int MAX_SIGNAL_COUNT = %d;" %
                 self._max_signal_count())
-        lines.append("CanSignal SIGNALS[][MAX_SIGNAL_COUNT] = {")
+        lines.append("const CanSignal SIGNALS[][MAX_SIGNAL_COUNT] __attribute__ ((section(\".rodata._ZL7SIGNALS\"))) = {")
 
         def block(message_set):
             lines = []
@@ -322,8 +322,8 @@ def block(message_set):
                             line += ("can::read::translateSignal("
                                         "&SIGNALS[%d][%d], message, " %
                                         (message_set.index, signal.array_index))
-                            line += ("SIGNALS[%d], getSignalCount(), pipeline); // %s" % (
-                                message_set.index, signal.name))
+                            line += ("SIGNALS[%d], SIGNAL_MANAGERS[%d], getSignalCount(), pipeline); // %s" % (
+                                message_set.index, message_set.index, signal.name))
                             lines.append(line)
                         lines.append(" " * 16 + "break;")
                 lines.append(" " * 12 + "}")

openxc/generator/signals.cpp.footer

@@ -6,15 +6,15 @@ int openxc::signals::getCommandCount() {
     return getActiveMessageSet()->commandCount;
 }
 
-CanMessageDefinition* openxc::signals::getMessages() {
+const CanMessageDefinition* openxc::signals::getMessages() {
     return CAN_MESSAGES[getActiveMessageSet()->index];
 }
 
 int openxc::signals::getMessageCount() {
     return getActiveMessageSet()->messageCount;
 }
 
-CanSignal* openxc::signals::getSignals() {
+const CanSignal* openxc::signals::getSignals() {
     return SIGNALS[getActiveMessageSet()->index];
 }
 
@@ -30,11 +30,11 @@ int openxc::signals::getCanBusCount() {
     return getActiveMessageSet()->busCount;
 }
 
-CanMessageSet* openxc::signals::getActiveMessageSet() {
+const CanMessageSet* openxc::signals::getActiveMessageSet() {
     return &MESSAGE_SETS[getConfiguration()->messageSetIndex];
 }
 
-CanMessageSet* openxc::signals::getMessageSets() {
+const CanMessageSet* openxc::signals::getMessageSets() {
     return MESSAGE_SETS;
 }
 

openxc/generator/signals.cpp.header

@@ -16,6 +16,7 @@
 namespace can = openxc::can;
 
 using openxc::util::log::debug;
+using openxc::util::time::FrequencyClock;
 using openxc::pipeline::Pipeline;
 using openxc::config::getConfiguration;
 using openxc::can::read::booleanDecoder;

openxc/generator/structures.py

@@ -487,7 +487,7 @@ def _invert_bit_index(cls, bit_index, length):
         return inverted_index
 
     def __str__(self):
-        result =  ("{message: &CAN_MESSAGES[%d][%d], genericName: \"%s\", bitPosition: %s, bitSize: %d, factor: %f, offset: %f, minValue: %f, maxValue: %f, frequencyClock: {%f}, sendSame: %s, forceSendChanged: %s, " % (
+        result =  ("{message: &CAN_MESSAGES[%d][%d], genericName: \"%s\", bitPosition: %s, bitSize: %d, factor: %f, offset: %f, minValue: %f, maxValue: %f, frequency: %f, sendSame: %s, forceSendChanged: %s, " % (
                 self.message_set.index,
                 self.message_set.lookup_message_index(self.message),
                 self.generic_name, self.bit_position, self.bit_size,