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

v1.17.0 #327

Merged
muellerr merged 131 commits from develop into main 2022-11-28 18:29:31 +01:00
Conversation 0 Commits 131 Files Changed 69 +4 -4
3 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 9a3fd51337 - Show all commits

4
linux/devices/ploc/PlocSupervisorHandler.cpp
View File

@ -1230,9 +1230,9 @@ ReturnValue_t PlocSupervisorHandler::doSendReadHook() {
return returnvalue::OK; return returnvalue::OK;
} }
void PlocSupervisorHandler::doOffActivity() { startupState = StartupState::OFF; } void PlocSupervisorHandler::doOffActivity() {}
void PlocSupervisorHandler::handleDeviceTM(const uint8_t* data, size_t dataSize, void PlocSupervisorHandler::handleDeviceTm(const uint8_t* data, size_t dataSize,
DeviceCommandId_t replyId) { DeviceCommandId_t replyId) {
ReturnValue_t result = returnvalue::OK; ReturnValue_t result = returnvalue::OK;

2
linux/devices/ploc/PlocSupervisorHandler.h
View File

@ -237,7 +237,7 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
* @param dataSize Size of telemetry in bytes. * @param dataSize Size of telemetry in bytes.
* @param replyId Id of the reply. This will be added to the ActionMessage. * @param replyId Id of the reply. This will be added to the ActionMessage.
*/ */
void handleDeviceTM(const uint8_t* data, size_t dataSize, DeviceCommandId_t replyId); void handleDeviceTm(const uint8_t* data, size_t dataSize, DeviceCommandId_t replyId);
/** /**
* @brief This function prepares a space packet which does not transport any data in the * @brief This function prepares a space packet which does not transport any data in the

2
tmtc

@ -1 +1 @@
Subproject commit d5813e1a422beae7d0cb092a885e0956e9f1ddc1 Subproject commit f730ff4180b02f68122f853800a6247a92ac722e