Skip to content

Commit 26ee4ad

Browse files
committed
Updated the function code for Write Holding Registers to 0x10
1 parent c9a8aa7 commit 26ee4ad

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/modbusmechanic/PacketFrame.form

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@
461461
<StringItem index="3" value="Read Input Registers (0x04)"/>
462462
<StringItem index="4" value="Preset (Write) Single Register (0x06)"/>
463463
<StringItem index="5" value="Write Coils (0x15)"/>
464-
<StringItem index="6" value="Write Holding Registers (0x16)"/>
464+
<StringItem index="6" value="Write Holding Registers (0x10)"/>
465465
</StringArray>
466466
</Property>
467467
<Property name="selectedIndex" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">

src/modbusmechanic/PacketFrame.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
320320

321321
jLayeredPane1.add(jPanel5, "card4");
322322

323-
functionSelector.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Read Coils (0x01)", "Read Discrete Inputs (0x02)", "Read Holding Registers (0x03)", "Read Input Registers (0x04)", "Preset (Write) Single Register (0x06)", "Write Coils (0x15)", "Write Holding Registers (0x16)" }));
323+
functionSelector.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Read Coils (0x01)", "Read Discrete Inputs (0x02)", "Read Holding Registers (0x03)", "Read Input Registers (0x04)", "Preset (Write) Single Register (0x06)", "Write Coils (0x15)", "Write Holding Registers (0x10)" }));
324324
functionSelector.setSelectedIndex(2);
325325
functionSelector.addActionListener(new java.awt.event.ActionListener() {
326326
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -691,7 +691,7 @@ private void transmitPacket() throws NumberFormatException
691691
functionCode = ModbusMechanic.WRITE_SINGLE_REGISTER_CODE;
692692
writingFlag = true;
693693
}
694-
if (functionSelector.getSelectedItem().equals("Write Holding Registers (0x16)"))
694+
if (functionSelector.getSelectedItem().equals("Write Holding Registers (0x10)"))
695695
{
696696
functionCode = ModbusMechanic.WRITE_HOLDING_REGISTERS_CODE;
697697
writingFlag = true;
@@ -1370,7 +1370,7 @@ public void fireSelectionEvent()
13701370
{
13711371
writeFlag = true;
13721372
}
1373-
if (functionSelector.getSelectedItem().equals("Read Holding Registers (0x03)") || functionSelector.getSelectedItem().equals("Read Input Registers (0x04)") || functionSelector.getSelectedItem().equals("Write Holding Registers (0x16)"))
1373+
if (functionSelector.getSelectedItem().equals("Read Holding Registers (0x03)") || functionSelector.getSelectedItem().equals("Read Input Registers (0x04)") || functionSelector.getSelectedItem().equals("Write Holding Registers (0x10)"))
13741374
{
13751375
wordsFlag = true;
13761376
}
@@ -1458,7 +1458,7 @@ public void fireSelectionEvent()
14581458
jPanel5.setVisible(false);
14591459
functionSelector.setVisible(true);
14601460
}
1461-
if (asciiReadButton.isSelected() && functionSelector.getSelectedItem().equals("Write Holding Registers (0x16)"))
1461+
if (asciiReadButton.isSelected() && functionSelector.getSelectedItem().equals("Write Holding Registers (0x10)"))
14621462
{
14631463
quantityField.setEnabled(false);
14641464
}
@@ -1598,7 +1598,7 @@ private void valueFieldKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:eve
15981598
}//GEN-LAST:event_valueFieldKeyReleased
15991599

16001600
private void bitsButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bitsButtonActionPerformed
1601-
if (functionSelector.getSelectedItem().equals("Write Holding Registers (0x16)"))
1601+
if (functionSelector.getSelectedItem().equals("Write Holding Registers (0x10)"))
16021602
{
16031603
if (u16ReadButton.isSelected())
16041604
{

0 commit comments

Comments
 (0)