merge #2108

2025-12-08 16:59:50 +03:00 · 2025-01-04 13:41:39 +01:00
parent 4138598db2
commit eb87651c47
166 changed files with 2099 additions and 10446 deletions
--- a/src/core/modbus.h
+++ b/src/core/modbus.h
@@ -0,0 +1,110 @@
+//
+// Created by Michael Heyse on 08.02.24.
+//
+
+#ifndef EMSESP_MODBUS_H_
+#define EMSESP_MODBUS_H_
+
+#include "helpers.h"
+#include "emsdevice.h"
+#include "emsdevicevalue.h"
+
+#include <string>
+#include <map>
+#include <utility>
+
+#if defined(EMSESP_STANDALONE)
+#include <../test/test_modbus/modbus_test.h>
+#endif
+
+#ifndef EMSESP_STANDALONE
+#include <ModbusServerTCPasync.h>
+#endif
+
+namespace emsesp {
+
+class Modbus {
+  public:
+    static const int REGISTER_BLOCK_SIZE = 1000;
+
+    void start(uint8_t systemServerId, uint16_t port, uint8_t max_clients, uint32_t timeout);
+    void stop();
+
+#if defined(EMSESP_STANDALONE)
+    int getRegisterOffset(const DeviceValue & dv);
+    int getRegisterCount(const DeviceValue & dv);
+    int getRegisterStartAddress(const DeviceValue & dv);
+#endif
+
+  private:
+    static uuid::log::Logger logger_;
+
+    struct EntityModbusInfoKey {
+        const uint8_t  device_type;
+        const uint8_t  device_value_tag_type;
+        const uint16_t registerOffset;
+
+        EntityModbusInfoKey(uint8_t deviceType, uint8_t deviceValueTagType, uint16_t registerOffset)
+            : device_type(deviceType)
+            , device_value_tag_type(deviceValueTagType)
+            , registerOffset(registerOffset) {
+        }
+
+        bool equals(const EntityModbusInfoKey & other) const {
+            return device_type == other.device_type && device_value_tag_type == other.device_value_tag_type && registerOffset == other.registerOffset;
+        }
+    };
+
+    struct EntityModbusInfo {
+        const uint8_t      device_type;
+        const uint8_t      device_value_tag_type;
+        const char * const short_name;
+        const uint16_t     registerOffset;
+        const uint16_t     registerCount;
+
+        bool equals(const EntityModbusInfoKey & other) const {
+            return device_type == other.device_type && device_value_tag_type == other.device_value_tag_type && registerOffset == other.registerOffset;
+        }
+
+        bool isLessThan(const EntityModbusInfoKey & other) const {
+            return device_type < other.device_type || ((device_type == other.device_type) && (device_value_tag_type < other.device_value_tag_type))
+                   || ((device_type == other.device_type) && (device_value_tag_type == other.device_value_tag_type) && (registerOffset < other.registerOffset));
+        }
+
+        bool isLessThan(const EntityModbusInfo & other) const {
+            return device_type < other.device_type || ((device_type == other.device_type) && (device_value_tag_type < other.device_value_tag_type))
+                   || ((device_type == other.device_type) && (device_value_tag_type == other.device_value_tag_type) && (registerOffset < other.registerOffset));
+        }
+    };
+
+    enum DeviceValueTAGType : int8_t {
+        TAG_TYPE_NONE        = DeviceValue::DeviceValueTAG::TAG_NONE,
+        TAG_TYPE_DEVICE_DATA = DeviceValue::DeviceValueTAG::TAG_DEVICE_DATA,
+        TAG_TYPE_HC          = DeviceValue::DeviceValueTAG::TAG_HC1,
+        TAG_TYPE_DHW         = DeviceValue::DeviceValueTAG::TAG_DHW1,
+        TAG_TYPE_AHS         = DeviceValue::DeviceValueTAG::TAG_AHS1,
+        TAG_TYPE_HS          = DeviceValue::DeviceValueTAG::TAG_HS1,
+        INVALID_TAG_TYPE     = -2
+    };
+
+    static const std::initializer_list<EntityModbusInfo> modbus_register_mappings;
+
+    static int8_t tag_to_type(int8_t tag);
+    static bool   check_parameter_order();
+
+#ifndef EMSESP_STANDALONE
+    ModbusServerTCPasync * modbusServer_;
+#endif
+
+#if defined(EMSESP_STANDALONE) || defined(EMSESP_TEST)
+  public:
+#endif
+
+    static ModbusMessage handleSystemRead(const ModbusMessage & request);
+    static ModbusMessage handleRead(const ModbusMessage & request);
+    static ModbusMessage handleWrite(const ModbusMessage & request);
+};
+
+} // namespace emsesp
+
+#endif //EMSESP_MODBUS_H_