From dec95f321701bac86363960ca561b7cd15f4551b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 25 Apr 2021 11:10:05 +0200 Subject: [PATCH 1/7] added modgen submodule --- .gitmodules | 3 +++ fsfw | 2 +- generators/modgen | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 generators/modgen diff --git a/.gitmodules b/.gitmodules index 4a973500..6f538287 100644 --- 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 diff --git a/fsfw b/fsfw index f2ab07c7..5273ffa7 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit f2ab07c78242d8211aebf9e0d6911d386dbc4ec5 +Subproject commit 5273ffa721dd83634ebbcc37c4646752f0bea20f diff --git a/generators/modgen b/generators/modgen new file mode 160000 index 00000000..5ed4a2ae --- /dev/null +++ b/generators/modgen @@ -0,0 +1 @@ +Subproject commit 5ed4a2ae59e90c3763616bdaf41eb3317e849100 From 2e4a8e1f948b8fcd34b61446be78828fae3590a9 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 25 Apr 2021 11:32:21 +0200 Subject: [PATCH 2/7] tmtc and obj factory update --- bsp_q7s/ObjectFactory.cpp | 2 +- tmtc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp index e905393a..fc86c1ea 100644 --- a/bsp_q7s/ObjectFactory.cpp +++ b/bsp_q7s/ObjectFactory.cpp @@ -404,7 +404,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")); diff --git a/tmtc b/tmtc index 7cc06ef0..3b5d92f9 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 7cc06ef0e0882d286bab8156ca756e0211e5ebae +Subproject commit 3b5d92f9083392d8dd040470ae56fa610d0de8ad From 2f766f012d7a258b2c3a441b532c133262a69acc Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 25 Apr 2021 11:32:49 +0200 Subject: [PATCH 3/7] tmtc update --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index 3b5d92f9..7cc06ef0 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 3b5d92f9083392d8dd040470ae56fa610d0de8ad +Subproject commit 7cc06ef0e0882d286bab8156ca756e0211e5ebae From daea8373b507d192065f6d63673560b70ff2fd60 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 25 Apr 2021 12:35:24 +0200 Subject: [PATCH 4/7] OBSW VERsion --- common/config/OBSWVersion.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/config/OBSWVersion.h b/common/config/OBSWVersion.h index 548363f2..7ac812e6 100644 --- a/common/config/OBSWVersion.h +++ b/common/config/OBSWVersion.h @@ -4,7 +4,7 @@ const char* const SW_NAME = "eive"; #define SW_VERSION 1 -#define SW_SUBVERSION 1 +#define SW_SUBVERSION 2 #define SW_SUBSUBVERSION 0 #endif /* COMMON_CONFIG_OBSWVERSION_H_ */ From c1ae98f1c886f5b31c3b377d99c948ccb0b772a1 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 25 Apr 2021 12:37:59 +0200 Subject: [PATCH 5/7] obsw version update --- common/config/OBSWVersion.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/config/OBSWVersion.h b/common/config/OBSWVersion.h index 7ac812e6..548363f2 100644 --- a/common/config/OBSWVersion.h +++ b/common/config/OBSWVersion.h @@ -4,7 +4,7 @@ const char* const SW_NAME = "eive"; #define SW_VERSION 1 -#define SW_SUBVERSION 2 +#define SW_SUBVERSION 1 #define SW_SUBSUBVERSION 0 #endif /* COMMON_CONFIG_OBSWVERSION_H_ */ From 9c7fa8c5e7bf782256e2d26862b439858527d7fc Mon Sep 17 00:00:00 2001 From: "Jakob.Meier" Date: Thu, 13 May 2021 13:35:24 +0200 Subject: [PATCH 6/7] updated submodules --- fsfw | 2 +- fsfw_hal | 2 +- thirdparty/etl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fsfw b/fsfw index 5273ffa7..e7d24563 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 5273ffa721dd83634ebbcc37c4646752f0bea20f +Subproject commit e7d245635047439ca4b5a46d05bf58437a5aa33a diff --git a/fsfw_hal b/fsfw_hal index 14fe3257..a0f698ff 160000 --- a/fsfw_hal +++ b/fsfw_hal @@ -1 +1 @@ -Subproject commit 14fe32572d62db9d19707dc1f9bb6fecb1993b73 +Subproject commit a0f698fffa4dd5c9f86337c5d6170f9321cb8de7 diff --git a/thirdparty/etl b/thirdparty/etl index ae06e641..c308dc42 160000 --- a/thirdparty/etl +++ b/thirdparty/etl @@ -1 +1 @@ -Subproject commit ae06e6417702b770c49289c9e7162cb3f4a5a217 +Subproject commit c308dc427b7a34e54f33860fb2e244564b2740b4 From 626db76a606d829811e721543d9534384a027429 Mon Sep 17 00:00:00 2001 From: "Jakob.Meier" Date: Mon, 17 May 2021 13:54:12 +0200 Subject: [PATCH 7/7] added etl and tmtc --- thirdparty/etl | 2 +- tmtc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/thirdparty/etl b/thirdparty/etl index c308dc42..0efecca7 160000 --- a/thirdparty/etl +++ b/thirdparty/etl @@ -1 +1 @@ -Subproject commit c308dc427b7a34e54f33860fb2e244564b2740b4 +Subproject commit 0efecca700c6d0847f91b5540638571ba298c793 diff --git a/tmtc b/tmtc index 06750809..574a3e92 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 06750809cb52044392e0683896538a652f11a512 +Subproject commit 574a3e92074d9d4d0335dad3ddc5962e1369f5d5