From 983ce045a9af75eae0d9ebcab469c1c3b46c764f Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 29 Jul 2021 13:07:07 +0200 Subject: [PATCH] continued --- CMakeLists.txt | 3 +-- bsp_q7s/core/obsw.cpp | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 49d0d42b..5e49dd9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,9 +123,8 @@ if(NOT BUILD_WATCHDOG) elseif(${TGT_BSP} MATCHES "arm/raspberrypi") configure_file(${BSP_PATH}/boardconfig/rpiConfig.h.in rpiConfig.h) endif() -else() - configure_file(${WATCHDOG_PATH}/watchdogConf.h.in watchdogConf.h) endif() +configure_file(${WATCHDOG_PATH}/watchdogConf.h.in watchdogConf.h) # Set common config path for FSFW set(FSFW_ADDITIONAL_INC_PATHS diff --git a/bsp_q7s/core/obsw.cpp b/bsp_q7s/core/obsw.cpp index 4a13e178..64b0b422 100644 --- a/bsp_q7s/core/obsw.cpp +++ b/bsp_q7s/core/obsw.cpp @@ -20,6 +20,9 @@ int obsw::obsw() { FSFW_REVISION << "--" << std::endl; std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl; +#if Q7S_CHECK_FOR_ALREADY_RUNNING_IMG == 1 + // Check special file here +#endif initmission::initMission(); for(;;) {