From 0d10528b430721512e0e93e0d455fcec44207ec9 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 14 七月 2020 18:27:10 +0800
Subject: [PATCH] 1. 板卡驱动实现运动暂停/继续功能，板卡动作衔接实现暂停/继续 2. 修复部分调试bug 3. 安全光幕/安全门功能调整
---
src/Bro.Common.Model/Bro.Common.Model.csproj | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/Bro.Common.Model/Bro.Common.Model.csproj b/src/Bro.Common.Model/Bro.Common.Model.csproj
index de64a2e..5bb013e 100644
--- a/src/Bro.Common.Model/Bro.Common.Model.csproj
+++ b/src/Bro.Common.Model/Bro.Common.Model.csproj
@@ -76,9 +76,8 @@
<Reference Include="Autofac, Version=4.9.4.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\..\packages\Autofac.4.9.4\lib\net45\Autofac.dll</HintPath>
</Reference>
- <Reference Include="dog_net_windows, Version=1.0.1.28668, Culture=neutral, PublicKeyToken=56120be447701319, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\T047\libs\SafetyDog\dog_net_windows.dll</HintPath>
+ <Reference Include="dog_net_windows">
+ <HintPath>..\..\libs\SafetyDog\dog_net_windows.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -151,8 +150,10 @@
<Compile Include="Model\CustomizedPoint.cs" />
<Compile Include="Model\CustomizedRectangle.cs" />
<Compile Include="Model\DeviceOpBind.cs" />
+ <Compile Include="Model\LaserScanParam.cs" />
<Compile Include="Model\ModbusFrame.cs" />
<Compile Include="Model\MonitorSet.cs" />
+ <Compile Include="Model\MotionCardRelated.cs" />
<Compile Include="Model\PageRequest.cs" />
<Compile Include="Model\IOItem.cs" />
<Compile Include="Model\PLCItem.cs" />
--
Gitblit v1.8.0