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

allow querying for first field in hasField(), support cloning message for conditions with specific destination address, support message seen check in condition, fix for parsing destination address in condition, more error messages

Browse Source
This commit is contained in:
john30
2015-10-18 12:11:12 +02:00
parent f02eee616a
commit c2c3462134
2 changed files with 84 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/message.h
+16 -5
View File
@@ -105,6 +105,13 @@ public:
vector< vector<string> >* defaultsRows, Condition* condition, const string& filename,
DataFieldTemplates* templates, vector<Message*>& messages);
/**
* Derive a new @a Message from this message.
* @param dstAddress the new destination address.
* @return the derived @a Message instance.
*/
Message* derive(const unsigned char dstAddress);
/**
* Get the optional circuit name.
* @return the optional circuit name.
@@ -192,7 +199,7 @@ public:
/**
* Return whether the field is available.
* @param fieldName the name of the field to find.
* @param fieldName the name of the field to find, or NULL for any.
* @param numeric true for a numeric field, false for a string field.
* @return true if the field is available.
*/
@@ -490,12 +497,13 @@ public:
* Construct a new instance.
* @param circuit the circuit name.
* @param name the message name.
* @param dstAddress the override destination address, or @a SYN (only for @a Message without specific destination).
* @param field the field name.
* @param valueRanges the valid value ranges (pairs of from/to inclusive).
* @param valueRanges the valid value ranges (pairs of from/to inclusive), empty for @a m_message seen check.
*/
SimpleCondition(const string circuit, const string name, const string field, const vector<unsigned int> valueRanges)
SimpleCondition(const string circuit, const string name, const unsigned char dstAddress, const string field, const vector<unsigned int> valueRanges)
: Condition(),
m_circuit(circuit), m_name(name), m_field(field), m_valueRanges(valueRanges),
m_circuit(circuit), m_name(name), m_dstAddress(dstAddress), m_field(field), m_valueRanges(valueRanges),
m_message(NULL) { }
/**
@@ -528,10 +536,13 @@ private:
/** the message name. */
const string m_name;
/** the override destination address, or @a SYN (only for @a Message without specific destination). */
const unsigned char m_dstAddress;
/** the field name, or empty for first field. */
const string m_field;
/** the valid value ranges (pairs of from/to inclusive). */
/** the valid value ranges (pairs of from/to inclusive), empty for @a m_message seen check. */
const vector<unsigned int> m_valueRanges;
/** the resolved @a Message instance, or NULL. */