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

mueller/master #37

Closed
muellerr wants to merge 126 commits from mueller/master into eive/develop
pull from: mueller/master
merge into: eive:eive/develop
Conversation 0 Commits 126 Files Changed 42 +1 -3
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1d18ad5ebf - Show all commits

3
tests/src/fsfw_tests/unit/testcfg/events/subsystemIdRanges.h
View File

@ -2,7 +2,6 @@
#define CONFIG_EVENTS_SUBSYSTEMIDRANGES_H_
#include "fsfw/events/fwSubsystemIdRanges.h"
#include "common/events/commonSubsystemIds.h"
#include <cstdint>
@ -13,7 +12,7 @@
*/
namespace SUBSYSTEM_ID {
enum: uint8_t {
SUBSYSTEM_ID_START = COMMON_SUBSYSTEM_ID_RANGE,
SUBSYSTEM_ID_START = 0,
SUBSYSTEM_ID_END // [EXPORT] : [END]
};
}

1
tests/src/fsfw_tests/unit/testcfg/returnvalues/classIds.h
View File

@ -1,7 +1,6 @@
#ifndef CONFIG_RETURNVALUES_CLASSIDS_H_
#define CONFIG_RETURNVALUES_CLASSIDS_H_
#include "common/returnvalues/commonClassIds.h"
#include "fsfw/returnvalues/FwClassIds.h"
/**