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

Update to v1.1.0 #29

Merged
muellerr merged 427 commits from develop into master 2021-04-25 12:43:23 +02:00
Conversation 0 Commits 427 Files Changed 381 +4 -4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 97e5eb7319 - Show all commits

4
bsp_q7s/ObjectFactory.cpp
View File

@ -150,7 +150,7 @@ void ObjectFactory::produce(){
#if OBSW_ADD_ACS_BOARD == 1
GpioCookie* gpioCookieAcsBoard = new GpioCookie();
GpiodRegular* gpio = nullptr;
gpio = new GpiodRegular(std::string("gpiochip5"), 21, std::string("CS_GYRO_1_ADIS"),
gpio = new GpiodRegular(std::string("gpiochip5"), 19, std::string("CS_GYRO_1_ADIS"),
gpio::OUT, gpio::HIGH);
gpioCookieAcsBoard->addGpio(gpioIds::GYRO_0_ADIS_CS, gpio);
gpio = new GpiodRegular(std::string("gpiochip5"), 7, std::string("CS_GYRO_2_L3G"),
@ -172,7 +172,7 @@ void ObjectFactory::produce(){
gpio::OUT, gpio::HIGH);
gpioCookieAcsBoard->addGpio(gpioIds::MGM_2_LIS3_CS, gpio);
gpio = new GpiodRegular(std::string("gpiochip5"), 23, std::string("CS_MGM_3_RM3100_B"),
gpio = new GpiodRegular(std::string("gpiochip5"), 10, std::string("CS_MGM_3_RM3100_B"),
gpio::OUT, gpio::HIGH);
gpioCookieAcsBoard->addGpio(gpioIds::MGM_3_RM3100_CS, gpio);

2
fsfw

@ -1 +1 @@
Subproject commit dea2205908f29cbb700ad85c2614da71b6efccfc
Subproject commit 42720e6f7d64bdd9a1ac0cea5846c9a8cedea0ff

2
tmtc

@ -1 +1 @@
Subproject commit 74c61842c87e6a25751904116fdc82dd61a14333
Subproject commit 73105138050b5661a6cff76e1d64af40981f9c7f