Merge branch 'develop' into meier/master

2021-05-17 13:56:54 +02:00 · 2021-05-17 13:56:54 +02:00 · 532fb3228a
commit 532fb3228a
parent fa442ce584 626db76a60
5 changed files with 7 additions and 3 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -16,3 +16,6 @@
 [submodule "fsfw_hal"]
 	path = fsfw_hal
 	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw_hal.git
+[submodule "generators/modgen"]
+	path = generators/modgen
+	url = https://git.ksat-stuttgart.de/source/modgen.git
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@ -537,7 +537,7 @@ void ObjectFactory::produce(){
    (void) rtdIc17;
    (void) rtdIc18;

-#endif /* Q7S_ADD_RTS_DEVICES == 1 */
+#endif /* Q7S_ADD_RTD_DEVICES == 1 */

    I2cCookie* imtqI2cCookie = new I2cCookie(addresses::IMTQ, IMTQ::MAX_REPLY_SIZE,
            std::string("/dev/i2c-0"));
--- a/generators/modgen
+++ b/generators/modgen
@ -0,0 +1 @@
+Subproject commit 5ed4a2ae59e90c3763616bdaf41eb3317e849100
--- a/thirdparty/etl
+++ b/thirdparty/etl
@ -1 +1 @@
-Subproject commit c308dc427b7a34e54f33860fb2e244564b2740b4
+Subproject commit 0efecca700c6d0847f91b5540638571ba298c793
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 06750809cb52044392e0683896538a652f11a512
+Subproject commit 574a3e92074d9d4d0335dad3ddc5962e1369f5d5
				`@ -0,0 +1 @@`
				`Subproject commit 5ed4a2ae59e90c3763616bdaf41eb3317e849100`