KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

made two functions private and removed unnecessary if check

Browse Source
This commit is contained in:
Robin Müller 2021-08-18 13:17:48 +02:00
parent 7572d3f7cd
commit 94c2e703e0
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/fsfw/globalfunctions/DleEncoder.cpp
View File

@ -122,18 +122,13 @@ ReturnValue_t DleEncoder::decodeStreamEscaped(const uint8_t *sourceStream, size_
destStream[decodedIndex] = nextByte; destStream[decodedIndex] = nextByte;
} }
else { else {
if(this->escapeStxEtx) { /* The next byte is a STX, DTX or 0x0D character which
/* The next byte is a STX, DTX or 0x0D character which * was escaped by a DLE character. The actual byte was
* was escaped by a DLE character. The actual byte was * also encoded by adding + 0x40 to prevent having control chars,
* also encoded by adding + 0x40 to prevent having control chars, * in the stream at all, so we convert it back. */
* in the stream at all, so we convert it back. */ if ((nextByte == STX_CHAR + 0x40 or nextByte == ETX_CHAR + 0x40) or
if ((nextByte == STX_CHAR + 0x40 or nextByte == ETX_CHAR + 0x40) or (this->escapeCr and nextByte == CARRIAGE_RETURN + 0x40)) {
(this->escapeCr and nextByte == CARRIAGE_RETURN + 0x40)) { destStream[decodedIndex] = nextByte - 0x40;
destStream[decodedIndex] = nextByte - 0x40;
}
else {
return DECODING_ERROR;
}
} }
else { else {
return DECODING_ERROR; return DECODING_ERROR;

4
src/fsfw/globalfunctions/DleEncoder.h
View File

@ -87,14 +87,14 @@ public:
size_t sourceStreamLen, size_t *readLen, uint8_t *destStream, size_t sourceStreamLen, size_t *readLen, uint8_t *destStream,
size_t maxDestStreamlen, size_t *decodedLen); size_t maxDestStreamlen, size_t *decodedLen);
private:
ReturnValue_t decodeStreamEscaped(const uint8_t *sourceStream, size_t sourceStreamLen, ReturnValue_t decodeStreamEscaped(const uint8_t *sourceStream, size_t sourceStreamLen,
size_t *readLen, uint8_t *destStream, size_t maxDestStreamlen, size_t *decodedLen); size_t *readLen, uint8_t *destStream, size_t maxDestStreamlen, size_t *decodedLen);
ReturnValue_t decodeStreamNonEscaped(const uint8_t *sourceStream, size_t sourceStreamLen, ReturnValue_t decodeStreamNonEscaped(const uint8_t *sourceStream, size_t sourceStreamLen,
size_t *readLen, uint8_t *destStream, size_t maxDestStreamlen, size_t *decodedLen); size_t *readLen, uint8_t *destStream, size_t maxDestStreamlen, size_t *decodedLen);
private:
bool escapeStxEtx; bool escapeStxEtx;
bool escapeCr; bool escapeCr;
}; };