From 11537f9988b0b19ae7ceac3c0ebc62355098d5a3 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Fri, 24 Sep 2021 09:42:20 +0200 Subject: [PATCH] mgm 2 lis3 chip select opened by name --- bsp_q7s/core/ObjectFactory.cpp | 8 ++++++-- fsfw | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp index 1fbf9a33..6d6358c3 100644 --- a/bsp_q7s/core/ObjectFactory.cpp +++ b/bsp_q7s/core/ObjectFactory.cpp @@ -1,3 +1,5 @@ +#include + #include "ObjectFactory.h" #include "OBSWConfig.h" #include "devConf.h" @@ -414,8 +416,10 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF *gpioComIF, UartComI gpioCookieAcsBoard->addGpio(gpioIds::MGM_1_RM3100_CS, gpio); // auto gpioChip = new GpiodRegularByChip(q7s::GPIO_MGM2_LIS3_LABEL, q7s::GPIO_MGM_2_LIS3_CS, // "CS_MGM_2_LIS3_B", gpio::OUT, gpio::HIGH); - auto gpioByLineName = new GpiodRegularByLineName("mgm_2_lis3_chip_select", "LIS3 Handler", gpio::OUT, - gpio::HIGH); + std::stringstream consumer; + consumer << std::hex << objects::MGM_2_LIS3_HANDLER; + auto gpioByLineName = new GpiodRegularByLineName("mgm_2_lis3_chip_select", consumer.str(), + gpio::OUT, gpio::HIGH); gpioCookieAcsBoard->addGpio(gpioIds::MGM_2_LIS3_CS, gpioByLineName); gpio = new GpiodRegularByLabel(q7s::GPIO_ACS_BOARD_DEFAULT_LABEL, q7s::GPIO_MGM_3_RM3100_CS, "CS_MGM_3_RM3100_B", gpio::OUT, gpio::HIGH); diff --git a/fsfw b/fsfw index c9b343eb..e7df5207 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit c9b343ebcd92de1d214a9b1d7abafee4a7e79888 +Subproject commit e7df520780242f98f9a1189906c0ade1a8a99f29