diff --git a/include/etl/crc8_rohc.h b/include/etl/crc8_rohc.h index 9fdede5d..85217da8 100644 --- a/include/etl/crc8_rohc.h +++ b/include/etl/crc8_rohc.h @@ -43,7 +43,7 @@ SOFTWARE. namespace etl { - typedef crc8_poly_0x07<0xFF, 0x00, true, true> crc8_rohc; + typedef crc8_poly_0x07<0xFF, 0x00, true> crc8_rohc; } #endif diff --git a/include/etl/cumulative_moving_average.h b/include/etl/cumulative_moving_average.h index 323da080..3e49affc 100644 --- a/include/etl/cumulative_moving_average.h +++ b/include/etl/cumulative_moving_average.h @@ -39,37 +39,40 @@ namespace etl namespace private_cumulative_moving_average { //*************************************************** - /// Proxy adder. - /// Returned by the iterator dereference operator. + /// add_insert_iterator + /// An output iterator used to add new values. //*************************************************** template - class proxy_adder + class add_insert_iterator : public etl::iterator { public: - friend typename TCMA::iterator; - - //*************************************************** - /// Copy constuctor - //*************************************************** - proxy_adder(const proxy_adder& other) - : p_cma(other.p_cma) + //*********************************** + explicit add_insert_iterator(TCMA& cma) ETL_NOEXCEPT + : p_cma(&cma) { } - //*************************************************** - /// Assignment from proxy_adder - //*************************************************** - proxy_adder& operator =(const proxy_adder& rhs) + //*********************************** + add_insert_iterator& operator*() ETL_NOEXCEPT { - p_cma = rhs.p_cma; return *this; } - //*************************************************** - /// Assignment from value - //*************************************************** - proxy_adder& operator =(typename TCMA::value_type value) + //*********************************** + add_insert_iterator& operator++() ETL_NOEXCEPT + { + return *this; + } + + //*********************************** + add_insert_iterator& operator++(int) ETL_NOEXCEPT + { + return *this; + } + + //*********************************** + add_insert_iterator& operator =(typename TCMA::value_type value) { p_cma->add(value); return *this; @@ -77,89 +80,8 @@ namespace etl private: - //*************************************************** - /// Private constructor - //*************************************************** - proxy_adder(TCMA* p_cma_) - : p_cma(p_cma_) - { - } - TCMA* p_cma; }; - - //*************************************************** - /// iterator - /// An output iterator used to add new values. - //*************************************************** - template - class iterator : public etl::iterator - { - public: - - friend TCMA; - - //*************************************************** - /// Default constructor - //*************************************************** - iterator() - { - } - - //*************************************************** - /// Copy constuctor - //*************************************************** - iterator(const iterator& other) - : adder(other.adder) - { - } - - //*************************************************** - /// Assignment operator - //*************************************************** - iterator& operator =(const iterator& rhs) - { - adder = rhs.adder; - return *this; - } - - //*************************************************** - /// Pre-increment operator - //*************************************************** - iterator& operator ++() - { - return *this; - } - - //*************************************************** - /// Post-increment operator - //*************************************************** - iterator& operator ++(int) - { - return *this; - } - - //*************************************************** - /// De-reference operator - //*************************************************** - proxy_adder operator *() const - { - return adder; - } - - private: - - //*************************************************** - /// Private constructor - //*************************************************** - iterator(TCMA* p_cma) - : adder(p_cma) - { - } - - /// The adder proxy returned by an iterator dereference. - proxy_adder adder; - }; } //*************************************************************************** @@ -198,7 +120,7 @@ namespace etl public: typedef T value_type; - typedef private_cumulative_moving_average::iterator iterator; + typedef private_cumulative_moving_average::add_insert_iterator add_insert_iterator; static const size_t SAMPLE_SIZE = SAMPLE_SIZE_; ///< The number of samples averaged over. static const size_t SCALING = SCALING_; ///< The sample scaling factor. @@ -245,9 +167,9 @@ namespace etl /// Gets an iterator for input. /// \return An iterator. //************************************************************************* - iterator input() + add_insert_iterator input() { - return iterator(this); + return add_insert_iterator(*this); } private: @@ -274,7 +196,7 @@ namespace etl public: typedef T value_type; - typedef private_cumulative_moving_average::iterator iterator; + typedef private_cumulative_moving_average::add_insert_iterator add_insert_iterator; static const size_t SCALING = SCALING_; ///< The sample scaling factor. @@ -330,9 +252,9 @@ namespace etl /// Gets an iterator for input. /// \return An iterator. //************************************************************************* - iterator input() + add_insert_iterator input() { - return iterator(this); + return add_insert_iterator(*this); } private: @@ -355,7 +277,7 @@ namespace etl public: typedef T value_type; - typedef private_cumulative_moving_average::iterator iterator; + typedef private_cumulative_moving_average::add_insert_iterator add_insert_iterator; static const size_t SAMPLE_SIZE = SAMPLE_SIZE_; @@ -400,9 +322,9 @@ namespace etl /// Gets an iterator for input. /// \return An iterator. //************************************************************************* - iterator input() + add_insert_iterator input() { - return iterator(this); + return add_insert_iterator(*this); } private: @@ -425,7 +347,7 @@ namespace etl public: typedef T value_type; - typedef private_cumulative_moving_average::iterator iterator; + typedef private_cumulative_moving_average::add_insert_iterator add_insert_iterator; //************************************************************************* /// Constructor @@ -477,9 +399,9 @@ namespace etl /// Gets an iterator for input. /// \return An iterator. //************************************************************************* - iterator input() + add_insert_iterator input() { - return iterator(this); + return add_insert_iterator(*this); } private: diff --git a/include/etl/frame_check_sequence.h b/include/etl/frame_check_sequence.h index 3c8787cc..8c5c966c 100644 --- a/include/etl/frame_check_sequence.h +++ b/include/etl/frame_check_sequence.h @@ -46,37 +46,40 @@ namespace etl namespace private_frame_check_sequence { //*************************************************** - /// Proxy adder. - /// Returned by the iterator dereference operator. + /// add_insert_iterator + /// An output iterator used to add new values. //*************************************************** template - class proxy_adder + class add_insert_iterator : public etl::iterator { public: - friend typename TFCS::iterator; - - //*************************************************** - /// Copy constuctor - //*************************************************** - proxy_adder(const proxy_adder& other) - : p_fcs(other.p_fcs) + //*********************************** + explicit add_insert_iterator(TFCS& fcs) ETL_NOEXCEPT + : p_fcs(&fcs) { } - //*************************************************** - /// Assignment from proxy_adder - //*************************************************** - proxy_adder& operator =(const proxy_adder& rhs) + //*********************************** + add_insert_iterator& operator*() ETL_NOEXCEPT { - p_fcs = rhs.p_fcs; return *this; } - //*************************************************** - /// Assignment from value - //*************************************************** - proxy_adder& operator =(uint8_t value) + //*********************************** + add_insert_iterator& operator++() ETL_NOEXCEPT + { + return *this; + } + + //*********************************** + add_insert_iterator& operator++(int) ETL_NOEXCEPT + { + return *this; + } + + //*********************************** + add_insert_iterator& operator =(uint8_t value) { p_fcs->add(value); return *this; @@ -84,89 +87,8 @@ namespace etl private: - //*************************************************** - /// Private constructor - //*************************************************** - proxy_adder(TFCS* p_fcs_) - : p_fcs(p_fcs_) - { - } - TFCS* p_fcs; }; - - //*************************************************** - /// iterator - /// An output iterator used to add new values. - //*************************************************** - template - class iterator : public etl::iterator - { - public: - - friend TFCS; - - //*************************************************** - /// Default constructor - //*************************************************** - iterator() - { - } - - //*************************************************** - /// Copy constuctor - //*************************************************** - iterator(const iterator& other) - : adder(other.adder) - { - } - - //*************************************************** - /// Assignment operator - //*************************************************** - iterator& operator =(const iterator& rhs) - { - adder = rhs.adder; - return *this; - } - - //*************************************************** - /// Pre-increment operator - //*************************************************** - iterator& operator ++() - { - return *this; - } - - //*************************************************** - /// Post-increment operator - //*************************************************** - iterator& operator ++(int) - { - return *this; - } - - //*************************************************** - /// De-reference operator - //*************************************************** - proxy_adder operator *() const - { - return adder; - } - - private: - - //*************************************************** - /// Private constructor - //*************************************************** - iterator(TFCS* p_fcs) - : adder(p_fcs) - { - } - - /// The adder proxy returned by an iterator dereference. - proxy_adder adder; - }; } //*************************************************************************** @@ -181,7 +103,7 @@ namespace etl typedef TPolicy policy_type; typedef typename policy_type::value_type value_type; - typedef private_frame_check_sequence::iterator> iterator; + typedef private_frame_check_sequence::add_insert_iterator > add_insert_iterator; ETL_STATIC_ASSERT(etl::is_unsigned::value, "Signed frame check type not supported"); @@ -256,11 +178,11 @@ namespace etl } //************************************************************************* - /// Gets an iterator for input. + /// Gets an add_insert_iterator for input. //************************************************************************* - iterator input() + add_insert_iterator input() { - return iterator(this); + return add_insert_iterator(*this); } private: diff --git a/include/etl/private/crc8_poly_0x07.h b/include/etl/private/crc8_poly_0x07.h index 7615d0e2..6e28e534 100644 --- a/include/etl/private/crc8_poly_0x07.h +++ b/include/etl/private/crc8_poly_0x07.h @@ -93,22 +93,22 @@ namespace etl { static const uint8_t table[256] = { - 0x00, 0x31, 0x62, 0x53, 0xC4, 0xF5, 0xA6, 0x97, 0xB9, 0x88, 0xDB, 0xEA, 0x7D, 0x4C, 0x1F, 0x2E, - 0x43, 0x72, 0x21, 0x10, 0x87, 0xB6, 0xE5, 0xD4, 0xFA, 0xCB, 0x98, 0xA9, 0x3E, 0x0F, 0x5C, 0x6D, - 0x86, 0xB7, 0xE4, 0xD5, 0x42, 0x73, 0x20, 0x11, 0x3F, 0x0E, 0x5D, 0x6C, 0xFB, 0xCA, 0x99, 0xA8, - 0xC5, 0xF4, 0xA7, 0x96, 0x01, 0x30, 0x63, 0x52, 0x7C, 0x4D, 0x1E, 0x2F, 0xB8, 0x89, 0xDA, 0xEB, - 0x3D, 0x0C, 0x5F, 0x6E, 0xF9, 0xC8, 0x9B, 0xAA, 0x84, 0xB5, 0xE6, 0xD7, 0x40, 0x71, 0x22, 0x13, - 0x7E, 0x4F, 0x1C, 0x2D, 0xBA, 0x8B, 0xD8, 0xE9, 0xC7, 0xF6, 0xA5, 0x94, 0x03, 0x32, 0x61, 0x50, - 0xBB, 0x8A, 0xD9, 0xE8, 0x7F, 0x4E, 0x1D, 0x2C, 0x02, 0x33, 0x60, 0x51, 0xC6, 0xF7, 0xA4, 0x95, - 0xF8, 0xC9, 0x9A, 0xAB, 0x3C, 0x0D, 0x5E, 0x6F, 0x41, 0x70, 0x23, 0x12, 0x85, 0xB4, 0xE7, 0xD6, - 0x7A, 0x4B, 0x18, 0x29, 0xBE, 0x8F, 0xDC, 0xED, 0xC3, 0xF2, 0xA1, 0x90, 0x07, 0x36, 0x65, 0x54, - 0x39, 0x08, 0x5B, 0x6A, 0xFD, 0xCC, 0x9F, 0xAE, 0x80, 0xB1, 0xE2, 0xD3, 0x44, 0x75, 0x26, 0x17, - 0xFC, 0xCD, 0x9E, 0xAF, 0x38, 0x09, 0x5A, 0x6B, 0x45, 0x74, 0x27, 0x16, 0x81, 0xB0, 0xE3, 0xD2, - 0xBF, 0x8E, 0xDD, 0xEC, 0x7B, 0x4A, 0x19, 0x28, 0x06, 0x37, 0x64, 0x55, 0xC2, 0xF3, 0xA0, 0x91, - 0x47, 0x76, 0x25, 0x14, 0x83, 0xB2, 0xE1, 0xD0, 0xFE, 0xCF, 0x9C, 0xAD, 0x3A, 0x0B, 0x58, 0x69, - 0x04, 0x35, 0x66, 0x57, 0xC0, 0xF1, 0xA2, 0x93, 0xBD, 0x8C, 0xDF, 0xEE, 0x79, 0x48, 0x1B, 0x2A, - 0xC1, 0xF0, 0xA3, 0x92, 0x05, 0x34, 0x67, 0x56, 0x78, 0x49, 0x1A, 0x2B, 0xBC, 0x8D, 0xDE, 0xEF, - 0x82, 0xB3, 0xE0, 0xD1, 0x46, 0x77, 0x24, 0x15, 0x3B, 0x0A, 0x59, 0x68, 0xFF, 0xCE, 0x9D, 0xAC + 0x00, 0x91, 0xe3, 0x72, 0x07, 0x96, 0xe4, 0x75, 0x0e, 0x9f, 0xed, 0x7c, 0x09, 0x98, 0xea, 0x7b, + 0x1c, 0x8d, 0xff, 0x6e, 0x1b, 0x8a, 0xf8, 0x69, 0x12, 0x83, 0xf1, 0x60, 0x15, 0x84, 0xf6, 0x67, + 0x38, 0xa9, 0xdb, 0x4a, 0x3f, 0xae, 0xdc, 0x4d, 0x36, 0xa7, 0xd5, 0x44, 0x31, 0xa0, 0xd2, 0x43, + 0x24, 0xb5, 0xc7, 0x56, 0x23, 0xb2, 0xc0, 0x51, 0x2a, 0xbb, 0xc9, 0x58, 0x2d, 0xbc, 0xce, 0x5f, + 0x70, 0xe1, 0x93, 0x02, 0x77, 0xe6, 0x94, 0x05, 0x7e, 0xef, 0x9d, 0x0c, 0x79, 0xe8, 0x9a, 0x0b, + 0x6c, 0xfd, 0x8f, 0x1e, 0x6b, 0xfa, 0x88, 0x19, 0x62, 0xf3, 0x81, 0x10, 0x65, 0xf4, 0x86, 0x17, + 0x48, 0xd9, 0xab, 0x3a, 0x4f, 0xde, 0xac, 0x3d, 0x46, 0xd7, 0xa5, 0x34, 0x41, 0xd0, 0xa2, 0x33, + 0x54, 0xc5, 0xb7, 0x26, 0x53, 0xc2, 0xb0, 0x21, 0x5a, 0xcb, 0xb9, 0x28, 0x5d, 0xcc, 0xbe, 0x2f, + 0xe0, 0x71, 0x03, 0x92, 0xe7, 0x76, 0x04, 0x95, 0xee, 0x7f, 0x0d, 0x9c, 0xe9, 0x78, 0x0a, 0x9b, + 0xfc, 0x6d, 0x1f, 0x8e, 0xfb, 0x6a, 0x18, 0x89, 0xf2, 0x63, 0x11, 0x80, 0xf5, 0x64, 0x16, 0x87, + 0xd8, 0x49, 0x3b, 0xaa, 0xdf, 0x4e, 0x3c, 0xad, 0xd6, 0x47, 0x35, 0xa4, 0xd1, 0x40, 0x32, 0xa3, + 0xc4, 0x55, 0x27, 0xb6, 0xc3, 0x52, 0x20, 0xb1, 0xca, 0x5b, 0x29, 0xb8, 0xcd, 0x5c, 0x2e, 0xbf, + 0x90, 0x01, 0x73, 0xe2, 0x97, 0x06, 0x74, 0xe5, 0x9e, 0x0f, 0x7d, 0xec, 0x99, 0x08, 0x7a, 0xeb, + 0x8c, 0x1d, 0x6f, 0xfe, 0x8b, 0x1a, 0x68, 0xf9, 0x82, 0x13, 0x61, 0xf0, 0x85, 0x14, 0x66, 0xf7, + 0xa8, 0x39, 0x4b, 0xda, 0xaf, 0x3e, 0x4c, 0xdd, 0xa6, 0x37, 0x45, 0xd4, 0xa1, 0x30, 0x42, 0xd3, + 0xb4, 0x25, 0x57, 0xc6, 0xb3, 0x22, 0x50, 0xc1, 0xba, 0x2b, 0x59, 0xc8, 0xbd, 0x2c, 0x5e, 0xcf }; return table[crc ^ value]; diff --git a/test/test_crc.cpp b/test/test_crc.cpp index 20f63530..7cb75db9 100644 --- a/test/test_crc.cpp +++ b/test/test_crc.cpp @@ -34,6 +34,7 @@ SOFTWARE. #include #include "etl/crc8_ccitt.h" +#include "etl/crc8_rohc.h" #include "etl/crc16.h" #include "etl/crc16_ccitt.h" #include "etl/crc16_aug_ccitt.h" @@ -82,7 +83,7 @@ namespace uint8_t crc = crc_calculator; - CHECK_EQUAL(0xF4, crc); + CHECK_EQUAL(0xF4, int(crc)); } //************************************************************************* @@ -96,7 +97,7 @@ namespace uint8_t crc = crc_calculator.value(); - CHECK_EQUAL(0xF4, crc); + CHECK_EQUAL(0xF4, int(crc)); } //************************************************************************* @@ -110,7 +111,7 @@ namespace uint8_t crc = crc_calculator.value(); - CHECK_EQUAL(0xF4, crc); + CHECK_EQUAL(0xF4, int(crc)); } //************************************************************************* @@ -128,6 +129,76 @@ namespace CHECK_EQUAL(int(crc1), int(crc3)); } + //************************************************************************* + TEST(test_crc8_rohc_constructor) + { + std::string data("123456789"); + + uint8_t crc = etl::crc8_rohc(data.begin(), data.end()); + + CHECK_EQUAL(0xD0, int(crc)); + } + + //************************************************************************* + TEST(test_crc8_rohc_add_values) + { + std::string data("123456789"); + + etl::crc8_rohc crc_calculator; + + for (size_t i = 0; i < data.size(); ++i) + { + crc_calculator.add(data[i]); + } + + uint8_t crc = crc_calculator; + + CHECK_EQUAL(0xD0, int(crc)); + } + + //************************************************************************* + TEST(test_crc8_rohc_add_range) + { + std::string data("123456789"); + + etl::crc8_rohc crc_calculator; + + crc_calculator.add(data.begin(), data.end()); + + uint8_t crc = crc_calculator.value(); + + CHECK_EQUAL(0xD0, int(crc)); + } + + //************************************************************************* + TEST(test_crc8_rohc_add_range_via_iterator) + { + std::string data("123456789"); + + etl::crc8_rohc crc_calculator; + + std::copy(data.begin(), data.end(), crc_calculator.input()); + + uint8_t crc = crc_calculator.value(); + + CHECK_EQUAL(0xD0, int(crc)); + } + + //************************************************************************* + TEST(test_crc8_rohc_add_range_endian) + { + std::vector data1 = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 }; + std::vector data2 = { 0x04030201, 0x08070605 }; + std::vector data3 = { 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01 }; + + uint8_t crc1 = etl::crc32(data1.begin(), data1.end()); + uint8_t crc2 = etl::crc32((uint8_t*)&data2[0], (uint8_t*)(&data2[0] + data2.size())); + CHECK_EQUAL(int(crc1), int(crc2)); + + uint8_t crc3 = etl::crc32(data3.rbegin(), data3.rend()); + CHECK_EQUAL(int(crc1), int(crc3)); + } + //************************************************************************* TEST(test_crc16) {