修改TcpModbus Tools Tcp连接使用端口为可配置

modbus/modbus_tools/modbusConnect.ini

@@ -1,5 +1,5 @@
 [MODBUS_SLAVE]
-SLAVE_IP_ADDR=192.168.1.21
-SLAVE_IP_PORT=1502
+SLAVE_IP_ADDR=192.168.1.7
+SLAVE_IP_PORT=503
 
 

modbus/modbus_tools/modbus_tools.cpp

@@ -19,5 +19,5 @@ int main(int argc, char** argv)
 	printf("modbus tools: as modbus master\n");
 	xGet_config_from_file();
 	xModbus_master_task_init();//MODBUS thread
-	while (1);
+	while (1) { Sleep(1000); }
 }

modbus/modbus_tools/modbus_tools.vcxproj

@@ -23,26 +23,26 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{7f9f9a08-25dc-4ef3-bdfd-6e8490445c12}</ProjectGuid>
     <RootNamespace>modbustools</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -50,7 +50,7 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

modbus/modbus_tools/ysp_modbus_master.cpp

@@ -84,7 +84,7 @@ DWORD WINAPI xModbus_master_Proc(LPVOID lp) {
 
 
 		if (use_backend == TCP) {
-			ctx = modbus_new_tcp(slave_ip_addr, 1502);
+			ctx = modbus_new_tcp(slave_ip_addr, slave_tcp_port);
 			//modbus_set_slave(ctx, SERVER_ID); 
 		}