From af038d0a2f04c30cd4bfbe6ff3811afdc2740ddc Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Thu, 1 Oct 2020 20:44:27 +0200 Subject: [PATCH] master taken over --- globalfunctions/AsciiConverter.cpp | 2 +- globalfunctions/CRC.cpp | 2 +- globalfunctions/DleEncoder.cpp | 2 +- globalfunctions/DleEncoder.h | 8 ++++---- globalfunctions/arrayprinter.cpp | 4 ++-- globalfunctions/matching/BinaryMatcher.h | 2 +- globalfunctions/matching/DecimalMatcher.h | 2 +- globalfunctions/matching/MatchTree.h | 2 +- globalfunctions/matching/RangeMatcher.h | 2 +- globalfunctions/matching/SerializeableMatcherIF.h | 2 +- globalfunctions/math/QuaternionOperations.cpp | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/globalfunctions/AsciiConverter.cpp b/globalfunctions/AsciiConverter.cpp index c57125e2..9eb3698f 100644 --- a/globalfunctions/AsciiConverter.cpp +++ b/globalfunctions/AsciiConverter.cpp @@ -1,4 +1,4 @@ -#include "../globalfunctions/AsciiConverter.h" +#include "AsciiConverter.h" #include #include diff --git a/globalfunctions/CRC.cpp b/globalfunctions/CRC.cpp index 1258b698..7bb56806 100644 --- a/globalfunctions/CRC.cpp +++ b/globalfunctions/CRC.cpp @@ -1,4 +1,4 @@ -#include "../globalfunctions/CRC.h" +#include "CRC.h" #include const uint16_t CRC::crc16ccitt_table[256] = { diff --git a/globalfunctions/DleEncoder.cpp b/globalfunctions/DleEncoder.cpp index 6bd402d7..8520389d 100644 --- a/globalfunctions/DleEncoder.cpp +++ b/globalfunctions/DleEncoder.cpp @@ -92,7 +92,7 @@ ReturnValue_t DleEncoder::decode(const uint8_t *sourceStream, else { /* The next byte is a STX, DTX or 0x0D character which * 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. */ if (nextByte == 0x42 or nextByte == 0x43 or nextByte == 0x4D) { destStream[decodedIndex] = nextByte - 0x40; diff --git a/globalfunctions/DleEncoder.h b/globalfunctions/DleEncoder.h index 3c535d1f..6d073f9a 100644 --- a/globalfunctions/DleEncoder.h +++ b/globalfunctions/DleEncoder.h @@ -15,12 +15,12 @@ * char based transmission systems. * 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 - * 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 * by another char, so STX, ETX and CR should not appear anywhere in the actual * 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 * 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; //! End Of Text character. Last character in encoded stream 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. static constexpr uint8_t DLE_CHAR = 0x10; static constexpr uint8_t CARRIAGE_RETURN = 0x0D; @@ -47,7 +47,7 @@ public: * 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 * 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 sourceLen * @param destStream diff --git a/globalfunctions/arrayprinter.cpp b/globalfunctions/arrayprinter.cpp index fa89c0dc..b1e888c5 100644 --- a/globalfunctions/arrayprinter.cpp +++ b/globalfunctions/arrayprinter.cpp @@ -1,4 +1,4 @@ -#include "../globalfunctions/arrayprinter.h" +#include "arrayprinter.h" #include "../serviceinterface/ServiceInterfaceStream.h" #include @@ -27,7 +27,7 @@ void arrayprinter::printHex(const uint8_t *data, size_t size, if(i < size - 1){ sif::info << " , "; if(i > 0 and i % maxCharPerLine == 0) { - sif::info << "\r\n" << std::flush; + sif::info << std::endl; } } diff --git a/globalfunctions/matching/BinaryMatcher.h b/globalfunctions/matching/BinaryMatcher.h index 550439ab..4f6db85d 100644 --- a/globalfunctions/matching/BinaryMatcher.h +++ b/globalfunctions/matching/BinaryMatcher.h @@ -1,7 +1,7 @@ #ifndef BINARYMATCHER_H_ #define BINARYMATCHER_H_ -#include "../../globalfunctions/matching/MatcherIF.h" +#include "MatcherIF.h" template class BinaryMatcher: public MatcherIF { diff --git a/globalfunctions/matching/DecimalMatcher.h b/globalfunctions/matching/DecimalMatcher.h index 3c765cd7..53505020 100644 --- a/globalfunctions/matching/DecimalMatcher.h +++ b/globalfunctions/matching/DecimalMatcher.h @@ -1,7 +1,7 @@ #ifndef DECIMALMATCHER_H_ #define DECIMALMATCHER_H_ -#include "../../globalfunctions/matching/MatcherIF.h" +#include "MatcherIF.h" template class DecimalMatcher: public MatcherIF { diff --git a/globalfunctions/matching/MatchTree.h b/globalfunctions/matching/MatchTree.h index 46245c25..755687b2 100644 --- a/globalfunctions/matching/MatchTree.h +++ b/globalfunctions/matching/MatchTree.h @@ -2,7 +2,7 @@ #define FRAMEWORK_GLOBALFUNCTIONS_MATCHING_MATCHTREE_H_ #include "../../container/BinaryTree.h" -#include "../../globalfunctions/matching/SerializeableMatcherIF.h" +#include "SerializeableMatcherIF.h" #include "../../serialize/SerializeAdapter.h" template diff --git a/globalfunctions/matching/RangeMatcher.h b/globalfunctions/matching/RangeMatcher.h index 04c9c3fa..b64b9e30 100644 --- a/globalfunctions/matching/RangeMatcher.h +++ b/globalfunctions/matching/RangeMatcher.h @@ -1,7 +1,7 @@ #ifndef RANGEMATCHER_H_ #define RANGEMATCHER_H_ -#include "../../globalfunctions/matching/SerializeableMatcherIF.h" +#include "SerializeableMatcherIF.h" #include "../../serialize/SerializeAdapter.h" template diff --git a/globalfunctions/matching/SerializeableMatcherIF.h b/globalfunctions/matching/SerializeableMatcherIF.h index f99c6964..067b0251 100644 --- a/globalfunctions/matching/SerializeableMatcherIF.h +++ b/globalfunctions/matching/SerializeableMatcherIF.h @@ -1,7 +1,7 @@ #ifndef FRAMEWORK_GLOBALFUNCTIONS_MATCHING_SERIALIZEABLEMATCHERIF_H_ #define FRAMEWORK_GLOBALFUNCTIONS_MATCHING_SERIALIZEABLEMATCHERIF_H_ -#include "../../globalfunctions/matching/MatcherIF.h" +#include "MatcherIF.h" #include "../../serialize/SerializeIF.h" template diff --git a/globalfunctions/math/QuaternionOperations.cpp b/globalfunctions/math/QuaternionOperations.cpp index c6778de4..c09426da 100644 --- a/globalfunctions/math/QuaternionOperations.cpp +++ b/globalfunctions/math/QuaternionOperations.cpp @@ -1,5 +1,5 @@ #include "QuaternionOperations.h" -#include "../../globalfunctions/math/VectorOperations.h" +#include "VectorOperations.h" #include #include