From 4d5d66268b9e323a2848c601a6d3b2d87b8525b1 Mon Sep 17 00:00:00 2001
From: huyizhong <huyizhong@xinyingpower.com>
Date: Mon, 1 Jul 2024 13:55:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9TcpModbus=20Tools=20Tcp?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E4=BD=BF=E7=94=A8=E7=AB=AF=E5=8F=A3=E4=B8=BA?=
 =?UTF-8?q?=E5=8F=AF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modbus/modbus_tools/modbusConnect.ini     |  4 ++--
 modbus/modbus_tools/modbus_tools.cpp      |  2 +-
 modbus/modbus_tools/modbus_tools.vcxproj  | 12 ++++++------
 modbus/modbus_tools/ysp_modbus_master.cpp |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modbus/modbus_tools/modbusConnect.ini b/modbus/modbus_tools/modbusConnect.ini
index c1440fa..2547c71 100644
--- a/modbus/modbus_tools/modbusConnect.ini
+++ b/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
 
 
diff --git a/modbus/modbus_tools/modbus_tools.cpp b/modbus/modbus_tools/modbus_tools.cpp
index 05d0bcf..82d7d32 100644
--- a/modbus/modbus_tools/modbus_tools.cpp
+++ b/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); }
 }
diff --git a/modbus/modbus_tools/modbus_tools.vcxproj b/modbus/modbus_tools/modbus_tools.vcxproj
index 374d6bf..bb3d72b 100644
--- a/modbus/modbus_tools/modbus_tools.vcxproj
+++ b/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">
diff --git a/modbus/modbus_tools/ysp_modbus_master.cpp b/modbus/modbus_tools/ysp_modbus_master.cpp
index cc74d9d..fc548bb 100644
--- a/modbus/modbus_tools/ysp_modbus_master.cpp
+++ b/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); 
 		}