diff options
author | Karsten Heimrich <karsten.heimrich@qt.io> | 2018-04-20 10:58:54 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2018-04-20 12:13:31 +0000 |
commit | ec78312f92a59aab3b71de4cdbb98d715387c0a3 (patch) | |
tree | b1c7c84d0f710968c37293176b1cab1d189433f7 /examples | |
parent | 74afccd3826ef19667ea51466855494ded77f11c (diff) |
Create qknxlinklayerframe builder
Change-Id: I720882e2702cbab5c6d71ceb5058928d29f581ec
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/knx/knxeditor/tunneling.cpp | 7 | ||||
-rw-r--r-- | examples/knx/tunnelclient/main.cpp | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/examples/knx/knxeditor/tunneling.cpp b/examples/knx/knxeditor/tunneling.cpp index aa29e9f..3c06661 100644 --- a/examples/knx/knxeditor/tunneling.cpp +++ b/examples/knx/knxeditor/tunneling.cpp @@ -55,6 +55,7 @@ #include <QMetaType> #include <QStandardItemModel> #include <QTreeView> +#include <QtKnx/QKnxLinkLayerFrameBuilder> // -- KnxAddressValidator @@ -121,7 +122,11 @@ Tunneling::Tunneling(QWidget* parent) ui->textOuputTunneling->append(tr("Send tunnel frame with cEMI payload: ") + ui->cemiFrame->text()); auto data = QKnxByteArray::fromHex(ui->cemiFrame->text().toLatin1()); - m_tunnel.sendTunnelFrame(QKnxLinkLayerFrame::fromBytes(data, 0, data.size())); + auto frame = QKnxLinkLayerFrameBuilder() + .setData(data) + .setMedium(QKnx::MediumType::NetIP) + .createFrame(); + m_tunnel.sendTunnelFrame(frame); }); connect(&m_tunnel, &QKnxNetIpTunnelConnection::receivedTunnelFrame, this, diff --git a/examples/knx/tunnelclient/main.cpp b/examples/knx/tunnelclient/main.cpp index 9f7ddda..6ba7f69 100644 --- a/examples/knx/tunnelclient/main.cpp +++ b/examples/knx/tunnelclient/main.cpp @@ -53,6 +53,7 @@ #include <QtCore/QCoreApplication> #include <QtKnx/QKnxByteArray> #include <QtKnx/QKnxNetIpTunnelConnection> +#include <QtKnx/QKnxLinkLayerFrameBuilder> #include <QtNetwork/QNetworkInterface> #ifdef Q_OS_WIN @@ -106,7 +107,11 @@ int main(int argc, char *argv[]) auto tmp = input.readLine().toLatin1(); if (tmp != "quit") { const auto bytes = QKnxByteArray::fromHex(tmp); - tunnel.sendTunnelFrame(QKnxLinkLayerFrame::fromBytes(bytes, 0, bytes.size())); + auto frame = QKnxLinkLayerFrameBuilder() + .setData(bytes) + .setMedium(QKnx::MediumType::NetIP) + .createFrame(); + tunnel.sendTunnelFrame(frame); } else { tunnel.disconnectFromHost(); } |