merge upstream development #110

Merged
muellerr merged 70 commits from mohr/merge-upstream into develop 2022-09-15 18:34:50 +02:00
2 changed files with 0 additions and 4 deletions
Showing only changes of commit 1e85cdadfd - Show all commits

View File

@ -4,8 +4,6 @@
#include <stdint.h>
#include "fwSubsystemIdRanges.h"
// could be moved to more suitable location
#include <events/subsystemIdRanges.h>
using EventId_t = uint16_t;
using EventSeverity_t = uint8_t;

View File

@ -1,8 +1,6 @@
#ifndef FSFW_RETURNVALUES_RETURNVALUE_H_
#define FSFW_RETURNVALUES_RETURNVALUE_H_
#include <returnvalues/classIds.h>
#include <cstdint>
#include "FwClassIds.h"