From a52d0fbd81c7dfff975b9c98f6567afa22f558c7 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Mon, 30 May 2016 11:24:59 -0700 Subject: [PATCH] Rename format_manchester/ManchesterFormatted to "[sS]ymbols". --- firmware/common/ert_packet.cpp | 4 ++-- firmware/common/ert_packet.hpp | 2 +- firmware/common/manchester.cpp | 2 +- firmware/common/manchester.hpp | 4 ++-- firmware/common/tpms_packet.cpp | 4 ++-- firmware/common/tpms_packet.hpp | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/firmware/common/ert_packet.cpp b/firmware/common/ert_packet.cpp index 3fcf0ede..ff9e7d10 100644 --- a/firmware/common/ert_packet.cpp +++ b/firmware/common/ert_packet.cpp @@ -73,8 +73,8 @@ CommodityType Packet::commodity_type() const { return invalid_commodity_type; } -ManchesterFormatted Packet::symbols_formatted() const { - return format_manchester(decoder_); +FormattedSymbols Packet::symbols_formatted() const { + return format_symbols(decoder_); } bool Packet::crc_ok() const { diff --git a/firmware/common/ert_packet.hpp b/firmware/common/ert_packet.hpp index 0a053536..fcdf8e33 100644 --- a/firmware/common/ert_packet.hpp +++ b/firmware/common/ert_packet.hpp @@ -68,7 +68,7 @@ public: CommodityType commodity_type() const; Consumption consumption() const; - ManchesterFormatted symbols_formatted() const; + FormattedSymbols symbols_formatted() const; bool crc_ok() const; diff --git a/firmware/common/manchester.cpp b/firmware/common/manchester.cpp index c6d1cb9b..15196191 100644 --- a/firmware/common/manchester.cpp +++ b/firmware/common/manchester.cpp @@ -38,7 +38,7 @@ size_t ManchesterDecoder::symbols_count() const { return packet.size() / 2; } -ManchesterFormatted format_manchester( +FormattedSymbols format_symbols( const ManchesterDecoder& decoder ) { const size_t payload_length_decoded = decoder.symbols_count(); diff --git a/firmware/common/manchester.hpp b/firmware/common/manchester.hpp index c2bc820d..6a2376a9 100644 --- a/firmware/common/manchester.hpp +++ b/firmware/common/manchester.hpp @@ -58,12 +58,12 @@ T operator|(const T& l, const DecodedSymbol& r) { return l | r.value; } -struct ManchesterFormatted { +struct FormattedSymbols { const std::string data; const std::string errors; }; -ManchesterFormatted format_manchester( +FormattedSymbols format_symbols( const ManchesterDecoder& decoder ); diff --git a/firmware/common/tpms_packet.cpp b/firmware/common/tpms_packet.cpp index 1c5b55d5..8f1acffa 100644 --- a/firmware/common/tpms_packet.cpp +++ b/firmware/common/tpms_packet.cpp @@ -29,8 +29,8 @@ Timestamp Packet::received_at() const { return packet_.timestamp(); } -ManchesterFormatted Packet::symbols_formatted() const { - return format_manchester(decoder_); +FormattedSymbols Packet::symbols_formatted() const { + return format_symbols(decoder_); } Optional Packet::reading_fsk_19k2_schrader() const { diff --git a/firmware/common/tpms_packet.hpp b/firmware/common/tpms_packet.hpp index 4d35c962..5ee3e02a 100644 --- a/firmware/common/tpms_packet.hpp +++ b/firmware/common/tpms_packet.hpp @@ -147,7 +147,7 @@ public: SignalType signal_type() const { return signal_type_; } Timestamp received_at() const; - ManchesterFormatted symbols_formatted() const; + FormattedSymbols symbols_formatted() const; Optional reading() const;