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

meier/plocSupervisorHandler #56

Merged
muellerr merged 21 commits from meier/plocSupervisorHandler into develop 2021-07-23 18:15:35 +02:00
Conversation 1 Commits 21 Files Changed 35 +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 d430c5fbc7 - Show all commits

4
bsp_q7s/core/ObjectFactory.cpp
View File

@ -122,9 +122,11 @@ void ObjectFactory::produce(void* args){
std::string("/dev/i2c-0")); std::string("/dev/i2c-0"));
new IMTQHandler(objects::IMTQ_HANDLER, objects::I2C_COM_IF, imtqI2cCookie); new IMTQHandler(objects::IMTQ_HANDLER, objects::I2C_COM_IF, imtqI2cCookie);
#if ADD_PLOC_MPSOC == 1
UartCookie* mpsocUartCookie = new UartCookie(objects::RW1, std::string("/dev/ttyUL3"), UartCookie* mpsocUartCookie = new UartCookie(objects::RW1, std::string("/dev/ttyUL3"),
UartModes::NON_CANONICAL, 115200, PLOC_MPSOC::MAX_REPLY_SIZE); UartModes::NON_CANONICAL, 115200, PLOC_MPSOC::MAX_REPLY_SIZE);
new PlocMPSoCHandler(objects::PLOC_MPSOC_HANDLER, objects::UART_COM_IF, mpsocUartCookie); new PlocMPSoCHandler(objects::PLOC_MPSOC_HANDLER, objects::UART_COM_IF, mpsocUartCookie);
#endif /* ADD_PLOC_MPSOC */
createReactionWheelComponents(gpioComIF); createReactionWheelComponents(gpioComIF);
#endif /* TE7020 != 0 */ #endif /* TE7020 != 0 */
@ -507,8 +509,6 @@ void ObjectFactory::createSyrlinksComponents() {
syrlinksUartCookie->setParityEven(); syrlinksUartCookie->setParityEven();
new SyrlinksHkHandler(objects::SYRLINKS_HK_HANDLER, objects::UART_COM_IF, syrlinksUartCookie); new SyrlinksHkHandler(objects::SYRLINKS_HK_HANDLER, objects::UART_COM_IF, syrlinksUartCookie);
SyrlinksHkHandler* syrlinksHkHandler = new SyrlinksHkHandler(objects::SYRLINKS_HK_HANDLER,
objects::UART_COM_IF, syrlinksUartCookie);
} }
void ObjectFactory::createRtdComponents(LinuxLibgpioIF *gpioComIF) { void ObjectFactory::createRtdComponents(LinuxLibgpioIF *gpioComIF) {

2
linux/fsfwconfig/OBSWConfig.h.in
View File

@ -49,7 +49,7 @@ debugging. */
#define IMTQ_DEBUG 1 #define IMTQ_DEBUG 1
#define RW_DEBUG 0 #define RW_DEBUG 0
#define START_TRACKER_DEBUG 0 #define START_TRACKER_DEBUG 0
#define PLOC_MPSOC_DEBUG 1 #define PLOC_MPSOC_DEBUG 0
#define PLOC_SUPERVISOR_DEBUG 1 #define PLOC_SUPERVISOR_DEBUG 1
// Leave at one as the BSP is linux. Used by the ADIS16507 device handler // Leave at one as the BSP is linux. Used by the ADIS16507 device handler

2
mission/devices/PlocSupervisorHandler.h
View File

@ -4,7 +4,7 @@
#include <fsfw/devicehandlers/DeviceHandlerBase.h> #include <fsfw/devicehandlers/DeviceHandlerBase.h>
#include <mission/devices/devicedefinitions/PlocSupervisorDefinitions.h> #include <mission/devices/devicedefinitions/PlocSupervisorDefinitions.h>
#include <cstring> #include <cstring>
#include <fsfw_hal/linux/uart/UartComIF.h> #include <fsfw/hal/linux/uart/UartComIF.h>
/** /**
* @brief This is the device handler for the supervisor of the PLOC which is programmed by * @brief This is the device handler for the supervisor of the PLOC which is programmed by