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

Improved structure #17

Merged
meierj merged 16 commits from mueller/master into develop 2021-02-14 16:28:52 +01:00
Conversation 0 Commits 16 Files Changed 46 +89 -79
4 changed files with 89 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 313f7f6ec1 - Show all commits

22
bsp_q7s/ObjectFactory.cpp
View File

@ -26,10 +26,10 @@
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h> #include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
#include <mission/utility/TmFunnel.h> #include <mission/utility/TmFunnel.h>
#include <bsp_q7s/comIF/cookies/CspCookie.h> #include <linux/csp/CspCookie.h>
#include <bsp_q7s/comIF/cookies/I2cCookie.h> #include <linux/csp/CspComIF.h>
#include <bsp_q7s/comIF/CspComIF.h> #include <linux/i2c/I2cCookie.h>
#include <bsp_q7s/comIF/I2cComIF.h> #include <linux/i2c/I2cComIF.h>
#include <linux/gpio/LinuxLibgpioIF.h> #include <linux/gpio/LinuxLibgpioIF.h>
#include <linux/gpio/GpioCookie.h> #include <linux/gpio/GpioCookie.h>
@ -85,10 +85,14 @@ void ObjectFactory::produce(){
CspCookie* acuCspCookie = new CspCookie(ACU::MAX_REPLY_LENGTH, CspCookie* acuCspCookie = new CspCookie(ACU::MAX_REPLY_LENGTH,
addresses::ACU); addresses::ACU);
/* Device Handler */ /* Device Handler */
P60DockHandler* p60dockhandler = new P60DockHandler(objects::P60DOCK_HANDLER, objects::CSP_COM_IF, p60DockCspCookie); P60DockHandler* p60dockhandler = new P60DockHandler(objects::P60DOCK_HANDLER,
PDU1Handler* pdu1handler = new PDU1Handler(objects::PDU1_HANDLER, objects::CSP_COM_IF, pdu1CspCookie); objects::CSP_COM_IF, p60DockCspCookie);
PDU2Handler* pdu2handler = new PDU2Handler(objects::PDU2_HANDLER, objects::CSP_COM_IF, pdu2CspCookie); PDU1Handler* pdu1handler = new PDU1Handler(objects::PDU1_HANDLER,
ACUHandler* acuhandler = new ACUHandler(objects::ACU_HANDLER, objects::CSP_COM_IF, acuCspCookie); objects::CSP_COM_IF, pdu1CspCookie);
PDU2Handler* pdu2handler = new PDU2Handler(objects::PDU2_HANDLER,
objects::CSP_COM_IF, pdu2CspCookie);
ACUHandler* acuhandler = new ACUHandler(objects::ACU_HANDLER,
objects::CSP_COM_IF, acuCspCookie);
new PCDUHandler(objects::PCDU_HANDLER, 50); new PCDUHandler(objects::PCDU_HANDLER, 50);
/** /**
@ -164,7 +168,7 @@ void ObjectFactory::produce(){
gpioCookie->addGpio(gpioIds::Test_ID, gpioConfigMio0); gpioCookie->addGpio(gpioIds::Test_ID, gpioConfigMio0);
new LibgpiodTest(objects::LIBGPIOD_TEST, objects::GPIO_IF, gpioCookie); new LibgpiodTest(objects::LIBGPIOD_TEST, objects::GPIO_IF, gpioCookie);
#elif TE0720 == 1 #elif TE0720 == 1
// Configuration for MIO0 on TE0720-03-1CFA /* Configuration for MIO0 on TE0720-03-1CFA */
GpioConfig_t gpioConfigForDummyHeater(std::string("gpiochip0"), 0, GpioConfig_t gpioConfigForDummyHeater(std::string("gpiochip0"), 0,
std::string("Heater0"), gpio::OUT, 0); std::string("Heater0"), gpio::OUT, 0);
gpioCookie->addGpio(gpioIds::HEATER_0, gpioConfigForDummyHeater); gpioCookie->addGpio(gpioIds::HEATER_0, gpioConfigForDummyHeater);

1
bsp_q7s/ObjectFactory.h
View File

@ -1,7 +1,6 @@
#ifndef BSP_Q7S_OBJECTFACTORY_H_ #ifndef BSP_Q7S_OBJECTFACTORY_H_
#define BSP_Q7S_OBJECTFACTORY_H_ #define BSP_Q7S_OBJECTFACTORY_H_
namespace ObjectFactory { namespace ObjectFactory {
void setStatics(); void setStatics();
void produce(); void produce();

1
linux/CMakeLists.txt
View File

@ -1,4 +1,5 @@
add_subdirectory(gpio) add_subdirectory(gpio)
add_subdirectory(i2c) add_subdirectory(i2c)
add_subdirectory(csp) add_subdirectory(csp)
add_subdirectory(spi)

6
linux/spi/CMakeLists.txt Normal file
View File

@ -0,0 +1,6 @@
target_sources(${TARGET_NAME} PUBLIC
)