Merge branch 'develop' into acs-bug-bash
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...

This commit is contained in:
Robin Müller 2023-03-10 19:13:50 +01:00
commit c47a7338db

View File

@ -2,7 +2,7 @@
#include <fsfw/ipc/QueueFactory.h> #include <fsfw/ipc/QueueFactory.h>
EventManagerMock::EventManagerMock() : EventManager(objects::EVENT_MANAGER) {} EventManagerMock::EventManagerMock() : EventManager(objects::EVENT_MANAGER, 80) {}
ReturnValue_t EventManagerMock::performOperation(uint8_t opCode) { ReturnValue_t EventManagerMock::performOperation(uint8_t opCode) {
ReturnValue_t result = returnvalue::OK; ReturnValue_t result = returnvalue::OK;
@ -60,4 +60,4 @@ bool EventManagerMock::isEventInEventList(object_id_t object, EventId_t eventId,
} }
} }
return false; return false;
} }