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

simple mode working

Browse Source
This commit is contained in:
Robin Müller 2021-06-30 15:32:15 +02:00 committed by Robin.Mueller
parent 3f177d3321
commit 7d7b119d01
5 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
CMakeLists.txt
View File

@ -78,9 +78,11 @@ if(TGT_BSP)
OR ${TGT_BSP} MATCHES "arm/beagleboneblack" OR ${TGT_BSP} MATCHES "arm/beagleboneblack"
) )
set(FSFW_CONFIG_PATH "linux/fsfwconfig") set(FSFW_CONFIG_PATH "linux/fsfwconfig")
set(ADD_LINUX_FILES TRUE) if(NOT Q7S_SIMPLE_MODE)
set(ADD_CSP_LIB TRUE) set(ADD_LINUX_FILES TRUE)
set(FSFW_HAL_ADD_LINUX ON) set(ADD_CSP_LIB TRUE)
set(FSFW_HAL_ADD_LINUX ON)
endif()
endif() endif()
if(${TGT_BSP} MATCHES "arm/raspberrypi") if(${TGT_BSP} MATCHES "arm/raspberrypi")
@ -137,27 +139,33 @@ if(ADD_LINUX_FILES)
add_subdirectory(${LINUX_PATH}) add_subdirectory(${LINUX_PATH})
endif() endif()
add_subdirectory(${LWGPS_LIB_PATH})
add_subdirectory(${BSP_PATH}) add_subdirectory(${BSP_PATH})
add_subdirectory(${FSFW_PATH})
add_subdirectory(${MISSION_PATH})
add_subdirectory(${TEST_PATH})
add_subdirectory(${FSFW_HAL_LIB_PATH})
add_subdirectory(${COMMON_PATH}) add_subdirectory(${COMMON_PATH})
if(NOT Q7S_SIMPLE_MODE)
add_subdirectory(${LWGPS_LIB_PATH})
add_subdirectory(${FSFW_PATH})
add_subdirectory(${MISSION_PATH})
add_subdirectory(${TEST_PATH})
add_subdirectory(${FSFW_HAL_LIB_PATH})
endif()
################################################################################ ################################################################################
# Post-Sources preparation # Post-Sources preparation
################################################################################ ################################################################################
set_property(CACHE OS_FSFW PROPERTY STRINGS host linux) set_property(CACHE OS_FSFW PROPERTY STRINGS host linux)
# Add libraries for all sources. if(NOT Q7S_SIMPLE_MODE)
target_link_libraries(${TARGET_NAME} PRIVATE # Add libraries for all sources.
${LIB_FSFW_NAME} target_link_libraries(${TARGET_NAME} PRIVATE
${LIB_OS_NAME} ${LIB_FSFW_NAME}
${LIB_LWGPS_NAME} ${LIB_OS_NAME}
${LIB_FSFW_HAL_NAME} ${LIB_LWGPS_NAME}
) ${LIB_FSFW_HAL_NAME}
)
endif()
if(ADD_ETL_LIB) if(ADD_ETL_LIB)
target_link_libraries(${TARGET_NAME} PRIVATE target_link_libraries(${TARGET_NAME} PRIVATE
@ -247,8 +255,3 @@ add_custom_command(
include (${CMAKE_SCRIPT_PATH}/BuildType.cmake) include (${CMAKE_SCRIPT_PATH}/BuildType.cmake)
set_build_type() set_build_type()

14
bsp_q7s/CMakeLists.txt
View File

@ -2,8 +2,12 @@ target_sources(${TARGET_NAME} PUBLIC
main.cpp main.cpp
) )
add_subdirectory(boardconfig) if(Q7S_SIMPLE_MODE)
add_subdirectory(comIF) add_subdirectory(simple)
add_subdirectory(boardtest) else()
add_subdirectory(gpio) add_subdirectory(boardconfig)
add_subdirectory(core) add_subdirectory(comIF)
add_subdirectory(boardtest)
add_subdirectory(gpio)
add_subdirectory(core)
endif()

3
bsp_q7s/simple/CMakeLists.txt Normal file
View File

@ -0,0 +1,3 @@
target_sources(${TARGET_NAME} PRIVATE
simple.cpp
)

2
cmake/scripts/Q7S/simple_make_debug_cfg.sh
View File

@ -31,5 +31,5 @@ fi
echo "Running command (without the leading +):" echo "Running command (without the leading +):"
set -x # Print command set -x # Print command
${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \ ${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \
-l"${build_dir}" -d "${definitions} -l"${build_dir}" -d "${definitions}"
# set +x # set +x

2
cmake/scripts/Q7S/simple_ninja_debug_cfg.sh
View File

@ -29,6 +29,6 @@ fi
echo "Running command (without the leading +):" echo "Running command (without the leading +):"
set -x # Print command set -x # Print command
${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \ ${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \
-l"${build_dir}" -d "${definitions} -l"${build_dir}" -d "${definitions}"
# set +x # set +x