From b2ea470ec01bcc8e2ef85baff7c11168f9e9a5b2 Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 26 Dec 2015 11:58:04 +0100 Subject: [PATCH] rename RESULT_IN_ESC to RESULT_CONTINUE --- src/lib/ebus/result.cpp | 2 +- src/lib/ebus/result.h | 2 +- src/lib/ebus/symbol.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/ebus/result.cpp b/src/lib/ebus/result.cpp index 8892c0bb..ce7e793f 100644 --- a/src/lib/ebus/result.cpp +++ b/src/lib/ebus/result.cpp @@ -24,7 +24,7 @@ using namespace std; const char* getResultCode(result_t resultCode) { switch (resultCode) { case RESULT_OK: return "done"; - case RESULT_IN_ESC: return "escape sequence received"; + case RESULT_CONTINUE: return "continue"; case RESULT_EMPTY: return "empty"; case RESULT_ERR_GENERIC_IO: return "ERR: generic I/O error"; case RESULT_ERR_DEVICE: return "ERR: generic device error"; diff --git a/src/lib/ebus/result.h b/src/lib/ebus/result.h index 78f51f35..98e55d9a 100644 --- a/src/lib/ebus/result.h +++ b/src/lib/ebus/result.h @@ -31,7 +31,7 @@ enum result_t { RESULT_OK = 0, //!< success - RESULT_IN_ESC = 1, //!< start of escape sequence received + RESULT_CONTINUE = 1, //!< more input data is needed (e.g. start of escape sequence received) RESULT_EMPTY = 2, //!< empty result RESULT_ERR_GENERIC_IO = -1, //!< generic I/O error (usually fatal) diff --git a/src/lib/ebus/symbol.cpp b/src/lib/ebus/symbol.cpp index 51b00b3d..44045328 100644 --- a/src/lib/ebus/symbol.cpp +++ b/src/lib/ebus/symbol.cpp @@ -175,7 +175,7 @@ result_t SymbolString::push_back(const unsigned char value, const bool isEscaped addCRC(value); m_unescapeState = 2; - return RESULT_IN_ESC; + return RESULT_CONTINUE; } if (updateCRC) addCRC(value);