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

fixed merge conflict

Browse Source
This commit is contained in:
Jakob Meier 2022-05-11 14:36:23 +02:00
parent cbb3c92885
commit c7e4704234
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fsfw

@ -1 +1 @@
Subproject commit 19bd26d9983d97c8daf010649e9142afac7e2650 Subproject commit bc994595dae47fbe57d5a4fa70ad23f90e9410f9

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

@ -108,7 +108,7 @@ class PlocMPSoCHandler : public DeviceHandlerBase, public CommandsActionsIF {
MessageQueueIF* eventQueue = nullptr; MessageQueueIF* eventQueue = nullptr;
MessageQueueIF* commandActionHelperQueue = nullptr; MessageQueueIF* commandActionHelperQueue = nullptr;
SourceSequenceCounter sequenceCount; SourceSequenceCounter sequenceCount = SourceSequenceCounter(0);
uint8_t commandBuffer[mpsoc::MAX_COMMAND_SIZE]; uint8_t commandBuffer[mpsoc::MAX_COMMAND_SIZE];