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 -3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6350dbe0e9 - Show all commits

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

@ -25,7 +25,8 @@
using namespace returnvalue; using namespace returnvalue;
PlocSupvHelper::PlocSupvHelper(object_id_t objectId) : SystemObject(objectId), ringBuf(4096, true) { PlocSupvHelper::PlocSupvHelper(object_id_t objectId)
: SystemObject(objectId), recRingBuf(4096, true) {
spParams.maxSize = sizeof(commandBuffer); spParams.maxSize = sizeof(commandBuffer);
resetSpParams(); resetSpParams();
semaphore = SemaphoreFactory::instance()->createBinarySemaphore(); semaphore = SemaphoreFactory::instance()->createBinarySemaphore();
@ -79,6 +80,7 @@ ReturnValue_t PlocSupvHelper::performOperation(uint8_t operationCode) {
sif::info << "Received " << bytesRead sif::info << "Received " << bytesRead
<< " bytes from the Solar Cell Experiment:" << std::endl; << " bytes from the Solar Cell Experiment:" << std::endl;
} }
recRingBuf.writeData(recBuf.data(), bytesRead);
// insert buffer into ring buffer here // insert buffer into ring buffer here
// ReturnValue_t result = dleParser.passData(recBuf.data(), bytesRead); // ReturnValue_t result = dleParser.passData(recBuf.data(), bytesRead);
// TODO: Parse ring buffer here // TODO: Parse ring buffer here

3
linux/devices/ploc/PlocSupvHelper.h
View File

@ -216,6 +216,7 @@ class PlocSupvHelper : public DeviceCommunicationIF,
SdCardManager* sdcMan = nullptr; SdCardManager* sdcMan = nullptr;
#endif #endif
std::array<uint8_t, 2048> recBuf = {}; std::array<uint8_t, 2048> recBuf = {};
SimpleRingBuffer recRingBuf;
uint8_t commandBuffer[supv::MAX_COMMAND_SIZE]{}; uint8_t commandBuffer[supv::MAX_COMMAND_SIZE]{};
SpacePacketCreator creator; SpacePacketCreator creator;
ploc::SpTcParams spParams = ploc::SpTcParams(creator); ploc::SpTcParams spParams = ploc::SpTcParams(creator);
@ -224,8 +225,6 @@ class PlocSupvHelper : public DeviceCommunicationIF,
bool terminate = false; bool terminate = false;
bool debugMode = false; bool debugMode = false;
SimpleRingBuffer ringBuf;
/** /**
* Communication interface responsible for data transactions between OBC and Supervisor. * Communication interface responsible for data transactions between OBC and Supervisor.
*/ */