Port modbus from Qt to libuv

CMakeLists.txt

@@ -19,13 +19,12 @@ option(BUILD_TESTS "Build test programs" OFF)
 
 find_package(Threads)
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network SerialBus REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network REQUIRED)
 
 add_subdirectory(src/cli)
 add_subdirectory(src/common)
 add_subdirectory(src/config)
 add_subdirectory(src/fronius)
-add_subdirectory(src/http)
 #add_subdirectory(src/influx)
 add_subdirectory(src/modbus)
 add_subdirectory(src/mqtt)

README.md

@@ -63,10 +63,7 @@ sudo apt install \
   git \
   snapd \
   libboost-dev \
-  libcurl4-openssl-dev \
-  libqt6serialbus6-bin \
-  qt6-serialbus-dev \
-  qt6-serialport-dev
+  qt6-base-dev
 
 sudo snap install flutter --classic
 flutter   # init flutter first

src/cli/CMakeLists.txt

@@ -1,8 +1,8 @@
 FetchContent_Declare(clipp
-    URL https://github.com/muellan/clipp/archive/refs/tags/v1.2.3.tar.gz
+  URL https://github.com/muellan/clipp/archive/refs/tags/v1.2.3.tar.gz
 )
 if(NOT clipp_POPULATED)
-    FetchContent_Populate(clipp)
+  FetchContent_Populate(clipp)
 endif()
 
 add_library(cli STATIC

src/common/Asio.cpp

@@ -0,0 +1,14 @@
+#include "Asio.h"
+
+Asio* Asio::instance() {
+    if (!_instance) _instance = new Asio();
+    return _instance;
+}
+
+asio::io_context& Asio::ioc() {
+    return _ioc;
+}
+
+Asio::Asio() {
+}
+

src/common/Asio.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <asio/io_context.hpp>
+
+#define _asio Asio::instance()
+
+class Asio {
+public:
+    static Asio* instance();
+
+    asio::io_context& ioc();
+
+private:
+    Asio();
+
+    static inline Asio* _instance = nullptr;
+
+    asio::io_context _ioc;
+};

src/common/CMakeLists.txt

@@ -55,7 +55,6 @@ PUBLIC
   ${CMAKE_DL_LIBS}
   Qt${QT_VERSION_MAJOR}::Core
   Qt${QT_VERSION_MAJOR}::Network
-  Qt${QT_VERSION_MAJOR}::SerialBus
   magic_enum
   rpp
   rppqt

src/config/CMakeLists.txt

@@ -1,10 +1,10 @@
 include(FetchContent)
 
 FetchContent_Declare(toml11
-    URL https://github.com/ToruNiina/toml11/archive/refs/tags/v3.7.1.tar.gz
+  URL https://github.com/ToruNiina/toml11/archive/refs/tags/v3.7.1.tar.gz
 )
 if(NOT toml11_POPULATED)
-    FetchContent_Populate(toml11)
+  FetchContent_Populate(toml11)
 endif()
 
 add_library(config

src/fronius/FroniusDiscovery.cpp

@@ -6,17 +6,25 @@ using namespace sunspec;
 
 FroniusDiscovery::FroniusDiscovery(SunSpecDiscoveryPtr sunSpecDiscovery) :
     _sunSpecDiscovery(sunSpecDiscovery) {
-    _sunSpecDiscovery->thingDiscovered().subscribe([](ThingPtr thing) {
+    _sunSpecDiscovery->thingDiscovered().subscribe([this](ThingPtr thing) {
         auto sunSpecThing = std::static_pointer_cast<SunSpecThing>(thing);
 
-        if ((sunSpecThing->modbusUnitId() >= 1 &&
-             sunSpecThing->modbusUnitId() <= 100 &&
-             sunSpecThing->type() == Thing::Type::SolarInverter) ||
-                (sunSpecThing->modbusUnitId() >= 240 &&
-                 sunSpecThing->modbusUnitId() <= 244 &&
-                 sunSpecThing->type() == Thing::Type::SmartMeter)) {
-            LOG_S(INFO) << "potential thing found> " << "id: " << sunSpecThing->sunSpecId() <<
-                           ", modbusUnitId: " << sunSpecThing->modbusUnitId();
+        if ((sunSpecThing->unitId() >= 1 && sunSpecThing->unitId() <= 100 &&
+             sunSpecThing->type() == Thing::Type::SolarInverter)) {
+            onSolarInverterDiscovered(sunSpecThing);
+        } else if ((sunSpecThing->unitId() >= 240 && sunSpecThing->unitId() <= 244 &&
+                    sunSpecThing->type() == Thing::Type::SmartMeter)) {
+            onSmartMeterDiscovered(sunSpecThing);
         }
     });
 }
+
+void FroniusDiscovery::onSolarInverterDiscovered(SunSpecThingPtr thing) {
+    LOG_S(INFO) << "solar inverter found> " << "id: " << thing->sunSpecId() <<
+                   ", modbusUnitId: " << thing->unitId();
+}
+
+void FroniusDiscovery::onSmartMeterDiscovered(SunSpecThingPtr thing) {
+    LOG_S(INFO) << "smart meter found> " << "id: " << thing->sunSpecId() <<
+                   ", modbusUnitId: " << thing->unitId();
+}

src/fronius/FroniusDiscovery.h

@@ -2,10 +2,24 @@
 
 #include <things/sunspec/SunSpecDiscovery.h>
 
+/**
+ * This will discover further Fronius SunSpec things based on a previously
+ * discovered SunSpec thing.
+ *
+ * A Fronius solar inverter acts as a modbus/sunspec gateway and can house
+ * multiple sunspec things like smart meters and further solar inverters.
+ * However, the SunSpecDiscovery stops polling for valid SunSpec things after
+ * first valid unit per host.
+ * This class will check for further SunSpec things on a previously discovered
+ * SunSpec host.
+ */
 class FroniusDiscovery : public ThingsDiscovery {
 public:
     FroniusDiscovery(SunSpecDiscoveryPtr sunSpecDiscovery);
 
 private:
+    void onSolarInverterDiscovered(SunSpecThingPtr thing);
+    void onSmartMeterDiscovered(SunSpecThingPtr thing);
+
     SunSpecDiscoveryPtr _sunSpecDiscovery;
 };

src/main.cpp

@@ -41,7 +41,6 @@ int main(int argc, char *argv[]) {
     QTimer timer;
     QObject::connect(&timer, &QTimer::timeout, []() {
         uvw::loop::get_default()->run(uvw::loop::run_mode::NOWAIT);
-        //modbus::ModbusDiscovery::ioc.poll();
     });
     timer.start(100ms);
 

src/modbus/CMakeLists.txt

@@ -1,7 +1,8 @@
 add_library(modbus STATIC
   ModbusDiscovery.cpp
+  ModbusRequest.cpp
+  ModbusResponse.cpp
   ModbusThing.cpp
-  ModbusThingDecorator.cpp
 )
 
 target_link_libraries(modbus

src/modbus/ModbusDiscovery.cpp

@@ -5,26 +5,15 @@
 
 #include <common/Logger.h>
 #include <config/Config.h>
-#include <modbus/ModbusThing.h>
 #include <things/ThingsRepository.h>
 
 using namespace std::placeholders;
 using namespace sunspec;
 
 ModbusDiscovery::ModbusDiscovery() {
-    _discoveryTimer.callOnTimeout(this, &ModbusDiscovery::onStartDiscovering);
 }
 
 void ModbusDiscovery::start(int msec) {
-    onStartDiscovering();
-    _discoveryTimer.start(msec);
-}
-
-void ModbusDiscovery::stop() {
-    _discoveryTimer.stop();
-}
-
-void ModbusDiscovery::onStartDiscovering() {
     for (const auto& c : _candidates) {
         c.second.unsubscribe();
     }
@@ -40,26 +29,30 @@ void ModbusDiscovery::onStartDiscovering() {
     }
 
     // Scan subnets
-    LOG_S(INFO) << "find things> subnet: " << subnet << "0/24";
+    LOG_S(1) << "find things> subnet: " << subnet << "0/24";
     for (uint8_t i = 1; i < 255; ++i) {
         const QString host = subnet + QString::number(i);
         if (repo->thingByHost(host.toStdString())) {
             continue;
         }
 
-        //auto candidate = std::make_unique<SunSpecThing>(ThingInfo{ThingInfo::SunSpec, host.toStdString(), host.toStdString()});
+        //auto candidate = std::make_shared<ModbusThing>(ThingInfo{ThingInfo::SunSpec, host.toStdString(), host.toStdString()});
         auto candidate = std::make_shared<ModbusThing>(ThingInfo{ThingInfo::SunSpec, host.toStdString(), host.toStdString()});
         auto sub = candidate->stateObservable().subscribe(std::bind(&ModbusDiscovery::onCandidateStateChanged, this, candidate, _1));
         candidate->connect();
         _candidates.push_back({std::move(candidate), sub});
     }
 }
 
-void ModbusDiscovery::onCandidateStateChanged(const ModbusThingPtr& candidate_, Thing::State state) {
+void ModbusDiscovery::stop() {
+}
+
+void ModbusDiscovery::onCandidateStateChanged(const ModbusThingPtr_asio& candidate_, Thing::State state) {
+    assert(!_candidates.empty());
     auto it = std::find_if(_candidates.begin(), _candidates.end(), [&](const auto& c) {
         return c.first == candidate_;
     });
-    if (it == _candidates.end()) return;
+    assert(it != _candidates.end());
 
     // Steal candidate from container
     auto candidate = std::move(*it);