Skip to content

Commit 40dd998

Browse files
author
Ананьев Александр
committed
Correct display definitions normalization
1 parent b4ce6c7 commit 40dd998

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

omodsim/displaydefinition.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include <QSettings>
55
#include <QModbusDataUnit>
6+
#include "modbuslimits.h"
67

78
///
89
/// \brief The DisplayDefinition struct
@@ -18,10 +19,10 @@ struct DisplayDefinition
1819
void normalize()
1920
{
2021
UpdateRate = qBound(20U, UpdateRate, 10000U);
21-
DeviceId = qBound<quint8>(1, DeviceId, 255);
22-
PointAddress = qMax<quint16>(1U, PointAddress);
22+
DeviceId = qMax<quint8>(ModbusLimits::slaveRange().from(), DeviceId);
23+
PointAddress = qMax<quint16>(ModbusLimits::addressRange().from(), PointAddress);
2324
PointType = qBound(QModbusDataUnit::DiscreteInputs, PointType, QModbusDataUnit::HoldingRegisters);
24-
Length = qBound<quint16>(1, Length, 200);
25+
Length = qBound<quint16>(ModbusLimits::lengthRange().from(), Length, ModbusLimits::lengthRange().to());
2526
}
2627
};
2728
Q_DECLARE_METATYPE(DisplayDefinition)

0 commit comments

Comments
 (0)