meier/master #33

Merged
muellerr merged 24 commits from meier/master into develop 2021-05-17 14:59:47 +02:00
24 changed files with 1527 additions and 235 deletions
Showing only changes of commit 09e66ceb49 - Show all commits

3
.gitmodules vendored
View File

@ -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

View File

@ -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"));

1
generators/modgen Submodule

Submodule generators/modgen added at 5ed4a2ae59

2
thirdparty/etl vendored

2
tmtc

Submodule tmtc updated: 06750809cb...574a3e9207