2021-06-21 17:47:22 +02:00 · 2021-06-15 17:18:39 +02:00
7 changed files with 5 additions and 5 deletions
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@ -37,7 +37,7 @@
 #include <mission/devices/devicedefinitions/RadSensorDefinitions.h>
 #include <mission/devices/devicedefinitions/Max31865Definitions.h>
 #include <mission/utility/TmFunnel.h>
-#include <mission/obc/CCSDSIPCoreBridge.h>
+#include <linux/obc/CCSDSIPCoreBridge.h>

 #include "fsfw_hal/linux/uart/UartComIF.h"
 #include "fsfw_hal/linux/uart/UartCookie.h"
--- a/linux/CMakeLists.txt
+++ b/linux/CMakeLists.txt
@ -2,4 +2,5 @@ add_subdirectory(csp)
 add_subdirectory(utility)
 add_subdirectory(boardtest)
 add_subdirectory(devices)
-add_subdirectory(fsfwconfig)
+add_subdirectory(fsfwconfig)
+add_subdirectory(obc)
--- a/linux/fsfwconfig/FSFWConfig.h.in
+++ b/linux/fsfwconfig/FSFWConfig.h.in
@ -68,6 +68,6 @@ static constexpr uint8_t FSFW_CSB_FIFO_DEPTH = 6;
 static constexpr size_t FSFW_PRINT_BUFFER_SIZE = 124;
 }

-#define FSFW_HAL_LINUX_SPI_WIRETAPPING  1
+#define FSFW_HAL_LINUX_SPI_WIRETAPPING  0

 #endif /* CONFIG_FSFWCONFIG_H_ */
--- a/mission/obc/CCSDSIPCoreBridge.cpp
+++ b/mission/obc/CCSDSIPCoreBridge.cpp
@ -1,7 +1,7 @@
 #include <sys/mman.h>
 #include <fcntl.h>

-#include <mission/obc/CCSDSIPCoreBridge.h>
+#include <linux/obc/CCSDSIPCoreBridge.h>

 CCSDSIPCoreBridge::CCSDSIPCoreBridge(object_id_t objectId, object_id_t tcDestination,
        object_id_t tmStoreId, object_id_t tcStoreId, LinuxLibgpioIF* gpioComIF,
--- a/mission/obc/CCSDSIPCoreBridge.h
+++ b/mission/obc/CCSDSIPCoreBridge.h
--- a/mission/obc/CMakeLists.txt
+++ b/mission/obc/CMakeLists.txt
--- a/mission/CMakeLists.txt
+++ b/mission/CMakeLists.txt
@ -1,4 +1,3 @@
 add_subdirectory(core)
 add_subdirectory(devices)
-add_subdirectory(obc)
 add_subdirectory(utility)