From 185c65414112836e11eaf79c0cf1afb311feb8ef Mon Sep 17 00:00:00 2001 From: Ryan Barry Date: Fri, 2 Feb 2024 15:32:37 -0500 Subject: [PATCH] Update Object dictionary --- rover-code/embedded/main_body_board/include/CAN.h | 6 ++++-- .../embedded/main_body_board/include/object_dict.h | 9 --------- 2 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 rover-code/embedded/main_body_board/include/object_dict.h diff --git a/rover-code/embedded/main_body_board/include/CAN.h b/rover-code/embedded/main_body_board/include/CAN.h index ad8b0cb..30ff113 100644 --- 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 +#include #include "pinout.h" -#include "object_dict.h" + +using ObjectDictionary = std::unordered_map; class CAN { @@ -28,7 +30,7 @@ class CAN // static void staticCanSniff(const CAN_message_t &msg); ObjectDictionary m_objectDict; - ObjectDictionary::Type + private: FlexCAN_T4 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 deleted file mode 100644 index a13cc41..0000000 --- a/rover-code/embedded/main_body_board/include/object_dict.h +++ /dev/null @@ -1,9 +0,0 @@ -class ObjectDictionary -{ - enum Type - { - INT, - FLOAT, - STRING - }; -}; \ No newline at end of file