Merge remote-tracking branch 'upstream/development' into mueller/LocalPoolRefactoring

This commit is contained in:
Robin Müller 2020-12-01 13:22:39 +01:00
commit 2e51b90161
3 changed files with 11 additions and 0 deletions

7
CHANGELOG Normal file
View File

@ -0,0 +1,7 @@
## Changes from ASTP 0.0.1 to 0.0.2
### FreeRTOS OSAL
- vRequestContextSwitchFromISR is declared extern "C" so it can be defined in
a C file without issues

View File

@ -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 Command_t NO_COMMAND = 0xffffffff;
/**
* @brief This is the mode the <strong>device handler</strong> is in.
*

View File

@ -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)