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

format

Browse Source
This commit is contained in:
Ulrich Mohr 2023-01-16 12:35:14 +01:00
parent a0eae66c35
commit fe9804d922
9 changed files with 107 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -175,10 +175,7 @@ if(FSFW_BUILD_TESTS)
configure_file(unittests/testcfg/TestsConfig.h.in tests/TestsConfig.h) configure_file(unittests/testcfg/TestsConfig.h.in tests/TestsConfig.h)
if(FSFW_OSAL MATCHES "freertos") if(FSFW_OSAL MATCHES "freertos")
message( message(STATUS "${MSG_PREFIX} Downloading FreeRTOS with FetchContent")
STATUS
"${MSG_PREFIX} Downloading FreeRTOS with FetchContent"
)
include(FetchContent) include(FetchContent)
set(FreeRTOS_PORT posix) set(FreeRTOS_PORT posix)
@ -251,8 +248,6 @@ if(FSFW_FETCH_CONTENT_TARGETS)
set_target_properties(Catch2 PROPERTIES DEBUG_POSTFIX "") set_target_properties(Catch2 PROPERTIES DEBUG_POSTFIX "")
endif() endif()
endif() endif()
set(FSFW_CORE_INC_PATH "inc") set(FSFW_CORE_INC_PATH "inc")

4
src/fsfw/pus/Service11TelecommandScheduling.tpp
View File

@ -2,12 +2,12 @@
#include <cstddef> #include <cstddef>
#include "fsfw/globalfunctions/CRC.h"
#include "fsfw/objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "fsfw/serialize/SerializeAdapter.h" #include "fsfw/serialize/SerializeAdapter.h"
#include "fsfw/serviceinterface.h" #include "fsfw/serviceinterface.h"
#include "fsfw/tmtcservices/AcceptsTelecommandsIF.h"
#include "fsfw/tmtcpacket/pus/tc/PusTcIF.h" #include "fsfw/tmtcpacket/pus/tc/PusTcIF.h"
#include "fsfw/globalfunctions/CRC.h" #include "fsfw/tmtcservices/AcceptsTelecommandsIF.h"
static constexpr auto DEF_END = SerializeIF::Endianness::BIG; static constexpr auto DEF_END = SerializeIF::Endianness::BIG;

16
unittests/CatchRunner.cpp
View File

@ -10,21 +10,24 @@
#define CATCH_CONFIG_COLOUR_WINDOWS #define CATCH_CONFIG_COLOUR_WINDOWS
#include <catch2/catch_session.hpp>
#include <fsfw/osal/osal.h> #include <fsfw/osal/osal.h>
#include <catch2/catch_session.hpp>
#ifdef FSFW_OSAL_FREERTOS #ifdef FSFW_OSAL_FREERTOS
#include <FreeRTOS.h> #include <FreeRTOS.h>
#include "task.h" #include "task.h"
#endif #endif
extern int customSetup(); extern int customSetup();
extern int customTeardown(); extern int customTeardown();
#ifdef FSFW_OSAL_FREERTOS #ifdef FSFW_OSAL_FREERTOS
struct Taskparameters { struct Taskparameters {
int argc; char** argv;TaskHandle_t catchTask; int argc;
char** argv;
TaskHandle_t catchTask;
} taskParameters; } taskParameters;
void unittestTaskFunction(void* pvParameters) { void unittestTaskFunction(void* pvParameters) {
@ -40,15 +43,16 @@ void unittestTaskFunction( void *pvParameters ) {
} }
#endif #endif
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
customSetup(); customSetup();
int result = 0; int result = 0;
#ifdef FSFW_OSAL_FREERTOS #ifdef FSFW_OSAL_FREERTOS
xTaskCreate( unittestTaskFunction, /* The function that implements the task. */ xTaskCreate(
"Unittests", /* The text name assigned to the task - for debug only as it is not used by the kernel. */ unittestTaskFunction, /* The function that implements the task. */
"Unittests", /* The text name assigned to the task - for debug only as it is not used by the
kernel. */
configMINIMAL_STACK_SIZE, /* The size of the stack to allocate to the task. */ configMINIMAL_STACK_SIZE, /* The size of the stack to allocate to the task. */
&taskParameters, /* The parameter passed to the task - not used in this simple case. */ &taskParameters, /* The parameter passed to the task - not used in this simple case. */
1, /* The priority assigned to the task. */ 1, /* The priority assigned to the task. */

2
unittests/CatchSetup.cpp
View File

@ -6,8 +6,6 @@
#include <gcov.h> #include <gcov.h>
#endif #endif
#include "fsfw/objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "fsfw/storagemanager/StorageManagerIF.h" #include "fsfw/storagemanager/StorageManagerIF.h"

3
unittests/osal/TestClock.cpp
View File

@ -1,12 +1,11 @@
#include <fsfw/globalfunctions/timevalOperations.h> #include <fsfw/globalfunctions/timevalOperations.h>
#include <fsfw/timemanager/Clock.h> #include <fsfw/timemanager/Clock.h>
#include <stdio.h>
#include <array> #include <array>
#include <catch2/catch_approx.hpp> #include <catch2/catch_approx.hpp>
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <stdio.h>
#include "CatchDefinitions.h" #include "CatchDefinitions.h"
TEST_CASE("OSAL::Clock Test", "[OSAL::Clock Test]") { TEST_CASE("OSAL::Clock Test", "[OSAL::Clock Test]") {