plugins: mcumgr: Updates and fixes to bluetooth form and connection

Author: thedjnK

plugins/mcumgr/bluetooth_setup.cpp

@@ -28,6 +28,9 @@ bluetooth_setup::bluetooth_setup(QWidget *parent) :
     ui(new Ui::bluetooth_setup)
 {
     ui->setupUi(this);
+    ui->btn_connect->setEnabled(false);
+    ui->btn_disconnect->setEnabled(false);
+    ui->btn_refresh->setEnabled(false);
 }
 
 bluetooth_setup::~bluetooth_setup()
@@ -78,3 +81,37 @@ void bluetooth_setup::add_debug(QString data)
     ui->edit_debug->appendPlainText(data);
 }
 
+void bluetooth_setup::discovery_state(bool started)
+{
+    ui->btn_refresh->setEnabled(!started);
+
+    if (started == true)
+    {
+        ui->btn_connect->setEnabled(false);
+        ui->btn_disconnect->setEnabled(false);
+    }
+}
+
+void bluetooth_setup::connection_state(bool connected)
+{
+    ui->btn_connect->setEnabled(!connected);
+    ui->btn_disconnect->setEnabled(connected);
+    ui->btn_refresh->setEnabled(!connected);
+}
+
+void bluetooth_setup::on_list_devices_currentRowChanged(int row)
+{
+    if (row >= 0)
+    {
+        bool scanning;
+        bool connecting;
+
+        emit bluetooth_status(&scanning, &connecting);
+
+        ui->btn_connect->setEnabled((connecting == false ? true : false));
+    }
+    else
+    {
+        ui->btn_connect->setEnabled(false);
+    }
+}

plugins/mcumgr/bluetooth_setup.h

@@ -40,18 +40,22 @@ class bluetooth_setup : public QDialog
     void clear_devices();
     void add_device(QString *data);
     void add_debug(QString data);
+    void discovery_state(bool started);
+    void connection_state(bool connected);
 
 private slots:
     void on_btn_refresh_clicked();
     void on_btn_connect_clicked();
     void on_btn_disconnect_clicked();
     void on_btn_close_clicked();
     void on_list_devices_itemDoubleClicked(QListWidgetItem *item);
+    void on_list_devices_currentRowChanged(int row);
 
 signals:
     void refresh_devices();
     void connect_to_device(uint16_t index);
     void disconnect_from_device();
+    void bluetooth_status(bool *scanning, bool *connecting);
 
 private:
     Ui::bluetooth_setup *ui;

plugins/mcumgr/bluetooth_setup.ui

@@ -24,6 +24,9 @@
    </property>
   </widget>
   <widget class="QPushButton" name="btn_refresh">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="geometry">
     <rect>
      <x>20</x>
@@ -37,6 +40,9 @@
    </property>
   </widget>
   <widget class="QPushButton" name="btn_connect">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="geometry">
     <rect>
      <x>100</x>
@@ -50,6 +56,9 @@
    </property>
   </widget>
   <widget class="QPushButton" name="btn_disconnect">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="geometry">
     <rect>
      <x>180</x>

plugins/mcumgr/smp_bluetooth.cpp

@@ -60,6 +60,7 @@ smp_bluetooth::smp_bluetooth(QObject *parent)
     QObject::connect(bluetooth_window, SIGNAL(refresh_devices()), this, SLOT(form_refresh_devices()));
     QObject::connect(bluetooth_window, SIGNAL(connect_to_device(uint16_t)), this, SLOT(form_connect_to_device(uint16_t)));
     QObject::connect(bluetooth_window, SIGNAL(disconnect_from_device()), this, SLOT(form_disconnect_from_device()));
+    QObject::connect(bluetooth_window, SIGNAL(bluetooth_status(bool*,bool*)), this, SLOT(form_bluetooth_status(bool*,bool*)));
 
     discoveryAgent = new QBluetoothDeviceDiscoveryAgent();
     discoveryAgent->setLowEnergyDiscoveryTimeout(8000);
@@ -132,6 +133,7 @@ void smp_bluetooth::deviceUpdated(const QBluetoothDeviceInfo &info, QBluetoothDe
 void smp_bluetooth::finished()
 {
     bluetooth_window->add_debug("Discovery finished");
+    bluetooth_window->discovery_state(false);
 }
 
 void smp_bluetooth::connected()
@@ -174,6 +176,8 @@ void smp_bluetooth::disconnected()
 
         controller = nullptr;
     }
+
+    bluetooth_window->connection_state(false);
 }
 
 void smp_bluetooth::discovery_finished()
@@ -299,7 +303,81 @@ void smp_bluetooth::mcumgr_service_state_changed(QLowEnergyService::ServiceState
 
 void smp_bluetooth::errorz(QLowEnergyController::Error error)
 {
-    bluetooth_window->add_debug(QString::number(error));
+    bool disconnect_from_device = false;
+    QString err;
+    switch (error) {
+        case QLowEnergyController::NoError:
+    {
+        err = "No error";
+        break;
+    }
+        case QLowEnergyController::UnknownError:
+    {
+        disconnect_from_device = true;
+        err = "Unknown error";
+        break;
+        }
+        case QLowEnergyController::UnknownRemoteDeviceError:
+    {
+            disconnect_from_device = true;
+            err = "Unknown remote device";
+            break;
+        }
+        case QLowEnergyController::NetworkError:
+    {
+            disconnect_from_device = true;
+            err = "Network error";
+            break;
+        }
+        case QLowEnergyController::InvalidBluetoothAdapterError:
+    {
+            disconnect_from_device = true;
+            err = "Invalud bluetooth adapter";
+            break;
+        }
+        case QLowEnergyController::ConnectionError:
+    {
+            disconnect_from_device = true;
+            err = "Connection error";
+            break;
+        }
+        case QLowEnergyController::AdvertisingError:
+    {
+            err = "Advertising error";
+            break;
+        }
+        case QLowEnergyController::RemoteHostClosedError:
+    {
+            disconnect_from_device = true;
+            err = "Remote host closed";
+            break;
+        }
+        case QLowEnergyController::AuthorizationError:
+    {
+            err = "Authorisation error";
+            break;
+        }
+        default:
+    {
+        err = "Other";
+        break;
+    }
+        };
+//    bluetooth_window->add_debug(QString::number(error));
+    bluetooth_window->add_debug(err);
+
+        if (disconnect_from_device == true)
+    {
+        if (device_connected == true)
+            {
+        disconnect(true);
+        }
+        else
+        {
+        bluetooth_window->discovery_state(false);
+        bluetooth_window->connection_state(false);
+        }
+    }
 }
 
 int smp_bluetooth::is_connected()
@@ -320,6 +398,11 @@ void smp_bluetooth::connection_updated(QLowEnergyConnectionParameters parameters
 
 int smp_bluetooth::send(smp_message *message)
 {
+    if (device_connected == false)
+    {
+        return -1;
+    }
+
     retry_count = 0;
     sendbuffer.clear();
 
@@ -375,6 +458,11 @@ void smp_bluetooth::mcumgr_service_error(QLowEnergyService::ServiceError error)
 
 void smp_bluetooth::form_refresh_devices()
 {
+    if (device_connected == true)
+    {
+        return;
+    }
+
     bluetooth_window->clear_devices();
     bluetooth_device_list.clear();
 
@@ -384,10 +472,16 @@ void smp_bluetooth::form_refresh_devices()
     }
 
     discoveryAgent->start();
+    bluetooth_window->discovery_state(true);
 }
 
 void smp_bluetooth::form_connect_to_device(uint16_t index)
 {
+    if (discoveryAgent->isActive())
+    {
+        discoveryAgent->stop();
+    }
+
     if (controller)
     {
         QObject::disconnect(controller, SIGNAL(connected()), this, SLOT(connected()));
@@ -421,18 +515,30 @@ void smp_bluetooth::form_connect_to_device(uint16_t index)
     //         controller->setRemoteAddressType(QLowEnergyController::PublicAddress);
     //     }
     controller->connectToDevice();
+
+    bluetooth_window->connection_state(true);
 }
 
 void smp_bluetooth::form_disconnect_from_device()
 {
-    controller->disconnectFromDevice();
+    if (device_connected == true)
+    {
+        controller->disconnectFromDevice();
+    }
 }
 
-
 int smp_bluetooth::connect()
 {
     bluetooth_window->show();
-    discoveryAgent->start();
+
+    if (device_connected == false)
+    {
+        bluetooth_window->clear_devices();
+        bluetooth_device_list.clear();
+        discoveryAgent->start();
+        bluetooth_window->discovery_state(true);
+    }
+
     return 0;
 }
 
@@ -442,6 +548,10 @@ int smp_bluetooth::disconnect(bool force)
     {
         controller->disconnectFromDevice();
     }
+    else
+    {
+        bluetooth_window->connection_state(false);
+    }
 
     return 0;
 }
@@ -473,3 +583,9 @@ void smp_bluetooth::close_connect_dialog()
         bluetooth_window->close();
     }
 }
+
+void smp_bluetooth::form_bluetooth_status(bool *scanning, bool *connecting)
+{
+    *scanning = discoveryAgent->isActive();
+    *connecting = device_connected;
+}

plugins/mcumgr/smp_bluetooth.h

@@ -69,6 +69,7 @@ private slots:
     void form_refresh_devices();
     void form_connect_to_device(uint16_t index);
     void form_disconnect_from_device();
+    void form_bluetooth_status(bool *scanning, bool *connecting);
 //    void connection_updated(QLowEnergyConnectionParameters parameters);
 
 signals: