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

WIP: SCEX Init #272

Closed
muellerr wants to merge 62 commits from irini into develop
pull from: irini
merge into: eive:develop
Conversation 1 Commits 62 Files Changed 40 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c5683afe9f - Show all commits

2
linux/devices/ScexUartReader.cpp
View File

@ -51,7 +51,7 @@ ReturnValue_t ScexUartReader::performOperation(uint8_t operationCode) {
<< ", " << strerror(errno) << "]" << std::endl; << ", " << strerror(errno) << "]" << std::endl;
break; break;
} else if (bytesRead >= static_cast<int>(recBuf.size())) { } else if (bytesRead >= static_cast<int>(recBuf.size())) {
sif::error << "ScexUartReader::performOperation: Receive buffer too small" << std::endl; sif::error << "ScexUartReader::performOperation: Receive buffer too small for " << bytesRead << " bytes" << std::endl;
} else if (bytesRead > 0) { } else if (bytesRead > 0) {
ReturnValue_t result = dleParser.passData(recBuf.data(), bytesRead); ReturnValue_t result = dleParser.passData(recBuf.data(), bytesRead);
if (debugMode) { if (debugMode) {

4
linux/devices/ScexUartReader.h
View File

@ -37,9 +37,9 @@ class ScexUartReader : public SystemObject, // strg+shift+n
DleEncoder dleEncoder = DleEncoder(); DleEncoder dleEncoder = DleEncoder();
SimpleRingBuffer decodeRingBuf; SimpleRingBuffer decodeRingBuf;
Countdown finishCoutdown = Countdown(180 * 1000); Countdown finishCountdown = Countdown(180 * 1000);
std::array<uint8_t, 256> cmdbuf = {}; std::array<uint8_t, 256> cmdbuf = {};
std::array<uint8_t, 524> recBuf = {}; std::array<uint8_t, 4096> recBuf = {};
std::array<uint8_t, 4096> encodedBuf = {}; std::array<uint8_t, 4096> encodedBuf = {};
std::array<uint8_t, 4096> decodedBuf = {}; std::array<uint8_t, 4096> decodedBuf = {};
std::array<uint8_t, 4096> ipcBuffer = {}; std::array<uint8_t, 4096> ipcBuffer = {};