Merge pull request #40 from ryan-barry-99/main

Update Object dictionary
rit-spex · Feb 2, 2024 · 9a6ce13 · 9a6ce13
2 parents a8480d3 + 185c654
commit 9a6ce13
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/rover-code/embedded/main_body_board/include/CAN.h b/rover-code/embedded/main_body_board/include/CAN.h
@@ -1,8 +1,10 @@
 #ifndef CAN_H
 #define CAN_H
 #include <FlexCAN_T4.h>
+#include <unordered_map>
 #include "pinout.h"
-#include "object_dict.h"
+
+using ObjectDictionary = std::unordered_map<uint32_t, CAN_message_t>;
 
 class CAN
 {
@@ -28,7 +30,7 @@ class CAN
     // static void staticCanSniff(const CAN_message_t &msg);
 
     ObjectDictionary m_objectDict;
-    ObjectDictionary::Type
+
     private:
 
     FlexCAN_T4<CAN3, RX_SIZE_256, TX_SIZE_16> m_CAN;

diff --git a/rover-code/embedded/main_body_board/include/object_dict.h b/rover-code/embedded/main_body_board/include/object_dict.h