q7s compiling

This commit is contained in:
Robin Müller 2021-05-17 16:53:06 +02:00 committed by Robin Mueller
parent 6f9a1853ff
commit d380e3106a
10 changed files with 29 additions and 26 deletions

View File

@ -94,9 +94,10 @@ if(TGT_BSP)
else() else()
# Required by FSFW library # Required by FSFW library
set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig") set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig")
set(FSFW_ADDITIONAL_INC_PATH "${COMMON_PATH}/config")
endif() endif()
# Set common config path for FSFW
set(FSFW_ADDITIONAL_INC_PATH "${COMMON_PATH}/config")
# Set for lwgps library # Set for lwgps library
set(LWGPS_CONFIG_PATH "${COMMON_PATH}/config") set(LWGPS_CONFIG_PATH "${COMMON_PATH}/config")

View File

@ -6,7 +6,6 @@ target_sources(${TARGET_NAME} PUBLIC
add_subdirectory(boardconfig) add_subdirectory(boardconfig)
add_subdirectory(comIF) add_subdirectory(comIF)
add_subdirectory(devices)
add_subdirectory(boardtest) add_subdirectory(boardtest)
add_subdirectory(gpio) add_subdirectory(gpio)

View File

@ -1,16 +1,18 @@
#include "ObjectFactory.h" #include "ObjectFactory.h"
#include <OBSWConfig.h> #include "OBSWConfig.h"
#include <tmtc/apid.h> #include "tmtc/apid.h"
#include <devices/addresses.h> #include "devices/addresses.h"
#include <devices/gpioIds.h> #include "devices/gpioIds.h"
#include <tmtc/pusIds.h> #include "tmtc/pusIds.h"
#include <devices/powerSwitcherList.h> #include "devices/powerSwitcherList.h"
#include <devices/spi.h> #include "devices/spi.h"
#include <bsp_q7s/devices/HeaterHandler.h>
#include <bsp_q7s/devices/SolarArrayDeploymentHandler.h>
#include <bsp_q7s/gpio/gpioCallbacks.h> #include <bsp_q7s/gpio/gpioCallbacks.h>
#include <linux/devices/HeaterHandler.h>
#include <linux/devices/SolarArrayDeploymentHandler.h>
#include <linux/devices/SusHandler.h>
#include <mission/core/GenericFactory.h> #include <mission/core/GenericFactory.h>
#include <mission/devices/PDU1Handler.h> #include <mission/devices/PDU1Handler.h>
#include <mission/devices/PDU2Handler.h> #include <mission/devices/PDU2Handler.h>
@ -26,7 +28,7 @@
#include <mission/devices/GyroL3GD20Handler.h> #include <mission/devices/GyroL3GD20Handler.h>
#include <mission/devices/PlocHandler.h> #include <mission/devices/PlocHandler.h>
#include <mission/devices/RadiationSensorHandler.h> #include <mission/devices/RadiationSensorHandler.h>
#include <mission/devices/SusHandler.h>
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h> #include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
#include <mission/devices/devicedefinitions/SyrlinksDefinitions.h> #include <mission/devices/devicedefinitions/SyrlinksDefinitions.h>
@ -42,6 +44,7 @@
#include <linux/uart/UartComIF.h> #include <linux/uart/UartComIF.h>
#include <linux/uart/UartCookie.h> #include <linux/uart/UartCookie.h>
#include <fsfw_hal/linux/i2c/I2cCookie.h> #include <fsfw_hal/linux/i2c/I2cCookie.h>
#include <fsfw_hal/linux/i2c/I2cComIF.h> #include <fsfw_hal/linux/i2c/I2cComIF.h>
#include <fsfw_hal/linux/spi/SpiCookie.h> #include <fsfw_hal/linux/spi/SpiCookie.h>
@ -554,8 +557,7 @@ void ObjectFactory::produce(){
#endif /* TE0720 == 0 */ #endif /* TE0720 == 0 */
new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR, objects::TM_STORE, new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR);
objects::TC_STORE);
new UdpTcPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE); new UdpTcPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE);
#if TE0720 == 1 && TEST_LIBGPIOD == 1 #if TE0720 == 1 && TEST_LIBGPIOD == 1

View File

@ -1,4 +0,0 @@
target_sources(${TARGET_NAME} PRIVATE
HeaterHandler.cpp
SolarArrayDeploymentHandler.cpp
)

View File

@ -16,6 +16,7 @@ fi
os_fsfw="linux" os_fsfw="linux"
tgt_bsp="arm/q7s" tgt_bsp="arm/q7s"
build_dir="build-Debug-Q7S"
build_generator="" build_generator=""
if [ "${OS}" = "Windows_NT" ]; then if [ "${OS}" = "Windows_NT" ]; then
build_generator="MinGW Makefiles" build_generator="MinGW Makefiles"
@ -24,4 +25,5 @@ else
build_generator="Unix Makefiles" build_generator="Unix Makefiles"
fi fi
python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \
-l"${build_dir}"

View File

@ -16,6 +16,7 @@ fi
os_fsfw="linux" os_fsfw="linux"
tgt_bsp="arm/q7s" tgt_bsp="arm/q7s"
build_dir="build-Release-Q7S"
build_generator="" build_generator=""
if [ "${OS}" = "Windows_NT" ]; then if [ "${OS}" = "Windows_NT" ]; then
build_generator="MinGW Makefiles" build_generator="MinGW Makefiles"
@ -24,4 +25,5 @@ else
build_generator="Unix Makefiles" build_generator="Unix Makefiles"
fi fi
python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release" -t "${tgt_bsp}" python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release" -t "${tgt_bsp}" \
-l"${build_dir}"

View File

@ -16,6 +16,7 @@ fi
os_fsfw="linux" os_fsfw="linux"
tgt_bsp="arm/q7s" tgt_bsp="arm/q7s"
build_dir="build-Release-Q7S"
build_generator="" build_generator=""
if [ "${OS}" = "Windows_NT" ]; then if [ "${OS}" = "Windows_NT" ]; then
build_generator="MinGW Makefiles" build_generator="MinGW Makefiles"
@ -24,4 +25,5 @@ else
build_generator="Unix Makefiles" build_generator="Unix Makefiles"
fi fi
python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "reldeb" -t "${tgt_bsp}" python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "reldeb" -t "${tgt_bsp}" \
-l"${build_dir}"

1
etl

@ -1 +0,0 @@
Subproject commit ae06e6417702b770c49289c9e7162cb3f4a5a217

View File

@ -1,12 +1,12 @@
#include "pollingSequenceFactory.h" #include "pollingSequenceFactory.h"
#include <OBSWConfig.h> #include "linux/devices/SusHandler.h"
#include "OBSWConfig.h"
#include <fsfw/objectmanager/ObjectManagerIF.h> #include <fsfw/objectmanager/ObjectManagerIF.h>
#include <fsfw/serviceinterface/ServiceInterfaceStream.h> #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
#include <fsfw/devicehandlers/DeviceHandlerIF.h> #include <fsfw/devicehandlers/DeviceHandlerIF.h>
#include <fsfw/tasks/FixedTimeslotTaskIF.h> #include <fsfw/tasks/FixedTimeslotTaskIF.h>
#include <fsfwconfig/objects/systemObjectList.h> #include <fsfwconfig/objects/systemObjectList.h>
#include <fsfwconfig/OBSWConfig.h>
#include <mission/devices/SusHandler.h>
ReturnValue_t pst::pollingSequenceInitDefault(FixedTimeslotTaskIF *thisSequence) ReturnValue_t pst::pollingSequenceInitDefault(FixedTimeslotTaskIF *thisSequence)

View File

@ -1,5 +1,5 @@
#include "SusHandler.h"
#include "OBSWConfig.h" #include "OBSWConfig.h"
#include <mission/devices/SusHandler.h>
#include <fsfw/datapool/PoolReadGuard.h> #include <fsfw/datapool/PoolReadGuard.h>
#include <fsfw_hal/linux/spi/SpiComIF.h> #include <fsfw_hal/linux/spi/SpiComIF.h>