From 697a6016811ecca9cd1a8d22714a242f5a68f8c1 Mon Sep 17 00:00:00 2001 From: "Jakob.Meier" Date: Sun, 11 Apr 2021 15:18:55 +0200 Subject: [PATCH] spi chipselects changes --- bsp_q7s/ObjectFactory.cpp | 4 ++-- fsfw | 2 +- tmtc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp index fed5734c..6df0cf30 100644 --- a/bsp_q7s/ObjectFactory.cpp +++ b/bsp_q7s/ObjectFactory.cpp @@ -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); diff --git a/fsfw b/fsfw index dea22059..42720e6f 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit dea2205908f29cbb700ad85c2614da71b6efccfc +Subproject commit 42720e6f7d64bdd9a1ac0cea5846c9a8cedea0ff diff --git a/tmtc b/tmtc index 74c61842..73105138 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 74c61842c87e6a25751904116fdc82dd61a14333 +Subproject commit 73105138050b5661a6cff76e1d64af40981f9c7f