Added function to read/write 32-bit long integers values from script

Author: sanny32

omodsim/jsobjects/server.cpp

@@ -108,6 +108,54 @@ void Server::writeCoil(quint16 address, bool value)
     _mbMultiServer->writeValue(QModbusDataUnit::Coils, address - 1, value, *_byteOrder);
 }
 
+///
+/// \brief Server::readLong
+/// \param reg
+/// \param address
+/// \param swapped
+/// \return
+///
+qint32 Server::readLong(Register::Type reg, quint16 address, bool swapped) const
+{
+    return _mbMultiServer->readLong((QModbusDataUnit::RegisterType)reg, address - 1, *_byteOrder, swapped);
+}
+
+///
+/// \brief Server::writeLong
+/// \param reg
+/// \param address
+/// \param value
+/// \param swapped
+///
+void Server::writeLong(Register::Type reg, quint16 address, qint32 value, bool swapped)
+{
+    _mbMultiServer->writeLong((QModbusDataUnit::RegisterType)reg, address - 1, value, *_byteOrder, swapped);
+}
+
+///
+/// \brief Server::readUnsignedLong
+/// \param reg
+/// \param address
+/// \param swapped
+/// \return
+///
+quint32 Server::readUnsignedLong(Register::Type reg, quint16 address, bool swapped) const
+{
+    return _mbMultiServer->readUnsignedLong((QModbusDataUnit::RegisterType)reg, address - 1, *_byteOrder, swapped);
+}
+
+///
+/// \brief Server::writeUnsignedLong
+/// \param reg
+/// \param address
+/// \param value
+/// \param swapped
+///
+void Server::writeUnsignedLong(Register::Type reg, quint16 address, quint32 value, bool swapped)
+{
+    _mbMultiServer->writeUnsignedLong((QModbusDataUnit::RegisterType)reg, address - 1, value, *_byteOrder, swapped);
+}
+
 ///
 /// \brief Server::readFloat
 /// \param reg

omodsim/jsobjects/server.h

@@ -41,6 +41,12 @@ class Server : public QObject
     Q_INVOKABLE bool readCoil(quint16 address) const;
     Q_INVOKABLE void writeCoil(quint16 address, bool value);
 
+    Q_INVOKABLE qint32 readLong(Register::Type reg, quint16 address, bool swapped) const;
+    Q_INVOKABLE void writeLong(Register::Type reg, quint16 address, qint32 value, bool swapped);
+
+    Q_INVOKABLE quint32 readUnsignedLong(Register::Type reg, quint16 address, bool swapped) const;
+    Q_INVOKABLE void writeUnsignedLong(Register::Type reg, quint16 address, quint32 value, bool swapped);
+
     Q_INVOKABLE float readFloat(Register::Type reg, quint16 address, bool swapped) const;
     Q_INVOKABLE void writeFloat(Register::Type reg, quint16 address, float value, bool swapped);
 

omodsim/modbusmultiserver.cpp

@@ -448,6 +448,59 @@ void ModbusMultiServer::writeValue(QModbusDataUnit::RegisterType pointType, quin
     setData(data);
 }
 
+///
+/// \brief ModbusMultiServer::readLong
+/// \param pointType
+/// \param pointAddress
+/// \param order
+/// \param swapped
+/// \return
+///
+qint32 ModbusMultiServer::readLong(QModbusDataUnit::RegisterType pointType, quint16 pointAddress, ByteOrder order, bool swapped)
+{
+    const auto data = this->data(pointType, pointAddress, 2);
+    return swapped ?  makeLong(data.value(1), data.value(0), order): makeLong(data.value(0), data.value(1), order);
+}
+
+///
+/// \brief ModbusMultiServer::writeLong
+/// \param pointType
+/// \param pointAddress
+/// \param value
+/// \param order
+/// \param swapped
+///
+void ModbusMultiServer::writeLong(QModbusDataUnit::RegisterType pointType, quint16 pointAddress, qint32 value, ByteOrder order, bool swapped)
+{
+    setData(createLongDataUnit(pointType, pointAddress, value, order, swapped));
+}
+
+///
+/// \brief ModbusMultiServer::readUnsignedLong
+/// \param pointType
+/// \param pointAddress
+/// \param order
+/// \param swapped
+/// \return
+///
+quint32 ModbusMultiServer::readUnsignedLong(QModbusDataUnit::RegisterType pointType, quint16 pointAddress, ByteOrder order, bool swapped)
+{
+    return (quint32)readLong(pointType, pointAddress, order, swapped);
+}
+
+///
+/// \brief ModbusMultiServer::writeUnsignedLong
+/// \param pointType
+/// \param pointAddress
+/// \param value
+/// \param order
+/// \param swapped
+///
+void ModbusMultiServer::writeUnsignedLong(QModbusDataUnit::RegisterType pointType, quint16 pointAddress, quint32 value, ByteOrder order, bool swapped)
+{
+    writeLong(pointType, pointAddress, value, order, swapped);
+}
+
 ///
 /// \brief ModbusMultiServer::readFloat
 /// \param pointType

omodsim/modbusmultiserver.h

@@ -114,6 +114,12 @@ class ModbusMultiServer final : public QObject
     void writeValue(QModbusDataUnit::RegisterType pointType, quint16 pointAddress, quint16 value, ByteOrder order);
     void writeRegister(QModbusDataUnit::RegisterType pointType, const ModbusWriteParams& params);
 
+    qint32 readLong(QModbusDataUnit::RegisterType pointType, quint16 pointAddress, ByteOrder order, bool swapped);
+    void writeLong(QModbusDataUnit::RegisterType pointType, quint16 pointAddress, qint32 value, ByteOrder order, bool swapped);
+
+    quint32 readUnsignedLong(QModbusDataUnit::RegisterType pointType, quint16 pointAddress, ByteOrder order, bool swapped);
+    void writeUnsignedLong(QModbusDataUnit::RegisterType pointType, quint16 pointAddress, quint32 value, ByteOrder order, bool swapped);
+
     float readFloat(QModbusDataUnit::RegisterType pointType, quint16 pointAddress, ByteOrder order, bool swapped);
     void writeFloat(QModbusDataUnit::RegisterType pointType, quint16 pointAddress, float value, ByteOrder order, bool swapped);