moved stuff to linux folder
This commit is contained in:
parent
b5fa151415
commit
bb7eb5edec
@ -58,12 +58,9 @@ if(TGT_BSP)
|
|||||||
if(${TGT_BSP} MATCHES "arm/q7s" OR ${TGT_BSP} MATCHES "arm/raspberrypi")
|
if(${TGT_BSP} MATCHES "arm/q7s" OR ${TGT_BSP} MATCHES "arm/raspberrypi")
|
||||||
set(ROOT_CONFIG_FOLDER TRUE)
|
set(ROOT_CONFIG_FOLDER TRUE)
|
||||||
set(FSFW_CONFIG_PATH "fsfwconfig")
|
set(FSFW_CONFIG_PATH "fsfwconfig")
|
||||||
|
set(ADD_LINUX_FILES TRUE)
|
||||||
|
set(ADD_CSP_LIB TRUE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(${TGT_BSP} MATCHES "arm/q7s")
|
|
||||||
set(ADD_CSP_LIB TRUE)
|
|
||||||
endif()
|
|
||||||
set(ADD_LINUX_FILES TRUE)
|
|
||||||
else()
|
else()
|
||||||
# Required by FSFW library
|
# Required by FSFW library
|
||||||
set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig")
|
set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig")
|
||||||
|
@ -1,8 +1,4 @@
|
|||||||
target_sources(${TARGET_NAME} PRIVATE
|
target_sources(${TARGET_NAME} PRIVATE
|
||||||
cookies/CspCookie.cpp
|
|
||||||
cookies/I2cCookie.cpp
|
|
||||||
CspComIF.cpp
|
|
||||||
I2cComIF.cpp
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,2 +1,4 @@
|
|||||||
add_subdirectory(gpio)
|
add_subdirectory(gpio)
|
||||||
|
add_subdirectory(i2c)
|
||||||
|
add_subdirectory(csp)
|
||||||
|
|
||||||
|
8
linux/csp/CMakeLists.txt
Normal file
8
linux/csp/CMakeLists.txt
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
target_sources(${TARGET_NAME} PUBLIC
|
||||||
|
CspComIF.cpp
|
||||||
|
CspCookie.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
|||||||
#include "CspComIF.h"
|
#include "CspComIF.h"
|
||||||
#include "cookies/CspCookie.h"
|
#include "CspCookie.h"
|
||||||
|
|
||||||
#include <fsfw/serviceinterface/ServiceInterfaceStream.h>
|
#include <fsfw/serviceinterface/ServiceInterfaceStream.h>
|
||||||
#include <csp/drivers/can_socketcan.h>
|
#include <csp/drivers/can_socketcan.h>
|
||||||
@ -7,7 +7,6 @@
|
|||||||
|
|
||||||
CspComIF::CspComIF(object_id_t objectId) :
|
CspComIF::CspComIF(object_id_t objectId) :
|
||||||
SystemObject(objectId) {
|
SystemObject(objectId) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CspComIF::~CspComIF() {
|
CspComIF::~CspComIF() {
|
8
linux/i2c/CMakeLists.txt
Normal file
8
linux/i2c/CMakeLists.txt
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
target_sources(${TARGET_NAME} PUBLIC
|
||||||
|
I2cComIF.cpp
|
||||||
|
I2cCookie.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
|||||||
#include <bsp_q7s/comIF/I2cComIF.h>
|
#include "I2cComIF.h"
|
||||||
#include <fsfw/serviceinterface/ServiceInterfaceStream.h>
|
#include <fsfw/serviceinterface/ServiceInterface.h>
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
@ -1,9 +1,9 @@
|
|||||||
#ifndef BSP_Q7S_COMIF_I2COMIF_H_
|
#ifndef BSP_Q7S_COMIF_I2COMIF_H_
|
||||||
#define BSP_Q7S_COMIF_I2COMIF_H_
|
#define BSP_Q7S_COMIF_I2COMIF_H_
|
||||||
|
|
||||||
|
#include "I2cCookie.h"
|
||||||
#include <fsfw/objectmanager/SystemObject.h>
|
#include <fsfw/objectmanager/SystemObject.h>
|
||||||
#include <fsfw/devicehandlers/DeviceCommunicationIF.h>
|
#include <fsfw/devicehandlers/DeviceCommunicationIF.h>
|
||||||
#include <bsp_q7s/comIF/cookies/I2cCookie.h>
|
|
||||||
|
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <vector>
|
#include <vector>
|
@ -1,4 +1,4 @@
|
|||||||
#include <bsp_q7s/comIF/cookies/I2cCookie.h>
|
#include "I2cCookie.h"
|
||||||
|
|
||||||
I2cCookie::I2cCookie(address_t i2cAddress_, size_t maxReplyLen_,
|
I2cCookie::I2cCookie(address_t i2cAddress_, size_t maxReplyLen_,
|
||||||
std::string deviceFile_) :
|
std::string deviceFile_) :
|
Loading…
Reference in New Issue
Block a user