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

v1.12.0 #269

Merged
muellerr merged 493 commits from develop into main 2022-07-04 11:19:05 +02:00
Conversation 0 Commits 493 Files Changed 264 +8 -7
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2c684643b3 - Show all commits

2
linux/ObjectFactory.cpp
View File

@ -288,7 +288,7 @@ void ObjectFactory::createRtdComponents(std::string spiDev, GpioIF* gpioComIF,
std::array<SpiCookie*, NUM_RTDS> rtdCookies = {}; std::array<SpiCookie*, NUM_RTDS> rtdCookies = {};
std::array<DeviceHandlerBase*, NUM_RTDS> rtds = {}; std::array<DeviceHandlerBase*, NUM_RTDS> rtds = {};
RtdFdir* rtdFdir = nullptr; RtdFdir* rtdFdir = nullptr;
bool useDirectHandler = true; bool useDirectHandler = false;
if (not useDirectHandler) { if (not useDirectHandler) {
// Create special low level reader communication interface // Create special low level reader communication interface
new Max31865RtdReader(objects::SPI_RTD_COM_IF, comIF); new Max31865RtdReader(objects::SPI_RTD_COM_IF, comIF);

13
mission/devices/Max31865EiveHandler.cpp
View File

@ -37,24 +37,25 @@ void Max31865EiveHandler::doShutDown() {
} }
ReturnValue_t Max31865EiveHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) { ReturnValue_t Max31865EiveHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) {
*id = EiveMax31855::RtdCommands::EXCHANGE_SET_ID; //*id = EiveMax31855::RtdCommands::EXCHANGE_SET_ID;
return RETURN_OK; return NOTHING_TO_SEND;
} }
ReturnValue_t Max31865EiveHandler::buildTransitionDeviceCommand(DeviceCommandId_t* id) { ReturnValue_t Max31865EiveHandler::buildTransitionDeviceCommand(DeviceCommandId_t* id) {
ReturnValue_t result = NOTHING_TO_SEND;
if (state == InternalState::ON) { if (state == InternalState::ON) {
*id = EiveMax31855::RtdCommands::ON; *id = EiveMax31855::RtdCommands::ON;
buildCommandFromCommand(*id, nullptr, 0); result = buildCommandFromCommand(*id, nullptr, 0);
} }
if (state == InternalState::ACTIVE) { if (state == InternalState::ACTIVE) {
*id = EiveMax31855::RtdCommands::ACTIVE; *id = EiveMax31855::RtdCommands::ACTIVE;
buildCommandFromCommand(*id, nullptr, 0); result = buildCommandFromCommand(*id, nullptr, 0);
} }
if (state == InternalState::INACTIVE) { if (state == InternalState::INACTIVE) {
*id = EiveMax31855::RtdCommands::OFF; *id = EiveMax31855::RtdCommands::OFF;
buildCommandFromCommand(*id, nullptr, 0); result = buildCommandFromCommand(*id, nullptr, 0);
} }
return NOTHING_TO_SEND; return result;
} }
ReturnValue_t Max31865EiveHandler::buildCommandFromCommand(DeviceCommandId_t deviceCommand, ReturnValue_t Max31865EiveHandler::buildCommandFromCommand(DeviceCommandId_t deviceCommand,