eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

Merge branch 'develop' into meier/master

Browse Source
This commit is contained in:
Jakob Meier
2021-05-17 13:56:54 +02:00
parent fa442ce584 626db76a60
commit 532fb3228a
5 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -16,3 +16,6 @@
[submodule "fsfw_hal"] [submodule "fsfw_hal"]
path = fsfw_hal path = fsfw_hal
url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw_hal.git 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

2
bsp_q7s/ObjectFactory.cpp
View File

@ -537,7 +537,7 @@ void ObjectFactory::produce(){
(void) rtdIc17; (void) rtdIc17;
(void) rtdIc18; (void) rtdIc18;
#endif /* Q7S_ADD_RTS_DEVICES == 1 */ #endif /* Q7S_ADD_RTD_DEVICES == 1 */
I2cCookie* imtqI2cCookie = new I2cCookie(addresses::IMTQ, IMTQ::MAX_REPLY_SIZE, I2cCookie* imtqI2cCookie = new I2cCookie(addresses::IMTQ, IMTQ::MAX_REPLY_SIZE,
std::string("/dev/i2c-0")); std::string("/dev/i2c-0"));

1
generators/modgen Submodule

Submodule generators/modgen added at 5ed4a2ae59

2
thirdparty/etl vendored

Submodule thirdparty/etl updated: c308dc427b...0efecca700

2
tmtc

Submodule tmtc updated: 06750809cb...574a3e9207