From e1f92b3da4dc1fb5adcab2785da1570030506458 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 30 Jul 2021 13:47:29 +0200 Subject: [PATCH 1/7] various fixes and improvements --- CMakeLists.txt | 5 ++++- hal/src/fsfw/hal/devicehandlers/GyroL3GD20Handler.h | 4 ++-- src/fsfw/FSFW.h.in | 4 ++++ tests/src/fsfw/tests/unit/action/TestActionHelper.cpp | 2 +- tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.h | 2 +- tests/src/fsfw/tests/unit/globalfunctions/CMakeLists.txt | 1 - 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c75d711fe..3823bedfd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ 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_ADD_HAL "Add Hardware Abstraction Layer" ON) # Optional sources option(FSFW_ADD_PUS "Compile with PUS sources" ON) @@ -94,7 +95,9 @@ message(STATUS "Compiling FSFW for the ${OS_FSFW_NAME} operating system.") add_subdirectory(src) add_subdirectory(tests) -add_subdirectory(hal) +if(FSFW_ADD_HAL) + add_subdirectory(hal) +endif() add_subdirectory(contrib) # The project CMakeLists file has to set the FSFW_CONFIG_PATH and add it. diff --git a/hal/src/fsfw/hal/devicehandlers/GyroL3GD20Handler.h b/hal/src/fsfw/hal/devicehandlers/GyroL3GD20Handler.h index f82ba9359..020c5a32e 100644 --- a/hal/src/fsfw/hal/devicehandlers/GyroL3GD20Handler.h +++ b/hal/src/fsfw/hal/devicehandlers/GyroL3GD20Handler.h @@ -1,14 +1,14 @@ #ifndef MISSION_DEVICES_GYROL3GD20HANDLER_H_ #define MISSION_DEVICES_GYROL3GD20HANDLER_H_ -#include "OBSWConfig.h" +#include "fsfw/FSFW.h" #include "devicedefinitions/GyroL3GD20Definitions.h" #include #include #ifndef FSFW_HAL_L3GD20_GYRO_DEBUG -#define FSFW_HAL_L3GD20_GYRO_DEBUG 1 +#define FSFW_HAL_L3GD20_GYRO_DEBUG 0 #endif /* FSFW_HAL_L3GD20_GYRO_DEBUG */ /** diff --git a/src/fsfw/FSFW.h.in b/src/fsfw/FSFW.h.in index 9b74d04c8..a23ef43fb 100644 --- a/src/fsfw/FSFW.h.in +++ b/src/fsfw/FSFW.h.in @@ -10,4 +10,8 @@ #cmakedefine FSFW_ADD_PUS #cmakedefine FSFW_ADD_MONITORING +#ifndef FSFW_HAL_L3GD20_GYRO_DEBUG +#define FSFW_HAL_L3GD20_GYRO_DEBUG 0 +#endif /* FSFW_HAL_L3GD20_GYRO_DEBUG */ + #endif /* FSFW_FSFW_H_ */ diff --git a/tests/src/fsfw/tests/unit/action/TestActionHelper.cpp b/tests/src/fsfw/tests/unit/action/TestActionHelper.cpp index d8bd58c99..126979f64 100644 --- a/tests/src/fsfw/tests/unit/action/TestActionHelper.cpp +++ b/tests/src/fsfw/tests/unit/action/TestActionHelper.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include diff --git a/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.h b/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.h index 4c244b169..c0e41ddf6 100644 --- a/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.h +++ b/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include namespace lpool { diff --git a/tests/src/fsfw/tests/unit/globalfunctions/CMakeLists.txt b/tests/src/fsfw/tests/unit/globalfunctions/CMakeLists.txt index 4ea49bf74..8e57e01be 100644 --- a/tests/src/fsfw/tests/unit/globalfunctions/CMakeLists.txt +++ b/tests/src/fsfw/tests/unit/globalfunctions/CMakeLists.txt @@ -1,3 +1,2 @@ target_sources(${TARGET_NAME} PRIVATE - TestArrayPrinter.cpp ) From 0b207b2b1a73f098db898d2b4f4cbba3855a7c4b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 30 Jul 2021 14:18:47 +0200 Subject: [PATCH 2/7] updated user folder --- src/fsfw/serviceinterface/ServiceInterface.h | 2 +- tests/user/CMakeLists.txt | 46 +- .../testcfg/{FSFWConfig.h => FSFWConfig.h.in} | 28 +- tests/user/testcfg/Makefile-FSFW-Tests | 416 ------------------ tests/user/testcfg/OBSWConfig.h.in | 8 + tests/user/testcfg/TestsConfig.h | 8 - tests/user/testcfg/TestsConfig.h.in | 19 + tests/user/testcfg/cdatapool/dataPoolInit.cpp | 5 - tests/user/testcfg/cdatapool/dataPoolInit.h | 17 - tests/user/testcfg/objects/systemObjectList.h | 9 +- .../PollingSequenceFactory.cpp | 18 +- tests/user/testcfg/testcfg.mk | 8 - 12 files changed, 103 insertions(+), 481 deletions(-) rename tests/user/testcfg/{FSFWConfig.h => FSFWConfig.h.in} (68%) delete mode 100644 tests/user/testcfg/Makefile-FSFW-Tests create mode 100644 tests/user/testcfg/OBSWConfig.h.in delete mode 100644 tests/user/testcfg/TestsConfig.h create mode 100644 tests/user/testcfg/TestsConfig.h.in delete mode 100644 tests/user/testcfg/cdatapool/dataPoolInit.cpp delete mode 100644 tests/user/testcfg/cdatapool/dataPoolInit.h delete mode 100644 tests/user/testcfg/testcfg.mk diff --git a/src/fsfw/serviceinterface/ServiceInterface.h b/src/fsfw/serviceinterface/ServiceInterface.h index e95dd9a47..9f05b96cc 100644 --- a/src/fsfw/serviceinterface/ServiceInterface.h +++ b/src/fsfw/serviceinterface/ServiceInterface.h @@ -1,7 +1,7 @@ #ifndef FSFW_SERVICEINTERFACE_SERVICEINTERFACE_H_ #define FSFW_SERVICEINTERFACE_SERVICEINTERFACE_H_ -#include +#include "fsfw/FSFW.h" #include "serviceInterfaceDefintions.h" #if FSFW_CPP_OSTREAM_ENABLED == 1 diff --git a/tests/user/CMakeLists.txt b/tests/user/CMakeLists.txt index 722cc424c..e95edc2be 100644 --- a/tests/user/CMakeLists.txt +++ b/tests/user/CMakeLists.txt @@ -12,6 +12,7 @@ cmake_minimum_required(VERSION 3.13) # set(CMAKE_VERBOSE TRUE) +# set(CODE_COVERAGE_VERBOSE TRUE) set(CMAKE_SCRIPT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") @@ -21,6 +22,8 @@ option(GENERATE_COVERAGE TRUE ) +set(FSFW_ADD_UNITTESTS ON) + if(TMTC_TEST) set(LINK_CATCH2 FALSE) else() @@ -28,8 +31,8 @@ else() endif() # Tests can be built with the Host OSAL or with the Linux OSAL. -if(NOT OS_FSFW) - set(OS_FSFW host CACHE STRING "OS for the FSFW.") +if(NOT FSFW_OSAL) + set(FSFW_OSAL host CACHE STRING "OS for the FSFW.") endif() option(CUSTOM_UNITTEST_RUNNER @@ -41,7 +44,7 @@ option(CUSTOM_UNITTEST_RUNNER #pre_project_config() # Project Name -project(fsfw_tests C CXX) +project(fsfw-tests C CXX) ################################################################################ # Pre-Sources preparation @@ -71,7 +74,7 @@ set(TMTC_TEST_PATH tests) # determine BSP_PATH # FreeRTOS -if(${OS_FSFW} STREQUAL linux) +if(FSFW_OSAL STREQUAL linux) add_definitions(-DUNIX -DLINUX) find_package(Threads REQUIRED) # Hosted @@ -94,6 +97,11 @@ if(GENERATE_COVERAGE) endif() set(FSFW_CONFIG_PATH testcfg) +set(FSFW_ADDITIONAL_INC_PATHS ${CMAKE_CURRENT_BINARY_DIR}) + +configure_file(${FSFW_CONFIG_PATH}/FSFWConfig.h.in FSFWConfig.h) +configure_file(${FSFW_CONFIG_PATH}/OBSWConfig.h.in OBSWConfig.h) +configure_file(${FSFW_CONFIG_PATH}/TestsConfig.h.in TestsConfig.h) ################################################################################ # Executable and Sources @@ -108,10 +116,16 @@ add_subdirectory(${FSFW_CONFIG_PATH}) if(LINK_CATCH2) add_subdirectory(${CATCH2_PATH}) - add_subdirectory(${FSFW_TESTS_PATH}) add_subdirectory(${TEST_SETUP_PATH}) else() + target_compile_definitions(${TARGET_NAME} PRIVATE + FSFW_DISABLE_PRINTOUT=0 + ) + target_compile_definitions(${LIB_FSFW_NAME} PRIVATE + FSFW_DISABLE_PRINTOUT=0 + ) add_subdirectory(${TMTC_TEST_PATH}) + add_subdirectory(${FSFW_TESTS_PATH}) endif() @@ -132,7 +146,7 @@ endif() if(GENERATE_COVERAGE) if(CMAKE_COMPILER_IS_GNUCXX) - set(CODE_COVERAGE_VERBOSE TRUE) + # set(CODE_COVERAGE_VERBOSE TRUE) include(CodeCoverage) # Remove quotes. @@ -194,6 +208,7 @@ endif() target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${FSFW_CONFIG_PATH} + ${CMAKE_CURRENT_BINARY_DIR} ) if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") @@ -225,12 +240,9 @@ if(CMAKE_VERBOSE) message(STATUS "Warning flags: ${WARNING_FLAGS}") endif() - # Compile options for all sources. target_compile_options(${TARGET_NAME} PRIVATE - $<$:${WARNING_FLAGS} ${COMPILER_FLAGS}> - $<$:${WARNING_FLAGS} ${COMPILER_FLAGS}> - ${ABI_FLAGS} + ${WARNING_FLAGS} ) if(NOT CMAKE_SIZE) @@ -240,12 +252,16 @@ if(NOT CMAKE_SIZE) endif() endif() +string(CONCAT POST_BUILD_COMMENT + "Build directory: ${CMAKE_BINARY_DIR}\n" + "Target OSAL: ${FSFW_OSAL}\n" + "Target Build Type: ${CMAKE_BUILD_TYPE}" +) + add_custom_command(TARGET ${TARGET_NAME} - POST_BUILD - COMMAND echo "Build directory: ${CMAKE_BINARY_DIR}" - COMMAND echo "Target OSAL: ${OS_FSFW}" - COMMAND echo "Target Build Type: ${CMAKE_BUILD_TYPE}" - COMMAND ${CMAKE_SIZE} ${TARGET_NAME}${FILE_SUFFIX} + POST_BUILD + COMMAND ${CMAKE_SIZE} ${TARGET_NAME}${FILE_SUFFIX} + COMMENT ${POST_BUILD_COMMENT} ) include (${CMAKE_SCRIPT_PATH}/BuildType.cmake) diff --git a/tests/user/testcfg/FSFWConfig.h b/tests/user/testcfg/FSFWConfig.h.in similarity index 68% rename from tests/user/testcfg/FSFWConfig.h rename to tests/user/testcfg/FSFWConfig.h.in index ed86e6e1f..d38f0648f 100644 --- a/tests/user/testcfg/FSFWConfig.h +++ b/tests/user/testcfg/FSFWConfig.h.in @@ -7,18 +7,24 @@ //! Used to determine whether C++ ostreams are used which can increase //! the binary size significantly. If this is disabled, //! the C stdio functions can be used alternatively -#define FSFW_CPP_OSTREAM_ENABLED 1 +#define FSFW_CPP_OSTREAM_ENABLED 0 -//! More FSFW related printouts depending on level. Useful for development. -#define FSFW_VERBOSE_LEVEL 1 +//! More FSFW related printouts. Useful for development. +#define FSFW_ENHANCED_PRINTOUT 0 //! Can be used to completely disable printouts, even the C stdio ones. -#if FSFW_CPP_OSTREAM_ENABLED == 0 && FSFW_VERBOSE_LEVEL == 0 - #define FSFW_DISABLE_PRINTOUT 0 +//! By default, printouts will be disabled for the unit tests. +#if FSFW_CPP_OSTREAM_ENABLED == 0 && FSFW_ENHANCED_PRINTOUT == 0 + #ifndef FSFW_DISABLE_PRINTOUT + #define FSFW_DISABLE_PRINTOUT 1 + #endif #endif +//! Can be used to enable additional debugging printouts for developing the FSFW +#define FSFW_PRINT_VERBOSITY_LEVEL 0 + //! Can be used to disable the ANSI color sequences for C stdio. -#define FSFW_COLORED_OUTPUT 1 +#define FSFW_COLORED_OUTPUT 0 //! If FSFW_OBJ_EVENT_TRANSLATION is set to one, //! additional output which requires the translation files translateObjects @@ -40,6 +46,13 @@ //! Specify whether a special mode store is used for Subsystem components. #define FSFW_USE_MODESTORE 0 +//! Defines if the real time scheduler for linux should be used. +//! If set to 0, this will also disable priority settings for linux +//! as most systems will not allow to set nice values without privileges +//! For embedded linux system set this to 1. +//! If set to 1 the binary needs "cap_sys_nice=eip" privileges to run +#define FSFW_USE_REALTIME_FOR_LINUX 1 + namespace fsfwconfig { //! Default timestamp size. The default timestamp will be an eight byte CDC //! short timestamp. @@ -57,6 +70,9 @@ static constexpr size_t FSFW_EVENTMGMR_RANGEMATCHERS = 120; static constexpr uint8_t FSFW_CSB_FIFO_DEPTH = 6; static constexpr size_t FSFW_PRINT_BUFFER_SIZE = 124; + +static constexpr size_t FSFW_MAX_TM_PACKET_SIZE = 1500; + } #endif /* CONFIG_FSFWCONFIG_H_ */ diff --git a/tests/user/testcfg/Makefile-FSFW-Tests b/tests/user/testcfg/Makefile-FSFW-Tests deleted file mode 100644 index 550fd1dee..000000000 --- a/tests/user/testcfg/Makefile-FSFW-Tests +++ /dev/null @@ -1,416 +0,0 @@ -#------------------------------------------------------------------------------- -# Makefile for FSFW Test -#------------------------------------------------------------------------------- -# User-modifiable options -#------------------------------------------------------------------------------- -# Fundamentals on the build process of C/C++ Software: -# https://www3.ntu.edu.sg/home/ehchua/programming/cpp/gcc_make.html - -# Make documentation: https://www.gnu.org/software/make/manual/make.pdf -# Online: https://www.gnu.org/software/make/manual/make.html -# General rules: http://make.mad-scientist.net/papers/rules-of-makefiles/#rule3 -SHELL = /bin/sh - -# Chip & board used for compilation -# (can be overriden by adding CHIP=chip and BOARD=board to the command-line) -# Unit Test can only be run on host machine for now (Linux) -FRAMEWORK_PATH = fsfw -TEST_FILE_ROOT = $(FRAMEWORK_PATH)/unittest -BOARD = unittest -LINUX = 1 -OS_FSFW = linux -CUSTOM_DEFINES += -D$(OS_FSFW) - -# Copied from stackoverflow, can be used to differentiate between Windows -# and Linux -ifeq ($(OS),Windows_NT) - CUSTOM_DEFINES += -DWIN32 - ifeq ($(PROCESSOR_ARCHITEW6432),AMD64) - CUSTOM_DEFINES += -DAMD64 - else - ifeq ($(PROCESSOR_ARCHITECTURE),AMD64) - CUSTOM_DEFINES += -DAMD64 - endif - ifeq ($(PROCESSOR_ARCHITECTURE),x86) - CUSTOM_DEFINES += -DIA32 - endif - endif -else - UNAME_S := $(shell uname -s) - ifeq ($(UNAME_S),Linux) - DETECTED_OS = LINUX - CUSTOM_DEFINES += -DLINUX - endif - ifeq ($(UNAME_S),Darwin) - CUSTOM_DEFINES += -DOSX - endif - UNAME_P := $(shell uname -p) - ifeq ($(UNAME_P),x86_64) - CUSTOM_DEFINES += -DAMD64 - endif - ifneq ($(filter %86,$(UNAME_P)),) - CUSTOM_DEFINES += -DIA32 - endif - ifneq ($(filter arm%,$(UNAME_P)),) - CUSTOM_DEFINES += -DARM - endif -endif - -UNIT_TEST = 1 -# General folder paths -CONFIG_PATH = testcfg -# Core copy has to be copied as well. -CORE_PATH = core -UNIT_TEST_PATH = $(TEST_FILE_ROOT)/tests - -# Output file basename -BASENAME = fsfw -BINARY_NAME := $(BASENAME)-$(BOARD) -# Output files will be put in this directory inside -OUTPUT_FOLDER = $(OS) - -# Optimization level. Optimized for debugging. -OPTIMIZATION = -O0 - -# Default debug output. Optimized for debugging. -DEBUG_LEVEL = -g3 - -ifdef GCOV -CUSTOM_DEFINES += -DGCOV -endif - - -# Output directories -BUILDPATH = _bin -DEPENDPATH = _dep -OBJECTPATH = _obj - -ifeq ($(MAKECMDGOALS),mission) -BUILD_FOLDER = mission -else -BUILD_FOLDER = devel -endif - -DEPENDDIR = $(DEPENDPATH)/$(OUTPUT_FOLDER)/$(BUILD_FOLDER) -OBJDIR = $(OBJECTPATH)/$(OUTPUT_FOLDER)/$(BUILD_FOLDER) -BINDIR = $(BUILDPATH) - -CLEANDEP = $(DEPENDPATH)/$(OUTPUT_FOLDER) -CLEANOBJ = $(OBJECTPATH)/$(OUTPUT_FOLDER) -CLEANBIN = $(BUILDPATH) -#------------------------------------------------------------------------------- -# Tools and Includes -#------------------------------------------------------------------------------- - -# Tool suffix when cross-compiling -CROSS_COMPILE = - -# C Compiler -CC = $(CROSS_COMPILE)gcc - -# C++ compiler -CXX = $(CROSS_COMPILE)g++ - -# Additional Tools -SIZE = $(CROSS_COMPILE)size -STRIP = $(CROSS_COMPILE)strip -CP = $(CROSS_COMPILE)objcopy - -HEXCOPY = $(CP) -O ihex -BINCOPY = $(CP) -O binary -# files to be compiled, will be filled in by include makefiles -# := assignment is neccessary so we get all paths right -# https://www.gnu.org/software/make/manual/html_node/Flavors.html -CSRC := -CXXSRC := -ASRC := -INCLUDES := - -# Directories where $(directoryname).mk files should be included from -SUBDIRS := $(FRAMEWORK_PATH) $(TEST_PATH) $(UNIT_TEST_PATH) $(CONFIG_PATH) \ - $(CORE_PATH) - - -I_INCLUDES += $(addprefix -I, $(INCLUDES)) - -# This is a hack from http://make.mad-scientist.net/the-eval-function/ -# -# The problem is, that included makefiles should be aware of their relative path -# but not need to guess or hardcode it. So we set $(CURRENTPATH) for them. If -# we do this globally and the included makefiles want to include other makefiles as -# well, they would overwrite $(CURRENTPATH), screwing the include after them. -# -# By using a for-loop with an eval'd macro, we can generate the code to include all -# sub-makefiles (with the correct $(CURRENTPATH) set) before actually evaluating -# (and by this possibly changing $(CURRENTPATH)) them. -# -# This works recursively, if an included makefile wants to include, it can safely set -# $(SUBDIRS) (which has already been evaluated here) and do -# "$(foreach S,$(SUBDIRS),$(eval $(INCLUDE_FILE)))" -# $(SUBDIRS) must be relative to the project root, so to include subdir foo, set -# $(SUBDIRS) = $(CURRENTPATH)/foo. -define INCLUDE_FILE -CURRENTPATH := $S -include $(S)/$(notdir $S).mk -endef -$(foreach S,$(SUBDIRS),$(eval $(INCLUDE_FILE))) - -INCLUDES += $(TEST_FILE_ROOT) -INCLUDES += $(TEST_FILE_ROOT)/catch2/ - -#------------------------------------------------------------------------------- -# Source Files -#------------------------------------------------------------------------------- - -# All source files which are not includes by the .mk files are added here -# Please ensure that no files are included by both .mk file and here ! - -# if a target is not listed in the current directory, -# make searches in the directories specified with VPATH - -# All C Sources included by .mk files are assigned here -# Add the objects to sources so dependency handling works -C_OBJECTS += $(CSRC:.c=.o) - -# Objects built from Assembly source files -ASM_OBJECTS = $(ASRC:.S=.o) - -# Objects built from C++ source files -CXX_OBJECTS += $(CXXSRC:.cpp=.o) - -#------------------------------------------------------------------------------- -# Build Configuration + Output -#------------------------------------------------------------------------------- - -TARGET = Debug build. -DEBUG_MESSAGE = Off -OPTIMIZATION_MESSAGE = Off - -# Define Messages -MSG_INFO = Software: Hosted unittest \(Catch2\) for the FSFW. -MSG_OPTIMIZATION = Optimization: $(OPTIMIZATION), $(OPTIMIZATION_MESSAGE) -MSG_TARGET = Target Build: $(TARGET) -MSG_DEBUG = Debug level: $(DEBUG_LEVEL), FSFW Debugging: $(DEBUG_MESSAGE) - -MSG_LINKING = Linking: -MSG_COMPILING = Compiling: -MSG_ASSEMBLING = Assembling: -MSG_DEPENDENCY = Collecting dependencies for: -MSG_BINARY = Generate binary: - -# See https://stackoverflow.com/questions/6687630/how-to-remove-unused-c-c-symbols-with-gcc-and-ld -# Used to throw away unused code. Reduces code size significantly ! -# -Wl,--gc-sections: needs to be passed to the linker to throw aways unused code -ifdef KEEP_UNUSED_CODE -PROTOTYPE_OPTIMIZATION = -UNUSED_CODE_REMOVAL = -else -PROTOTYPE_OPTIMIZATION = -ffunction-sections -fdata-sections -UNUSED_CODE_REMOVAL = -Wl,--gc-sections -# Link time optimization -# See https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html for reference -# Link time is larger and size of object files can not be retrieved -# but resulting binary is smaller. Could be used in mission/deployment build -# Requires -ffunction-section in linker call -LINK_TIME_OPTIMIZATION = -flto -OPTIMIZATION += $(PROTOTYPE_OPTIMIZATION) -endif - -# Dependency Flags -# These flags tell the compiler to build dependencies -# See: https://www.gnu.org/software/make/manual/html_node/Automatic-Prerequisites.html -# Using following guide: http://make.mad-scientist.net/papers/advanced-auto-dependency-generation/#combine -DEPFLAGS = -MT $@ -MMD -MP -MF $(DEPENDDIR)/$*.d - -# Flags for the compiler call -# - std: Which C++ version to use. Common versions: c++11, c++14 and c++17 -# - Wall: enable all warnings -# - Wextra: enable extra warnings -# - g: defines debug level -# - fmessage-length: to control the formatting algorithm for diagnostic messages; -# =0 means no line-wrapping is done; each error message appears on a single line -# - fno-exceptions: stops generating extra code needed to propagate exceptions, -# which can produce significant data size overhead -CUSTOM_DEFINES += -DUNIT_TEST -WARNING_FLAGS = -Wall -Wshadow=local -Wextra -Wimplicit-fallthrough=1 \ - -Wno-unused-parameter - -CXXDEFINES := $(CUSTOM_DEFINES) -CFLAGS += -CXXFLAGS += -I. $(DEBUG_LEVEL) $(WARNING_FLAGS) $(DEPFLAGS) -fmessage-length=0 $(OPTIMIZATION)\ - $(I_INCLUDES) $(CXXDEFINES) -CPPFLAGS += -std=c++11 - -# Flags for the linker call -# LINK_INCLUDES specify the path to used libraries and the linker script -# LINK_LIBRARIES: Link real time support -LDFLAGS := $(DEBUG_LEVEL) $(UNUSED_CODE_REMOVAL) $(OPTIMIZATION) -pthread -LINK_INCLUDES := -LINK_LIBRARIES := - -ifdef LINUX -LINK_LIBRARIES += -lrt -endif - -ifeq ($(OS),Windows_NT) -LINK_LIBRARIES += -lwsock32 -lws2_32 -LDFLASGS += -fuse-ld=lld -endif - -# Gnu Coverage Tools Flags -ifdef GCOV -GCOV_CXXFLAGS = -fprofile-arcs -ftest-coverage --coverage -fno-inline \ - -fno-inline-small-functions -fno-default-inline -CXXFLAGS += $(GCOV_CXXFLAGS) -GCOV_LINKER_LIBS = -lgcov -fprofile-arcs -ftest-coverage -LINK_LIBRARIES += $(GCOV_LINKER_LIBS) -endif - -# $(info $${CXXFLAGS} is [${CXXFLAGS}]) - -#------------------------------------------------------------------------------- -# Rules -#------------------------------------------------------------------------------- -# the call function assigns parameters to temporary variables -# https://www.gnu.org/software/make/manual/make.html#Call-Function -# $(1) = Memory names -# Rules are called for each memory type -# Two Expansion Symbols $$ are to escape the dollar sign for eval. -# See: http://make.mad-scientist.net/the-eval-function/ - -default: all - -# Cleans all files -hardclean: - -rm -rf $(BUILDPATH) - -rm -rf $(OBJECTPATH) - -rm -rf $(DEPENDPATH) - -# Only clean files for current build -clean: - -rm -rf $(CLEANOBJ) - -rm -rf $(CLEANBIN) - -rm -rf $(CLEANDEP) - -# Only clean binaries. Useful for changing the binary type when object files -# are already compiled so complete rebuild is not necessary -cleanbin: - -rm -rf $(CLEANBIN) - -# In this section, the binaries are built for all selected memories -# notestfw: all -all: executable - -# Build target configuration -release: OPTIMIZATION = -Os $(PROTOTYPE_OPTIMIZATION) $(LINK_TIME_OPTIMIZATION) -release: LINK_TIME_OPTIMIZATION = -flto -release: TARGET = Mission build. -release: OPTIMIZATION_MESSAGE = On with Link Time Optimization - -debug: CXXDEFINES += -DDEBUG -debug: TARGET = Debug -debug: DEBUG_MESSAGE = On - -ifndef KEEP_UNUSED_CODE -debug release: OPTIMIZATION_MESSAGE += , no unused code removal -endif - -debug release notestfw: executable - -executable: $(BINDIR)/$(BINARY_NAME).elf - @echo - @echo $(MSG_INFO) - @echo $(MSG_TARGET) - @echo $(MSG_OPTIMIZATION) - @echo $(MSG_DEBUG) - -C_OBJECTS_PREFIXED = $(addprefix $(OBJDIR)/, $(C_OBJECTS)) -CXX_OBJECTS_PREFIXED = $(addprefix $(OBJDIR)/, $(CXX_OBJECTS)) -ASM_OBJECTS_PREFIXED = $(addprefix $(OBJDIR)/, $(ASM_OBJECTS)) -ALL_OBJECTS = $(ASM_OBJECTS_PREFIXED) $(C_OBJECTS_PREFIXED) \ - $(CXX_OBJECTS_PREFIXED) - -# Useful for debugging the Makefile -# Also see: https://www.oreilly.com/openbook/make3/book/ch12.pdf -# $(info $${ALL_OBJECTS} is [${ALL_OBJECTS}]) -# $(info $${CXXSRC} is [${CXXSRC}]) - -# Automatic variables are used here extensively. Some of them -# are escaped($$) to suppress immediate evaluation. The most important ones are: -# $@: Name of Target (left side of rule) -# $<: Name of the first prerequisite (right side of rule) -# @^: List of all prerequisite, omitting duplicates -# @D: Directory and file-within-directory part of $@ - -# Generates binary and displays all build properties -# -p with mkdir ignores error and creates directory when needed. - -# SHOW_DETAILS = 1 - - -# Link with required libraries: HAL (Hardware Abstraction Layer) and -# HCC (File System Library) -$(BINDIR)/$(BINARY_NAME).elf: $(ALL_OBJECTS) - @echo - @echo $(MSG_LINKING) Target $@ - @mkdir -p $(@D) -ifdef SHOW_DETAILS - $(CXX) $(LDFLAGS) $(LINK_INCLUDES) -o $@ $^ $(LINK_LIBRARIES) -else - @$(CXX) $(LDFLAGS) $(LINK_INCLUDES) -o $@ $^ $(LINK_LIBRARIES) -endif -ifeq ($(BUILD_FOLDER), mission) -# With Link Time Optimization, section size is not available - $(SIZE) $@ -else - $(SIZE) $^ $@ -endif - -$(BINDIR)/$(BINARY_NAME).hex: $(BINDIR)/$(BINARY_NAME).elf - @echo - @echo $(MSG_BINARY) - @mkdir -p $(@D) - $(HEXCOPY) $< $@ - -# Build new objects for changed dependencies. -$(OBJDIR)/%.o: %.cpp -$(OBJDIR)/%.o: %.cpp $(DEPENDDIR)/%.d | $(DEPENDDIR) - @echo - @echo $(MSG_COMPILING) $< - @mkdir -p $(@D) -ifdef SHOW_DETAILS - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< -else - @$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< -endif - -$(OBJDIR)/%.o: %.c -$(OBJDIR)/%.o: %.c $(DEPENDDIR)/%.d | $(DEPENDDIR) - @echo - @echo $(MSG_COMPILING) $< - @mkdir -p $(@D) -ifdef SHOW_DETAILS - $(CC) $(CXXFLAGS) $(CFLAGS) -c -o $@ $< -else - @$(CC) $(CXXFLAGS) $(CFLAGS) -c -o $@ $< -endif - -#------------------------------------------------------------------------------- -# Dependency Handling -#------------------------------------------------------------------------------- - -# Dependency Handling according to following guide: -# http://make.mad-scientist.net/papers/advanced-auto-dependency-generation/ -$(DEPENDDIR): - @mkdir -p $(@D) -DEPENDENCY_RELATIVE = $(CSRC:.c=.d) $(CXXSRC:.cpp=.d) -# This is the list of all dependencies -DEPFILES = $(addprefix $(DEPENDDIR)/, $(DEPENDENCY_RELATIVE)) -# Create subdirectories for dependencies -$(DEPFILES): - @mkdir -p $(@D) -# Include all dependencies -include $(wildcard $(DEPFILES)) - -# .PHONY tells make that these targets aren't files -.PHONY: clean release debug all hardclean cleanbin diff --git a/tests/user/testcfg/OBSWConfig.h.in b/tests/user/testcfg/OBSWConfig.h.in new file mode 100644 index 000000000..34eda31f0 --- /dev/null +++ b/tests/user/testcfg/OBSWConfig.h.in @@ -0,0 +1,8 @@ +#ifndef TESTCFG_OBSWCONFIG_H_ +#define TESTCFG_OBSWCONFIG_H_ + + + + + +#endif /* TESTCFG_OBSWCONFIG_H_ */ diff --git a/tests/user/testcfg/TestsConfig.h b/tests/user/testcfg/TestsConfig.h deleted file mode 100644 index cd967fa73..000000000 --- a/tests/user/testcfg/TestsConfig.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef FSFW_UNITTEST_CONFIG_TESTSCONFIG_H_ -#define FSFW_UNITTEST_CONFIG_TESTSCONFIG_H_ - - -#define CUSTOM_UNITTEST_RUNNER 0 - - -#endif /* FSFW_UNITTEST_CONFIG_TESTSCONFIG_H_ */ diff --git a/tests/user/testcfg/TestsConfig.h.in b/tests/user/testcfg/TestsConfig.h.in new file mode 100644 index 000000000..0341583de --- /dev/null +++ b/tests/user/testcfg/TestsConfig.h.in @@ -0,0 +1,19 @@ +#ifndef FSFW_UNITTEST_CONFIG_TESTSCONFIG_H_ +#define FSFW_UNITTEST_CONFIG_TESTSCONFIG_H_ + +#ifdef __cplusplus + +#include "objects/systemObjectList.h" +#include "events/subsystemIdRanges.h" +#include "returnvalues/classIds.h" + +namespace config { +#endif + +/* Add mission configuration flags here */ + +#ifdef __cplusplus +} +#endif + +#endif /* FSFW_UNITTEST_CONFIG_TESTSCONFIG_H_ */ diff --git a/tests/user/testcfg/cdatapool/dataPoolInit.cpp b/tests/user/testcfg/cdatapool/dataPoolInit.cpp deleted file mode 100644 index ad2dc4ef5..000000000 --- a/tests/user/testcfg/cdatapool/dataPoolInit.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "dataPoolInit.h" - -void datapool::dataPoolInit(std::map * poolMap) { - -} diff --git a/tests/user/testcfg/cdatapool/dataPoolInit.h b/tests/user/testcfg/cdatapool/dataPoolInit.h deleted file mode 100644 index 9425d7678..000000000 --- a/tests/user/testcfg/cdatapool/dataPoolInit.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef HOSTED_CONFIG_CDATAPOOL_DATAPOOLINIT_H_ -#define HOSTED_CONFIG_CDATAPOOL_DATAPOOLINIT_H_ - -#include -#include -#include -#include - - -namespace datapool { - void dataPoolInit(std::map * poolMap); - - enum datapoolvariables { - NO_PARAMETER = 0, - }; -} -#endif /* CONFIG_CDATAPOOL_DATAPOOLINIT_H_ */ diff --git a/tests/user/testcfg/objects/systemObjectList.h b/tests/user/testcfg/objects/systemObjectList.h index 76f1ff90c..efd21e0de 100644 --- a/tests/user/testcfg/objects/systemObjectList.h +++ b/tests/user/testcfg/objects/systemObjectList.h @@ -15,14 +15,17 @@ namespace objects { PUS_DISTRIBUTOR = 11, TM_FUNNEL = 12, - TCPIP_BRIDGE = 15, - TCPIP_HELPER = 16, + UDP_BRIDGE = 15, + UDP_POLLING_TASK = 16, TEST_ECHO_COM_IF = 20, TEST_DEVICE = 21, HK_RECEIVER_MOCK = 22, - TEST_LOCAL_POOL_OWNER_BASE = 25 + TEST_LOCAL_POOL_OWNER_BASE = 25, + + SHARED_SET_ID = 26 + }; } diff --git a/tests/user/testcfg/pollingsequence/PollingSequenceFactory.cpp b/tests/user/testcfg/pollingsequence/PollingSequenceFactory.cpp index b7f1fb3e1..e3ee874a4 100644 --- a/tests/user/testcfg/pollingsequence/PollingSequenceFactory.cpp +++ b/tests/user/testcfg/pollingsequence/PollingSequenceFactory.cpp @@ -1,6 +1,8 @@ #include "PollingSequenceFactory.h" -#include +#include + +#include #include #include @@ -10,14 +12,26 @@ ReturnValue_t pst::pollingSequenceInitDefault( uint32_t length = thisSequence->getPeriodMs(); /* Add polling sequence table here */ + thisSequence->addSlot(objects::TEST_DEVICE, 0, + DeviceHandlerIF::PERFORM_OPERATION); + thisSequence->addSlot(objects::TEST_DEVICE, 0.3, + DeviceHandlerIF::SEND_WRITE); + thisSequence->addSlot(objects::TEST_DEVICE, 0.45 * length, + DeviceHandlerIF::GET_WRITE); + thisSequence->addSlot(objects::TEST_DEVICE, 0.6 * length, + DeviceHandlerIF::SEND_READ); + thisSequence->addSlot(objects::TEST_DEVICE, 0.8 * length, + DeviceHandlerIF::GET_READ); if (thisSequence->checkSequence() == HasReturnvaluesIF::RETURN_OK) { return HasReturnvaluesIF::RETURN_OK; } else { -#if FSFW_CPP_OSTREAM_ENABLED == 1 +#if FSFW_CPP_OSTREAM_ENABLED sif::error << "pst::pollingSequenceInitDefault: Sequence invalid!" << std::endl; +#else + sif::printError("pst::pollingSequenceInitDefault: Sequence invalid!"); #endif return HasReturnvaluesIF::RETURN_FAILED; } diff --git a/tests/user/testcfg/testcfg.mk b/tests/user/testcfg/testcfg.mk deleted file mode 100644 index fca2f7327..000000000 --- a/tests/user/testcfg/testcfg.mk +++ /dev/null @@ -1,8 +0,0 @@ -CXXSRC += $(wildcard $(CURRENTPATH)/cdatapool/*.cpp) -CXXSRC += $(wildcard $(CURRENTPATH)/ipc/*.cpp) -CXXSRC += $(wildcard $(CURRENTPATH)/objects/*.cpp) -CXXSRC += $(wildcard $(CURRENTPATH)/pollingsequence/*.cpp) -CXXSRC += $(wildcard $(CURRENTPATH)/events/*.cpp) -CXXSRC += $(wildcard $(CURRENTPATH)/*.cpp) - -INCLUDES += $(CURRENTPATH) From 490ab440e5917af11ebb474098e0671acfe8d403 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 30 Jul 2021 14:21:37 +0200 Subject: [PATCH 3/7] smaller tweaks in CMakelists files --- tests/CMakeLists.txt | 1 - tests/user/CMakeLists.txt | 12 ------------ 2 files changed, 13 deletions(-) delete mode 100644 tests/CMakeLists.txt diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt deleted file mode 100644 index febd4f0ab..000000000 --- a/tests/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(src) diff --git a/tests/user/CMakeLists.txt b/tests/user/CMakeLists.txt index e95edc2be..df16c7567 100644 --- a/tests/user/CMakeLists.txt +++ b/tests/user/CMakeLists.txt @@ -1,8 +1,5 @@ ################################################################################ # CMake support for the Flight Software Framework Tests -# -# Developed in an effort to replace Make with a modern build system. -# # Author: R. Mueller ################################################################################ @@ -39,10 +36,6 @@ option(CUSTOM_UNITTEST_RUNNER "Specify whether custom main or Catch2 main is used" TRUE ) -# Perform steps like loading toolchain files where applicable. -#include(${CMAKE_SCRIPT_PATH}/PreProjectConfig.cmake) -#pre_project_config() - # Project Name project(fsfw-tests C CXX) @@ -266,8 +259,3 @@ add_custom_command(TARGET ${TARGET_NAME} include (${CMAKE_SCRIPT_PATH}/BuildType.cmake) set_build_type() - - - - - From 5bbe16081f78ea9ca8df30387ed3134e67f972fd Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 30 Jul 2021 14:38:20 +0200 Subject: [PATCH 4/7] added missing CMakeLists.txt --- tests/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 tests/CMakeLists.txt diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 000000000..febd4f0ab --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(src) From c0591c3d24531fdc591bf150eeef1637cef908b7 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 2 Aug 2021 15:31:13 +0200 Subject: [PATCH 5/7] renamed some folders --- contrib/CMakeLists.txt | 20 +++++++++---------- contrib/fsfw-contrib/CMakeLists.txt | 11 ++++++++++ contrib/{ => fsfw-contrib}/sgp4/LICENSE | 0 contrib/{ => fsfw-contrib}/sgp4/sgp4unit.cpp | 0 contrib/{ => fsfw-contrib}/sgp4/sgp4unit.h | 0 hal/src/CMakeLists.txt | 2 +- hal/src/{fsfw/hal => fsfw-hal}/CMakeLists.txt | 0 .../hal => fsfw-hal}/common/CMakeLists.txt | 0 .../common/gpio/CMakeLists.txt | 0 .../common/gpio/GpioCookie.cpp | 0 .../hal => fsfw-hal}/common/gpio/GpioCookie.h | 0 .../hal => fsfw-hal}/common/gpio/GpioIF.h | 0 .../common/gpio/gpioDefinitions.h | 0 .../hal => fsfw-hal}/common/spi/spiCommon.h | 0 .../devicehandlers/CMakeLists.txt | 0 .../devicehandlers/GyroL3GD20Handler.cpp | 0 .../devicehandlers/GyroL3GD20Handler.h | 0 .../devicedefinitions/GyroL3GD20Definitions.h | 0 .../hal => fsfw-hal}/host/CMakeLists.txt | 0 .../hal => fsfw-hal}/linux/CMakeLists.txt | 0 .../hal => fsfw-hal}/linux/UnixFileGuard.cpp | 0 .../hal => fsfw-hal}/linux/UnixFileGuard.h | 0 .../linux/gpio/CMakeLists.txt | 0 .../linux/gpio/LinuxLibgpioIF.cpp | 0 .../linux/gpio/LinuxLibgpioIF.h | 0 .../hal => fsfw-hal}/linux/i2c/CMakeLists.txt | 0 .../hal => fsfw-hal}/linux/i2c/I2cComIF.cpp | 0 .../hal => fsfw-hal}/linux/i2c/I2cComIF.h | 0 .../hal => fsfw-hal}/linux/i2c/I2cCookie.cpp | 0 .../hal => fsfw-hal}/linux/i2c/I2cCookie.h | 0 .../hal => fsfw-hal}/linux/rpi/CMakeLists.txt | 0 .../hal => fsfw-hal}/linux/rpi/GpioRPi.cpp | 0 .../hal => fsfw-hal}/linux/rpi/GpioRPi.h | 0 .../hal => fsfw-hal}/linux/spi/CMakeLists.txt | 0 .../hal => fsfw-hal}/linux/spi/SpiComIF.cpp | 0 .../hal => fsfw-hal}/linux/spi/SpiComIF.h | 0 .../hal => fsfw-hal}/linux/spi/SpiCookie.cpp | 0 .../hal => fsfw-hal}/linux/spi/SpiCookie.h | 0 .../linux/spi/spiDefinitions.h | 0 .../linux/uart/CMakeLists.txt | 0 .../hal => fsfw-hal}/linux/uart/UartComIF.cpp | 0 .../hal => fsfw-hal}/linux/uart/UartComIF.h | 0 .../linux/uart/UartCookie.cpp | 0 .../hal => fsfw-hal}/linux/uart/UartCookie.h | 0 .../{fsfw/hal => fsfw-hal}/linux/utility.cpp | 0 .../{fsfw/hal => fsfw-hal}/linux/utility.h | 0 .../hal => fsfw-hal}/stm32h7/CMakeLists.txt | 0 .../stm32h7/devicetest/CMakeLists.txt | 0 .../stm32h7/devicetest/GyroL3GD20H.cpp | 0 .../stm32h7/devicetest/GyroL3GD20H.h | 0 .../{fsfw/hal => fsfw-hal}/stm32h7/dma.cpp | 0 hal/src/{fsfw/hal => fsfw-hal}/stm32h7/dma.h | 0 .../stm32h7/gpio/CMakeLists.txt | 0 .../hal => fsfw-hal}/stm32h7/gpio/gpio.cpp | 0 .../hal => fsfw-hal}/stm32h7/gpio/gpio.h | 0 .../stm32h7/i2c/CMakeLists.txt | 0 .../hal => fsfw-hal}/stm32h7/interrupts.h | 0 .../stm32h7/spi/CMakeLists.txt | 0 .../hal => fsfw-hal}/stm32h7/spi/SpiComIF.cpp | 0 .../hal => fsfw-hal}/stm32h7/spi/SpiComIF.h | 0 .../stm32h7/spi/SpiCookie.cpp | 0 .../hal => fsfw-hal}/stm32h7/spi/SpiCookie.h | 0 .../hal => fsfw-hal}/stm32h7/spi/mspInit.cpp | 0 .../hal => fsfw-hal}/stm32h7/spi/mspInit.h | 0 .../hal => fsfw-hal}/stm32h7/spi/spiCore.cpp | 0 .../hal => fsfw-hal}/stm32h7/spi/spiCore.h | 0 .../stm32h7/spi/spiDefinitions.cpp | 0 .../stm32h7/spi/spiDefinitions.h | 0 .../stm32h7/spi/spiInterrupts.cpp | 0 .../stm32h7/spi/spiInterrupts.h | 0 .../stm32h7/spi/stm32h743ziSpi.cpp | 0 .../stm32h7/spi/stm32h743ziSpi.h | 0 .../stm32h7/uart/CMakeLists.txt | 0 hal/src/fsfw/CMakeLists.txt | 1 - tests/src/CMakeLists.txt | 2 +- .../{fsfw/tests => fsfw-tests}/CMakeLists.txt | 0 .../internal/CMakeLists.txt | 0 .../internal/InternalUnitTester.cpp | 0 .../internal/InternalUnitTester.h | 0 .../internal/UnittDefinitions.cpp | 0 .../internal/UnittDefinitions.h | 0 .../internal/globalfunctions/CMakeLists.txt | 0 .../globalfunctions/TestArrayPrinter.cpp | 0 .../globalfunctions/TestArrayPrinter.h | 0 .../internal/osal/CMakeLists.txt | 0 .../internal/osal/IntTestMq.cpp | 0 .../internal/osal/IntTestMq.h | 0 .../internal/osal/IntTestMutex.cpp | 0 .../internal/osal/IntTestMutex.h | 0 .../internal/osal/IntTestSemaphore.cpp | 0 .../internal/osal/IntTestSemaphore.h | 0 .../internal/serialize/CMakeLists.txt | 0 .../serialize/IntTestSerialization.cpp | 0 .../internal/serialize/IntTestSerialization.h | 0 .../tests => fsfw-tests}/unit/CMakeLists.txt | 0 .../unit/action/CMakeLists.txt | 0 .../unit/action/TestActionHelper.cpp | 0 .../unit/action/TestActionHelper.h | 0 .../unit/container/CMakeLists.txt | 0 .../unit/container/RingBufferTest.cpp | 0 .../unit/container/TestArrayList.cpp | 0 .../unit/container/TestDynamicFifo.cpp | 0 .../unit/container/TestFifo.cpp | 0 .../unit/container/TestFixedArrayList.cpp | 0 .../unit/container/TestFixedMap.cpp | 0 .../container/TestFixedOrderedMultimap.cpp | 0 .../unit/container/TestPlacementFactory.cpp | 0 .../unit/datapoollocal/CMakeLists.txt | 0 .../unit/datapoollocal/DataSetTest.cpp | 0 .../datapoollocal/LocalPoolManagerTest.cpp | 0 .../unit/datapoollocal/LocalPoolOwnerBase.cpp | 0 .../unit/datapoollocal/LocalPoolOwnerBase.h | 0 .../datapoollocal/LocalPoolVariableTest.cpp | 0 .../datapoollocal/LocalPoolVectorTest.cpp | 0 .../unit/globalfunctions/CMakeLists.txt | 0 .../unit/mocks/HkReceiverMock.h | 0 .../unit/mocks/MessageQueueMockBase.h | 0 .../unit/osal/CMakeLists.txt | 0 .../unit/osal/TestMessageQueue.cpp | 0 .../unit/osal/TestSemaphore.cpp | 0 .../unit/serialize/CMakeLists.txt | 0 .../serialize/TestSerialBufferAdapter.cpp | 0 .../unit/serialize/TestSerialLinkedPacket.cpp | 0 .../unit/serialize/TestSerialLinkedPacket.h | 0 .../unit/serialize/TestSerialization.cpp | 0 .../unit/storagemanager/CMakeLists.txt | 0 .../unit/storagemanager/TestNewAccessor.cpp | 0 .../unit/storagemanager/TestPool.cpp | 0 .../unit/tmtcpacket/CMakeLists.txt | 0 .../unit/tmtcpacket/PusTmTest.cpp | 0 tests/src/fsfw/CMakeLists.txt | 1 - 131 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 contrib/fsfw-contrib/CMakeLists.txt rename contrib/{ => fsfw-contrib}/sgp4/LICENSE (100%) rename contrib/{ => fsfw-contrib}/sgp4/sgp4unit.cpp (100%) rename contrib/{ => fsfw-contrib}/sgp4/sgp4unit.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/CMakeLists.txt (100%) rename hal/src/{fsfw/hal => fsfw-hal}/common/CMakeLists.txt (100%) rename hal/src/{fsfw/hal => fsfw-hal}/common/gpio/CMakeLists.txt (100%) rename hal/src/{fsfw/hal => fsfw-hal}/common/gpio/GpioCookie.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/common/gpio/GpioCookie.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/common/gpio/GpioIF.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/common/gpio/gpioDefinitions.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/common/spi/spiCommon.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/devicehandlers/CMakeLists.txt (100%) rename hal/src/{fsfw/hal => fsfw-hal}/devicehandlers/GyroL3GD20Handler.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/devicehandlers/GyroL3GD20Handler.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/devicehandlers/devicedefinitions/GyroL3GD20Definitions.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/host/CMakeLists.txt (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/CMakeLists.txt (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/UnixFileGuard.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/UnixFileGuard.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/gpio/CMakeLists.txt (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/gpio/LinuxLibgpioIF.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/gpio/LinuxLibgpioIF.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/i2c/CMakeLists.txt (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/i2c/I2cComIF.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/i2c/I2cComIF.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/i2c/I2cCookie.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/i2c/I2cCookie.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/rpi/CMakeLists.txt (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/rpi/GpioRPi.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/rpi/GpioRPi.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/spi/CMakeLists.txt (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/spi/SpiComIF.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/spi/SpiComIF.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/spi/SpiCookie.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/spi/SpiCookie.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/spi/spiDefinitions.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/uart/CMakeLists.txt (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/uart/UartComIF.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/uart/UartComIF.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/uart/UartCookie.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/uart/UartCookie.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/utility.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/linux/utility.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/CMakeLists.txt (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/devicetest/CMakeLists.txt (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/devicetest/GyroL3GD20H.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/devicetest/GyroL3GD20H.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/dma.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/dma.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/gpio/CMakeLists.txt (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/gpio/gpio.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/gpio/gpio.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/i2c/CMakeLists.txt (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/interrupts.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/spi/CMakeLists.txt (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/spi/SpiComIF.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/spi/SpiComIF.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/spi/SpiCookie.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/spi/SpiCookie.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/spi/mspInit.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/spi/mspInit.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/spi/spiCore.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/spi/spiCore.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/spi/spiDefinitions.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/spi/spiDefinitions.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/spi/spiInterrupts.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/spi/spiInterrupts.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/spi/stm32h743ziSpi.cpp (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/spi/stm32h743ziSpi.h (100%) rename hal/src/{fsfw/hal => fsfw-hal}/stm32h7/uart/CMakeLists.txt (100%) delete mode 100644 hal/src/fsfw/CMakeLists.txt rename tests/src/{fsfw/tests => fsfw-tests}/CMakeLists.txt (100%) rename tests/src/{fsfw/tests => fsfw-tests}/internal/CMakeLists.txt (100%) rename tests/src/{fsfw/tests => fsfw-tests}/internal/InternalUnitTester.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/internal/InternalUnitTester.h (100%) rename tests/src/{fsfw/tests => fsfw-tests}/internal/UnittDefinitions.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/internal/UnittDefinitions.h (100%) rename tests/src/{fsfw/tests => fsfw-tests}/internal/globalfunctions/CMakeLists.txt (100%) rename tests/src/{fsfw/tests => fsfw-tests}/internal/globalfunctions/TestArrayPrinter.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/internal/globalfunctions/TestArrayPrinter.h (100%) rename tests/src/{fsfw/tests => fsfw-tests}/internal/osal/CMakeLists.txt (100%) rename tests/src/{fsfw/tests => fsfw-tests}/internal/osal/IntTestMq.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/internal/osal/IntTestMq.h (100%) rename tests/src/{fsfw/tests => fsfw-tests}/internal/osal/IntTestMutex.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/internal/osal/IntTestMutex.h (100%) rename tests/src/{fsfw/tests => fsfw-tests}/internal/osal/IntTestSemaphore.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/internal/osal/IntTestSemaphore.h (100%) rename tests/src/{fsfw/tests => fsfw-tests}/internal/serialize/CMakeLists.txt (100%) rename tests/src/{fsfw/tests => fsfw-tests}/internal/serialize/IntTestSerialization.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/internal/serialize/IntTestSerialization.h (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/CMakeLists.txt (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/action/CMakeLists.txt (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/action/TestActionHelper.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/action/TestActionHelper.h (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/container/CMakeLists.txt (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/container/RingBufferTest.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/container/TestArrayList.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/container/TestDynamicFifo.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/container/TestFifo.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/container/TestFixedArrayList.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/container/TestFixedMap.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/container/TestFixedOrderedMultimap.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/container/TestPlacementFactory.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/datapoollocal/CMakeLists.txt (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/datapoollocal/DataSetTest.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/datapoollocal/LocalPoolManagerTest.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/datapoollocal/LocalPoolOwnerBase.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/datapoollocal/LocalPoolOwnerBase.h (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/datapoollocal/LocalPoolVariableTest.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/datapoollocal/LocalPoolVectorTest.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/globalfunctions/CMakeLists.txt (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/mocks/HkReceiverMock.h (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/mocks/MessageQueueMockBase.h (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/osal/CMakeLists.txt (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/osal/TestMessageQueue.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/osal/TestSemaphore.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/serialize/CMakeLists.txt (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/serialize/TestSerialBufferAdapter.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/serialize/TestSerialLinkedPacket.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/serialize/TestSerialLinkedPacket.h (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/serialize/TestSerialization.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/storagemanager/CMakeLists.txt (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/storagemanager/TestNewAccessor.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/storagemanager/TestPool.cpp (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/tmtcpacket/CMakeLists.txt (100%) rename tests/src/{fsfw/tests => fsfw-tests}/unit/tmtcpacket/PusTmTest.cpp (100%) delete mode 100644 tests/src/fsfw/CMakeLists.txt diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 3a987228a..8c252e82d 100644 --- 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) diff --git a/contrib/fsfw-contrib/CMakeLists.txt b/contrib/fsfw-contrib/CMakeLists.txt new file mode 100644 index 000000000..3a987228a --- /dev/null +++ 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() diff --git a/contrib/sgp4/LICENSE b/contrib/fsfw-contrib/sgp4/LICENSE similarity index 100% rename from contrib/sgp4/LICENSE rename to contrib/fsfw-contrib/sgp4/LICENSE diff --git a/contrib/sgp4/sgp4unit.cpp b/contrib/fsfw-contrib/sgp4/sgp4unit.cpp similarity index 100% rename from contrib/sgp4/sgp4unit.cpp rename to contrib/fsfw-contrib/sgp4/sgp4unit.cpp diff --git a/contrib/sgp4/sgp4unit.h b/contrib/fsfw-contrib/sgp4/sgp4unit.h similarity index 100% rename from contrib/sgp4/sgp4unit.h rename to contrib/fsfw-contrib/sgp4/sgp4unit.h diff --git a/hal/src/CMakeLists.txt b/hal/src/CMakeLists.txt index ed2f2522e..ff3f1beb5 100644 --- 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) diff --git a/hal/src/fsfw/hal/CMakeLists.txt b/hal/src/fsfw-hal/CMakeLists.txt similarity index 100% rename from hal/src/fsfw/hal/CMakeLists.txt rename to hal/src/fsfw-hal/CMakeLists.txt diff --git a/hal/src/fsfw/hal/common/CMakeLists.txt b/hal/src/fsfw-hal/common/CMakeLists.txt similarity index 100% rename from hal/src/fsfw/hal/common/CMakeLists.txt rename to hal/src/fsfw-hal/common/CMakeLists.txt diff --git a/hal/src/fsfw/hal/common/gpio/CMakeLists.txt b/hal/src/fsfw-hal/common/gpio/CMakeLists.txt similarity index 100% rename from hal/src/fsfw/hal/common/gpio/CMakeLists.txt rename to hal/src/fsfw-hal/common/gpio/CMakeLists.txt diff --git a/hal/src/fsfw/hal/common/gpio/GpioCookie.cpp b/hal/src/fsfw-hal/common/gpio/GpioCookie.cpp similarity index 100% rename from hal/src/fsfw/hal/common/gpio/GpioCookie.cpp rename to hal/src/fsfw-hal/common/gpio/GpioCookie.cpp diff --git a/hal/src/fsfw/hal/common/gpio/GpioCookie.h b/hal/src/fsfw-hal/common/gpio/GpioCookie.h similarity index 100% rename from hal/src/fsfw/hal/common/gpio/GpioCookie.h rename to hal/src/fsfw-hal/common/gpio/GpioCookie.h diff --git a/hal/src/fsfw/hal/common/gpio/GpioIF.h b/hal/src/fsfw-hal/common/gpio/GpioIF.h similarity index 100% rename from hal/src/fsfw/hal/common/gpio/GpioIF.h rename to hal/src/fsfw-hal/common/gpio/GpioIF.h diff --git a/hal/src/fsfw/hal/common/gpio/gpioDefinitions.h b/hal/src/fsfw-hal/common/gpio/gpioDefinitions.h similarity index 100% rename from hal/src/fsfw/hal/common/gpio/gpioDefinitions.h rename to hal/src/fsfw-hal/common/gpio/gpioDefinitions.h diff --git a/hal/src/fsfw/hal/common/spi/spiCommon.h b/hal/src/fsfw-hal/common/spi/spiCommon.h similarity index 100% rename from hal/src/fsfw/hal/common/spi/spiCommon.h rename to hal/src/fsfw-hal/common/spi/spiCommon.h diff --git a/hal/src/fsfw/hal/devicehandlers/CMakeLists.txt b/hal/src/fsfw-hal/devicehandlers/CMakeLists.txt similarity index 100% rename from hal/src/fsfw/hal/devicehandlers/CMakeLists.txt rename to hal/src/fsfw-hal/devicehandlers/CMakeLists.txt diff --git a/hal/src/fsfw/hal/devicehandlers/GyroL3GD20Handler.cpp b/hal/src/fsfw-hal/devicehandlers/GyroL3GD20Handler.cpp similarity index 100% rename from hal/src/fsfw/hal/devicehandlers/GyroL3GD20Handler.cpp rename to hal/src/fsfw-hal/devicehandlers/GyroL3GD20Handler.cpp diff --git a/hal/src/fsfw/hal/devicehandlers/GyroL3GD20Handler.h b/hal/src/fsfw-hal/devicehandlers/GyroL3GD20Handler.h similarity index 100% rename from hal/src/fsfw/hal/devicehandlers/GyroL3GD20Handler.h rename to hal/src/fsfw-hal/devicehandlers/GyroL3GD20Handler.h diff --git a/hal/src/fsfw/hal/devicehandlers/devicedefinitions/GyroL3GD20Definitions.h b/hal/src/fsfw-hal/devicehandlers/devicedefinitions/GyroL3GD20Definitions.h similarity index 100% rename from hal/src/fsfw/hal/devicehandlers/devicedefinitions/GyroL3GD20Definitions.h rename to hal/src/fsfw-hal/devicehandlers/devicedefinitions/GyroL3GD20Definitions.h diff --git a/hal/src/fsfw/hal/host/CMakeLists.txt b/hal/src/fsfw-hal/host/CMakeLists.txt similarity index 100% rename from hal/src/fsfw/hal/host/CMakeLists.txt rename to hal/src/fsfw-hal/host/CMakeLists.txt diff --git a/hal/src/fsfw/hal/linux/CMakeLists.txt b/hal/src/fsfw-hal/linux/CMakeLists.txt similarity index 100% rename from hal/src/fsfw/hal/linux/CMakeLists.txt rename to hal/src/fsfw-hal/linux/CMakeLists.txt diff --git a/hal/src/fsfw/hal/linux/UnixFileGuard.cpp b/hal/src/fsfw-hal/linux/UnixFileGuard.cpp similarity index 100% rename from hal/src/fsfw/hal/linux/UnixFileGuard.cpp rename to hal/src/fsfw-hal/linux/UnixFileGuard.cpp diff --git a/hal/src/fsfw/hal/linux/UnixFileGuard.h b/hal/src/fsfw-hal/linux/UnixFileGuard.h similarity index 100% rename from hal/src/fsfw/hal/linux/UnixFileGuard.h rename to hal/src/fsfw-hal/linux/UnixFileGuard.h diff --git a/hal/src/fsfw/hal/linux/gpio/CMakeLists.txt b/hal/src/fsfw-hal/linux/gpio/CMakeLists.txt similarity index 100% rename from hal/src/fsfw/hal/linux/gpio/CMakeLists.txt rename to hal/src/fsfw-hal/linux/gpio/CMakeLists.txt diff --git a/hal/src/fsfw/hal/linux/gpio/LinuxLibgpioIF.cpp b/hal/src/fsfw-hal/linux/gpio/LinuxLibgpioIF.cpp similarity index 100% rename from hal/src/fsfw/hal/linux/gpio/LinuxLibgpioIF.cpp rename to hal/src/fsfw-hal/linux/gpio/LinuxLibgpioIF.cpp diff --git a/hal/src/fsfw/hal/linux/gpio/LinuxLibgpioIF.h b/hal/src/fsfw-hal/linux/gpio/LinuxLibgpioIF.h similarity index 100% rename from hal/src/fsfw/hal/linux/gpio/LinuxLibgpioIF.h rename to hal/src/fsfw-hal/linux/gpio/LinuxLibgpioIF.h diff --git a/hal/src/fsfw/hal/linux/i2c/CMakeLists.txt b/hal/src/fsfw-hal/linux/i2c/CMakeLists.txt similarity index 100% rename from hal/src/fsfw/hal/linux/i2c/CMakeLists.txt rename to hal/src/fsfw-hal/linux/i2c/CMakeLists.txt diff --git a/hal/src/fsfw/hal/linux/i2c/I2cComIF.cpp b/hal/src/fsfw-hal/linux/i2c/I2cComIF.cpp similarity index 100% rename from hal/src/fsfw/hal/linux/i2c/I2cComIF.cpp rename to hal/src/fsfw-hal/linux/i2c/I2cComIF.cpp diff --git a/hal/src/fsfw/hal/linux/i2c/I2cComIF.h b/hal/src/fsfw-hal/linux/i2c/I2cComIF.h similarity index 100% rename from hal/src/fsfw/hal/linux/i2c/I2cComIF.h rename to hal/src/fsfw-hal/linux/i2c/I2cComIF.h diff --git a/hal/src/fsfw/hal/linux/i2c/I2cCookie.cpp b/hal/src/fsfw-hal/linux/i2c/I2cCookie.cpp similarity index 100% rename from hal/src/fsfw/hal/linux/i2c/I2cCookie.cpp rename to hal/src/fsfw-hal/linux/i2c/I2cCookie.cpp diff --git a/hal/src/fsfw/hal/linux/i2c/I2cCookie.h b/hal/src/fsfw-hal/linux/i2c/I2cCookie.h similarity index 100% rename from hal/src/fsfw/hal/linux/i2c/I2cCookie.h rename to hal/src/fsfw-hal/linux/i2c/I2cCookie.h diff --git a/hal/src/fsfw/hal/linux/rpi/CMakeLists.txt b/hal/src/fsfw-hal/linux/rpi/CMakeLists.txt similarity index 100% rename from hal/src/fsfw/hal/linux/rpi/CMakeLists.txt rename to hal/src/fsfw-hal/linux/rpi/CMakeLists.txt diff --git a/hal/src/fsfw/hal/linux/rpi/GpioRPi.cpp b/hal/src/fsfw-hal/linux/rpi/GpioRPi.cpp similarity index 100% rename from hal/src/fsfw/hal/linux/rpi/GpioRPi.cpp rename to hal/src/fsfw-hal/linux/rpi/GpioRPi.cpp diff --git a/hal/src/fsfw/hal/linux/rpi/GpioRPi.h b/hal/src/fsfw-hal/linux/rpi/GpioRPi.h similarity index 100% rename from hal/src/fsfw/hal/linux/rpi/GpioRPi.h rename to hal/src/fsfw-hal/linux/rpi/GpioRPi.h diff --git a/hal/src/fsfw/hal/linux/spi/CMakeLists.txt b/hal/src/fsfw-hal/linux/spi/CMakeLists.txt similarity index 100% rename from hal/src/fsfw/hal/linux/spi/CMakeLists.txt rename to hal/src/fsfw-hal/linux/spi/CMakeLists.txt diff --git a/hal/src/fsfw/hal/linux/spi/SpiComIF.cpp b/hal/src/fsfw-hal/linux/spi/SpiComIF.cpp similarity index 100% rename from hal/src/fsfw/hal/linux/spi/SpiComIF.cpp rename to hal/src/fsfw-hal/linux/spi/SpiComIF.cpp diff --git a/hal/src/fsfw/hal/linux/spi/SpiComIF.h b/hal/src/fsfw-hal/linux/spi/SpiComIF.h similarity index 100% rename from hal/src/fsfw/hal/linux/spi/SpiComIF.h rename to hal/src/fsfw-hal/linux/spi/SpiComIF.h diff --git a/hal/src/fsfw/hal/linux/spi/SpiCookie.cpp b/hal/src/fsfw-hal/linux/spi/SpiCookie.cpp similarity index 100% rename from hal/src/fsfw/hal/linux/spi/SpiCookie.cpp rename to hal/src/fsfw-hal/linux/spi/SpiCookie.cpp diff --git a/hal/src/fsfw/hal/linux/spi/SpiCookie.h b/hal/src/fsfw-hal/linux/spi/SpiCookie.h similarity index 100% rename from hal/src/fsfw/hal/linux/spi/SpiCookie.h rename to hal/src/fsfw-hal/linux/spi/SpiCookie.h diff --git a/hal/src/fsfw/hal/linux/spi/spiDefinitions.h b/hal/src/fsfw-hal/linux/spi/spiDefinitions.h similarity index 100% rename from hal/src/fsfw/hal/linux/spi/spiDefinitions.h rename to hal/src/fsfw-hal/linux/spi/spiDefinitions.h diff --git a/hal/src/fsfw/hal/linux/uart/CMakeLists.txt b/hal/src/fsfw-hal/linux/uart/CMakeLists.txt similarity index 100% rename from hal/src/fsfw/hal/linux/uart/CMakeLists.txt rename to hal/src/fsfw-hal/linux/uart/CMakeLists.txt diff --git a/hal/src/fsfw/hal/linux/uart/UartComIF.cpp b/hal/src/fsfw-hal/linux/uart/UartComIF.cpp similarity index 100% rename from hal/src/fsfw/hal/linux/uart/UartComIF.cpp rename to hal/src/fsfw-hal/linux/uart/UartComIF.cpp diff --git a/hal/src/fsfw/hal/linux/uart/UartComIF.h b/hal/src/fsfw-hal/linux/uart/UartComIF.h similarity index 100% rename from hal/src/fsfw/hal/linux/uart/UartComIF.h rename to hal/src/fsfw-hal/linux/uart/UartComIF.h diff --git a/hal/src/fsfw/hal/linux/uart/UartCookie.cpp b/hal/src/fsfw-hal/linux/uart/UartCookie.cpp similarity index 100% rename from hal/src/fsfw/hal/linux/uart/UartCookie.cpp rename to hal/src/fsfw-hal/linux/uart/UartCookie.cpp diff --git a/hal/src/fsfw/hal/linux/uart/UartCookie.h b/hal/src/fsfw-hal/linux/uart/UartCookie.h similarity index 100% rename from hal/src/fsfw/hal/linux/uart/UartCookie.h rename to hal/src/fsfw-hal/linux/uart/UartCookie.h diff --git a/hal/src/fsfw/hal/linux/utility.cpp b/hal/src/fsfw-hal/linux/utility.cpp similarity index 100% rename from hal/src/fsfw/hal/linux/utility.cpp rename to hal/src/fsfw-hal/linux/utility.cpp diff --git a/hal/src/fsfw/hal/linux/utility.h b/hal/src/fsfw-hal/linux/utility.h similarity index 100% rename from hal/src/fsfw/hal/linux/utility.h rename to hal/src/fsfw-hal/linux/utility.h diff --git a/hal/src/fsfw/hal/stm32h7/CMakeLists.txt b/hal/src/fsfw-hal/stm32h7/CMakeLists.txt similarity index 100% rename from hal/src/fsfw/hal/stm32h7/CMakeLists.txt rename to hal/src/fsfw-hal/stm32h7/CMakeLists.txt diff --git a/hal/src/fsfw/hal/stm32h7/devicetest/CMakeLists.txt b/hal/src/fsfw-hal/stm32h7/devicetest/CMakeLists.txt similarity index 100% rename from hal/src/fsfw/hal/stm32h7/devicetest/CMakeLists.txt rename to hal/src/fsfw-hal/stm32h7/devicetest/CMakeLists.txt diff --git a/hal/src/fsfw/hal/stm32h7/devicetest/GyroL3GD20H.cpp b/hal/src/fsfw-hal/stm32h7/devicetest/GyroL3GD20H.cpp similarity index 100% rename from hal/src/fsfw/hal/stm32h7/devicetest/GyroL3GD20H.cpp rename to hal/src/fsfw-hal/stm32h7/devicetest/GyroL3GD20H.cpp diff --git a/hal/src/fsfw/hal/stm32h7/devicetest/GyroL3GD20H.h b/hal/src/fsfw-hal/stm32h7/devicetest/GyroL3GD20H.h similarity index 100% rename from hal/src/fsfw/hal/stm32h7/devicetest/GyroL3GD20H.h rename to hal/src/fsfw-hal/stm32h7/devicetest/GyroL3GD20H.h diff --git a/hal/src/fsfw/hal/stm32h7/dma.cpp b/hal/src/fsfw-hal/stm32h7/dma.cpp similarity index 100% rename from hal/src/fsfw/hal/stm32h7/dma.cpp rename to hal/src/fsfw-hal/stm32h7/dma.cpp diff --git a/hal/src/fsfw/hal/stm32h7/dma.h b/hal/src/fsfw-hal/stm32h7/dma.h similarity index 100% rename from hal/src/fsfw/hal/stm32h7/dma.h rename to hal/src/fsfw-hal/stm32h7/dma.h diff --git a/hal/src/fsfw/hal/stm32h7/gpio/CMakeLists.txt b/hal/src/fsfw-hal/stm32h7/gpio/CMakeLists.txt similarity index 100% rename from hal/src/fsfw/hal/stm32h7/gpio/CMakeLists.txt rename to hal/src/fsfw-hal/stm32h7/gpio/CMakeLists.txt diff --git a/hal/src/fsfw/hal/stm32h7/gpio/gpio.cpp b/hal/src/fsfw-hal/stm32h7/gpio/gpio.cpp similarity index 100% rename from hal/src/fsfw/hal/stm32h7/gpio/gpio.cpp rename to hal/src/fsfw-hal/stm32h7/gpio/gpio.cpp diff --git a/hal/src/fsfw/hal/stm32h7/gpio/gpio.h b/hal/src/fsfw-hal/stm32h7/gpio/gpio.h similarity index 100% rename from hal/src/fsfw/hal/stm32h7/gpio/gpio.h rename to hal/src/fsfw-hal/stm32h7/gpio/gpio.h diff --git a/hal/src/fsfw/hal/stm32h7/i2c/CMakeLists.txt b/hal/src/fsfw-hal/stm32h7/i2c/CMakeLists.txt similarity index 100% rename from hal/src/fsfw/hal/stm32h7/i2c/CMakeLists.txt rename to hal/src/fsfw-hal/stm32h7/i2c/CMakeLists.txt diff --git a/hal/src/fsfw/hal/stm32h7/interrupts.h b/hal/src/fsfw-hal/stm32h7/interrupts.h similarity index 100% rename from hal/src/fsfw/hal/stm32h7/interrupts.h rename to hal/src/fsfw-hal/stm32h7/interrupts.h diff --git a/hal/src/fsfw/hal/stm32h7/spi/CMakeLists.txt b/hal/src/fsfw-hal/stm32h7/spi/CMakeLists.txt similarity index 100% rename from hal/src/fsfw/hal/stm32h7/spi/CMakeLists.txt rename to hal/src/fsfw-hal/stm32h7/spi/CMakeLists.txt diff --git a/hal/src/fsfw/hal/stm32h7/spi/SpiComIF.cpp b/hal/src/fsfw-hal/stm32h7/spi/SpiComIF.cpp similarity index 100% rename from hal/src/fsfw/hal/stm32h7/spi/SpiComIF.cpp rename to hal/src/fsfw-hal/stm32h7/spi/SpiComIF.cpp diff --git a/hal/src/fsfw/hal/stm32h7/spi/SpiComIF.h b/hal/src/fsfw-hal/stm32h7/spi/SpiComIF.h similarity index 100% rename from hal/src/fsfw/hal/stm32h7/spi/SpiComIF.h rename to hal/src/fsfw-hal/stm32h7/spi/SpiComIF.h diff --git a/hal/src/fsfw/hal/stm32h7/spi/SpiCookie.cpp b/hal/src/fsfw-hal/stm32h7/spi/SpiCookie.cpp similarity index 100% rename from hal/src/fsfw/hal/stm32h7/spi/SpiCookie.cpp rename to hal/src/fsfw-hal/stm32h7/spi/SpiCookie.cpp diff --git a/hal/src/fsfw/hal/stm32h7/spi/SpiCookie.h b/hal/src/fsfw-hal/stm32h7/spi/SpiCookie.h similarity index 100% rename from hal/src/fsfw/hal/stm32h7/spi/SpiCookie.h rename to hal/src/fsfw-hal/stm32h7/spi/SpiCookie.h diff --git a/hal/src/fsfw/hal/stm32h7/spi/mspInit.cpp b/hal/src/fsfw-hal/stm32h7/spi/mspInit.cpp similarity index 100% rename from hal/src/fsfw/hal/stm32h7/spi/mspInit.cpp rename to hal/src/fsfw-hal/stm32h7/spi/mspInit.cpp diff --git a/hal/src/fsfw/hal/stm32h7/spi/mspInit.h b/hal/src/fsfw-hal/stm32h7/spi/mspInit.h similarity index 100% rename from hal/src/fsfw/hal/stm32h7/spi/mspInit.h rename to hal/src/fsfw-hal/stm32h7/spi/mspInit.h diff --git a/hal/src/fsfw/hal/stm32h7/spi/spiCore.cpp b/hal/src/fsfw-hal/stm32h7/spi/spiCore.cpp similarity index 100% rename from hal/src/fsfw/hal/stm32h7/spi/spiCore.cpp rename to hal/src/fsfw-hal/stm32h7/spi/spiCore.cpp diff --git a/hal/src/fsfw/hal/stm32h7/spi/spiCore.h b/hal/src/fsfw-hal/stm32h7/spi/spiCore.h similarity index 100% rename from hal/src/fsfw/hal/stm32h7/spi/spiCore.h rename to hal/src/fsfw-hal/stm32h7/spi/spiCore.h diff --git a/hal/src/fsfw/hal/stm32h7/spi/spiDefinitions.cpp b/hal/src/fsfw-hal/stm32h7/spi/spiDefinitions.cpp similarity index 100% rename from hal/src/fsfw/hal/stm32h7/spi/spiDefinitions.cpp rename to hal/src/fsfw-hal/stm32h7/spi/spiDefinitions.cpp diff --git a/hal/src/fsfw/hal/stm32h7/spi/spiDefinitions.h b/hal/src/fsfw-hal/stm32h7/spi/spiDefinitions.h similarity index 100% rename from hal/src/fsfw/hal/stm32h7/spi/spiDefinitions.h rename to hal/src/fsfw-hal/stm32h7/spi/spiDefinitions.h diff --git a/hal/src/fsfw/hal/stm32h7/spi/spiInterrupts.cpp b/hal/src/fsfw-hal/stm32h7/spi/spiInterrupts.cpp similarity index 100% rename from hal/src/fsfw/hal/stm32h7/spi/spiInterrupts.cpp rename to hal/src/fsfw-hal/stm32h7/spi/spiInterrupts.cpp diff --git a/hal/src/fsfw/hal/stm32h7/spi/spiInterrupts.h b/hal/src/fsfw-hal/stm32h7/spi/spiInterrupts.h similarity index 100% rename from hal/src/fsfw/hal/stm32h7/spi/spiInterrupts.h rename to hal/src/fsfw-hal/stm32h7/spi/spiInterrupts.h diff --git a/hal/src/fsfw/hal/stm32h7/spi/stm32h743ziSpi.cpp b/hal/src/fsfw-hal/stm32h7/spi/stm32h743ziSpi.cpp similarity index 100% rename from hal/src/fsfw/hal/stm32h7/spi/stm32h743ziSpi.cpp rename to hal/src/fsfw-hal/stm32h7/spi/stm32h743ziSpi.cpp diff --git a/hal/src/fsfw/hal/stm32h7/spi/stm32h743ziSpi.h b/hal/src/fsfw-hal/stm32h7/spi/stm32h743ziSpi.h similarity index 100% rename from hal/src/fsfw/hal/stm32h7/spi/stm32h743ziSpi.h rename to hal/src/fsfw-hal/stm32h7/spi/stm32h743ziSpi.h diff --git a/hal/src/fsfw/hal/stm32h7/uart/CMakeLists.txt b/hal/src/fsfw-hal/stm32h7/uart/CMakeLists.txt similarity index 100% rename from hal/src/fsfw/hal/stm32h7/uart/CMakeLists.txt rename to hal/src/fsfw-hal/stm32h7/uart/CMakeLists.txt diff --git a/hal/src/fsfw/CMakeLists.txt b/hal/src/fsfw/CMakeLists.txt deleted file mode 100644 index c034e0b73..000000000 --- a/hal/src/fsfw/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(hal) diff --git a/tests/src/CMakeLists.txt b/tests/src/CMakeLists.txt index ed2f2522e..18bf7f8ca 100644 --- 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) diff --git a/tests/src/fsfw/tests/CMakeLists.txt b/tests/src/fsfw-tests/CMakeLists.txt similarity index 100% rename from tests/src/fsfw/tests/CMakeLists.txt rename to tests/src/fsfw-tests/CMakeLists.txt diff --git a/tests/src/fsfw/tests/internal/CMakeLists.txt b/tests/src/fsfw-tests/internal/CMakeLists.txt similarity index 100% rename from tests/src/fsfw/tests/internal/CMakeLists.txt rename to tests/src/fsfw-tests/internal/CMakeLists.txt diff --git a/tests/src/fsfw/tests/internal/InternalUnitTester.cpp b/tests/src/fsfw-tests/internal/InternalUnitTester.cpp similarity index 100% rename from tests/src/fsfw/tests/internal/InternalUnitTester.cpp rename to tests/src/fsfw-tests/internal/InternalUnitTester.cpp diff --git a/tests/src/fsfw/tests/internal/InternalUnitTester.h b/tests/src/fsfw-tests/internal/InternalUnitTester.h similarity index 100% rename from tests/src/fsfw/tests/internal/InternalUnitTester.h rename to tests/src/fsfw-tests/internal/InternalUnitTester.h diff --git a/tests/src/fsfw/tests/internal/UnittDefinitions.cpp b/tests/src/fsfw-tests/internal/UnittDefinitions.cpp similarity index 100% rename from tests/src/fsfw/tests/internal/UnittDefinitions.cpp rename to tests/src/fsfw-tests/internal/UnittDefinitions.cpp diff --git a/tests/src/fsfw/tests/internal/UnittDefinitions.h b/tests/src/fsfw-tests/internal/UnittDefinitions.h similarity index 100% rename from tests/src/fsfw/tests/internal/UnittDefinitions.h rename to tests/src/fsfw-tests/internal/UnittDefinitions.h diff --git a/tests/src/fsfw/tests/internal/globalfunctions/CMakeLists.txt b/tests/src/fsfw-tests/internal/globalfunctions/CMakeLists.txt similarity index 100% rename from tests/src/fsfw/tests/internal/globalfunctions/CMakeLists.txt rename to tests/src/fsfw-tests/internal/globalfunctions/CMakeLists.txt diff --git a/tests/src/fsfw/tests/internal/globalfunctions/TestArrayPrinter.cpp b/tests/src/fsfw-tests/internal/globalfunctions/TestArrayPrinter.cpp similarity index 100% rename from tests/src/fsfw/tests/internal/globalfunctions/TestArrayPrinter.cpp rename to tests/src/fsfw-tests/internal/globalfunctions/TestArrayPrinter.cpp diff --git a/tests/src/fsfw/tests/internal/globalfunctions/TestArrayPrinter.h b/tests/src/fsfw-tests/internal/globalfunctions/TestArrayPrinter.h similarity index 100% rename from tests/src/fsfw/tests/internal/globalfunctions/TestArrayPrinter.h rename to tests/src/fsfw-tests/internal/globalfunctions/TestArrayPrinter.h diff --git a/tests/src/fsfw/tests/internal/osal/CMakeLists.txt b/tests/src/fsfw-tests/internal/osal/CMakeLists.txt similarity index 100% rename from tests/src/fsfw/tests/internal/osal/CMakeLists.txt rename to tests/src/fsfw-tests/internal/osal/CMakeLists.txt diff --git a/tests/src/fsfw/tests/internal/osal/IntTestMq.cpp b/tests/src/fsfw-tests/internal/osal/IntTestMq.cpp similarity index 100% rename from tests/src/fsfw/tests/internal/osal/IntTestMq.cpp rename to tests/src/fsfw-tests/internal/osal/IntTestMq.cpp diff --git a/tests/src/fsfw/tests/internal/osal/IntTestMq.h b/tests/src/fsfw-tests/internal/osal/IntTestMq.h similarity index 100% rename from tests/src/fsfw/tests/internal/osal/IntTestMq.h rename to tests/src/fsfw-tests/internal/osal/IntTestMq.h diff --git a/tests/src/fsfw/tests/internal/osal/IntTestMutex.cpp b/tests/src/fsfw-tests/internal/osal/IntTestMutex.cpp similarity index 100% rename from tests/src/fsfw/tests/internal/osal/IntTestMutex.cpp rename to tests/src/fsfw-tests/internal/osal/IntTestMutex.cpp diff --git a/tests/src/fsfw/tests/internal/osal/IntTestMutex.h b/tests/src/fsfw-tests/internal/osal/IntTestMutex.h similarity index 100% rename from tests/src/fsfw/tests/internal/osal/IntTestMutex.h rename to tests/src/fsfw-tests/internal/osal/IntTestMutex.h diff --git a/tests/src/fsfw/tests/internal/osal/IntTestSemaphore.cpp b/tests/src/fsfw-tests/internal/osal/IntTestSemaphore.cpp similarity index 100% rename from tests/src/fsfw/tests/internal/osal/IntTestSemaphore.cpp rename to tests/src/fsfw-tests/internal/osal/IntTestSemaphore.cpp diff --git a/tests/src/fsfw/tests/internal/osal/IntTestSemaphore.h b/tests/src/fsfw-tests/internal/osal/IntTestSemaphore.h similarity index 100% rename from tests/src/fsfw/tests/internal/osal/IntTestSemaphore.h rename to tests/src/fsfw-tests/internal/osal/IntTestSemaphore.h diff --git a/tests/src/fsfw/tests/internal/serialize/CMakeLists.txt b/tests/src/fsfw-tests/internal/serialize/CMakeLists.txt similarity index 100% rename from tests/src/fsfw/tests/internal/serialize/CMakeLists.txt rename to tests/src/fsfw-tests/internal/serialize/CMakeLists.txt diff --git a/tests/src/fsfw/tests/internal/serialize/IntTestSerialization.cpp b/tests/src/fsfw-tests/internal/serialize/IntTestSerialization.cpp similarity index 100% rename from tests/src/fsfw/tests/internal/serialize/IntTestSerialization.cpp rename to tests/src/fsfw-tests/internal/serialize/IntTestSerialization.cpp diff --git a/tests/src/fsfw/tests/internal/serialize/IntTestSerialization.h b/tests/src/fsfw-tests/internal/serialize/IntTestSerialization.h similarity index 100% rename from tests/src/fsfw/tests/internal/serialize/IntTestSerialization.h rename to tests/src/fsfw-tests/internal/serialize/IntTestSerialization.h diff --git a/tests/src/fsfw/tests/unit/CMakeLists.txt b/tests/src/fsfw-tests/unit/CMakeLists.txt similarity index 100% rename from tests/src/fsfw/tests/unit/CMakeLists.txt rename to tests/src/fsfw-tests/unit/CMakeLists.txt diff --git a/tests/src/fsfw/tests/unit/action/CMakeLists.txt b/tests/src/fsfw-tests/unit/action/CMakeLists.txt similarity index 100% rename from tests/src/fsfw/tests/unit/action/CMakeLists.txt rename to tests/src/fsfw-tests/unit/action/CMakeLists.txt diff --git a/tests/src/fsfw/tests/unit/action/TestActionHelper.cpp b/tests/src/fsfw-tests/unit/action/TestActionHelper.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/action/TestActionHelper.cpp rename to tests/src/fsfw-tests/unit/action/TestActionHelper.cpp diff --git a/tests/src/fsfw/tests/unit/action/TestActionHelper.h b/tests/src/fsfw-tests/unit/action/TestActionHelper.h similarity index 100% rename from tests/src/fsfw/tests/unit/action/TestActionHelper.h rename to tests/src/fsfw-tests/unit/action/TestActionHelper.h diff --git a/tests/src/fsfw/tests/unit/container/CMakeLists.txt b/tests/src/fsfw-tests/unit/container/CMakeLists.txt similarity index 100% rename from tests/src/fsfw/tests/unit/container/CMakeLists.txt rename to tests/src/fsfw-tests/unit/container/CMakeLists.txt diff --git a/tests/src/fsfw/tests/unit/container/RingBufferTest.cpp b/tests/src/fsfw-tests/unit/container/RingBufferTest.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/container/RingBufferTest.cpp rename to tests/src/fsfw-tests/unit/container/RingBufferTest.cpp diff --git a/tests/src/fsfw/tests/unit/container/TestArrayList.cpp b/tests/src/fsfw-tests/unit/container/TestArrayList.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/container/TestArrayList.cpp rename to tests/src/fsfw-tests/unit/container/TestArrayList.cpp diff --git a/tests/src/fsfw/tests/unit/container/TestDynamicFifo.cpp b/tests/src/fsfw-tests/unit/container/TestDynamicFifo.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/container/TestDynamicFifo.cpp rename to tests/src/fsfw-tests/unit/container/TestDynamicFifo.cpp diff --git a/tests/src/fsfw/tests/unit/container/TestFifo.cpp b/tests/src/fsfw-tests/unit/container/TestFifo.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/container/TestFifo.cpp rename to tests/src/fsfw-tests/unit/container/TestFifo.cpp diff --git a/tests/src/fsfw/tests/unit/container/TestFixedArrayList.cpp b/tests/src/fsfw-tests/unit/container/TestFixedArrayList.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/container/TestFixedArrayList.cpp rename to tests/src/fsfw-tests/unit/container/TestFixedArrayList.cpp diff --git a/tests/src/fsfw/tests/unit/container/TestFixedMap.cpp b/tests/src/fsfw-tests/unit/container/TestFixedMap.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/container/TestFixedMap.cpp rename to tests/src/fsfw-tests/unit/container/TestFixedMap.cpp diff --git a/tests/src/fsfw/tests/unit/container/TestFixedOrderedMultimap.cpp b/tests/src/fsfw-tests/unit/container/TestFixedOrderedMultimap.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/container/TestFixedOrderedMultimap.cpp rename to tests/src/fsfw-tests/unit/container/TestFixedOrderedMultimap.cpp diff --git a/tests/src/fsfw/tests/unit/container/TestPlacementFactory.cpp b/tests/src/fsfw-tests/unit/container/TestPlacementFactory.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/container/TestPlacementFactory.cpp rename to tests/src/fsfw-tests/unit/container/TestPlacementFactory.cpp diff --git a/tests/src/fsfw/tests/unit/datapoollocal/CMakeLists.txt b/tests/src/fsfw-tests/unit/datapoollocal/CMakeLists.txt similarity index 100% rename from tests/src/fsfw/tests/unit/datapoollocal/CMakeLists.txt rename to tests/src/fsfw-tests/unit/datapoollocal/CMakeLists.txt diff --git a/tests/src/fsfw/tests/unit/datapoollocal/DataSetTest.cpp b/tests/src/fsfw-tests/unit/datapoollocal/DataSetTest.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/datapoollocal/DataSetTest.cpp rename to tests/src/fsfw-tests/unit/datapoollocal/DataSetTest.cpp diff --git a/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolManagerTest.cpp b/tests/src/fsfw-tests/unit/datapoollocal/LocalPoolManagerTest.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/datapoollocal/LocalPoolManagerTest.cpp rename to tests/src/fsfw-tests/unit/datapoollocal/LocalPoolManagerTest.cpp diff --git a/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.cpp b/tests/src/fsfw-tests/unit/datapoollocal/LocalPoolOwnerBase.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.cpp rename to tests/src/fsfw-tests/unit/datapoollocal/LocalPoolOwnerBase.cpp diff --git a/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.h b/tests/src/fsfw-tests/unit/datapoollocal/LocalPoolOwnerBase.h similarity index 100% rename from tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.h rename to tests/src/fsfw-tests/unit/datapoollocal/LocalPoolOwnerBase.h diff --git a/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolVariableTest.cpp b/tests/src/fsfw-tests/unit/datapoollocal/LocalPoolVariableTest.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/datapoollocal/LocalPoolVariableTest.cpp rename to tests/src/fsfw-tests/unit/datapoollocal/LocalPoolVariableTest.cpp diff --git a/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolVectorTest.cpp b/tests/src/fsfw-tests/unit/datapoollocal/LocalPoolVectorTest.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/datapoollocal/LocalPoolVectorTest.cpp rename to tests/src/fsfw-tests/unit/datapoollocal/LocalPoolVectorTest.cpp diff --git a/tests/src/fsfw/tests/unit/globalfunctions/CMakeLists.txt b/tests/src/fsfw-tests/unit/globalfunctions/CMakeLists.txt similarity index 100% rename from tests/src/fsfw/tests/unit/globalfunctions/CMakeLists.txt rename to tests/src/fsfw-tests/unit/globalfunctions/CMakeLists.txt diff --git a/tests/src/fsfw/tests/unit/mocks/HkReceiverMock.h b/tests/src/fsfw-tests/unit/mocks/HkReceiverMock.h similarity index 100% rename from tests/src/fsfw/tests/unit/mocks/HkReceiverMock.h rename to tests/src/fsfw-tests/unit/mocks/HkReceiverMock.h diff --git a/tests/src/fsfw/tests/unit/mocks/MessageQueueMockBase.h b/tests/src/fsfw-tests/unit/mocks/MessageQueueMockBase.h similarity index 100% rename from tests/src/fsfw/tests/unit/mocks/MessageQueueMockBase.h rename to tests/src/fsfw-tests/unit/mocks/MessageQueueMockBase.h diff --git a/tests/src/fsfw/tests/unit/osal/CMakeLists.txt b/tests/src/fsfw-tests/unit/osal/CMakeLists.txt similarity index 100% rename from tests/src/fsfw/tests/unit/osal/CMakeLists.txt rename to tests/src/fsfw-tests/unit/osal/CMakeLists.txt diff --git a/tests/src/fsfw/tests/unit/osal/TestMessageQueue.cpp b/tests/src/fsfw-tests/unit/osal/TestMessageQueue.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/osal/TestMessageQueue.cpp rename to tests/src/fsfw-tests/unit/osal/TestMessageQueue.cpp diff --git a/tests/src/fsfw/tests/unit/osal/TestSemaphore.cpp b/tests/src/fsfw-tests/unit/osal/TestSemaphore.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/osal/TestSemaphore.cpp rename to tests/src/fsfw-tests/unit/osal/TestSemaphore.cpp diff --git a/tests/src/fsfw/tests/unit/serialize/CMakeLists.txt b/tests/src/fsfw-tests/unit/serialize/CMakeLists.txt similarity index 100% rename from tests/src/fsfw/tests/unit/serialize/CMakeLists.txt rename to tests/src/fsfw-tests/unit/serialize/CMakeLists.txt diff --git a/tests/src/fsfw/tests/unit/serialize/TestSerialBufferAdapter.cpp b/tests/src/fsfw-tests/unit/serialize/TestSerialBufferAdapter.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/serialize/TestSerialBufferAdapter.cpp rename to tests/src/fsfw-tests/unit/serialize/TestSerialBufferAdapter.cpp diff --git a/tests/src/fsfw/tests/unit/serialize/TestSerialLinkedPacket.cpp b/tests/src/fsfw-tests/unit/serialize/TestSerialLinkedPacket.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/serialize/TestSerialLinkedPacket.cpp rename to tests/src/fsfw-tests/unit/serialize/TestSerialLinkedPacket.cpp diff --git a/tests/src/fsfw/tests/unit/serialize/TestSerialLinkedPacket.h b/tests/src/fsfw-tests/unit/serialize/TestSerialLinkedPacket.h similarity index 100% rename from tests/src/fsfw/tests/unit/serialize/TestSerialLinkedPacket.h rename to tests/src/fsfw-tests/unit/serialize/TestSerialLinkedPacket.h diff --git a/tests/src/fsfw/tests/unit/serialize/TestSerialization.cpp b/tests/src/fsfw-tests/unit/serialize/TestSerialization.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/serialize/TestSerialization.cpp rename to tests/src/fsfw-tests/unit/serialize/TestSerialization.cpp diff --git a/tests/src/fsfw/tests/unit/storagemanager/CMakeLists.txt b/tests/src/fsfw-tests/unit/storagemanager/CMakeLists.txt similarity index 100% rename from tests/src/fsfw/tests/unit/storagemanager/CMakeLists.txt rename to tests/src/fsfw-tests/unit/storagemanager/CMakeLists.txt diff --git a/tests/src/fsfw/tests/unit/storagemanager/TestNewAccessor.cpp b/tests/src/fsfw-tests/unit/storagemanager/TestNewAccessor.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/storagemanager/TestNewAccessor.cpp rename to tests/src/fsfw-tests/unit/storagemanager/TestNewAccessor.cpp diff --git a/tests/src/fsfw/tests/unit/storagemanager/TestPool.cpp b/tests/src/fsfw-tests/unit/storagemanager/TestPool.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/storagemanager/TestPool.cpp rename to tests/src/fsfw-tests/unit/storagemanager/TestPool.cpp diff --git a/tests/src/fsfw/tests/unit/tmtcpacket/CMakeLists.txt b/tests/src/fsfw-tests/unit/tmtcpacket/CMakeLists.txt similarity index 100% rename from tests/src/fsfw/tests/unit/tmtcpacket/CMakeLists.txt rename to tests/src/fsfw-tests/unit/tmtcpacket/CMakeLists.txt diff --git a/tests/src/fsfw/tests/unit/tmtcpacket/PusTmTest.cpp b/tests/src/fsfw-tests/unit/tmtcpacket/PusTmTest.cpp similarity index 100% rename from tests/src/fsfw/tests/unit/tmtcpacket/PusTmTest.cpp rename to tests/src/fsfw-tests/unit/tmtcpacket/PusTmTest.cpp diff --git a/tests/src/fsfw/CMakeLists.txt b/tests/src/fsfw/CMakeLists.txt deleted file mode 100644 index 571a126ee..000000000 --- a/tests/src/fsfw/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(tests) \ No newline at end of file From aabc729e77622de9d80cddd8dedd3cb5690f8f8a Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 2 Aug 2021 15:47:12 +0200 Subject: [PATCH 6/7] include changes --- CMakeLists.txt | 2 +- contrib/fsfw-contrib/CMakeLists.txt | 2 +- hal/src/fsfw-hal/common/gpio/GpioCookie.cpp | 2 +- .../fsfw-hal/devicehandlers/GyroL3GD20Handler.cpp | 2 +- hal/src/fsfw-hal/linux/UnixFileGuard.cpp | 2 +- hal/src/fsfw-hal/linux/gpio/LinuxLibgpioIF.cpp | 6 +++--- hal/src/fsfw-hal/linux/i2c/I2cComIF.cpp | 6 +++--- hal/src/fsfw-hal/linux/i2c/I2cCookie.cpp | 2 +- hal/src/fsfw-hal/linux/rpi/GpioRPi.cpp | 4 ++-- hal/src/fsfw-hal/linux/spi/SpiComIF.cpp | 8 ++++---- hal/src/fsfw-hal/linux/spi/SpiComIF.h | 2 +- hal/src/fsfw-hal/linux/spi/SpiCookie.cpp | 2 +- hal/src/fsfw-hal/linux/uart/UartComIF.cpp | 2 +- hal/src/fsfw-hal/linux/uart/UartCookie.cpp | 2 +- hal/src/fsfw-hal/linux/utility.cpp | 2 +- .../fsfw-hal/stm32h7/devicetest/GyroL3GD20H.cpp | 12 ++++++------ hal/src/fsfw-hal/stm32h7/dma.cpp | 2 +- hal/src/fsfw-hal/stm32h7/gpio/gpio.cpp | 2 +- hal/src/fsfw-hal/stm32h7/spi/SpiComIF.cpp | 12 ++++++------ hal/src/fsfw-hal/stm32h7/spi/SpiComIF.h | 2 +- hal/src/fsfw-hal/stm32h7/spi/SpiCookie.cpp | 2 +- hal/src/fsfw-hal/stm32h7/spi/mspInit.cpp | 8 ++++---- hal/src/fsfw-hal/stm32h7/spi/spiCore.cpp | 4 ++-- hal/src/fsfw-hal/stm32h7/spi/spiCore.h | 4 ++-- hal/src/fsfw-hal/stm32h7/spi/spiDefinitions.cpp | 2 +- hal/src/fsfw-hal/stm32h7/spi/spiInterrupts.cpp | 4 ++-- hal/src/fsfw-hal/stm32h7/spi/stm32h743ziSpi.cpp | 6 +++--- src/fsfw/FSFW.h.in | 1 + src/fsfw/coordinates/Sgp4Propagator.h | 2 +- src/fsfw/coordinates/coordinatesConf.h | 5 +++++ .../src/fsfw-tests/internal/InternalUnitTester.cpp | 14 +++++++------- tests/src/fsfw-tests/internal/UnittDefinitions.cpp | 2 +- .../internal/globalfunctions/TestArrayPrinter.cpp | 2 +- tests/src/fsfw-tests/internal/osal/IntTestMq.cpp | 4 ++-- .../src/fsfw-tests/internal/osal/IntTestMutex.cpp | 4 ++-- .../fsfw-tests/internal/osal/IntTestSemaphore.cpp | 4 ++-- .../internal/serialize/IntTestSerialization.cpp | 4 ++-- 37 files changed, 77 insertions(+), 71 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c75d711fe..e3a526f5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ 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) +option(FSFW_ADD_SGP4_PROPAGATOR "Add SGP4 propagator code" OFF) set(LIB_FSFW_NAME fsfw) add_library(${LIB_FSFW_NAME}) diff --git a/contrib/fsfw-contrib/CMakeLists.txt b/contrib/fsfw-contrib/CMakeLists.txt index 3a987228a..3a7e4182a 100644 --- a/contrib/fsfw-contrib/CMakeLists.txt +++ b/contrib/fsfw-contrib/CMakeLists.txt @@ -1,4 +1,4 @@ -if(FSFW_ADD_SPG4_PROPAGATOR) +if(FSFW_ADD_SGP4_PROPAGATOR) target_sources(${LIB_FSFW_NAME} PRIVATE sgp4/sgp4unit.cpp ) diff --git a/hal/src/fsfw-hal/common/gpio/GpioCookie.cpp b/hal/src/fsfw-hal/common/gpio/GpioCookie.cpp index 31832070a..4d221ed9c 100644 --- a/hal/src/fsfw-hal/common/gpio/GpioCookie.cpp +++ b/hal/src/fsfw-hal/common/gpio/GpioCookie.cpp @@ -1,4 +1,4 @@ -#include "fsfw/hal/common/gpio/GpioCookie.h" +#include "fsfw-hal/common/gpio/GpioCookie.h" #include "fsfw/serviceinterface/ServiceInterface.h" GpioCookie::GpioCookie() { diff --git a/hal/src/fsfw-hal/devicehandlers/GyroL3GD20Handler.cpp b/hal/src/fsfw-hal/devicehandlers/GyroL3GD20Handler.cpp index 11f7e92d0..539877cc4 100644 --- a/hal/src/fsfw-hal/devicehandlers/GyroL3GD20Handler.cpp +++ b/hal/src/fsfw-hal/devicehandlers/GyroL3GD20Handler.cpp @@ -1,4 +1,4 @@ -#include "fsfw/hal/devicehandlers/GyroL3GD20Handler.h" +#include "fsfw-hal/devicehandlers/GyroL3GD20Handler.h" #include "fsfw/datapool/PoolReadGuard.h" diff --git a/hal/src/fsfw-hal/linux/UnixFileGuard.cpp b/hal/src/fsfw-hal/linux/UnixFileGuard.cpp index c47e35b19..31280844b 100644 --- a/hal/src/fsfw-hal/linux/UnixFileGuard.cpp +++ b/hal/src/fsfw-hal/linux/UnixFileGuard.cpp @@ -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, std::string diagnosticPrefix): diff --git a/hal/src/fsfw-hal/linux/gpio/LinuxLibgpioIF.cpp b/hal/src/fsfw-hal/linux/gpio/LinuxLibgpioIF.cpp index 98e027964..573961691 100644 --- a/hal/src/fsfw-hal/linux/gpio/LinuxLibgpioIF.cpp +++ b/hal/src/fsfw-hal/linux/gpio/LinuxLibgpioIF.cpp @@ -1,6 +1,6 @@ -#include "fsfw/hal/linux/gpio/LinuxLibgpioIF.h" -#include "fsfw/hal/common/gpio/gpioDefinitions.h" -#include "fsfw/hal/common/gpio/GpioCookie.h" +#include "fsfw-hal/linux/gpio/LinuxLibgpioIF.h" +#include "fsfw-hal/common/gpio/gpioDefinitions.h" +#include "fsfw-hal/common/gpio/GpioCookie.h" #include diff --git a/hal/src/fsfw-hal/linux/i2c/I2cComIF.cpp b/hal/src/fsfw-hal/linux/i2c/I2cComIF.cpp index d756e75ea..b1d3da9eb 100644 --- a/hal/src/fsfw-hal/linux/i2c/I2cComIF.cpp +++ b/hal/src/fsfw-hal/linux/i2c/I2cComIF.cpp @@ -1,6 +1,6 @@ -#include "fsfw/hal/linux/i2c/I2cComIF.h" -#include "fsfw/hal/linux/utility.h" -#include "fsfw/hal/linux/UnixFileGuard.h" +#include "fsfw-hal/linux/i2c/I2cComIF.h" +#include "fsfw-hal/linux/utility.h" +#include "fsfw-hal/linux/UnixFileGuard.h" #include "fsfw/serviceinterface/ServiceInterface.h" diff --git a/hal/src/fsfw-hal/linux/i2c/I2cCookie.cpp b/hal/src/fsfw-hal/linux/i2c/I2cCookie.cpp index fd0f654d7..c3297f1e6 100644 --- a/hal/src/fsfw-hal/linux/i2c/I2cCookie.cpp +++ b/hal/src/fsfw-hal/linux/i2c/I2cCookie.cpp @@ -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_, std::string deviceFile_) : diff --git a/hal/src/fsfw-hal/linux/rpi/GpioRPi.cpp b/hal/src/fsfw-hal/linux/rpi/GpioRPi.cpp index 277a9fb2b..c4cc51ff1 100644 --- a/hal/src/fsfw-hal/linux/rpi/GpioRPi.cpp +++ b/hal/src/fsfw-hal/linux/rpi/GpioRPi.cpp @@ -1,7 +1,7 @@ #include "fsfw/FSFW.h" -#include "fsfw/hal/linux/rpi/GpioRPi.h" -#include "fsfw/hal/common/gpio/GpioCookie.h" +#include "fsfw-hal/linux/rpi/GpioRPi.h" +#include "fsfw-hal/common/gpio/GpioCookie.h" #include diff --git a/hal/src/fsfw-hal/linux/spi/SpiComIF.cpp b/hal/src/fsfw-hal/linux/spi/SpiComIF.cpp index f3d8ab09c..35aa6c296 100644 --- a/hal/src/fsfw-hal/linux/spi/SpiComIF.cpp +++ b/hal/src/fsfw-hal/linux/spi/SpiComIF.cpp @@ -1,8 +1,8 @@ #include "fsfw/FSFW.h" -#include "fsfw/hal/linux/spi/SpiComIF.h" -#include "fsfw/hal/linux/spi/SpiCookie.h" -#include "fsfw/hal/linux/utility.h" -#include "fsfw/hal/linux/UnixFileGuard.h" +#include "fsfw-hal/linux/spi/SpiComIF.h" +#include "fsfw-hal/linux/spi/SpiCookie.h" +#include "fsfw-hal/linux/utility.h" +#include "fsfw-hal/linux/UnixFileGuard.h" #include #include diff --git a/hal/src/fsfw-hal/linux/spi/SpiComIF.h b/hal/src/fsfw-hal/linux/spi/SpiComIF.h index 7f66b8e50..daabf6be4 100644 --- a/hal/src/fsfw-hal/linux/spi/SpiComIF.h +++ b/hal/src/fsfw-hal/linux/spi/SpiComIF.h @@ -3,7 +3,7 @@ #include "spiDefinitions.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/objectmanager/SystemObject.h" diff --git a/hal/src/fsfw-hal/linux/spi/SpiCookie.cpp b/hal/src/fsfw-hal/linux/spi/SpiCookie.cpp index a74bc419e..1f1806c23 100644 --- a/hal/src/fsfw-hal/linux/spi/SpiCookie.cpp +++ b/hal/src/fsfw-hal/linux/spi/SpiCookie.cpp @@ -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, const size_t maxSize, spi::SpiModes spiMode, uint32_t spiSpeed): diff --git a/hal/src/fsfw-hal/linux/uart/UartComIF.cpp b/hal/src/fsfw-hal/linux/uart/UartComIF.cpp index e5fc90c3f..c6e192c50 100644 --- a/hal/src/fsfw-hal/linux/uart/UartComIF.cpp +++ b/hal/src/fsfw-hal/linux/uart/UartComIF.cpp @@ -1,4 +1,4 @@ -#include "fsfw/hal/linux/uart/UartComIF.h" +#include "fsfw-hal/linux/uart/UartComIF.h" #include "OBSWConfig.h" #include "fsfw/serviceinterface/ServiceInterface.h" diff --git a/hal/src/fsfw-hal/linux/uart/UartCookie.cpp b/hal/src/fsfw-hal/linux/uart/UartCookie.cpp index bfd091a8c..5156d9b8a 100644 --- a/hal/src/fsfw-hal/linux/uart/UartCookie.cpp +++ b/hal/src/fsfw-hal/linux/uart/UartCookie.cpp @@ -1,4 +1,4 @@ -#include "fsfw/hal/linux/uart/UartCookie.h" +#include "fsfw-hal/linux/uart/UartCookie.h" #include diff --git a/hal/src/fsfw-hal/linux/utility.cpp b/hal/src/fsfw-hal/linux/utility.cpp index 04fded6c6..6120f9838 100644 --- a/hal/src/fsfw-hal/linux/utility.cpp +++ b/hal/src/fsfw-hal/linux/utility.cpp @@ -1,6 +1,6 @@ #include "fsfw/FSFW.h" #include "fsfw/serviceinterface/ServiceInterface.h" -#include "fsfw/hal/linux/utility.h" +#include "fsfw-hal/linux/utility.h" #include #include diff --git a/hal/src/fsfw-hal/stm32h7/devicetest/GyroL3GD20H.cpp b/hal/src/fsfw-hal/stm32h7/devicetest/GyroL3GD20H.cpp index 04b1de3bc..7e5d0d513 100644 --- a/hal/src/fsfw-hal/stm32h7/devicetest/GyroL3GD20H.cpp +++ b/hal/src/fsfw-hal/stm32h7/devicetest/GyroL3GD20H.cpp @@ -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/spiDefinitions.h" -#include "fsfw/hal/stm32h7/spi/spiCore.h" -#include "fsfw/hal/stm32h7/spi/spiInterrupts.h" -#include "fsfw/hal/stm32h7/spi/stm32h743ziSpi.h" +#include "fsfw-hal/stm32h7/spi/mspInit.h" +#include "fsfw-hal/stm32h7/spi/spiDefinitions.h" +#include "fsfw-hal/stm32h7/spi/spiCore.h" +#include "fsfw-hal/stm32h7/spi/spiInterrupts.h" +#include "fsfw-hal/stm32h7/spi/stm32h743ziSpi.h" #include "fsfw/tasks/TaskFactory.h" #include "fsfw/serviceinterface/ServiceInterface.h" diff --git a/hal/src/fsfw-hal/stm32h7/dma.cpp b/hal/src/fsfw-hal/stm32h7/dma.cpp index 288e42944..97cd93a29 100644 --- a/hal/src/fsfw-hal/stm32h7/dma.cpp +++ b/hal/src/fsfw-hal/stm32h7/dma.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/hal/src/fsfw-hal/stm32h7/gpio/gpio.cpp b/hal/src/fsfw-hal/stm32h7/gpio/gpio.cpp index 927588a37..d8b24270e 100644 --- a/hal/src/fsfw-hal/stm32h7/gpio/gpio.cpp +++ b/hal/src/fsfw-hal/stm32h7/gpio/gpio.cpp @@ -1,4 +1,4 @@ -#include "fsfw/hal/stm32h7/gpio/gpio.h" +#include "fsfw-hal/stm32h7/gpio/gpio.h" #include "stm32h7xx_hal_rcc.h" diff --git a/hal/src/fsfw-hal/stm32h7/spi/SpiComIF.cpp b/hal/src/fsfw-hal/stm32h7/spi/SpiComIF.cpp index da34c4c0c..f91602f9a 100644 --- a/hal/src/fsfw-hal/stm32h7/spi/SpiComIF.cpp +++ b/hal/src/fsfw-hal/stm32h7/spi/SpiComIF.cpp @@ -1,11 +1,11 @@ -#include "fsfw/hal/stm32h7/spi/SpiComIF.h" -#include "fsfw/hal/stm32h7/spi/SpiCookie.h" +#include "fsfw-hal/stm32h7/spi/SpiComIF.h" +#include "fsfw-hal/stm32h7/spi/SpiCookie.h" #include "fsfw/tasks/SemaphoreFactory.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" +#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 diff --git a/hal/src/fsfw-hal/stm32h7/spi/SpiComIF.h b/hal/src/fsfw-hal/stm32h7/spi/SpiComIF.h index 00625b34d..e97aebe70 100644 --- a/hal/src/fsfw-hal/stm32h7/spi/SpiComIF.h +++ b/hal/src/fsfw-hal/stm32h7/spi/SpiComIF.h @@ -5,7 +5,7 @@ #include "fsfw/devicehandlers/DeviceCommunicationIF.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 "stm32h743xx.h" diff --git a/hal/src/fsfw-hal/stm32h7/spi/SpiCookie.cpp b/hal/src/fsfw-hal/stm32h7/spi/SpiCookie.cpp index 82d705c21..b37d3ae92 100644 --- a/hal/src/fsfw-hal/stm32h7/spi/SpiCookie.cpp +++ b/hal/src/fsfw-hal/stm32h7/spi/SpiCookie.cpp @@ -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, diff --git a/hal/src/fsfw-hal/stm32h7/spi/mspInit.cpp b/hal/src/fsfw-hal/stm32h7/spi/mspInit.cpp index 424a8bfb9..17ff45f9e 100644 --- a/hal/src/fsfw-hal/stm32h7/spi/mspInit.cpp +++ b/hal/src/fsfw-hal/stm32h7/spi/mspInit.cpp @@ -1,7 +1,7 @@ -#include "fsfw/hal/stm32h7/dma.h" -#include "fsfw/hal/stm32h7/spi/mspInit.h" -#include "fsfw/hal/stm32h7/spi/spiCore.h" -#include "fsfw/hal/stm32h7/spi/spiInterrupts.h" +#include "fsfw-hal/stm32h7/dma.h" +#include "fsfw-hal/stm32h7/spi/mspInit.h" +#include "fsfw-hal/stm32h7/spi/spiCore.h" +#include "fsfw-hal/stm32h7/spi/spiInterrupts.h" #include "stm32h743xx.h" #include "stm32h7xx_hal_spi.h" diff --git a/hal/src/fsfw-hal/stm32h7/spi/spiCore.cpp b/hal/src/fsfw-hal/stm32h7/spi/spiCore.cpp index a72bf12b6..aa3c32ce0 100644 --- a/hal/src/fsfw-hal/stm32h7/spi/spiCore.cpp +++ b/hal/src/fsfw-hal/stm32h7/spi/spiCore.cpp @@ -1,5 +1,5 @@ -#include "fsfw/hal/stm32h7/spi/spiCore.h" -#include "fsfw/hal/stm32h7/spi/spiDefinitions.h" +#include "fsfw-hal/stm32h7/spi/spiCore.h" +#include "fsfw-hal/stm32h7/spi/spiDefinitions.h" #include diff --git a/hal/src/fsfw-hal/stm32h7/spi/spiCore.h b/hal/src/fsfw-hal/stm32h7/spi/spiCore.h index bff90a5b0..ba4e1430a 100644 --- a/hal/src/fsfw-hal/stm32h7/spi/spiCore.h +++ b/hal/src/fsfw-hal/stm32h7/spi/spiCore.h @@ -1,8 +1,8 @@ #ifndef FSFW_HAL_STM32H7_SPI_SPICORE_H_ #define FSFW_HAL_STM32H7_SPI_SPICORE_H_ -#include "fsfw/hal/stm32h7/dma.h" -#include "fsfw/hal/stm32h7/spi/spiDefinitions.h" +#include "fsfw-hal/stm32h7/dma.h" +#include "fsfw-hal/stm32h7/spi/spiDefinitions.h" #include "stm32h7xx_hal.h" #include "stm32h7xx_hal_dma.h" diff --git a/hal/src/fsfw-hal/stm32h7/spi/spiDefinitions.cpp b/hal/src/fsfw-hal/stm32h7/spi/spiDefinitions.cpp index 6a83ae42b..7573640c6 100644 --- a/hal/src/fsfw-hal/stm32h7/spi/spiDefinitions.cpp +++ b/hal/src/fsfw-hal/stm32h7/spi/spiDefinitions.cpp @@ -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) { switch(spiMode) { diff --git a/hal/src/fsfw-hal/stm32h7/spi/spiInterrupts.cpp b/hal/src/fsfw-hal/stm32h7/spi/spiInterrupts.cpp index 90cfe7065..c3ca66036 100644 --- a/hal/src/fsfw-hal/stm32h7/spi/spiInterrupts.cpp +++ b/hal/src/fsfw-hal/stm32h7/spi/spiInterrupts.cpp @@ -1,5 +1,5 @@ -#include "fsfw/hal/stm32h7/spi/spiInterrupts.h" -#include "fsfw/hal/stm32h7/spi/spiCore.h" +#include "fsfw-hal/stm32h7/spi/spiInterrupts.h" +#include "fsfw-hal/stm32h7/spi/spiCore.h" #include "stm32h7xx_hal.h" #include "stm32h7xx_hal_dma.h" diff --git a/hal/src/fsfw-hal/stm32h7/spi/stm32h743ziSpi.cpp b/hal/src/fsfw-hal/stm32h7/spi/stm32h743ziSpi.cpp index f1f2815ef..c6be862f3 100644 --- a/hal/src/fsfw-hal/stm32h7/spi/stm32h743ziSpi.cpp +++ b/hal/src/fsfw-hal/stm32h7/spi/stm32h743ziSpi.cpp @@ -1,6 +1,6 @@ -#include "fsfw/hal/stm32h7/spi/stm32h743ziSpi.h" -#include "fsfw/hal/stm32h7/spi/spiCore.h" -#include "fsfw/hal/stm32h7/spi/spiInterrupts.h" +#include "fsfw-hal/stm32h7/spi/stm32h743ziSpi.h" +#include "fsfw-hal/stm32h7/spi/spiCore.h" +#include "fsfw-hal/stm32h7/spi/spiInterrupts.h" #include "stm32h7xx_hal.h" #include "stm32h7xx_hal_rcc.h" diff --git a/src/fsfw/FSFW.h.in b/src/fsfw/FSFW.h.in index 9b74d04c8..01379c5f2 100644 --- a/src/fsfw/FSFW.h.in +++ b/src/fsfw/FSFW.h.in @@ -9,5 +9,6 @@ #cmakedefine FSFW_ADD_COORDINATES #cmakedefine FSFW_ADD_PUS #cmakedefine FSFW_ADD_MONITORING +#cmakedefine FSFW_ADD_SGP4_PROPAGATOR #endif /* FSFW_FSFW_H_ */ diff --git a/src/fsfw/coordinates/Sgp4Propagator.h b/src/fsfw/coordinates/Sgp4Propagator.h index 4f29509fb..aa1e821fc 100644 --- a/src/fsfw/coordinates/Sgp4Propagator.h +++ b/src/fsfw/coordinates/Sgp4Propagator.h @@ -7,7 +7,7 @@ #ifndef PLATFORM_WIN #include #endif -#include "fsfw/contrib/sgp4/sgp4unit.h" +#include "fsfw-contrib/sgp4/sgp4unit.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h" class Sgp4Propagator { diff --git a/src/fsfw/coordinates/coordinatesConf.h b/src/fsfw/coordinates/coordinatesConf.h index ce798e6f1..9c1c37549 100644 --- a/src/fsfw/coordinates/coordinatesConf.h +++ b/src/fsfw/coordinates/coordinatesConf.h @@ -8,4 +8,9 @@ not enabled with FSFW_ADD_COORDINATES #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_ */ diff --git a/tests/src/fsfw-tests/internal/InternalUnitTester.cpp b/tests/src/fsfw-tests/internal/InternalUnitTester.cpp index 8631ce0d4..8fc7cb68f 100644 --- a/tests/src/fsfw-tests/internal/InternalUnitTester.cpp +++ b/tests/src/fsfw-tests/internal/InternalUnitTester.cpp @@ -1,11 +1,11 @@ -#include "fsfw/tests/internal/InternalUnitTester.h" -#include "fsfw/tests/internal/UnittDefinitions.h" +#include "fsfw-tests/internal/InternalUnitTester.h" +#include "fsfw-tests/internal/UnittDefinitions.h" -#include "fsfw/tests/internal/osal/IntTestMq.h" -#include "fsfw/tests/internal/osal/IntTestSemaphore.h" -#include "fsfw/tests/internal/osal/IntTestMutex.h" -#include "fsfw/tests/internal/serialize/IntTestSerialization.h" -#include "fsfw/tests/internal/globalfunctions/TestArrayPrinter.h" +#include "fsfw-tests/internal/osal/IntTestMq.h" +#include "fsfw-tests/internal/osal/IntTestSemaphore.h" +#include "fsfw-tests/internal/osal/IntTestMutex.h" +#include "fsfw-tests/internal/serialize/IntTestSerialization.h" +#include "fsfw-tests/internal/globalfunctions/TestArrayPrinter.h" #include diff --git a/tests/src/fsfw-tests/internal/UnittDefinitions.cpp b/tests/src/fsfw-tests/internal/UnittDefinitions.cpp index 74fd53be8..eaef0bfe7 100644 --- a/tests/src/fsfw-tests/internal/UnittDefinitions.cpp +++ b/tests/src/fsfw-tests/internal/UnittDefinitions.cpp @@ -1,4 +1,4 @@ -#include "fsfw/tests/internal/UnittDefinitions.h" +#include "fsfw-tests/internal/UnittDefinitions.h" ReturnValue_t unitt::put_error(std::string errorId) { #if FSFW_CPP_OSTREAM_ENABLED == 1 diff --git a/tests/src/fsfw-tests/internal/globalfunctions/TestArrayPrinter.cpp b/tests/src/fsfw-tests/internal/globalfunctions/TestArrayPrinter.cpp index 905780955..f1a0378e7 100644 --- a/tests/src/fsfw-tests/internal/globalfunctions/TestArrayPrinter.cpp +++ b/tests/src/fsfw-tests/internal/globalfunctions/TestArrayPrinter.cpp @@ -1,4 +1,4 @@ -#include "fsfw/tests/internal/globalfunctions/TestArrayPrinter.h" +#include "fsfw-tests/internal/globalfunctions/TestArrayPrinter.h" void arrayprinter::testArrayPrinter() { { diff --git a/tests/src/fsfw-tests/internal/osal/IntTestMq.cpp b/tests/src/fsfw-tests/internal/osal/IntTestMq.cpp index 91bc2c6d6..5ea3ec34e 100644 --- a/tests/src/fsfw-tests/internal/osal/IntTestMq.cpp +++ b/tests/src/fsfw-tests/internal/osal/IntTestMq.cpp @@ -1,5 +1,5 @@ -#include "fsfw/tests/internal/osal/IntTestMq.h" -#include "fsfw/tests/internal/UnittDefinitions.h" +#include "fsfw-tests/internal/osal/IntTestMq.h" +#include "fsfw-tests/internal/UnittDefinitions.h" #include #include diff --git a/tests/src/fsfw-tests/internal/osal/IntTestMutex.cpp b/tests/src/fsfw-tests/internal/osal/IntTestMutex.cpp index 9e7c1481f..2d8a50c2e 100644 --- a/tests/src/fsfw-tests/internal/osal/IntTestMutex.cpp +++ b/tests/src/fsfw-tests/internal/osal/IntTestMutex.cpp @@ -1,5 +1,5 @@ -#include "fsfw/tests/internal/osal/IntTestMutex.h" -#include "fsfw/tests/internal/UnittDefinitions.h" +#include "fsfw-tests/internal/osal/IntTestMutex.h" +#include "fsfw-tests/internal/UnittDefinitions.h" #include diff --git a/tests/src/fsfw-tests/internal/osal/IntTestSemaphore.cpp b/tests/src/fsfw-tests/internal/osal/IntTestSemaphore.cpp index e278e3c1c..8a848d92b 100644 --- a/tests/src/fsfw-tests/internal/osal/IntTestSemaphore.cpp +++ b/tests/src/fsfw-tests/internal/osal/IntTestSemaphore.cpp @@ -1,5 +1,5 @@ -#include "fsfw/tests/internal/osal/IntTestSemaphore.h" -#include "fsfw/tests/internal/UnittDefinitions.h" +#include "fsfw-tests/internal/osal/IntTestSemaphore.h" +#include "fsfw-tests/internal/UnittDefinitions.h" #include #include diff --git a/tests/src/fsfw-tests/internal/serialize/IntTestSerialization.cpp b/tests/src/fsfw-tests/internal/serialize/IntTestSerialization.cpp index 3489c759f..42b4861fa 100644 --- a/tests/src/fsfw-tests/internal/serialize/IntTestSerialization.cpp +++ b/tests/src/fsfw-tests/internal/serialize/IntTestSerialization.cpp @@ -1,5 +1,5 @@ -#include "fsfw/tests/internal/serialize/IntTestSerialization.h" -#include "fsfw/tests/internal/UnittDefinitions.h" +#include "fsfw-tests/internal/serialize/IntTestSerialization.h" +#include "fsfw-tests/internal/UnittDefinitions.h" #include #include From 0e5cfcf28f0183d7286d1160a40dcff2017f7795 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 2 Aug 2021 16:19:37 +0200 Subject: [PATCH 7/7] minor improvement for printout --- src/fsfw/osal/linux/unixUtility.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fsfw/osal/linux/unixUtility.cpp b/src/fsfw/osal/linux/unixUtility.cpp index 40d8c2129..57e1f17a3 100644 --- a/src/fsfw/osal/linux/unixUtility.cpp +++ b/src/fsfw/osal/linux/unixUtility.cpp @@ -14,7 +14,7 @@ void utility::printUnixErrorGeneric(const char* const className, #if FSFW_VERBOSE_LEVEL >= 1 if(outputType == sif::OutputTypes::OUT_ERROR) { #if FSFW_CPP_OSTREAM_ENABLED == 1 - sif::error << className << "::" << function << ":" << failString << " error: " + sif::error << className << "::" << function << ": " << failString << " error: " << strerror(errno) << std::endl; #else sif::printError("%s::%s: %s error: %s\n", className, function, failString, strerror(errno)); @@ -22,7 +22,7 @@ void utility::printUnixErrorGeneric(const char* const className, } else { #if FSFW_CPP_OSTREAM_ENABLED == 1 - sif::warning << className << "::" << function << ":" << failString << " error: " + sif::warning << className << "::" << function << ": " << failString << " error: " << strerror(errno) << std::endl; #else sif::printWarning("%s::%s: %s error: %s\n", className, function, failString, strerror(errno));