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

Merge branch 'mueller/scex-additions' into irini
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller
2022-05-26 12:08:18 +02:00
parent a1faa3a73c 1276cc2dc6
commit 9f42ac9875
8 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
linux/ObjectFactory.cpp
View File

@ -319,8 +319,13 @@ void ObjectFactory::createRtdComponents(std::string spiDev, GpioIF* gpioComIF,
#endif // OBSW_ADD_RTD_DEVICES == 1
}
void ObjectFactory::createScexComponents(std::string uartDev, PowerSwitchIF *pwrSwitcher) {
}
du findest
void ObjectFactory::gpioChecker(ReturnValue_t result, std::string output) {
if (result != HasReturnvaluesIF::RETURN_OK) {
sif::error << "ObjectFactory: Adding GPIOs failed for " << output << std::endl;
}
}

2
linux/ObjectFactory.h
View File

@ -15,6 +15,8 @@ void createSunSensorComponents(GpioIF* gpioComIF, SpiComIF* spiComIF, PowerSwitc
void createRtdComponents(std::string spiDev, GpioIF* gpioComIF, PowerSwitchIF* pwrSwitcher,
SpiComIF* comIF);
void createScexComponents(std::string uartDev, PowerSwitchIF* pwrSwitcher);
void gpioChecker(ReturnValue_t result, std::string output);
} // namespace ObjectFactory

1
linux/obc/PdecHandler.cpp
View File

@ -1,4 +1,5 @@
#include "PdecHandler.h"
#include "OBSWConfig.h"
#include <fcntl.h>
#include <sys/mman.h>