From 0bdcb40609e62c9dd04daa85c48db09edf93beb9 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 11 Mar 2022 14:25:01 +0100
Subject: [PATCH 1/2] minor event changes

---
 src/fsfw/events/Event.h | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/fsfw/events/Event.h b/src/fsfw/events/Event.h
index 20b66679e..edc1d838d 100644
--- a/src/fsfw/events/Event.h
+++ b/src/fsfw/events/Event.h
@@ -7,8 +7,19 @@
 // could be moved to more suitable location
 #include <events/subsystemIdRanges.h>
 
-typedef uint16_t EventId_t;
-typedef uint8_t EventSeverity_t;
+using EventId_t = uint16_t;
+using EventSeverity_t = uint8_t ;
+using UniqueEventId_t = uint8_t;
+
+namespace severity {
+enum Severity: EventSeverity_t {
+  INFO = 1,
+  LOW = 2,
+  MEDIUM = 3,
+  HIGH = 4
+};
+
+}  // namespace severity
 
 #define MAKE_EVENT(id, severity) (((severity) << 16) + (SUBSYSTEM_ID * 100) + (id))
 
@@ -20,18 +31,11 @@ constexpr EventId_t getEventId(Event event) { return (event & 0xFFFF); }
 
 constexpr EventSeverity_t getSeverity(Event event) { return ((event >> 16) & 0xFF); }
 
-constexpr Event makeEvent(uint8_t subsystemId, uint8_t uniqueEventId,
+constexpr Event makeEvent(uint8_t subsystemId, UniqueEventId_t uniqueEventId,
                           EventSeverity_t eventSeverity) {
   return (eventSeverity << 16) + (subsystemId * 100) + uniqueEventId;
 }
 
 }  // namespace event
 
-namespace severity {
-static constexpr EventSeverity_t INFO = 1;
-static constexpr EventSeverity_t LOW = 2;
-static constexpr EventSeverity_t MEDIUM = 3;
-static constexpr EventSeverity_t HIGH = 4;
-}  // namespace severity
-
 #endif /* EVENTOBJECT_EVENT_H_ */

From fca43b3d34917bd11c7ef9a76e7789103ed193d0 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 14 Mar 2022 15:08:45 +0100
Subject: [PATCH 2/2] run auto-formatter

---
 src/fsfw/events/Event.h | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/fsfw/events/Event.h b/src/fsfw/events/Event.h
index edc1d838d..ecab04932 100644
--- a/src/fsfw/events/Event.h
+++ b/src/fsfw/events/Event.h
@@ -8,16 +8,11 @@
 #include <events/subsystemIdRanges.h>
 
 using EventId_t = uint16_t;
-using EventSeverity_t = uint8_t ;
+using EventSeverity_t = uint8_t;
 using UniqueEventId_t = uint8_t;
 
 namespace severity {
-enum Severity: EventSeverity_t {
-  INFO = 1,
-  LOW = 2,
-  MEDIUM = 3,
-  HIGH = 4
-};
+enum Severity : EventSeverity_t { INFO = 1, LOW = 2, MEDIUM = 3, HIGH = 4 };
 
 }  // namespace severity