Merge branch 'eive/include-fsfw' into development

small fix so that it compiles
include added
2020-11-02 17:21:43 +01:00 · 2020-11-02 17:21:25 +01:00 · 2020-11-02 17:19:24 +01:00
2 changed files with 4 additions and 0 deletions
--- a/devicehandlers/DeviceHandlerIF.h
+++ b/devicehandlers/DeviceHandlerIF.h
@@ -18,6 +18,8 @@ public:
 	static const uint8_t TRANSITION_MODE_CHILD_ACTION_MASK = 0x20;
 	static const uint8_t TRANSITION_MODE_BASE_ACTION_MASK = 0x10;

+	static constexpr DeviceCommandId_t NO_COMMAND = 0xffffffff;
+
 	/**
 	 * @brief This is the mode the <strong>device handler</strong> is in.
 	 *
--- 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)
Author	SHA1	Message	Date
Robin.Mueller	edecb7882b	Merge branch 'eive/include-fsfw' into development	2020-11-02 17:21:43 +01:00
Robin.Mueller	cc51d9ace9	small fix so that it compiles	2020-11-02 17:21:25 +01:00
Robin.Mueller	3067259a9b	include added	2020-11-02 17:19:24 +01:00