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

Merge branch 'develop' into mohr/startracker
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source 
Conflicts:
	CMakeLists.txt
	cmake/PreProjectConfig.cmake
	linux/fsfwconfig/events/translateEvents.cpp
This commit is contained in:
Ulrich Mohr
2022-02-16 15:21:24 +01:00
parent b722b15b26 6ddd2e4759
commit 91e0e9f233
52 changed files with 397 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/PreProjectConfig.cmake
View File

@ -9,6 +9,7 @@ if(DEFINED TGT_BSP)
endif()
endif()
# Disable compiler checks for cross-compiling.
if(FSFW_OSAL MATCHES linux AND TGT_BSP)
if(TGT_BSP MATCHES "arm/q7s")