From 88d0f9fc0eda8437f3d7a5437e59987ccc937a4c Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 23 Mar 2021 16:45:07 +0100 Subject: [PATCH] using new fsfw_hal now --- bsp_rpi/ObjectFactory.cpp | 9 +- fsfw_hal | 2 +- fsfwconfig/devices/gpioIds.h | 2 +- linux/boardtest/LibgpiodTest.h | 4 +- linux/boardtest/SpiTestClass.cpp | 4 +- linux/boardtest/SpiTestClass.h | 2 +- linux/spi/SpiComIF.h | 2 +- linux/spi/SpiCookie.h | 2 +- misc/eclipse/.cproject | 434 ++++++++++--------------------- 9 files changed, 148 insertions(+), 313 deletions(-) diff --git a/bsp_rpi/ObjectFactory.cpp b/bsp_rpi/ObjectFactory.cpp index 13cadfb3..a5c81961 100644 --- a/bsp_rpi/ObjectFactory.cpp +++ b/bsp_rpi/ObjectFactory.cpp @@ -1,5 +1,5 @@ #include "ObjectFactory.h" -#include +#include #include #include @@ -11,11 +11,10 @@ #include #include -#include -#include #include #include +#include #include #include #include @@ -28,7 +27,9 @@ #include #include #include -#include + +#include +#include void Factory::setStaticFrameworkObjectIds() { diff --git a/fsfw_hal b/fsfw_hal index 547c788c..f094e992 160000 --- a/fsfw_hal +++ b/fsfw_hal @@ -1 +1 @@ -Subproject commit 547c788c818069abb9eaea12a0c997376641f9aa +Subproject commit f094e9921db807344ed5488f662295034eb89731 diff --git a/fsfwconfig/devices/gpioIds.h b/fsfwconfig/devices/gpioIds.h index 8963bd20..10c0a553 100644 --- a/fsfwconfig/devices/gpioIds.h +++ b/fsfwconfig/devices/gpioIds.h @@ -1,7 +1,7 @@ #ifndef FSFWCONFIG_DEVICES_GPIOIDS_H_ #define FSFWCONFIG_DEVICES_GPIOIDS_H_ -#include +#include namespace gpioIds { enum gpioId_t { diff --git a/linux/boardtest/LibgpiodTest.h b/linux/boardtest/LibgpiodTest.h index e9c6c030..a18c618e 100644 --- a/linux/boardtest/LibgpiodTest.h +++ b/linux/boardtest/LibgpiodTest.h @@ -2,8 +2,8 @@ #define TEST_TESTTASKS_LIBGPIODTEST_H_ #include "TestTask.h" -#include -#include +#include +#include #include /** diff --git a/linux/boardtest/SpiTestClass.cpp b/linux/boardtest/SpiTestClass.cpp index 3090c115..374cb644 100644 --- a/linux/boardtest/SpiTestClass.cpp +++ b/linux/boardtest/SpiTestClass.cpp @@ -7,9 +7,9 @@ #include #include -#include -#include #include +#include +#include #include #include diff --git a/linux/boardtest/SpiTestClass.h b/linux/boardtest/SpiTestClass.h index c567bc45..2e3d8b8c 100644 --- a/linux/boardtest/SpiTestClass.h +++ b/linux/boardtest/SpiTestClass.h @@ -1,7 +1,7 @@ #ifndef LINUX_BOARDTEST_SPITESTCLASS_H_ #define LINUX_BOARDTEST_SPITESTCLASS_H_ -#include +#include #include #include diff --git a/linux/spi/SpiComIF.h b/linux/spi/SpiComIF.h index 0e27a595..c5076ba6 100644 --- a/linux/spi/SpiComIF.h +++ b/linux/spi/SpiComIF.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/linux/spi/SpiCookie.h b/linux/spi/SpiCookie.h index 59d0e206..aff4d770 100644 --- a/linux/spi/SpiCookie.h +++ b/linux/spi/SpiCookie.h @@ -3,7 +3,7 @@ #include "spiDefinitions.h" #include -#include +#include #include class SpiCookie: public CookieIF { diff --git a/misc/eclipse/.cproject b/misc/eclipse/.cproject index 6caf4a08..e06537d3 100644 --- a/misc/eclipse/.cproject +++ b/misc/eclipse/.cproject @@ -15,11 +15,11 @@ - + - + @@ -70,7 +70,7 @@ - + @@ -219,9 +219,6 @@ - - - @@ -233,7 +230,7 @@ - + - + @@ -370,9 +363,6 @@ - - - @@ -461,7 +451,7 @@ - + - - + + - + @@ -535,277 +521,134 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -813,14 +656,11 @@ - + - - - @@ -831,50 +671,44 @@ - + - - - - make - -f Makefile-Hosted -j16 - hardclean - true - true - true - - - - + - + - + - + - + - + - + - + + + + + + +