eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

meier/ImtqHandler #44

Merged
muellerr merged 25 commits from meier/ImtqHandler into develop 2021-06-21 17:47:22 +02:00
Conversation 0 Commits 25 Files Changed 21 +5 -5
7 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4b4ac7902f - Show all commits

2
bsp_q7s/ObjectFactory.cpp
View File

@ -37,7 +37,7 @@
#include <mission/devices/devicedefinitions/RadSensorDefinitions.h> #include <mission/devices/devicedefinitions/RadSensorDefinitions.h>
#include <mission/devices/devicedefinitions/Max31865Definitions.h> #include <mission/devices/devicedefinitions/Max31865Definitions.h>
#include <mission/utility/TmFunnel.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/UartComIF.h"
#include "fsfw_hal/linux/uart/UartCookie.h" #include "fsfw_hal/linux/uart/UartCookie.h"

3
linux/CMakeLists.txt
View File

@ -2,4 +2,5 @@ add_subdirectory(csp)
add_subdirectory(utility) add_subdirectory(utility)
add_subdirectory(boardtest) add_subdirectory(boardtest)
add_subdirectory(devices) add_subdirectory(devices)
add_subdirectory(fsfwconfig) add_subdirectory(fsfwconfig)
add_subdirectory(obc)

2
linux/fsfwconfig/FSFWConfig.h.in
View File

@ -68,6 +68,6 @@ static constexpr uint8_t FSFW_CSB_FIFO_DEPTH = 6;
static constexpr size_t FSFW_PRINT_BUFFER_SIZE = 124; 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_ */ #endif /* CONFIG_FSFWCONFIG_H_ */

2
mission/obc/CCSDSIPCoreBridge.cpp → linux/obc/CCSDSIPCoreBridge.cpp
View File

@ -1,7 +1,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <fcntl.h> #include <fcntl.h>
#include <mission/obc/CCSDSIPCoreBridge.h> #include <linux/obc/CCSDSIPCoreBridge.h>
CCSDSIPCoreBridge::CCSDSIPCoreBridge(object_id_t objectId, object_id_t tcDestination, CCSDSIPCoreBridge::CCSDSIPCoreBridge(object_id_t objectId, object_id_t tcDestination,
object_id_t tmStoreId, object_id_t tcStoreId, LinuxLibgpioIF* gpioComIF, object_id_t tmStoreId, object_id_t tcStoreId, LinuxLibgpioIF* gpioComIF,

0
mission/obc/CCSDSIPCoreBridge.h → linux/obc/CCSDSIPCoreBridge.h
View File

0
mission/obc/CMakeLists.txt → linux/obc/CMakeLists.txt
View File

1
mission/CMakeLists.txt
View File

@ -1,4 +1,3 @@
add_subdirectory(core) add_subdirectory(core)
add_subdirectory(devices) add_subdirectory(devices)
add_subdirectory(obc)
add_subdirectory(utility) add_subdirectory(utility)