Fixed incorrect data offset for 'WriteSingleRegister'-function in 'SendMessage'-window

Author: serhmarch

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5) # 2.2 - case insensitive syntax
 
-project(ModbusTools VERSION 0.3.2 LANGUAGES CXX)
+project(ModbusTools VERSION 0.3.3 LANGUAGES CXX)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")

README.md

@@ -2,7 +2,10 @@
 
 ## Overview
 
-ModbusTools are cross-platform (Windows, Linux) Modbus simulator tools (client and server) with GUI to work with standard Modbus Protocol. Modbus Tools are a free, open-source  tools with a simple user interface written in C++/Qt. It implements TCP, RTU and ASCII versions of Modbus Protocol.
+ModbusTools are cross-platform (Windows, Linux) Modbus simulator tools (client and server) with GUI
+to work with standard Modbus Protocol. 
+Modbus Tools are a free, open-source  tools with a simple user interface written in C++/Qt. 
+It implements TCP, RTU and ASCII versions of Modbus Protocol.
 
 Software implements such Modbus functions as:
 * `1 ` (`0x01`) - `READ_COILS`
@@ -24,25 +27,37 @@ https://github.com/serhmarch/ModbusLib
 
 ## Release
 
-All compiled binaries are located in latest release:
+All compiled binaries are located in the latest release:
 
 https://github.com/serhmarch/ModbusTools/releases
 
 ## About Modbus Client
 
-The client implements access to a remote Modbus device. However, the client can work not only with one device, but with several devices that can be connected to a single network, which is especially useful when working with RTU and ASCII protocols, when access to all Modbus servers is realized through a single serial port. However, it can also be useful when using the TCP version of the protocol, for example, if you use the TCP->RTU bridge.
+The client implements access to a remote Modbus device. 
+However, the client can work not only with one device, but with several devices that can be connected to
+a single network, which is especially useful when working with RTU and ASCII protocols, 
+when access to all Modbus servers is realized through a single serial port. 
+However, it can also be useful when using the TCP version of the protocol, for example,
+if you use the TCP->RTU bridge.
 
 ![](./doc/images/client_view.png)
 
-All work is done within a single project. The main entities in the project are Port, Device and DataViewItem. Port contains network settings for both TCP/IP and serial ports. Device contains settings for a single device (such as Modbus Unit Address, etc.).  The DataViewItem contains a single data unit to be read from the remote device and has many formats to represent the current data.
+All work is done within a single project. The main entities in the project are Port, Device and DataViewItem.
+Port contains network settings for both TCP/IP and serial ports. 
+Device contains settings for a single device (such as Modbus Unit Address, etc.).  
+The DataViewItem contains a single data unit to be read from the remote device and 
+has many formats to represent the current data.
 
 ### Send Message window
 
-The client has the ability to process one separate Modbus function with full configuration of the parameters of this function, view/edit read/write data with the format specified, view Modbus packets of this function:
+The client has the ability to process one separate Modbus function with full configuration of the parameters 
+of this function, view/edit read/write data with the format specified, view Modbus packets of this function:
 
 ![](./doc/images/client_sendmessage_window.png)
 
-This window can be opened using menu `Tools->Send Message`. It works in parallel with regular Modbus application messages and can be seen in LogView as regular Modbus message as well.
+This window can be opened using menu `Tools->Send Message`. 
+It works in parallel with regular Modbus application messages and 
+can be seen in LogView as regular Modbus message as well.
 
 ### Scanner window (since v0.3)
 
@@ -62,15 +77,27 @@ button `To Project` add selected devices, `All To Project` - all devices will be
 
 ## About Modbus Server
 
-The server implements Modbus server device and works like Modbus simulator. However, the server can  not only simulate single device, but can simulate several devices that can be connected to a single network, which is especially useful when working with RTU and ASCII protocols, when access to all Modbus servers is realized through a single serial port. However, it can also be useful to simulate Modbus network using the TCP version of the protocol, for example, if you use the TCP->RTU bridge, Modbus server can replace this bridge with remote devices for testing purposes.
+The server implements Modbus server device and works like Modbus simulator. 
+However, the server can  not only simulate single device, but can simulate several devices that can be connected
+to a single network, which is especially useful when working with RTU and ASCII protocols, 
+when access to all Modbus servers is realized through a single serial port. 
+However, it can also be useful to simulate Modbus network using the TCP version of the protocol, 
+for example, if you use the TCP->RTU bridge, Modbus server can replace this bridge with remote devices 
+for testing purposes.
 
 ![](./doc/images/server_view.png)
 
-All work is performing within a single project. The main entities in the project are Port, Device, DataViewItem and Action. Port contains network settings for both TCP/IP and serial ports. Device contains settings for a single device (such as Modbus Unit Address, memory size etc).  The DataViewItem contains a single data unit to be read/write from the device and has many formats to represent the current data. Action provides simulation capabilities (automatic change of device memory values).
+All work is performing within a single project. 
+The main entities in the project are Port, Device, DataViewItem and Action. 
+Port contains network settings for both TCP/IP and serial ports. 
+Device contains settings for a single device (such as Modbus Unit Address, memory size etc).  
+The DataViewItem contains a single data unit to be read/write from the device and has many formats to 
+represent the current data. Action provides simulation capabilities (automatic change of device memory values).
 
 ### Server Actions window
 
-The server has the ability to simulate data (actions, automaticaly change values) with predefined action types (`Actions` tab near `LogView`, menu `View->Actions` window and menu `Actions`):
+The server has the ability to simulate/change data (actions, automaticaly change values) with predefined 
+action types (`Actions` tab near `LogView`, menu `View->Actions` window and menu `Actions`):
 * `Increment` - changing value by adding or subtracting (if incrementValue < 0) incrementValue
 * `Sine` - sine function with parameters of period, shift, amplitude
 * `Random` - randomly changing values with specified range

bugfix.md

@@ -42,3 +42,7 @@ typedef QAtomicInt RefCount_t;
 # 0.3.2
 
 * Fixed a bug when changing the log settings does not affect the LogView of client/server
+
+# 0.3.3
+
+* Fixed incorrect data offset for 'WriteSingleRegister'-function in 'SendMessage'-window

changelog.md

@@ -58,4 +58,10 @@
 
 * Load previously saved project when starting the `client`/`server`
 * Mdi Windows are saved/restored their geometry (when saving/opening project) for `client`/`server`
-* Fixed bug
+* Fixed bugs
+
+# 0.3.3
+
+* Improve client's Scanner Window
+* Allow user right to enter port name if it's absent in list of ports in ComboBox
+* Fixed bugs

doc/images/client_scanner_window.png

@@ -104,7 +104,6 @@ void mbClientDialogDataViewItem::setCachedSettings(const MBSETTINGS &settings)
 void mbClientDialogDataViewItem::fillFormInner(const MBSETTINGS &settings)
 {
     const mbClientDataViewItem::Strings &sItem = mbClientDataViewItem::Strings::instance();
-    const QString &prefix = Strings().cachePrefix;
     int period = settings.value(sItem.period).toInt();
     ui->spPeriod->setValue(period);
 }

src/client/gui/dialogs/client_dialogdataviewitem.cpp

@@ -108,6 +108,7 @@ mbClientDialogDevice::mbClientDialogDevice(QWidget *parent) :
     QStringList ports = Modbus::availableSerialPortList();
     Q_FOREACH(const QString &port, ports)
         cmb->addItem(port);
+    cmb->setEditable(true); // Note: Allow user right to enter port name if it's absent in list
 
     // Baud Rate
     cmb = ui->cmbBaudRate;
@@ -223,11 +224,11 @@ void mbClientDialogDevice::setCachedSettings(const MBSETTINGS &m)
     it = m.find(prefix+ss.parity          ); if (it != end)  ui->cmbParity        ->setCurrentText(it.value().toString());
     it = m.find(prefix+ss.stopBits        ); if (it != end)  ui->cmbStopBits      ->setCurrentText(it.value().toString());
     it = m.find(prefix+ss.flowControl     ); if (it != end)  ui->cmbFlowControl   ->setCurrentText(it.value().toString());
-    it = m.find(prefix+ss.timeoutFirstByte); if (it != end)  ui->spTimeoutFB      ->setValue      (it.value().toInt());
-    it = m.find(prefix+ss.timeoutInterByte); if (it != end)  ui->spTimeoutIB      ->setValue      (it.value().toInt());
+    it = m.find(prefix+ss.timeoutFirstByte); if (it != end)  ui->spTimeoutFB      ->setValue      (it.value().toInt   ());
+    it = m.find(prefix+ss.timeoutInterByte); if (it != end)  ui->spTimeoutIB      ->setValue      (it.value().toInt   ());
     it = m.find(prefix+ss.host            ); if (it != end)  ui->lnHost           ->setText       (it.value().toString());
-    it = m.find(prefix+ss.port            ); if (it != end)  ui->spPort           ->setValue      (it.value().toInt());
-    it = m.find(prefix+ss.timeout         ); if (it != end)  ui->spTimeout        ->setValue      (it.value().toInt());
+    it = m.find(prefix+ss.port            ); if (it != end)  ui->spPort           ->setValue      (it.value().toInt   ());
+    it = m.find(prefix+ss.timeout         ); if (it != end)  ui->spTimeout        ->setValue      (it.value().toInt   ());
 
     QString portName = ui->lnPortName->text();
     if (!portName.isEmpty())
@@ -246,20 +247,19 @@ void mbClientDialogDevice::fillForm(const MBSETTINGS &m)
     const mbClientDevice::Strings &ms = mbClientDevice::Strings::instance();
 
     auto it = m.find(Strings::instance().createDeviceForPort);
-    if (it != m.end())
+    auto end = m.end();
+
+    if (it != end)
     {
         ui->cmbPort->setEnabled(false);
-        QString portName = it.value().toString();
-        setPortName(portName);
+        setPortName(it.value().toString());
     }
     else
     {
-        ui->spUnit->setValue(m.value(ms.unit).toInt());
         mbCoreDialogDevice::fillForm(m);
-        //----------------------- PORT -----------------------
         ui->cmbPort->setEnabled(true);
-        QString portName = m.value(ms.portName).toString();
-        setPortName(portName);
+        it = m.find(ms.unit    ); if (it != end) ui->spUnit->setValue   (it.value().toInt   ());
+        it = m.find(ms.portName); if (it != end) this->      setPortName(it.value().toString());
     }
 }
 
@@ -312,19 +312,22 @@ void mbClientDialogDevice::fillPortForm(const MBSETTINGS &m)
     mbClientPort::Strings ms = mbClientPort::Strings();
     Modbus::Strings ss = Modbus::Strings::instance();
 
-    ui->lnPortName       ->setText       (m.value(ms.name            ).toString());
-    ui->cmbPortType      ->setCurrentText(m.value(ms.type            ).toString());
-    ui->cmbSerialPortName->setCurrentText(m.value(ss.serialPortName  ).toString());
-    ui->cmbBaudRate      ->setCurrentText(m.value(ss.baudRate        ).toString());
-    ui->cmbDataBits      ->setCurrentText(m.value(ss.dataBits        ).toString());
-    ui->cmbParity        ->setCurrentText(m.value(ss.parity          ).toString());
-    ui->cmbStopBits      ->setCurrentText(m.value(ss.stopBits        ).toString());
-    ui->cmbFlowControl   ->setCurrentText(m.value(ss.flowControl     ).toString());
-    ui->spTimeoutFB      ->setValue      (m.value(ss.timeoutFirstByte).toInt());
-    ui->spTimeoutIB      ->setValue      (m.value(ss.timeoutInterByte).toInt());
-    ui->lnHost           ->setText       (m.value(ss.host            ).toString());
-    ui->spPort           ->setValue      (m.value(ss.port            ).toInt());
-    ui->spTimeout        ->setValue      (m.value(ss.timeout         ).toInt());
+    MBSETTINGS::const_iterator it;
+    MBSETTINGS::const_iterator end = m.end();
+
+    it = m.find(ms.name            ); if (it != end) ui->lnPortName       ->setText       (it.value().toString());
+    it = m.find(ms.type            ); if (it != end) ui->cmbPortType      ->setCurrentText(it.value().toString());
+    it = m.find(ss.serialPortName  ); if (it != end) ui->cmbSerialPortName->setCurrentText(it.value().toString());
+    it = m.find(ss.baudRate        ); if (it != end) ui->cmbBaudRate      ->setCurrentText(it.value().toString());
+    it = m.find(ss.dataBits        ); if (it != end) ui->cmbDataBits      ->setCurrentText(it.value().toString());
+    it = m.find(ss.parity          ); if (it != end) ui->cmbParity        ->setCurrentText(it.value().toString());
+    it = m.find(ss.stopBits        ); if (it != end) ui->cmbStopBits      ->setCurrentText(it.value().toString());
+    it = m.find(ss.flowControl     ); if (it != end) ui->cmbFlowControl   ->setCurrentText(it.value().toString());
+    it = m.find(ss.timeoutFirstByte); if (it != end) ui->spTimeoutFB      ->setValue      (it.value().toInt   ());
+    it = m.find(ss.timeoutInterByte); if (it != end) ui->spTimeoutIB      ->setValue      (it.value().toInt   ());
+    it = m.find(ss.host            ); if (it != end) ui->lnHost           ->setText       (it.value().toString());
+    it = m.find(ss.port            ); if (it != end) ui->spPort           ->setValue      (it.value().toInt   ());
+    it = m.find(ss.timeout         ); if (it != end) ui->spTimeout        ->setValue      (it.value().toInt   ());
 }
 
 void mbClientDialogDevice::fillPortData(MBSETTINGS &m) const

src/client/gui/dialogs/client_dialogdevice.cpp

@@ -70,37 +70,38 @@ mbClientDialogPort::~mbClientDialogPort()
 
 MBSETTINGS mbClientDialogPort::cachedSettings() const
 {
-    Modbus::Strings ss = Modbus::Strings::instance();
+    Modbus::Strings vs = Modbus::Strings::instance();
     const QString &prefix = Strings().cachePrefix;
     MBSETTINGS m = mbCoreDialogPort::cachedSettings();
-    m[prefix+ss.host] = ui->lnHost->text();
+    m[prefix+vs.host] = ui->lnHost->text();
     return m;
 }
 
 void mbClientDialogPort::setCachedSettings(const MBSETTINGS &m)
 {
     mbCoreDialogPort::setCachedSettings(m);
 
-    Modbus::Strings ss = Modbus::Strings::instance();
+    Modbus::Strings vs = Modbus::Strings::instance();
     const QString &prefix = Strings().cachePrefix;
     MBSETTINGS::const_iterator it;
     MBSETTINGS::const_iterator end = m.end();
     //bool ok;
 
-    it = m.find(prefix+ss.host); if (it != end) ui->lnHost->setText(it.value().toString());
-
+    it = m.find(prefix+vs.host); if (it != end) ui->lnHost->setText(it.value().toString());
 }
 
 void mbClientDialogPort::fillFormInner(const MBSETTINGS &settings)
 {
-    Modbus::Strings ss = Modbus::Strings::instance();
+    Modbus::Strings vs = Modbus::Strings::instance();
+    MBSETTINGS::const_iterator it;
+    MBSETTINGS::const_iterator end = settings.end();
 
-    ui->lnHost->setText(settings.value(ss.host).toString());
+    it = settings.find(vs.host); if (it != end) ui->lnHost->setText(it.value().toString());
 }
 
 void mbClientDialogPort::fillDataInner(MBSETTINGS &settings) const
 {
-    Modbus::Strings ss = Modbus::Strings::instance();
+    Modbus::Strings vs = Modbus::Strings::instance();
 
-    settings[ss.host] = ui->lnHost->text();
+    settings[vs.host] = ui->lnHost->text();
 }

src/client/gui/dialogs/client_dialogport.cpp

@@ -425,6 +425,7 @@ void mbClientScanner::clear()
     QWriteLocker _(&m_lock);
     m_deviceInfoList.clear();
     setStatDevice(QString());
+    setStatFound  (0);
     setStatCountTx(0);
     setStatCountRx(0);
     setStatPercent(0);
@@ -454,6 +455,15 @@ void mbClientScanner::setStatDevice(const QString &device)
     }
 }
 
+void mbClientScanner::setStatFound(quint32 count)
+{
+    if (m_stat.found != count)
+    {
+        m_stat.found = count;
+        Q_EMIT statFoundChanged(count);
+    }
+}
+
 void mbClientScanner::setStatCountTx(quint32 count)
 {
     if (m_stat.countTx != count)

src/client/gui/scanner/client_scanner.cpp

@@ -128,6 +128,7 @@ class mbClientScanner : public QObject
     QString deviceInfoStr(int i) const;
     void deviceAdd(const Modbus::Settings &settings);
     inline QString statDevice () const { return m_stat.device ; }
+    inline quint32 statFound  () const { return m_stat.found  ; }
     inline quint32 statCountTx() const { return m_stat.countTx; }
     inline quint32 statCountRx() const { return m_stat.countRx; }
     inline quint32 statPercent() const { return m_stat.percent; }
@@ -138,6 +139,7 @@ class mbClientScanner : public QObject
     void startScanning(const Modbus::Settings &settings);
     void stopScanning();
     void setStatDevice(const QString &device);
+    void setStatFound  (quint32 count);
     void setStatCountTx(quint32 count);
     void setStatCountRx(quint32 count);
     void setStatPercent(quint32 percent);
@@ -147,6 +149,7 @@ class mbClientScanner : public QObject
     void cleared();
     void stateChanged(bool run);
     void statDeviceChanged(const QString &name);
+    void statFoundChanged  (quint32 count);
     void statCountTxChanged(quint32 count);
     void statCountRxChanged(quint32 count);
     void statPercentChanged(quint32 percent);
@@ -173,13 +176,14 @@ private Q_SLOTS:
     {
         Statistics()
         {
-
+            found   = 0;
             countTx = 0;
             countRx = 0;
             percent = 0;
         }
 
-        QString device;
+        QString device ;
+        quint32 found  ;
         quint32 countTx;
         quint32 countRx;
         quint32 percent;