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

Update Package #43

Merged
meierj merged 20 commits from mueller/update-package into develop 2021-06-15 15:14:53 +02:00
Conversation 0 Commits 20 Files Changed 15 +3 -2
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 76c6702f41 - Show all commits

1
bsp_hosted/main.cpp
View File

@ -24,6 +24,7 @@ int main(void)
<< SW_SUBVERSION << "." << SW_SUBSUBVERSION << " -- " << std::endl; << SW_SUBVERSION << "." << SW_SUBSUBVERSION << " -- " << std::endl;
std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl; std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl;
sif::warning << "Test" << std::endl;
initmission::initMission(); initmission::initMission();
for(;;) { for(;;) {

2
cmake/scripts/Host/create_cmake_debug_cfg.sh Normal file → Executable file
View File

@ -15,7 +15,7 @@ if [ "${counter}" -ge 5 ];then
fi fi
build_generator="" build_generator=""
build_dir="Debug-Host" build_dir="build-Debug-Host"
os_fsfw="host" os_fsfw="host"
if [ "${OS}" = "Windows_NT" ]; then if [ "${OS}" = "Windows_NT" ]; then
build_generator="MinGW Makefiles" build_generator="MinGW Makefiles"

2
fsfw

@ -1 +1 @@
Subproject commit 4b095eea8991d3e9a48fa8945c86339cfdad26d5 Subproject commit 589e64fc467cbf5cac5e721a896564c811cd25c6