From 1cc0847bb512bc5df7a79097da726bf7f45739db Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 21 Nov 2020 00:15:31 +0100 Subject: [PATCH 1/4] small bugfix --- devicehandlers/DeviceHandlerIF.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devicehandlers/DeviceHandlerIF.h b/devicehandlers/DeviceHandlerIF.h index 10907a891..35bbe3764 100644 --- a/devicehandlers/DeviceHandlerIF.h +++ b/devicehandlers/DeviceHandlerIF.h @@ -18,7 +18,7 @@ public: static const uint8_t TRANSITION_MODE_CHILD_ACTION_MASK = 0x20; static const uint8_t TRANSITION_MODE_BASE_ACTION_MASK = 0x10; - static constexpr Command_t NO_COMMAND = 0xffffffff; + static constexpr Command_t NO_COMMAND = -1; /** * @brief This is the mode the device handler is in. From 8c294729d0dce83c95f34b849ec8bbe8ef369133 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 22 Nov 2020 12:34:16 +0100 Subject: [PATCH 2/4] extern c definition added --- osal/FreeRTOS/TaskManagement.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osal/FreeRTOS/TaskManagement.h b/osal/FreeRTOS/TaskManagement.h index 4b7fe3eb3..eb7351859 100644 --- a/osal/FreeRTOS/TaskManagement.h +++ b/osal/FreeRTOS/TaskManagement.h @@ -13,7 +13,7 @@ extern "C" { * Architecture dependant portmacro.h function call. * Should be implemented in bsp. */ -extern void vRequestContextSwitchFromISR(); +extern "C" void vRequestContextSwitchFromISR(); /*! * Used by functions to tell if they are being called from From c182171b096d1beaa25edda4ff365b5f2fdd64d9 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Mon, 30 Nov 2020 12:32:38 +0100 Subject: [PATCH 3/4] updated make file --- fsfw.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fsfw.mk b/fsfw.mk index 3639717b6..f2cdd7ab6 100644 --- a/fsfw.mk +++ b/fsfw.mk @@ -70,3 +70,5 @@ CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcpacket/packetmatcher/*.cpp) CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcpacket/pus/*.cpp) CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcservices/*.cpp) CXXSRC += $(wildcard $(FRAMEWORK_PATH)/pus/*.cpp) + +INCLUDES += $(CURRENTPATH) From 49479faa1a4e2b8e43fc1ff55fb4fce7cff75bbb Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Mon, 30 Nov 2020 12:37:22 +0100 Subject: [PATCH 4/4] better solution --- defaultcfg/fsfwconfig/FSFWConfig.h | 1 - fsfw.mk | 2 -- 2 files changed, 3 deletions(-) diff --git a/defaultcfg/fsfwconfig/FSFWConfig.h b/defaultcfg/fsfwconfig/FSFWConfig.h index be3717b40..8c6c754ae 100644 --- a/defaultcfg/fsfwconfig/FSFWConfig.h +++ b/defaultcfg/fsfwconfig/FSFWConfig.h @@ -1,7 +1,6 @@ #ifndef CONFIG_FSFWCONFIG_H_ #define CONFIG_FSFWCONFIG_H_ -#include #include #include diff --git a/fsfw.mk b/fsfw.mk index f2cdd7ab6..3639717b6 100644 --- a/fsfw.mk +++ b/fsfw.mk @@ -70,5 +70,3 @@ CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcpacket/packetmatcher/*.cpp) CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcpacket/pus/*.cpp) CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcservices/*.cpp) CXXSRC += $(wildcard $(FRAMEWORK_PATH)/pus/*.cpp) - -INCLUDES += $(CURRENTPATH)