Merge branch 'eive/develop' into mueller/gpio-hal-updates

2022-02-28 15:34:48 +01:00
parent 4cf2a384f3 992c05df56
commit 2fed161eff
11 changed files with 70 additions and 41 deletions
--- a/hal/src/fsfw_hal/linux/uart/UartComIF.cpp
+++ b/hal/src/fsfw_hal/linux/uart/UartComIF.cpp
@ -1,4 +1,7 @@
 #include "UartComIF.h"
+#include "fsfw/FSFW.h"
+#include "fsfw/serviceinterface.h"
+#include "fsfw_hal/linux/utility.h"

 #include <errno.h>
 #include <fcntl.h>
@ -7,10 +10,6 @@

 #include <cstring>

-#include "fsfw/FSFW.h"
-#include "fsfw/serviceinterface.h"
-#include "fsfw_hal/linux/utility.h"
-
 UartComIF::UartComIF(object_id_t objectId) : SystemObject(objectId) {}

 UartComIF::~UartComIF() {}
--- a/hal/src/fsfw_hal/linux/uart/UartCookie.cpp
+++ b/hal/src/fsfw_hal/linux/uart/UartCookie.cpp
@ -1,4 +1,4 @@
-#include "fsfw_hal/linux/uart/UartCookie.h"
+#include "UartCookie.h"

 #include <fsfw/serviceinterface.h>