Linked the TX and RX id's to the generated network definition file

concordia-fsae · Nov 24, 2024 · 9f84564 · 9f84564
1 parent e7394df
commit 9f84564
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/network/definition/templates/MessagePack_generated.c.mako b/network/definition/templates/MessagePack_generated.c.mako
@@ -10,6 +10,7 @@
 
 #include "CAN/CanTypes.h"
 #include "MessagePack_generated.h"
+#include "NetworkDefines_generated.h"
 
 /******************************************************************************
  *                     P R I V A T E  F U N C T I O N S

diff --git a/network/definition/templates/MessageUnpack_generated.c.mako b/network/definition/templates/MessageUnpack_generated.c.mako
@@ -44,9 +44,9 @@ void CANRX_${bus.upper()}_unpackMessage(const uint16_t id, const CAN_data_T *con
     {
     %for message in node.received_msgs:
       %if bus in node.received_msgs[message].source_buses:
-        case ${node.received_msgs[message].id}U:
+        case CAN_${bus.upper()}_${message}_ID:
         %if node.received_msgs[message].node_ref.duplicateNode:
-          CANRX_${bus.upper()}_unpack_${node.received_msgs[message].node_ref.name.upper()}_${node.received_msgs[message].name.split('_')[1]}(&CANRX_${bus.upper()}_signals, &CANRX_${bus.upper()}_messages, m, ${node.received_msgs[message].node_ref.offset});
+            CANRX_${bus.upper()}_unpack_${node.received_msgs[message].node_ref.name.upper()}_${node.received_msgs[message].name.split('_')[1]}(&CANRX_${bus.upper()}_signals, &CANRX_${bus.upper()}_messages, m, ${node.received_msgs[message].node_ref.offset});
         %else:
             CANRX_${bus.upper()}_unpack_${node.received_msgs[message].name}(&CANRX_${bus.upper()}_signals, &CANRX_${bus.upper()}_messages, m);
         %endif
@@ -135,3 +135,5 @@ CANRX_MESSAGE_health_E CANRX_${bus.upper()}_validate_${msg_name}(${arg})
     %endfor
   %endfor
 %endfor
+
+
diff --git a/network/definition/templates/message_pack.mako b/network/definition/templates/message_pack.mako
@@ -25,7 +25,10 @@ static bool pack_${bus.upper()}_${msg.name}(CAN_data_T *message, const uint8_t c
 <%def name="make_packtable(bus, msgs, cycle_time)">
 const packTable_S ${bus.upper()}_packTable_${cycle_time}ms [] = {
   %for msg in msgs:
-    { &pack_${bus.upper()}_${msg.name}, ${hex(msg.id)}, ${msg.length_bytes}U },
+    <%
+      msg_name = msg.node_ref.name.upper() + '_' + msg.name.split('_')[1] if msg.node_ref.duplicateNode else msg.name
+    %>\
+    { &pack_${bus.upper()}_${msg.name}, CAN_${bus.upper()}_${msg_name}_ID, ${msg.length_bytes}U },
   %endfor
 };
 </%def>