renamed some folders

2021-08-02 15:31:13 +02:00 · 2021-08-02 15:31:13 +02:00 · c0591c3d24
commit c0591c3d24
parent b75c815361
131 changed files with 22 additions and 15 deletions
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@ -1,11 +1,9 @@
-if(FSFW_ADD_SPG4_PROPAGATOR)
-    target_sources(${LIB_FSFW_NAME} PRIVATE
-        sgp4/sgp4unit.cpp
-    )
-    target_include_directories(${LIB_FSFW_NAME} PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}/sgp4
-    )
-    target_include_directories(${LIB_FSFW_NAME} INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}/sgp4
-    )
-endif()
+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-contrib)
--- a/contrib/fsfw-contrib/CMakeLists.txt
+++ b/contrib/fsfw-contrib/CMakeLists.txt
@ -0,0 +1,11 @@
+if(FSFW_ADD_SPG4_PROPAGATOR)
+    target_sources(${LIB_FSFW_NAME} PRIVATE
+        sgp4/sgp4unit.cpp
+    )
+    target_include_directories(${LIB_FSFW_NAME} PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/sgp4
+    )
+    target_include_directories(${LIB_FSFW_NAME} INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}/sgp4
+    )
+endif()
--- a/contrib/fsfw-contrib/sgp4/LICENSE
+++ b/contrib/fsfw-contrib/sgp4/LICENSE
--- a/contrib/fsfw-contrib/sgp4/sgp4unit.cpp
+++ b/contrib/fsfw-contrib/sgp4/sgp4unit.cpp
--- a/contrib/fsfw-contrib/sgp4/sgp4unit.h
+++ b/contrib/fsfw-contrib/sgp4/sgp4unit.h
--- a/hal/src/CMakeLists.txt
+++ b/hal/src/CMakeLists.txt
@ -6,4 +6,4 @@ target_include_directories(${LIB_FSFW_NAME} INTERFACE
    ${CMAKE_CURRENT_SOURCE_DIR}
 )

-add_subdirectory(fsfw)
+add_subdirectory(fsfw-hal)
--- a/hal/src/fsfw-hal/CMakeLists.txt
+++ b/hal/src/fsfw-hal/CMakeLists.txt
--- a/hal/src/fsfw-hal/common/CMakeLists.txt
+++ b/hal/src/fsfw-hal/common/CMakeLists.txt
--- a/hal/src/fsfw-hal/common/gpio/CMakeLists.txt
+++ b/hal/src/fsfw-hal/common/gpio/CMakeLists.txt
--- a/hal/src/fsfw-hal/common/gpio/GpioCookie.cpp
+++ b/hal/src/fsfw-hal/common/gpio/GpioCookie.cpp
--- a/hal/src/fsfw-hal/common/gpio/GpioCookie.h
+++ b/hal/src/fsfw-hal/common/gpio/GpioCookie.h
--- a/hal/src/fsfw-hal/common/gpio/GpioIF.h
+++ b/hal/src/fsfw-hal/common/gpio/GpioIF.h
--- a/hal/src/fsfw-hal/common/gpio/gpioDefinitions.h
+++ b/hal/src/fsfw-hal/common/gpio/gpioDefinitions.h
--- a/hal/src/fsfw-hal/common/spi/spiCommon.h
+++ b/hal/src/fsfw-hal/common/spi/spiCommon.h
--- a/hal/src/fsfw-hal/devicehandlers/CMakeLists.txt
+++ b/hal/src/fsfw-hal/devicehandlers/CMakeLists.txt
--- a/hal/src/fsfw-hal/devicehandlers/GyroL3GD20Handler.cpp
+++ b/hal/src/fsfw-hal/devicehandlers/GyroL3GD20Handler.cpp
--- a/hal/src/fsfw-hal/devicehandlers/GyroL3GD20Handler.h
+++ b/hal/src/fsfw-hal/devicehandlers/GyroL3GD20Handler.h
--- a/hal/src/fsfw-hal/devicehandlers/devicedefinitions/GyroL3GD20Definitions.h
+++ b/hal/src/fsfw-hal/devicehandlers/devicedefinitions/GyroL3GD20Definitions.h
--- a/hal/src/fsfw-hal/host/CMakeLists.txt
+++ b/hal/src/fsfw-hal/host/CMakeLists.txt
--- a/hal/src/fsfw-hal/linux/CMakeLists.txt
+++ b/hal/src/fsfw-hal/linux/CMakeLists.txt
--- a/hal/src/fsfw-hal/linux/UnixFileGuard.cpp
+++ b/hal/src/fsfw-hal/linux/UnixFileGuard.cpp
--- a/hal/src/fsfw-hal/linux/UnixFileGuard.h
+++ b/hal/src/fsfw-hal/linux/UnixFileGuard.h
--- a/hal/src/fsfw-hal/linux/gpio/CMakeLists.txt
+++ b/hal/src/fsfw-hal/linux/gpio/CMakeLists.txt
--- a/hal/src/fsfw-hal/linux/gpio/LinuxLibgpioIF.cpp
+++ b/hal/src/fsfw-hal/linux/gpio/LinuxLibgpioIF.cpp
--- a/hal/src/fsfw-hal/linux/gpio/LinuxLibgpioIF.h
+++ b/hal/src/fsfw-hal/linux/gpio/LinuxLibgpioIF.h
--- a/hal/src/fsfw-hal/linux/i2c/CMakeLists.txt
+++ b/hal/src/fsfw-hal/linux/i2c/CMakeLists.txt
--- a/hal/src/fsfw-hal/linux/i2c/I2cComIF.cpp
+++ b/hal/src/fsfw-hal/linux/i2c/I2cComIF.cpp
--- a/hal/src/fsfw-hal/linux/i2c/I2cComIF.h
+++ b/hal/src/fsfw-hal/linux/i2c/I2cComIF.h
--- a/hal/src/fsfw-hal/linux/i2c/I2cCookie.cpp
+++ b/hal/src/fsfw-hal/linux/i2c/I2cCookie.cpp
--- a/hal/src/fsfw-hal/linux/i2c/I2cCookie.h
+++ b/hal/src/fsfw-hal/linux/i2c/I2cCookie.h
--- a/hal/src/fsfw-hal/linux/rpi/CMakeLists.txt
+++ b/hal/src/fsfw-hal/linux/rpi/CMakeLists.txt
--- a/hal/src/fsfw-hal/linux/rpi/GpioRPi.cpp
+++ b/hal/src/fsfw-hal/linux/rpi/GpioRPi.cpp
--- a/hal/src/fsfw-hal/linux/rpi/GpioRPi.h
+++ b/hal/src/fsfw-hal/linux/rpi/GpioRPi.h
--- a/hal/src/fsfw-hal/linux/spi/CMakeLists.txt
+++ b/hal/src/fsfw-hal/linux/spi/CMakeLists.txt
--- a/hal/src/fsfw-hal/linux/spi/SpiComIF.cpp
+++ b/hal/src/fsfw-hal/linux/spi/SpiComIF.cpp
--- a/hal/src/fsfw-hal/linux/spi/SpiComIF.h
+++ b/hal/src/fsfw-hal/linux/spi/SpiComIF.h
--- a/hal/src/fsfw-hal/linux/spi/SpiCookie.cpp
+++ b/hal/src/fsfw-hal/linux/spi/SpiCookie.cpp
--- a/hal/src/fsfw-hal/linux/spi/SpiCookie.h
+++ b/hal/src/fsfw-hal/linux/spi/SpiCookie.h
--- a/hal/src/fsfw-hal/linux/spi/spiDefinitions.h
+++ b/hal/src/fsfw-hal/linux/spi/spiDefinitions.h
--- a/hal/src/fsfw-hal/linux/uart/CMakeLists.txt
+++ b/hal/src/fsfw-hal/linux/uart/CMakeLists.txt
--- a/hal/src/fsfw-hal/linux/uart/UartComIF.cpp
+++ b/hal/src/fsfw-hal/linux/uart/UartComIF.cpp
--- a/hal/src/fsfw-hal/linux/uart/UartComIF.h
+++ b/hal/src/fsfw-hal/linux/uart/UartComIF.h
--- a/hal/src/fsfw-hal/linux/uart/UartCookie.cpp
+++ b/hal/src/fsfw-hal/linux/uart/UartCookie.cpp
--- a/hal/src/fsfw-hal/linux/uart/UartCookie.h
+++ b/hal/src/fsfw-hal/linux/uart/UartCookie.h
--- a/hal/src/fsfw-hal/linux/utility.cpp
+++ b/hal/src/fsfw-hal/linux/utility.cpp
--- a/hal/src/fsfw-hal/linux/utility.h
+++ b/hal/src/fsfw-hal/linux/utility.h
--- a/hal/src/fsfw-hal/stm32h7/CMakeLists.txt
+++ b/hal/src/fsfw-hal/stm32h7/CMakeLists.txt
--- a/hal/src/fsfw-hal/stm32h7/devicetest/CMakeLists.txt
+++ b/hal/src/fsfw-hal/stm32h7/devicetest/CMakeLists.txt
--- a/hal/src/fsfw-hal/stm32h7/devicetest/GyroL3GD20H.cpp
+++ b/hal/src/fsfw-hal/stm32h7/devicetest/GyroL3GD20H.cpp
--- a/hal/src/fsfw-hal/stm32h7/devicetest/GyroL3GD20H.h
+++ b/hal/src/fsfw-hal/stm32h7/devicetest/GyroL3GD20H.h
--- a/hal/src/fsfw-hal/stm32h7/dma.cpp
+++ b/hal/src/fsfw-hal/stm32h7/dma.cpp
--- a/hal/src/fsfw-hal/stm32h7/dma.h
+++ b/hal/src/fsfw-hal/stm32h7/dma.h
--- a/hal/src/fsfw-hal/stm32h7/gpio/CMakeLists.txt
+++ b/hal/src/fsfw-hal/stm32h7/gpio/CMakeLists.txt
--- a/hal/src/fsfw-hal/stm32h7/gpio/gpio.cpp
+++ b/hal/src/fsfw-hal/stm32h7/gpio/gpio.cpp
--- a/hal/src/fsfw-hal/stm32h7/gpio/gpio.h
+++ b/hal/src/fsfw-hal/stm32h7/gpio/gpio.h
--- a/hal/src/fsfw-hal/stm32h7/i2c/CMakeLists.txt
+++ b/hal/src/fsfw-hal/stm32h7/i2c/CMakeLists.txt
--- a/hal/src/fsfw-hal/stm32h7/interrupts.h
+++ b/hal/src/fsfw-hal/stm32h7/interrupts.h
--- a/hal/src/fsfw-hal/stm32h7/spi/CMakeLists.txt
+++ b/hal/src/fsfw-hal/stm32h7/spi/CMakeLists.txt
--- a/hal/src/fsfw-hal/stm32h7/spi/SpiComIF.cpp
+++ b/hal/src/fsfw-hal/stm32h7/spi/SpiComIF.cpp
--- a/hal/src/fsfw-hal/stm32h7/spi/SpiComIF.h
+++ b/hal/src/fsfw-hal/stm32h7/spi/SpiComIF.h
--- a/hal/src/fsfw-hal/stm32h7/spi/SpiCookie.cpp
+++ b/hal/src/fsfw-hal/stm32h7/spi/SpiCookie.cpp
--- a/hal/src/fsfw-hal/stm32h7/spi/SpiCookie.h
+++ b/hal/src/fsfw-hal/stm32h7/spi/SpiCookie.h
--- a/hal/src/fsfw-hal/stm32h7/spi/mspInit.cpp
+++ b/hal/src/fsfw-hal/stm32h7/spi/mspInit.cpp
--- a/hal/src/fsfw-hal/stm32h7/spi/mspInit.h
+++ b/hal/src/fsfw-hal/stm32h7/spi/mspInit.h
--- a/hal/src/fsfw-hal/stm32h7/spi/spiCore.cpp
+++ b/hal/src/fsfw-hal/stm32h7/spi/spiCore.cpp
--- a/hal/src/fsfw-hal/stm32h7/spi/spiCore.h
+++ b/hal/src/fsfw-hal/stm32h7/spi/spiCore.h
--- a/hal/src/fsfw-hal/stm32h7/spi/spiDefinitions.cpp
+++ b/hal/src/fsfw-hal/stm32h7/spi/spiDefinitions.cpp
--- a/hal/src/fsfw-hal/stm32h7/spi/spiDefinitions.h
+++ b/hal/src/fsfw-hal/stm32h7/spi/spiDefinitions.h
--- a/hal/src/fsfw-hal/stm32h7/spi/spiInterrupts.cpp
+++ b/hal/src/fsfw-hal/stm32h7/spi/spiInterrupts.cpp
--- a/hal/src/fsfw-hal/stm32h7/spi/spiInterrupts.h
+++ b/hal/src/fsfw-hal/stm32h7/spi/spiInterrupts.h
--- a/hal/src/fsfw-hal/stm32h7/spi/stm32h743ziSpi.cpp
+++ b/hal/src/fsfw-hal/stm32h7/spi/stm32h743ziSpi.cpp
--- a/hal/src/fsfw-hal/stm32h7/spi/stm32h743ziSpi.h
+++ b/hal/src/fsfw-hal/stm32h7/spi/stm32h743ziSpi.h
--- a/hal/src/fsfw-hal/stm32h7/uart/CMakeLists.txt
+++ b/hal/src/fsfw-hal/stm32h7/uart/CMakeLists.txt
--- a/hal/src/fsfw/CMakeLists.txt
+++ b/hal/src/fsfw/CMakeLists.txt
@ -1 +0,0 @@
-add_subdirectory(hal)
--- a/tests/src/CMakeLists.txt
+++ b/tests/src/CMakeLists.txt
@ -6,4 +6,4 @@ target_include_directories(${LIB_FSFW_NAME} INTERFACE
    ${CMAKE_CURRENT_SOURCE_DIR}
 )

-add_subdirectory(fsfw)
+add_subdirectory(fsfw-tests)
--- a/tests/src/fsfw-tests/CMakeLists.txt
+++ b/tests/src/fsfw-tests/CMakeLists.txt
--- a/tests/src/fsfw-tests/internal/CMakeLists.txt
+++ b/tests/src/fsfw-tests/internal/CMakeLists.txt
--- a/tests/src/fsfw-tests/internal/InternalUnitTester.cpp
+++ b/tests/src/fsfw-tests/internal/InternalUnitTester.cpp
--- a/tests/src/fsfw-tests/internal/InternalUnitTester.h
+++ b/tests/src/fsfw-tests/internal/InternalUnitTester.h
--- a/tests/src/fsfw-tests/internal/UnittDefinitions.cpp
+++ b/tests/src/fsfw-tests/internal/UnittDefinitions.cpp
--- a/tests/src/fsfw-tests/internal/UnittDefinitions.h
+++ b/tests/src/fsfw-tests/internal/UnittDefinitions.h
--- a/tests/src/fsfw-tests/internal/globalfunctions/CMakeLists.txt
+++ b/tests/src/fsfw-tests/internal/globalfunctions/CMakeLists.txt
--- a/tests/src/fsfw-tests/internal/globalfunctions/TestArrayPrinter.cpp
+++ b/tests/src/fsfw-tests/internal/globalfunctions/TestArrayPrinter.cpp
--- a/tests/src/fsfw-tests/internal/globalfunctions/TestArrayPrinter.h
+++ b/tests/src/fsfw-tests/internal/globalfunctions/TestArrayPrinter.h
--- a/tests/src/fsfw-tests/internal/osal/CMakeLists.txt
+++ b/tests/src/fsfw-tests/internal/osal/CMakeLists.txt
--- a/tests/src/fsfw-tests/internal/osal/IntTestMq.cpp
+++ b/tests/src/fsfw-tests/internal/osal/IntTestMq.cpp
--- a/tests/src/fsfw-tests/internal/osal/IntTestMq.h
+++ b/tests/src/fsfw-tests/internal/osal/IntTestMq.h
--- a/tests/src/fsfw-tests/internal/osal/IntTestMutex.cpp
+++ b/tests/src/fsfw-tests/internal/osal/IntTestMutex.cpp
--- a/tests/src/fsfw-tests/internal/osal/IntTestMutex.h
+++ b/tests/src/fsfw-tests/internal/osal/IntTestMutex.h
--- a/tests/src/fsfw-tests/internal/osal/IntTestSemaphore.cpp
+++ b/tests/src/fsfw-tests/internal/osal/IntTestSemaphore.cpp
--- a/tests/src/fsfw-tests/internal/osal/IntTestSemaphore.h
+++ b/tests/src/fsfw-tests/internal/osal/IntTestSemaphore.h
--- a/tests/src/fsfw-tests/internal/serialize/CMakeLists.txt
+++ b/tests/src/fsfw-tests/internal/serialize/CMakeLists.txt
--- a/tests/src/fsfw-tests/internal/serialize/IntTestSerialization.cpp
+++ b/tests/src/fsfw-tests/internal/serialize/IntTestSerialization.cpp
--- a/tests/src/fsfw-tests/internal/serialize/IntTestSerialization.h
+++ b/tests/src/fsfw-tests/internal/serialize/IntTestSerialization.h
--- a/tests/src/fsfw-tests/unit/CMakeLists.txt
+++ b/tests/src/fsfw-tests/unit/CMakeLists.txt
--- a/tests/src/fsfw-tests/unit/action/CMakeLists.txt
+++ b/tests/src/fsfw-tests/unit/action/CMakeLists.txt
--- a/tests/src/fsfw-tests/unit/action/TestActionHelper.cpp
+++ b/tests/src/fsfw-tests/unit/action/TestActionHelper.cpp
--- a/tests/src/fsfw-tests/unit/action/TestActionHelper.h
+++ b/tests/src/fsfw-tests/unit/action/TestActionHelper.h
--- a/tests/src/fsfw-tests/unit/container/CMakeLists.txt
+++ b/tests/src/fsfw-tests/unit/container/CMakeLists.txt
--- a/tests/src/fsfw-tests/unit/container/RingBufferTest.cpp
+++ b/tests/src/fsfw-tests/unit/container/RingBufferTest.cpp
--- a/Show More
+++ b/Show More