eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Release v1.2.0 #47

Merged
meierj merged 229 commits from develop into master 2021-06-21 17:58:40 +02:00
Conversation 1 Commits 229 Files Changed 202 +3 -8
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 11192d7670 - Show all commits

6
common/config/commonSubsystemIds.h
View File

@ -6,12 +6,6 @@
namespace SUBSYSTEM_ID {
enum: uint8_t {
COMMON_SUBSYSTEM_ID_START = FW_SUBSYSTEM_ID_RANGE,
PUS_SERVICE_2 = 100,
PUS_SERVICE_3 = 101,
PUS_SERVICE_5 = 102,
PUS_SERVICE_6 = 103,
PUS_SERVICE_8 = 104,
PUS_SERVICE_23 = 105,
MGM_LIS3MDL = 106,
MGM_RM3100 = 107,
PCDU_HANDLER = 108,

5
linux/fsfwconfig/events/subsystemIdRanges.h
View File

@ -1,8 +1,9 @@
#ifndef FSFWCONFIG_EVENTS_SUBSYSTEMIDRANGES_H_
#define FSFWCONFIG_EVENTS_SUBSYSTEMIDRANGES_H_
#include <common/config/commonSubsystemIds.h>
#include <fsfw/events/fwSubsystemIdRanges.h>
#include "common/config/commonSubsystemIds.h"
#include "fsfw/events/fwSubsystemIdRanges.h"
#include <cstdint>
/**