nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch ";" and "," but keep ";" for values shown in/parsed from UI, added todos, removed "p" for poll (use 1-9 instead), formatting

Browse Source
This commit is contained in:
john30
2014-12-10 23:11:34 +01:00
parent d36b024876
commit 0bd7df2ce1
6 changed files with 190 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/data.h
+21 -8
View File
@@ -31,7 +31,20 @@
using namespace std;
#define FIELD_SEPARATOR ';'
/** the separator character used between fields (in CSV only). */
#define FIELD_SEPARATOR ','
/** the separator character used between multiple values (in CSV only). */
#define VALUE_SEPARATOR ';'
/** the separator character used between base type name and length (in CSV only). */
#define LENGTH_SEPARATOR ':'
/** the replacement string for undefined values (in UI and CSV). */
#define NULL_VALUE "-"
/** the separator character used between fields (in UI only). */
#define UI_FIELD_SEPARATOR ';'
/** the message part in which a data field is stored. */
enum PartType {
@@ -90,7 +103,7 @@ unsigned int parseInt(const char* str, int base, const unsigned int minValue, co
* @param pos the iterator with the erroneous position.
* @param separator the character to place between items.
*/
void printErrorPos(vector<string>::iterator begin, const vector<string>::iterator end, vector<string>::iterator pos, char separator=';');
void printErrorPos(vector<string>::iterator begin, const vector<string>::iterator end, vector<string>::iterator pos);
class DataFieldTemplates;
@@ -178,7 +191,7 @@ public:
virtual result_t read(const PartType partType,
SymbolString& data, unsigned char offset,
ostringstream& output, bool leadingSeparator=false,
bool verbose=false, char separator=';') = 0;
bool verbose=false, char separator=UI_FIELD_SEPARATOR) = 0;
/**
* @brief Writes the value to the master or slave @a SymbolString.
* @param input the @a istringstream to parse the formatted value from.
@@ -190,7 +203,7 @@ public:
*/
virtual result_t write(istringstream& input,
const PartType partType, SymbolString& data,
unsigned char offset, char separator=';') = 0;
unsigned char offset, char separator=UI_FIELD_SEPARATOR) = 0;
protected:
@@ -259,11 +272,11 @@ public:
virtual result_t read(const PartType partType,
SymbolString& data, unsigned char offset,
ostringstream& output, bool leadingSeparator=false,
bool verbose=false, char separator=';');
bool verbose=false, char separator=UI_FIELD_SEPARATOR);
// @copydoc
virtual result_t write(istringstream& input,
const PartType partType, SymbolString& data,
unsigned char offset, char separator=';');//TODO replace
unsigned char offset, char separator=UI_FIELD_SEPARATOR);
protected:
@@ -553,11 +566,11 @@ public:
virtual result_t read(const PartType partType,
SymbolString& data, unsigned char offset,
ostringstream& output, bool leadingSeparator=false,
bool verbose=false, char separator=';');
bool verbose=false, char separator=UI_FIELD_SEPARATOR);
// @copydoc
virtual result_t write(istringstream& input,
const PartType partType, SymbolString& data,
unsigned char offset, char separator=';');
unsigned char offset, char separator=UI_FIELD_SEPARATOR);
private: