From a5ffaf89a22e8713a688ecca7ddd647f750f95b6 Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 2 Jan 2016 12:13:59 +0100 Subject: [PATCH] fix for previous commit --- src/lib/ebus/message.cpp | 6 +++--- src/lib/ebus/message.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/ebus/message.cpp b/src/lib/ebus/message.cpp index 898b9bc4..f8a17cab 100644 --- a/src/lib/ebus/message.cpp +++ b/src/lib/ebus/message.cpp @@ -378,7 +378,7 @@ result_t Message::create(vector::iterator& it, const vector::ite return RESULT_OK; } -Message* Message::derive(const unsigned char dstAddress, unsigned char srcAddress=SYN) +Message* Message::derive(const unsigned char dstAddress, unsigned char srcAddress) { return new Message(m_circuit, m_name, m_isWrite, m_isPassive, m_comment, @@ -746,10 +746,10 @@ ChainedMessage::~ChainedMessage() free(m_lastSlaveUpdateTimes); } -Message* ChainedMessage::derive(const unsigned char dstAddress) +Message* ChainedMessage::derive(const unsigned char dstAddress, unsigned char srcAddress) { return new ChainedMessage(m_circuit, m_name, m_isWrite, - m_comment, m_srcAddress, dstAddress, m_id, + m_comment, srcAddress==SYN ? m_srcAddress : srcAddress, dstAddress, m_id, m_ids, m_lengths, m_data, false, m_pollPriority, m_condition); } diff --git a/src/lib/ebus/message.h b/src/lib/ebus/message.h index 37e1c34e..9e7148dd 100644 --- a/src/lib/ebus/message.h +++ b/src/lib/ebus/message.h @@ -145,7 +145,7 @@ public: * @param srcAddress the new source address, or @a SYN to keep the current source address. * @return the derived @a Message instance. */ - virtual Message* derive(const unsigned char dstAddress, unsigned char srcAddress); + virtual Message* derive(const unsigned char dstAddress, unsigned char srcAddress=SYN); /** * Get the optional circuit name. @@ -548,7 +548,7 @@ public: virtual ~ChainedMessage(); // @copydoc - virtual Message* derive(const unsigned char dstAddress); + virtual Message* derive(const unsigned char dstAddress, unsigned char srcAddress=SYN); // @copydoc virtual unsigned char getIdLength() const { return (unsigned char)(m_ids[0].size() - 2); }