Merge branch 'mueller/plpcdu-sus-updates' into mueller/master

2022-03-01 15:21:02 +01:00 · 2022-03-01 15:21:02 +01:00 · be9242b975
commit be9242b975
parent b98a24373e 501b35c20c
6 changed files with 11 additions and 16 deletions
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@ -29,8 +29,12 @@
 #include "linux/csp/CspComIF.h"
 #include "linux/csp/CspCookie.h"
 #include "linux/devices/GPSHyperionLinuxController.h"
+#include "linux/devices/devicedefinitions/StarTrackerDefinitions.h"
+#include "linux/devices/startracker/StarTrackerHandler.h"
+#include "linux/devices/startracker/StrHelper.h"
 #include "tmtc/apid.h"
 #include "tmtc/pusIds.h"
+
 #if OBSW_TEST_LIBGPIOD == 1
 #include "linux/boardtest/LibgpiodTest.h"
 #endif
@ -52,16 +56,6 @@
 #include "fsfw_hal/linux/spi/SpiCookie.h"
 #include "fsfw_hal/linux/uart/UartComIF.h"
 #include "fsfw_hal/linux/uart/UartCookie.h"
-#include "linux/boardtest/SpiTestClass.h"
-#include "linux/csp/CspComIF.h"
-#include "linux/csp/CspCookie.h"
-<<<<<<< HEAD
-=======
-#include "linux/devices/GPSHyperionLinuxController.h"
-#include "linux/devices/devicedefinitions/StarTrackerDefinitions.h"
-#include "linux/devices/startracker/StarTrackerHandler.h"
-#include "linux/devices/startracker/StrHelper.h"
->>>>>>> mueller/reboot-file-handling
 #include "mission/core/GenericFactory.h"
 #include "mission/devices/ACUHandler.h"
 #include "mission/devices/BpxBatteryHandler.h"
--- a/generators/events/translateEvents.cpp
+++ b/generators/events/translateEvents.cpp
@ -1,7 +1,7 @@
 /**
 * @brief    Auto-generated event translation file. Contains 152 translations.
 * @details
- * Generated on: 2022-03-01 15:17:49
+ * Generated on: 2022-03-01 15:19:18
 */
 #include "translateEvents.h"

--- a/generators/objects/translateObjects.cpp
+++ b/generators/objects/translateObjects.cpp
@ -2,7 +2,7 @@
 * @brief  Auto-generated object translation file.
 * @details
 * Contains 112 translations.
- * Generated on: 2022-03-01 15:17:56
+ * Generated on: 2022-03-01 15:19:26
 */
 #include "translateObjects.h"

--- a/linux/fsfwconfig/events/translateEvents.cpp
+++ b/linux/fsfwconfig/events/translateEvents.cpp
@ -1,7 +1,7 @@
 /**
 * @brief    Auto-generated event translation file. Contains 152 translations.
 * @details
- * Generated on: 2022-03-01 15:17:49
+ * Generated on: 2022-03-01 15:19:18
 */
 #include "translateEvents.h"

--- a/linux/fsfwconfig/objects/translateObjects.cpp
+++ b/linux/fsfwconfig/objects/translateObjects.cpp
@ -2,7 +2,7 @@
 * @brief  Auto-generated object translation file.
 * @details
 * Contains 112 translations.
- * Generated on: 2022-03-01 15:17:56
+ * Generated on: 2022-03-01 15:19:26
 */
 #include "translateObjects.h"

--- a/mission/devices/GyroADIS1650XHandler.cpp
+++ b/mission/devices/GyroADIS1650XHandler.cpp
@ -1,9 +1,10 @@
 #include "GyroADIS1650XHandler.h"

-#include "fsfw/FSFW.h"
 #include <fsfw/action/HasActionsIF.h>
 #include <fsfw/datapool/PoolReadGuard.h>

+#include "fsfw/FSFW.h"
+
 #ifdef FSFW_OSAL_LINUX
 #include <sys/ioctl.h>
 #include <unistd.h>