Merge remote-tracking branch 'origin/dev'

Author: sanny32

omodscan/formmodsca.cpp

@@ -627,8 +627,9 @@ void FormModSca::beginUpdate()
 
     const auto dd = displayDefinition();
     const auto addr = dd.PointAddress - (dd.ZeroBasedAddress ?  0 : 1);
-    if(addr + dd.Length <= ModbusLimits::addressRange(dd.ZeroBasedAddress).to())
+    if(addr + dd.Length <= ModbusLimits::addressRange(dd.ZeroBasedAddress).to()) {
         _modbusClient.sendReadRequest(dd.PointType, addr, dd.Length, dd.DeviceId, _formId);
+    }
     else
         ui->outputWidget->setStatus(tr("No Scan: Invalid Data Length Specified"));
 
@@ -794,7 +795,7 @@ void FormModSca::on_modbusConnected(const ConnectionDetails&)
     ui->outputWidget->setProtocol(protocol);
     ui->outputWidget->clearLogView();
 
-    beginUpdate();
+    setPollState(PollState::Running);
 }
 
 ///

omodscan/translations/omodscan_cn.ts

@@ -1678,12 +1678,12 @@ Valid Slave Responses: %2</source>
 有效的从站响应：%2</translation>
     </message>
     <message>
-        <location filename="../formmodsca.cpp" line="633"/>
+        <location filename="../formmodsca.cpp" line="634"/>
         <source>No Scan: Invalid Data Length Specified</source>
         <translation>指定的数据长度无效</translation>
     </message>
     <message>
-        <location filename="../formmodsca.cpp" line="806"/>
+        <location filename="../formmodsca.cpp" line="807"/>
         <source>Device NOT CONNECTED!</source>
         <translation>设备未连接！</translation>
     </message>
@@ -1693,7 +1693,7 @@ Valid Slave Responses: %2</source>
         <translation>设备未响应</translation>
     </message>
     <message>
-        <location filename="../formmodsca.cpp" line="760"/>
+        <location filename="../formmodsca.cpp" line="761"/>
         <source>Received Invalid Response MODBUS Query</source>
         <translation>接收到无效的 MODBUS 请求响应</translation>
     </message>

omodscan/translations/omodscan_ru.ts

@@ -1666,12 +1666,12 @@ Valid Slave Responses: %2</source>
 Корректных ответов устройства: %2</translation>
     </message>
     <message>
-        <location filename="../formmodsca.cpp" line="633"/>
+        <location filename="../formmodsca.cpp" line="634"/>
         <source>No Scan: Invalid Data Length Specified</source>
         <translation>Нет опроса: указана недопустимая длина данных</translation>
     </message>
     <message>
-        <location filename="../formmodsca.cpp" line="806"/>
+        <location filename="../formmodsca.cpp" line="807"/>
         <source>Device NOT CONNECTED!</source>
         <translation>Устройство НЕ ПОДКЛЮЧЕНО!</translation>
     </message>
@@ -1681,7 +1681,7 @@ Valid Slave Responses: %2</source>
         <translation>Нет ответа от устройства</translation>
     </message>
     <message>
-        <location filename="../formmodsca.cpp" line="760"/>
+        <location filename="../formmodsca.cpp" line="761"/>
         <source>Received Invalid Response MODBUS Query</source>
         <translation>Получен некорректный ответ на запрос MODBUS</translation>
     </message>

omodscan/translations/omodscan_zh.ts

@@ -1677,12 +1677,12 @@ Valid Slave Responses: %2</source>
 有效的從站回應：%2</translation>
     </message>
     <message>
-        <location filename="../formmodsca.cpp" line="633"/>
+        <location filename="../formmodsca.cpp" line="634"/>
         <source>No Scan: Invalid Data Length Specified</source>
         <translation>沒有掃描：指定的數據長度無效</translation>
     </message>
     <message>
-        <location filename="../formmodsca.cpp" line="806"/>
+        <location filename="../formmodsca.cpp" line="807"/>
         <source>Device NOT CONNECTED!</source>
         <translation>裝置未連繫！</translation>
     </message>
@@ -1692,7 +1692,7 @@ Valid Slave Responses: %2</source>
         <translation>從裝置未回應</translation>
     </message>
     <message>
-        <location filename="../formmodsca.cpp" line="760"/>
+        <location filename="../formmodsca.cpp" line="761"/>
         <source>Received Invalid Response MODBUS Query</source>
         <translation>接收到無效的 MODBUS 要求回應</translation>
     </message>