Merge pull request 'Smaller PLOC tweaks' (#836) from smaller-ploc-tweaks into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good

Reviewed-on: #836
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
This commit is contained in:
Marius Eggert 2024-01-29 10:51:53 +01:00
commit 79efca3a66
3 changed files with 3 additions and 10 deletions

View File

@ -28,6 +28,7 @@ will consitute of a breaking change warranting a new major release:
- If the PCDU handler fails reading data from the IPC store, it will - If the PCDU handler fails reading data from the IPC store, it will
not try to do a deserialization anymore. not try to do a deserialization anymore.
- All action commands sent by the PLOC SUPV to itself will have no sender now.
# [v7.5.5] 2024-01-22 # [v7.5.5] 2024-01-22

View File

@ -1115,7 +1115,7 @@ void FreshSupvHandler::handleEvent(EventMessage* eventMessage) {
if (not isCommandAlreadyActive(supv::SHUTDOWN_MPSOC)) { if (not isCommandAlreadyActive(supv::SHUTDOWN_MPSOC)) {
CommandMessage actionMsg; CommandMessage actionMsg;
ActionMessage::setCommand(&actionMsg, supv::SHUTDOWN_MPSOC, store_address_t::invalid()); ActionMessage::setCommand(&actionMsg, supv::SHUTDOWN_MPSOC, store_address_t::invalid());
result = messageQueue->sendMessage(getCommandQueue(), &actionMsg); result = messageQueue->sendMessageFrom(getCommandQueue(), &actionMsg, MessageQueueIF::NO_QUEUE);
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
triggerEvent(supv::SUPV_MPSOC_SHUTDOWN_BUILD_FAILED); triggerEvent(supv::SUPV_MPSOC_SHUTDOWN_BUILD_FAILED);
sif::warning << "PlocSupervisorHandler::handleEvent: Failed to build MPSoC shutdown " sif::warning << "PlocSupervisorHandler::handleEvent: Failed to build MPSoC shutdown "

View File

@ -945,15 +945,7 @@ ReturnValue_t PlocSupvUartManager::handleRunningLongerRequest() {
break; break;
} }
case Request::REQUEST_EVENT_BUFFER: { case Request::REQUEST_EVENT_BUFFER: {
// result = performEventBufferRequest(); sif::error << "Requesting event buffer is not implemented" << std::endl;
// if (result == returnvalue::OK) {
// triggerEvent(SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL, result);
// } else if (result == PROCESS_TERMINATED) {
// // Event already triggered
// break;
// } else {
// triggerEvent(SUPV_EVENT_BUFFER_REQUEST_FAILED, result);
// }
break; break;
} }
case Request::DEFAULT: { case Request::DEFAULT: {