diff --git a/CHANGELOG b/CHANGELOG index 09b8db6a..8f86c147 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,17 +1,81 @@ -## Changes from ASTP 1.0.0 to 1.1.0 +# Changed from ASTP 1.1.0 to 1.2.0 + +## API Changes + +### FSFW Architecture + +- New src folder which contains all source files except the HAL, contributed code and test code +- External and internal API mostly stayed the same +- Folder names are now all smaller case: internalError was renamed to internalerror and + FreeRTOS was renamed to freertos +- Warning if optional headers are used but the modules was not added to the source files to compile + +### HAL + +- HAL added back into FSFW. It is tightly bound to the FSFW, and compiling it as a static library + made using it more complicated than necessary + +## Bugfixes + +### FreeRTOS QueueMapManager + +- Fixed a bug which causes the first generated Queue ID to be invalid + +## Enhancements + +### FSFW Architecture + +- See API changes chapter. This change will keep the internal API consistent in the future + +# Changes from ASTP 1.0.0 to 1.1.0 + +## API Changes ### PUS - Added PUS C support +- SUBSYSTEM_IDs added for PUS Services +- Added new Parameter which must be defined in config: fsfwconfig::FSFW_MAX_TM_PACKET_SIZE + +### ObjectManager + + - ObjectManager is now a singelton + ### Configuration - Additional configuration option fsfwconfig::FSFW_MAX_TM_PACKET_SIZE which need to be specified in FSFWConfig.h +### CMake + +- Changed Cmake FSFW_ADDITIONAL_INC_PATH to FSFW_ADDITIONAL_INC_PATHS + +## Bugfixes + +- timemanager/TimeStamperIF.h: Timestamp config was not used correctly, leading to different timestamp sizes than configured in fsfwconfig::FSFW_MISSION_TIMESTAMP_SIZE +- TCP server fixes + +## Enhancements + +### FreeRTOS Queue Handles + +- Fixed an internal issue how FreeRTOS MessageQueues were handled + +### Linux OSAL + +- Better printf error messages + +### CMake + +- Check for C++11 as mininimum required Version + +### Debug Output + +- Changed Warning color to magenta, which is well readable on both dark and light mode IDEs -## Changes from ASTP 0.0.1 to 1.0.0 +# Changes from ASTP 0.0.1 to 1.0.0 ### Host OSAL diff --git a/CMakeLists.txt b/CMakeLists.txt index fa721031..cb1f0d3f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.13) option(FSFW_GENERATE_SECTIONS "Generate function and data sections. Required to remove unused code" ON ) - if(FSFW_GENERATE_SECTIONS) option(FSFW_REMOVE_UNUSED_CODE "Remove unused code" ON) endif() @@ -11,9 +10,18 @@ endif() option(FSFW_WARNING_SHADOW_LOCAL_GCC "Enable -Wshadow=local warning in GCC" ON) # Options to exclude parts of the FSFW from compilation. option(FSFW_ADD_INTERNAL_TESTS "Add internal unit tests" ON) -option(FSFW_USE_RMAP "Compile with RMAP" ON) -option(FSFW_USE_DATALINKLAYER "Compile with Data Link Layer" ON) -option(FSFW_ADD_SPG4_PROPAGATOR "Add SPG4 propagator code" ON) + +# Optional sources +option(FSFW_ADD_PUS "Compile with PUS sources" ON) +option(FSFW_ADD_MONITORING "Compile with monitoring components" ON) + +option(FSFW_ADD_RMAP "Compile with RMAP" OFF) +option(FSFW_ADD_DATALINKLAYER "Compile with Data Link Layer" OFF) +option(FSFW_ADD_COORDINATES "Compile with coordinate components" OFF) +option(FSFW_ADD_TMSTORAGE "Compile with tm storage components" OFF) + +# Contrib sources +option(FSFW_ADD_SPG4_PROPAGATOR "Add SPG4 propagator code" OFF) set(LIB_FSFW_NAME fsfw) add_library(${LIB_FSFW_NAME}) diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt index 4cb18315..7a9a0ffa 100644 --- a/hal/CMakeLists.txt +++ b/hal/CMakeLists.txt @@ -12,7 +12,6 @@ set(LINUX_HAL_PATH_NAME linux) set(STM32H7_PATH_NAME stm32h7) add_subdirectory(src) -add_subdirectory(inc) foreach(INCLUDE_PATH ${FSFW_HAL_ADDITIONAL_INC_PATHS}) if(IS_ABSOLUTE ${INCLUDE_PATH}) diff --git a/hal/inc/CMakeLists.txt b/hal/inc/CMakeLists.txt deleted file mode 100644 index abf6a3d2..00000000 --- a/hal/inc/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -target_include_directories(${LIB_FSFW_NAME} PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} -) - -target_include_directories(${LIB_FSFW_NAME} INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR} -) diff --git a/hal/src/CMakeLists.txt b/hal/src/CMakeLists.txt index fcd81389..ed2f2522 100644 --- a/hal/src/CMakeLists.txt +++ b/hal/src/CMakeLists.txt @@ -1,10 +1,9 @@ -add_subdirectory(devicehandlers) -add_subdirectory(common) +target_include_directories(${LIB_FSFW_NAME} PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} +) -if(FSFW_HAL_ADD_LINUX) - add_subdirectory(${LINUX_HAL_PATH_NAME}) -endif() +target_include_directories(${LIB_FSFW_NAME} INTERFACE + ${CMAKE_CURRENT_SOURCE_DIR} +) -if(FSFW_HAL_ADD_STM32H7) - add_subdirectory(${STM32H7_PATH_NAME}) -endif() +add_subdirectory(fsfw) diff --git a/hal/src/fsfw/CMakeLists.txt b/hal/src/fsfw/CMakeLists.txt new file mode 100644 index 00000000..c034e0b7 --- /dev/null +++ b/hal/src/fsfw/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(hal) diff --git a/hal/src/fsfw/hal/CMakeLists.txt b/hal/src/fsfw/hal/CMakeLists.txt new file mode 100644 index 00000000..f5901e91 --- /dev/null +++ b/hal/src/fsfw/hal/CMakeLists.txt @@ -0,0 +1,10 @@ +add_subdirectory(devicehandlers) +add_subdirectory(common) + +if(FSFW_HAL_ADD_LINUX) + add_subdirectory(linux) +endif() + +if(FSFW_HAL_ADD_STM32H7) + add_subdirectory(stm32h7) +endif() diff --git a/hal/src/common/CMakeLists.txt b/hal/src/fsfw/hal/common/CMakeLists.txt similarity index 100% rename from hal/src/common/CMakeLists.txt rename to hal/src/fsfw/hal/common/CMakeLists.txt diff --git a/hal/src/common/gpio/CMakeLists.txt b/hal/src/fsfw/hal/common/gpio/CMakeLists.txt similarity index 100% rename from hal/src/common/gpio/CMakeLists.txt rename to hal/src/fsfw/hal/common/gpio/CMakeLists.txt diff --git a/hal/src/common/gpio/GpioCookie.cpp b/hal/src/fsfw/hal/common/gpio/GpioCookie.cpp similarity index 100% rename from hal/src/common/gpio/GpioCookie.cpp rename to hal/src/fsfw/hal/common/gpio/GpioCookie.cpp diff --git a/hal/inc/fsfw/hal/common/gpio/GpioCookie.h b/hal/src/fsfw/hal/common/gpio/GpioCookie.h similarity index 100% rename from hal/inc/fsfw/hal/common/gpio/GpioCookie.h rename to hal/src/fsfw/hal/common/gpio/GpioCookie.h diff --git a/hal/inc/fsfw/hal/common/gpio/GpioIF.h b/hal/src/fsfw/hal/common/gpio/GpioIF.h similarity index 100% rename from hal/inc/fsfw/hal/common/gpio/GpioIF.h rename to hal/src/fsfw/hal/common/gpio/GpioIF.h diff --git a/hal/inc/fsfw/hal/common/gpio/gpioDefinitions.h b/hal/src/fsfw/hal/common/gpio/gpioDefinitions.h similarity index 100% rename from hal/inc/fsfw/hal/common/gpio/gpioDefinitions.h rename to hal/src/fsfw/hal/common/gpio/gpioDefinitions.h diff --git a/hal/inc/fsfw/hal/common/spi/spiCommon.h b/hal/src/fsfw/hal/common/spi/spiCommon.h similarity index 100% rename from hal/inc/fsfw/hal/common/spi/spiCommon.h rename to hal/src/fsfw/hal/common/spi/spiCommon.h diff --git a/hal/src/devicehandlers/CMakeLists.txt b/hal/src/fsfw/hal/devicehandlers/CMakeLists.txt similarity index 100% rename from hal/src/devicehandlers/CMakeLists.txt rename to hal/src/fsfw/hal/devicehandlers/CMakeLists.txt diff --git a/hal/src/devicehandlers/GyroL3GD20Handler.cpp b/hal/src/fsfw/hal/devicehandlers/GyroL3GD20Handler.cpp similarity index 100% rename from hal/src/devicehandlers/GyroL3GD20Handler.cpp rename to hal/src/fsfw/hal/devicehandlers/GyroL3GD20Handler.cpp diff --git a/hal/inc/fsfw/hal/devicehandlers/GyroL3GD20Handler.h b/hal/src/fsfw/hal/devicehandlers/GyroL3GD20Handler.h similarity index 100% rename from hal/inc/fsfw/hal/devicehandlers/GyroL3GD20Handler.h rename to hal/src/fsfw/hal/devicehandlers/GyroL3GD20Handler.h diff --git a/hal/inc/fsfw/hal/devicehandlers/devicedefinitions/GyroL3GD20Definitions.h b/hal/src/fsfw/hal/devicehandlers/devicedefinitions/GyroL3GD20Definitions.h similarity index 100% rename from hal/inc/fsfw/hal/devicehandlers/devicedefinitions/GyroL3GD20Definitions.h rename to hal/src/fsfw/hal/devicehandlers/devicedefinitions/GyroL3GD20Definitions.h diff --git a/hal/src/host/CMakeLists.txt b/hal/src/fsfw/hal/host/CMakeLists.txt similarity index 100% rename from hal/src/host/CMakeLists.txt rename to hal/src/fsfw/hal/host/CMakeLists.txt diff --git a/hal/src/linux/CMakeLists.txt b/hal/src/fsfw/hal/linux/CMakeLists.txt similarity index 100% rename from hal/src/linux/CMakeLists.txt rename to hal/src/fsfw/hal/linux/CMakeLists.txt diff --git a/hal/src/linux/UnixFileGuard.cpp b/hal/src/fsfw/hal/linux/UnixFileGuard.cpp similarity index 100% rename from hal/src/linux/UnixFileGuard.cpp rename to hal/src/fsfw/hal/linux/UnixFileGuard.cpp diff --git a/hal/inc/fsfw/hal/linux/UnixFileGuard.h b/hal/src/fsfw/hal/linux/UnixFileGuard.h similarity index 100% rename from hal/inc/fsfw/hal/linux/UnixFileGuard.h rename to hal/src/fsfw/hal/linux/UnixFileGuard.h diff --git a/hal/src/linux/gpio/CMakeLists.txt b/hal/src/fsfw/hal/linux/gpio/CMakeLists.txt similarity index 100% rename from hal/src/linux/gpio/CMakeLists.txt rename to hal/src/fsfw/hal/linux/gpio/CMakeLists.txt diff --git a/hal/src/linux/gpio/LinuxLibgpioIF.cpp b/hal/src/fsfw/hal/linux/gpio/LinuxLibgpioIF.cpp similarity index 100% rename from hal/src/linux/gpio/LinuxLibgpioIF.cpp rename to hal/src/fsfw/hal/linux/gpio/LinuxLibgpioIF.cpp diff --git a/hal/inc/fsfw/hal/linux/gpio/LinuxLibgpioIF.h b/hal/src/fsfw/hal/linux/gpio/LinuxLibgpioIF.h similarity index 100% rename from hal/inc/fsfw/hal/linux/gpio/LinuxLibgpioIF.h rename to hal/src/fsfw/hal/linux/gpio/LinuxLibgpioIF.h diff --git a/hal/src/linux/i2c/CMakeLists.txt b/hal/src/fsfw/hal/linux/i2c/CMakeLists.txt similarity index 100% rename from hal/src/linux/i2c/CMakeLists.txt rename to hal/src/fsfw/hal/linux/i2c/CMakeLists.txt diff --git a/hal/src/linux/i2c/I2cComIF.cpp b/hal/src/fsfw/hal/linux/i2c/I2cComIF.cpp similarity index 100% rename from hal/src/linux/i2c/I2cComIF.cpp rename to hal/src/fsfw/hal/linux/i2c/I2cComIF.cpp diff --git a/hal/inc/fsfw/hal/linux/i2c/I2cComIF.h b/hal/src/fsfw/hal/linux/i2c/I2cComIF.h similarity index 100% rename from hal/inc/fsfw/hal/linux/i2c/I2cComIF.h rename to hal/src/fsfw/hal/linux/i2c/I2cComIF.h diff --git a/hal/src/linux/i2c/I2cCookie.cpp b/hal/src/fsfw/hal/linux/i2c/I2cCookie.cpp similarity index 100% rename from hal/src/linux/i2c/I2cCookie.cpp rename to hal/src/fsfw/hal/linux/i2c/I2cCookie.cpp diff --git a/hal/inc/fsfw/hal/linux/i2c/I2cCookie.h b/hal/src/fsfw/hal/linux/i2c/I2cCookie.h similarity index 100% rename from hal/inc/fsfw/hal/linux/i2c/I2cCookie.h rename to hal/src/fsfw/hal/linux/i2c/I2cCookie.h diff --git a/hal/src/linux/rpi/CMakeLists.txt b/hal/src/fsfw/hal/linux/rpi/CMakeLists.txt similarity index 100% rename from hal/src/linux/rpi/CMakeLists.txt rename to hal/src/fsfw/hal/linux/rpi/CMakeLists.txt diff --git a/hal/src/linux/rpi/GpioRPi.cpp b/hal/src/fsfw/hal/linux/rpi/GpioRPi.cpp similarity index 100% rename from hal/src/linux/rpi/GpioRPi.cpp rename to hal/src/fsfw/hal/linux/rpi/GpioRPi.cpp diff --git a/hal/inc/fsfw/hal/linux/rpi/GpioRPi.h b/hal/src/fsfw/hal/linux/rpi/GpioRPi.h similarity index 100% rename from hal/inc/fsfw/hal/linux/rpi/GpioRPi.h rename to hal/src/fsfw/hal/linux/rpi/GpioRPi.h diff --git a/hal/src/linux/spi/CMakeLists.txt b/hal/src/fsfw/hal/linux/spi/CMakeLists.txt similarity index 100% rename from hal/src/linux/spi/CMakeLists.txt rename to hal/src/fsfw/hal/linux/spi/CMakeLists.txt diff --git a/hal/src/linux/spi/SpiComIF.cpp b/hal/src/fsfw/hal/linux/spi/SpiComIF.cpp similarity index 100% rename from hal/src/linux/spi/SpiComIF.cpp rename to hal/src/fsfw/hal/linux/spi/SpiComIF.cpp diff --git a/hal/inc/fsfw/hal/linux/spi/SpiComIF.h b/hal/src/fsfw/hal/linux/spi/SpiComIF.h similarity index 95% rename from hal/inc/fsfw/hal/linux/spi/SpiComIF.h rename to hal/src/fsfw/hal/linux/spi/SpiComIF.h index 676c7cba..7f66b8e5 100644 --- a/hal/inc/fsfw/hal/linux/spi/SpiComIF.h +++ b/hal/src/fsfw/hal/linux/spi/SpiComIF.h @@ -3,10 +3,10 @@ #include "spiDefinitions.h" #include "returnvalues/classIds.h" -#include "../../common/gpio/GpioIF.h" +#include "fsfw/hal/common/gpio/GpioIF.h" -#include -#include +#include "fsfw/devicehandlers/DeviceCommunicationIF.h" +#include "fsfw/objectmanager/SystemObject.h" #include #include diff --git a/hal/src/linux/spi/SpiCookie.cpp b/hal/src/fsfw/hal/linux/spi/SpiCookie.cpp similarity index 100% rename from hal/src/linux/spi/SpiCookie.cpp rename to hal/src/fsfw/hal/linux/spi/SpiCookie.cpp diff --git a/hal/inc/fsfw/hal/linux/spi/SpiCookie.h b/hal/src/fsfw/hal/linux/spi/SpiCookie.h similarity index 100% rename from hal/inc/fsfw/hal/linux/spi/SpiCookie.h rename to hal/src/fsfw/hal/linux/spi/SpiCookie.h diff --git a/hal/inc/fsfw/hal/linux/spi/spiDefinitions.h b/hal/src/fsfw/hal/linux/spi/spiDefinitions.h similarity index 100% rename from hal/inc/fsfw/hal/linux/spi/spiDefinitions.h rename to hal/src/fsfw/hal/linux/spi/spiDefinitions.h diff --git a/hal/src/linux/uart/CMakeLists.txt b/hal/src/fsfw/hal/linux/uart/CMakeLists.txt similarity index 100% rename from hal/src/linux/uart/CMakeLists.txt rename to hal/src/fsfw/hal/linux/uart/CMakeLists.txt diff --git a/hal/src/linux/uart/UartComIF.cpp b/hal/src/fsfw/hal/linux/uart/UartComIF.cpp similarity index 100% rename from hal/src/linux/uart/UartComIF.cpp rename to hal/src/fsfw/hal/linux/uart/UartComIF.cpp diff --git a/hal/inc/fsfw/hal/linux/uart/UartComIF.h b/hal/src/fsfw/hal/linux/uart/UartComIF.h similarity index 100% rename from hal/inc/fsfw/hal/linux/uart/UartComIF.h rename to hal/src/fsfw/hal/linux/uart/UartComIF.h diff --git a/hal/src/linux/uart/UartCookie.cpp b/hal/src/fsfw/hal/linux/uart/UartCookie.cpp similarity index 100% rename from hal/src/linux/uart/UartCookie.cpp rename to hal/src/fsfw/hal/linux/uart/UartCookie.cpp diff --git a/hal/inc/fsfw/hal/linux/uart/UartCookie.h b/hal/src/fsfw/hal/linux/uart/UartCookie.h similarity index 100% rename from hal/inc/fsfw/hal/linux/uart/UartCookie.h rename to hal/src/fsfw/hal/linux/uart/UartCookie.h diff --git a/hal/src/linux/utility.cpp b/hal/src/fsfw/hal/linux/utility.cpp similarity index 100% rename from hal/src/linux/utility.cpp rename to hal/src/fsfw/hal/linux/utility.cpp diff --git a/hal/inc/fsfw/hal/linux/utility.h b/hal/src/fsfw/hal/linux/utility.h similarity index 100% rename from hal/inc/fsfw/hal/linux/utility.h rename to hal/src/fsfw/hal/linux/utility.h diff --git a/hal/src/stm32h7/CMakeLists.txt b/hal/src/fsfw/hal/stm32h7/CMakeLists.txt similarity index 100% rename from hal/src/stm32h7/CMakeLists.txt rename to hal/src/fsfw/hal/stm32h7/CMakeLists.txt diff --git a/hal/src/stm32h7/devicetest/CMakeLists.txt b/hal/src/fsfw/hal/stm32h7/devicetest/CMakeLists.txt similarity index 100% rename from hal/src/stm32h7/devicetest/CMakeLists.txt rename to hal/src/fsfw/hal/stm32h7/devicetest/CMakeLists.txt diff --git a/hal/src/stm32h7/devicetest/GyroL3GD20H.cpp b/hal/src/fsfw/hal/stm32h7/devicetest/GyroL3GD20H.cpp similarity index 99% rename from hal/src/stm32h7/devicetest/GyroL3GD20H.cpp rename to hal/src/fsfw/hal/stm32h7/devicetest/GyroL3GD20H.cpp index 6765f540..04b1de3b 100644 --- a/hal/src/stm32h7/devicetest/GyroL3GD20H.cpp +++ b/hal/src/fsfw/hal/stm32h7/devicetest/GyroL3GD20H.cpp @@ -9,7 +9,6 @@ #include "fsfw/tasks/TaskFactory.h" #include "fsfw/serviceinterface/ServiceInterface.h" -#include "stm32h7xx_nucleo.h" #include "stm32h7xx_hal_spi.h" #include "stm32h7xx_hal_rcc.h" diff --git a/hal/inc/fsfw/hal/stm32h7/devicetest/GyroL3GD20H.h b/hal/src/fsfw/hal/stm32h7/devicetest/GyroL3GD20H.h similarity index 100% rename from hal/inc/fsfw/hal/stm32h7/devicetest/GyroL3GD20H.h rename to hal/src/fsfw/hal/stm32h7/devicetest/GyroL3GD20H.h diff --git a/hal/src/stm32h7/dma.cpp b/hal/src/fsfw/hal/stm32h7/dma.cpp similarity index 100% rename from hal/src/stm32h7/dma.cpp rename to hal/src/fsfw/hal/stm32h7/dma.cpp diff --git a/hal/inc/fsfw/hal/stm32h7/dma.h b/hal/src/fsfw/hal/stm32h7/dma.h similarity index 100% rename from hal/inc/fsfw/hal/stm32h7/dma.h rename to hal/src/fsfw/hal/stm32h7/dma.h diff --git a/hal/src/stm32h7/gpio/CMakeLists.txt b/hal/src/fsfw/hal/stm32h7/gpio/CMakeLists.txt similarity index 100% rename from hal/src/stm32h7/gpio/CMakeLists.txt rename to hal/src/fsfw/hal/stm32h7/gpio/CMakeLists.txt diff --git a/hal/src/stm32h7/gpio/gpio.cpp b/hal/src/fsfw/hal/stm32h7/gpio/gpio.cpp similarity index 100% rename from hal/src/stm32h7/gpio/gpio.cpp rename to hal/src/fsfw/hal/stm32h7/gpio/gpio.cpp diff --git a/hal/inc/fsfw/hal/stm32h7/gpio/gpio.h b/hal/src/fsfw/hal/stm32h7/gpio/gpio.h similarity index 100% rename from hal/inc/fsfw/hal/stm32h7/gpio/gpio.h rename to hal/src/fsfw/hal/stm32h7/gpio/gpio.h diff --git a/hal/src/stm32h7/i2c/CMakeLists.txt b/hal/src/fsfw/hal/stm32h7/i2c/CMakeLists.txt similarity index 100% rename from hal/src/stm32h7/i2c/CMakeLists.txt rename to hal/src/fsfw/hal/stm32h7/i2c/CMakeLists.txt diff --git a/hal/inc/fsfw/hal/stm32h7/interrupts.h b/hal/src/fsfw/hal/stm32h7/interrupts.h similarity index 100% rename from hal/inc/fsfw/hal/stm32h7/interrupts.h rename to hal/src/fsfw/hal/stm32h7/interrupts.h diff --git a/hal/src/stm32h7/spi/CMakeLists.txt b/hal/src/fsfw/hal/stm32h7/spi/CMakeLists.txt similarity index 100% rename from hal/src/stm32h7/spi/CMakeLists.txt rename to hal/src/fsfw/hal/stm32h7/spi/CMakeLists.txt diff --git a/hal/src/stm32h7/spi/SpiComIF.cpp b/hal/src/fsfw/hal/stm32h7/spi/SpiComIF.cpp similarity index 96% rename from hal/src/stm32h7/spi/SpiComIF.cpp rename to hal/src/fsfw/hal/stm32h7/spi/SpiComIF.cpp index d1484de0..da34c4c0 100644 --- a/hal/src/stm32h7/spi/SpiComIF.cpp +++ b/hal/src/fsfw/hal/stm32h7/spi/SpiComIF.cpp @@ -2,12 +2,21 @@ #include "fsfw/hal/stm32h7/spi/SpiCookie.h" #include "fsfw/tasks/SemaphoreFactory.h" -#include "fsfw/osal/freertos/TaskManagement.h" #include "fsfw/hal/stm32h7/spi/spiCore.h" #include "fsfw/hal/stm32h7/spi/spiInterrupts.h" #include "fsfw/hal/stm32h7/spi/mspInit.h" #include "fsfw/hal/stm32h7/gpio/gpio.h" +// FreeRTOS required special Semaphore handling from an ISR. Therefore, we use the concrete +// instance here, because RTEMS and FreeRTOS are the only relevant OSALs currently +// and it is not trivial to add a releaseFromISR to the SemaphoreIF +#if defined FSFW_OSAL_RTEMS +#include "fsfw/osal/rtems/BinarySemaphore.h" +#elif defined FSFW_OSAL_FREERTOS +#include "fsfw/osal/freertos/TaskManagement.h" +#include "fsfw/osal/freertos/BinarySemaphore.h" +#endif + #include "stm32h7xx_hal_gpio.h" SpiComIF::SpiComIF(object_id_t objectId): SystemObject(objectId) { @@ -421,10 +430,14 @@ void SpiComIF::genericIrqHandler(void *irqArgsVoid, spi::TransferStates targetSt HAL_GPIO_WritePin(spiCookie->getChipSelectGpioPort(), spiCookie->getChipSelectGpioPin(), GPIO_PIN_SET); +#if defined FSFW_OSAL_FREERTOS // Release the task semaphore BaseType_t taskWoken = pdFALSE; ReturnValue_t result = BinarySemaphore::releaseFromISR(comIF->spiSemaphore->getSemaphore(), &taskWoken); +#elif defined FSFW_OSAL_RTEMS + ReturnValue_t result = comIF->spiSemaphore->release(); +#endif if(result != HasReturnvaluesIF::RETURN_OK) { // Configuration error printf("SpiComIF::genericIrqHandler: Failure releasing Semaphore!\n"); @@ -436,11 +449,13 @@ void SpiComIF::genericIrqHandler(void *irqArgsVoid, spi::TransferStates targetSt SCB_InvalidateDCache_by_Addr ((uint32_t *) comIF->currentRecvPtr, comIF->currentRecvBuffSize); } +#if defined FSFW_OSAL_FREERTOS /* Request a context switch if the SPI ComIF task was woken up and has a higher priority than the currently running task */ if(taskWoken == pdTRUE) { TaskManagement::requestContextSwitch(CallContext::ISR); } +#endif } void SpiComIF::printCfgError(const char *const type) { diff --git a/hal/inc/fsfw/hal/stm32h7/spi/SpiComIF.h b/hal/src/fsfw/hal/stm32h7/spi/SpiComIF.h similarity index 99% rename from hal/inc/fsfw/hal/stm32h7/spi/SpiComIF.h rename to hal/src/fsfw/hal/stm32h7/spi/SpiComIF.h index c2554544..00625b34 100644 --- a/hal/inc/fsfw/hal/stm32h7/spi/SpiComIF.h +++ b/hal/src/fsfw/hal/stm32h7/spi/SpiComIF.h @@ -5,7 +5,6 @@ #include "fsfw/devicehandlers/DeviceCommunicationIF.h" #include "fsfw/objectmanager/SystemObject.h" -#include "fsfw/osal/freertos/BinarySemaphore.h" #include "fsfw/hal/stm32h7/spi/spiDefinitions.h" #include "stm32h7xx_hal_spi.h" #include "stm32h743xx.h" @@ -14,6 +13,7 @@ #include class SpiCookie; +class BinarySemaphore; /** * @brief This communication interface allows using generic device handlers with using diff --git a/hal/src/stm32h7/spi/SpiCookie.cpp b/hal/src/fsfw/hal/stm32h7/spi/SpiCookie.cpp similarity index 100% rename from hal/src/stm32h7/spi/SpiCookie.cpp rename to hal/src/fsfw/hal/stm32h7/spi/SpiCookie.cpp diff --git a/hal/inc/fsfw/hal/stm32h7/spi/SpiCookie.h b/hal/src/fsfw/hal/stm32h7/spi/SpiCookie.h similarity index 100% rename from hal/inc/fsfw/hal/stm32h7/spi/SpiCookie.h rename to hal/src/fsfw/hal/stm32h7/spi/SpiCookie.h diff --git a/hal/src/stm32h7/spi/mspInit.cpp b/hal/src/fsfw/hal/stm32h7/spi/mspInit.cpp similarity index 100% rename from hal/src/stm32h7/spi/mspInit.cpp rename to hal/src/fsfw/hal/stm32h7/spi/mspInit.cpp diff --git a/hal/inc/fsfw/hal/stm32h7/spi/mspInit.h b/hal/src/fsfw/hal/stm32h7/spi/mspInit.h similarity index 100% rename from hal/inc/fsfw/hal/stm32h7/spi/mspInit.h rename to hal/src/fsfw/hal/stm32h7/spi/mspInit.h diff --git a/hal/src/stm32h7/spi/spiCore.cpp b/hal/src/fsfw/hal/stm32h7/spi/spiCore.cpp similarity index 100% rename from hal/src/stm32h7/spi/spiCore.cpp rename to hal/src/fsfw/hal/stm32h7/spi/spiCore.cpp diff --git a/hal/inc/fsfw/hal/stm32h7/spi/spiCore.h b/hal/src/fsfw/hal/stm32h7/spi/spiCore.h similarity index 100% rename from hal/inc/fsfw/hal/stm32h7/spi/spiCore.h rename to hal/src/fsfw/hal/stm32h7/spi/spiCore.h diff --git a/hal/src/stm32h7/spi/spiDefinitions.cpp b/hal/src/fsfw/hal/stm32h7/spi/spiDefinitions.cpp similarity index 100% rename from hal/src/stm32h7/spi/spiDefinitions.cpp rename to hal/src/fsfw/hal/stm32h7/spi/spiDefinitions.cpp diff --git a/hal/inc/fsfw/hal/stm32h7/spi/spiDefinitions.h b/hal/src/fsfw/hal/stm32h7/spi/spiDefinitions.h similarity index 100% rename from hal/inc/fsfw/hal/stm32h7/spi/spiDefinitions.h rename to hal/src/fsfw/hal/stm32h7/spi/spiDefinitions.h diff --git a/hal/src/stm32h7/spi/spiInterrupts.cpp b/hal/src/fsfw/hal/stm32h7/spi/spiInterrupts.cpp similarity index 100% rename from hal/src/stm32h7/spi/spiInterrupts.cpp rename to hal/src/fsfw/hal/stm32h7/spi/spiInterrupts.cpp diff --git a/hal/inc/fsfw/hal/stm32h7/spi/spiInterrupts.h b/hal/src/fsfw/hal/stm32h7/spi/spiInterrupts.h similarity index 100% rename from hal/inc/fsfw/hal/stm32h7/spi/spiInterrupts.h rename to hal/src/fsfw/hal/stm32h7/spi/spiInterrupts.h diff --git a/hal/src/stm32h7/spi/stm32h743ziSpi.cpp b/hal/src/fsfw/hal/stm32h7/spi/stm32h743ziSpi.cpp similarity index 100% rename from hal/src/stm32h7/spi/stm32h743ziSpi.cpp rename to hal/src/fsfw/hal/stm32h7/spi/stm32h743ziSpi.cpp diff --git a/hal/inc/fsfw/hal/stm32h7/spi/stm32h743ziSpi.h b/hal/src/fsfw/hal/stm32h7/spi/stm32h743ziSpi.h similarity index 100% rename from hal/inc/fsfw/hal/stm32h7/spi/stm32h743ziSpi.h rename to hal/src/fsfw/hal/stm32h7/spi/stm32h743ziSpi.h diff --git a/hal/src/stm32h7/uart/CMakeLists.txt b/hal/src/fsfw/hal/stm32h7/uart/CMakeLists.txt similarity index 100% rename from hal/src/stm32h7/uart/CMakeLists.txt rename to hal/src/fsfw/hal/stm32h7/uart/CMakeLists.txt diff --git a/inc/fsfw/FSFW.h b/inc/fsfw/FSFW.h deleted file mode 100644 index df06ff3d..00000000 --- a/inc/fsfw/FSFW.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef FSFW_FSFW_H_ -#define FSFW_FSFW_H_ - -#include "FSFWConfig.h" - - -#endif /* FSFW_FSFW_H_ */ diff --git a/inc/fsfw/action.h b/inc/fsfw/action.h deleted file mode 100644 index 543ccb0c..00000000 --- a/inc/fsfw/action.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef FSFW_INC_FSFW_ACTION_H_ -#define FSFW_INC_FSFW_ACTION_H_ - -#include "action/ActionHelper.h" -#include "action/ActionMessage.h" -#include "action/CommandActionHelper.h" -#include "action/HasActionsIF.h" -#include "action/CommandsActionsIF.h" -#include "action/SimpleActionHelper.h" - -#endif /* FSFW_INC_FSFW_ACTION_H_ */ diff --git a/inc/fsfw/datapoollocal.h b/inc/fsfw/datapoollocal.h deleted file mode 100644 index 73024a5c..00000000 --- a/inc/fsfw/datapoollocal.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef FSFW_DATAPOOLLOCAL_DATAPOOLLOCAL_H_ -#define FSFW_DATAPOOLLOCAL_DATAPOOLLOCAL_H_ - -/* Collected related headers */ -#include "datapoollocal/LocalPoolVariable.h" -#include "datapoollocal/LocalPoolVector.h" -#include "datapoollocal/StaticLocalDataSet.h" -#include "datapoollocal/LocalDataSet.h" -#include "datapoollocal/SharedLocalDataSet.h" - - -#endif /* FSFW_DATAPOOLLOCAL_DATAPOOLLOCAL_H_ */ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 70e6d76e..5a8f139b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,3 +1,20 @@ -add_subdirectory(core) -add_subdirectory(opt) -add_subdirectory(osal) +target_include_directories(${LIB_FSFW_NAME} PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} +) + +target_include_directories(${LIB_FSFW_NAME} INTERFACE + ${CMAKE_CURRENT_SOURCE_DIR} +) + +add_subdirectory(fsfw) + +# Configure File + +target_include_directories(${LIB_FSFW_NAME} PRIVATE + ${CMAKE_CURRENT_BINARY_DIR} +) +target_include_directories(${LIB_FSFW_NAME} INTERFACE + ${CMAKE_CURRENT_BINARY_DIR} +) + +configure_file(fsfw/FSFW.h.in fsfw/FSFW.h) diff --git a/src/core/devicehandlers/CMakeLists.txt b/src/core/devicehandlers/CMakeLists.txt deleted file mode 100644 index a3fb6d65..00000000 --- a/src/core/devicehandlers/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -target_sources(${LIB_FSFW_NAME} PRIVATE - AssemblyBase.cpp - ChildHandlerBase.cpp - ChildHandlerFDIR.cpp - DeviceHandlerBase.cpp - DeviceHandlerFailureIsolation.cpp - DeviceHandlerMessage.cpp - DeviceTmReportingWrapper.cpp - HealthDevice.cpp -) diff --git a/src/core/housekeeping/CMakeLists.txt b/src/core/housekeeping/CMakeLists.txt deleted file mode 100644 index 0a3e7bd1..00000000 --- a/src/core/housekeeping/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -target_sources(${LIB_FSFW_NAME} PRIVATE - HousekeepingMessage.cpp - PeriodicHousekeepingHelper.cpp -) \ No newline at end of file diff --git a/src/core/CMakeLists.txt b/src/fsfw/CMakeLists.txt similarity index 65% rename from src/core/CMakeLists.txt rename to src/fsfw/CMakeLists.txt index 4a2f7a2c..7c665e28 100644 --- a/src/core/CMakeLists.txt +++ b/src/fsfw/CMakeLists.txt @@ -1,3 +1,5 @@ +# Core + add_subdirectory(action) add_subdirectory(container) add_subdirectory(controller) @@ -26,3 +28,28 @@ add_subdirectory(thermal) add_subdirectory(timemanager) add_subdirectory(tmtcpacket) add_subdirectory(tmtcservices) + +# Optional + +if(FSFW_ADD_MONITORING) +add_subdirectory(monitoring) +endif() +if(FSFW_ADD_PUS) + add_subdirectory(pus) +endif() +if(FSFW_ADD_TMSTORAGE) + add_subdirectory(tmstorage) +endif() +if(FSFW_ADD_COORDINATES) + add_subdirectory(coordinates) +endif() +if(FSFW_ADD_RMAP) + add_subdirectory(rmap) +endif() +if(FSFW_ADD_DATALINKLAYER) + add_subdirectory(datalinklayer) +endif() + +# OSAL + +add_subdirectory(osal) diff --git a/src/fsfw/FSFW.h.in b/src/fsfw/FSFW.h.in new file mode 100644 index 00000000..9b74d04c --- /dev/null +++ b/src/fsfw/FSFW.h.in @@ -0,0 +1,13 @@ +#ifndef FSFW_FSFW_H_ +#define FSFW_FSFW_H_ + +#include "FSFWConfig.h" + +#cmakedefine FSFW_ADD_RMAP +#cmakedefine FSFW_ADD_DATALINKLAYER +#cmakedefine FSFW_ADD_TMSTORAGE +#cmakedefine FSFW_ADD_COORDINATES +#cmakedefine FSFW_ADD_PUS +#cmakedefine FSFW_ADD_MONITORING + +#endif /* FSFW_FSFW_H_ */ diff --git a/inc/fsfw/FSFWVersion.h b/src/fsfw/FSFWVersion.h similarity index 100% rename from inc/fsfw/FSFWVersion.h rename to src/fsfw/FSFWVersion.h diff --git a/src/fsfw/action.h b/src/fsfw/action.h new file mode 100644 index 00000000..1300cf17 --- /dev/null +++ b/src/fsfw/action.h @@ -0,0 +1,11 @@ +#ifndef FSFW_INC_FSFW_ACTION_H_ +#define FSFW_INC_FSFW_ACTION_H_ + +#include "fsfw/action/ActionHelper.h" +#include "fsfw/action/ActionMessage.h" +#include "fsfw/action/CommandActionHelper.h" +#include "fsfw/action/HasActionsIF.h" +#include "fsfw/action/CommandsActionsIF.h" +#include "fsfw/action/SimpleActionHelper.h" + +#endif /* FSFW_INC_FSFW_ACTION_H_ */ diff --git a/src/core/action/ActionHelper.cpp b/src/fsfw/action/ActionHelper.cpp similarity index 100% rename from src/core/action/ActionHelper.cpp rename to src/fsfw/action/ActionHelper.cpp diff --git a/inc/fsfw/action/ActionHelper.h b/src/fsfw/action/ActionHelper.h similarity index 100% rename from inc/fsfw/action/ActionHelper.h rename to src/fsfw/action/ActionHelper.h diff --git a/src/core/action/ActionMessage.cpp b/src/fsfw/action/ActionMessage.cpp similarity index 100% rename from src/core/action/ActionMessage.cpp rename to src/fsfw/action/ActionMessage.cpp diff --git a/inc/fsfw/action/ActionMessage.h b/src/fsfw/action/ActionMessage.h similarity index 100% rename from inc/fsfw/action/ActionMessage.h rename to src/fsfw/action/ActionMessage.h diff --git a/src/core/action/CMakeLists.txt b/src/fsfw/action/CMakeLists.txt similarity index 100% rename from src/core/action/CMakeLists.txt rename to src/fsfw/action/CMakeLists.txt diff --git a/src/core/action/CommandActionHelper.cpp b/src/fsfw/action/CommandActionHelper.cpp similarity index 100% rename from src/core/action/CommandActionHelper.cpp rename to src/fsfw/action/CommandActionHelper.cpp diff --git a/inc/fsfw/action/CommandActionHelper.h b/src/fsfw/action/CommandActionHelper.h similarity index 100% rename from inc/fsfw/action/CommandActionHelper.h rename to src/fsfw/action/CommandActionHelper.h diff --git a/inc/fsfw/action/CommandsActionsIF.h b/src/fsfw/action/CommandsActionsIF.h similarity index 100% rename from inc/fsfw/action/CommandsActionsIF.h rename to src/fsfw/action/CommandsActionsIF.h diff --git a/inc/fsfw/action/HasActionsIF.h b/src/fsfw/action/HasActionsIF.h similarity index 100% rename from inc/fsfw/action/HasActionsIF.h rename to src/fsfw/action/HasActionsIF.h diff --git a/src/core/action/SimpleActionHelper.cpp b/src/fsfw/action/SimpleActionHelper.cpp similarity index 100% rename from src/core/action/SimpleActionHelper.cpp rename to src/fsfw/action/SimpleActionHelper.cpp diff --git a/inc/fsfw/action/SimpleActionHelper.h b/src/fsfw/action/SimpleActionHelper.h similarity index 100% rename from inc/fsfw/action/SimpleActionHelper.h rename to src/fsfw/action/SimpleActionHelper.h diff --git a/inc/fsfw/container/ArrayList.h b/src/fsfw/container/ArrayList.h similarity index 100% rename from inc/fsfw/container/ArrayList.h rename to src/fsfw/container/ArrayList.h diff --git a/inc/fsfw/container/BinaryTree.h b/src/fsfw/container/BinaryTree.h similarity index 100% rename from inc/fsfw/container/BinaryTree.h rename to src/fsfw/container/BinaryTree.h diff --git a/src/core/container/CMakeLists.txt b/src/fsfw/container/CMakeLists.txt similarity index 100% rename from src/core/container/CMakeLists.txt rename to src/fsfw/container/CMakeLists.txt diff --git a/inc/fsfw/container/DynamicFIFO.h b/src/fsfw/container/DynamicFIFO.h similarity index 100% rename from inc/fsfw/container/DynamicFIFO.h rename to src/fsfw/container/DynamicFIFO.h diff --git a/inc/fsfw/container/FIFO.h b/src/fsfw/container/FIFO.h similarity index 100% rename from inc/fsfw/container/FIFO.h rename to src/fsfw/container/FIFO.h diff --git a/inc/fsfw/container/FIFOBase.h b/src/fsfw/container/FIFOBase.h similarity index 100% rename from inc/fsfw/container/FIFOBase.h rename to src/fsfw/container/FIFOBase.h diff --git a/inc/fsfw/container/FIFOBase.tpp b/src/fsfw/container/FIFOBase.tpp similarity index 100% rename from inc/fsfw/container/FIFOBase.tpp rename to src/fsfw/container/FIFOBase.tpp diff --git a/inc/fsfw/container/FixedArrayList.h b/src/fsfw/container/FixedArrayList.h similarity index 100% rename from inc/fsfw/container/FixedArrayList.h rename to src/fsfw/container/FixedArrayList.h diff --git a/inc/fsfw/container/FixedMap.h b/src/fsfw/container/FixedMap.h similarity index 100% rename from inc/fsfw/container/FixedMap.h rename to src/fsfw/container/FixedMap.h diff --git a/inc/fsfw/container/FixedOrderedMultimap.h b/src/fsfw/container/FixedOrderedMultimap.h similarity index 100% rename from inc/fsfw/container/FixedOrderedMultimap.h rename to src/fsfw/container/FixedOrderedMultimap.h diff --git a/inc/fsfw/container/FixedOrderedMultimap.tpp b/src/fsfw/container/FixedOrderedMultimap.tpp similarity index 100% rename from inc/fsfw/container/FixedOrderedMultimap.tpp rename to src/fsfw/container/FixedOrderedMultimap.tpp diff --git a/inc/fsfw/container/HybridIterator.h b/src/fsfw/container/HybridIterator.h similarity index 100% rename from inc/fsfw/container/HybridIterator.h rename to src/fsfw/container/HybridIterator.h diff --git a/inc/fsfw/container/IndexedRingMemoryArray.h b/src/fsfw/container/IndexedRingMemoryArray.h similarity index 100% rename from inc/fsfw/container/IndexedRingMemoryArray.h rename to src/fsfw/container/IndexedRingMemoryArray.h diff --git a/inc/fsfw/container/PlacementFactory.h b/src/fsfw/container/PlacementFactory.h similarity index 100% rename from inc/fsfw/container/PlacementFactory.h rename to src/fsfw/container/PlacementFactory.h diff --git a/inc/fsfw/container/RingBufferBase.h b/src/fsfw/container/RingBufferBase.h similarity index 100% rename from inc/fsfw/container/RingBufferBase.h rename to src/fsfw/container/RingBufferBase.h diff --git a/src/core/container/SharedRingBuffer.cpp b/src/fsfw/container/SharedRingBuffer.cpp similarity index 100% rename from src/core/container/SharedRingBuffer.cpp rename to src/fsfw/container/SharedRingBuffer.cpp diff --git a/inc/fsfw/container/SharedRingBuffer.h b/src/fsfw/container/SharedRingBuffer.h similarity index 100% rename from inc/fsfw/container/SharedRingBuffer.h rename to src/fsfw/container/SharedRingBuffer.h diff --git a/src/core/container/SimpleRingBuffer.cpp b/src/fsfw/container/SimpleRingBuffer.cpp similarity index 100% rename from src/core/container/SimpleRingBuffer.cpp rename to src/fsfw/container/SimpleRingBuffer.cpp diff --git a/inc/fsfw/container/SimpleRingBuffer.h b/src/fsfw/container/SimpleRingBuffer.h similarity index 100% rename from inc/fsfw/container/SimpleRingBuffer.h rename to src/fsfw/container/SimpleRingBuffer.h diff --git a/inc/fsfw/container/SinglyLinkedList.h b/src/fsfw/container/SinglyLinkedList.h similarity index 100% rename from inc/fsfw/container/SinglyLinkedList.h rename to src/fsfw/container/SinglyLinkedList.h diff --git a/inc/fsfw/container/group.h b/src/fsfw/container/group.h similarity index 100% rename from inc/fsfw/container/group.h rename to src/fsfw/container/group.h diff --git a/src/core/controller/CMakeLists.txt b/src/fsfw/controller/CMakeLists.txt similarity index 100% rename from src/core/controller/CMakeLists.txt rename to src/fsfw/controller/CMakeLists.txt diff --git a/src/core/controller/ControllerBase.cpp b/src/fsfw/controller/ControllerBase.cpp similarity index 100% rename from src/core/controller/ControllerBase.cpp rename to src/fsfw/controller/ControllerBase.cpp diff --git a/inc/fsfw/controller/ControllerBase.h b/src/fsfw/controller/ControllerBase.h similarity index 100% rename from inc/fsfw/controller/ControllerBase.h rename to src/fsfw/controller/ControllerBase.h diff --git a/src/core/controller/ExtendedControllerBase.cpp b/src/fsfw/controller/ExtendedControllerBase.cpp similarity index 100% rename from src/core/controller/ExtendedControllerBase.cpp rename to src/fsfw/controller/ExtendedControllerBase.cpp diff --git a/inc/fsfw/controller/ExtendedControllerBase.h b/src/fsfw/controller/ExtendedControllerBase.h similarity index 100% rename from inc/fsfw/controller/ExtendedControllerBase.h rename to src/fsfw/controller/ExtendedControllerBase.h diff --git a/src/opt/coordinates/CMakeLists.txt b/src/fsfw/coordinates/CMakeLists.txt similarity index 100% rename from src/opt/coordinates/CMakeLists.txt rename to src/fsfw/coordinates/CMakeLists.txt diff --git a/src/opt/coordinates/CoordinateTransformations.cpp b/src/fsfw/coordinates/CoordinateTransformations.cpp similarity index 100% rename from src/opt/coordinates/CoordinateTransformations.cpp rename to src/fsfw/coordinates/CoordinateTransformations.cpp diff --git a/inc/fsfw/coordinates/CoordinateTransformations.h b/src/fsfw/coordinates/CoordinateTransformations.h similarity index 97% rename from inc/fsfw/coordinates/CoordinateTransformations.h rename to src/fsfw/coordinates/CoordinateTransformations.h index a22e0bd4..ddc715d1 100644 --- a/inc/fsfw/coordinates/CoordinateTransformations.h +++ b/src/fsfw/coordinates/CoordinateTransformations.h @@ -1,6 +1,7 @@ #ifndef COORDINATETRANSFORMATIONS_H_ #define COORDINATETRANSFORMATIONS_H_ +#include "coordinatesConf.h" #include "fsfw/timemanager/Clock.h" #include diff --git a/inc/fsfw/coordinates/Jgm3Model.h b/src/fsfw/coordinates/Jgm3Model.h similarity index 96% rename from inc/fsfw/coordinates/Jgm3Model.h rename to src/fsfw/coordinates/Jgm3Model.h index 884ed141..0eeaf08f 100644 --- a/inc/fsfw/coordinates/Jgm3Model.h +++ b/src/fsfw/coordinates/Jgm3Model.h @@ -1,13 +1,14 @@ #ifndef FRAMEWORK_COORDINATES_JGM3MODEL_H_ #define FRAMEWORK_COORDINATES_JGM3MODEL_H_ -#include +#include "coordinatesConf.h" #include "CoordinateTransformations.h" -#include "../globalfunctions/math/VectorOperations.h" -#include "../globalfunctions/timevalOperations.h" -#include "../globalfunctions/constants.h" -#include +#include "fsfw/globalfunctions/math/VectorOperations.h" +#include "fsfw/globalfunctions/timevalOperations.h" +#include "fsfw/globalfunctions/constants.h" +#include +#include template class Jgm3Model { diff --git a/src/opt/coordinates/Sgp4Propagator.cpp b/src/fsfw/coordinates/Sgp4Propagator.cpp similarity index 100% rename from src/opt/coordinates/Sgp4Propagator.cpp rename to src/fsfw/coordinates/Sgp4Propagator.cpp diff --git a/inc/fsfw/coordinates/Sgp4Propagator.h b/src/fsfw/coordinates/Sgp4Propagator.h similarity index 97% rename from inc/fsfw/coordinates/Sgp4Propagator.h rename to src/fsfw/coordinates/Sgp4Propagator.h index 53c5d3e5..4f29509f 100644 --- a/inc/fsfw/coordinates/Sgp4Propagator.h +++ b/src/fsfw/coordinates/Sgp4Propagator.h @@ -1,7 +1,9 @@ #ifndef SGP4PROPAGATOR_H_ #define SGP4PROPAGATOR_H_ +#include "coordinatesConf.h" #include "fsfw/platform.h" + #ifndef PLATFORM_WIN #include #endif diff --git a/src/fsfw/coordinates/coordinatesConf.h b/src/fsfw/coordinates/coordinatesConf.h new file mode 100644 index 00000000..ce798e6f --- /dev/null +++ b/src/fsfw/coordinates/coordinatesConf.h @@ -0,0 +1,11 @@ +#ifndef FSFW_SRC_FSFW_COORDINATES_COORDINATESCONF_H_ +#define FSFW_SRC_FSFW_COORDINATES_COORDINATESCONF_H_ + +#include "fsfw/FSFW.h" + +#ifndef FSFW_ADD_COORDINATES +#warning Coordinates files were included but compilation was \ + not enabled with FSFW_ADD_COORDINATES +#endif + +#endif /* FSFW_SRC_FSFW_COORDINATES_COORDINATESCONF_H_ */ diff --git a/inc/fsfw/datalinklayer/BCFrame.h b/src/fsfw/datalinklayer/BCFrame.h similarity index 98% rename from inc/fsfw/datalinklayer/BCFrame.h rename to src/fsfw/datalinklayer/BCFrame.h index b7795556..9cedd41b 100644 --- a/inc/fsfw/datalinklayer/BCFrame.h +++ b/src/fsfw/datalinklayer/BCFrame.h @@ -8,6 +8,7 @@ #ifndef BCFRAME_H_ #define BCFRAME_H_ +#include "dllConf.h" #include "CCSDSReturnValuesIF.h" /** diff --git a/inc/fsfw/datalinklayer/CCSDSReturnValuesIF.h b/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h similarity index 98% rename from inc/fsfw/datalinklayer/CCSDSReturnValuesIF.h rename to src/fsfw/datalinklayer/CCSDSReturnValuesIF.h index 805b6969..a31f9ced 100644 --- a/inc/fsfw/datalinklayer/CCSDSReturnValuesIF.h +++ b/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h @@ -8,7 +8,8 @@ #ifndef CCSDSRETURNVALUESIF_H_ #define CCSDSRETURNVALUESIF_H_ -#include "../returnvalues/HasReturnvaluesIF.h" +#include "dllConf.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" /** * This is a helper class to collect special return values that come up during CCSDS Handling. * @ingroup ccsds_handling diff --git a/src/opt/datalinklayer/CMakeLists.txt b/src/fsfw/datalinklayer/CMakeLists.txt similarity index 100% rename from src/opt/datalinklayer/CMakeLists.txt rename to src/fsfw/datalinklayer/CMakeLists.txt diff --git a/src/opt/datalinklayer/Clcw.cpp b/src/fsfw/datalinklayer/Clcw.cpp similarity index 100% rename from src/opt/datalinklayer/Clcw.cpp rename to src/fsfw/datalinklayer/Clcw.cpp diff --git a/inc/fsfw/datalinklayer/Clcw.h b/src/fsfw/datalinklayer/Clcw.h similarity index 99% rename from inc/fsfw/datalinklayer/Clcw.h rename to src/fsfw/datalinklayer/Clcw.h index f6c77230..aa1ee35b 100644 --- a/inc/fsfw/datalinklayer/Clcw.h +++ b/src/fsfw/datalinklayer/Clcw.h @@ -1,7 +1,9 @@ #ifndef CLCW_H_ #define CLCW_H_ +#include "dllConf.h" #include "ClcwIF.h" + /** * Small helper method to handle the Clcw values. * It has a content struct that manages the register and can be set externally. diff --git a/inc/fsfw/datalinklayer/ClcwIF.h b/src/fsfw/datalinklayer/ClcwIF.h similarity index 100% rename from inc/fsfw/datalinklayer/ClcwIF.h rename to src/fsfw/datalinklayer/ClcwIF.h diff --git a/src/opt/datalinklayer/DataLinkLayer.cpp b/src/fsfw/datalinklayer/DataLinkLayer.cpp similarity index 100% rename from src/opt/datalinklayer/DataLinkLayer.cpp rename to src/fsfw/datalinklayer/DataLinkLayer.cpp diff --git a/inc/fsfw/datalinklayer/DataLinkLayer.h b/src/fsfw/datalinklayer/DataLinkLayer.h similarity index 99% rename from inc/fsfw/datalinklayer/DataLinkLayer.h rename to src/fsfw/datalinklayer/DataLinkLayer.h index aa203785..9c2a2952 100644 --- a/inc/fsfw/datalinklayer/DataLinkLayer.h +++ b/src/fsfw/datalinklayer/DataLinkLayer.h @@ -1,11 +1,13 @@ #ifndef DATALINKLAYER_H_ #define DATALINKLAYER_H_ +#include "dllConf.h" #include "CCSDSReturnValuesIF.h" #include "ClcwIF.h" #include "TcTransferFrame.h" #include "VirtualChannelReceptionIF.h" -#include "../events/Event.h" +#include "fsfw/events/Event.h" + #include diff --git a/inc/fsfw/datalinklayer/Farm1StateIF.h b/src/fsfw/datalinklayer/Farm1StateIF.h similarity index 98% rename from inc/fsfw/datalinklayer/Farm1StateIF.h rename to src/fsfw/datalinklayer/Farm1StateIF.h index 71794d75..7e1ba2ec 100644 --- a/inc/fsfw/datalinklayer/Farm1StateIF.h +++ b/src/fsfw/datalinklayer/Farm1StateIF.h @@ -8,7 +8,9 @@ #ifndef FARM1STATEIF_H_ #define FARM1STATEIF_H_ +#include "dllConf.h" #include "CCSDSReturnValuesIF.h" + class VirtualChannelReception; class TcTransferFrame; class ClcwIF; diff --git a/src/opt/datalinklayer/Farm1StateLockout.cpp b/src/fsfw/datalinklayer/Farm1StateLockout.cpp similarity index 100% rename from src/opt/datalinklayer/Farm1StateLockout.cpp rename to src/fsfw/datalinklayer/Farm1StateLockout.cpp diff --git a/inc/fsfw/datalinklayer/Farm1StateLockout.h b/src/fsfw/datalinklayer/Farm1StateLockout.h similarity index 98% rename from inc/fsfw/datalinklayer/Farm1StateLockout.h rename to src/fsfw/datalinklayer/Farm1StateLockout.h index 28abf4e6..a039c89b 100644 --- a/inc/fsfw/datalinklayer/Farm1StateLockout.h +++ b/src/fsfw/datalinklayer/Farm1StateLockout.h @@ -1,6 +1,7 @@ #ifndef FARM1STATELOCKOUT_H_ #define FARM1STATELOCKOUT_H_ +#include "dllConf.h" #include "Farm1StateIF.h" /** diff --git a/src/opt/datalinklayer/Farm1StateOpen.cpp b/src/fsfw/datalinklayer/Farm1StateOpen.cpp similarity index 100% rename from src/opt/datalinklayer/Farm1StateOpen.cpp rename to src/fsfw/datalinklayer/Farm1StateOpen.cpp diff --git a/inc/fsfw/datalinklayer/Farm1StateOpen.h b/src/fsfw/datalinklayer/Farm1StateOpen.h similarity index 99% rename from inc/fsfw/datalinklayer/Farm1StateOpen.h rename to src/fsfw/datalinklayer/Farm1StateOpen.h index 3b3a2604..c5506e7a 100644 --- a/inc/fsfw/datalinklayer/Farm1StateOpen.h +++ b/src/fsfw/datalinklayer/Farm1StateOpen.h @@ -8,6 +8,7 @@ #ifndef FARM1STATEOPEN_H_ #define FARM1STATEOPEN_H_ +#include "dllConf.h" #include "Farm1StateIF.h" /** diff --git a/src/opt/datalinklayer/Farm1StateWait.cpp b/src/fsfw/datalinklayer/Farm1StateWait.cpp similarity index 100% rename from src/opt/datalinklayer/Farm1StateWait.cpp rename to src/fsfw/datalinklayer/Farm1StateWait.cpp diff --git a/inc/fsfw/datalinklayer/Farm1StateWait.h b/src/fsfw/datalinklayer/Farm1StateWait.h similarity index 98% rename from inc/fsfw/datalinklayer/Farm1StateWait.h rename to src/fsfw/datalinklayer/Farm1StateWait.h index 877c36c2..76704fdb 100644 --- a/inc/fsfw/datalinklayer/Farm1StateWait.h +++ b/src/fsfw/datalinklayer/Farm1StateWait.h @@ -8,6 +8,7 @@ #ifndef FARM1STATEWAIT_H_ #define FARM1STATEWAIT_H_ +#include "dllConf.h" #include "Farm1StateIF.h" /** diff --git a/src/opt/datalinklayer/MapPacketExtraction.cpp b/src/fsfw/datalinklayer/MapPacketExtraction.cpp similarity index 100% rename from src/opt/datalinklayer/MapPacketExtraction.cpp rename to src/fsfw/datalinklayer/MapPacketExtraction.cpp diff --git a/inc/fsfw/datalinklayer/MapPacketExtraction.h b/src/fsfw/datalinklayer/MapPacketExtraction.h similarity index 99% rename from inc/fsfw/datalinklayer/MapPacketExtraction.h rename to src/fsfw/datalinklayer/MapPacketExtraction.h index c74ab803..30552a8e 100644 --- a/inc/fsfw/datalinklayer/MapPacketExtraction.h +++ b/src/fsfw/datalinklayer/MapPacketExtraction.h @@ -1,6 +1,7 @@ #ifndef FSFW_DATALINKLAYER_MAPPACKETEXTRACTION_H_ #define FSFW_DATALINKLAYER_MAPPACKETEXTRACTION_H_ +#include "dllConf.h" #include "MapPacketExtractionIF.h" #include "fsfw/objectmanager/ObjectManagerIF.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h" diff --git a/inc/fsfw/datalinklayer/MapPacketExtractionIF.h b/src/fsfw/datalinklayer/MapPacketExtractionIF.h similarity index 98% rename from inc/fsfw/datalinklayer/MapPacketExtractionIF.h rename to src/fsfw/datalinklayer/MapPacketExtractionIF.h index e29ac666..7f8a60af 100644 --- a/inc/fsfw/datalinklayer/MapPacketExtractionIF.h +++ b/src/fsfw/datalinklayer/MapPacketExtractionIF.h @@ -8,6 +8,7 @@ #ifndef MAPPACKETEXTRACTIONIF_H_ #define MAPPACKETEXTRACTIONIF_H_ +#include "dllConf.h" #include "CCSDSReturnValuesIF.h" #include "TcTransferFrame.h" diff --git a/src/opt/datalinklayer/TcTransferFrame.cpp b/src/fsfw/datalinklayer/TcTransferFrame.cpp similarity index 100% rename from src/opt/datalinklayer/TcTransferFrame.cpp rename to src/fsfw/datalinklayer/TcTransferFrame.cpp diff --git a/inc/fsfw/datalinklayer/TcTransferFrame.h b/src/fsfw/datalinklayer/TcTransferFrame.h similarity index 99% rename from inc/fsfw/datalinklayer/TcTransferFrame.h rename to src/fsfw/datalinklayer/TcTransferFrame.h index ca96536f..9d4f6349 100644 --- a/inc/fsfw/datalinklayer/TcTransferFrame.h +++ b/src/fsfw/datalinklayer/TcTransferFrame.h @@ -1,6 +1,8 @@ #ifndef TCTRANSFERFRAME_H_ #define TCTRANSFERFRAME_H_ +#include "dllConf.h" + #include #include diff --git a/src/opt/datalinklayer/TcTransferFrameLocal.cpp b/src/fsfw/datalinklayer/TcTransferFrameLocal.cpp similarity index 100% rename from src/opt/datalinklayer/TcTransferFrameLocal.cpp rename to src/fsfw/datalinklayer/TcTransferFrameLocal.cpp diff --git a/inc/fsfw/datalinklayer/TcTransferFrameLocal.h b/src/fsfw/datalinklayer/TcTransferFrameLocal.h similarity index 98% rename from inc/fsfw/datalinklayer/TcTransferFrameLocal.h rename to src/fsfw/datalinklayer/TcTransferFrameLocal.h index 487d8940..f2bf3275 100644 --- a/inc/fsfw/datalinklayer/TcTransferFrameLocal.h +++ b/src/fsfw/datalinklayer/TcTransferFrameLocal.h @@ -8,6 +8,7 @@ #ifndef TCTRANSFERFRAMELOCAL_H_ #define TCTRANSFERFRAMELOCAL_H_ +#include "dllConf.h" #include "TcTransferFrame.h" /** diff --git a/src/opt/datalinklayer/VirtualChannelReception.cpp b/src/fsfw/datalinklayer/VirtualChannelReception.cpp similarity index 100% rename from src/opt/datalinklayer/VirtualChannelReception.cpp rename to src/fsfw/datalinklayer/VirtualChannelReception.cpp diff --git a/inc/fsfw/datalinklayer/VirtualChannelReception.h b/src/fsfw/datalinklayer/VirtualChannelReception.h similarity index 99% rename from inc/fsfw/datalinklayer/VirtualChannelReception.h rename to src/fsfw/datalinklayer/VirtualChannelReception.h index 9b4e2987..314e18ec 100644 --- a/inc/fsfw/datalinklayer/VirtualChannelReception.h +++ b/src/fsfw/datalinklayer/VirtualChannelReception.h @@ -8,6 +8,7 @@ #ifndef VIRTUALCHANNELRECEPTION_H_ #define VIRTUALCHANNELRECEPTION_H_ +#include "dllConf.h" #include "CCSDSReturnValuesIF.h" #include "Clcw.h" #include "Farm1StateIF.h" @@ -16,6 +17,7 @@ #include "Farm1StateWait.h" #include "MapPacketExtractionIF.h" #include "VirtualChannelReceptionIF.h" + #include /** * Implementation of a TC Virtual Channel. diff --git a/inc/fsfw/datalinklayer/VirtualChannelReceptionIF.h b/src/fsfw/datalinklayer/VirtualChannelReceptionIF.h similarity index 95% rename from inc/fsfw/datalinklayer/VirtualChannelReceptionIF.h rename to src/fsfw/datalinklayer/VirtualChannelReceptionIF.h index 36f60e8c..e7a21b3c 100644 --- a/inc/fsfw/datalinklayer/VirtualChannelReceptionIF.h +++ b/src/fsfw/datalinklayer/VirtualChannelReceptionIF.h @@ -8,9 +8,10 @@ #ifndef VIRTUALCHANNELRECEPTIONIF_H_ #define VIRTUALCHANNELRECEPTIONIF_H_ +#include "dllConf.h" #include "ClcwIF.h" #include "TcTransferFrame.h" -#include "../returnvalues/HasReturnvaluesIF.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" /** * This is the interface for Virtual Channel reception classes. diff --git a/src/fsfw/datalinklayer/dllConf.h b/src/fsfw/datalinklayer/dllConf.h new file mode 100644 index 00000000..dce63ff0 --- /dev/null +++ b/src/fsfw/datalinklayer/dllConf.h @@ -0,0 +1,11 @@ +#ifndef FSFW_SRC_FSFW_DATALINKLAYER_DLLCONF_H_ +#define FSFW_SRC_FSFW_DATALINKLAYER_DLLCONF_H_ + +#include "fsfw/FSFW.h" + +#ifndef FSFW_ADD_DATALINKLAYER +#warning Datalinklayer files were included but compilation was \ + not enabled with FSFW_ADD_DATALINKLAYER +#endif + +#endif /* FSFW_SRC_FSFW_DATALINKLAYER_DLLCONF_H_ */ diff --git a/src/core/datapool/CMakeLists.txt b/src/fsfw/datapool/CMakeLists.txt similarity index 100% rename from src/core/datapool/CMakeLists.txt rename to src/fsfw/datapool/CMakeLists.txt diff --git a/inc/fsfw/datapool/DataSetIF.h b/src/fsfw/datapool/DataSetIF.h similarity index 100% rename from inc/fsfw/datapool/DataSetIF.h rename to src/fsfw/datapool/DataSetIF.h diff --git a/src/core/datapool/HkSwitchHelper.cpp b/src/fsfw/datapool/HkSwitchHelper.cpp similarity index 100% rename from src/core/datapool/HkSwitchHelper.cpp rename to src/fsfw/datapool/HkSwitchHelper.cpp diff --git a/inc/fsfw/datapool/HkSwitchHelper.h b/src/fsfw/datapool/HkSwitchHelper.h similarity index 100% rename from inc/fsfw/datapool/HkSwitchHelper.h rename to src/fsfw/datapool/HkSwitchHelper.h diff --git a/src/core/datapool/PoolDataSetBase.cpp b/src/fsfw/datapool/PoolDataSetBase.cpp similarity index 100% rename from src/core/datapool/PoolDataSetBase.cpp rename to src/fsfw/datapool/PoolDataSetBase.cpp diff --git a/inc/fsfw/datapool/PoolDataSetBase.h b/src/fsfw/datapool/PoolDataSetBase.h similarity index 100% rename from inc/fsfw/datapool/PoolDataSetBase.h rename to src/fsfw/datapool/PoolDataSetBase.h diff --git a/inc/fsfw/datapool/PoolDataSetIF.h b/src/fsfw/datapool/PoolDataSetIF.h similarity index 100% rename from inc/fsfw/datapool/PoolDataSetIF.h rename to src/fsfw/datapool/PoolDataSetIF.h diff --git a/src/core/datapool/PoolEntry.cpp b/src/fsfw/datapool/PoolEntry.cpp similarity index 100% rename from src/core/datapool/PoolEntry.cpp rename to src/fsfw/datapool/PoolEntry.cpp diff --git a/inc/fsfw/datapool/PoolEntry.h b/src/fsfw/datapool/PoolEntry.h similarity index 100% rename from inc/fsfw/datapool/PoolEntry.h rename to src/fsfw/datapool/PoolEntry.h diff --git a/inc/fsfw/datapool/PoolEntryIF.h b/src/fsfw/datapool/PoolEntryIF.h similarity index 100% rename from inc/fsfw/datapool/PoolEntryIF.h rename to src/fsfw/datapool/PoolEntryIF.h diff --git a/inc/fsfw/datapool/PoolReadGuard.h b/src/fsfw/datapool/PoolReadGuard.h similarity index 100% rename from inc/fsfw/datapool/PoolReadGuard.h rename to src/fsfw/datapool/PoolReadGuard.h diff --git a/inc/fsfw/datapool/PoolVarList.h b/src/fsfw/datapool/PoolVarList.h similarity index 100% rename from inc/fsfw/datapool/PoolVarList.h rename to src/fsfw/datapool/PoolVarList.h diff --git a/inc/fsfw/datapool/PoolVariableIF.h b/src/fsfw/datapool/PoolVariableIF.h similarity index 100% rename from inc/fsfw/datapool/PoolVariableIF.h rename to src/fsfw/datapool/PoolVariableIF.h diff --git a/inc/fsfw/datapool/ReadCommitIF.h b/src/fsfw/datapool/ReadCommitIF.h similarity index 100% rename from inc/fsfw/datapool/ReadCommitIF.h rename to src/fsfw/datapool/ReadCommitIF.h diff --git a/inc/fsfw/datapool/ReadCommitIFAttorney.h b/src/fsfw/datapool/ReadCommitIFAttorney.h similarity index 100% rename from inc/fsfw/datapool/ReadCommitIFAttorney.h rename to src/fsfw/datapool/ReadCommitIFAttorney.h diff --git a/inc/fsfw/datapool/SharedDataSetIF.h b/src/fsfw/datapool/SharedDataSetIF.h similarity index 100% rename from inc/fsfw/datapool/SharedDataSetIF.h rename to src/fsfw/datapool/SharedDataSetIF.h diff --git a/src/fsfw/datapoollocal.h b/src/fsfw/datapoollocal.h new file mode 100644 index 00000000..7a3c4c20 --- /dev/null +++ b/src/fsfw/datapoollocal.h @@ -0,0 +1,11 @@ +#ifndef FSFW_DATAPOOLLOCAL_DATAPOOLLOCAL_H_ +#define FSFW_DATAPOOLLOCAL_DATAPOOLLOCAL_H_ + +/* Collected related headers */ +#include "fsfw/datapoollocal/LocalPoolVariable.h" +#include "fsfw/datapoollocal/LocalPoolVector.h" +#include "fsfw/datapoollocal/StaticLocalDataSet.h" +#include "fsfw/datapoollocal/LocalDataSet.h" +#include "fsfw/datapoollocal/SharedLocalDataSet.h" + +#endif /* FSFW_DATAPOOLLOCAL_DATAPOOLLOCAL_H_ */ diff --git a/inc/fsfw/datapoollocal/AccessLocalPoolF.h b/src/fsfw/datapoollocal/AccessLocalPoolF.h similarity index 100% rename from inc/fsfw/datapoollocal/AccessLocalPoolF.h rename to src/fsfw/datapoollocal/AccessLocalPoolF.h diff --git a/src/core/datapoollocal/CMakeLists.txt b/src/fsfw/datapoollocal/CMakeLists.txt similarity index 100% rename from src/core/datapoollocal/CMakeLists.txt rename to src/fsfw/datapoollocal/CMakeLists.txt diff --git a/inc/fsfw/datapoollocal/HasLocalDataPoolIF.h b/src/fsfw/datapoollocal/HasLocalDataPoolIF.h similarity index 100% rename from inc/fsfw/datapoollocal/HasLocalDataPoolIF.h rename to src/fsfw/datapoollocal/HasLocalDataPoolIF.h diff --git a/src/core/datapoollocal/LocalDataPoolManager.cpp b/src/fsfw/datapoollocal/LocalDataPoolManager.cpp similarity index 100% rename from src/core/datapoollocal/LocalDataPoolManager.cpp rename to src/fsfw/datapoollocal/LocalDataPoolManager.cpp diff --git a/inc/fsfw/datapoollocal/LocalDataPoolManager.h b/src/fsfw/datapoollocal/LocalDataPoolManager.h similarity index 100% rename from inc/fsfw/datapoollocal/LocalDataPoolManager.h rename to src/fsfw/datapoollocal/LocalDataPoolManager.h diff --git a/src/core/datapoollocal/LocalDataSet.cpp b/src/fsfw/datapoollocal/LocalDataSet.cpp similarity index 100% rename from src/core/datapoollocal/LocalDataSet.cpp rename to src/fsfw/datapoollocal/LocalDataSet.cpp diff --git a/inc/fsfw/datapoollocal/LocalDataSet.h b/src/fsfw/datapoollocal/LocalDataSet.h similarity index 100% rename from inc/fsfw/datapoollocal/LocalDataSet.h rename to src/fsfw/datapoollocal/LocalDataSet.h diff --git a/src/core/datapoollocal/LocalPoolDataSetBase.cpp b/src/fsfw/datapoollocal/LocalPoolDataSetBase.cpp similarity index 100% rename from src/core/datapoollocal/LocalPoolDataSetBase.cpp rename to src/fsfw/datapoollocal/LocalPoolDataSetBase.cpp diff --git a/inc/fsfw/datapoollocal/LocalPoolDataSetBase.h b/src/fsfw/datapoollocal/LocalPoolDataSetBase.h similarity index 100% rename from inc/fsfw/datapoollocal/LocalPoolDataSetBase.h rename to src/fsfw/datapoollocal/LocalPoolDataSetBase.h diff --git a/src/core/datapoollocal/LocalPoolObjectBase.cpp b/src/fsfw/datapoollocal/LocalPoolObjectBase.cpp similarity index 100% rename from src/core/datapoollocal/LocalPoolObjectBase.cpp rename to src/fsfw/datapoollocal/LocalPoolObjectBase.cpp diff --git a/inc/fsfw/datapoollocal/LocalPoolObjectBase.h b/src/fsfw/datapoollocal/LocalPoolObjectBase.h similarity index 100% rename from inc/fsfw/datapoollocal/LocalPoolObjectBase.h rename to src/fsfw/datapoollocal/LocalPoolObjectBase.h diff --git a/inc/fsfw/datapoollocal/LocalPoolVariable.h b/src/fsfw/datapoollocal/LocalPoolVariable.h similarity index 100% rename from inc/fsfw/datapoollocal/LocalPoolVariable.h rename to src/fsfw/datapoollocal/LocalPoolVariable.h diff --git a/inc/fsfw/datapoollocal/LocalPoolVariable.tpp b/src/fsfw/datapoollocal/LocalPoolVariable.tpp similarity index 100% rename from inc/fsfw/datapoollocal/LocalPoolVariable.tpp rename to src/fsfw/datapoollocal/LocalPoolVariable.tpp diff --git a/inc/fsfw/datapoollocal/LocalPoolVector.h b/src/fsfw/datapoollocal/LocalPoolVector.h similarity index 100% rename from inc/fsfw/datapoollocal/LocalPoolVector.h rename to src/fsfw/datapoollocal/LocalPoolVector.h diff --git a/inc/fsfw/datapoollocal/LocalPoolVector.tpp b/src/fsfw/datapoollocal/LocalPoolVector.tpp similarity index 100% rename from inc/fsfw/datapoollocal/LocalPoolVector.tpp rename to src/fsfw/datapoollocal/LocalPoolVector.tpp diff --git a/inc/fsfw/datapoollocal/MarkChangedIF.h b/src/fsfw/datapoollocal/MarkChangedIF.h similarity index 100% rename from inc/fsfw/datapoollocal/MarkChangedIF.h rename to src/fsfw/datapoollocal/MarkChangedIF.h diff --git a/inc/fsfw/datapoollocal/ProvidesDataPoolSubscriptionIF.h b/src/fsfw/datapoollocal/ProvidesDataPoolSubscriptionIF.h similarity index 100% rename from inc/fsfw/datapoollocal/ProvidesDataPoolSubscriptionIF.h rename to src/fsfw/datapoollocal/ProvidesDataPoolSubscriptionIF.h diff --git a/src/core/datapoollocal/SharedLocalDataSet.cpp b/src/fsfw/datapoollocal/SharedLocalDataSet.cpp similarity index 100% rename from src/core/datapoollocal/SharedLocalDataSet.cpp rename to src/fsfw/datapoollocal/SharedLocalDataSet.cpp diff --git a/inc/fsfw/datapoollocal/SharedLocalDataSet.h b/src/fsfw/datapoollocal/SharedLocalDataSet.h similarity index 100% rename from inc/fsfw/datapoollocal/SharedLocalDataSet.h rename to src/fsfw/datapoollocal/SharedLocalDataSet.h diff --git a/inc/fsfw/datapoollocal/StaticLocalDataSet.h b/src/fsfw/datapoollocal/StaticLocalDataSet.h similarity index 100% rename from inc/fsfw/datapoollocal/StaticLocalDataSet.h rename to src/fsfw/datapoollocal/StaticLocalDataSet.h diff --git a/src/core/datapoollocal/internal/CMakeLists.txt b/src/fsfw/datapoollocal/internal/CMakeLists.txt similarity index 100% rename from src/core/datapoollocal/internal/CMakeLists.txt rename to src/fsfw/datapoollocal/internal/CMakeLists.txt diff --git a/src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp b/src/fsfw/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp similarity index 100% rename from src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp rename to src/fsfw/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp diff --git a/src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.h b/src/fsfw/datapoollocal/internal/HasLocalDpIFManagerAttorney.h similarity index 100% rename from src/core/datapoollocal/internal/HasLocalDpIFManagerAttorney.h rename to src/fsfw/datapoollocal/internal/HasLocalDpIFManagerAttorney.h diff --git a/src/core/datapoollocal/internal/HasLocalDpIFUserAttorney.cpp b/src/fsfw/datapoollocal/internal/HasLocalDpIFUserAttorney.cpp similarity index 100% rename from src/core/datapoollocal/internal/HasLocalDpIFUserAttorney.cpp rename to src/fsfw/datapoollocal/internal/HasLocalDpIFUserAttorney.cpp diff --git a/src/core/datapoollocal/internal/HasLocalDpIFUserAttorney.h b/src/fsfw/datapoollocal/internal/HasLocalDpIFUserAttorney.h similarity index 100% rename from src/core/datapoollocal/internal/HasLocalDpIFUserAttorney.h rename to src/fsfw/datapoollocal/internal/HasLocalDpIFUserAttorney.h diff --git a/inc/fsfw/datapoollocal/internal/LocalDpManagerAttorney.h b/src/fsfw/datapoollocal/internal/LocalDpManagerAttorney.h similarity index 100% rename from inc/fsfw/datapoollocal/internal/LocalDpManagerAttorney.h rename to src/fsfw/datapoollocal/internal/LocalDpManagerAttorney.h diff --git a/src/core/datapoollocal/internal/LocalPoolDataSetAttorney.h b/src/fsfw/datapoollocal/internal/LocalPoolDataSetAttorney.h similarity index 100% rename from src/core/datapoollocal/internal/LocalPoolDataSetAttorney.h rename to src/fsfw/datapoollocal/internal/LocalPoolDataSetAttorney.h diff --git a/inc/fsfw/datapoollocal/localPoolDefinitions.h b/src/fsfw/datapoollocal/localPoolDefinitions.h similarity index 100% rename from inc/fsfw/datapoollocal/localPoolDefinitions.h rename to src/fsfw/datapoollocal/localPoolDefinitions.h diff --git a/inc/fsfw/devicehandlers/AcceptsDeviceResponsesIF.h b/src/fsfw/devicehandlers/AcceptsDeviceResponsesIF.h similarity index 100% rename from inc/fsfw/devicehandlers/AcceptsDeviceResponsesIF.h rename to src/fsfw/devicehandlers/AcceptsDeviceResponsesIF.h diff --git a/src/core/devicehandlers/AssemblyBase.cpp b/src/fsfw/devicehandlers/AssemblyBase.cpp similarity index 100% rename from src/core/devicehandlers/AssemblyBase.cpp rename to src/fsfw/devicehandlers/AssemblyBase.cpp diff --git a/inc/fsfw/devicehandlers/AssemblyBase.h b/src/fsfw/devicehandlers/AssemblyBase.h similarity index 100% rename from inc/fsfw/devicehandlers/AssemblyBase.h rename to src/fsfw/devicehandlers/AssemblyBase.h diff --git a/inc/fsfw/devicehandlers/CMakeLists.txt b/src/fsfw/devicehandlers/CMakeLists.txt similarity index 100% rename from inc/fsfw/devicehandlers/CMakeLists.txt rename to src/fsfw/devicehandlers/CMakeLists.txt diff --git a/src/core/devicehandlers/ChildHandlerBase.cpp b/src/fsfw/devicehandlers/ChildHandlerBase.cpp similarity index 100% rename from src/core/devicehandlers/ChildHandlerBase.cpp rename to src/fsfw/devicehandlers/ChildHandlerBase.cpp diff --git a/inc/fsfw/devicehandlers/ChildHandlerBase.h b/src/fsfw/devicehandlers/ChildHandlerBase.h similarity index 100% rename from inc/fsfw/devicehandlers/ChildHandlerBase.h rename to src/fsfw/devicehandlers/ChildHandlerBase.h diff --git a/src/core/devicehandlers/ChildHandlerFDIR.cpp b/src/fsfw/devicehandlers/ChildHandlerFDIR.cpp similarity index 100% rename from src/core/devicehandlers/ChildHandlerFDIR.cpp rename to src/fsfw/devicehandlers/ChildHandlerFDIR.cpp diff --git a/inc/fsfw/devicehandlers/ChildHandlerFDIR.h b/src/fsfw/devicehandlers/ChildHandlerFDIR.h similarity index 100% rename from inc/fsfw/devicehandlers/ChildHandlerFDIR.h rename to src/fsfw/devicehandlers/ChildHandlerFDIR.h diff --git a/inc/fsfw/devicehandlers/CookieIF.h b/src/fsfw/devicehandlers/CookieIF.h similarity index 100% rename from inc/fsfw/devicehandlers/CookieIF.h rename to src/fsfw/devicehandlers/CookieIF.h diff --git a/inc/fsfw/devicehandlers/DeviceCommunicationIF.h b/src/fsfw/devicehandlers/DeviceCommunicationIF.h similarity index 100% rename from inc/fsfw/devicehandlers/DeviceCommunicationIF.h rename to src/fsfw/devicehandlers/DeviceCommunicationIF.h diff --git a/src/core/devicehandlers/DeviceHandlerBase.cpp b/src/fsfw/devicehandlers/DeviceHandlerBase.cpp similarity index 100% rename from src/core/devicehandlers/DeviceHandlerBase.cpp rename to src/fsfw/devicehandlers/DeviceHandlerBase.cpp diff --git a/inc/fsfw/devicehandlers/DeviceHandlerBase.h b/src/fsfw/devicehandlers/DeviceHandlerBase.h similarity index 100% rename from inc/fsfw/devicehandlers/DeviceHandlerBase.h rename to src/fsfw/devicehandlers/DeviceHandlerBase.h diff --git a/src/core/devicehandlers/DeviceHandlerFailureIsolation.cpp b/src/fsfw/devicehandlers/DeviceHandlerFailureIsolation.cpp similarity index 100% rename from src/core/devicehandlers/DeviceHandlerFailureIsolation.cpp rename to src/fsfw/devicehandlers/DeviceHandlerFailureIsolation.cpp diff --git a/inc/fsfw/devicehandlers/DeviceHandlerFailureIsolation.h b/src/fsfw/devicehandlers/DeviceHandlerFailureIsolation.h similarity index 100% rename from inc/fsfw/devicehandlers/DeviceHandlerFailureIsolation.h rename to src/fsfw/devicehandlers/DeviceHandlerFailureIsolation.h diff --git a/inc/fsfw/devicehandlers/DeviceHandlerIF.h b/src/fsfw/devicehandlers/DeviceHandlerIF.h similarity index 100% rename from inc/fsfw/devicehandlers/DeviceHandlerIF.h rename to src/fsfw/devicehandlers/DeviceHandlerIF.h diff --git a/src/core/devicehandlers/DeviceHandlerMessage.cpp b/src/fsfw/devicehandlers/DeviceHandlerMessage.cpp similarity index 100% rename from src/core/devicehandlers/DeviceHandlerMessage.cpp rename to src/fsfw/devicehandlers/DeviceHandlerMessage.cpp diff --git a/inc/fsfw/devicehandlers/DeviceHandlerMessage.h b/src/fsfw/devicehandlers/DeviceHandlerMessage.h similarity index 100% rename from inc/fsfw/devicehandlers/DeviceHandlerMessage.h rename to src/fsfw/devicehandlers/DeviceHandlerMessage.h diff --git a/inc/fsfw/devicehandlers/DeviceHandlerThermalSet.h b/src/fsfw/devicehandlers/DeviceHandlerThermalSet.h similarity index 100% rename from inc/fsfw/devicehandlers/DeviceHandlerThermalSet.h rename to src/fsfw/devicehandlers/DeviceHandlerThermalSet.h diff --git a/src/core/devicehandlers/DeviceTmReportingWrapper.cpp b/src/fsfw/devicehandlers/DeviceTmReportingWrapper.cpp similarity index 100% rename from src/core/devicehandlers/DeviceTmReportingWrapper.cpp rename to src/fsfw/devicehandlers/DeviceTmReportingWrapper.cpp diff --git a/inc/fsfw/devicehandlers/DeviceTmReportingWrapper.h b/src/fsfw/devicehandlers/DeviceTmReportingWrapper.h similarity index 100% rename from inc/fsfw/devicehandlers/DeviceTmReportingWrapper.h rename to src/fsfw/devicehandlers/DeviceTmReportingWrapper.h diff --git a/src/core/devicehandlers/HealthDevice.cpp b/src/fsfw/devicehandlers/HealthDevice.cpp similarity index 100% rename from src/core/devicehandlers/HealthDevice.cpp rename to src/fsfw/devicehandlers/HealthDevice.cpp diff --git a/inc/fsfw/devicehandlers/HealthDevice.h b/src/fsfw/devicehandlers/HealthDevice.h similarity index 100% rename from inc/fsfw/devicehandlers/HealthDevice.h rename to src/fsfw/devicehandlers/HealthDevice.h diff --git a/src/core/events/CMakeLists.txt b/src/fsfw/events/CMakeLists.txt similarity index 100% rename from src/core/events/CMakeLists.txt rename to src/fsfw/events/CMakeLists.txt diff --git a/inc/fsfw/events/Event.h b/src/fsfw/events/Event.h similarity index 100% rename from inc/fsfw/events/Event.h rename to src/fsfw/events/Event.h diff --git a/src/core/events/EventManager.cpp b/src/fsfw/events/EventManager.cpp similarity index 100% rename from src/core/events/EventManager.cpp rename to src/fsfw/events/EventManager.cpp diff --git a/inc/fsfw/events/EventManager.h b/src/fsfw/events/EventManager.h similarity index 100% rename from inc/fsfw/events/EventManager.h rename to src/fsfw/events/EventManager.h diff --git a/inc/fsfw/events/EventManagerIF.h b/src/fsfw/events/EventManagerIF.h similarity index 100% rename from inc/fsfw/events/EventManagerIF.h rename to src/fsfw/events/EventManagerIF.h diff --git a/src/core/events/EventMessage.cpp b/src/fsfw/events/EventMessage.cpp similarity index 100% rename from src/core/events/EventMessage.cpp rename to src/fsfw/events/EventMessage.cpp diff --git a/inc/fsfw/events/EventMessage.h b/src/fsfw/events/EventMessage.h similarity index 100% rename from inc/fsfw/events/EventMessage.h rename to src/fsfw/events/EventMessage.h diff --git a/inc/fsfw/events/EventReportingProxyIF.h b/src/fsfw/events/EventReportingProxyIF.h similarity index 100% rename from inc/fsfw/events/EventReportingProxyIF.h rename to src/fsfw/events/EventReportingProxyIF.h diff --git a/src/core/events/eventmatching/CMakeLists.txt b/src/fsfw/events/eventmatching/CMakeLists.txt similarity index 100% rename from src/core/events/eventmatching/CMakeLists.txt rename to src/fsfw/events/eventmatching/CMakeLists.txt diff --git a/src/core/events/eventmatching/EventIdRangeMatcher.cpp b/src/fsfw/events/eventmatching/EventIdRangeMatcher.cpp similarity index 100% rename from src/core/events/eventmatching/EventIdRangeMatcher.cpp rename to src/fsfw/events/eventmatching/EventIdRangeMatcher.cpp diff --git a/inc/fsfw/events/eventmatching/EventIdRangeMatcher.h b/src/fsfw/events/eventmatching/EventIdRangeMatcher.h similarity index 100% rename from inc/fsfw/events/eventmatching/EventIdRangeMatcher.h rename to src/fsfw/events/eventmatching/EventIdRangeMatcher.h diff --git a/src/core/events/eventmatching/EventMatchTree.cpp b/src/fsfw/events/eventmatching/EventMatchTree.cpp similarity index 100% rename from src/core/events/eventmatching/EventMatchTree.cpp rename to src/fsfw/events/eventmatching/EventMatchTree.cpp diff --git a/inc/fsfw/events/eventmatching/EventMatchTree.h b/src/fsfw/events/eventmatching/EventMatchTree.h similarity index 100% rename from inc/fsfw/events/eventmatching/EventMatchTree.h rename to src/fsfw/events/eventmatching/EventMatchTree.h diff --git a/inc/fsfw/events/eventmatching/EventRangeMatcherBase.h b/src/fsfw/events/eventmatching/EventRangeMatcherBase.h similarity index 100% rename from inc/fsfw/events/eventmatching/EventRangeMatcherBase.h rename to src/fsfw/events/eventmatching/EventRangeMatcherBase.h diff --git a/src/core/events/eventmatching/ReporterRangeMatcher.cpp b/src/fsfw/events/eventmatching/ReporterRangeMatcher.cpp similarity index 100% rename from src/core/events/eventmatching/ReporterRangeMatcher.cpp rename to src/fsfw/events/eventmatching/ReporterRangeMatcher.cpp diff --git a/inc/fsfw/events/eventmatching/ReporterRangeMatcher.h b/src/fsfw/events/eventmatching/ReporterRangeMatcher.h similarity index 100% rename from inc/fsfw/events/eventmatching/ReporterRangeMatcher.h rename to src/fsfw/events/eventmatching/ReporterRangeMatcher.h diff --git a/src/core/events/eventmatching/SeverityRangeMatcher.cpp b/src/fsfw/events/eventmatching/SeverityRangeMatcher.cpp similarity index 100% rename from src/core/events/eventmatching/SeverityRangeMatcher.cpp rename to src/fsfw/events/eventmatching/SeverityRangeMatcher.cpp diff --git a/inc/fsfw/events/eventmatching/SeverityRangeMatcher.h b/src/fsfw/events/eventmatching/SeverityRangeMatcher.h similarity index 100% rename from inc/fsfw/events/eventmatching/SeverityRangeMatcher.h rename to src/fsfw/events/eventmatching/SeverityRangeMatcher.h diff --git a/inc/fsfw/events/eventmatching/eventmatching.h b/src/fsfw/events/eventmatching/eventmatching.h similarity index 100% rename from inc/fsfw/events/eventmatching/eventmatching.h rename to src/fsfw/events/eventmatching/eventmatching.h diff --git a/inc/fsfw/events/fwSubsystemIdRanges.h b/src/fsfw/events/fwSubsystemIdRanges.h similarity index 100% rename from inc/fsfw/events/fwSubsystemIdRanges.h rename to src/fsfw/events/fwSubsystemIdRanges.h diff --git a/src/core/fdir/CMakeLists.txt b/src/fsfw/fdir/CMakeLists.txt similarity index 100% rename from src/core/fdir/CMakeLists.txt rename to src/fsfw/fdir/CMakeLists.txt diff --git a/inc/fsfw/fdir/ConfirmsFailuresIF.h b/src/fsfw/fdir/ConfirmsFailuresIF.h similarity index 100% rename from inc/fsfw/fdir/ConfirmsFailuresIF.h rename to src/fsfw/fdir/ConfirmsFailuresIF.h diff --git a/src/core/fdir/EventCorrelation.cpp b/src/fsfw/fdir/EventCorrelation.cpp similarity index 100% rename from src/core/fdir/EventCorrelation.cpp rename to src/fsfw/fdir/EventCorrelation.cpp diff --git a/inc/fsfw/fdir/EventCorrelation.h b/src/fsfw/fdir/EventCorrelation.h similarity index 100% rename from inc/fsfw/fdir/EventCorrelation.h rename to src/fsfw/fdir/EventCorrelation.h diff --git a/src/core/fdir/FailureIsolationBase.cpp b/src/fsfw/fdir/FailureIsolationBase.cpp similarity index 100% rename from src/core/fdir/FailureIsolationBase.cpp rename to src/fsfw/fdir/FailureIsolationBase.cpp diff --git a/inc/fsfw/fdir/FailureIsolationBase.h b/src/fsfw/fdir/FailureIsolationBase.h similarity index 100% rename from inc/fsfw/fdir/FailureIsolationBase.h rename to src/fsfw/fdir/FailureIsolationBase.h diff --git a/src/core/fdir/FaultCounter.cpp b/src/fsfw/fdir/FaultCounter.cpp similarity index 100% rename from src/core/fdir/FaultCounter.cpp rename to src/fsfw/fdir/FaultCounter.cpp diff --git a/inc/fsfw/fdir/FaultCounter.h b/src/fsfw/fdir/FaultCounter.h similarity index 100% rename from inc/fsfw/fdir/FaultCounter.h rename to src/fsfw/fdir/FaultCounter.h diff --git a/src/core/globalfunctions/AsciiConverter.cpp b/src/fsfw/globalfunctions/AsciiConverter.cpp similarity index 100% rename from src/core/globalfunctions/AsciiConverter.cpp rename to src/fsfw/globalfunctions/AsciiConverter.cpp diff --git a/inc/fsfw/globalfunctions/AsciiConverter.h b/src/fsfw/globalfunctions/AsciiConverter.h similarity index 100% rename from inc/fsfw/globalfunctions/AsciiConverter.h rename to src/fsfw/globalfunctions/AsciiConverter.h diff --git a/src/core/globalfunctions/CMakeLists.txt b/src/fsfw/globalfunctions/CMakeLists.txt similarity index 100% rename from src/core/globalfunctions/CMakeLists.txt rename to src/fsfw/globalfunctions/CMakeLists.txt diff --git a/src/core/globalfunctions/CRC.cpp b/src/fsfw/globalfunctions/CRC.cpp similarity index 100% rename from src/core/globalfunctions/CRC.cpp rename to src/fsfw/globalfunctions/CRC.cpp diff --git a/inc/fsfw/globalfunctions/CRC.h b/src/fsfw/globalfunctions/CRC.h similarity index 100% rename from inc/fsfw/globalfunctions/CRC.h rename to src/fsfw/globalfunctions/CRC.h diff --git a/src/core/globalfunctions/DleEncoder.cpp b/src/fsfw/globalfunctions/DleEncoder.cpp similarity index 100% rename from src/core/globalfunctions/DleEncoder.cpp rename to src/fsfw/globalfunctions/DleEncoder.cpp diff --git a/inc/fsfw/globalfunctions/DleEncoder.h b/src/fsfw/globalfunctions/DleEncoder.h similarity index 100% rename from inc/fsfw/globalfunctions/DleEncoder.h rename to src/fsfw/globalfunctions/DleEncoder.h diff --git a/src/core/globalfunctions/PeriodicOperationDivider.cpp b/src/fsfw/globalfunctions/PeriodicOperationDivider.cpp similarity index 100% rename from src/core/globalfunctions/PeriodicOperationDivider.cpp rename to src/fsfw/globalfunctions/PeriodicOperationDivider.cpp diff --git a/inc/fsfw/globalfunctions/PeriodicOperationDivider.h b/src/fsfw/globalfunctions/PeriodicOperationDivider.h similarity index 100% rename from inc/fsfw/globalfunctions/PeriodicOperationDivider.h rename to src/fsfw/globalfunctions/PeriodicOperationDivider.h diff --git a/src/core/globalfunctions/Type.cpp b/src/fsfw/globalfunctions/Type.cpp similarity index 100% rename from src/core/globalfunctions/Type.cpp rename to src/fsfw/globalfunctions/Type.cpp diff --git a/inc/fsfw/globalfunctions/Type.h b/src/fsfw/globalfunctions/Type.h similarity index 100% rename from inc/fsfw/globalfunctions/Type.h rename to src/fsfw/globalfunctions/Type.h diff --git a/src/core/globalfunctions/arrayprinter.cpp b/src/fsfw/globalfunctions/arrayprinter.cpp similarity index 100% rename from src/core/globalfunctions/arrayprinter.cpp rename to src/fsfw/globalfunctions/arrayprinter.cpp diff --git a/inc/fsfw/globalfunctions/arrayprinter.h b/src/fsfw/globalfunctions/arrayprinter.h similarity index 100% rename from inc/fsfw/globalfunctions/arrayprinter.h rename to src/fsfw/globalfunctions/arrayprinter.h diff --git a/src/core/globalfunctions/bitutility.cpp b/src/fsfw/globalfunctions/bitutility.cpp similarity index 100% rename from src/core/globalfunctions/bitutility.cpp rename to src/fsfw/globalfunctions/bitutility.cpp diff --git a/inc/fsfw/globalfunctions/bitutility.h b/src/fsfw/globalfunctions/bitutility.h similarity index 100% rename from inc/fsfw/globalfunctions/bitutility.h rename to src/fsfw/globalfunctions/bitutility.h diff --git a/inc/fsfw/globalfunctions/constants.h b/src/fsfw/globalfunctions/constants.h similarity index 100% rename from inc/fsfw/globalfunctions/constants.h rename to src/fsfw/globalfunctions/constants.h diff --git a/inc/fsfw/globalfunctions/matching/BinaryMatcher.h b/src/fsfw/globalfunctions/matching/BinaryMatcher.h similarity index 100% rename from inc/fsfw/globalfunctions/matching/BinaryMatcher.h rename to src/fsfw/globalfunctions/matching/BinaryMatcher.h diff --git a/inc/fsfw/globalfunctions/matching/DecimalMatcher.h b/src/fsfw/globalfunctions/matching/DecimalMatcher.h similarity index 100% rename from inc/fsfw/globalfunctions/matching/DecimalMatcher.h rename to src/fsfw/globalfunctions/matching/DecimalMatcher.h diff --git a/inc/fsfw/globalfunctions/matching/MatchTree.h b/src/fsfw/globalfunctions/matching/MatchTree.h similarity index 100% rename from inc/fsfw/globalfunctions/matching/MatchTree.h rename to src/fsfw/globalfunctions/matching/MatchTree.h diff --git a/inc/fsfw/globalfunctions/matching/MatcherIF.h b/src/fsfw/globalfunctions/matching/MatcherIF.h similarity index 100% rename from inc/fsfw/globalfunctions/matching/MatcherIF.h rename to src/fsfw/globalfunctions/matching/MatcherIF.h diff --git a/inc/fsfw/globalfunctions/matching/RangeMatcher.h b/src/fsfw/globalfunctions/matching/RangeMatcher.h similarity index 100% rename from inc/fsfw/globalfunctions/matching/RangeMatcher.h rename to src/fsfw/globalfunctions/matching/RangeMatcher.h diff --git a/inc/fsfw/globalfunctions/matching/SerializeableMatcherIF.h b/src/fsfw/globalfunctions/matching/SerializeableMatcherIF.h similarity index 100% rename from inc/fsfw/globalfunctions/matching/SerializeableMatcherIF.h rename to src/fsfw/globalfunctions/matching/SerializeableMatcherIF.h diff --git a/src/core/globalfunctions/math/CMakeLists.txt b/src/fsfw/globalfunctions/math/CMakeLists.txt similarity index 100% rename from src/core/globalfunctions/math/CMakeLists.txt rename to src/fsfw/globalfunctions/math/CMakeLists.txt diff --git a/inc/fsfw/globalfunctions/math/MatrixOperations.h b/src/fsfw/globalfunctions/math/MatrixOperations.h similarity index 100% rename from inc/fsfw/globalfunctions/math/MatrixOperations.h rename to src/fsfw/globalfunctions/math/MatrixOperations.h diff --git a/src/core/globalfunctions/math/QuaternionOperations.cpp b/src/fsfw/globalfunctions/math/QuaternionOperations.cpp similarity index 100% rename from src/core/globalfunctions/math/QuaternionOperations.cpp rename to src/fsfw/globalfunctions/math/QuaternionOperations.cpp diff --git a/inc/fsfw/globalfunctions/math/QuaternionOperations.h b/src/fsfw/globalfunctions/math/QuaternionOperations.h similarity index 100% rename from inc/fsfw/globalfunctions/math/QuaternionOperations.h rename to src/fsfw/globalfunctions/math/QuaternionOperations.h diff --git a/inc/fsfw/globalfunctions/math/VectorOperations.h b/src/fsfw/globalfunctions/math/VectorOperations.h similarity index 100% rename from inc/fsfw/globalfunctions/math/VectorOperations.h rename to src/fsfw/globalfunctions/math/VectorOperations.h diff --git a/inc/fsfw/globalfunctions/sign.h b/src/fsfw/globalfunctions/sign.h similarity index 100% rename from inc/fsfw/globalfunctions/sign.h rename to src/fsfw/globalfunctions/sign.h diff --git a/src/core/globalfunctions/timevalOperations.cpp b/src/fsfw/globalfunctions/timevalOperations.cpp similarity index 100% rename from src/core/globalfunctions/timevalOperations.cpp rename to src/fsfw/globalfunctions/timevalOperations.cpp diff --git a/inc/fsfw/globalfunctions/timevalOperations.h b/src/fsfw/globalfunctions/timevalOperations.h similarity index 100% rename from inc/fsfw/globalfunctions/timevalOperations.h rename to src/fsfw/globalfunctions/timevalOperations.h diff --git a/src/fsfw/health.h b/src/fsfw/health.h new file mode 100644 index 00000000..0b7c8793 --- /dev/null +++ b/src/fsfw/health.h @@ -0,0 +1,9 @@ +#ifndef FSFW_INC_FSFW_HEALTH_H_ +#define FSFW_INC_FSFW_HEALTH_H_ + +#include "src/core/health/HasHealthIF.h" +#include "src/core/health/HealthHelper.h" +#include "src/core/health/HealthMessage.h" +#include "src/core/health/HealthTable.h" + +#endif /* FSFW_INC_FSFW_HEALTH_H_ */ diff --git a/src/core/health/CMakeLists.txt b/src/fsfw/health/CMakeLists.txt similarity index 100% rename from src/core/health/CMakeLists.txt rename to src/fsfw/health/CMakeLists.txt diff --git a/inc/fsfw/health/HasHealthIF.h b/src/fsfw/health/HasHealthIF.h similarity index 100% rename from inc/fsfw/health/HasHealthIF.h rename to src/fsfw/health/HasHealthIF.h diff --git a/src/core/health/HealthHelper.cpp b/src/fsfw/health/HealthHelper.cpp similarity index 100% rename from src/core/health/HealthHelper.cpp rename to src/fsfw/health/HealthHelper.cpp diff --git a/inc/fsfw/health/HealthHelper.h b/src/fsfw/health/HealthHelper.h similarity index 100% rename from inc/fsfw/health/HealthHelper.h rename to src/fsfw/health/HealthHelper.h diff --git a/src/core/health/HealthMessage.cpp b/src/fsfw/health/HealthMessage.cpp similarity index 100% rename from src/core/health/HealthMessage.cpp rename to src/fsfw/health/HealthMessage.cpp diff --git a/inc/fsfw/health/HealthMessage.h b/src/fsfw/health/HealthMessage.h similarity index 100% rename from inc/fsfw/health/HealthMessage.h rename to src/fsfw/health/HealthMessage.h diff --git a/src/core/health/HealthTable.cpp b/src/fsfw/health/HealthTable.cpp similarity index 100% rename from src/core/health/HealthTable.cpp rename to src/fsfw/health/HealthTable.cpp diff --git a/inc/fsfw/health/HealthTable.h b/src/fsfw/health/HealthTable.h similarity index 100% rename from inc/fsfw/health/HealthTable.h rename to src/fsfw/health/HealthTable.h diff --git a/inc/fsfw/health/HealthTableIF.h b/src/fsfw/health/HealthTableIF.h similarity index 100% rename from inc/fsfw/health/HealthTableIF.h rename to src/fsfw/health/HealthTableIF.h diff --git a/inc/fsfw/health/ManagesHealthIF.h b/src/fsfw/health/ManagesHealthIF.h similarity index 100% rename from inc/fsfw/health/ManagesHealthIF.h rename to src/fsfw/health/ManagesHealthIF.h diff --git a/src/fsfw/housekeeping.h b/src/fsfw/housekeeping.h new file mode 100644 index 00000000..0627d523 --- /dev/null +++ b/src/fsfw/housekeeping.h @@ -0,0 +1,9 @@ +#ifndef FSFW_INC_FSFW_HOUSEKEEPING_H_ +#define FSFW_INC_FSFW_HOUSEKEEPING_H_ + +#include "src/core/housekeeping/HousekeepingMessage.h" +#include "src/core/housekeeping/HousekeepingPacketDownlink.h" +#include "src/core/housekeeping/HousekeepingSetPacket.h" +#include "src/core/housekeeping/HousekeepingSnapshot.h" + +#endif /* FSFW_INC_FSFW_HOUSEKEEPING_H_ */ diff --git a/inc/fsfw/housekeeping/AcceptsHkPacketsIF.h b/src/fsfw/housekeeping/AcceptsHkPacketsIF.h similarity index 100% rename from inc/fsfw/housekeeping/AcceptsHkPacketsIF.h rename to src/fsfw/housekeeping/AcceptsHkPacketsIF.h diff --git a/inc/fsfw/housekeeping/CMakeLists.txt b/src/fsfw/housekeeping/CMakeLists.txt similarity index 100% rename from inc/fsfw/housekeeping/CMakeLists.txt rename to src/fsfw/housekeeping/CMakeLists.txt diff --git a/src/core/housekeeping/HousekeepingMessage.cpp b/src/fsfw/housekeeping/HousekeepingMessage.cpp similarity index 100% rename from src/core/housekeeping/HousekeepingMessage.cpp rename to src/fsfw/housekeeping/HousekeepingMessage.cpp diff --git a/inc/fsfw/housekeeping/HousekeepingMessage.h b/src/fsfw/housekeeping/HousekeepingMessage.h similarity index 100% rename from inc/fsfw/housekeeping/HousekeepingMessage.h rename to src/fsfw/housekeeping/HousekeepingMessage.h diff --git a/inc/fsfw/housekeeping/HousekeepingPacketDownlink.h b/src/fsfw/housekeeping/HousekeepingPacketDownlink.h similarity index 100% rename from inc/fsfw/housekeeping/HousekeepingPacketDownlink.h rename to src/fsfw/housekeeping/HousekeepingPacketDownlink.h diff --git a/inc/fsfw/housekeeping/HousekeepingSetPacket.h b/src/fsfw/housekeeping/HousekeepingSetPacket.h similarity index 100% rename from inc/fsfw/housekeeping/HousekeepingSetPacket.h rename to src/fsfw/housekeeping/HousekeepingSetPacket.h diff --git a/inc/fsfw/housekeeping/HousekeepingSnapshot.h b/src/fsfw/housekeeping/HousekeepingSnapshot.h similarity index 100% rename from inc/fsfw/housekeeping/HousekeepingSnapshot.h rename to src/fsfw/housekeeping/HousekeepingSnapshot.h diff --git a/src/core/housekeeping/PeriodicHousekeepingHelper.cpp b/src/fsfw/housekeeping/PeriodicHousekeepingHelper.cpp similarity index 100% rename from src/core/housekeeping/PeriodicHousekeepingHelper.cpp rename to src/fsfw/housekeeping/PeriodicHousekeepingHelper.cpp diff --git a/inc/fsfw/housekeeping/PeriodicHousekeepingHelper.h b/src/fsfw/housekeeping/PeriodicHousekeepingHelper.h similarity index 100% rename from inc/fsfw/housekeeping/PeriodicHousekeepingHelper.h rename to src/fsfw/housekeeping/PeriodicHousekeepingHelper.h diff --git a/src/core/internalerror/CMakeLists.txt b/src/fsfw/internalerror/CMakeLists.txt similarity index 100% rename from src/core/internalerror/CMakeLists.txt rename to src/fsfw/internalerror/CMakeLists.txt diff --git a/inc/fsfw/internalerror/InternalErrorDataset.h b/src/fsfw/internalerror/InternalErrorDataset.h similarity index 100% rename from inc/fsfw/internalerror/InternalErrorDataset.h rename to src/fsfw/internalerror/InternalErrorDataset.h diff --git a/src/core/internalerror/InternalErrorReporter.cpp b/src/fsfw/internalerror/InternalErrorReporter.cpp similarity index 100% rename from src/core/internalerror/InternalErrorReporter.cpp rename to src/fsfw/internalerror/InternalErrorReporter.cpp diff --git a/inc/fsfw/internalerror/InternalErrorReporter.h b/src/fsfw/internalerror/InternalErrorReporter.h similarity index 100% rename from inc/fsfw/internalerror/InternalErrorReporter.h rename to src/fsfw/internalerror/InternalErrorReporter.h diff --git a/inc/fsfw/internalerror/InternalErrorReporterIF.h b/src/fsfw/internalerror/InternalErrorReporterIF.h similarity index 100% rename from inc/fsfw/internalerror/InternalErrorReporterIF.h rename to src/fsfw/internalerror/InternalErrorReporterIF.h diff --git a/src/core/ipc/CMakeLists.txt b/src/fsfw/ipc/CMakeLists.txt similarity index 100% rename from src/core/ipc/CMakeLists.txt rename to src/fsfw/ipc/CMakeLists.txt diff --git a/src/core/ipc/CommandMessage.cpp b/src/fsfw/ipc/CommandMessage.cpp similarity index 100% rename from src/core/ipc/CommandMessage.cpp rename to src/fsfw/ipc/CommandMessage.cpp diff --git a/inc/fsfw/ipc/CommandMessage.h b/src/fsfw/ipc/CommandMessage.h similarity index 100% rename from inc/fsfw/ipc/CommandMessage.h rename to src/fsfw/ipc/CommandMessage.h diff --git a/src/core/ipc/CommandMessageCleaner.cpp b/src/fsfw/ipc/CommandMessageCleaner.cpp similarity index 94% rename from src/core/ipc/CommandMessageCleaner.cpp rename to src/fsfw/ipc/CommandMessageCleaner.cpp index ca835509..0918d739 100644 --- a/src/core/ipc/CommandMessageCleaner.cpp +++ b/src/fsfw/ipc/CommandMessageCleaner.cpp @@ -1,3 +1,4 @@ +#include "fsfw/FSFW.h" #include "fsfw/ipc/CommandMessageCleaner.h" #include "fsfw/memory/GenericFileSystemMessage.h" @@ -7,9 +8,11 @@ #include "fsfw/modes/ModeMessage.h" #include "fsfw/monitoring/MonitoringMessage.h" #include "fsfw/subsystem/modes/ModeSequenceMessage.h" -#include "fsfw/tmstorage/TmStoreMessage.h" #include "fsfw/housekeeping/HousekeepingMessage.h" #include "fsfw/parameters/ParameterMessage.h" +#ifdef FSFW_ADD_TMSTORAGE +#include "fsfw/tmstorage/TmStoreMessage.h" +#endif void CommandMessageCleaner::clearCommandMessage(CommandMessage* message) { switch(message->getMessageType()){ @@ -34,9 +37,11 @@ void CommandMessageCleaner::clearCommandMessage(CommandMessage* message) { case messagetypes::MONITORING: MonitoringMessage::clear(message); break; +#ifdef FSFW_ADD_TMSTORAGE case messagetypes::TM_STORE: TmStoreMessage::clear(message); break; +#endif case messagetypes::PARAMETER: ParameterMessage::clear(message); break; diff --git a/inc/fsfw/ipc/CommandMessageCleaner.h b/src/fsfw/ipc/CommandMessageCleaner.h similarity index 100% rename from inc/fsfw/ipc/CommandMessageCleaner.h rename to src/fsfw/ipc/CommandMessageCleaner.h diff --git a/inc/fsfw/ipc/CommandMessageIF.h b/src/fsfw/ipc/CommandMessageIF.h similarity index 100% rename from inc/fsfw/ipc/CommandMessageIF.h rename to src/fsfw/ipc/CommandMessageIF.h diff --git a/inc/fsfw/ipc/FwMessageTypes.h b/src/fsfw/ipc/FwMessageTypes.h similarity index 100% rename from inc/fsfw/ipc/FwMessageTypes.h rename to src/fsfw/ipc/FwMessageTypes.h diff --git a/inc/fsfw/ipc/MessageQueueIF.h b/src/fsfw/ipc/MessageQueueIF.h similarity index 100% rename from inc/fsfw/ipc/MessageQueueIF.h rename to src/fsfw/ipc/MessageQueueIF.h diff --git a/src/core/ipc/MessageQueueMessage.cpp b/src/fsfw/ipc/MessageQueueMessage.cpp similarity index 100% rename from src/core/ipc/MessageQueueMessage.cpp rename to src/fsfw/ipc/MessageQueueMessage.cpp diff --git a/inc/fsfw/ipc/MessageQueueMessage.h b/src/fsfw/ipc/MessageQueueMessage.h similarity index 100% rename from inc/fsfw/ipc/MessageQueueMessage.h rename to src/fsfw/ipc/MessageQueueMessage.h diff --git a/inc/fsfw/ipc/MessageQueueMessageIF.h b/src/fsfw/ipc/MessageQueueMessageIF.h similarity index 100% rename from inc/fsfw/ipc/MessageQueueMessageIF.h rename to src/fsfw/ipc/MessageQueueMessageIF.h diff --git a/inc/fsfw/ipc/MessageQueueSenderIF.h b/src/fsfw/ipc/MessageQueueSenderIF.h similarity index 100% rename from inc/fsfw/ipc/MessageQueueSenderIF.h rename to src/fsfw/ipc/MessageQueueSenderIF.h diff --git a/inc/fsfw/ipc/MutexFactory.h b/src/fsfw/ipc/MutexFactory.h similarity index 100% rename from inc/fsfw/ipc/MutexFactory.h rename to src/fsfw/ipc/MutexFactory.h diff --git a/inc/fsfw/ipc/MutexGuard.h b/src/fsfw/ipc/MutexGuard.h similarity index 100% rename from inc/fsfw/ipc/MutexGuard.h rename to src/fsfw/ipc/MutexGuard.h diff --git a/inc/fsfw/ipc/MutexIF.h b/src/fsfw/ipc/MutexIF.h similarity index 100% rename from inc/fsfw/ipc/MutexIF.h rename to src/fsfw/ipc/MutexIF.h diff --git a/inc/fsfw/ipc/QueueFactory.h b/src/fsfw/ipc/QueueFactory.h similarity index 100% rename from inc/fsfw/ipc/QueueFactory.h rename to src/fsfw/ipc/QueueFactory.h diff --git a/inc/fsfw/ipc/messageQueueDefinitions.h b/src/fsfw/ipc/messageQueueDefinitions.h similarity index 100% rename from inc/fsfw/ipc/messageQueueDefinitions.h rename to src/fsfw/ipc/messageQueueDefinitions.h diff --git a/inc/fsfw/memory/AcceptsMemoryMessagesIF.h b/src/fsfw/memory/AcceptsMemoryMessagesIF.h similarity index 100% rename from inc/fsfw/memory/AcceptsMemoryMessagesIF.h rename to src/fsfw/memory/AcceptsMemoryMessagesIF.h diff --git a/src/core/memory/CMakeLists.txt b/src/fsfw/memory/CMakeLists.txt similarity index 100% rename from src/core/memory/CMakeLists.txt rename to src/fsfw/memory/CMakeLists.txt diff --git a/src/core/memory/GenericFileSystemMessage.cpp b/src/fsfw/memory/GenericFileSystemMessage.cpp similarity index 100% rename from src/core/memory/GenericFileSystemMessage.cpp rename to src/fsfw/memory/GenericFileSystemMessage.cpp diff --git a/inc/fsfw/memory/GenericFileSystemMessage.h b/src/fsfw/memory/GenericFileSystemMessage.h similarity index 100% rename from inc/fsfw/memory/GenericFileSystemMessage.h rename to src/fsfw/memory/GenericFileSystemMessage.h diff --git a/inc/fsfw/memory/HasFileSystemIF.h b/src/fsfw/memory/HasFileSystemIF.h similarity index 100% rename from inc/fsfw/memory/HasFileSystemIF.h rename to src/fsfw/memory/HasFileSystemIF.h diff --git a/inc/fsfw/memory/HasMemoryIF.h b/src/fsfw/memory/HasMemoryIF.h similarity index 100% rename from inc/fsfw/memory/HasMemoryIF.h rename to src/fsfw/memory/HasMemoryIF.h diff --git a/src/core/memory/MemoryHelper.cpp b/src/fsfw/memory/MemoryHelper.cpp similarity index 100% rename from src/core/memory/MemoryHelper.cpp rename to src/fsfw/memory/MemoryHelper.cpp diff --git a/inc/fsfw/memory/MemoryHelper.h b/src/fsfw/memory/MemoryHelper.h similarity index 100% rename from inc/fsfw/memory/MemoryHelper.h rename to src/fsfw/memory/MemoryHelper.h diff --git a/src/core/memory/MemoryMessage.cpp b/src/fsfw/memory/MemoryMessage.cpp similarity index 100% rename from src/core/memory/MemoryMessage.cpp rename to src/fsfw/memory/MemoryMessage.cpp diff --git a/inc/fsfw/memory/MemoryMessage.h b/src/fsfw/memory/MemoryMessage.h similarity index 100% rename from inc/fsfw/memory/MemoryMessage.h rename to src/fsfw/memory/MemoryMessage.h diff --git a/src/core/modes/CMakeLists.txt b/src/fsfw/modes/CMakeLists.txt similarity index 100% rename from src/core/modes/CMakeLists.txt rename to src/fsfw/modes/CMakeLists.txt diff --git a/inc/fsfw/modes/HasModesIF.h b/src/fsfw/modes/HasModesIF.h similarity index 100% rename from inc/fsfw/modes/HasModesIF.h rename to src/fsfw/modes/HasModesIF.h diff --git a/src/core/modes/ModeHelper.cpp b/src/fsfw/modes/ModeHelper.cpp similarity index 100% rename from src/core/modes/ModeHelper.cpp rename to src/fsfw/modes/ModeHelper.cpp diff --git a/inc/fsfw/modes/ModeHelper.h b/src/fsfw/modes/ModeHelper.h similarity index 100% rename from inc/fsfw/modes/ModeHelper.h rename to src/fsfw/modes/ModeHelper.h diff --git a/src/core/modes/ModeMessage.cpp b/src/fsfw/modes/ModeMessage.cpp similarity index 100% rename from src/core/modes/ModeMessage.cpp rename to src/fsfw/modes/ModeMessage.cpp diff --git a/inc/fsfw/modes/ModeMessage.h b/src/fsfw/modes/ModeMessage.h similarity index 100% rename from inc/fsfw/modes/ModeMessage.h rename to src/fsfw/modes/ModeMessage.h diff --git a/inc/fsfw/monitoring/AbsLimitMonitor.h b/src/fsfw/monitoring/AbsLimitMonitor.h similarity index 98% rename from inc/fsfw/monitoring/AbsLimitMonitor.h rename to src/fsfw/monitoring/AbsLimitMonitor.h index 5feb369c..f3bbf04c 100644 --- a/inc/fsfw/monitoring/AbsLimitMonitor.h +++ b/src/fsfw/monitoring/AbsLimitMonitor.h @@ -1,6 +1,7 @@ #ifndef FSFW_MONITORING_ABSLIMITMONITOR_H_ #define FSFW_MONITORING_ABSLIMITMONITOR_H_ +#include "monitoringConf.h" #include "MonitorBase.h" #include diff --git a/src/opt/monitoring/CMakeLists.txt b/src/fsfw/monitoring/CMakeLists.txt similarity index 100% rename from src/opt/monitoring/CMakeLists.txt rename to src/fsfw/monitoring/CMakeLists.txt diff --git a/inc/fsfw/monitoring/HasMonitorsIF.h b/src/fsfw/monitoring/HasMonitorsIF.h similarity index 96% rename from inc/fsfw/monitoring/HasMonitorsIF.h rename to src/fsfw/monitoring/HasMonitorsIF.h index 04f63437..20520952 100644 --- a/inc/fsfw/monitoring/HasMonitorsIF.h +++ b/src/fsfw/monitoring/HasMonitorsIF.h @@ -1,6 +1,7 @@ #ifndef FSFW_MONITORING_HASMONITORSIF_H_ #define FSFW_MONITORING_HASMONITORSIF_H_ +#include "monitoringConf.h" #include "../events/EventReportingProxyIF.h" #include "../objectmanager/ObjectManagerIF.h" #include "../ipc/MessageQueueSenderIF.h" diff --git a/inc/fsfw/monitoring/LimitMonitor.h b/src/fsfw/monitoring/LimitMonitor.h similarity index 99% rename from inc/fsfw/monitoring/LimitMonitor.h rename to src/fsfw/monitoring/LimitMonitor.h index cd8b8d13..2565ebaa 100644 --- a/inc/fsfw/monitoring/LimitMonitor.h +++ b/src/fsfw/monitoring/LimitMonitor.h @@ -1,6 +1,7 @@ #ifndef FRAMEWORK_MONITORING_LIMITMONITOR_H_ #define FRAMEWORK_MONITORING_LIMITMONITOR_H_ +#include "monitoringConf.h" #include "MonitorBase.h" /** diff --git a/src/opt/monitoring/LimitViolationReporter.cpp b/src/fsfw/monitoring/LimitViolationReporter.cpp similarity index 100% rename from src/opt/monitoring/LimitViolationReporter.cpp rename to src/fsfw/monitoring/LimitViolationReporter.cpp diff --git a/inc/fsfw/monitoring/LimitViolationReporter.h b/src/fsfw/monitoring/LimitViolationReporter.h similarity index 96% rename from inc/fsfw/monitoring/LimitViolationReporter.h rename to src/fsfw/monitoring/LimitViolationReporter.h index a71b972f..b254e312 100644 --- a/inc/fsfw/monitoring/LimitViolationReporter.h +++ b/src/fsfw/monitoring/LimitViolationReporter.h @@ -7,6 +7,7 @@ #ifndef LIMITVIOLATIONREPORTER_H_ #define LIMITVIOLATIONREPORTER_H_ +#include "monitoringConf.h" #include "../returnvalues/HasReturnvaluesIF.h" #include "../serialize/SerializeIF.h" #include "../storagemanager/StorageManagerIF.h" diff --git a/inc/fsfw/monitoring/MonitorBase.h b/src/fsfw/monitoring/MonitorBase.h similarity index 98% rename from inc/fsfw/monitoring/MonitorBase.h rename to src/fsfw/monitoring/MonitorBase.h index 967f0f62..261b3eac 100644 --- a/inc/fsfw/monitoring/MonitorBase.h +++ b/src/fsfw/monitoring/MonitorBase.h @@ -1,6 +1,7 @@ #ifndef FSFW_MONITORING_MONITORBASE_H_ #define FSFW_MONITORING_MONITORBASE_H_ +#include "monitoringConf.h" #include "LimitViolationReporter.h" #include "MonitoringIF.h" #include "MonitoringMessageContent.h" diff --git a/inc/fsfw/monitoring/MonitorReporter.h b/src/fsfw/monitoring/MonitorReporter.h similarity index 99% rename from inc/fsfw/monitoring/MonitorReporter.h rename to src/fsfw/monitoring/MonitorReporter.h index d155594d..e27d0101 100644 --- a/inc/fsfw/monitoring/MonitorReporter.h +++ b/src/fsfw/monitoring/MonitorReporter.h @@ -1,6 +1,7 @@ #ifndef FSFW_MONITORING_MONITORREPORTER_H_ #define FSFW_MONITORING_MONITORREPORTER_H_ +#include "monitoringConf.h" #include "LimitViolationReporter.h" #include "MonitoringIF.h" #include "MonitoringMessageContent.h" diff --git a/inc/fsfw/monitoring/MonitoringIF.h b/src/fsfw/monitoring/MonitoringIF.h similarity index 99% rename from inc/fsfw/monitoring/MonitoringIF.h rename to src/fsfw/monitoring/MonitoringIF.h index aae29475..9c35b419 100644 --- a/inc/fsfw/monitoring/MonitoringIF.h +++ b/src/fsfw/monitoring/MonitoringIF.h @@ -1,6 +1,7 @@ #ifndef FSFW_MONITORING_MONITORINGIF_H_ #define FSFW_MONITORING_MONITORINGIF_H_ +#include "monitoringConf.h" #include "MonitoringMessage.h" #include "../serialize/SerializeIF.h" diff --git a/src/opt/monitoring/MonitoringMessage.cpp b/src/fsfw/monitoring/MonitoringMessage.cpp similarity index 100% rename from src/opt/monitoring/MonitoringMessage.cpp rename to src/fsfw/monitoring/MonitoringMessage.cpp diff --git a/inc/fsfw/monitoring/MonitoringMessage.h b/src/fsfw/monitoring/MonitoringMessage.h similarity index 86% rename from inc/fsfw/monitoring/MonitoringMessage.h rename to src/fsfw/monitoring/MonitoringMessage.h index 84b02750..a625e388 100644 --- a/inc/fsfw/monitoring/MonitoringMessage.h +++ b/src/fsfw/monitoring/MonitoringMessage.h @@ -1,8 +1,9 @@ #ifndef MONITORINGMESSAGE_H_ #define MONITORINGMESSAGE_H_ -#include "../ipc/CommandMessage.h" -#include "../storagemanager/StorageManagerIF.h" +#include "monitoringConf.h" +#include "fsfw/ipc/CommandMessage.h" +#include "fsfw/storagemanager/StorageManagerIF.h" class MonitoringMessage: public CommandMessage { public: diff --git a/inc/fsfw/monitoring/MonitoringMessageContent.h b/src/fsfw/monitoring/MonitoringMessageContent.h similarity index 99% rename from inc/fsfw/monitoring/MonitoringMessageContent.h rename to src/fsfw/monitoring/MonitoringMessageContent.h index 1d5f9c92..cf8c8752 100644 --- a/inc/fsfw/monitoring/MonitoringMessageContent.h +++ b/src/fsfw/monitoring/MonitoringMessageContent.h @@ -1,6 +1,7 @@ #ifndef FSFW_MONITORING_MONITORINGMESSAGECONTENT_H_ #define FSFW_MONITORING_MONITORINGMESSAGECONTENT_H_ +#include "monitoringConf.h" #include "HasMonitorsIF.h" #include "MonitoringIF.h" diff --git a/inc/fsfw/monitoring/ReceivesMonitoringReportsIF.h b/src/fsfw/monitoring/ReceivesMonitoringReportsIF.h similarity index 78% rename from inc/fsfw/monitoring/ReceivesMonitoringReportsIF.h rename to src/fsfw/monitoring/ReceivesMonitoringReportsIF.h index fb37c16c..6c126c84 100644 --- a/inc/fsfw/monitoring/ReceivesMonitoringReportsIF.h +++ b/src/fsfw/monitoring/ReceivesMonitoringReportsIF.h @@ -1,7 +1,8 @@ #ifndef RECEIVESMONITORINGREPORTSIF_H_ #define RECEIVESMONITORINGREPORTSIF_H_ -#include "../ipc/MessageQueueSenderIF.h" +#include "monitoringConf.h" +#include "fsfw/ipc/messageQueueDefinitions.h" class ReceivesMonitoringReportsIF { public: diff --git a/inc/fsfw/monitoring/TriplexMonitor.h b/src/fsfw/monitoring/TriplexMonitor.h similarity index 99% rename from inc/fsfw/monitoring/TriplexMonitor.h rename to src/fsfw/monitoring/TriplexMonitor.h index 295a6174..ff995b5d 100644 --- a/inc/fsfw/monitoring/TriplexMonitor.h +++ b/src/fsfw/monitoring/TriplexMonitor.h @@ -1,6 +1,7 @@ #ifndef FRAMEWORK_MONITORING_TRIPLEXMONITOR_H_ #define FRAMEWORK_MONITORING_TRIPLEXMONITOR_H_ +#include "monitoringConf.h" #include "../datapool/DataSet.h" #include "../datapool/PIDReaderList.h" #include "../health/HealthTableIF.h" diff --git a/inc/fsfw/monitoring/TwoValueLimitMonitor.h b/src/fsfw/monitoring/TwoValueLimitMonitor.h similarity index 98% rename from inc/fsfw/monitoring/TwoValueLimitMonitor.h rename to src/fsfw/monitoring/TwoValueLimitMonitor.h index e690cdae..cd34391c 100644 --- a/inc/fsfw/monitoring/TwoValueLimitMonitor.h +++ b/src/fsfw/monitoring/TwoValueLimitMonitor.h @@ -1,6 +1,7 @@ #ifndef FRAMEWORK_MONITORING_TWOVALUELIMITMONITOR_H_ #define FRAMEWORK_MONITORING_TWOVALUELIMITMONITOR_H_ +#include "monitoringConf.h" #include "LimitMonitor.h" template diff --git a/src/fsfw/monitoring/monitoringConf.h b/src/fsfw/monitoring/monitoringConf.h new file mode 100644 index 00000000..25cac8db --- /dev/null +++ b/src/fsfw/monitoring/monitoringConf.h @@ -0,0 +1,11 @@ +#ifndef FSFW_MONITORING_MONITORINGCONF_H_ +#define FSFW_MONITORING_MONITORINGCONF_H_ + +#include "fsfw/FSFW.h" + +#ifndef FSFW_ADD_MONITORING +#warning Monitoring files were included but compilation was \ + not enabled with FSFW_ADD_MONITORING +#endif + +#endif /* FSFW_MONITORING_MONITORINGCONF_H_ */ diff --git a/src/fsfw/objectmanager.h b/src/fsfw/objectmanager.h new file mode 100644 index 00000000..50a90c9f --- /dev/null +++ b/src/fsfw/objectmanager.h @@ -0,0 +1,8 @@ +#ifndef FSFW_SRC_FSFW_OBJECTMANAGER_H_ +#define FSFW_SRC_FSFW_OBJECTMANAGER_H_ + +#include "objectmanager/ObjectManager.h" +#include "objectmanager/SystemObject.h" +#include "objectmanager/frameworkObjects.h" + +#endif /* FSFW_SRC_FSFW_OBJECTMANAGER_H_ */ diff --git a/src/core/objectmanager/CMakeLists.txt b/src/fsfw/objectmanager/CMakeLists.txt similarity index 100% rename from src/core/objectmanager/CMakeLists.txt rename to src/fsfw/objectmanager/CMakeLists.txt diff --git a/src/core/objectmanager/ObjectManager.cpp b/src/fsfw/objectmanager/ObjectManager.cpp similarity index 100% rename from src/core/objectmanager/ObjectManager.cpp rename to src/fsfw/objectmanager/ObjectManager.cpp diff --git a/inc/fsfw/objectmanager/ObjectManager.h b/src/fsfw/objectmanager/ObjectManager.h similarity index 100% rename from inc/fsfw/objectmanager/ObjectManager.h rename to src/fsfw/objectmanager/ObjectManager.h diff --git a/inc/fsfw/objectmanager/ObjectManagerIF.h b/src/fsfw/objectmanager/ObjectManagerIF.h similarity index 100% rename from inc/fsfw/objectmanager/ObjectManagerIF.h rename to src/fsfw/objectmanager/ObjectManagerIF.h diff --git a/src/core/objectmanager/SystemObject.cpp b/src/fsfw/objectmanager/SystemObject.cpp similarity index 100% rename from src/core/objectmanager/SystemObject.cpp rename to src/fsfw/objectmanager/SystemObject.cpp diff --git a/inc/fsfw/objectmanager/SystemObject.h b/src/fsfw/objectmanager/SystemObject.h similarity index 100% rename from inc/fsfw/objectmanager/SystemObject.h rename to src/fsfw/objectmanager/SystemObject.h diff --git a/inc/fsfw/objectmanager/SystemObjectIF.h b/src/fsfw/objectmanager/SystemObjectIF.h similarity index 100% rename from inc/fsfw/objectmanager/SystemObjectIF.h rename to src/fsfw/objectmanager/SystemObjectIF.h diff --git a/inc/fsfw/objectmanager/frameworkObjects.h b/src/fsfw/objectmanager/frameworkObjects.h similarity index 100% rename from inc/fsfw/objectmanager/frameworkObjects.h rename to src/fsfw/objectmanager/frameworkObjects.h diff --git a/src/osal/CMakeLists.txt b/src/fsfw/osal/CMakeLists.txt similarity index 100% rename from src/osal/CMakeLists.txt rename to src/fsfw/osal/CMakeLists.txt diff --git a/inc/fsfw/osal/Endiness.h b/src/fsfw/osal/Endiness.h similarity index 100% rename from inc/fsfw/osal/Endiness.h rename to src/fsfw/osal/Endiness.h diff --git a/inc/fsfw/osal/InternalErrorCodes.h b/src/fsfw/osal/InternalErrorCodes.h similarity index 100% rename from inc/fsfw/osal/InternalErrorCodes.h rename to src/fsfw/osal/InternalErrorCodes.h diff --git a/src/osal/common/CMakeLists.txt b/src/fsfw/osal/common/CMakeLists.txt similarity index 100% rename from src/osal/common/CMakeLists.txt rename to src/fsfw/osal/common/CMakeLists.txt diff --git a/src/osal/common/TcpIpBase.cpp b/src/fsfw/osal/common/TcpIpBase.cpp similarity index 100% rename from src/osal/common/TcpIpBase.cpp rename to src/fsfw/osal/common/TcpIpBase.cpp diff --git a/inc/fsfw/osal/common/TcpIpBase.h b/src/fsfw/osal/common/TcpIpBase.h similarity index 100% rename from inc/fsfw/osal/common/TcpIpBase.h rename to src/fsfw/osal/common/TcpIpBase.h diff --git a/src/osal/common/TcpTmTcBridge.cpp b/src/fsfw/osal/common/TcpTmTcBridge.cpp similarity index 100% rename from src/osal/common/TcpTmTcBridge.cpp rename to src/fsfw/osal/common/TcpTmTcBridge.cpp diff --git a/inc/fsfw/osal/common/TcpTmTcBridge.h b/src/fsfw/osal/common/TcpTmTcBridge.h similarity index 100% rename from inc/fsfw/osal/common/TcpTmTcBridge.h rename to src/fsfw/osal/common/TcpTmTcBridge.h diff --git a/src/osal/common/TcpTmTcServer.cpp b/src/fsfw/osal/common/TcpTmTcServer.cpp similarity index 100% rename from src/osal/common/TcpTmTcServer.cpp rename to src/fsfw/osal/common/TcpTmTcServer.cpp diff --git a/inc/fsfw/osal/common/TcpTmTcServer.h b/src/fsfw/osal/common/TcpTmTcServer.h similarity index 100% rename from inc/fsfw/osal/common/TcpTmTcServer.h rename to src/fsfw/osal/common/TcpTmTcServer.h diff --git a/src/osal/common/UdpTcPollingTask.cpp b/src/fsfw/osal/common/UdpTcPollingTask.cpp similarity index 100% rename from src/osal/common/UdpTcPollingTask.cpp rename to src/fsfw/osal/common/UdpTcPollingTask.cpp diff --git a/inc/fsfw/osal/common/UdpTcPollingTask.h b/src/fsfw/osal/common/UdpTcPollingTask.h similarity index 100% rename from inc/fsfw/osal/common/UdpTcPollingTask.h rename to src/fsfw/osal/common/UdpTcPollingTask.h diff --git a/src/osal/common/UdpTmTcBridge.cpp b/src/fsfw/osal/common/UdpTmTcBridge.cpp similarity index 100% rename from src/osal/common/UdpTmTcBridge.cpp rename to src/fsfw/osal/common/UdpTmTcBridge.cpp diff --git a/inc/fsfw/osal/common/UdpTmTcBridge.h b/src/fsfw/osal/common/UdpTmTcBridge.h similarity index 100% rename from inc/fsfw/osal/common/UdpTmTcBridge.h rename to src/fsfw/osal/common/UdpTmTcBridge.h diff --git a/src/osal/common/tcpipCommon.cpp b/src/fsfw/osal/common/tcpipCommon.cpp similarity index 100% rename from src/osal/common/tcpipCommon.cpp rename to src/fsfw/osal/common/tcpipCommon.cpp diff --git a/inc/fsfw/osal/common/tcpipCommon.h b/src/fsfw/osal/common/tcpipCommon.h similarity index 100% rename from inc/fsfw/osal/common/tcpipCommon.h rename to src/fsfw/osal/common/tcpipCommon.h diff --git a/inc/fsfw/osal/common/tcpipHelpers.h b/src/fsfw/osal/common/tcpipHelpers.h similarity index 100% rename from inc/fsfw/osal/common/tcpipHelpers.h rename to src/fsfw/osal/common/tcpipHelpers.h diff --git a/src/osal/freertos/BinSemaphUsingTask.cpp b/src/fsfw/osal/freertos/BinSemaphUsingTask.cpp similarity index 100% rename from src/osal/freertos/BinSemaphUsingTask.cpp rename to src/fsfw/osal/freertos/BinSemaphUsingTask.cpp diff --git a/inc/fsfw/osal/freertos/BinSemaphUsingTask.h b/src/fsfw/osal/freertos/BinSemaphUsingTask.h similarity index 100% rename from inc/fsfw/osal/freertos/BinSemaphUsingTask.h rename to src/fsfw/osal/freertos/BinSemaphUsingTask.h diff --git a/src/osal/freertos/BinarySemaphore.cpp b/src/fsfw/osal/freertos/BinarySemaphore.cpp similarity index 100% rename from src/osal/freertos/BinarySemaphore.cpp rename to src/fsfw/osal/freertos/BinarySemaphore.cpp diff --git a/inc/fsfw/osal/freertos/BinarySemaphore.h b/src/fsfw/osal/freertos/BinarySemaphore.h similarity index 100% rename from inc/fsfw/osal/freertos/BinarySemaphore.h rename to src/fsfw/osal/freertos/BinarySemaphore.h diff --git a/src/osal/freertos/CMakeLists.txt b/src/fsfw/osal/freertos/CMakeLists.txt similarity index 100% rename from src/osal/freertos/CMakeLists.txt rename to src/fsfw/osal/freertos/CMakeLists.txt diff --git a/src/osal/freertos/Clock.cpp b/src/fsfw/osal/freertos/Clock.cpp similarity index 100% rename from src/osal/freertos/Clock.cpp rename to src/fsfw/osal/freertos/Clock.cpp diff --git a/src/osal/freertos/CountingSemaphUsingTask.cpp b/src/fsfw/osal/freertos/CountingSemaphUsingTask.cpp similarity index 100% rename from src/osal/freertos/CountingSemaphUsingTask.cpp rename to src/fsfw/osal/freertos/CountingSemaphUsingTask.cpp diff --git a/inc/fsfw/osal/freertos/CountingSemaphUsingTask.h b/src/fsfw/osal/freertos/CountingSemaphUsingTask.h similarity index 100% rename from inc/fsfw/osal/freertos/CountingSemaphUsingTask.h rename to src/fsfw/osal/freertos/CountingSemaphUsingTask.h diff --git a/src/osal/freertos/CountingSemaphore.cpp b/src/fsfw/osal/freertos/CountingSemaphore.cpp similarity index 100% rename from src/osal/freertos/CountingSemaphore.cpp rename to src/fsfw/osal/freertos/CountingSemaphore.cpp diff --git a/inc/fsfw/osal/freertos/CountingSemaphore.h b/src/fsfw/osal/freertos/CountingSemaphore.h similarity index 100% rename from inc/fsfw/osal/freertos/CountingSemaphore.h rename to src/fsfw/osal/freertos/CountingSemaphore.h diff --git a/src/osal/freertos/FixedTimeslotTask.cpp b/src/fsfw/osal/freertos/FixedTimeslotTask.cpp similarity index 100% rename from src/osal/freertos/FixedTimeslotTask.cpp rename to src/fsfw/osal/freertos/FixedTimeslotTask.cpp diff --git a/inc/fsfw/osal/freertos/FixedTimeslotTask.h b/src/fsfw/osal/freertos/FixedTimeslotTask.h similarity index 100% rename from inc/fsfw/osal/freertos/FixedTimeslotTask.h rename to src/fsfw/osal/freertos/FixedTimeslotTask.h diff --git a/inc/fsfw/osal/freertos/FreeRTOSTaskIF.h b/src/fsfw/osal/freertos/FreeRTOSTaskIF.h similarity index 100% rename from inc/fsfw/osal/freertos/FreeRTOSTaskIF.h rename to src/fsfw/osal/freertos/FreeRTOSTaskIF.h diff --git a/src/osal/freertos/MessageQueue.cpp b/src/fsfw/osal/freertos/MessageQueue.cpp similarity index 100% rename from src/osal/freertos/MessageQueue.cpp rename to src/fsfw/osal/freertos/MessageQueue.cpp diff --git a/inc/fsfw/osal/freertos/MessageQueue.h b/src/fsfw/osal/freertos/MessageQueue.h similarity index 100% rename from inc/fsfw/osal/freertos/MessageQueue.h rename to src/fsfw/osal/freertos/MessageQueue.h diff --git a/src/osal/freertos/Mutex.cpp b/src/fsfw/osal/freertos/Mutex.cpp similarity index 100% rename from src/osal/freertos/Mutex.cpp rename to src/fsfw/osal/freertos/Mutex.cpp diff --git a/inc/fsfw/osal/freertos/Mutex.h b/src/fsfw/osal/freertos/Mutex.h similarity index 100% rename from inc/fsfw/osal/freertos/Mutex.h rename to src/fsfw/osal/freertos/Mutex.h diff --git a/src/osal/freertos/MutexFactory.cpp b/src/fsfw/osal/freertos/MutexFactory.cpp similarity index 100% rename from src/osal/freertos/MutexFactory.cpp rename to src/fsfw/osal/freertos/MutexFactory.cpp diff --git a/src/osal/freertos/PeriodicTask.cpp b/src/fsfw/osal/freertos/PeriodicTask.cpp similarity index 100% rename from src/osal/freertos/PeriodicTask.cpp rename to src/fsfw/osal/freertos/PeriodicTask.cpp diff --git a/inc/fsfw/osal/freertos/PeriodicTask.h b/src/fsfw/osal/freertos/PeriodicTask.h similarity index 100% rename from inc/fsfw/osal/freertos/PeriodicTask.h rename to src/fsfw/osal/freertos/PeriodicTask.h diff --git a/src/osal/freertos/QueueFactory.cpp b/src/fsfw/osal/freertos/QueueFactory.cpp similarity index 100% rename from src/osal/freertos/QueueFactory.cpp rename to src/fsfw/osal/freertos/QueueFactory.cpp diff --git a/src/osal/freertos/QueueMapManager.cpp b/src/fsfw/osal/freertos/QueueMapManager.cpp similarity index 94% rename from src/osal/freertos/QueueMapManager.cpp rename to src/fsfw/osal/freertos/QueueMapManager.cpp index e32cbe1d..7d6b2f12 100644 --- a/src/osal/freertos/QueueMapManager.cpp +++ b/src/fsfw/osal/freertos/QueueMapManager.cpp @@ -17,10 +17,12 @@ QueueMapManager* QueueMapManager::instance() { ReturnValue_t QueueMapManager::addMessageQueue(QueueHandle_t queue, MessageQueueId_t* id) { MutexGuard lock(mapLock); - uint32_t currentId = queueCounter++; + uint32_t currentId = queueCounter; + queueCounter++; if(currentId == MessageQueueIF::NO_QUEUE) { // Skip the NO_QUEUE value - currentId = queueCounter++; + currentId = queueCounter; + queueCounter++; } auto returnPair = queueMap.emplace(currentId, queue); if(not returnPair.second) { diff --git a/inc/fsfw/osal/freertos/QueueMapManager.h b/src/fsfw/osal/freertos/QueueMapManager.h similarity index 93% rename from inc/fsfw/osal/freertos/QueueMapManager.h rename to src/fsfw/osal/freertos/QueueMapManager.h index 7e999b0d..dbe0526b 100644 --- a/inc/fsfw/osal/freertos/QueueMapManager.h +++ b/src/fsfw/osal/freertos/QueueMapManager.h @@ -39,8 +39,7 @@ private: QueueMapManager(); ~QueueMapManager(); - // Start at 1 because 0 might be the NO_QUEUE value - uint32_t queueCounter = 1; + uint32_t queueCounter = MessageQueueIF::NO_QUEUE + 1; MutexIF* mapLock; QueueMap queueMap; static QueueMapManager* mqManagerInstance; diff --git a/inc/fsfw/osal/freertos/README.md b/src/fsfw/osal/freertos/README.md similarity index 100% rename from inc/fsfw/osal/freertos/README.md rename to src/fsfw/osal/freertos/README.md diff --git a/src/osal/freertos/SemaphoreFactory.cpp b/src/fsfw/osal/freertos/SemaphoreFactory.cpp similarity index 100% rename from src/osal/freertos/SemaphoreFactory.cpp rename to src/fsfw/osal/freertos/SemaphoreFactory.cpp diff --git a/src/osal/freertos/TaskFactory.cpp b/src/fsfw/osal/freertos/TaskFactory.cpp similarity index 100% rename from src/osal/freertos/TaskFactory.cpp rename to src/fsfw/osal/freertos/TaskFactory.cpp diff --git a/src/osal/freertos/TaskManagement.cpp b/src/fsfw/osal/freertos/TaskManagement.cpp similarity index 100% rename from src/osal/freertos/TaskManagement.cpp rename to src/fsfw/osal/freertos/TaskManagement.cpp diff --git a/inc/fsfw/osal/freertos/TaskManagement.h b/src/fsfw/osal/freertos/TaskManagement.h similarity index 100% rename from inc/fsfw/osal/freertos/TaskManagement.h rename to src/fsfw/osal/freertos/TaskManagement.h diff --git a/src/osal/freertos/Timekeeper.cpp b/src/fsfw/osal/freertos/Timekeeper.cpp similarity index 100% rename from src/osal/freertos/Timekeeper.cpp rename to src/fsfw/osal/freertos/Timekeeper.cpp diff --git a/inc/fsfw/osal/freertos/Timekeeper.h b/src/fsfw/osal/freertos/Timekeeper.h similarity index 100% rename from inc/fsfw/osal/freertos/Timekeeper.h rename to src/fsfw/osal/freertos/Timekeeper.h diff --git a/src/osal/host/CMakeLists.txt b/src/fsfw/osal/host/CMakeLists.txt similarity index 100% rename from src/osal/host/CMakeLists.txt rename to src/fsfw/osal/host/CMakeLists.txt diff --git a/src/osal/host/Clock.cpp b/src/fsfw/osal/host/Clock.cpp similarity index 100% rename from src/osal/host/Clock.cpp rename to src/fsfw/osal/host/Clock.cpp diff --git a/src/osal/host/FixedTimeslotTask.cpp b/src/fsfw/osal/host/FixedTimeslotTask.cpp similarity index 100% rename from src/osal/host/FixedTimeslotTask.cpp rename to src/fsfw/osal/host/FixedTimeslotTask.cpp diff --git a/inc/fsfw/osal/host/FixedTimeslotTask.h b/src/fsfw/osal/host/FixedTimeslotTask.h similarity index 100% rename from inc/fsfw/osal/host/FixedTimeslotTask.h rename to src/fsfw/osal/host/FixedTimeslotTask.h diff --git a/src/osal/host/MessageQueue.cpp b/src/fsfw/osal/host/MessageQueue.cpp similarity index 100% rename from src/osal/host/MessageQueue.cpp rename to src/fsfw/osal/host/MessageQueue.cpp diff --git a/inc/fsfw/osal/host/MessageQueue.h b/src/fsfw/osal/host/MessageQueue.h similarity index 98% rename from inc/fsfw/osal/host/MessageQueue.h rename to src/fsfw/osal/host/MessageQueue.h index 36a7ca4d..0bdfd8fc 100644 --- a/inc/fsfw/osal/host/MessageQueue.h +++ b/src/fsfw/osal/host/MessageQueue.h @@ -2,10 +2,10 @@ #define FRAMEWORK_OSAL_HOST_MESSAGEQUEUE_H_ #include "fsfw/internalerror/InternalErrorReporterIF.h" -#include "../../ipc/MessageQueueIF.h" -#include "../../ipc/MessageQueueMessage.h" -#include "../../ipc/MutexIF.h" -#include "../../timemanager/Clock.h" +#include "fsfw/ipc/MessageQueueIF.h" +#include "fsfw/ipc/MessageQueueMessage.h" +#include "fsfw/ipc/MutexIF.h" +#include "fsfw/timemanager/Clock.h" #include #include diff --git a/src/fsfw/osal/host/Mutex.cpp b/src/fsfw/osal/host/Mutex.cpp new file mode 100644 index 00000000..e423ea93 --- /dev/null +++ b/src/fsfw/osal/host/Mutex.cpp @@ -0,0 +1,32 @@ +#include "fsfw/osal/host/Mutex.h" +#include "fsfw/serviceinterface/ServiceInterface.h" + +Mutex::Mutex() {} + +ReturnValue_t Mutex::lockMutex(TimeoutType timeoutType, uint32_t timeoutMs) { + if(timeoutType == TimeoutType::BLOCKING) { + mutex.lock(); + return HasReturnvaluesIF::RETURN_OK; + } + else if(timeoutType == TimeoutType::POLLING) { + if(mutex.try_lock()) { + return HasReturnvaluesIF::RETURN_OK; + } + } + else if(timeoutType == TimeoutType::WAITING){ + auto chronoMs = std::chrono::milliseconds(timeoutMs); + if(mutex.try_lock_for(chronoMs)) { + return HasReturnvaluesIF::RETURN_OK; + } + } + return MutexIF::MUTEX_TIMEOUT; +} + +ReturnValue_t Mutex::unlockMutex() { + mutex.unlock(); + return HasReturnvaluesIF::RETURN_OK; +} + +std::timed_mutex* Mutex::getMutexHandle() { + return &mutex; +} diff --git a/inc/fsfw/osal/host/Mutex.h b/src/fsfw/osal/host/Mutex.h similarity index 100% rename from inc/fsfw/osal/host/Mutex.h rename to src/fsfw/osal/host/Mutex.h diff --git a/src/osal/host/MutexFactory.cpp b/src/fsfw/osal/host/MutexFactory.cpp similarity index 100% rename from src/osal/host/MutexFactory.cpp rename to src/fsfw/osal/host/MutexFactory.cpp diff --git a/src/osal/host/PeriodicTask.cpp b/src/fsfw/osal/host/PeriodicTask.cpp similarity index 100% rename from src/osal/host/PeriodicTask.cpp rename to src/fsfw/osal/host/PeriodicTask.cpp diff --git a/inc/fsfw/osal/host/PeriodicTask.h b/src/fsfw/osal/host/PeriodicTask.h similarity index 100% rename from inc/fsfw/osal/host/PeriodicTask.h rename to src/fsfw/osal/host/PeriodicTask.h diff --git a/src/osal/host/QueueFactory.cpp b/src/fsfw/osal/host/QueueFactory.cpp similarity index 100% rename from src/osal/host/QueueFactory.cpp rename to src/fsfw/osal/host/QueueFactory.cpp diff --git a/src/osal/host/QueueMapManager.cpp b/src/fsfw/osal/host/QueueMapManager.cpp similarity index 90% rename from src/osal/host/QueueMapManager.cpp rename to src/fsfw/osal/host/QueueMapManager.cpp index ad39972f..58575cf6 100644 --- a/src/osal/host/QueueMapManager.cpp +++ b/src/fsfw/osal/host/QueueMapManager.cpp @@ -24,7 +24,13 @@ QueueMapManager* QueueMapManager::instance() { ReturnValue_t QueueMapManager::addMessageQueue( MessageQueueIF* queueToInsert, MessageQueueId_t* id) { MutexGuard lock(mapLock); - uint32_t currentId = queueCounter++; + uint32_t currentId = queueCounter; + queueCounter++; + if(currentId == MessageQueueIF::NO_QUEUE) { + // Skip the NO_QUEUE value + currentId = queueCounter; + queueCounter++; + } auto returnPair = queueMap.emplace(currentId, queueToInsert); if(not returnPair.second) { /* This should never happen for the atomic variable. */ diff --git a/inc/fsfw/osal/host/QueueMapManager.h b/src/fsfw/osal/host/QueueMapManager.h similarity index 96% rename from inc/fsfw/osal/host/QueueMapManager.h rename to src/fsfw/osal/host/QueueMapManager.h index e274bed2..2dd2a01d 100644 --- a/inc/fsfw/osal/host/QueueMapManager.h +++ b/src/fsfw/osal/host/QueueMapManager.h @@ -41,7 +41,7 @@ private: QueueMapManager(); ~QueueMapManager(); - uint32_t queueCounter = 0; + uint32_t queueCounter = MessageQueueIF::NO_QUEUE + 1; MutexIF* mapLock; QueueMap queueMap; static QueueMapManager* mqManagerInstance; diff --git a/src/osal/host/SemaphoreFactory.cpp b/src/fsfw/osal/host/SemaphoreFactory.cpp similarity index 100% rename from src/osal/host/SemaphoreFactory.cpp rename to src/fsfw/osal/host/SemaphoreFactory.cpp diff --git a/src/osal/host/TaskFactory.cpp b/src/fsfw/osal/host/TaskFactory.cpp similarity index 100% rename from src/osal/host/TaskFactory.cpp rename to src/fsfw/osal/host/TaskFactory.cpp diff --git a/src/osal/host/taskHelpers.cpp b/src/fsfw/osal/host/taskHelpers.cpp similarity index 100% rename from src/osal/host/taskHelpers.cpp rename to src/fsfw/osal/host/taskHelpers.cpp diff --git a/inc/fsfw/osal/host/taskHelpers.h b/src/fsfw/osal/host/taskHelpers.h similarity index 100% rename from inc/fsfw/osal/host/taskHelpers.h rename to src/fsfw/osal/host/taskHelpers.h diff --git a/src/osal/linux/BinarySemaphore.cpp b/src/fsfw/osal/linux/BinarySemaphore.cpp similarity index 100% rename from src/osal/linux/BinarySemaphore.cpp rename to src/fsfw/osal/linux/BinarySemaphore.cpp diff --git a/inc/fsfw/osal/linux/BinarySemaphore.h b/src/fsfw/osal/linux/BinarySemaphore.h similarity index 100% rename from inc/fsfw/osal/linux/BinarySemaphore.h rename to src/fsfw/osal/linux/BinarySemaphore.h diff --git a/src/osal/linux/CMakeLists.txt b/src/fsfw/osal/linux/CMakeLists.txt similarity index 100% rename from src/osal/linux/CMakeLists.txt rename to src/fsfw/osal/linux/CMakeLists.txt diff --git a/src/osal/linux/Clock.cpp b/src/fsfw/osal/linux/Clock.cpp similarity index 100% rename from src/osal/linux/Clock.cpp rename to src/fsfw/osal/linux/Clock.cpp diff --git a/src/osal/linux/CountingSemaphore.cpp b/src/fsfw/osal/linux/CountingSemaphore.cpp similarity index 100% rename from src/osal/linux/CountingSemaphore.cpp rename to src/fsfw/osal/linux/CountingSemaphore.cpp diff --git a/inc/fsfw/osal/linux/CountingSemaphore.h b/src/fsfw/osal/linux/CountingSemaphore.h similarity index 100% rename from inc/fsfw/osal/linux/CountingSemaphore.h rename to src/fsfw/osal/linux/CountingSemaphore.h diff --git a/src/osal/linux/FixedTimeslotTask.cpp b/src/fsfw/osal/linux/FixedTimeslotTask.cpp similarity index 100% rename from src/osal/linux/FixedTimeslotTask.cpp rename to src/fsfw/osal/linux/FixedTimeslotTask.cpp diff --git a/inc/fsfw/osal/linux/FixedTimeslotTask.h b/src/fsfw/osal/linux/FixedTimeslotTask.h similarity index 100% rename from inc/fsfw/osal/linux/FixedTimeslotTask.h rename to src/fsfw/osal/linux/FixedTimeslotTask.h diff --git a/src/osal/linux/InternalErrorCodes.cpp b/src/fsfw/osal/linux/InternalErrorCodes.cpp similarity index 100% rename from src/osal/linux/InternalErrorCodes.cpp rename to src/fsfw/osal/linux/InternalErrorCodes.cpp diff --git a/src/osal/linux/MessageQueue.cpp b/src/fsfw/osal/linux/MessageQueue.cpp similarity index 100% rename from src/osal/linux/MessageQueue.cpp rename to src/fsfw/osal/linux/MessageQueue.cpp diff --git a/inc/fsfw/osal/linux/MessageQueue.h b/src/fsfw/osal/linux/MessageQueue.h similarity index 100% rename from inc/fsfw/osal/linux/MessageQueue.h rename to src/fsfw/osal/linux/MessageQueue.h diff --git a/src/osal/linux/Mutex.cpp b/src/fsfw/osal/linux/Mutex.cpp similarity index 100% rename from src/osal/linux/Mutex.cpp rename to src/fsfw/osal/linux/Mutex.cpp diff --git a/inc/fsfw/osal/linux/Mutex.h b/src/fsfw/osal/linux/Mutex.h similarity index 100% rename from inc/fsfw/osal/linux/Mutex.h rename to src/fsfw/osal/linux/Mutex.h diff --git a/src/osal/linux/MutexFactory.cpp b/src/fsfw/osal/linux/MutexFactory.cpp similarity index 100% rename from src/osal/linux/MutexFactory.cpp rename to src/fsfw/osal/linux/MutexFactory.cpp diff --git a/src/osal/linux/PeriodicPosixTask.cpp b/src/fsfw/osal/linux/PeriodicPosixTask.cpp similarity index 100% rename from src/osal/linux/PeriodicPosixTask.cpp rename to src/fsfw/osal/linux/PeriodicPosixTask.cpp diff --git a/inc/fsfw/osal/linux/PeriodicPosixTask.h b/src/fsfw/osal/linux/PeriodicPosixTask.h similarity index 100% rename from inc/fsfw/osal/linux/PeriodicPosixTask.h rename to src/fsfw/osal/linux/PeriodicPosixTask.h diff --git a/src/osal/linux/PosixThread.cpp b/src/fsfw/osal/linux/PosixThread.cpp similarity index 100% rename from src/osal/linux/PosixThread.cpp rename to src/fsfw/osal/linux/PosixThread.cpp diff --git a/inc/fsfw/osal/linux/PosixThread.h b/src/fsfw/osal/linux/PosixThread.h similarity index 100% rename from inc/fsfw/osal/linux/PosixThread.h rename to src/fsfw/osal/linux/PosixThread.h diff --git a/src/osal/linux/QueueFactory.cpp b/src/fsfw/osal/linux/QueueFactory.cpp similarity index 100% rename from src/osal/linux/QueueFactory.cpp rename to src/fsfw/osal/linux/QueueFactory.cpp diff --git a/src/osal/linux/SemaphoreFactory.cpp b/src/fsfw/osal/linux/SemaphoreFactory.cpp similarity index 100% rename from src/osal/linux/SemaphoreFactory.cpp rename to src/fsfw/osal/linux/SemaphoreFactory.cpp diff --git a/src/osal/linux/TaskFactory.cpp b/src/fsfw/osal/linux/TaskFactory.cpp similarity index 100% rename from src/osal/linux/TaskFactory.cpp rename to src/fsfw/osal/linux/TaskFactory.cpp diff --git a/src/osal/linux/Timer.cpp b/src/fsfw/osal/linux/Timer.cpp similarity index 100% rename from src/osal/linux/Timer.cpp rename to src/fsfw/osal/linux/Timer.cpp diff --git a/inc/fsfw/osal/linux/Timer.h b/src/fsfw/osal/linux/Timer.h similarity index 100% rename from inc/fsfw/osal/linux/Timer.h rename to src/fsfw/osal/linux/Timer.h diff --git a/src/osal/linux/tcpipHelpers.cpp b/src/fsfw/osal/linux/tcpipHelpers.cpp similarity index 100% rename from src/osal/linux/tcpipHelpers.cpp rename to src/fsfw/osal/linux/tcpipHelpers.cpp diff --git a/src/osal/linux/unixUtility.cpp b/src/fsfw/osal/linux/unixUtility.cpp similarity index 100% rename from src/osal/linux/unixUtility.cpp rename to src/fsfw/osal/linux/unixUtility.cpp diff --git a/inc/fsfw/osal/linux/unixUtility.h b/src/fsfw/osal/linux/unixUtility.h similarity index 100% rename from inc/fsfw/osal/linux/unixUtility.h rename to src/fsfw/osal/linux/unixUtility.h diff --git a/src/fsfw/osal/rtems/BinarySemaphore.cpp b/src/fsfw/osal/rtems/BinarySemaphore.cpp new file mode 100644 index 00000000..6d145d98 --- /dev/null +++ b/src/fsfw/osal/rtems/BinarySemaphore.cpp @@ -0,0 +1,23 @@ +#include "BinarySemaphore.h" + +#include + +BinarySemaphore::BinarySemaphore() { +} + +BinarySemaphore::~BinarySemaphore() { + +} + +ReturnValue_t BinarySemaphore::acquire(TimeoutType timeoutType, uint32_t timeoutMs) { + return HasReturnvaluesIF::RETURN_OK; +} + + +ReturnValue_t BinarySemaphore::release() { + return HasReturnvaluesIF::RETURN_OK; +} + +uint8_t BinarySemaphore::getSemaphoreCounter() const { + return 0; +} diff --git a/src/fsfw/osal/rtems/BinarySemaphore.h b/src/fsfw/osal/rtems/BinarySemaphore.h new file mode 100644 index 00000000..a2796af1 --- /dev/null +++ b/src/fsfw/osal/rtems/BinarySemaphore.h @@ -0,0 +1,23 @@ +#ifndef FSFW_OSAL_RTEMS_BINARYSEMAPHORE_H_ +#define FSFW_OSAL_RTEMS_BINARYSEMAPHORE_H_ + +#include "fsfw/tasks/SemaphoreIF.h" + +class BinarySemaphore: public SemaphoreIF { +public: + BinarySemaphore(); + virtual ~BinarySemaphore(); + + // Semaphore IF implementations + ReturnValue_t acquire(TimeoutType timeoutType = + TimeoutType::BLOCKING, uint32_t timeoutMs = 0) override; + ReturnValue_t release() override; + uint8_t getSemaphoreCounter() const override; + +private: + +}; + + + +#endif /* FSFW_SRC_FSFW_OSAL_RTEMS_BINARYSEMAPHORE_H_ */ diff --git a/src/osal/rtems/CMakeLists.txt b/src/fsfw/osal/rtems/CMakeLists.txt similarity index 86% rename from src/osal/rtems/CMakeLists.txt rename to src/fsfw/osal/rtems/CMakeLists.txt index cd266125..734566a3 100644 --- a/src/osal/rtems/CMakeLists.txt +++ b/src/fsfw/osal/rtems/CMakeLists.txt @@ -13,6 +13,8 @@ target_sources(${LIB_FSFW_NAME} RtemsBasic.cpp RTEMSTaskBase.cpp TaskFactory.cpp + BinarySemaphore.cpp + SemaphoreFactory.cpp ) diff --git a/src/osal/rtems/Clock.cpp b/src/fsfw/osal/rtems/Clock.cpp similarity index 100% rename from src/osal/rtems/Clock.cpp rename to src/fsfw/osal/rtems/Clock.cpp diff --git a/src/osal/rtems/CpuUsage.cpp b/src/fsfw/osal/rtems/CpuUsage.cpp similarity index 100% rename from src/osal/rtems/CpuUsage.cpp rename to src/fsfw/osal/rtems/CpuUsage.cpp diff --git a/inc/fsfw/osal/rtems/CpuUsage.h b/src/fsfw/osal/rtems/CpuUsage.h similarity index 100% rename from inc/fsfw/osal/rtems/CpuUsage.h rename to src/fsfw/osal/rtems/CpuUsage.h diff --git a/src/osal/rtems/FixedTimeslotTask.cpp b/src/fsfw/osal/rtems/FixedTimeslotTask.cpp similarity index 100% rename from src/osal/rtems/FixedTimeslotTask.cpp rename to src/fsfw/osal/rtems/FixedTimeslotTask.cpp diff --git a/inc/fsfw/osal/rtems/FixedTimeslotTask.h b/src/fsfw/osal/rtems/FixedTimeslotTask.h similarity index 100% rename from inc/fsfw/osal/rtems/FixedTimeslotTask.h rename to src/fsfw/osal/rtems/FixedTimeslotTask.h diff --git a/src/osal/rtems/InitTask.cpp b/src/fsfw/osal/rtems/InitTask.cpp similarity index 100% rename from src/osal/rtems/InitTask.cpp rename to src/fsfw/osal/rtems/InitTask.cpp diff --git a/inc/fsfw/osal/rtems/InitTask.h b/src/fsfw/osal/rtems/InitTask.h similarity index 100% rename from inc/fsfw/osal/rtems/InitTask.h rename to src/fsfw/osal/rtems/InitTask.h diff --git a/src/osal/rtems/InternalErrorCodes.cpp b/src/fsfw/osal/rtems/InternalErrorCodes.cpp similarity index 100% rename from src/osal/rtems/InternalErrorCodes.cpp rename to src/fsfw/osal/rtems/InternalErrorCodes.cpp diff --git a/src/osal/rtems/MessageQueue.cpp b/src/fsfw/osal/rtems/MessageQueue.cpp similarity index 100% rename from src/osal/rtems/MessageQueue.cpp rename to src/fsfw/osal/rtems/MessageQueue.cpp diff --git a/inc/fsfw/osal/rtems/MessageQueue.h b/src/fsfw/osal/rtems/MessageQueue.h similarity index 98% rename from inc/fsfw/osal/rtems/MessageQueue.h rename to src/fsfw/osal/rtems/MessageQueue.h index 342f1e30..fa143ebe 100644 --- a/inc/fsfw/osal/rtems/MessageQueue.h +++ b/src/fsfw/osal/rtems/MessageQueue.h @@ -1,9 +1,9 @@ #ifndef FSFW_OSAL_RTEMS_MESSAGEQUEUE_H_ #define FSFW_OSAL_RTEMS_MESSAGEQUEUE_H_ -#include "../../internalError/InternalErrorReporterIF.h" -#include "../../ipc/MessageQueueIF.h" -#include "../../ipc/MessageQueueMessage.h" +#include "fsfw/internalerror/InternalErrorReporterIF.h" +#include "fsfw/ipc/MessageQueueIF.h" +#include "fsfw/ipc/MessageQueueMessage.h" #include "RtemsBasic.h" /** diff --git a/src/osal/rtems/Mutex.cpp b/src/fsfw/osal/rtems/Mutex.cpp similarity index 100% rename from src/osal/rtems/Mutex.cpp rename to src/fsfw/osal/rtems/Mutex.cpp diff --git a/inc/fsfw/osal/rtems/Mutex.h b/src/fsfw/osal/rtems/Mutex.h similarity index 100% rename from inc/fsfw/osal/rtems/Mutex.h rename to src/fsfw/osal/rtems/Mutex.h diff --git a/src/osal/rtems/MutexFactory.cpp b/src/fsfw/osal/rtems/MutexFactory.cpp similarity index 100% rename from src/osal/rtems/MutexFactory.cpp rename to src/fsfw/osal/rtems/MutexFactory.cpp diff --git a/src/osal/rtems/PeriodicTask.cpp b/src/fsfw/osal/rtems/PeriodicTask.cpp similarity index 100% rename from src/osal/rtems/PeriodicTask.cpp rename to src/fsfw/osal/rtems/PeriodicTask.cpp diff --git a/inc/fsfw/osal/rtems/PeriodicTask.h b/src/fsfw/osal/rtems/PeriodicTask.h similarity index 100% rename from inc/fsfw/osal/rtems/PeriodicTask.h rename to src/fsfw/osal/rtems/PeriodicTask.h diff --git a/src/osal/rtems/QueueFactory.cpp b/src/fsfw/osal/rtems/QueueFactory.cpp similarity index 100% rename from src/osal/rtems/QueueFactory.cpp rename to src/fsfw/osal/rtems/QueueFactory.cpp diff --git a/src/osal/rtems/RTEMSTaskBase.cpp b/src/fsfw/osal/rtems/RTEMSTaskBase.cpp similarity index 100% rename from src/osal/rtems/RTEMSTaskBase.cpp rename to src/fsfw/osal/rtems/RTEMSTaskBase.cpp diff --git a/inc/fsfw/osal/rtems/RTEMSTaskBase.h b/src/fsfw/osal/rtems/RTEMSTaskBase.h similarity index 100% rename from inc/fsfw/osal/rtems/RTEMSTaskBase.h rename to src/fsfw/osal/rtems/RTEMSTaskBase.h diff --git a/src/osal/rtems/RtemsBasic.cpp b/src/fsfw/osal/rtems/RtemsBasic.cpp similarity index 100% rename from src/osal/rtems/RtemsBasic.cpp rename to src/fsfw/osal/rtems/RtemsBasic.cpp diff --git a/inc/fsfw/osal/rtems/RtemsBasic.h b/src/fsfw/osal/rtems/RtemsBasic.h similarity index 100% rename from inc/fsfw/osal/rtems/RtemsBasic.h rename to src/fsfw/osal/rtems/RtemsBasic.h diff --git a/src/fsfw/osal/rtems/SemaphoreFactory.cpp b/src/fsfw/osal/rtems/SemaphoreFactory.cpp new file mode 100644 index 00000000..cec4b833 --- /dev/null +++ b/src/fsfw/osal/rtems/SemaphoreFactory.cpp @@ -0,0 +1,34 @@ +#include "fsfw/osal/rtems/BinarySemaphore.h" +//#include "fsfw/osal/rtems/CountingSemaphore.h" + +#include "fsfw/tasks/SemaphoreFactory.h" +#include "fsfw/serviceinterface/ServiceInterface.h" + +SemaphoreFactory* SemaphoreFactory::factoryInstance = nullptr; + +SemaphoreFactory::SemaphoreFactory() { +} + +SemaphoreFactory::~SemaphoreFactory() { + delete factoryInstance; +} + +SemaphoreFactory* SemaphoreFactory::instance() { + if (factoryInstance == nullptr){ + factoryInstance = new SemaphoreFactory(); + } + return SemaphoreFactory::factoryInstance; +} + +SemaphoreIF* SemaphoreFactory::createBinarySemaphore(uint32_t argument) { + return new BinarySemaphore(); +} + +SemaphoreIF* SemaphoreFactory::createCountingSemaphore(uint8_t maxCount, + uint8_t initCount, uint32_t argument) { + return nullptr; +} + +void SemaphoreFactory::deleteSemaphore(SemaphoreIF* semaphore) { + delete semaphore; +} diff --git a/src/osal/rtems/TaskFactory.cpp b/src/fsfw/osal/rtems/TaskFactory.cpp similarity index 100% rename from src/osal/rtems/TaskFactory.cpp rename to src/fsfw/osal/rtems/TaskFactory.cpp diff --git a/src/osal/windows/CMakeLists.txt b/src/fsfw/osal/windows/CMakeLists.txt similarity index 100% rename from src/osal/windows/CMakeLists.txt rename to src/fsfw/osal/windows/CMakeLists.txt diff --git a/src/osal/windows/tcpipHelpers.cpp b/src/fsfw/osal/windows/tcpipHelpers.cpp similarity index 100% rename from src/osal/windows/tcpipHelpers.cpp rename to src/fsfw/osal/windows/tcpipHelpers.cpp diff --git a/src/osal/windows/winTaskHelpers.cpp b/src/fsfw/osal/windows/winTaskHelpers.cpp similarity index 100% rename from src/osal/windows/winTaskHelpers.cpp rename to src/fsfw/osal/windows/winTaskHelpers.cpp diff --git a/inc/fsfw/osal/windows/winTaskHelpers.h b/src/fsfw/osal/windows/winTaskHelpers.h similarity index 100% rename from inc/fsfw/osal/windows/winTaskHelpers.h rename to src/fsfw/osal/windows/winTaskHelpers.h diff --git a/src/core/parameters/CMakeLists.txt b/src/fsfw/parameters/CMakeLists.txt similarity index 100% rename from src/core/parameters/CMakeLists.txt rename to src/fsfw/parameters/CMakeLists.txt diff --git a/inc/fsfw/parameters/HasParametersIF.h b/src/fsfw/parameters/HasParametersIF.h similarity index 100% rename from inc/fsfw/parameters/HasParametersIF.h rename to src/fsfw/parameters/HasParametersIF.h diff --git a/src/core/parameters/ParameterHelper.cpp b/src/fsfw/parameters/ParameterHelper.cpp similarity index 100% rename from src/core/parameters/ParameterHelper.cpp rename to src/fsfw/parameters/ParameterHelper.cpp diff --git a/inc/fsfw/parameters/ParameterHelper.h b/src/fsfw/parameters/ParameterHelper.h similarity index 100% rename from inc/fsfw/parameters/ParameterHelper.h rename to src/fsfw/parameters/ParameterHelper.h diff --git a/src/core/parameters/ParameterMessage.cpp b/src/fsfw/parameters/ParameterMessage.cpp similarity index 100% rename from src/core/parameters/ParameterMessage.cpp rename to src/fsfw/parameters/ParameterMessage.cpp diff --git a/inc/fsfw/parameters/ParameterMessage.h b/src/fsfw/parameters/ParameterMessage.h similarity index 100% rename from inc/fsfw/parameters/ParameterMessage.h rename to src/fsfw/parameters/ParameterMessage.h diff --git a/src/core/parameters/ParameterWrapper.cpp b/src/fsfw/parameters/ParameterWrapper.cpp similarity index 100% rename from src/core/parameters/ParameterWrapper.cpp rename to src/fsfw/parameters/ParameterWrapper.cpp diff --git a/inc/fsfw/parameters/ParameterWrapper.h b/src/fsfw/parameters/ParameterWrapper.h similarity index 100% rename from inc/fsfw/parameters/ParameterWrapper.h rename to src/fsfw/parameters/ParameterWrapper.h diff --git a/inc/fsfw/parameters/ReceivesParameterMessagesIF.h b/src/fsfw/parameters/ReceivesParameterMessagesIF.h similarity index 100% rename from inc/fsfw/parameters/ReceivesParameterMessagesIF.h rename to src/fsfw/parameters/ReceivesParameterMessagesIF.h diff --git a/inc/fsfw/platform.h b/src/fsfw/platform.h similarity index 100% rename from inc/fsfw/platform.h rename to src/fsfw/platform.h diff --git a/src/core/power/CMakeLists.txt b/src/fsfw/power/CMakeLists.txt similarity index 100% rename from src/core/power/CMakeLists.txt rename to src/fsfw/power/CMakeLists.txt diff --git a/src/core/power/Fuse.cpp b/src/fsfw/power/Fuse.cpp similarity index 100% rename from src/core/power/Fuse.cpp rename to src/fsfw/power/Fuse.cpp diff --git a/inc/fsfw/power/Fuse.h b/src/fsfw/power/Fuse.h similarity index 100% rename from inc/fsfw/power/Fuse.h rename to src/fsfw/power/Fuse.h diff --git a/src/core/power/PowerComponent.cpp b/src/fsfw/power/PowerComponent.cpp similarity index 100% rename from src/core/power/PowerComponent.cpp rename to src/fsfw/power/PowerComponent.cpp diff --git a/inc/fsfw/power/PowerComponent.h b/src/fsfw/power/PowerComponent.h similarity index 100% rename from inc/fsfw/power/PowerComponent.h rename to src/fsfw/power/PowerComponent.h diff --git a/inc/fsfw/power/PowerComponentIF.h b/src/fsfw/power/PowerComponentIF.h similarity index 100% rename from inc/fsfw/power/PowerComponentIF.h rename to src/fsfw/power/PowerComponentIF.h diff --git a/src/core/power/PowerSensor.cpp b/src/fsfw/power/PowerSensor.cpp similarity index 100% rename from src/core/power/PowerSensor.cpp rename to src/fsfw/power/PowerSensor.cpp diff --git a/inc/fsfw/power/PowerSensor.h b/src/fsfw/power/PowerSensor.h similarity index 100% rename from inc/fsfw/power/PowerSensor.h rename to src/fsfw/power/PowerSensor.h diff --git a/inc/fsfw/power/PowerSwitchIF.h b/src/fsfw/power/PowerSwitchIF.h similarity index 100% rename from inc/fsfw/power/PowerSwitchIF.h rename to src/fsfw/power/PowerSwitchIF.h diff --git a/src/core/power/PowerSwitcher.cpp b/src/fsfw/power/PowerSwitcher.cpp similarity index 100% rename from src/core/power/PowerSwitcher.cpp rename to src/fsfw/power/PowerSwitcher.cpp diff --git a/inc/fsfw/power/PowerSwitcher.h b/src/fsfw/power/PowerSwitcher.h similarity index 100% rename from inc/fsfw/power/PowerSwitcher.h rename to src/fsfw/power/PowerSwitcher.h diff --git a/src/opt/pus/CMakeLists.txt b/src/fsfw/pus/CMakeLists.txt similarity index 100% rename from src/opt/pus/CMakeLists.txt rename to src/fsfw/pus/CMakeLists.txt diff --git a/src/opt/pus/CService200ModeCommanding.cpp b/src/fsfw/pus/CService200ModeCommanding.cpp similarity index 100% rename from src/opt/pus/CService200ModeCommanding.cpp rename to src/fsfw/pus/CService200ModeCommanding.cpp diff --git a/inc/fsfw/pus/CService200ModeCommanding.h b/src/fsfw/pus/CService200ModeCommanding.h similarity index 100% rename from inc/fsfw/pus/CService200ModeCommanding.h rename to src/fsfw/pus/CService200ModeCommanding.h diff --git a/src/opt/pus/CService201HealthCommanding.cpp b/src/fsfw/pus/CService201HealthCommanding.cpp similarity index 100% rename from src/opt/pus/CService201HealthCommanding.cpp rename to src/fsfw/pus/CService201HealthCommanding.cpp diff --git a/inc/fsfw/pus/CService201HealthCommanding.h b/src/fsfw/pus/CService201HealthCommanding.h similarity index 100% rename from inc/fsfw/pus/CService201HealthCommanding.h rename to src/fsfw/pus/CService201HealthCommanding.h diff --git a/src/opt/pus/Service17Test.cpp b/src/fsfw/pus/Service17Test.cpp similarity index 100% rename from src/opt/pus/Service17Test.cpp rename to src/fsfw/pus/Service17Test.cpp diff --git a/inc/fsfw/pus/Service17Test.h b/src/fsfw/pus/Service17Test.h similarity index 100% rename from inc/fsfw/pus/Service17Test.h rename to src/fsfw/pus/Service17Test.h diff --git a/src/opt/pus/Service1TelecommandVerification.cpp b/src/fsfw/pus/Service1TelecommandVerification.cpp similarity index 100% rename from src/opt/pus/Service1TelecommandVerification.cpp rename to src/fsfw/pus/Service1TelecommandVerification.cpp diff --git a/inc/fsfw/pus/Service1TelecommandVerification.h b/src/fsfw/pus/Service1TelecommandVerification.h similarity index 100% rename from inc/fsfw/pus/Service1TelecommandVerification.h rename to src/fsfw/pus/Service1TelecommandVerification.h diff --git a/src/opt/pus/Service20ParameterManagement.cpp b/src/fsfw/pus/Service20ParameterManagement.cpp similarity index 100% rename from src/opt/pus/Service20ParameterManagement.cpp rename to src/fsfw/pus/Service20ParameterManagement.cpp diff --git a/inc/fsfw/pus/Service20ParameterManagement.h b/src/fsfw/pus/Service20ParameterManagement.h similarity index 100% rename from inc/fsfw/pus/Service20ParameterManagement.h rename to src/fsfw/pus/Service20ParameterManagement.h diff --git a/src/opt/pus/Service2DeviceAccess.cpp b/src/fsfw/pus/Service2DeviceAccess.cpp similarity index 100% rename from src/opt/pus/Service2DeviceAccess.cpp rename to src/fsfw/pus/Service2DeviceAccess.cpp diff --git a/inc/fsfw/pus/Service2DeviceAccess.h b/src/fsfw/pus/Service2DeviceAccess.h similarity index 100% rename from inc/fsfw/pus/Service2DeviceAccess.h rename to src/fsfw/pus/Service2DeviceAccess.h diff --git a/src/opt/pus/Service3Housekeeping.cpp b/src/fsfw/pus/Service3Housekeeping.cpp similarity index 100% rename from src/opt/pus/Service3Housekeeping.cpp rename to src/fsfw/pus/Service3Housekeeping.cpp diff --git a/inc/fsfw/pus/Service3Housekeeping.h b/src/fsfw/pus/Service3Housekeeping.h similarity index 100% rename from inc/fsfw/pus/Service3Housekeeping.h rename to src/fsfw/pus/Service3Housekeeping.h diff --git a/src/opt/pus/Service5EventReporting.cpp b/src/fsfw/pus/Service5EventReporting.cpp similarity index 100% rename from src/opt/pus/Service5EventReporting.cpp rename to src/fsfw/pus/Service5EventReporting.cpp diff --git a/inc/fsfw/pus/Service5EventReporting.h b/src/fsfw/pus/Service5EventReporting.h similarity index 100% rename from inc/fsfw/pus/Service5EventReporting.h rename to src/fsfw/pus/Service5EventReporting.h diff --git a/src/opt/pus/Service8FunctionManagement.cpp b/src/fsfw/pus/Service8FunctionManagement.cpp similarity index 100% rename from src/opt/pus/Service8FunctionManagement.cpp rename to src/fsfw/pus/Service8FunctionManagement.cpp diff --git a/inc/fsfw/pus/Service8FunctionManagement.h b/src/fsfw/pus/Service8FunctionManagement.h similarity index 100% rename from inc/fsfw/pus/Service8FunctionManagement.h rename to src/fsfw/pus/Service8FunctionManagement.h diff --git a/src/opt/pus/Service9TimeManagement.cpp b/src/fsfw/pus/Service9TimeManagement.cpp similarity index 100% rename from src/opt/pus/Service9TimeManagement.cpp rename to src/fsfw/pus/Service9TimeManagement.cpp diff --git a/inc/fsfw/pus/Service9TimeManagement.h b/src/fsfw/pus/Service9TimeManagement.h similarity index 100% rename from inc/fsfw/pus/Service9TimeManagement.h rename to src/fsfw/pus/Service9TimeManagement.h diff --git a/inc/fsfw/pus/servicepackets/Service1Packets.h b/src/fsfw/pus/servicepackets/Service1Packets.h similarity index 100% rename from inc/fsfw/pus/servicepackets/Service1Packets.h rename to src/fsfw/pus/servicepackets/Service1Packets.h diff --git a/inc/fsfw/pus/servicepackets/Service200Packets.h b/src/fsfw/pus/servicepackets/Service200Packets.h similarity index 100% rename from inc/fsfw/pus/servicepackets/Service200Packets.h rename to src/fsfw/pus/servicepackets/Service200Packets.h diff --git a/inc/fsfw/pus/servicepackets/Service201Packets.h b/src/fsfw/pus/servicepackets/Service201Packets.h similarity index 100% rename from inc/fsfw/pus/servicepackets/Service201Packets.h rename to src/fsfw/pus/servicepackets/Service201Packets.h diff --git a/inc/fsfw/pus/servicepackets/Service20Packets.h b/src/fsfw/pus/servicepackets/Service20Packets.h similarity index 100% rename from inc/fsfw/pus/servicepackets/Service20Packets.h rename to src/fsfw/pus/servicepackets/Service20Packets.h diff --git a/inc/fsfw/pus/servicepackets/Service2Packets.h b/src/fsfw/pus/servicepackets/Service2Packets.h similarity index 100% rename from inc/fsfw/pus/servicepackets/Service2Packets.h rename to src/fsfw/pus/servicepackets/Service2Packets.h diff --git a/inc/fsfw/pus/servicepackets/Service3Packets.h b/src/fsfw/pus/servicepackets/Service3Packets.h similarity index 100% rename from inc/fsfw/pus/servicepackets/Service3Packets.h rename to src/fsfw/pus/servicepackets/Service3Packets.h diff --git a/inc/fsfw/pus/servicepackets/Service5Packets.h b/src/fsfw/pus/servicepackets/Service5Packets.h similarity index 100% rename from inc/fsfw/pus/servicepackets/Service5Packets.h rename to src/fsfw/pus/servicepackets/Service5Packets.h diff --git a/inc/fsfw/pus/servicepackets/Service8Packets.h b/src/fsfw/pus/servicepackets/Service8Packets.h similarity index 100% rename from inc/fsfw/pus/servicepackets/Service8Packets.h rename to src/fsfw/pus/servicepackets/Service8Packets.h diff --git a/inc/fsfw/pus/servicepackets/Service9Packets.h b/src/fsfw/pus/servicepackets/Service9Packets.h similarity index 100% rename from inc/fsfw/pus/servicepackets/Service9Packets.h rename to src/fsfw/pus/servicepackets/Service9Packets.h diff --git a/inc/fsfw/returnvalues/FwClassIds.h b/src/fsfw/returnvalues/FwClassIds.h similarity index 100% rename from inc/fsfw/returnvalues/FwClassIds.h rename to src/fsfw/returnvalues/FwClassIds.h diff --git a/inc/fsfw/returnvalues/HasReturnvaluesIF.h b/src/fsfw/returnvalues/HasReturnvaluesIF.h similarity index 100% rename from inc/fsfw/returnvalues/HasReturnvaluesIF.h rename to src/fsfw/returnvalues/HasReturnvaluesIF.h diff --git a/src/opt/rmap/CMakeLists.txt b/src/fsfw/rmap/CMakeLists.txt similarity index 100% rename from src/opt/rmap/CMakeLists.txt rename to src/fsfw/rmap/CMakeLists.txt diff --git a/src/opt/rmap/RMAP.cpp b/src/fsfw/rmap/RMAP.cpp similarity index 100% rename from src/opt/rmap/RMAP.cpp rename to src/fsfw/rmap/RMAP.cpp diff --git a/inc/fsfw/rmap/RMAP.h b/src/fsfw/rmap/RMAP.h similarity index 99% rename from inc/fsfw/rmap/RMAP.h rename to src/fsfw/rmap/RMAP.h index 7fa0021d..ff310db0 100644 --- a/inc/fsfw/rmap/RMAP.h +++ b/src/fsfw/rmap/RMAP.h @@ -1,6 +1,7 @@ #ifndef FSFW_RMAP_RMAP_H_ #define FSFW_RMAP_RMAP_H_ +#include "rmapConf.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h" #include "fsfw/rmap/RMAPCookie.h" diff --git a/inc/fsfw/rmap/RMAPChannelIF.h b/src/fsfw/rmap/RMAPChannelIF.h similarity index 98% rename from inc/fsfw/rmap/RMAPChannelIF.h rename to src/fsfw/rmap/RMAPChannelIF.h index 0aa809c5..7fbda348 100644 --- a/inc/fsfw/rmap/RMAPChannelIF.h +++ b/src/fsfw/rmap/RMAPChannelIF.h @@ -1,8 +1,9 @@ #ifndef FSFW_RMAP_RMAPCHANNELIF_H_ #define FSFW_RMAP_RMAPCHANNELIF_H_ +#include "rmapConf.h" #include "RMAPCookie.h" -#include "../returnvalues/HasReturnvaluesIF.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" #include class RMAPChannelIF { diff --git a/src/opt/rmap/RMAPCookie.cpp b/src/fsfw/rmap/RMAPCookie.cpp similarity index 100% rename from src/opt/rmap/RMAPCookie.cpp rename to src/fsfw/rmap/RMAPCookie.cpp diff --git a/inc/fsfw/rmap/RMAPCookie.h b/src/fsfw/rmap/RMAPCookie.h similarity index 98% rename from inc/fsfw/rmap/RMAPCookie.h rename to src/fsfw/rmap/RMAPCookie.h index 97aaa6d0..032e5a46 100644 --- a/inc/fsfw/rmap/RMAPCookie.h +++ b/src/fsfw/rmap/RMAPCookie.h @@ -1,6 +1,7 @@ #ifndef FSFW_RMAP_RMAPCOOKIE_H_ #define FSFW_RMAP_RMAPCOOKIE_H_ +#include "rmapConf.h" #include "rmapStructs.h" #include "fsfw/devicehandlers/CookieIF.h" #include diff --git a/src/opt/rmap/RmapDeviceCommunicationIF.cpp b/src/fsfw/rmap/RmapDeviceCommunicationIF.cpp similarity index 100% rename from src/opt/rmap/RmapDeviceCommunicationIF.cpp rename to src/fsfw/rmap/RmapDeviceCommunicationIF.cpp diff --git a/inc/fsfw/rmap/RmapDeviceCommunicationIF.h b/src/fsfw/rmap/RmapDeviceCommunicationIF.h similarity index 99% rename from inc/fsfw/rmap/RmapDeviceCommunicationIF.h rename to src/fsfw/rmap/RmapDeviceCommunicationIF.h index 3714b7e7..36baf87b 100644 --- a/inc/fsfw/rmap/RmapDeviceCommunicationIF.h +++ b/src/fsfw/rmap/RmapDeviceCommunicationIF.h @@ -1,6 +1,7 @@ #ifndef FSFW_RMAP_RMAPDEVICECOMMUNICATIONINTERFACE_H_ #define FSFW_RMAP_RMAPDEVICECOMMUNICATIONINTERFACE_H_ +#include "rmapConf.h" #include "fsfw/devicehandlers/DeviceCommunicationIF.h" /** diff --git a/src/fsfw/rmap/rmapConf.h b/src/fsfw/rmap/rmapConf.h new file mode 100644 index 00000000..c4fa1e54 --- /dev/null +++ b/src/fsfw/rmap/rmapConf.h @@ -0,0 +1,10 @@ +#ifndef FSFW_SRC_FSFW_RMAP_RAMCONF_H_ +#define FSFW_SRC_FSFW_RMAP_RAMCONF_H_ + +#include "fsfw/FSFW.h" + +#ifndef FSFW_ADD_RMAP +#warning RMAP was included but compilation was not enabled with FSFW_ADD_RMAP +#endif + +#endif /* FSFW_SRC_FSFW_RMAP_RAMCONF_H_ */ diff --git a/inc/fsfw/rmap/rmapStructs.h b/src/fsfw/rmap/rmapStructs.h similarity index 99% rename from inc/fsfw/rmap/rmapStructs.h rename to src/fsfw/rmap/rmapStructs.h index 11d8bb85..de8b3a59 100644 --- a/inc/fsfw/rmap/rmapStructs.h +++ b/src/fsfw/rmap/rmapStructs.h @@ -1,6 +1,8 @@ #ifndef FSFW_RMAP_RMAPSTRUCTS_H_ #define FSFW_RMAP_RMAPSTRUCTS_H_ +#include "rmapConf.h" + #include //SHOULDDO: having the defines within a namespace would be nice. Problem are the defines referencing the previous define, eg RMAP_COMMAND_WRITE diff --git a/src/fsfw/serialize.h b/src/fsfw/serialize.h new file mode 100644 index 00000000..7cd735bb --- /dev/null +++ b/src/fsfw/serialize.h @@ -0,0 +1,10 @@ +#ifndef FSFW_INC_FSFW_SERIALIZE_H_ +#define FSFW_INC_FSFW_SERIALIZE_H_ + +#include "src/core/serialize/EndianConverter.h" +#include "src/core/serialize/SerialArrayListAdapter.h" +#include "src/core/serialize/SerialBufferAdapter.h" +#include "src/core/serialize/SerializeElement.h" +#include "src/core/serialize/SerialLinkedListAdapter.h" + +#endif /* FSFW_INC_FSFW_SERIALIZE_H_ */ diff --git a/src/core/serialize/CMakeLists.txt b/src/fsfw/serialize/CMakeLists.txt similarity index 100% rename from src/core/serialize/CMakeLists.txt rename to src/fsfw/serialize/CMakeLists.txt diff --git a/inc/fsfw/serialize/EndianConverter.h b/src/fsfw/serialize/EndianConverter.h similarity index 100% rename from inc/fsfw/serialize/EndianConverter.h rename to src/fsfw/serialize/EndianConverter.h diff --git a/inc/fsfw/serialize/SerialArrayListAdapter.h b/src/fsfw/serialize/SerialArrayListAdapter.h similarity index 100% rename from inc/fsfw/serialize/SerialArrayListAdapter.h rename to src/fsfw/serialize/SerialArrayListAdapter.h diff --git a/src/core/serialize/SerialBufferAdapter.cpp b/src/fsfw/serialize/SerialBufferAdapter.cpp similarity index 100% rename from src/core/serialize/SerialBufferAdapter.cpp rename to src/fsfw/serialize/SerialBufferAdapter.cpp diff --git a/inc/fsfw/serialize/SerialBufferAdapter.h b/src/fsfw/serialize/SerialBufferAdapter.h similarity index 100% rename from inc/fsfw/serialize/SerialBufferAdapter.h rename to src/fsfw/serialize/SerialBufferAdapter.h diff --git a/inc/fsfw/serialize/SerialFixedArrayListAdapter.h b/src/fsfw/serialize/SerialFixedArrayListAdapter.h similarity index 100% rename from inc/fsfw/serialize/SerialFixedArrayListAdapter.h rename to src/fsfw/serialize/SerialFixedArrayListAdapter.h diff --git a/inc/fsfw/serialize/SerialLinkedListAdapter.h b/src/fsfw/serialize/SerialLinkedListAdapter.h similarity index 100% rename from inc/fsfw/serialize/SerialLinkedListAdapter.h rename to src/fsfw/serialize/SerialLinkedListAdapter.h diff --git a/inc/fsfw/serialize/SerializeAdapter.h b/src/fsfw/serialize/SerializeAdapter.h similarity index 100% rename from inc/fsfw/serialize/SerializeAdapter.h rename to src/fsfw/serialize/SerializeAdapter.h diff --git a/inc/fsfw/serialize/SerializeElement.h b/src/fsfw/serialize/SerializeElement.h similarity index 100% rename from inc/fsfw/serialize/SerializeElement.h rename to src/fsfw/serialize/SerializeElement.h diff --git a/inc/fsfw/serialize/SerializeIF.h b/src/fsfw/serialize/SerializeIF.h similarity index 100% rename from inc/fsfw/serialize/SerializeIF.h rename to src/fsfw/serialize/SerializeIF.h diff --git a/src/fsfw/serviceinterface.h b/src/fsfw/serviceinterface.h new file mode 100644 index 00000000..2e9a0b7e --- /dev/null +++ b/src/fsfw/serviceinterface.h @@ -0,0 +1,6 @@ +#ifndef FSFW_SRC_FSFW_SERVICEINTERFACE_H_ +#define FSFW_SRC_FSFW_SERVICEINTERFACE_H_ + +#include "serviceinterface/ServiceInterface.h" + +#endif /* FSFW_SRC_FSFW_SERVICEINTERFACE_H_ */ diff --git a/src/core/serviceinterface/CMakeLists.txt b/src/fsfw/serviceinterface/CMakeLists.txt similarity index 100% rename from src/core/serviceinterface/CMakeLists.txt rename to src/fsfw/serviceinterface/CMakeLists.txt diff --git a/inc/fsfw/serviceinterface/ServiceInterface.h b/src/fsfw/serviceinterface/ServiceInterface.h similarity index 100% rename from inc/fsfw/serviceinterface/ServiceInterface.h rename to src/fsfw/serviceinterface/ServiceInterface.h diff --git a/src/core/serviceinterface/ServiceInterfaceBuffer.cpp b/src/fsfw/serviceinterface/ServiceInterfaceBuffer.cpp similarity index 100% rename from src/core/serviceinterface/ServiceInterfaceBuffer.cpp rename to src/fsfw/serviceinterface/ServiceInterfaceBuffer.cpp diff --git a/inc/fsfw/serviceinterface/ServiceInterfaceBuffer.h b/src/fsfw/serviceinterface/ServiceInterfaceBuffer.h similarity index 100% rename from inc/fsfw/serviceinterface/ServiceInterfaceBuffer.h rename to src/fsfw/serviceinterface/ServiceInterfaceBuffer.h diff --git a/src/core/serviceinterface/ServiceInterfacePrinter.cpp b/src/fsfw/serviceinterface/ServiceInterfacePrinter.cpp similarity index 100% rename from src/core/serviceinterface/ServiceInterfacePrinter.cpp rename to src/fsfw/serviceinterface/ServiceInterfacePrinter.cpp diff --git a/inc/fsfw/serviceinterface/ServiceInterfacePrinter.h b/src/fsfw/serviceinterface/ServiceInterfacePrinter.h similarity index 100% rename from inc/fsfw/serviceinterface/ServiceInterfacePrinter.h rename to src/fsfw/serviceinterface/ServiceInterfacePrinter.h diff --git a/src/core/serviceinterface/ServiceInterfaceStream.cpp b/src/fsfw/serviceinterface/ServiceInterfaceStream.cpp similarity index 100% rename from src/core/serviceinterface/ServiceInterfaceStream.cpp rename to src/fsfw/serviceinterface/ServiceInterfaceStream.cpp diff --git a/inc/fsfw/serviceinterface/ServiceInterfaceStream.h b/src/fsfw/serviceinterface/ServiceInterfaceStream.h similarity index 100% rename from inc/fsfw/serviceinterface/ServiceInterfaceStream.h rename to src/fsfw/serviceinterface/ServiceInterfaceStream.h diff --git a/inc/fsfw/serviceinterface/serviceInterfaceDefintions.h b/src/fsfw/serviceinterface/serviceInterfaceDefintions.h similarity index 100% rename from inc/fsfw/serviceinterface/serviceInterfaceDefintions.h rename to src/fsfw/serviceinterface/serviceInterfaceDefintions.h diff --git a/src/core/storagemanager/CMakeLists.txt b/src/fsfw/storagemanager/CMakeLists.txt similarity index 100% rename from src/core/storagemanager/CMakeLists.txt rename to src/fsfw/storagemanager/CMakeLists.txt diff --git a/src/core/storagemanager/ConstStorageAccessor.cpp b/src/fsfw/storagemanager/ConstStorageAccessor.cpp similarity index 100% rename from src/core/storagemanager/ConstStorageAccessor.cpp rename to src/fsfw/storagemanager/ConstStorageAccessor.cpp diff --git a/inc/fsfw/storagemanager/ConstStorageAccessor.h b/src/fsfw/storagemanager/ConstStorageAccessor.h similarity index 100% rename from inc/fsfw/storagemanager/ConstStorageAccessor.h rename to src/fsfw/storagemanager/ConstStorageAccessor.h diff --git a/src/core/storagemanager/LocalPool.cpp b/src/fsfw/storagemanager/LocalPool.cpp similarity index 100% rename from src/core/storagemanager/LocalPool.cpp rename to src/fsfw/storagemanager/LocalPool.cpp diff --git a/inc/fsfw/storagemanager/LocalPool.h b/src/fsfw/storagemanager/LocalPool.h similarity index 100% rename from inc/fsfw/storagemanager/LocalPool.h rename to src/fsfw/storagemanager/LocalPool.h diff --git a/src/core/storagemanager/PoolManager.cpp b/src/fsfw/storagemanager/PoolManager.cpp similarity index 100% rename from src/core/storagemanager/PoolManager.cpp rename to src/fsfw/storagemanager/PoolManager.cpp diff --git a/inc/fsfw/storagemanager/PoolManager.h b/src/fsfw/storagemanager/PoolManager.h similarity index 100% rename from inc/fsfw/storagemanager/PoolManager.h rename to src/fsfw/storagemanager/PoolManager.h diff --git a/src/core/storagemanager/StorageAccessor.cpp b/src/fsfw/storagemanager/StorageAccessor.cpp similarity index 100% rename from src/core/storagemanager/StorageAccessor.cpp rename to src/fsfw/storagemanager/StorageAccessor.cpp diff --git a/inc/fsfw/storagemanager/StorageAccessor.h b/src/fsfw/storagemanager/StorageAccessor.h similarity index 100% rename from inc/fsfw/storagemanager/StorageAccessor.h rename to src/fsfw/storagemanager/StorageAccessor.h diff --git a/inc/fsfw/storagemanager/StorageManagerIF.h b/src/fsfw/storagemanager/StorageManagerIF.h similarity index 100% rename from inc/fsfw/storagemanager/StorageManagerIF.h rename to src/fsfw/storagemanager/StorageManagerIF.h diff --git a/inc/fsfw/storagemanager/storeAddress.h b/src/fsfw/storagemanager/storeAddress.h similarity index 100% rename from inc/fsfw/storagemanager/storeAddress.h rename to src/fsfw/storagemanager/storeAddress.h diff --git a/src/core/subsystem/CMakeLists.txt b/src/fsfw/subsystem/CMakeLists.txt similarity index 100% rename from src/core/subsystem/CMakeLists.txt rename to src/fsfw/subsystem/CMakeLists.txt diff --git a/src/core/subsystem/Subsystem.cpp b/src/fsfw/subsystem/Subsystem.cpp similarity index 100% rename from src/core/subsystem/Subsystem.cpp rename to src/fsfw/subsystem/Subsystem.cpp diff --git a/inc/fsfw/subsystem/Subsystem.h b/src/fsfw/subsystem/Subsystem.h similarity index 100% rename from inc/fsfw/subsystem/Subsystem.h rename to src/fsfw/subsystem/Subsystem.h diff --git a/src/core/subsystem/SubsystemBase.cpp b/src/fsfw/subsystem/SubsystemBase.cpp similarity index 100% rename from src/core/subsystem/SubsystemBase.cpp rename to src/fsfw/subsystem/SubsystemBase.cpp diff --git a/inc/fsfw/subsystem/SubsystemBase.h b/src/fsfw/subsystem/SubsystemBase.h similarity index 100% rename from inc/fsfw/subsystem/SubsystemBase.h rename to src/fsfw/subsystem/SubsystemBase.h diff --git a/src/core/subsystem/modes/CMakeLists.txt b/src/fsfw/subsystem/modes/CMakeLists.txt similarity index 100% rename from src/core/subsystem/modes/CMakeLists.txt rename to src/fsfw/subsystem/modes/CMakeLists.txt diff --git a/inc/fsfw/subsystem/modes/HasModeSequenceIF.h b/src/fsfw/subsystem/modes/HasModeSequenceIF.h similarity index 100% rename from inc/fsfw/subsystem/modes/HasModeSequenceIF.h rename to src/fsfw/subsystem/modes/HasModeSequenceIF.h diff --git a/inc/fsfw/subsystem/modes/ModeDefinitions.h b/src/fsfw/subsystem/modes/ModeDefinitions.h similarity index 100% rename from inc/fsfw/subsystem/modes/ModeDefinitions.h rename to src/fsfw/subsystem/modes/ModeDefinitions.h diff --git a/src/core/subsystem/modes/ModeSequenceMessage.cpp b/src/fsfw/subsystem/modes/ModeSequenceMessage.cpp similarity index 100% rename from src/core/subsystem/modes/ModeSequenceMessage.cpp rename to src/fsfw/subsystem/modes/ModeSequenceMessage.cpp diff --git a/inc/fsfw/subsystem/modes/ModeSequenceMessage.h b/src/fsfw/subsystem/modes/ModeSequenceMessage.h similarity index 100% rename from inc/fsfw/subsystem/modes/ModeSequenceMessage.h rename to src/fsfw/subsystem/modes/ModeSequenceMessage.h diff --git a/src/core/subsystem/modes/ModeStore.cpp b/src/fsfw/subsystem/modes/ModeStore.cpp similarity index 100% rename from src/core/subsystem/modes/ModeStore.cpp rename to src/fsfw/subsystem/modes/ModeStore.cpp diff --git a/inc/fsfw/subsystem/modes/ModeStore.h b/src/fsfw/subsystem/modes/ModeStore.h similarity index 100% rename from inc/fsfw/subsystem/modes/ModeStore.h rename to src/fsfw/subsystem/modes/ModeStore.h diff --git a/inc/fsfw/subsystem/modes/ModeStoreIF.h b/src/fsfw/subsystem/modes/ModeStoreIF.h similarity index 100% rename from inc/fsfw/subsystem/modes/ModeStoreIF.h rename to src/fsfw/subsystem/modes/ModeStoreIF.h diff --git a/src/core/tasks/CMakeLists.txt b/src/fsfw/tasks/CMakeLists.txt similarity index 100% rename from src/core/tasks/CMakeLists.txt rename to src/fsfw/tasks/CMakeLists.txt diff --git a/inc/fsfw/tasks/ExecutableObjectIF.h b/src/fsfw/tasks/ExecutableObjectIF.h similarity index 100% rename from inc/fsfw/tasks/ExecutableObjectIF.h rename to src/fsfw/tasks/ExecutableObjectIF.h diff --git a/src/core/tasks/FixedSequenceSlot.cpp b/src/fsfw/tasks/FixedSequenceSlot.cpp similarity index 100% rename from src/core/tasks/FixedSequenceSlot.cpp rename to src/fsfw/tasks/FixedSequenceSlot.cpp diff --git a/inc/fsfw/tasks/FixedSequenceSlot.h b/src/fsfw/tasks/FixedSequenceSlot.h similarity index 100% rename from inc/fsfw/tasks/FixedSequenceSlot.h rename to src/fsfw/tasks/FixedSequenceSlot.h diff --git a/src/core/tasks/FixedSlotSequence.cpp b/src/fsfw/tasks/FixedSlotSequence.cpp similarity index 100% rename from src/core/tasks/FixedSlotSequence.cpp rename to src/fsfw/tasks/FixedSlotSequence.cpp diff --git a/inc/fsfw/tasks/FixedSlotSequence.h b/src/fsfw/tasks/FixedSlotSequence.h similarity index 100% rename from inc/fsfw/tasks/FixedSlotSequence.h rename to src/fsfw/tasks/FixedSlotSequence.h diff --git a/inc/fsfw/tasks/FixedTimeslotTaskIF.h b/src/fsfw/tasks/FixedTimeslotTaskIF.h similarity index 100% rename from inc/fsfw/tasks/FixedTimeslotTaskIF.h rename to src/fsfw/tasks/FixedTimeslotTaskIF.h diff --git a/inc/fsfw/tasks/PeriodicTaskIF.h b/src/fsfw/tasks/PeriodicTaskIF.h similarity index 100% rename from inc/fsfw/tasks/PeriodicTaskIF.h rename to src/fsfw/tasks/PeriodicTaskIF.h diff --git a/inc/fsfw/tasks/SemaphoreFactory.h b/src/fsfw/tasks/SemaphoreFactory.h similarity index 100% rename from inc/fsfw/tasks/SemaphoreFactory.h rename to src/fsfw/tasks/SemaphoreFactory.h diff --git a/inc/fsfw/tasks/SemaphoreIF.h b/src/fsfw/tasks/SemaphoreIF.h similarity index 100% rename from inc/fsfw/tasks/SemaphoreIF.h rename to src/fsfw/tasks/SemaphoreIF.h diff --git a/inc/fsfw/tasks/TaskFactory.h b/src/fsfw/tasks/TaskFactory.h similarity index 100% rename from inc/fsfw/tasks/TaskFactory.h rename to src/fsfw/tasks/TaskFactory.h diff --git a/inc/fsfw/tasks/Typedef.h b/src/fsfw/tasks/Typedef.h similarity index 100% rename from inc/fsfw/tasks/Typedef.h rename to src/fsfw/tasks/Typedef.h diff --git a/src/core/tcdistribution/CCSDSDistributor.cpp b/src/fsfw/tcdistribution/CCSDSDistributor.cpp similarity index 100% rename from src/core/tcdistribution/CCSDSDistributor.cpp rename to src/fsfw/tcdistribution/CCSDSDistributor.cpp diff --git a/inc/fsfw/tcdistribution/CCSDSDistributor.h b/src/fsfw/tcdistribution/CCSDSDistributor.h similarity index 100% rename from inc/fsfw/tcdistribution/CCSDSDistributor.h rename to src/fsfw/tcdistribution/CCSDSDistributor.h diff --git a/inc/fsfw/tcdistribution/CCSDSDistributorIF.h b/src/fsfw/tcdistribution/CCSDSDistributorIF.h similarity index 100% rename from inc/fsfw/tcdistribution/CCSDSDistributorIF.h rename to src/fsfw/tcdistribution/CCSDSDistributorIF.h diff --git a/src/core/tcdistribution/CFDPDistributor.cpp b/src/fsfw/tcdistribution/CFDPDistributor.cpp similarity index 100% rename from src/core/tcdistribution/CFDPDistributor.cpp rename to src/fsfw/tcdistribution/CFDPDistributor.cpp diff --git a/inc/fsfw/tcdistribution/CFDPDistributor.h b/src/fsfw/tcdistribution/CFDPDistributor.h similarity index 100% rename from inc/fsfw/tcdistribution/CFDPDistributor.h rename to src/fsfw/tcdistribution/CFDPDistributor.h diff --git a/inc/fsfw/tcdistribution/CFDPDistributorIF.h b/src/fsfw/tcdistribution/CFDPDistributorIF.h similarity index 100% rename from inc/fsfw/tcdistribution/CFDPDistributorIF.h rename to src/fsfw/tcdistribution/CFDPDistributorIF.h diff --git a/src/core/tcdistribution/CMakeLists.txt b/src/fsfw/tcdistribution/CMakeLists.txt similarity index 100% rename from src/core/tcdistribution/CMakeLists.txt rename to src/fsfw/tcdistribution/CMakeLists.txt diff --git a/src/core/tcdistribution/PUSDistributor.cpp b/src/fsfw/tcdistribution/PUSDistributor.cpp similarity index 100% rename from src/core/tcdistribution/PUSDistributor.cpp rename to src/fsfw/tcdistribution/PUSDistributor.cpp diff --git a/inc/fsfw/tcdistribution/PUSDistributor.h b/src/fsfw/tcdistribution/PUSDistributor.h similarity index 100% rename from inc/fsfw/tcdistribution/PUSDistributor.h rename to src/fsfw/tcdistribution/PUSDistributor.h diff --git a/inc/fsfw/tcdistribution/PUSDistributorIF.h b/src/fsfw/tcdistribution/PUSDistributorIF.h similarity index 100% rename from inc/fsfw/tcdistribution/PUSDistributorIF.h rename to src/fsfw/tcdistribution/PUSDistributorIF.h diff --git a/src/core/tcdistribution/TcDistributor.cpp b/src/fsfw/tcdistribution/TcDistributor.cpp similarity index 100% rename from src/core/tcdistribution/TcDistributor.cpp rename to src/fsfw/tcdistribution/TcDistributor.cpp diff --git a/inc/fsfw/tcdistribution/TcDistributor.h b/src/fsfw/tcdistribution/TcDistributor.h similarity index 100% rename from inc/fsfw/tcdistribution/TcDistributor.h rename to src/fsfw/tcdistribution/TcDistributor.h diff --git a/src/core/tcdistribution/TcPacketCheck.cpp b/src/fsfw/tcdistribution/TcPacketCheck.cpp similarity index 100% rename from src/core/tcdistribution/TcPacketCheck.cpp rename to src/fsfw/tcdistribution/TcPacketCheck.cpp diff --git a/inc/fsfw/tcdistribution/TcPacketCheck.h b/src/fsfw/tcdistribution/TcPacketCheck.h similarity index 94% rename from inc/fsfw/tcdistribution/TcPacketCheck.h rename to src/fsfw/tcdistribution/TcPacketCheck.h index 7106b7e4..519943c7 100644 --- a/inc/fsfw/tcdistribution/TcPacketCheck.h +++ b/src/fsfw/tcdistribution/TcPacketCheck.h @@ -1,9 +1,9 @@ #ifndef FSFW_TCDISTRIBUTION_TCPACKETCHECK_H_ #define FSFW_TCDISTRIBUTION_TCPACKETCHECK_H_ -#include "../FSFW.h" -#include "../returnvalues/HasReturnvaluesIF.h" -#include "../tmtcservices/PusVerificationReport.h" +#include "fsfw/FSFW.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" +#include "fsfw/tmtcservices/PusVerificationReport.h" class TcPacketStoredBase; diff --git a/src/core/thermal/AbstractTemperatureSensor.cpp b/src/fsfw/thermal/AbstractTemperatureSensor.cpp similarity index 100% rename from src/core/thermal/AbstractTemperatureSensor.cpp rename to src/fsfw/thermal/AbstractTemperatureSensor.cpp diff --git a/inc/fsfw/thermal/AbstractTemperatureSensor.h b/src/fsfw/thermal/AbstractTemperatureSensor.h similarity index 100% rename from inc/fsfw/thermal/AbstractTemperatureSensor.h rename to src/fsfw/thermal/AbstractTemperatureSensor.h diff --git a/inc/fsfw/thermal/AcceptsThermalMessagesIF.h b/src/fsfw/thermal/AcceptsThermalMessagesIF.h similarity index 100% rename from inc/fsfw/thermal/AcceptsThermalMessagesIF.h rename to src/fsfw/thermal/AcceptsThermalMessagesIF.h diff --git a/src/core/thermal/CMakeLists.txt b/src/fsfw/thermal/CMakeLists.txt similarity index 100% rename from src/core/thermal/CMakeLists.txt rename to src/fsfw/thermal/CMakeLists.txt diff --git a/src/core/thermal/Heater.cpp b/src/fsfw/thermal/Heater.cpp similarity index 100% rename from src/core/thermal/Heater.cpp rename to src/fsfw/thermal/Heater.cpp diff --git a/inc/fsfw/thermal/Heater.h b/src/fsfw/thermal/Heater.h similarity index 100% rename from inc/fsfw/thermal/Heater.h rename to src/fsfw/thermal/Heater.h diff --git a/src/core/thermal/RedundantHeater.cpp b/src/fsfw/thermal/RedundantHeater.cpp similarity index 100% rename from src/core/thermal/RedundantHeater.cpp rename to src/fsfw/thermal/RedundantHeater.cpp diff --git a/inc/fsfw/thermal/RedundantHeater.h b/src/fsfw/thermal/RedundantHeater.h similarity index 100% rename from inc/fsfw/thermal/RedundantHeater.h rename to src/fsfw/thermal/RedundantHeater.h diff --git a/inc/fsfw/thermal/TemperatureSensor.h b/src/fsfw/thermal/TemperatureSensor.h similarity index 100% rename from inc/fsfw/thermal/TemperatureSensor.h rename to src/fsfw/thermal/TemperatureSensor.h diff --git a/src/core/thermal/ThermalComponent.cpp b/src/fsfw/thermal/ThermalComponent.cpp similarity index 100% rename from src/core/thermal/ThermalComponent.cpp rename to src/fsfw/thermal/ThermalComponent.cpp diff --git a/inc/fsfw/thermal/ThermalComponent.h b/src/fsfw/thermal/ThermalComponent.h similarity index 100% rename from inc/fsfw/thermal/ThermalComponent.h rename to src/fsfw/thermal/ThermalComponent.h diff --git a/src/core/thermal/ThermalComponentCore.cpp b/src/fsfw/thermal/ThermalComponentCore.cpp similarity index 100% rename from src/core/thermal/ThermalComponentCore.cpp rename to src/fsfw/thermal/ThermalComponentCore.cpp diff --git a/inc/fsfw/thermal/ThermalComponentCore.h b/src/fsfw/thermal/ThermalComponentCore.h similarity index 100% rename from inc/fsfw/thermal/ThermalComponentCore.h rename to src/fsfw/thermal/ThermalComponentCore.h diff --git a/inc/fsfw/thermal/ThermalComponentIF.h b/src/fsfw/thermal/ThermalComponentIF.h similarity index 100% rename from inc/fsfw/thermal/ThermalComponentIF.h rename to src/fsfw/thermal/ThermalComponentIF.h diff --git a/src/core/thermal/ThermalModule.cpp b/src/fsfw/thermal/ThermalModule.cpp similarity index 100% rename from src/core/thermal/ThermalModule.cpp rename to src/fsfw/thermal/ThermalModule.cpp diff --git a/inc/fsfw/thermal/ThermalModule.h b/src/fsfw/thermal/ThermalModule.h similarity index 100% rename from inc/fsfw/thermal/ThermalModule.h rename to src/fsfw/thermal/ThermalModule.h diff --git a/inc/fsfw/thermal/ThermalModuleIF.h b/src/fsfw/thermal/ThermalModuleIF.h similarity index 100% rename from inc/fsfw/thermal/ThermalModuleIF.h rename to src/fsfw/thermal/ThermalModuleIF.h diff --git a/src/core/thermal/ThermalMonitorReporter.cpp b/src/fsfw/thermal/ThermalMonitorReporter.cpp similarity index 100% rename from src/core/thermal/ThermalMonitorReporter.cpp rename to src/fsfw/thermal/ThermalMonitorReporter.cpp diff --git a/inc/fsfw/thermal/ThermalMonitorReporter.h b/src/fsfw/thermal/ThermalMonitorReporter.h similarity index 100% rename from inc/fsfw/thermal/ThermalMonitorReporter.h rename to src/fsfw/thermal/ThermalMonitorReporter.h diff --git a/inc/fsfw/thermal/tcsDefinitions.h b/src/fsfw/thermal/tcsDefinitions.h similarity index 100% rename from inc/fsfw/thermal/tcsDefinitions.h rename to src/fsfw/thermal/tcsDefinitions.h diff --git a/src/core/timemanager/CCSDSTime.cpp b/src/fsfw/timemanager/CCSDSTime.cpp similarity index 100% rename from src/core/timemanager/CCSDSTime.cpp rename to src/fsfw/timemanager/CCSDSTime.cpp diff --git a/inc/fsfw/timemanager/CCSDSTime.h b/src/fsfw/timemanager/CCSDSTime.h similarity index 100% rename from inc/fsfw/timemanager/CCSDSTime.h rename to src/fsfw/timemanager/CCSDSTime.h diff --git a/src/core/timemanager/CMakeLists.txt b/src/fsfw/timemanager/CMakeLists.txt similarity index 100% rename from src/core/timemanager/CMakeLists.txt rename to src/fsfw/timemanager/CMakeLists.txt diff --git a/inc/fsfw/timemanager/Clock.h b/src/fsfw/timemanager/Clock.h similarity index 100% rename from inc/fsfw/timemanager/Clock.h rename to src/fsfw/timemanager/Clock.h diff --git a/src/core/timemanager/ClockCommon.cpp b/src/fsfw/timemanager/ClockCommon.cpp similarity index 100% rename from src/core/timemanager/ClockCommon.cpp rename to src/fsfw/timemanager/ClockCommon.cpp diff --git a/src/core/timemanager/Countdown.cpp b/src/fsfw/timemanager/Countdown.cpp similarity index 100% rename from src/core/timemanager/Countdown.cpp rename to src/fsfw/timemanager/Countdown.cpp diff --git a/inc/fsfw/timemanager/Countdown.h b/src/fsfw/timemanager/Countdown.h similarity index 100% rename from inc/fsfw/timemanager/Countdown.h rename to src/fsfw/timemanager/Countdown.h diff --git a/inc/fsfw/timemanager/ReceivesTimeInfoIF.h b/src/fsfw/timemanager/ReceivesTimeInfoIF.h similarity index 100% rename from inc/fsfw/timemanager/ReceivesTimeInfoIF.h rename to src/fsfw/timemanager/ReceivesTimeInfoIF.h diff --git a/src/core/timemanager/Stopwatch.cpp b/src/fsfw/timemanager/Stopwatch.cpp similarity index 100% rename from src/core/timemanager/Stopwatch.cpp rename to src/fsfw/timemanager/Stopwatch.cpp diff --git a/inc/fsfw/timemanager/Stopwatch.h b/src/fsfw/timemanager/Stopwatch.h similarity index 100% rename from inc/fsfw/timemanager/Stopwatch.h rename to src/fsfw/timemanager/Stopwatch.h diff --git a/src/core/timemanager/TimeMessage.cpp b/src/fsfw/timemanager/TimeMessage.cpp similarity index 100% rename from src/core/timemanager/TimeMessage.cpp rename to src/fsfw/timemanager/TimeMessage.cpp diff --git a/inc/fsfw/timemanager/TimeMessage.h b/src/fsfw/timemanager/TimeMessage.h similarity index 100% rename from inc/fsfw/timemanager/TimeMessage.h rename to src/fsfw/timemanager/TimeMessage.h diff --git a/src/core/timemanager/TimeStamper.cpp b/src/fsfw/timemanager/TimeStamper.cpp similarity index 100% rename from src/core/timemanager/TimeStamper.cpp rename to src/fsfw/timemanager/TimeStamper.cpp diff --git a/inc/fsfw/timemanager/TimeStamper.h b/src/fsfw/timemanager/TimeStamper.h similarity index 100% rename from inc/fsfw/timemanager/TimeStamper.h rename to src/fsfw/timemanager/TimeStamper.h diff --git a/inc/fsfw/timemanager/TimeStamperIF.h b/src/fsfw/timemanager/TimeStamperIF.h similarity index 100% rename from inc/fsfw/timemanager/TimeStamperIF.h rename to src/fsfw/timemanager/TimeStamperIF.h diff --git a/inc/fsfw/timemanager/clockDefinitions.h b/src/fsfw/timemanager/clockDefinitions.h similarity index 100% rename from inc/fsfw/timemanager/clockDefinitions.h rename to src/fsfw/timemanager/clockDefinitions.h diff --git a/src/opt/tmstorage/CMakeLists.txt b/src/fsfw/tmstorage/CMakeLists.txt similarity index 100% rename from src/opt/tmstorage/CMakeLists.txt rename to src/fsfw/tmstorage/CMakeLists.txt diff --git a/inc/fsfw/tmstorage/TmStoreBackendIF.h b/src/fsfw/tmstorage/TmStoreBackendIF.h similarity index 95% rename from inc/fsfw/tmstorage/TmStoreBackendIF.h rename to src/fsfw/tmstorage/TmStoreBackendIF.h index 4ae77609..4183334b 100644 --- a/inc/fsfw/tmstorage/TmStoreBackendIF.h +++ b/src/fsfw/tmstorage/TmStoreBackendIF.h @@ -1,11 +1,13 @@ #ifndef FSFW_TMTCSERVICES_TMSTOREBACKENDIF_H_ #define FSFW_TMTCSERVICES_TMSTOREBACKENDIF_H_ -#include "../returnvalues/HasReturnvaluesIF.h" -#include "../objectmanager/SystemObjectIF.h" -#include "../parameters/HasParametersIF.h" -#include "../storagemanager/StorageManagerIF.h" -#include "../timemanager/Clock.h" +#include "tmStorageConf.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" +#include "fsfw/objectmanager/SystemObjectIF.h" +#include "fsfw/parameters/HasParametersIF.h" +#include "fsfw/storagemanager/StorageManagerIF.h" +#include "fsfw/timemanager/Clock.h" + class TmPacketInformation; class TmPacketMinimal; class SpacePacketBase; diff --git a/inc/fsfw/tmstorage/TmStoreFrontendIF.h b/src/fsfw/tmstorage/TmStoreFrontendIF.h similarity index 95% rename from inc/fsfw/tmstorage/TmStoreFrontendIF.h rename to src/fsfw/tmstorage/TmStoreFrontendIF.h index beee7ede..11b2a686 100644 --- a/inc/fsfw/tmstorage/TmStoreFrontendIF.h +++ b/src/fsfw/tmstorage/TmStoreFrontendIF.h @@ -1,9 +1,10 @@ #ifndef FSFW_TMTCSERVICES_TMSTOREFRONTENDIF_H_ #define FSFW_TMTCSERVICES_TMSTOREFRONTENDIF_H_ +#include "tmStorageConf.h" #include "TmStorePackets.h" -#include "../returnvalues/HasReturnvaluesIF.h" -#include "../ipc/MessageQueueSenderIF.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" +#include "fsfw/ipc/MessageQueueSenderIF.h" class TmPacketMinimal; class SpacePacketBase; diff --git a/src/opt/tmstorage/TmStoreMessage.cpp b/src/fsfw/tmstorage/TmStoreMessage.cpp similarity index 99% rename from src/opt/tmstorage/TmStoreMessage.cpp rename to src/fsfw/tmstorage/TmStoreMessage.cpp index f63a4757..fa5fb541 100644 --- a/src/opt/tmstorage/TmStoreMessage.cpp +++ b/src/fsfw/tmstorage/TmStoreMessage.cpp @@ -1,4 +1,4 @@ -#include "fsfw/tmstorage/TmStoreMessage.h" +#include "TmStoreMessage.h" #include "fsfw/objectmanager/ObjectManager.h" TmStoreMessage::~TmStoreMessage() { diff --git a/inc/fsfw/tmstorage/TmStoreMessage.h b/src/fsfw/tmstorage/TmStoreMessage.h similarity index 95% rename from inc/fsfw/tmstorage/TmStoreMessage.h rename to src/fsfw/tmstorage/TmStoreMessage.h index d0178920..51f86b3a 100644 --- a/inc/fsfw/tmstorage/TmStoreMessage.h +++ b/src/fsfw/tmstorage/TmStoreMessage.h @@ -1,10 +1,11 @@ #ifndef FSFW_TMSTORAGE_TMSTOREMESSAGE_H_ #define FSFW_TMSTORAGE_TMSTOREMESSAGE_H_ +#include "tmStorageConf.h" #include "TmStorePackets.h" -#include "../ipc/CommandMessage.h" -#include "../storagemanager/StorageManagerIF.h" -#include "../objectmanager/SystemObjectIF.h" +#include "fsfw/ipc/CommandMessage.h" +#include "fsfw/storagemanager/StorageManagerIF.h" +#include "fsfw/objectmanager/SystemObjectIF.h" class TmStoreMessage { public: diff --git a/inc/fsfw/tmstorage/TmStorePackets.h b/src/fsfw/tmstorage/TmStorePackets.h similarity index 95% rename from inc/fsfw/tmstorage/TmStorePackets.h rename to src/fsfw/tmstorage/TmStorePackets.h index 53a5d8d6..738f7ac2 100644 --- a/inc/fsfw/tmstorage/TmStorePackets.h +++ b/src/fsfw/tmstorage/TmStorePackets.h @@ -1,14 +1,15 @@ #ifndef FSFW_TMSTORAGE_TMSTOREPACKETS_H_ #define FSFW_TMSTORAGE_TMSTOREPACKETS_H_ -#include "../serialize/SerialFixedArrayListAdapter.h" -#include "../serialize/SerializeElement.h" -#include "../serialize/SerialLinkedListAdapter.h" -#include "../serialize/SerialBufferAdapter.h" -#include "../tmtcpacket/pus/tm/TmPacketMinimal.h" -#include "../timemanager/TimeStamperIF.h" -#include "../timemanager/CCSDSTime.h" -#include "../globalfunctions/timevalOperations.h" +#include "tmStorageConf.h" +#include "fsfw/serialize/SerialFixedArrayListAdapter.h" +#include "fsfw/serialize/SerializeElement.h" +#include "fsfw/serialize/SerialLinkedListAdapter.h" +#include "fsfw/serialize/SerialBufferAdapter.h" +#include "fsfw/tmtcpacket/pus/tm/TmPacketMinimal.h" +#include "fsfw/timemanager/TimeStamperIF.h" +#include "fsfw/timemanager/CCSDSTime.h" +#include "fsfw/globalfunctions/timevalOperations.h" class ServiceSubservice: public SerialLinkedListAdapter { public: diff --git a/src/fsfw/tmstorage/tmStorageConf.h b/src/fsfw/tmstorage/tmStorageConf.h new file mode 100644 index 00000000..e5c3d0d5 --- /dev/null +++ b/src/fsfw/tmstorage/tmStorageConf.h @@ -0,0 +1,11 @@ +#ifndef FSFW_TMSTORAGE_TMSTORAGECONF_H_ +#define FSFW_TMSTORAGE_TMSTORAGECONF_H_ + +#include "fsfw/FSFW.h" + +#ifndef FSFW_ADD_TMSTORAGE +#warning TM storage files were includes but compilation was \ + not enabled with FSFW_ADD_TMSTORAGE +#endif + +#endif /* FSFW_TMSTORAGE_TMSTORAGECONF_H_ */ diff --git a/src/core/tmtcpacket/CMakeLists.txt b/src/fsfw/tmtcpacket/CMakeLists.txt similarity index 100% rename from src/core/tmtcpacket/CMakeLists.txt rename to src/fsfw/tmtcpacket/CMakeLists.txt diff --git a/src/core/tmtcpacket/SpacePacket.cpp b/src/fsfw/tmtcpacket/SpacePacket.cpp similarity index 100% rename from src/core/tmtcpacket/SpacePacket.cpp rename to src/fsfw/tmtcpacket/SpacePacket.cpp diff --git a/inc/fsfw/tmtcpacket/SpacePacket.h b/src/fsfw/tmtcpacket/SpacePacket.h similarity index 100% rename from inc/fsfw/tmtcpacket/SpacePacket.h rename to src/fsfw/tmtcpacket/SpacePacket.h diff --git a/src/core/tmtcpacket/SpacePacketBase.cpp b/src/fsfw/tmtcpacket/SpacePacketBase.cpp similarity index 100% rename from src/core/tmtcpacket/SpacePacketBase.cpp rename to src/fsfw/tmtcpacket/SpacePacketBase.cpp diff --git a/inc/fsfw/tmtcpacket/SpacePacketBase.h b/src/fsfw/tmtcpacket/SpacePacketBase.h similarity index 100% rename from inc/fsfw/tmtcpacket/SpacePacketBase.h rename to src/fsfw/tmtcpacket/SpacePacketBase.h diff --git a/inc/fsfw/tmtcpacket/ccsds_header.h b/src/fsfw/tmtcpacket/ccsds_header.h similarity index 100% rename from inc/fsfw/tmtcpacket/ccsds_header.h rename to src/fsfw/tmtcpacket/ccsds_header.h diff --git a/inc/fsfw/tmtcpacket/packetmatcher/ApidMatcher.h b/src/fsfw/tmtcpacket/packetmatcher/ApidMatcher.h similarity index 100% rename from inc/fsfw/tmtcpacket/packetmatcher/ApidMatcher.h rename to src/fsfw/tmtcpacket/packetmatcher/ApidMatcher.h diff --git a/src/core/tmtcpacket/packetmatcher/CMakeLists.txt b/src/fsfw/tmtcpacket/packetmatcher/CMakeLists.txt similarity index 100% rename from src/core/tmtcpacket/packetmatcher/CMakeLists.txt rename to src/fsfw/tmtcpacket/packetmatcher/CMakeLists.txt diff --git a/src/core/tmtcpacket/packetmatcher/PacketMatchTree.cpp b/src/fsfw/tmtcpacket/packetmatcher/PacketMatchTree.cpp similarity index 100% rename from src/core/tmtcpacket/packetmatcher/PacketMatchTree.cpp rename to src/fsfw/tmtcpacket/packetmatcher/PacketMatchTree.cpp diff --git a/inc/fsfw/tmtcpacket/packetmatcher/PacketMatchTree.h b/src/fsfw/tmtcpacket/packetmatcher/PacketMatchTree.h similarity index 100% rename from inc/fsfw/tmtcpacket/packetmatcher/PacketMatchTree.h rename to src/fsfw/tmtcpacket/packetmatcher/PacketMatchTree.h diff --git a/inc/fsfw/tmtcpacket/packetmatcher/ServiceMatcher.h b/src/fsfw/tmtcpacket/packetmatcher/ServiceMatcher.h similarity index 100% rename from inc/fsfw/tmtcpacket/packetmatcher/ServiceMatcher.h rename to src/fsfw/tmtcpacket/packetmatcher/ServiceMatcher.h diff --git a/inc/fsfw/tmtcpacket/packetmatcher/SubserviceMatcher.h b/src/fsfw/tmtcpacket/packetmatcher/SubserviceMatcher.h similarity index 100% rename from inc/fsfw/tmtcpacket/packetmatcher/SubserviceMatcher.h rename to src/fsfw/tmtcpacket/packetmatcher/SubserviceMatcher.h diff --git a/src/core/tmtcpacket/pus/CMakeLists.txt b/src/fsfw/tmtcpacket/pus/CMakeLists.txt similarity index 100% rename from src/core/tmtcpacket/pus/CMakeLists.txt rename to src/fsfw/tmtcpacket/pus/CMakeLists.txt diff --git a/inc/fsfw/tmtcpacket/pus/PacketTimestampInterpreterIF.h b/src/fsfw/tmtcpacket/pus/PacketTimestampInterpreterIF.h similarity index 100% rename from inc/fsfw/tmtcpacket/pus/PacketTimestampInterpreterIF.h rename to src/fsfw/tmtcpacket/pus/PacketTimestampInterpreterIF.h diff --git a/inc/fsfw/tmtcpacket/pus/tc.h b/src/fsfw/tmtcpacket/pus/tc.h similarity index 100% rename from inc/fsfw/tmtcpacket/pus/tc.h rename to src/fsfw/tmtcpacket/pus/tc.h diff --git a/src/core/tmtcpacket/pus/tc/CMakeLists.txt b/src/fsfw/tmtcpacket/pus/tc/CMakeLists.txt similarity index 100% rename from src/core/tmtcpacket/pus/tc/CMakeLists.txt rename to src/fsfw/tmtcpacket/pus/tc/CMakeLists.txt diff --git a/src/core/tmtcpacket/pus/tc/TcPacketBase.cpp b/src/fsfw/tmtcpacket/pus/tc/TcPacketBase.cpp similarity index 100% rename from src/core/tmtcpacket/pus/tc/TcPacketBase.cpp rename to src/fsfw/tmtcpacket/pus/tc/TcPacketBase.cpp diff --git a/inc/fsfw/tmtcpacket/pus/tc/TcPacketBase.h b/src/fsfw/tmtcpacket/pus/tc/TcPacketBase.h similarity index 100% rename from inc/fsfw/tmtcpacket/pus/tc/TcPacketBase.h rename to src/fsfw/tmtcpacket/pus/tc/TcPacketBase.h diff --git a/src/core/tmtcpacket/pus/tc/TcPacketPus.cpp b/src/fsfw/tmtcpacket/pus/tc/TcPacketPus.cpp similarity index 100% rename from src/core/tmtcpacket/pus/tc/TcPacketPus.cpp rename to src/fsfw/tmtcpacket/pus/tc/TcPacketPus.cpp diff --git a/inc/fsfw/tmtcpacket/pus/tc/TcPacketPus.h b/src/fsfw/tmtcpacket/pus/tc/TcPacketPus.h similarity index 97% rename from inc/fsfw/tmtcpacket/pus/tc/TcPacketPus.h rename to src/fsfw/tmtcpacket/pus/tc/TcPacketPus.h index 7a28a957..082541ba 100644 --- a/inc/fsfw/tmtcpacket/pus/tc/TcPacketPus.h +++ b/src/fsfw/tmtcpacket/pus/tc/TcPacketPus.h @@ -1,8 +1,8 @@ #ifndef FSFW_TMTCPACKET_PUS_TCPACKETPUSA_H_ #define FSFW_TMTCPACKET_PUS_TCPACKETPUSA_H_ -#include "../../../FSFW.h" -#include "../../ccsds_header.h" +#include "fsfw/FSFW.h" +#include "fsfw/tmtcpacket/ccsds_header.h" #include "TcPacketBase.h" #include diff --git a/src/core/tmtcpacket/pus/tc/TcPacketStoredBase.cpp b/src/fsfw/tmtcpacket/pus/tc/TcPacketStoredBase.cpp similarity index 100% rename from src/core/tmtcpacket/pus/tc/TcPacketStoredBase.cpp rename to src/fsfw/tmtcpacket/pus/tc/TcPacketStoredBase.cpp diff --git a/inc/fsfw/tmtcpacket/pus/tc/TcPacketStoredBase.h b/src/fsfw/tmtcpacket/pus/tc/TcPacketStoredBase.h similarity index 100% rename from inc/fsfw/tmtcpacket/pus/tc/TcPacketStoredBase.h rename to src/fsfw/tmtcpacket/pus/tc/TcPacketStoredBase.h diff --git a/inc/fsfw/tmtcpacket/pus/tc/TcPacketStoredIF.h b/src/fsfw/tmtcpacket/pus/tc/TcPacketStoredIF.h similarity index 100% rename from inc/fsfw/tmtcpacket/pus/tc/TcPacketStoredIF.h rename to src/fsfw/tmtcpacket/pus/tc/TcPacketStoredIF.h diff --git a/src/core/tmtcpacket/pus/tc/TcPacketStoredPus.cpp b/src/fsfw/tmtcpacket/pus/tc/TcPacketStoredPus.cpp similarity index 100% rename from src/core/tmtcpacket/pus/tc/TcPacketStoredPus.cpp rename to src/fsfw/tmtcpacket/pus/tc/TcPacketStoredPus.cpp diff --git a/inc/fsfw/tmtcpacket/pus/tc/TcPacketStoredPus.h b/src/fsfw/tmtcpacket/pus/tc/TcPacketStoredPus.h similarity index 100% rename from inc/fsfw/tmtcpacket/pus/tc/TcPacketStoredPus.h rename to src/fsfw/tmtcpacket/pus/tc/TcPacketStoredPus.h diff --git a/inc/fsfw/tmtcpacket/pus/tm.h b/src/fsfw/tmtcpacket/pus/tm.h similarity index 92% rename from inc/fsfw/tmtcpacket/pus/tm.h rename to src/fsfw/tmtcpacket/pus/tm.h index 591ada7c..afbe8251 100644 --- a/inc/fsfw/tmtcpacket/pus/tm.h +++ b/src/fsfw/tmtcpacket/pus/tm.h @@ -1,7 +1,7 @@ #ifndef FSFW_TMTCPACKET_PUS_TM_H_ #define FSFW_TMTCPACKET_PUS_TM_H_ -#include "../../FSFW.h" +#include "fsfw/FSFW.h" #if FSFW_USE_PUS_C_TELEMETRY == 1 #include "tm/TmPacketPusC.h" diff --git a/src/core/tmtcpacket/pus/tm/CMakeLists.txt b/src/fsfw/tmtcpacket/pus/tm/CMakeLists.txt similarity index 100% rename from src/core/tmtcpacket/pus/tm/CMakeLists.txt rename to src/fsfw/tmtcpacket/pus/tm/CMakeLists.txt diff --git a/src/core/tmtcpacket/pus/tm/TmPacketBase.cpp b/src/fsfw/tmtcpacket/pus/tm/TmPacketBase.cpp similarity index 100% rename from src/core/tmtcpacket/pus/tm/TmPacketBase.cpp rename to src/fsfw/tmtcpacket/pus/tm/TmPacketBase.cpp diff --git a/inc/fsfw/tmtcpacket/pus/tm/TmPacketBase.h b/src/fsfw/tmtcpacket/pus/tm/TmPacketBase.h similarity index 100% rename from inc/fsfw/tmtcpacket/pus/tm/TmPacketBase.h rename to src/fsfw/tmtcpacket/pus/tm/TmPacketBase.h diff --git a/src/core/tmtcpacket/pus/tm/TmPacketMinimal.cpp b/src/fsfw/tmtcpacket/pus/tm/TmPacketMinimal.cpp similarity index 100% rename from src/core/tmtcpacket/pus/tm/TmPacketMinimal.cpp rename to src/fsfw/tmtcpacket/pus/tm/TmPacketMinimal.cpp diff --git a/inc/fsfw/tmtcpacket/pus/tm/TmPacketMinimal.h b/src/fsfw/tmtcpacket/pus/tm/TmPacketMinimal.h similarity index 100% rename from inc/fsfw/tmtcpacket/pus/tm/TmPacketMinimal.h rename to src/fsfw/tmtcpacket/pus/tm/TmPacketMinimal.h diff --git a/src/core/tmtcpacket/pus/tm/TmPacketPusA.cpp b/src/fsfw/tmtcpacket/pus/tm/TmPacketPusA.cpp similarity index 100% rename from src/core/tmtcpacket/pus/tm/TmPacketPusA.cpp rename to src/fsfw/tmtcpacket/pus/tm/TmPacketPusA.cpp diff --git a/inc/fsfw/tmtcpacket/pus/tm/TmPacketPusA.h b/src/fsfw/tmtcpacket/pus/tm/TmPacketPusA.h similarity index 100% rename from inc/fsfw/tmtcpacket/pus/tm/TmPacketPusA.h rename to src/fsfw/tmtcpacket/pus/tm/TmPacketPusA.h diff --git a/src/core/tmtcpacket/pus/tm/TmPacketPusC.cpp b/src/fsfw/tmtcpacket/pus/tm/TmPacketPusC.cpp similarity index 100% rename from src/core/tmtcpacket/pus/tm/TmPacketPusC.cpp rename to src/fsfw/tmtcpacket/pus/tm/TmPacketPusC.cpp diff --git a/inc/fsfw/tmtcpacket/pus/tm/TmPacketPusC.h b/src/fsfw/tmtcpacket/pus/tm/TmPacketPusC.h similarity index 100% rename from inc/fsfw/tmtcpacket/pus/tm/TmPacketPusC.h rename to src/fsfw/tmtcpacket/pus/tm/TmPacketPusC.h diff --git a/inc/fsfw/tmtcpacket/pus/tm/TmPacketStored.h b/src/fsfw/tmtcpacket/pus/tm/TmPacketStored.h similarity index 100% rename from inc/fsfw/tmtcpacket/pus/tm/TmPacketStored.h rename to src/fsfw/tmtcpacket/pus/tm/TmPacketStored.h diff --git a/src/core/tmtcpacket/pus/tm/TmPacketStoredBase.cpp b/src/fsfw/tmtcpacket/pus/tm/TmPacketStoredBase.cpp similarity index 100% rename from src/core/tmtcpacket/pus/tm/TmPacketStoredBase.cpp rename to src/fsfw/tmtcpacket/pus/tm/TmPacketStoredBase.cpp diff --git a/inc/fsfw/tmtcpacket/pus/tm/TmPacketStoredBase.h b/src/fsfw/tmtcpacket/pus/tm/TmPacketStoredBase.h similarity index 100% rename from inc/fsfw/tmtcpacket/pus/tm/TmPacketStoredBase.h rename to src/fsfw/tmtcpacket/pus/tm/TmPacketStoredBase.h diff --git a/src/core/tmtcpacket/pus/tm/TmPacketStoredPusA.cpp b/src/fsfw/tmtcpacket/pus/tm/TmPacketStoredPusA.cpp similarity index 100% rename from src/core/tmtcpacket/pus/tm/TmPacketStoredPusA.cpp rename to src/fsfw/tmtcpacket/pus/tm/TmPacketStoredPusA.cpp diff --git a/inc/fsfw/tmtcpacket/pus/tm/TmPacketStoredPusA.h b/src/fsfw/tmtcpacket/pus/tm/TmPacketStoredPusA.h similarity index 100% rename from inc/fsfw/tmtcpacket/pus/tm/TmPacketStoredPusA.h rename to src/fsfw/tmtcpacket/pus/tm/TmPacketStoredPusA.h diff --git a/src/core/tmtcpacket/pus/tm/TmPacketStoredPusC.cpp b/src/fsfw/tmtcpacket/pus/tm/TmPacketStoredPusC.cpp similarity index 100% rename from src/core/tmtcpacket/pus/tm/TmPacketStoredPusC.cpp rename to src/fsfw/tmtcpacket/pus/tm/TmPacketStoredPusC.cpp diff --git a/inc/fsfw/tmtcpacket/pus/tm/TmPacketStoredPusC.h b/src/fsfw/tmtcpacket/pus/tm/TmPacketStoredPusC.h similarity index 100% rename from inc/fsfw/tmtcpacket/pus/tm/TmPacketStoredPusC.h rename to src/fsfw/tmtcpacket/pus/tm/TmPacketStoredPusC.h diff --git a/inc/fsfw/tmtcservices/AcceptsTelecommandsIF.h b/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h similarity index 100% rename from inc/fsfw/tmtcservices/AcceptsTelecommandsIF.h rename to src/fsfw/tmtcservices/AcceptsTelecommandsIF.h diff --git a/inc/fsfw/tmtcservices/AcceptsTelemetryIF.h b/src/fsfw/tmtcservices/AcceptsTelemetryIF.h similarity index 100% rename from inc/fsfw/tmtcservices/AcceptsTelemetryIF.h rename to src/fsfw/tmtcservices/AcceptsTelemetryIF.h diff --git a/inc/fsfw/tmtcservices/AcceptsVerifyMessageIF.h b/src/fsfw/tmtcservices/AcceptsVerifyMessageIF.h similarity index 100% rename from inc/fsfw/tmtcservices/AcceptsVerifyMessageIF.h rename to src/fsfw/tmtcservices/AcceptsVerifyMessageIF.h diff --git a/src/core/tmtcservices/CMakeLists.txt b/src/fsfw/tmtcservices/CMakeLists.txt similarity index 100% rename from src/core/tmtcservices/CMakeLists.txt rename to src/fsfw/tmtcservices/CMakeLists.txt diff --git a/src/core/tmtcservices/CommandingServiceBase.cpp b/src/fsfw/tmtcservices/CommandingServiceBase.cpp similarity index 100% rename from src/core/tmtcservices/CommandingServiceBase.cpp rename to src/fsfw/tmtcservices/CommandingServiceBase.cpp diff --git a/inc/fsfw/tmtcservices/CommandingServiceBase.h b/src/fsfw/tmtcservices/CommandingServiceBase.h similarity index 100% rename from inc/fsfw/tmtcservices/CommandingServiceBase.h rename to src/fsfw/tmtcservices/CommandingServiceBase.h diff --git a/src/core/tmtcservices/PusServiceBase.cpp b/src/fsfw/tmtcservices/PusServiceBase.cpp similarity index 100% rename from src/core/tmtcservices/PusServiceBase.cpp rename to src/fsfw/tmtcservices/PusServiceBase.cpp diff --git a/inc/fsfw/tmtcservices/PusServiceBase.h b/src/fsfw/tmtcservices/PusServiceBase.h similarity index 100% rename from inc/fsfw/tmtcservices/PusServiceBase.h rename to src/fsfw/tmtcservices/PusServiceBase.h diff --git a/src/core/tmtcservices/PusVerificationReport.cpp b/src/fsfw/tmtcservices/PusVerificationReport.cpp similarity index 100% rename from src/core/tmtcservices/PusVerificationReport.cpp rename to src/fsfw/tmtcservices/PusVerificationReport.cpp diff --git a/inc/fsfw/tmtcservices/PusVerificationReport.h b/src/fsfw/tmtcservices/PusVerificationReport.h similarity index 100% rename from inc/fsfw/tmtcservices/PusVerificationReport.h rename to src/fsfw/tmtcservices/PusVerificationReport.h diff --git a/inc/fsfw/tmtcservices/SourceSequenceCounter.h b/src/fsfw/tmtcservices/SourceSequenceCounter.h similarity index 100% rename from inc/fsfw/tmtcservices/SourceSequenceCounter.h rename to src/fsfw/tmtcservices/SourceSequenceCounter.h diff --git a/src/core/tmtcservices/TmTcBridge.cpp b/src/fsfw/tmtcservices/TmTcBridge.cpp similarity index 100% rename from src/core/tmtcservices/TmTcBridge.cpp rename to src/fsfw/tmtcservices/TmTcBridge.cpp diff --git a/inc/fsfw/tmtcservices/TmTcBridge.h b/src/fsfw/tmtcservices/TmTcBridge.h similarity index 100% rename from inc/fsfw/tmtcservices/TmTcBridge.h rename to src/fsfw/tmtcservices/TmTcBridge.h diff --git a/src/core/tmtcservices/TmTcMessage.cpp b/src/fsfw/tmtcservices/TmTcMessage.cpp similarity index 100% rename from src/core/tmtcservices/TmTcMessage.cpp rename to src/fsfw/tmtcservices/TmTcMessage.cpp diff --git a/inc/fsfw/tmtcservices/TmTcMessage.h b/src/fsfw/tmtcservices/TmTcMessage.h similarity index 100% rename from inc/fsfw/tmtcservices/TmTcMessage.h rename to src/fsfw/tmtcservices/TmTcMessage.h diff --git a/inc/fsfw/tmtcservices/VerificationCodes.h b/src/fsfw/tmtcservices/VerificationCodes.h similarity index 100% rename from inc/fsfw/tmtcservices/VerificationCodes.h rename to src/fsfw/tmtcservices/VerificationCodes.h diff --git a/src/core/tmtcservices/VerificationReporter.cpp b/src/fsfw/tmtcservices/VerificationReporter.cpp similarity index 100% rename from src/core/tmtcservices/VerificationReporter.cpp rename to src/fsfw/tmtcservices/VerificationReporter.cpp diff --git a/inc/fsfw/tmtcservices/VerificationReporter.h b/src/fsfw/tmtcservices/VerificationReporter.h similarity index 100% rename from inc/fsfw/tmtcservices/VerificationReporter.h rename to src/fsfw/tmtcservices/VerificationReporter.h diff --git a/src/opt/CMakeLists.txt b/src/opt/CMakeLists.txt deleted file mode 100644 index 48ee664b..00000000 --- a/src/opt/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_subdirectory(coordinates) -add_subdirectory(datalinklayer) -add_subdirectory(monitoring) -add_subdirectory(pus) -add_subdirectory(rmap) -add_subdirectory(tmstorage) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 26ce12e8..febd4f0a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,2 +1 @@ add_subdirectory(src) -add_subdirectory(inc) \ No newline at end of file diff --git a/tests/inc/CMakeLists.txt b/tests/inc/CMakeLists.txt deleted file mode 100644 index abf6a3d2..00000000 --- a/tests/inc/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -target_include_directories(${LIB_FSFW_NAME} PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} -) - -target_include_directories(${LIB_FSFW_NAME} INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR} -) diff --git a/tests/src/CMakeLists.txt b/tests/src/CMakeLists.txt index 3f5d21b5..ed2f2522 100644 --- a/tests/src/CMakeLists.txt +++ b/tests/src/CMakeLists.txt @@ -1,7 +1,9 @@ -if(FSFW_ADD_INTERNAL_TESTS) - add_subdirectory(internal) -endif() +target_include_directories(${LIB_FSFW_NAME} PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} +) -if(FSFW_ADD_UNITTESTS) - add_subdirectory(tests) -endif() +target_include_directories(${LIB_FSFW_NAME} INTERFACE + ${CMAKE_CURRENT_SOURCE_DIR} +) + +add_subdirectory(fsfw) diff --git a/tests/src/fsfw/CMakeLists.txt b/tests/src/fsfw/CMakeLists.txt new file mode 100644 index 00000000..571a126e --- /dev/null +++ b/tests/src/fsfw/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(tests) \ No newline at end of file diff --git a/tests/src/fsfw/tests/CMakeLists.txt b/tests/src/fsfw/tests/CMakeLists.txt new file mode 100644 index 00000000..e4a6be80 --- /dev/null +++ b/tests/src/fsfw/tests/CMakeLists.txt @@ -0,0 +1,8 @@ + +if(FSFW_ADD_INTERNAL_TESTS) + add_subdirectory(internal) +endif() + +if(FSFW_ADD_UNITTESTS) + add_subdirectory(unit) +endif() diff --git a/tests/src/internal/CMakeLists.txt b/tests/src/fsfw/tests/internal/CMakeLists.txt similarity index 100% rename from tests/src/internal/CMakeLists.txt rename to tests/src/fsfw/tests/internal/CMakeLists.txt diff --git a/tests/src/internal/InternalUnitTester.cpp b/tests/src/fsfw/tests/internal/InternalUnitTester.cpp similarity index 100% rename from tests/src/internal/InternalUnitTester.cpp rename to tests/src/fsfw/tests/internal/InternalUnitTester.cpp diff --git a/tests/inc/fsfw/tests/internal/InternalUnitTester.h b/tests/src/fsfw/tests/internal/InternalUnitTester.h similarity index 100% rename from tests/inc/fsfw/tests/internal/InternalUnitTester.h rename to tests/src/fsfw/tests/internal/InternalUnitTester.h diff --git a/tests/src/internal/UnittDefinitions.cpp b/tests/src/fsfw/tests/internal/UnittDefinitions.cpp similarity index 100% rename from tests/src/internal/UnittDefinitions.cpp rename to tests/src/fsfw/tests/internal/UnittDefinitions.cpp diff --git a/tests/inc/fsfw/tests/internal/UnittDefinitions.h b/tests/src/fsfw/tests/internal/UnittDefinitions.h similarity index 100% rename from tests/inc/fsfw/tests/internal/UnittDefinitions.h rename to tests/src/fsfw/tests/internal/UnittDefinitions.h diff --git a/tests/src/internal/globalfunctions/CMakeLists.txt b/tests/src/fsfw/tests/internal/globalfunctions/CMakeLists.txt similarity index 100% rename from tests/src/internal/globalfunctions/CMakeLists.txt rename to tests/src/fsfw/tests/internal/globalfunctions/CMakeLists.txt diff --git a/tests/src/internal/globalfunctions/TestArrayPrinter.cpp b/tests/src/fsfw/tests/internal/globalfunctions/TestArrayPrinter.cpp similarity index 100% rename from tests/src/internal/globalfunctions/TestArrayPrinter.cpp rename to tests/src/fsfw/tests/internal/globalfunctions/TestArrayPrinter.cpp diff --git a/tests/inc/fsfw/tests/internal/globalfunctions/TestArrayPrinter.h b/tests/src/fsfw/tests/internal/globalfunctions/TestArrayPrinter.h similarity index 100% rename from tests/inc/fsfw/tests/internal/globalfunctions/TestArrayPrinter.h rename to tests/src/fsfw/tests/internal/globalfunctions/TestArrayPrinter.h diff --git a/tests/src/internal/osal/CMakeLists.txt b/tests/src/fsfw/tests/internal/osal/CMakeLists.txt similarity index 100% rename from tests/src/internal/osal/CMakeLists.txt rename to tests/src/fsfw/tests/internal/osal/CMakeLists.txt diff --git a/tests/src/internal/osal/IntTestMq.cpp b/tests/src/fsfw/tests/internal/osal/IntTestMq.cpp similarity index 100% rename from tests/src/internal/osal/IntTestMq.cpp rename to tests/src/fsfw/tests/internal/osal/IntTestMq.cpp diff --git a/tests/inc/fsfw/tests/internal/osal/IntTestMq.h b/tests/src/fsfw/tests/internal/osal/IntTestMq.h similarity index 100% rename from tests/inc/fsfw/tests/internal/osal/IntTestMq.h rename to tests/src/fsfw/tests/internal/osal/IntTestMq.h diff --git a/tests/src/internal/osal/IntTestMutex.cpp b/tests/src/fsfw/tests/internal/osal/IntTestMutex.cpp similarity index 100% rename from tests/src/internal/osal/IntTestMutex.cpp rename to tests/src/fsfw/tests/internal/osal/IntTestMutex.cpp diff --git a/tests/inc/fsfw/tests/internal/osal/IntTestMutex.h b/tests/src/fsfw/tests/internal/osal/IntTestMutex.h similarity index 100% rename from tests/inc/fsfw/tests/internal/osal/IntTestMutex.h rename to tests/src/fsfw/tests/internal/osal/IntTestMutex.h diff --git a/tests/src/internal/osal/IntTestSemaphore.cpp b/tests/src/fsfw/tests/internal/osal/IntTestSemaphore.cpp similarity index 100% rename from tests/src/internal/osal/IntTestSemaphore.cpp rename to tests/src/fsfw/tests/internal/osal/IntTestSemaphore.cpp diff --git a/tests/inc/fsfw/tests/internal/osal/IntTestSemaphore.h b/tests/src/fsfw/tests/internal/osal/IntTestSemaphore.h similarity index 100% rename from tests/inc/fsfw/tests/internal/osal/IntTestSemaphore.h rename to tests/src/fsfw/tests/internal/osal/IntTestSemaphore.h diff --git a/tests/src/internal/serialize/CMakeLists.txt b/tests/src/fsfw/tests/internal/serialize/CMakeLists.txt similarity index 100% rename from tests/src/internal/serialize/CMakeLists.txt rename to tests/src/fsfw/tests/internal/serialize/CMakeLists.txt diff --git a/tests/src/internal/serialize/IntTestSerialization.cpp b/tests/src/fsfw/tests/internal/serialize/IntTestSerialization.cpp similarity index 100% rename from tests/src/internal/serialize/IntTestSerialization.cpp rename to tests/src/fsfw/tests/internal/serialize/IntTestSerialization.cpp diff --git a/tests/inc/fsfw/tests/internal/serialize/IntTestSerialization.h b/tests/src/fsfw/tests/internal/serialize/IntTestSerialization.h similarity index 100% rename from tests/inc/fsfw/tests/internal/serialize/IntTestSerialization.h rename to tests/src/fsfw/tests/internal/serialize/IntTestSerialization.h diff --git a/tests/src/tests/CMakeLists.txt b/tests/src/fsfw/tests/unit/CMakeLists.txt similarity index 72% rename from tests/src/tests/CMakeLists.txt rename to tests/src/fsfw/tests/unit/CMakeLists.txt index 2f3d9f70..255063f3 100644 --- a/tests/src/tests/CMakeLists.txt +++ b/tests/src/fsfw/tests/unit/CMakeLists.txt @@ -4,3 +4,5 @@ add_subdirectory(osal) add_subdirectory(serialize) add_subdirectory(datapoollocal) add_subdirectory(storagemanager) +add_subdirectory(globalfunctions) +add_subdirectory(tmtcpacket) diff --git a/tests/src/tests/action/CMakeLists.txt b/tests/src/fsfw/tests/unit/action/CMakeLists.txt similarity index 100% rename from tests/src/tests/action/CMakeLists.txt rename to tests/src/fsfw/tests/unit/action/CMakeLists.txt diff --git a/tests/src/tests/action/TestActionHelper.cpp b/tests/src/fsfw/tests/unit/action/TestActionHelper.cpp similarity index 100% rename from tests/src/tests/action/TestActionHelper.cpp rename to tests/src/fsfw/tests/unit/action/TestActionHelper.cpp diff --git a/tests/src/tests/action/TestActionHelper.h b/tests/src/fsfw/tests/unit/action/TestActionHelper.h similarity index 100% rename from tests/src/tests/action/TestActionHelper.h rename to tests/src/fsfw/tests/unit/action/TestActionHelper.h diff --git a/tests/src/tests/container/CMakeLists.txt b/tests/src/fsfw/tests/unit/container/CMakeLists.txt similarity index 100% rename from tests/src/tests/container/CMakeLists.txt rename to tests/src/fsfw/tests/unit/container/CMakeLists.txt diff --git a/tests/src/tests/container/RingBufferTest.cpp b/tests/src/fsfw/tests/unit/container/RingBufferTest.cpp similarity index 100% rename from tests/src/tests/container/RingBufferTest.cpp rename to tests/src/fsfw/tests/unit/container/RingBufferTest.cpp diff --git a/tests/src/tests/container/TestArrayList.cpp b/tests/src/fsfw/tests/unit/container/TestArrayList.cpp similarity index 100% rename from tests/src/tests/container/TestArrayList.cpp rename to tests/src/fsfw/tests/unit/container/TestArrayList.cpp diff --git a/tests/src/tests/container/TestDynamicFifo.cpp b/tests/src/fsfw/tests/unit/container/TestDynamicFifo.cpp similarity index 100% rename from tests/src/tests/container/TestDynamicFifo.cpp rename to tests/src/fsfw/tests/unit/container/TestDynamicFifo.cpp diff --git a/tests/src/tests/container/TestFifo.cpp b/tests/src/fsfw/tests/unit/container/TestFifo.cpp similarity index 100% rename from tests/src/tests/container/TestFifo.cpp rename to tests/src/fsfw/tests/unit/container/TestFifo.cpp diff --git a/tests/src/tests/container/TestFixedArrayList.cpp b/tests/src/fsfw/tests/unit/container/TestFixedArrayList.cpp similarity index 100% rename from tests/src/tests/container/TestFixedArrayList.cpp rename to tests/src/fsfw/tests/unit/container/TestFixedArrayList.cpp diff --git a/tests/src/tests/container/TestFixedMap.cpp b/tests/src/fsfw/tests/unit/container/TestFixedMap.cpp similarity index 100% rename from tests/src/tests/container/TestFixedMap.cpp rename to tests/src/fsfw/tests/unit/container/TestFixedMap.cpp diff --git a/tests/src/tests/container/TestFixedOrderedMultimap.cpp b/tests/src/fsfw/tests/unit/container/TestFixedOrderedMultimap.cpp similarity index 100% rename from tests/src/tests/container/TestFixedOrderedMultimap.cpp rename to tests/src/fsfw/tests/unit/container/TestFixedOrderedMultimap.cpp diff --git a/tests/src/tests/container/TestPlacementFactory.cpp b/tests/src/fsfw/tests/unit/container/TestPlacementFactory.cpp similarity index 100% rename from tests/src/tests/container/TestPlacementFactory.cpp rename to tests/src/fsfw/tests/unit/container/TestPlacementFactory.cpp diff --git a/tests/src/tests/datapoollocal/CMakeLists.txt b/tests/src/fsfw/tests/unit/datapoollocal/CMakeLists.txt similarity index 100% rename from tests/src/tests/datapoollocal/CMakeLists.txt rename to tests/src/fsfw/tests/unit/datapoollocal/CMakeLists.txt diff --git a/tests/src/tests/datapoollocal/DataSetTest.cpp b/tests/src/fsfw/tests/unit/datapoollocal/DataSetTest.cpp similarity index 100% rename from tests/src/tests/datapoollocal/DataSetTest.cpp rename to tests/src/fsfw/tests/unit/datapoollocal/DataSetTest.cpp diff --git a/tests/src/tests/datapoollocal/LocalPoolManagerTest.cpp b/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolManagerTest.cpp similarity index 100% rename from tests/src/tests/datapoollocal/LocalPoolManagerTest.cpp rename to tests/src/fsfw/tests/unit/datapoollocal/LocalPoolManagerTest.cpp diff --git a/tests/src/tests/datapoollocal/LocalPoolOwnerBase.cpp b/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.cpp similarity index 100% rename from tests/src/tests/datapoollocal/LocalPoolOwnerBase.cpp rename to tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.cpp diff --git a/tests/src/tests/datapoollocal/LocalPoolOwnerBase.h b/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.h similarity index 100% rename from tests/src/tests/datapoollocal/LocalPoolOwnerBase.h rename to tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.h diff --git a/tests/src/tests/datapoollocal/LocalPoolVariableTest.cpp b/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolVariableTest.cpp similarity index 100% rename from tests/src/tests/datapoollocal/LocalPoolVariableTest.cpp rename to tests/src/fsfw/tests/unit/datapoollocal/LocalPoolVariableTest.cpp diff --git a/tests/src/tests/datapoollocal/LocalPoolVectorTest.cpp b/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolVectorTest.cpp similarity index 100% rename from tests/src/tests/datapoollocal/LocalPoolVectorTest.cpp rename to tests/src/fsfw/tests/unit/datapoollocal/LocalPoolVectorTest.cpp diff --git a/tests/src/tests/globalfunctions/CMakeLists.txt b/tests/src/fsfw/tests/unit/globalfunctions/CMakeLists.txt similarity index 100% rename from tests/src/tests/globalfunctions/CMakeLists.txt rename to tests/src/fsfw/tests/unit/globalfunctions/CMakeLists.txt diff --git a/tests/src/tests/mocks/HkReceiverMock.h b/tests/src/fsfw/tests/unit/mocks/HkReceiverMock.h similarity index 100% rename from tests/src/tests/mocks/HkReceiverMock.h rename to tests/src/fsfw/tests/unit/mocks/HkReceiverMock.h diff --git a/tests/src/tests/mocks/MessageQueueMockBase.h b/tests/src/fsfw/tests/unit/mocks/MessageQueueMockBase.h similarity index 100% rename from tests/src/tests/mocks/MessageQueueMockBase.h rename to tests/src/fsfw/tests/unit/mocks/MessageQueueMockBase.h diff --git a/tests/src/tests/osal/CMakeLists.txt b/tests/src/fsfw/tests/unit/osal/CMakeLists.txt similarity index 100% rename from tests/src/tests/osal/CMakeLists.txt rename to tests/src/fsfw/tests/unit/osal/CMakeLists.txt diff --git a/tests/src/tests/osal/TestMessageQueue.cpp b/tests/src/fsfw/tests/unit/osal/TestMessageQueue.cpp similarity index 100% rename from tests/src/tests/osal/TestMessageQueue.cpp rename to tests/src/fsfw/tests/unit/osal/TestMessageQueue.cpp diff --git a/tests/src/tests/osal/TestSemaphore.cpp b/tests/src/fsfw/tests/unit/osal/TestSemaphore.cpp similarity index 100% rename from tests/src/tests/osal/TestSemaphore.cpp rename to tests/src/fsfw/tests/unit/osal/TestSemaphore.cpp diff --git a/tests/src/tests/serialize/CMakeLists.txt b/tests/src/fsfw/tests/unit/serialize/CMakeLists.txt similarity index 100% rename from tests/src/tests/serialize/CMakeLists.txt rename to tests/src/fsfw/tests/unit/serialize/CMakeLists.txt diff --git a/tests/src/tests/serialize/TestSerialBufferAdapter.cpp b/tests/src/fsfw/tests/unit/serialize/TestSerialBufferAdapter.cpp similarity index 100% rename from tests/src/tests/serialize/TestSerialBufferAdapter.cpp rename to tests/src/fsfw/tests/unit/serialize/TestSerialBufferAdapter.cpp diff --git a/tests/src/tests/serialize/TestSerialLinkedPacket.cpp b/tests/src/fsfw/tests/unit/serialize/TestSerialLinkedPacket.cpp similarity index 100% rename from tests/src/tests/serialize/TestSerialLinkedPacket.cpp rename to tests/src/fsfw/tests/unit/serialize/TestSerialLinkedPacket.cpp diff --git a/tests/src/tests/serialize/TestSerialLinkedPacket.h b/tests/src/fsfw/tests/unit/serialize/TestSerialLinkedPacket.h similarity index 100% rename from tests/src/tests/serialize/TestSerialLinkedPacket.h rename to tests/src/fsfw/tests/unit/serialize/TestSerialLinkedPacket.h diff --git a/tests/src/tests/serialize/TestSerialization.cpp b/tests/src/fsfw/tests/unit/serialize/TestSerialization.cpp similarity index 100% rename from tests/src/tests/serialize/TestSerialization.cpp rename to tests/src/fsfw/tests/unit/serialize/TestSerialization.cpp diff --git a/tests/src/tests/storagemanager/CMakeLists.txt b/tests/src/fsfw/tests/unit/storagemanager/CMakeLists.txt similarity index 100% rename from tests/src/tests/storagemanager/CMakeLists.txt rename to tests/src/fsfw/tests/unit/storagemanager/CMakeLists.txt diff --git a/tests/src/tests/storagemanager/TestNewAccessor.cpp b/tests/src/fsfw/tests/unit/storagemanager/TestNewAccessor.cpp similarity index 100% rename from tests/src/tests/storagemanager/TestNewAccessor.cpp rename to tests/src/fsfw/tests/unit/storagemanager/TestNewAccessor.cpp diff --git a/tests/src/tests/storagemanager/TestPool.cpp b/tests/src/fsfw/tests/unit/storagemanager/TestPool.cpp similarity index 100% rename from tests/src/tests/storagemanager/TestPool.cpp rename to tests/src/fsfw/tests/unit/storagemanager/TestPool.cpp diff --git a/tests/src/tests/tmtcpacket/CMakeLists.txt b/tests/src/fsfw/tests/unit/tmtcpacket/CMakeLists.txt similarity index 100% rename from tests/src/tests/tmtcpacket/CMakeLists.txt rename to tests/src/fsfw/tests/unit/tmtcpacket/CMakeLists.txt diff --git a/tests/src/tests/tmtcpacket/PusTmTest.cpp b/tests/src/fsfw/tests/unit/tmtcpacket/PusTmTest.cpp similarity index 100% rename from tests/src/tests/tmtcpacket/PusTmTest.cpp rename to tests/src/fsfw/tests/unit/tmtcpacket/PusTmTest.cpp