vcrmn/CheckDevice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.star-rising.cn/vcrmn/CheckDevice

Browse Source
This commit is contained in:
Maikouce China
2025-10-20 17:28:25 +08:00
parent 715d7166bc 679320311d
commit 165963d337
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Check.Main/Check.Main.csproj
View File

@@ -39,7 +39,7 @@
<HintPath>..\..\..\HslCommunication-master\HslCommunication.dll</HintPath> <HintPath>..\..\..\HslCommunication-master\HslCommunication.dll</HintPath>
</Reference> </Reference>
<Reference Include="MvCameraControl.Net"> <Reference Include="MvCameraControl.Net">
<HintPath>C:\Program Files (x86)\MVS\Development\DotNet\win64\MvCameraControl.Net.dll</HintPath> <HintPath>..\..\XKRS2025\CheckDevice\Check.Main\bin\Debug\MvCameraControl.Net.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>

4
Check.Main/Common/PLC_Control_Base.cs
View File

@@ -2,7 +2,7 @@
using HslCommunication.ModBus; using HslCommunication.ModBus;
using System; using System;
using System.Net.Sockets; using System.Net.Sockets;
//
// ModbusTcp读写服务类，线程安全，互斥锁 // ModbusTcp读写服务类，线程安全，互斥锁
namespace Check.Main.Common namespace Check.Main.Common
{ {
@@ -12,7 +12,7 @@ namespace Check.Main.Common
private readonly ModbusTcpNet _plc; private readonly ModbusTcpNet _plc;
private readonly object _lock = new(); private readonly object _lock = new();
public bool IsConnected => _tcpClient != null && _tcpClient.Connected;// public bool IsConnected => _tcpClient != null && _tcpClient.Connected;//
//
public ModbusTcpService(string ip, int port = 502, byte station = 1) public ModbusTcpService(string ip, int port = 502, byte station = 1)
{ {
_plc = new ModbusTcpNet(ip, port, station) _plc = new ModbusTcpNet(ip, port, station)

2
Check.Main/Process_Img.cs
View File

@@ -9,7 +9,7 @@ using System.Collections.Concurrent;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Diagnostics; using System.Diagnostics;
using System.Threading; using System.Threading;
//cyf
public class ProcessImg public class ProcessImg
{ {
// 对单个图像进行模板匹配 // 对单个图像进行模板匹配