Merge remote-tracking branch 'origin/dev'

Author: sanny32

README.md

@@ -108,7 +108,7 @@ Script.onInit(init);
   Now building is available via cmake (with installed Qt version 5.15 and above) or Qt Creator. Supports both OS Microsoft Windows and Linux.
 
 ## MIT License
-Copyright 2024 Alexandr Ananev [[email protected]]
+Copyright 2025 Alexandr Ananev [[email protected]]
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

omodsim/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.25)
 
-project(OpenModSim 
-        VERSION 1.8.0
+project(omodsim
+        VERSION 1.8.1
         LANGUAGES CXX)
 
 set(CMAKE_AUTOUIC ON)
@@ -234,6 +234,7 @@ set(UI_FILES
 
 set(TS_FILES
     translations/omodsim_ru.ts
+    translations/omodsim_zh.ts
 )
 
 set(JSHELP_INPUT "${CMAKE_SOURCE_DIR}/docs/jshelp.qhcp")

omodsim/dialogs/dialogdisplaydefinition.cpp

@@ -26,6 +26,8 @@ DialogDisplayDefinition::DialogDisplayDefinition(DisplayDefinition dd, QWidget*
     ui->lineEditLogLimit->setValue(dd.LogViewLimit);
     ui->comboBoxPointType->setCurrentPointType(dd.PointType);
 
+    ui->checkBoxGlobalMap->setChecked(dd.UseGlobalUnitMap);
+
     ui->buttonBox->setFocus();
 }
 
@@ -48,11 +50,11 @@ void DialogDisplayDefinition::accept()
     _displayDefinition.Length = ui->lineEditLength->value<int>();
     _displayDefinition.LogViewLimit = ui->lineEditLogLimit->value<int>();
     _displayDefinition.ZeroBasedAddress = (ui->comboBoxAddressBase->currentAddressBase() == AddressBase::Base0);
+    _displayDefinition.UseGlobalUnitMap = ui->checkBoxGlobalMap->isChecked();
 
     QFixedSizeDialog::accept();
 }
 
-
 ///
 /// \brief DialogDisplayDefinition::on_comboBoxAddressBase_currentIndexChanged
 /// \param index

omodsim/dialogs/dialogdisplaydefinition.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>350</width>
-    <height>285</height>
+    <width>352</width>
+    <height>387</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -23,7 +23,7 @@
       <set>Qt::AlignmentFlag::AlignHCenter|Qt::AlignmentFlag::AlignTop</set>
      </property>
      <property name="leftMargin">
-      <number>40</number>
+      <number>50</number>
      </property>
      <property name="topMargin">
       <number>9</number>
@@ -152,22 +152,15 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="labelPointAddress">
-        <property name="text">
-         <string>Point Address:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="labelLength">
+      <item row="3" column="0">
+       <widget class="QLabel" name="labelAddressBase">
         <property name="text">
-         <string>Length:</string>
+         <string>Address Base:</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="1">
-       <widget class="NumericLineEdit" name="lineEditLength">
+      <item row="3" column="1">
+       <widget class="AddressBaseComboBox" name="comboBoxAddressBase">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -176,19 +169,20 @@
         </property>
         <property name="minimumSize">
          <size>
-          <width>0</width>
+          <width>100</width>
           <height>25</height>
          </size>
         </property>
-        <property name="maximumSize">
-         <size>
-          <width>60</width>
-          <height>16777215</height>
-         </size>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="labelPointAddress">
+        <property name="text">
+         <string>Point Address:</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
+      <item row="4" column="1">
        <widget class="NumericLineEdit" name="lineEditPointAddress">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -210,15 +204,15 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="labelAddressBase">
+      <item row="7" column="0">
+       <widget class="QLabel" name="labelLength">
         <property name="text">
-         <string>Address Base:</string>
+         <string>Length:</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="1">
-       <widget class="AddressBaseComboBox" name="comboBoxAddressBase">
+      <item row="7" column="1">
+       <widget class="NumericLineEdit" name="lineEditLength">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -227,15 +221,44 @@
         </property>
         <property name="minimumSize">
          <size>
-          <width>100</width>
+          <width>0</width>
           <height>25</height>
          </size>
         </property>
+        <property name="maximumSize">
+         <size>
+          <width>60</width>
+          <height>16777215</height>
+         </size>
+        </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QCheckBox" name="checkBoxGlobalMap">
+     <property name="text">
+      <string>Use Global Address Map (Unallocated registers will be zero)</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Orientation::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Policy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>5</width>
+       <height>9</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
@@ -271,7 +294,6 @@
  <tabstops>
   <tabstop>lineEditSlaveAddress</tabstop>
   <tabstop>comboBoxPointType</tabstop>
-  <tabstop>lineEditLength</tabstop>
  </tabstops>
  <resources/>
  <connections>

omodsim/displaydefinition.h

@@ -16,6 +16,7 @@ struct DisplayDefinition
     quint16 Length = 100;
     quint16 LogViewLimit = 30;
     bool ZeroBasedAddress = false;
+    bool UseGlobalUnitMap = false;
 
     void normalize()
     {
@@ -42,6 +43,7 @@ inline QSettings& operator <<(QSettings& out, const DisplayDefinition& dd)
     out.setValue("DisplayDefinition/Length",            dd.Length);
     out.setValue("DisplayDefinition/LogViewLimit",      dd.LogViewLimit);
     out.setValue("DisplayDefinition/ZeroBasedAddress",  dd.ZeroBasedAddress);
+    out.setValue("DisplayDefinition/UseGlobalUnitMap",  dd.UseGlobalUnitMap);
 
     return out;
 }
@@ -60,6 +62,7 @@ inline QSettings& operator >>(QSettings& in, DisplayDefinition& dd)
     dd.Length = in.value("DisplayDefinition/Length", 100).toUInt();
     dd.LogViewLimit = in.value("DisplayDefinition/LogViewLimit", 30).toUInt();
     dd.ZeroBasedAddress = in.value("DisplayDefinition/ZeroBasedAddress").toBool();
+    dd.UseGlobalUnitMap = in.value("DisplayDefinition/UseGlobalUnitMap").toBool();
 
     dd.normalize();
     return in;

omodsim/docs/index.html

@@ -134,6 +134,7 @@ <h1 class="title">JavaScript Help</h1>
 		</li>
 		<li class="object"><a href="#server"><strong>Server</strong></a>
 			<ul class="level2">
+				<li><a href="#server.addressbase">Server.addressBase</a></li>
 				<li><a href="#server.onchange">Server.onChange</a></li>
 				<li><a href="#server.readcoil">Server.readCoil</a></li>
 				<li><a href="#server.readdiscrete">Server.readDiscrete</a></li>
@@ -157,6 +158,7 @@ <h1 class="title">JavaScript Help</h1>
 				<li><a href="#server.writeunint64">Server.writeUInt64</a></li>
 				<li><a href="#server.writedouble">Server.writeDouble</a></li>
 				<li><a href="#server.writefloat">Server.writeFloat</a></li>
+				<li><a href="#server.useglobalunitmap">Server.useGlobalUnitMap</a></li>
 			</ul>
 		</li>
 		<li class="object"><a href="#storage"><strong>Storage</strong></a>
@@ -633,6 +635,16 @@ <h1 id="script">Script</h1>
 			<h1 id="server">Server</h1>
 		</div>
 		<div class="section-content"><p>The <strong><code>Server</code></strong> object provides access to the MODBUS server functionality.</p></div>
+		<section aria-labelledby="static_properties"><h2 id="script.static_properties">Static properties</h2><div class="section-content"><dl>
+			<dt id="server.addressbase"><code>Server.addressBase</code></dt>
+			<dd>
+			  <p>Returns or sets <a href="#addressbase">addressbase</a> of the Server object.</p>
+			</dd>
+			<dt id="server.useglobalunitmap"><code>Server.useGlobalUnitMap</code></dt>
+			<dd>
+			  <p>Returns or sets global address map usage. Unallocated registers will be zero.</p>
+			</dd>
+		</dl>
 		<section aria-labelledby="static_methods"><h2 id="server.static_methods">Static methods</h2><div class="section-content"><dl>
 			<dt id="server.onchange"><code>Server.onChange(Register, address, functionRef)</code></dt>
 			<dd>

omodsim/docs/index_ru.html

@@ -134,6 +134,7 @@ <h1 class="title">Справка по JavaScript</h1>
 		</li>
 		<li class="object"><a href="#server"><strong>Server</strong></a>
 			<ul class="level2">
+				<li><a href="#server.addressbase">Server.addressBase</a></li>
 				<li><a href="#server.onchange">Server.onChange</a></li>
 				<li><a href="#server.readcoil">Server.readCoil</a></li>
 				<li><a href="#server.readdiscrete">Server.readDiscrete</a></li>
@@ -157,6 +158,7 @@ <h1 class="title">Справка по JavaScript</h1>
 				<li><a href="#server.writeunint64">Server.writeUInt64</a></li>
 				<li><a href="#server.writedouble">Server.writeDouble</a></li>
 				<li><a href="#server.writefloat">Server.writeFloat</a></li>
+				<li><a href="#server.useglobalunitmap">Server.useGlobalUnitMap</a></li>
 			</ul>
 		</li>
 		<li class="object"><a href="#storage"><strong>Storage</strong></a>
@@ -633,6 +635,16 @@ <h1 id="script">Script</h1>
 			<h1 id="server">Server</h1>
 		</div>
 		<div class="section-content"><p>Объект <strong><code>Server</code></strong> обеспечивает доступ к функциям сервера MODBUS.</p></div>
+		<section aria-labelledby="static_properties"><h2 id="script.static_properties">Статические свойства</h2><div class="section-content"><dl>
+			<dt id="server.addressbase"><code>Server.addressBase</code></dt>
+			<dd>
+			  <p>Возвращает или устанавливает нумерацию <a href="#addressbase">адресного пространства</a> сервера.</p>
+			</dd>
+			<dt id="server.useglobalunitmap"><code>Server.useGlobalUnitMap</code></dt>
+			<dd>
+			  <p>Возвращает или устанавливает использование глобальной карты адресов. Неразмеченные регистры будут занулены.</p>
+			</dd>
+		</dl>
 		<section aria-labelledby="static_methods"><h2 id="server.static_methods">Статические методы</h2><div class="section-content"><dl>
 			<dt id="server.onchange"><code>Server.onChange(Register, address, functionRef)</code></dt>
 			<dd>

omodsim/formmodsim.cpp

@@ -138,6 +138,7 @@ DisplayDefinition FormModSim::displayDefinition() const
     dd.PointType = ui->comboBoxModbusPointType->currentPointType();
     dd.Length = ui->lineEditLength->value<int>();
     dd.ZeroBasedAddress = ui->lineEditAddress->range<int>().from() == 0;
+    dd.UseGlobalUnitMap = _mbMultiServer.useGlobalUnitMap();
 
     return dd;
 }
@@ -167,6 +168,8 @@ void FormModSim::setDisplayDefinition(const DisplayDefinition& dd)
     ui->comboBoxModbusPointType->setCurrentPointType(dd.PointType);
     ui->comboBoxModbusPointType->blockSignals(false);
 
+    _mbMultiServer.setUseGlobalUnitMap(dd.UseGlobalUnitMap);
+
     onDefinitionChanged();
 }
 

omodsim/jsobjects/server.cpp

@@ -45,6 +45,24 @@ void Server::setAddressBase(Address::Base base)
     _addressBase = base;
 }
 
+///
+/// \brief Server::useGlobalUnitMap
+/// \return
+///
+bool Server::useGlobalUnitMap() const
+{
+    return _mbMultiServer->useGlobalUnitMap();
+}
+
+///
+/// \brief Server::setUseGlobalUnitMap
+/// \param value
+///
+void Server::setUseGlobalUnitMap(bool value)
+{
+    _mbMultiServer->setUseGlobalUnitMap(value);
+}
+
 ///
 /// \brief Server::readHolding
 /// \param address

omodsim/jsobjects/server.h

@@ -41,8 +41,10 @@ class Server : public QObject
     ~Server() override;
 
     Q_PROPERTY(Address::Base addressBase READ addressBase WRITE setAddressBase);
+    Q_PROPERTY(bool useGlobalUnitMap READ useGlobalUnitMap WRITE setUseGlobalUnitMap);
 
     Address::Base addressBase() const;
+    bool useGlobalUnitMap() const;
 
     Q_INVOKABLE quint16 readHolding(quint16 address) const;
     Q_INVOKABLE void writeHolding(quint16 address, quint16 value);
@@ -81,6 +83,7 @@ class Server : public QObject
 
 public slots:
     void setAddressBase(Address::Base base);
+    void setUseGlobalUnitMap(bool value);
 
 private slots:
     void on_dataChanged(const QModbusDataUnit& data);