Skip to content

Commit 73416f1

Browse files
committed
Added response timeout for register scanner.
1 parent d51458a commit 73416f1

File tree

2 files changed

+37
-4
lines changed

2 files changed

+37
-4
lines changed

src/modbusmechanic/RegisterScannerFrame.form

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,10 +331,21 @@
331331
</Component>
332332
<Component class="javax.swing.JTextField" name="endRegisterField">
333333
<Properties>
334-
<Property name="columns" type="int" value="3"/>
334+
<Property name="columns" type="int" value="4"/>
335335
<Property name="text" type="java.lang.String" value="65535"/>
336336
</Properties>
337337
</Component>
338+
<Component class="javax.swing.JLabel" name="jLabel7">
339+
<Properties>
340+
<Property name="text" type="java.lang.String" value="Response timeout (ms):"/>
341+
</Properties>
342+
</Component>
343+
<Component class="javax.swing.JTextField" name="responseTimeoutField">
344+
<Properties>
345+
<Property name="columns" type="int" value="4"/>
346+
<Property name="text" type="java.lang.String" value="100"/>
347+
</Properties>
348+
</Component>
338349
</SubComponents>
339350
</Container>
340351
<Container class="javax.swing.JPanel" name="jPanel7">

src/modbusmechanic/RegisterScannerFrame.java

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ private void initComponents() {
8484
startRegisterField = new javax.swing.JTextField();
8585
jLabel6 = new javax.swing.JLabel();
8686
endRegisterField = new javax.swing.JTextField();
87+
jLabel7 = new javax.swing.JLabel();
88+
responseTimeoutField = new javax.swing.JTextField();
8789
jPanel7 = new javax.swing.JPanel();
8890
jLabel9 = new javax.swing.JLabel();
8991
hideZeroValCheckbox = new javax.swing.JCheckBox();
@@ -107,7 +109,6 @@ private void initComponents() {
107109
);
108110

109111
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
110-
setPreferredSize(new java.awt.Dimension(486, 450));
111112

112113
jPanel1.setLayout(new javax.swing.BoxLayout(jPanel1, javax.swing.BoxLayout.Y_AXIS));
113114

@@ -252,10 +253,17 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
252253
jLabel6.setText("End register:");
253254
jPanel5.add(jLabel6);
254255

255-
endRegisterField.setColumns(3);
256+
endRegisterField.setColumns(4);
256257
endRegisterField.setText("65535");
257258
jPanel5.add(endRegisterField);
258259

260+
jLabel7.setText("Response timeout (ms):");
261+
jPanel5.add(jLabel7);
262+
263+
responseTimeoutField.setColumns(4);
264+
responseTimeoutField.setText("100");
265+
jPanel5.add(responseTimeoutField);
266+
259267
jPanel1.add(jPanel5);
260268

261269
jLabel9.setText(bundle.getString("PacketFrame.jLabel9.text")); // NOI18N
@@ -435,7 +443,19 @@ public void run()
435443
}
436444
if (master != null)
437445
{
438-
master.setResponseTimeout(50);
446+
int responseTimeout = 100;
447+
try
448+
{
449+
responseTimeout = Integer.parseInt(responseTimeoutField.getText());
450+
}
451+
catch (Exception e)
452+
{
453+
if (ModbusMechanic.debug)
454+
{
455+
e.printStackTrace();
456+
}
457+
}
458+
master.setResponseTimeout(responseTimeout);
439459
try
440460
{
441461
startIndex = Integer.parseInt(startRegisterField.getText());
@@ -642,6 +662,7 @@ public void run() {
642662
private javax.swing.JLabel jLabel4;
643663
private javax.swing.JLabel jLabel5;
644664
private javax.swing.JLabel jLabel6;
665+
private javax.swing.JLabel jLabel7;
645666
private javax.swing.JLabel jLabel9;
646667
private javax.swing.JLayeredPane jLayeredPane1;
647668
private javax.swing.JPanel jPanel1;
@@ -656,6 +677,7 @@ public void run() {
656677
private javax.swing.JComboBox<String> paritySelector;
657678
private javax.swing.JTextField portField;
658679
private javax.swing.JTable registerTable;
680+
private javax.swing.JTextField responseTimeoutField;
659681
private javax.swing.JRadioButton rtuMsgButton;
660682
private javax.swing.JPanel serialPanel;
661683
private javax.swing.JTextField slaveNodeField;

0 commit comments

Comments
 (0)