Read binding table keyboard shortcut Ctrl+B

Note prior to version 2.05.81 the dialog needs to have active focus to trigger the action.

Author: manup

bindings.cpp

@@ -123,7 +123,10 @@ bool DeRestPluginPrivate::readBindingTable(RestNodeBase *node, quint8 startIndex
     Resource *r = dynamic_cast<Resource*>(node);
 
     // whitelist
-    if (checkMacVendor(node->address(), VENDOR_DDEL))
+    if (node->mgmtBindSupported())
+    {
+    }
+    else if (checkMacVendor(node->address(), VENDOR_DDEL))
     {
     }
     else if (checkMacVendor(node->address(), VENDOR_UBISYS))

de_web_plugin.cpp

@@ -16777,7 +16777,7 @@ QDialog *DeRestPlugin::createDialog()
 {
     if (!m_w)
     {
-        m_w = new DeRestWidget(0);
+        m_w = new DeRestWidget(nullptr, this);
     }
 
     return m_w;

de_web_plugin.h

@@ -68,11 +68,12 @@ public Q_SLOTS:
     void nodeUpdated(quint64 extAddress, QString key, QString value);
 
 private:
-    QTimer *m_idleTimer;
-    QTimer *m_readAttributesTimer;
+    QTimer *m_idleTimer = nullptr;
+    QTimer *m_readAttributesTimer = nullptr;
     State m_state;
-    DeRestWidget *m_w;
-    DeRestPluginPrivate *d;
+    friend class DeRestWidget;
+    DeRestWidget *m_w = nullptr;
+    DeRestPluginPrivate *d = nullptr;
 };
 
 #endif // REST_PLUGIN_H

de_web_widget.cpp

@@ -8,19 +8,22 @@
  *
  */
 
+#include <QAction>
 #include <QLabel>
 #include <QNetworkInterface>
 #include "de_web_plugin.h"
+#include "de_web_plugin_private.h"
 #include "de_web_widget.h"
 #include "ui_de_web_widget.h"
 
 /*! Constructor. */
-DeRestWidget::DeRestWidget(QWidget *parent) :
+DeRestWidget::DeRestWidget(QWidget *parent, DeRestPlugin *_plugin) :
     QDialog(parent),
-    ui(new Ui::DeWebWidget)
+    ui(new Ui::DeWebWidget),
+    plugin(_plugin)
 {
     ui->setupUi(this);
-    setWindowTitle(tr("DE REST API"));
+    setWindowTitle(tr("DE REST-API"));
     deCONZ::ApsController *apsCtrl = deCONZ::ApsController::instance();
 
     quint16 httpPort = apsCtrl ? deCONZ::ApsController::instance()->getParameter(deCONZ::ParamHttpPort) : 0;
@@ -77,6 +80,15 @@ DeRestWidget::DeRestWidget(QWidget *parent) :
     }
 
     ui->ipAddressesLabel->setText(str);
+
+    //
+    connect(deCONZ::ApsController::instance(), &deCONZ::ApsController::nodeEvent, this, &DeRestWidget::nodeEvent);
+
+    // keyboard shortcuts
+    auto *readBindingTableAction = new QAction(tr("Read binding table"), this);
+    readBindingTableAction->setShortcut(Qt::CTRL + Qt::Key_B);
+    connect(readBindingTableAction, &QAction::triggered, this, &DeRestWidget::readBindingTableTriggered);
+    addAction(readBindingTableAction);
 }
 
 /*! Deconstructor. */
@@ -97,6 +109,42 @@ bool DeRestWidget::pluginActive() const
     return false;
 }
 
+void DeRestWidget::readBindingTableTriggered()
+{
+    if (m_selectedNodeAddress.hasExt())
+    {
+
+        auto *restNode = dynamic_cast<RestNodeBase*>(plugin->d->getLightNodeForAddress(m_selectedNodeAddress));
+
+        if (!restNode)
+        {
+            restNode = dynamic_cast<RestNodeBase*>(plugin->d->getSensorNodeForAddress(m_selectedNodeAddress));
+        }
+
+        if (restNode)
+        {
+            restNode->setMgmtBindSupported(true);
+            DBG_Printf(DBG_INFO, "read binding table for %s (%s) \n", qPrintable(m_selectedNodeAddress.toStringExt()), qPrintable(m_selectedNodeAddress.toStringNwk()));
+            plugin->d->readBindingTable(restNode, 0);
+        }
+    }
+}
+
+void DeRestWidget::nodeEvent(const deCONZ::NodeEvent &event)
+{
+    if (event.node())
+    {
+        if (event.event() == deCONZ::NodeEvent::NodeSelected)
+        {
+            m_selectedNodeAddress = event.node()->address();
+        }
+        else if (event.event() == deCONZ::NodeEvent::NodeSelected)
+        {
+            m_selectedNodeAddress = {};
+        }
+    }
+}
+
 void DeRestWidget::showEvent(QShowEvent *)
 {
     deCONZ::ApsController *apsCtrl = deCONZ::ApsController::instance();

de_web_widget.h

@@ -12,25 +12,32 @@
 #define DE_WEB_WIDGET_H
 
 #include <QDialog>
+#include <deconz.h>
 
 namespace Ui {
 class DeWebWidget;
 }
 
+class DeRestPlugin;
+
 class DeRestWidget : public QDialog
 {
     Q_OBJECT
 
 public:
-    explicit DeRestWidget(QWidget *parent);
+    explicit DeRestWidget(QWidget *parent, DeRestPlugin *_plugin);
     ~DeRestWidget();
     bool pluginActive() const;
 
-public Q_SLOTS:
+private Q_SLOTS:
+    void readBindingTableTriggered();
+    void nodeEvent(const deCONZ::NodeEvent &event);
 
 private:
     void showEvent(QShowEvent *);
-    Ui::DeWebWidget *ui;
+    deCONZ::Address m_selectedNodeAddress;
+    Ui::DeWebWidget *ui = nullptr;
+    DeRestPlugin *plugin = nullptr;
 };
 
 #endif // DE_WEB_WIDGET_H