added chained messages, adjusted to message.h, small fix for find formatting use named objects for JSON fields instead of array (or numbered if field names are not unique), fix for JSON output when decoding failed

2015-12-27 22:57:11 +01:00
parent a059c9d3de
commit bcd6eb57fe
2 changed files with 48 additions and 44 deletions
@@ -107,13 +107,11 @@ private:
 	/**
 	 * Prepare the master part for the @a Message, send it to the bus and wait for the answer.
 	 * @param message the @a Message instance.
-	 * @param master the master data @a SymbolString for writing symbols to.
 	 * @param inputStr the input @a string from which to read master values (if any).
-	 * @param slave the @a SymbolString that will be filled with retrieved slave data.
 	 * @param dstAddress the destination address to set, or @a SYN to keep the address defined during construction.
 	 * @return the result code.
 	 */
-	result_t readFromBus(Message* message, SymbolString& master, string inputStr, SymbolString& slave, const unsigned char dstAddress=SYN);
+	result_t readFromBus(Message* message, string inputStr, const unsigned char dstAddress=SYN);

 	/**
 	 * Execute the read command.