From f0702e57145b66cc4e83f17f30d3916f2a8ddde7 Mon Sep 17 00:00:00 2001
From: Henrik Stickann <4376396-Mithradir@users.noreply.gitlab.com>
Date: Tue, 24 May 2022 14:05:48 +0200
Subject: [PATCH] Move system event files

---
 .../sta/rtos/{ => system}/system_event.hpp    | 20 +++++++++++--------
 src/rtos/{ => system}/system_event.cpp        |  5 ++++-
 2 files changed, 16 insertions(+), 9 deletions(-)
 rename include/sta/rtos/{ => system}/system_event.hpp (80%)
 rename src/rtos/{ => system}/system_event.cpp (83%)

diff --git a/include/sta/rtos/system_event.hpp b/include/sta/rtos/system/system_event.hpp
similarity index 80%
rename from include/sta/rtos/system_event.hpp
rename to include/sta/rtos/system/system_event.hpp
index a51367f..3e84ae9 100644
--- a/include/sta/rtos/system_event.hpp
+++ b/include/sta/rtos/system/system_event.hpp
@@ -2,8 +2,11 @@
  * @file
  * @brief Implementation of system events.
  */
-#ifndef STA_RTOS_SYSTEM_EVENT_HPP
-#define STA_RTOS_SYSTEM_EVENT_HPP
+#ifndef STA_RTOS_SYSTEM_SYSTEM_EVENT_HPP
+#define STA_RTOS_SYSTEM_SYSTEM_EVENT_HPP
+
+#include <sta/rtos/system/names.hpp>
+
 
 /**
  * @defgroup STA_RTOS_SysEvent System Events
@@ -22,15 +25,16 @@
 #  define STA_RTOS2_SYSTEM_EVENT_ENABLE
 #endif // DOXYGEN
 
+
 /**
- * @def STA_RTOS_SYSTEM_EVENT_HANDLE
- * @brief Set variable name of event flags handle.
+ * @def STA_RTOS_SYSTEM_EVENT_NAME
+ * @brief Set name of system event flags.
  *
  * @ingroup STA_RTOS_BuildConfig
  */
-#ifndef STA_RTOS_SYSTEM_EVENT_HANDLE
-#  define STA_RTOS_SYSTEM_EVENT_HANDLE  systemEventHandle
-#endif // !STA_RTOS_SYSTEM_EVENT_HANDLE
+#ifndef STA_RTOS_SYSTEM_EVENT_NAME
+#  define STA_RTOS_SYSTEM_EVENT_NAME    systemEvent
+#endif // !STA_RTOS_SYSTEM_EVENT_NAME
 
 
 #include <sta/config.hpp>
@@ -93,4 +97,4 @@ namespace sta
 
 #endif // STA_RTOS_SYSTEM_EVENT_ENABLE
 
-#endif // STA_RTOS_SYSTEM_EVENT_HPP
+#endif // STA_RTOS_SYSTEM_SYSTEM_EVENT_HPP
diff --git a/src/rtos/system_event.cpp b/src/rtos/system/system_event.cpp
similarity index 83%
rename from src/rtos/system_event.cpp
rename to src/rtos/system/system_event.cpp
index 22da936..dcd2b4e 100644
--- a/src/rtos/system_event.cpp
+++ b/src/rtos/system/system_event.cpp
@@ -1,10 +1,13 @@
-#include <sta/rtos/system_event.hpp>
+#include <sta/rtos/system/system_event.hpp>
 
 #ifdef STA_RTOS_SYSTEM_EVENT_ENABLE
 
 #include <cmsis_os2.h>
 
 
+#define STA_RTOS_SYSTEM_EVENT_HANDLE STA_RTOS_MAKE_HANDLE_NAME(STA_RTOS_SYSTEM_EVENT_NAME)
+
+
 // Access handle from freertos.c
 extern osEventFlagsId_t STA_RTOS_SYSTEM_EVENT_HANDLE;