From 702cc0645565353a840362b9b07435d01d8bf3da Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 11 Jun 2021 10:51:15 +0200 Subject: [PATCH] minor fixes --- bsp_stm32_freertos/core/ObjectFactory.cpp | 12 ++++++------ .../fsfwconfig/devices/devAddresses.h | 14 ++++++++++++++ fsfw_hal | 2 +- .../FreeRTOS/fsfw-stm32-freertos-debug.launch | 2 +- 4 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 bsp_stm32_freertos/fsfwconfig/devices/devAddresses.h diff --git a/bsp_stm32_freertos/core/ObjectFactory.cpp b/bsp_stm32_freertos/core/ObjectFactory.cpp index 580a915..4422cbd 100644 --- a/bsp_stm32_freertos/core/ObjectFactory.cpp +++ b/bsp_stm32_freertos/core/ObjectFactory.cpp @@ -1,7 +1,7 @@ #include "ObjectFactory.h" - -#include -#include +#include "OBSWConfig.h" +#include "devices/devAddresses.h" +#include "objects/systemObjectList.h" #include #include @@ -68,7 +68,7 @@ void ObjectFactory::produce(void* args) { #if OBSW_PERFORM_L3GD20H_TEST == 1 spi::MspCfgBase* mspCfg = nullptr; - spi::TransferModes transferMode = spi::TransferModes::POLLING; + spi::TransferModes transferMode = spi::TransferModes::DMA; if(transferMode == spi::TransferModes::POLLING) { auto typedCfg = new spi::MspPollingConfigStruct(); spi::h743zi::standardPollingCfg(*typedCfg); @@ -90,8 +90,8 @@ void ObjectFactory::produce(void* args) { } new SpiComIF(objects::SPI_COM_IF); - auto spiCookie = new SpiCookie(0, spi::SpiBus::SPI_1, transferMode, mspCfg, 3900000, - spi::SpiModes::MODE_3, GPIO_PIN_14, GPIOD, 32); + auto spiCookie = new SpiCookie(devaddress::L3GD20H, spi::SpiBus::SPI_1, transferMode, mspCfg, + 3900000, spi::SpiModes::MODE_3, GPIO_PIN_14, GPIOD, 32); auto gyroDevice = new GyroHandlerL3GD20H(objects::SPI_DEVICE_TEST, objects::SPI_COM_IF, spiCookie); gyroDevice->setStartUpImmediately(); diff --git a/bsp_stm32_freertos/fsfwconfig/devices/devAddresses.h b/bsp_stm32_freertos/fsfwconfig/devices/devAddresses.h new file mode 100644 index 0000000..1ef7c6b --- /dev/null +++ b/bsp_stm32_freertos/fsfwconfig/devices/devAddresses.h @@ -0,0 +1,14 @@ +#ifndef BSP_STM32_FREERTOS_FSFWCONFIG_DEVICES_DEVADDRESSES_H_ +#define BSP_STM32_FREERTOS_FSFWCONFIG_DEVICES_DEVADDRESSES_H_ + +#include + +namespace devaddress { +enum devaddress: uint32_t { + L3GD20H = 1 +}; + +} + + +#endif /* BSP_STM32_FREERTOS_FSFWCONFIG_DEVICES_DEVADDRESSES_H_ */ diff --git a/fsfw_hal b/fsfw_hal index 543ee54..cd0dfc4 160000 --- a/fsfw_hal +++ b/fsfw_hal @@ -1 +1 @@ -Subproject commit 543ee54ccaf7336b0789d378c8c598676c8f90a6 +Subproject commit cd0dfc49d5527755462118445832888572a92169 diff --git a/misc/eclipse/cmake/FreeRTOS/fsfw-stm32-freertos-debug.launch b/misc/eclipse/cmake/FreeRTOS/fsfw-stm32-freertos-debug.launch index a8c0c1e..c2dbd65 100644 --- a/misc/eclipse/cmake/FreeRTOS/fsfw-stm32-freertos-debug.launch +++ b/misc/eclipse/cmake/FreeRTOS/fsfw-stm32-freertos-debug.launch @@ -59,6 +59,6 @@ - +