chore: do something make ble happy

Author: x-tools-author

src/LinksUi/BLECenterUi.cpp

@@ -11,7 +11,7 @@
 #include <wx/gbsizer.h>
 #include <wx/string.h>
 
-#include "Utilities/BLEScanner.h"
+#include "Utilities/BLECenterManager.h"
 #include "Utilities/BaudRateComboBox.h"
 #include "Utilities/DataBitsComboBox.h"
 #include "Utilities/FlowBitsComboBox.h"
@@ -21,18 +21,29 @@
 
 #include "Links/BLECenter.h"
 
+class BLECenterUiPrivate
+{
+public:
+    BLECenterUiPrivate(BLECenterUi *q_ptr)
+        : q(q_ptr)
+    {}
+
+    ~BLECenterUiPrivate() = default;
+
+public:
+    BLECenterManager *m_bleMgr{nullptr};
+
+private:
+    BLECenterUi *q{nullptr};
+};
+
 BLECenterUi::BLECenterUi(wxWindow *parent)
     : LinkUi(parent)
-    , m_portNameComboBox(nullptr)
-    , m_baudRateComboBox(nullptr)
-    , m_dataBitsComboBox(nullptr)
-    , m_stopBitsComboBox(nullptr)
-    , m_parityComboBox(nullptr)
-    , m_flowBitsComboBox(nullptr)
 {
-    m_bleScanner = new BLEScanner(parent);
-    Add(m_bleScanner, wxGBPosition(0, 0), wxGBSpan(1, 2), wxEXPAND | wxALL, 0);
-
+    d = new BLECenterUiPrivate(this);
+    d->m_bleMgr = new BLECenterManager(parent);
+    Add(d->m_bleMgr, wxGBPosition(0, 0), wxGBSpan(1, 2), wxEXPAND | wxALL, 0);
+#if 0
     m_portNameComboBox = new PortNameComboBox(parent);
     m_baudRateComboBox = new BaudRateComboBox(parent);
     m_dataBitsComboBox = new DataBitsComboBox(parent);
@@ -46,6 +57,7 @@ BLECenterUi::BLECenterUi(wxWindow *parent)
     SetupComboBox(m_stopBitsComboBox, _("Stop bits"), 4, parent);
     SetupComboBox(m_parityComboBox, _("Parity"), 5, parent);
     SetupComboBox(m_flowBitsComboBox, _("Flow bits"), 6, parent);
+#endif
 
     AddGrowableCol(1);
 }
@@ -55,76 +67,30 @@ BLECenterUi::~BLECenterUi()
     delete dynamic_cast<BLECenter *>(GetLink());
 }
 
-void BLECenterUi::Disable()
-{
-    m_portNameComboBox->Disable();
-    m_baudRateComboBox->Disable();
-    m_dataBitsComboBox->Disable();
-    m_stopBitsComboBox->Disable();
-    m_flowBitsComboBox->Disable();
-    m_parityComboBox->Disable();
-}
+void BLECenterUi::Disable() {}
 
-void BLECenterUi::Enable()
-{
-    m_portNameComboBox->Enable();
-    m_baudRateComboBox->Enable();
-    m_dataBitsComboBox->Enable();
-    m_stopBitsComboBox->Enable();
-    m_flowBitsComboBox->Enable();
-    m_parityComboBox->Enable();
-}
+void BLECenterUi::Enable() {}
 
 wxtJson BLECenterUi::DoSave() const
 {
     nlohmann::json json = nlohmann::json(nlohmann::json::object());
     BLECenterParameterKeys keys;
-    json[keys.portName] = m_portNameComboBox->GetPortName().ToStdString();
-    json[keys.baudRate] = static_cast<int>(m_baudRateComboBox->GetBaudRate());
-    json[keys.dataBits] = static_cast<int>(m_dataBitsComboBox->GetDataBits());
-    json[keys.stopBits] = static_cast<int>(m_stopBitsComboBox->GetStopBits());
-    json[keys.flowControl] = static_cast<int>(m_flowBitsComboBox->GetFlowBits());
-    json[keys.parity] = static_cast<int>(m_parityComboBox->GetParity());
     return json;
 }
 
 void BLECenterUi::DoLoad(const wxtJson &json)
 {
     BLECenterParameterKeys keys;
-    // clang-format off
-    wxString portName = wxtGetJsonObjValue<std::string>(json, keys.portName, std::string(""));
-    int baudRate = wxtGetJsonObjValue<int>(json, keys.baudRate, 9600);
-    int dataBits = wxtGetJsonObjValue<int>(json, keys.dataBits, static_cast<int>(itas109::DataBits8));
-    int stopBits = wxtGetJsonObjValue<int>(json, keys.stopBits, static_cast<int>(itas109::StopOne));
-    int flowBits = wxtGetJsonObjValue<int>(json, keys.flowControl, static_cast<int>(itas109::FlowNone));
-    int parity = wxtGetJsonObjValue<int>(json, keys.parity, static_cast<int>(itas109::ParityNone));
-    // clang-format on
-
-    m_portNameComboBox->SetPortName(portName);
-    m_baudRateComboBox->SetBaudRate(baudRate);
-    m_dataBitsComboBox->SetDataBits(static_cast<itas109::DataBits>(dataBits));
-    m_stopBitsComboBox->SetStopBits(static_cast<itas109::StopBits>(stopBits));
-    m_flowBitsComboBox->SetFlowBits(static_cast<itas109::FlowControl>(flowBits));
-    m_parityComboBox->SetParity(static_cast<itas109::Parity>(parity));
 }
 
 void BLECenterUi::DoRefreshDevice()
 {
     if (GetLink()) {
         return;
     }
-
-    m_portNameComboBox->DoRefresh();
 }
 
 Link *BLECenterUi::NewLink()
 {
     return new BLECenter();
 }
-
-void BLECenterUi::SetupComboBox(wxComboBox *cb, const wxString &label, int row, wxWindow *parent)
-{
-    auto text = new wxStaticText(parent, wxID_ANY, label);
-    Add(text, wxGBPosition(row, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL | wxALL, 0);
-    Add(cb, wxGBPosition(row, 1), wxGBSpan(1, 1), wxEXPAND | wxALL, 0);
-}

src/LinksUi/BLECenterUi.h

@@ -10,15 +10,11 @@
 
 #include "LinkUi.h"
 
-class BLEScanner;
-class BaudRateComboBox;
-class DataBitsComboBox;
-class FlowBitsComboBox;
-class ParityComboBox;
-class PortNameComboBox;
-class StopBitsComboBox;
+class BLECenterUiPrivate;
 class BLECenterUi : public LinkUi
 {
+    BLECenterUiPrivate *d{nullptr};
+
 public:
     BLECenterUi(wxWindow *parent = nullptr);
     ~BLECenterUi();
@@ -31,16 +27,4 @@ class BLECenterUi : public LinkUi
 
 protected:
     Link *NewLink() override;
-
-private:
-    void SetupComboBox(wxComboBox *cb, const wxString &label, int row, wxWindow *parent);
-
-private:
-    BLEScanner *m_bleScanner;
-    PortNameComboBox *m_portNameComboBox;
-    BaudRateComboBox *m_baudRateComboBox;
-    DataBitsComboBox *m_dataBitsComboBox;
-    StopBitsComboBox *m_stopBitsComboBox;
-    FlowBitsComboBox *m_flowBitsComboBox;
-    ParityComboBox *m_parityComboBox;
 };

src/Utilities/BLEScanner.cpp src/Utilities/BLECenterManager.cppsrc/Utilities/BLEScanner.cpp renamed to src/Utilities/BLECenterManager.cpp

@@ -6,7 +6,7 @@
  * wxTools is licensed according to the terms in the file LICENCE(GPL V3) in the root of the source
  * code directory.
  **************************************************************************************************/
-#include "BLEScanner.h"
+#include "BLECenterManager.h"
 
 #include <wx/artprov.h>
 #include <wx/bmpbuttn.h>
@@ -19,18 +19,18 @@
 
 #include "Common/wxTools.h"
 
-IMPLEMENT_ABSTRACT_CLASS(BLEScanner, wxPanel)
-BEGIN_EVENT_TABLE(BLEScanner, wxPanel)
-EVT_THREAD(wxtID_SCAN_START, BLEScanner::onScanStart)
-EVT_THREAD(wxtID_SCAN_FOUND, BLEScanner::onScanFound)
-EVT_THREAD(wxtID_SCAN_UPDATED, BLEScanner::onScanUpdated)
-EVT_THREAD(wxtID_SCAN_STOP, BLEScanner::onScanStop)
+IMPLEMENT_ABSTRACT_CLASS(BLECenterManager, wxPanel)
+BEGIN_EVENT_TABLE(BLECenterManager, wxPanel)
+EVT_THREAD(wxtID_SCAN_START, BLECenterManager::onScanStart)
+EVT_THREAD(wxtID_SCAN_FOUND, BLECenterManager::onScanFound)
+EVT_THREAD(wxtID_SCAN_UPDATED, BLECenterManager::onScanUpdated)
+EVT_THREAD(wxtID_SCAN_STOP, BLECenterManager::onScanStop)
 END_EVENT_TABLE()
 
-class BLEScannerThread : public wxThread
+class BLECenterManagerThread : public wxThread
 {
 public:
-    BLEScannerThread(wxPanel *panel)
+    BLECenterManagerThread(wxPanel *panel)
         : wxThread(wxTHREAD_JOINABLE)
         , m_panel(panel)
     {}
@@ -70,7 +70,7 @@ class BLEScannerThread : public wxThread
 protected:
     ExitCode Entry() override
     {
-        SimpleBLE::Adapter adapter = BLEScannerThread::getAdapter();
+        SimpleBLE::Adapter adapter = BLECenterManagerThread::getAdapter();
         if (!adapter.initialized()) {
             wxtWarning() << "No BLE adapter found, scanning thread will exit.";
             return nullptr;
@@ -183,23 +183,25 @@ class BLEScannerThread : public wxThread
     wxPanel *m_panel{nullptr};
 };
 
-class BLEScannerPrivate
+class BLECenterManagerPrivate
 {
 public:
-    BLEScannerPrivate(BLEScanner *q_ptr)
+    BLECenterManagerPrivate(BLECenterManager *q_ptr)
         : q(q_ptr)
     {}
-    ~BLEScannerPrivate() = default;
+    ~BLECenterManagerPrivate() = default;
 
 public:
     wxComboBox *m_blePeripheralComboBox{nullptr};
-    wxBitmapButton *m_refreshButton{nullptr};
-    BLEScannerThread *m_thread{nullptr};
+    wxComboBox *m_bleServiceComboBox{nullptr};
+    wxComboBox *m_bleCharacteristicComboBox{nullptr};
+    wxComboBox *m_bleDescriptorComboBox{nullptr};
+    BLECenterManagerThread *m_thread{nullptr};
 
 public:
     void DoRefreshDevice()
     {
-        SimpleBLE::Adapter adapter = BLEScannerThread::getAdapter();
+        SimpleBLE::Adapter adapter = BLECenterManagerThread::getAdapter();
         if (!adapter.initialized()) {
             //wxMessageBox(_("No BLE adapter found."), _("Error"), wxOK | wxICON_ERROR);
             return;
@@ -211,59 +213,71 @@ class BLEScannerPrivate
             return;
         }
 
-        m_thread = new BLEScannerThread(q);
+        m_thread = new BLECenterManagerThread(q);
         m_thread->Create();
         m_thread->Run();
     }
 
+    void DoAddComboBox(wxGridBagSizer *sizer, const wxString &label, wxComboBox *control)
+    {
+        auto text = new wxStaticText(q, wxID_ANY, label);
+        sizer->Add(text,
+                   wxGBPosition(m_rowCount, 0),
+                   wxGBSpan(1, 1),
+                   wxALIGN_CENTER_VERTICAL | wxALL,
+                   0);
+        m_rowCount++;
+        sizer->Add(control, wxGBPosition(m_rowCount, 0), wxGBSpan(1, 1), wxEXPAND | wxALL, 0);
+        m_rowCount++;
+    }
+
 private:
-    BLEScanner *q{nullptr};
+    BLECenterManager *q{nullptr};
+    int m_rowCount{0};
 };
 
-BLEScanner::BLEScanner(wxWindow *parent)
+#define BLEComboBox \
+    wxComboBox(this, \
+               wxID_ANY, \
+               wxEmptyString, \
+               wxDefaultPosition, \
+               wxDefaultSize, \
+               0, \
+               nullptr, \
+               wxCB_READONLY)
+
+BLECenterManager::BLECenterManager(wxWindow *parent)
     : wxPanel(parent)
 {
     wxGridBagSizer *sizer = new wxGridBagSizer(0, 0);
     SetSizer(sizer);
 
-    d = new BLEScannerPrivate(this);
-    auto text = new wxStaticText(this, wxID_ANY, _("Peripheral"));
-    sizer->Add(text, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL | wxALL, 0);
-
-    wxBitmapBundle refreshIcon = wxArtProvider::GetBitmapBundle(wxART_REFRESH, wxART_BUTTON);
-    d->m_refreshButton = new wxBitmapButton(this, wxID_ANY, refreshIcon);
-    d->m_refreshButton->SetToolTip(_("Refresh BLE device list"));
-    d->m_refreshButton->Bind(wxEVT_BUTTON, [this](wxCommandEvent &event) { d->DoRefreshDevice(); });
-    d->m_refreshButton->Hide();
-    auto refreshSizer = new wxBoxSizer(wxHORIZONTAL);
-    refreshSizer->AddStretchSpacer();
-    refreshSizer->Add(d->m_refreshButton, 0, wxALIGN_CENTER_VERTICAL | wxALL, 0);
-    sizer->Add(refreshSizer, wxGBPosition(0, 1), wxGBSpan(1, 1), wxEXPAND | wxALL, 0);
-
-    d->m_blePeripheralComboBox = new wxComboBox(this,
-                                                wxID_ANY,
-                                                wxEmptyString,
-                                                wxDefaultPosition,
-                                                wxDefaultSize,
-                                                0,
-                                                nullptr,
-                                                wxCB_READONLY);
-    sizer->Add(d->m_blePeripheralComboBox, wxGBPosition(1, 0), wxGBSpan(1, 2), wxEXPAND | wxALL, 0);
-    sizer->AddGrowableCol(1);
+    d = new BLECenterManagerPrivate(this);
+    d->m_blePeripheralComboBox = new BLEComboBox;
+    d->m_bleServiceComboBox = new BLEComboBox;
+    d->m_bleCharacteristicComboBox = new BLEComboBox;
+    d->m_bleDescriptorComboBox = new BLEComboBox;
+
+    d->DoAddComboBox(sizer, _("Peripheral"), d->m_blePeripheralComboBox);
+    d->DoAddComboBox(sizer, _("Service"), d->m_bleServiceComboBox);
+    d->DoAddComboBox(sizer, _("Characteristic"), d->m_bleCharacteristicComboBox);
+    d->DoAddComboBox(sizer, _("Descriptor"), d->m_bleDescriptorComboBox);
+
+    sizer->AddGrowableCol(0);
     d->DoRefreshDevice();
 }
 
-BLEScanner::~BLEScanner()
+BLECenterManager::~BLECenterManager()
 {
     // Nothing to do yet...
 }
 
-void BLEScanner::onScanStart(wxThreadEvent &e)
+void BLECenterManager::onScanStart(wxThreadEvent &e)
 {
     wxtInfo() << "Scan started.";
 }
 
-void BLEScanner::onScanFound(wxThreadEvent &e)
+void BLECenterManager::onScanFound(wxThreadEvent &e)
 {
     wxtBlePeripheralItem item = e.GetPayload<wxtBlePeripheralItem>();
     if (item.identifier.IsEmpty()) {
@@ -279,7 +293,7 @@ void BLEScanner::onScanFound(wxThreadEvent &e)
     }
 }
 
-void BLEScanner::onScanUpdated(wxThreadEvent &e)
+void BLECenterManager::onScanUpdated(wxThreadEvent &e)
 {
     // Update existing item
     wxtBlePeripheralItem item = e.GetPayload<wxtBlePeripheralItem>();
@@ -300,7 +314,7 @@ void BLEScanner::onScanUpdated(wxThreadEvent &e)
     onScanFound(e);
 }
 
-void BLEScanner::onScanStop(wxThreadEvent &e)
+void BLECenterManager::onScanStop(wxThreadEvent &e)
 {
     wxtInfo() << "Scan stopped.";
 }

src/Utilities/BLEScanner.h src/Utilities/BLECenterManager.hsrc/Utilities/BLEScanner.h renamed to src/Utilities/BLECenterManager.h

@@ -23,21 +23,21 @@ struct wxtBlePeripheralItem
     int rssi;
 };
 
-class BLEScannerPrivate;
-class BLEScanner : public wxPanel
+class BLECenterManagerPrivate;
+class BLECenterManager : public wxPanel
 {
-    BLEScannerPrivate *d{nullptr};
+    BLECenterManagerPrivate *d{nullptr};
 
 public:
-    BLEScanner(wxWindow *parent);
-    ~BLEScanner() override;
+    BLECenterManager(wxWindow *parent);
+    ~BLECenterManager() override;
 
     void onScanStart(wxThreadEvent &e);
     void onScanFound(wxThreadEvent &e);
     void onScanUpdated(wxThreadEvent &e);
     void onScanStop(wxThreadEvent &e);
 
 private:
-    DECLARE_DYNAMIC_CLASS(BLEScanner);
+    DECLARE_DYNAMIC_CLASS(BLECenterManager);
     DECLARE_EVENT_TABLE();
 };