Merge pull request #521 from ut-issl/develop

Merge develop to main for hotfix #519
ut-issl · Oct 17, 2023 · 83a0846 · 83a0846
2 parents 45c0c76 + 956b9c6
commit 83a0846
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/components/real/cdh/on_board_computer_with_c2a.cpp b/src/components/real/cdh/on_board_computer_with_c2a.cpp
@@ -9,7 +9,9 @@
 #ifdef USE_C2A
 #include "src_core/c2a_core_main.h"
 
-#if C2A_CORE_VER_MAJOR == 4
+#if !defined(C2A_CORE_VER_MAJOR)
+#warning "C2A_CORE_VER_MAJOR is not defined"   # this flag is defined after c2a-core v3.5.0
+#elif C2A_CORE_VER_MAJOR == 4
 // c2a-core v4
 #include "src_core/system/task_manager/task_dispatcher.h"
 #include "src_core/system/time_manager/time_manager.h"
@@ -22,7 +24,6 @@
 #else
 #error "c2a-core version is not supported"
 #endif  // c2a-core version header
-
 #endif  // USE_C2A
 
 std::map<int, UartPort*> ObcWithC2a::com_ports_c2a_;

diff --git a/src/components/real/communication/wings_command_sender_to_c2a.cpp b/src/components/real/communication/wings_command_sender_to_c2a.cpp
@@ -12,7 +12,10 @@
 #include <regex>
 
 #ifdef USE_C2A
-#if C2A_CORE_VER_MAJOR == 4
+#include "src_core/c2a_core_main.h"
+#if !defined(C2A_CORE_VER_MAJOR)
+#warning "C2A_CORE_VER_MAJOR is not defined"   # this flag is defined after c2a-core v3.5.0
+#elif C2A_CORE_VER_MAJOR == 4
 // c2a-core v4
 #include "src_core/tlm_cmd/common_cmd_packet_util.h"
 #elif C2A_CORE_VER_MAJOR <= 3