summaryrefslogtreecommitdiffstats
path: root/examples/serialbus/modbus/slave
diff options
context:
space:
mode:
authorRalf Nolden <nolden@kde.org>2015-10-26 09:32:09 +0100
committerAlex Blasche <alexander.blasche@theqtcompany.com>2015-10-26 12:45:46 +0000
commit41c95cc03b1f6ee2f210a94c27c3e04ab71fef79 (patch)
tree61fb161ed80bb1f48f3b7a1358519ab89db0a424 /examples/serialbus/modbus/slave
parent4b710acd2c80a47197718d8067dd5ed6c926e79a (diff)
Rename slaveId to slaveAddress
Rename all occurrences of slaveId and according read write functions to slaveAddress to avoid confusion with the slave ID code for function code 17 Change-Id: Ia05096105d739317f6a4ac62ed589dc262828d43 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'examples/serialbus/modbus/slave')
-rw-r--r--examples/serialbus/modbus/slave/mainwindow.cpp2
-rw-r--r--examples/serialbus/modbus/slave/mainwindow.ui2
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/serialbus/modbus/slave/mainwindow.cpp b/examples/serialbus/modbus/slave/mainwindow.cpp
index 0cbb0de..95407bd 100644
--- a/examples/serialbus/modbus/slave/mainwindow.cpp
+++ b/examples/serialbus/modbus/slave/mainwindow.cpp
@@ -126,7 +126,7 @@ void MainWindow::on_connectButton_clicked()
if (intendToConnect) {
modbusDevice->setPortName(ui->portEdit->text());
- modbusDevice->setSlaveId(ui->slaveEdit->text().toInt());
+ modbusDevice->setSlaveAddress(ui->slaveEdit->text().toInt());
if (!modbusDevice->connectDevice())
ui->errorLabel->setText(tr("Connect failed: ") + modbusDevice->errorString());
} else {
diff --git a/examples/serialbus/modbus/slave/mainwindow.ui b/examples/serialbus/modbus/slave/mainwindow.ui
index 706ddca..769d153 100644
--- a/examples/serialbus/modbus/slave/mainwindow.ui
+++ b/examples/serialbus/modbus/slave/mainwindow.ui
@@ -81,7 +81,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>Slave Id:</string>
+ <string>Slave Address:</string>
</property>
</widget>
</item>