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 +4 -4
2 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 3ae1812c32 - Show all commits

6
mission/devices/Max31865EiveHandler.cpp
View File

@ -86,7 +86,7 @@ void Max31865EiveHandler::setInstantNormal(bool instantNormal) {
} }
void Max31865EiveHandler::simpleCommand(EiveMax31855::RtdCommands cmd) { void Max31865EiveHandler::simpleCommand(EiveMax31855::RtdCommands cmd) {
cmdBuf[0] = cmd; cmdBuf[0] = static_cast<uint8_t>(cmd);
rawPacket = cmdBuf.data(); rawPacket = cmdBuf.data();
rawPacketLen = 1; rawPacketLen = 1;
} }
@ -140,7 +140,7 @@ ReturnValue_t Max31865EiveHandler::initializeLocalDataPool(localpool::DataPool&
return RETURN_OK; return RETURN_OK;
} }
void Max31865EiveHandler::setDeviceInfo(uint8_t idx_, std::string locString_) { void Max31865EiveHandler::setDeviceInfo(uint8_t idx_, std::string locaction_) {
idx = idx_; idx = idx_;
locString = std::move(locString_); locString = std::move(locaction_);
} }

2
mission/devices/Max31865EiveHandler.h
View File

@ -9,7 +9,7 @@ class Max31865EiveHandler : public DeviceHandlerBase {
public: public:
Max31865EiveHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie); Max31865EiveHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie);
void setInstantNormal(bool instantNormal); void setInstantNormal(bool instantNormal);
void setDeviceInfo(uint8_t idx, std::string locString); void setDeviceInfo(uint8_t idx, std::string location);
private: private:
void doStartUp() override; void doStartUp() override;