Simulation interval in msecs

Author: sanny32

omodsim/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.25)
 
 project(OpenModSim 
-        VERSION 1.8.1 
+        VERSION 1.8.0
         LANGUAGES CXX)
 
 set(CMAKE_AUTOUIC ON)

omodsim/datasimulator.cpp

@@ -140,7 +140,7 @@ void DataSimulator::on_timeout()
         const auto params = _simulationMap[key].Params;
         const auto interval = params.Interval;
 
-        if(_elapsed % interval) continue;
+        if((_elapsed * _interval) % interval) continue;
 
         switch(params.Mode)
         {
@@ -203,6 +203,7 @@ void DataSimulator::randomSimulation(DataDisplayMode mode, QModbusDataUnit::Regi
                 case DataDisplayMode::Int16:
                 case DataDisplayMode::UInt16:
                 case DataDisplayMode::Hex:
+                case DataDisplayMode::Ansi:
                     value = generateRandom<quint16>(params.Range.from(), params.Range.to() + 1);
                 break;
 

omodsim/datasimulator.h

@@ -45,7 +45,7 @@ private slots:
 private:
     QTimer _timer;
     quint32 _elapsed;
-    const int _interval = 1000;
+    const int _interval = 1;
 
     struct SimulationParams {
         DataDisplayMode Mode;

omodsim/dialogs/dialogautosimulation.cpp

@@ -23,7 +23,7 @@ DialogAutoSimulation::DialogAutoSimulation(DataDisplayMode mode, ModbusSimulatio
     else
         ui->comboBoxSimulationType->setCurrentIndex(0);
 
-    ui->lineEditInterval->setInputRange(1, 60000);
+    ui->lineEditInterval->setInputRange(100, 6000000);
     ui->lineEditInterval->setValue(_params.Interval);
 
     switch(_displayMode)
@@ -66,6 +66,12 @@ DialogAutoSimulation::DialogAutoSimulation(DataDisplayMode mode, ModbusSimulatio
             ui->lineEditHighLimit->setInputRange(0, USHRT_MAX);
         break;
 
+        case DataDisplayMode::Ansi:
+            ui->lineEditStepValue->setInputRange(1, USHRT_MAX - 1);
+            ui->lineEditLowLimit->setInputRange(0, USHRT_MAX);
+            ui->lineEditHighLimit->setInputRange(0, USHRT_MAX);
+        break;
+
         case DataDisplayMode::FloatingPt:
         case DataDisplayMode::SwappedFP:
             ui->lineEditStepValue->setInputRange((float)1, FLT_MAX - 1);

omodsim/dialogs/dialogautosimulation.ui

@@ -51,14 +51,14 @@
         </size>
        </property>
        <property name="text">
-        <string>5</string>
+        <string notr="true">1000</string>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="labelInterval">
        <property name="text">
-        <string>Change Interval (secs):</string>
+        <string>Change Interval (msecs):</string>
        </property>
       </widget>
      </item>

omodsim/modbussimulationparams.h

@@ -119,7 +119,7 @@ struct ModbusSimulationParams
     RandomSimulationParams RandomParams;
     IncrementSimulationParams IncrementParams;
     DecrementSimulationParams DecrementParams;
-    quint32 Interval = 1;
+    quint32 Interval = 1000;
 };
 Q_DECLARE_METATYPE(ModbusSimulationParams)
 

omodsim/translations/omodsim_ru.ts

@@ -141,14 +141,13 @@
         <translation>Тип симуляции:</translation>
     </message>
     <message>
-        <location filename="../dialogs/dialogautosimulation.ui" line="54"/>
-        <source>5</source>
-        <translation></translation>
+        <source>Change Interval (secs):</source>
+        <translation type="vanished">Интервал (сек):</translation>
     </message>
     <message>
         <location filename="../dialogs/dialogautosimulation.ui" line="61"/>
-        <source>Change Interval (secs):</source>
-        <translation>Интервал (сек):</translation>
+        <source>Change Interval (msecs):</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../dialogs/dialogautosimulation.ui" line="68"/>