working Modbus IO thread

HypersonicED · Feb 13, 2023 · 038eac6 · 038eac6
1 parent 87934d5
commit 038eac6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/include/aniray/IOInterfaceModbus.hpp b/include/aniray/IOInterfaceModbus.hpp
@@ -27,6 +27,7 @@
 #ifndef ANIRAY_INPUTINTERFACEMODBUS_HPP
 #define ANIRAY_INPUTINTERFACEMODBUS_HPP
 
+#include <chrono>
 #include <cstdint>
 #include <shared_mutex>
 #include <string>
@@ -35,6 +36,7 @@
 #include <modbus/modbus.h>
 
 #include <aniray/IOInterface.hpp>
+#include <aniray/PeriodicThread.hpp>
 
 namespace aniray {
 namespace IOInterface {
@@ -113,6 +115,13 @@ class IOInterfaceModbus : public aniray::IOInterface::IOInterfaceGeneric {
         // void updateInputsCounter(ConfigFunction functionConfig) {}
 };
 
+class IOInterfaceModbusThread : public IOInterfaceModbus, public aniray::PeriodicThread {
+    public:
+        IOInterfaceModbusThread(std::string tcpAddress, std::uint16_t tcpPort, std::chrono::milliseconds updateRateMs);
+    private:
+        void periodicAction() override;
+};
+
 } // namespace IOInterfaceModbus
 } // namespace IOInterface
 } // namespace aniray

diff --git a/include/aniray/PeriodicThread.hpp b/include/aniray/PeriodicThread.hpp
@@ -63,7 +63,7 @@ class PeriodicThread { // NOLINT(cppcoreguidelines-special-member-functions,hicp
         std::unique_ptr<boost::thread> mIOThread;
         mutable std::shared_mutex mUpdateRateMutex;
 
-        void timerHandler ();
+        void timerHandler();
 };
 
 } // namespace aniray

diff --git a/src/IOInterfaceModbus.cpp b/src/IOInterfaceModbus.cpp
@@ -269,6 +269,14 @@ void IOInterfaceModbus::updateInputDiscrete(ConfigInputDiscrete configInputDiscr
     values->setValues(out);
 }
 
+IOInterfaceModbusThread::IOInterfaceModbusThread(std::string tcpAddress, std::uint16_t tcpPort, std::chrono::milliseconds updateRateMs)
+    : IOInterfaceModbus(tcpAddress, tcpPort)
+    , PeriodicThread(updateRateMs) {}
+
+void IOInterfaceModbusThread::periodicAction() {
+    refreshInputs();
+}
+
 } // namespace Modbus
 } // namespace IOInterface
 } // namespace aniray