Fixed a bug where slave simulator would not run on an address other than 1.

Author: SciFiDryer

nbproject/project.properties

@@ -35,19 +35,18 @@ endorsed.classpath=
 excludes=
 file.reference.etherip.jar=/Users/matthew/Downloads/ModbusMechanic/lib/etherip.jar
 file.reference.etherip.jar-1=C:\\Users\\JAMESMA\\Downloads\\etherip-master\\etherip-master\\dist\\etherip.jar
-file.reference.jlibmodbus-1.2.9.7.jar=/Users/matthew/Downloads/ModbusMechanic/lib/jlibmodbus-1.2.9.7.jar
+file.reference.jlibmodbus-1.2.9.7.jar=C:\\Users\\JAMESMA\\Downloads\\ModbusMechanic.v2.2.1\\ModbusMechanic\\lib\\jlibmodbus-1.2.9.7.jar
 file.reference.jlibmodbus-1.2.9.7.jar-1=C:\\Users\\JAMESMA\\Downloads\\jlibmodbus-1.2.9.7.jar
 file.reference.jna-5.12.1.jar-1=C:\\Users\\JAMESMA\\Downloads\\ModbusMechanic.v2.2.1\\ModbusMechanic\\lib\\jna-5.12.1.jar
 file.reference.purejavacomm.jar=/Users/matthew/Downloads/purejavacomm.jar
 file.reference.purejavacomm.jar-1=C:\\Users\\JAMESMA\\Downloads\\ModbusMechanic.v2.2.1\\ModbusMechanic\\lib\\purejavacomm.jar
 includes=**
 jar.compress=false
 javac.classpath=\
-    ${file.reference.etherip.jar}:\
-    ${file.reference.jlibmodbus-1.2.9.7.jar}:\
     ${file.reference.etherip.jar-1}:\
     ${file.reference.purejavacomm.jar-1}:\
-    ${file.reference.jna-5.12.1.jar-1}
+    ${file.reference.jna-5.12.1.jar-1}:\
+    ${file.reference.jlibmodbus-1.2.9.7.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

src/modbusmechanic/ModbusMechanic.java

@@ -47,7 +47,7 @@ public class ModbusMechanic {
      * @param args the command line arguments
      */
     //version in numeric form major,minor,rev
-    public static int[] versionArray = { 2,3,0 };
+    public static int[] versionArray = { 2,4,0 };
     public static int RESPONSE_TYPE_ASCII = 1;
     public static int RESPONSE_TYPE_FLOAT = 2;
     public static int RESPONSE_TYPE_UINT16 = 3;
@@ -431,7 +431,7 @@ public static String byteToHex(byte[] buf)
         }
         return sb.toString();
     }
-    public static void startSlaveSimulatorTCP(int port, java.util.ArrayList registerList)
+    public static void startSlaveSimulatorTCP(int serverAddress, int port, java.util.ArrayList registerList)
     {
 
         try
@@ -440,7 +440,7 @@ public static void startSlaveSimulatorTCP(int port, java.util.ArrayList register
             parameters.setHost(InetAddress.getLocalHost());
             parameters.setPort(port);
             slave = ModbusSlaveFactory.createModbusSlaveTCP(parameters);
-            slave.setServerAddress(1);
+            slave.setServerAddress(serverAddress);
             slave.setReadTimeout(30000);
             slave.setDataHolder(new SimulatorDataHolder(registerList));
             slave.listen();

src/modbusmechanic/PacketFrame.java

@@ -1572,7 +1572,7 @@ private void jMenuItem1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI
         SlaveSimulatorFrame theFrame = new SlaveSimulatorFrame(slaveId);
         if (simulatorType == 0)
         {
-            ModbusMechanic.startSlaveSimulatorTCP(502, theFrame.getRegisterList());
+            ModbusMechanic.startSlaveSimulatorTCP(slaveId, 502, theFrame.getRegisterList());
         }
         else
         {