v1.12.0 #269

Merged
muellerr merged 493 commits from develop into main 2022-07-04 11:19:05 +02:00
118 changed files with 6290 additions and 4519 deletions
Showing only changes of commit 8715683d6b - Show all commits

2
fsfw

Submodule fsfw updated: c0ff84bb9d...4841d5d92d

View File

@ -145,3 +145,11 @@ void Max31865EiveHandler::setDeviceInfo(uint8_t idx_, std::string location_) {
idx = idx_; idx = idx_;
locString = std::move(location_); locString = std::move(location_);
} }
ReturnValue_t Max31865EiveHandler::initialize() {
auto result = DeviceHandlerBase::initialize();
if(result != RETURN_OK) {
return result;
}
return updatePeriodicReply(true, EiveMax31855::RtdCommands::EXCHANGE_SET_ID);
}

View File

@ -26,6 +26,7 @@ class Max31865EiveHandler : public DeviceHandlerBase {
uint32_t getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) override; uint32_t getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) override;
ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap, ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
LocalDataPoolManager& poolManager) override; LocalDataPoolManager& poolManager) override;
ReturnValue_t initialize() override;
void simpleCommand(EiveMax31855::RtdCommands cmd); void simpleCommand(EiveMax31855::RtdCommands cmd);
std::array<uint8_t, 12> cmdBuf = {}; std::array<uint8_t, 12> cmdBuf = {};