KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

include changes

Browse Source
This commit is contained in:
Robin Müller 2021-08-02 15:47:12 +02:00
parent c0591c3d24
commit aabc729e77
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
37 changed files with 77 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -21,7 +21,7 @@ option(FSFW_ADD_COORDINATES "Compile with coordinate components" OFF)
option(FSFW_ADD_TMSTORAGE "Compile with tm storage components" OFF) option(FSFW_ADD_TMSTORAGE "Compile with tm storage components" OFF)
# Contrib sources # Contrib sources
option(FSFW_ADD_SPG4_PROPAGATOR "Add SPG4 propagator code" OFF) option(FSFW_ADD_SGP4_PROPAGATOR "Add SGP4 propagator code" OFF)
set(LIB_FSFW_NAME fsfw) set(LIB_FSFW_NAME fsfw)
add_library(${LIB_FSFW_NAME}) add_library(${LIB_FSFW_NAME})

2
contrib/fsfw-contrib/CMakeLists.txt
View File

@ -1,4 +1,4 @@
if(FSFW_ADD_SPG4_PROPAGATOR) if(FSFW_ADD_SGP4_PROPAGATOR)
target_sources(${LIB_FSFW_NAME} PRIVATE target_sources(${LIB_FSFW_NAME} PRIVATE
sgp4/sgp4unit.cpp sgp4/sgp4unit.cpp
) )

2
hal/src/fsfw-hal/common/gpio/GpioCookie.cpp
View File

@ -1,4 +1,4 @@
#include "fsfw/hal/common/gpio/GpioCookie.h" #include "fsfw-hal/common/gpio/GpioCookie.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
GpioCookie::GpioCookie() { GpioCookie::GpioCookie() {

2
hal/src/fsfw-hal/devicehandlers/GyroL3GD20Handler.cpp
View File

@ -1,4 +1,4 @@
#include "fsfw/hal/devicehandlers/GyroL3GD20Handler.h" #include "fsfw-hal/devicehandlers/GyroL3GD20Handler.h"
#include "fsfw/datapool/PoolReadGuard.h" #include "fsfw/datapool/PoolReadGuard.h"

2
hal/src/fsfw-hal/linux/UnixFileGuard.cpp
View File

@ -1,4 +1,4 @@
#include "fsfw/hal/linux/UnixFileGuard.h" #include "fsfw-hal/linux/UnixFileGuard.h"
UnixFileGuard::UnixFileGuard(std::string device, int* fileDescriptor, int flags, UnixFileGuard::UnixFileGuard(std::string device, int* fileDescriptor, int flags,
std::string diagnosticPrefix): std::string diagnosticPrefix):

6
hal/src/fsfw-hal/linux/gpio/LinuxLibgpioIF.cpp
View File

@ -1,6 +1,6 @@
#include "fsfw/hal/linux/gpio/LinuxLibgpioIF.h" #include "fsfw-hal/linux/gpio/LinuxLibgpioIF.h"
#include "fsfw/hal/common/gpio/gpioDefinitions.h" #include "fsfw-hal/common/gpio/gpioDefinitions.h"
#include "fsfw/hal/common/gpio/GpioCookie.h" #include "fsfw-hal/common/gpio/GpioCookie.h"
#include <fsfw/serviceinterface/ServiceInterface.h> #include <fsfw/serviceinterface/ServiceInterface.h>

6
hal/src/fsfw-hal/linux/i2c/I2cComIF.cpp
View File

@ -1,6 +1,6 @@
#include "fsfw/hal/linux/i2c/I2cComIF.h" #include "fsfw-hal/linux/i2c/I2cComIF.h"
#include "fsfw/hal/linux/utility.h" #include "fsfw-hal/linux/utility.h"
#include "fsfw/hal/linux/UnixFileGuard.h" #include "fsfw-hal/linux/UnixFileGuard.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"

2
hal/src/fsfw-hal/linux/i2c/I2cCookie.cpp
View File

@ -1,4 +1,4 @@
#include "fsfw/hal/linux/i2c/I2cCookie.h" #include "fsfw-hal/linux/i2c/I2cCookie.h"
I2cCookie::I2cCookie(address_t i2cAddress_, size_t maxReplyLen_, I2cCookie::I2cCookie(address_t i2cAddress_, size_t maxReplyLen_,
std::string deviceFile_) : std::string deviceFile_) :

4
hal/src/fsfw-hal/linux/rpi/GpioRPi.cpp
View File

@ -1,7 +1,7 @@
#include "fsfw/FSFW.h" #include "fsfw/FSFW.h"
#include "fsfw/hal/linux/rpi/GpioRPi.h" #include "fsfw-hal/linux/rpi/GpioRPi.h"
#include "fsfw/hal/common/gpio/GpioCookie.h" #include "fsfw-hal/common/gpio/GpioCookie.h"
#include <fsfw/serviceinterface/ServiceInterface.h> #include <fsfw/serviceinterface/ServiceInterface.h>

8
hal/src/fsfw-hal/linux/spi/SpiComIF.cpp
View File

@ -1,8 +1,8 @@
#include "fsfw/FSFW.h" #include "fsfw/FSFW.h"
#include "fsfw/hal/linux/spi/SpiComIF.h" #include "fsfw-hal/linux/spi/SpiComIF.h"
#include "fsfw/hal/linux/spi/SpiCookie.h" #include "fsfw-hal/linux/spi/SpiCookie.h"
#include "fsfw/hal/linux/utility.h" #include "fsfw-hal/linux/utility.h"
#include "fsfw/hal/linux/UnixFileGuard.h" #include "fsfw-hal/linux/UnixFileGuard.h"
#include <fsfw/ipc/MutexFactory.h> #include <fsfw/ipc/MutexFactory.h>
#include <fsfw/globalfunctions/arrayprinter.h> #include <fsfw/globalfunctions/arrayprinter.h>

2
hal/src/fsfw-hal/linux/spi/SpiComIF.h
View File

@ -3,7 +3,7 @@
#include "spiDefinitions.h" #include "spiDefinitions.h"
#include "returnvalues/classIds.h" #include "returnvalues/classIds.h"
#include "fsfw/hal/common/gpio/GpioIF.h" #include "fsfw-hal/common/gpio/GpioIF.h"
#include "fsfw/devicehandlers/DeviceCommunicationIF.h" #include "fsfw/devicehandlers/DeviceCommunicationIF.h"
#include "fsfw/objectmanager/SystemObject.h" #include "fsfw/objectmanager/SystemObject.h"

2
hal/src/fsfw-hal/linux/spi/SpiCookie.cpp
View File

@ -1,4 +1,4 @@
#include "fsfw/hal/linux/spi/SpiCookie.h" #include "fsfw-hal/linux/spi/SpiCookie.h"
SpiCookie::SpiCookie(address_t spiAddress, gpioId_t chipSelect, std::string spiDev, SpiCookie::SpiCookie(address_t spiAddress, gpioId_t chipSelect, std::string spiDev,
const size_t maxSize, spi::SpiModes spiMode, uint32_t spiSpeed): const size_t maxSize, spi::SpiModes spiMode, uint32_t spiSpeed):

2
hal/src/fsfw-hal/linux/uart/UartComIF.cpp
View File

@ -1,4 +1,4 @@
#include "fsfw/hal/linux/uart/UartComIF.h" #include "fsfw-hal/linux/uart/UartComIF.h"
#include "OBSWConfig.h" #include "OBSWConfig.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"

2
hal/src/fsfw-hal/linux/uart/UartCookie.cpp
View File

@ -1,4 +1,4 @@
#include "fsfw/hal/linux/uart/UartCookie.h" #include "fsfw-hal/linux/uart/UartCookie.h"
#include <fsfw/serviceinterface/ServiceInterface.h> #include <fsfw/serviceinterface/ServiceInterface.h>

2
hal/src/fsfw-hal/linux/utility.cpp
View File

@ -1,6 +1,6 @@
#include "fsfw/FSFW.h" #include "fsfw/FSFW.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "fsfw/hal/linux/utility.h" #include "fsfw-hal/linux/utility.h"
#include <cerrno> #include <cerrno>
#include <cstring> #include <cstring>

12
hal/src/fsfw-hal/stm32h7/devicetest/GyroL3GD20H.cpp
View File

@ -1,10 +1,10 @@
#include "fsfw/hal/stm32h7/devicetest/GyroL3GD20H.h" #include "fsfw-hal/stm32h7/devicetest/GyroL3GD20H.h"
#include "fsfw/hal/stm32h7/spi/mspInit.h" #include "fsfw-hal/stm32h7/spi/mspInit.h"
#include "fsfw/hal/stm32h7/spi/spiDefinitions.h" #include "fsfw-hal/stm32h7/spi/spiDefinitions.h"
#include "fsfw/hal/stm32h7/spi/spiCore.h" #include "fsfw-hal/stm32h7/spi/spiCore.h"
#include "fsfw/hal/stm32h7/spi/spiInterrupts.h" #include "fsfw-hal/stm32h7/spi/spiInterrupts.h"
#include "fsfw/hal/stm32h7/spi/stm32h743ziSpi.h" #include "fsfw-hal/stm32h7/spi/stm32h743ziSpi.h"
#include "fsfw/tasks/TaskFactory.h" #include "fsfw/tasks/TaskFactory.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"

2
hal/src/fsfw-hal/stm32h7/dma.cpp
View File

@ -1,4 +1,4 @@
#include <fsfw/hal/stm32h7/dma.h> #include <fsfw-hal/stm32h7/dma.h>
#include <cstdint> #include <cstdint>
#include <cstddef> #include <cstddef>

2
hal/src/fsfw-hal/stm32h7/gpio/gpio.cpp
View File

@ -1,4 +1,4 @@
#include "fsfw/hal/stm32h7/gpio/gpio.h" #include "fsfw-hal/stm32h7/gpio/gpio.h"
#include "stm32h7xx_hal_rcc.h" #include "stm32h7xx_hal_rcc.h"

12
hal/src/fsfw-hal/stm32h7/spi/SpiComIF.cpp
View File

@ -1,11 +1,11 @@
#include "fsfw/hal/stm32h7/spi/SpiComIF.h" #include "fsfw-hal/stm32h7/spi/SpiComIF.h"
#include "fsfw/hal/stm32h7/spi/SpiCookie.h" #include "fsfw-hal/stm32h7/spi/SpiCookie.h"
#include "fsfw/tasks/SemaphoreFactory.h" #include "fsfw/tasks/SemaphoreFactory.h"
#include "fsfw/hal/stm32h7/spi/spiCore.h" #include "fsfw-hal/stm32h7/spi/spiCore.h"
#include "fsfw/hal/stm32h7/spi/spiInterrupts.h" #include "fsfw-hal/stm32h7/spi/spiInterrupts.h"
#include "fsfw/hal/stm32h7/spi/mspInit.h" #include "fsfw-hal/stm32h7/spi/mspInit.h"
#include "fsfw/hal/stm32h7/gpio/gpio.h" #include "fsfw-hal/stm32h7/gpio/gpio.h"
// FreeRTOS required special Semaphore handling from an ISR. Therefore, we use the concrete // 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 // instance here, because RTEMS and FreeRTOS are the only relevant OSALs currently

2
hal/src/fsfw-hal/stm32h7/spi/SpiComIF.h
View File

@ -5,7 +5,7 @@
#include "fsfw/devicehandlers/DeviceCommunicationIF.h" #include "fsfw/devicehandlers/DeviceCommunicationIF.h"
#include "fsfw/objectmanager/SystemObject.h" #include "fsfw/objectmanager/SystemObject.h"
#include "fsfw/hal/stm32h7/spi/spiDefinitions.h" #include "fsfw-hal/stm32h7/spi/spiDefinitions.h"
#include "stm32h7xx_hal_spi.h" #include "stm32h7xx_hal_spi.h"
#include "stm32h743xx.h" #include "stm32h743xx.h"

2
hal/src/fsfw-hal/stm32h7/spi/SpiCookie.cpp
View File

@ -1,4 +1,4 @@
#include "fsfw/hal/stm32h7/spi/SpiCookie.h" #include "fsfw-hal/stm32h7/spi/SpiCookie.h"
SpiCookie::SpiCookie(address_t deviceAddress, spi::SpiBus spiIdx, spi::TransferModes transferMode, SpiCookie::SpiCookie(address_t deviceAddress, spi::SpiBus spiIdx, spi::TransferModes transferMode,

8
hal/src/fsfw-hal/stm32h7/spi/mspInit.cpp
View File

@ -1,7 +1,7 @@
#include "fsfw/hal/stm32h7/dma.h" #include "fsfw-hal/stm32h7/dma.h"
#include "fsfw/hal/stm32h7/spi/mspInit.h" #include "fsfw-hal/stm32h7/spi/mspInit.h"
#include "fsfw/hal/stm32h7/spi/spiCore.h" #include "fsfw-hal/stm32h7/spi/spiCore.h"
#include "fsfw/hal/stm32h7/spi/spiInterrupts.h" #include "fsfw-hal/stm32h7/spi/spiInterrupts.h"
#include "stm32h743xx.h" #include "stm32h743xx.h"
#include "stm32h7xx_hal_spi.h" #include "stm32h7xx_hal_spi.h"

4
hal/src/fsfw-hal/stm32h7/spi/spiCore.cpp
View File

@ -1,5 +1,5 @@
#include "fsfw/hal/stm32h7/spi/spiCore.h" #include "fsfw-hal/stm32h7/spi/spiCore.h"
#include "fsfw/hal/stm32h7/spi/spiDefinitions.h" #include "fsfw-hal/stm32h7/spi/spiDefinitions.h"
#include <cstdio> #include <cstdio>

4
hal/src/fsfw-hal/stm32h7/spi/spiCore.h
View File

@ -1,8 +1,8 @@
#ifndef FSFW_HAL_STM32H7_SPI_SPICORE_H_ #ifndef FSFW_HAL_STM32H7_SPI_SPICORE_H_
#define FSFW_HAL_STM32H7_SPI_SPICORE_H_ #define FSFW_HAL_STM32H7_SPI_SPICORE_H_
#include "fsfw/hal/stm32h7/dma.h" #include "fsfw-hal/stm32h7/dma.h"
#include "fsfw/hal/stm32h7/spi/spiDefinitions.h" #include "fsfw-hal/stm32h7/spi/spiDefinitions.h"
#include "stm32h7xx_hal.h" #include "stm32h7xx_hal.h"
#include "stm32h7xx_hal_dma.h" #include "stm32h7xx_hal_dma.h"

2
hal/src/fsfw-hal/stm32h7/spi/spiDefinitions.cpp
View File

@ -1,4 +1,4 @@
#include "fsfw/hal/stm32h7/spi/spiDefinitions.h" #include "fsfw-hal/stm32h7/spi/spiDefinitions.h"
void spi::assignSpiMode(SpiModes spiMode, SPI_HandleTypeDef& spiHandle) { void spi::assignSpiMode(SpiModes spiMode, SPI_HandleTypeDef& spiHandle) {
switch(spiMode) { switch(spiMode) {

4
hal/src/fsfw-hal/stm32h7/spi/spiInterrupts.cpp
View File

@ -1,5 +1,5 @@
#include "fsfw/hal/stm32h7/spi/spiInterrupts.h" #include "fsfw-hal/stm32h7/spi/spiInterrupts.h"
#include "fsfw/hal/stm32h7/spi/spiCore.h" #include "fsfw-hal/stm32h7/spi/spiCore.h"
#include "stm32h7xx_hal.h" #include "stm32h7xx_hal.h"
#include "stm32h7xx_hal_dma.h" #include "stm32h7xx_hal_dma.h"

6
hal/src/fsfw-hal/stm32h7/spi/stm32h743ziSpi.cpp
View File

@ -1,6 +1,6 @@
#include "fsfw/hal/stm32h7/spi/stm32h743ziSpi.h" #include "fsfw-hal/stm32h7/spi/stm32h743ziSpi.h"
#include "fsfw/hal/stm32h7/spi/spiCore.h" #include "fsfw-hal/stm32h7/spi/spiCore.h"
#include "fsfw/hal/stm32h7/spi/spiInterrupts.h" #include "fsfw-hal/stm32h7/spi/spiInterrupts.h"
#include "stm32h7xx_hal.h" #include "stm32h7xx_hal.h"
#include "stm32h7xx_hal_rcc.h" #include "stm32h7xx_hal_rcc.h"

1
src/fsfw/FSFW.h.in
View File

@ -9,5 +9,6 @@
#cmakedefine FSFW_ADD_COORDINATES #cmakedefine FSFW_ADD_COORDINATES
#cmakedefine FSFW_ADD_PUS #cmakedefine FSFW_ADD_PUS
#cmakedefine FSFW_ADD_MONITORING #cmakedefine FSFW_ADD_MONITORING
#cmakedefine FSFW_ADD_SGP4_PROPAGATOR
#endif /* FSFW_FSFW_H_ */ #endif /* FSFW_FSFW_H_ */

2
src/fsfw/coordinates/Sgp4Propagator.h
View File

@ -7,7 +7,7 @@
#ifndef PLATFORM_WIN #ifndef PLATFORM_WIN
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#include "fsfw/contrib/sgp4/sgp4unit.h" #include "fsfw-contrib/sgp4/sgp4unit.h"
#include "fsfw/returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h"
class Sgp4Propagator { class Sgp4Propagator {

5
src/fsfw/coordinates/coordinatesConf.h
View File

@ -8,4 +8,9 @@
not enabled with FSFW_ADD_COORDINATES not enabled with FSFW_ADD_COORDINATES
#endif #endif
#ifndef FSFW_ADD_SGP4_PROPAGATOR
#warning Coordinates files were included but SGP4 contributed code compilation was \
not enabled with FSFW_ADD_SGP4_PROPAGATOR
#endif
#endif /* FSFW_SRC_FSFW_COORDINATES_COORDINATESCONF_H_ */ #endif /* FSFW_SRC_FSFW_COORDINATES_COORDINATESCONF_H_ */

14
tests/src/fsfw-tests/internal/InternalUnitTester.cpp
View File

@ -1,11 +1,11 @@
#include "fsfw/tests/internal/InternalUnitTester.h" #include "fsfw-tests/internal/InternalUnitTester.h"
#include "fsfw/tests/internal/UnittDefinitions.h" #include "fsfw-tests/internal/UnittDefinitions.h"
#include "fsfw/tests/internal/osal/IntTestMq.h" #include "fsfw-tests/internal/osal/IntTestMq.h"
#include "fsfw/tests/internal/osal/IntTestSemaphore.h" #include "fsfw-tests/internal/osal/IntTestSemaphore.h"
#include "fsfw/tests/internal/osal/IntTestMutex.h" #include "fsfw-tests/internal/osal/IntTestMutex.h"
#include "fsfw/tests/internal/serialize/IntTestSerialization.h" #include "fsfw-tests/internal/serialize/IntTestSerialization.h"
#include "fsfw/tests/internal/globalfunctions/TestArrayPrinter.h" #include "fsfw-tests/internal/globalfunctions/TestArrayPrinter.h"
#include <cstdlib> #include <cstdlib>

2
tests/src/fsfw-tests/internal/UnittDefinitions.cpp
View File

@ -1,4 +1,4 @@
#include "fsfw/tests/internal/UnittDefinitions.h" #include "fsfw-tests/internal/UnittDefinitions.h"
ReturnValue_t unitt::put_error(std::string errorId) { ReturnValue_t unitt::put_error(std::string errorId) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1

2
tests/src/fsfw-tests/internal/globalfunctions/TestArrayPrinter.cpp
View File

@ -1,4 +1,4 @@
#include "fsfw/tests/internal/globalfunctions/TestArrayPrinter.h" #include "fsfw-tests/internal/globalfunctions/TestArrayPrinter.h"
void arrayprinter::testArrayPrinter() { void arrayprinter::testArrayPrinter() {
{ {

4
tests/src/fsfw-tests/internal/osal/IntTestMq.cpp
View File

@ -1,5 +1,5 @@
#include "fsfw/tests/internal/osal/IntTestMq.h" #include "fsfw-tests/internal/osal/IntTestMq.h"
#include "fsfw/tests/internal/UnittDefinitions.h" #include "fsfw-tests/internal/UnittDefinitions.h"
#include <fsfw/ipc/MessageQueueIF.h> #include <fsfw/ipc/MessageQueueIF.h>
#include <fsfw/ipc/QueueFactory.h> #include <fsfw/ipc/QueueFactory.h>

4
tests/src/fsfw-tests/internal/osal/IntTestMutex.cpp
View File

@ -1,5 +1,5 @@
#include "fsfw/tests/internal/osal/IntTestMutex.h" #include "fsfw-tests/internal/osal/IntTestMutex.h"
#include "fsfw/tests/internal/UnittDefinitions.h" #include "fsfw-tests/internal/UnittDefinitions.h"
#include <fsfw/ipc/MutexFactory.h> #include <fsfw/ipc/MutexFactory.h>

4
tests/src/fsfw-tests/internal/osal/IntTestSemaphore.cpp
View File

@ -1,5 +1,5 @@
#include "fsfw/tests/internal/osal/IntTestSemaphore.h" #include "fsfw-tests/internal/osal/IntTestSemaphore.h"
#include "fsfw/tests/internal/UnittDefinitions.h" #include "fsfw-tests/internal/UnittDefinitions.h"
#include <fsfw/tasks/SemaphoreFactory.h> #include <fsfw/tasks/SemaphoreFactory.h>
#include <fsfw/serviceinterface/ServiceInterface.h> #include <fsfw/serviceinterface/ServiceInterface.h>

4
tests/src/fsfw-tests/internal/serialize/IntTestSerialization.cpp
View File

@ -1,5 +1,5 @@
#include "fsfw/tests/internal/serialize/IntTestSerialization.h" #include "fsfw-tests/internal/serialize/IntTestSerialization.h"
#include "fsfw/tests/internal/UnittDefinitions.h" #include "fsfw-tests/internal/UnittDefinitions.h"
#include <fsfw/serialize/SerializeElement.h> #include <fsfw/serialize/SerializeElement.h>
#include <fsfw/serialize/SerialBufferAdapter.h> #include <fsfw/serialize/SerialBufferAdapter.h>