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

master taken over

Browse Source
This commit is contained in:
Robin Müller 2020-10-01 20:44:27 +02:00
parent f9e6b9faca
commit af038d0a2f
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
globalfunctions/AsciiConverter.cpp
View File

@ -1,4 +1,4 @@
#include "../globalfunctions/AsciiConverter.h" #include "AsciiConverter.h"
#include <limits> #include <limits>
#include <cmath> #include <cmath>

2
globalfunctions/CRC.cpp
View File

@ -1,4 +1,4 @@
#include "../globalfunctions/CRC.h" #include "CRC.h"
#include <math.h> #include <math.h>
const uint16_t CRC::crc16ccitt_table[256] = { const uint16_t CRC::crc16ccitt_table[256] = {

2
globalfunctions/DleEncoder.cpp
View File

@ -92,7 +92,7 @@ ReturnValue_t DleEncoder::decode(const uint8_t *sourceStream,
else { else {
/* 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 preven 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 == 0x42 or nextByte == 0x43 or nextByte == 0x4D) { if (nextByte == 0x42 or nextByte == 0x43 or nextByte == 0x4D) {
destStream[decodedIndex] = nextByte - 0x40; destStream[decodedIndex] = nextByte - 0x40;

8
globalfunctions/DleEncoder.h
View File

@ -15,12 +15,12 @@
* char based transmission systems. * char based transmission systems.
* The passed source strean is converted into a encoded stream by adding * The passed source strean is converted into a encoded stream by adding
* a STX marker at the start of the stream and an ETX marker at the end of * a STX marker at the start of the stream and an ETX marker at the end of
* the stream. Any STX, ETX, DLE and CR occurences in the source stream are * the stream. Any STX, ETX, DLE and CR occurrences in the source stream are
* escaped by a DLE character. The encoder also replaces escaped control chars * escaped by a DLE character. The encoder also replaces escaped control chars
* by another char, so STX, ETX and CR should not appear anywhere in the actual * by another char, so STX, ETX and CR should not appear anywhere in the actual
* encoded data stream. * encoded data stream.
* *
* When using a strictly char based reception of packets enoded with DLE, * When using a strictly char based reception of packets encoded with DLE,
* STX can be used to notify a reader that actual data will start to arrive * STX can be used to notify a reader that actual data will start to arrive
* while ETX can be used to notify the reader that the data has ended. * while ETX can be used to notify the reader that the data has ended.
*/ */
@ -38,7 +38,7 @@ public:
static constexpr uint8_t STX_CHAR = 0x02; static constexpr uint8_t STX_CHAR = 0x02;
//! End Of Text character. Last character in encoded stream //! End Of Text character. Last character in encoded stream
static constexpr uint8_t ETX_CHAR = 0x03; static constexpr uint8_t ETX_CHAR = 0x03;
//! Data Link Escape character. Used to escape STX, ETX and DLE occurences //! Data Link Escape character. Used to escape STX, ETX and DLE occurrences
//! in the source stream. //! in the source stream.
static constexpr uint8_t DLE_CHAR = 0x10; static constexpr uint8_t DLE_CHAR = 0x10;
static constexpr uint8_t CARRIAGE_RETURN = 0x0D; static constexpr uint8_t CARRIAGE_RETURN = 0x0D;
@ -47,7 +47,7 @@ public:
* Encodes the give data stream by preceding it with the STX marker * Encodes the give data stream by preceding it with the STX marker
* and ending it with an ETX marker. STX, ETX and DLE characters inside * and ending it with an ETX marker. STX, ETX and DLE characters inside
* the stream are escaped by DLE characters and also replaced by adding * the stream are escaped by DLE characters and also replaced by adding
* 0x40 (which is reverted in the decoing process). * 0x40 (which is reverted in the decoding process).
* @param sourceStream * @param sourceStream
* @param sourceLen * @param sourceLen
* @param destStream * @param destStream

4
globalfunctions/arrayprinter.cpp
View File

@ -1,4 +1,4 @@
#include "../globalfunctions/arrayprinter.h" #include "arrayprinter.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "../serviceinterface/ServiceInterfaceStream.h"
#include <bitset> #include <bitset>
@ -27,7 +27,7 @@ void arrayprinter::printHex(const uint8_t *data, size_t size,
if(i < size - 1){ if(i < size - 1){
sif::info << " , "; sif::info << " , ";
if(i > 0 and i % maxCharPerLine == 0) { if(i > 0 and i % maxCharPerLine == 0) {
sif::info << "\r\n" << std::flush; sif::info << std::endl;
} }
} }

2
globalfunctions/matching/BinaryMatcher.h
View File

@ -1,7 +1,7 @@
#ifndef BINARYMATCHER_H_ #ifndef BINARYMATCHER_H_
#define BINARYMATCHER_H_ #define BINARYMATCHER_H_
#include "../../globalfunctions/matching/MatcherIF.h" #include "MatcherIF.h"
template<typename T> template<typename T>
class BinaryMatcher: public MatcherIF<T> { class BinaryMatcher: public MatcherIF<T> {

2
globalfunctions/matching/DecimalMatcher.h
View File

@ -1,7 +1,7 @@
#ifndef DECIMALMATCHER_H_ #ifndef DECIMALMATCHER_H_
#define DECIMALMATCHER_H_ #define DECIMALMATCHER_H_
#include "../../globalfunctions/matching/MatcherIF.h" #include "MatcherIF.h"
template<typename T> template<typename T>
class DecimalMatcher: public MatcherIF<T> { class DecimalMatcher: public MatcherIF<T> {

2
globalfunctions/matching/MatchTree.h
View File

@ -2,7 +2,7 @@
#define FRAMEWORK_GLOBALFUNCTIONS_MATCHING_MATCHTREE_H_ #define FRAMEWORK_GLOBALFUNCTIONS_MATCHING_MATCHTREE_H_
#include "../../container/BinaryTree.h" #include "../../container/BinaryTree.h"
#include "../../globalfunctions/matching/SerializeableMatcherIF.h" #include "SerializeableMatcherIF.h"
#include "../../serialize/SerializeAdapter.h" #include "../../serialize/SerializeAdapter.h"
template<typename T> template<typename T>

2
globalfunctions/matching/RangeMatcher.h
View File

@ -1,7 +1,7 @@
#ifndef RANGEMATCHER_H_ #ifndef RANGEMATCHER_H_
#define RANGEMATCHER_H_ #define RANGEMATCHER_H_
#include "../../globalfunctions/matching/SerializeableMatcherIF.h" #include "SerializeableMatcherIF.h"
#include "../../serialize/SerializeAdapter.h" #include "../../serialize/SerializeAdapter.h"
template<typename T> template<typename T>

2
globalfunctions/matching/SerializeableMatcherIF.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_GLOBALFUNCTIONS_MATCHING_SERIALIZEABLEMATCHERIF_H_ #ifndef FRAMEWORK_GLOBALFUNCTIONS_MATCHING_SERIALIZEABLEMATCHERIF_H_
#define FRAMEWORK_GLOBALFUNCTIONS_MATCHING_SERIALIZEABLEMATCHERIF_H_ #define FRAMEWORK_GLOBALFUNCTIONS_MATCHING_SERIALIZEABLEMATCHERIF_H_
#include "../../globalfunctions/matching/MatcherIF.h" #include "MatcherIF.h"
#include "../../serialize/SerializeIF.h" #include "../../serialize/SerializeIF.h"
template<typename T> template<typename T>

2
globalfunctions/math/QuaternionOperations.cpp
View File

@ -1,5 +1,5 @@
#include "QuaternionOperations.h" #include "QuaternionOperations.h"
#include "../../globalfunctions/math/VectorOperations.h" #include "VectorOperations.h"
#include <cmath> #include <cmath>
#include <cstring> #include <cstring>