Skip to content

Commit f837c33

Browse files
committed
Add 'tries'-setting for Modbus Scanner
1 parent f944757 commit f837c33

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/client/gui/scanner/client_scanner.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ const mbClientScanner::Strings &mbClientScanner::Strings::instance()
287287
mbClientScanner::Defaults::Defaults() :
288288
type (Modbus::Defaults::instance().type),
289289
timeout (1000),
290-
tries (1),
290+
tries (Modbus::Defaults::instance().tries),
291291
unitStart(Modbus::VALID_MODBUS_ADDRESS_BEGIN),
292292
unitEnd (Modbus::VALID_MODBUS_ADDRESS_END),
293293
request (mbClientScanner::createRequestParam2(MBF_READ_HOLDING_REGISTERS, 0, 1))

src/client/gui/scanner/client_scannerui.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ void mbClientScannerUi::slotStart()
280280
mbClientScanner::setSettingUnitEnd(s, ui->spUnitEnd->value());
281281
Modbus::setSettingType(s, type);
282282
Modbus::setSettingTimeout(s, ui->spTimeout->value());
283+
Modbus::setSettingTries(s, ui->spTries->value());
283284
Modbus::setSettingSerialPortName(s, ui->cmbSerialPortName->currentText());
284285
mbClientScanner::setSettingBaudRate(s, getValues(ui->lsBaudRate));
285286
mbClientScanner::setSettingDataBits(s, getValues(ui->lsDataBits));

src/client/gui/scanner/client_scannerui.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@
130130
</property>
131131
<property name="maximumSize">
132132
<size>
133-
<width>30</width>
134-
<height>16777215</height>
133+
<width>22</width>
134+
<height>22</height>
135135
</size>
136136
</property>
137137
<property name="text">

0 commit comments

Comments
 (0)