From 1f2fa3f54d4a7b5a2f601c4c947a06476342e3bd Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期五, 22 一月 2021 09:23:06 +0800
Subject: [PATCH] 1. gocator驱动将system.stop移到system.ReceiveData之后 2. 修改测量完成后状态切换逻辑，避免安全光线等干扰 3. 添加设备异常输出日志记录 4. 产品结果输出时做硬盘文件记录
---
src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj b/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj
index 68c7b28..4d1cb18 100644
--- a/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj
+++ b/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj
@@ -89,6 +89,12 @@
<Compile Include="CtrlCameraRunBase.Designer.cs">
<DependentUpon>CtrlCameraRunBase.cs</DependentUpon>
</Compile>
+ <Compile Include="MotionCard\CtrlMotionCardAxisOperation.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="MotionCard\CtrlMotionCardAxisOperation.Designer.cs">
+ <DependentUpon>CtrlMotionCardAxisOperation.cs</DependentUpon>
+ </Compile>
<Compile Include="MotionCard\CtrlMotionCardAxisStatus.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -101,11 +107,11 @@
<Compile Include="MotionCard\CtrlMotionCardIOStatus.Designer.cs">
<DependentUpon>CtrlMotionCardIOStatus.cs</DependentUpon>
</Compile>
- <Compile Include="MotionCard\CtrlMotionCardOperationBase.cs">
- <SubType>UserControl</SubType>
+ <Compile Include="MotionCard\FrmMotionCardOperationBase.cs">
+ <SubType>Form</SubType>
</Compile>
- <Compile Include="MotionCard\CtrlMotionCardOperationBase.Designer.cs">
- <DependentUpon>CtrlMotionCardOperationBase.cs</DependentUpon>
+ <Compile Include="MotionCard\FrmMotionCardOperationBase.Designer.cs">
+ <DependentUpon>FrmMotionCardOperationBase.cs</DependentUpon>
</Compile>
<Compile Include="CtrlPLCRunBase.cs">
<SubType>UserControl</SubType>
@@ -130,14 +136,17 @@
<EmbeddedResource Include="CtrlCameraRunBase.resx">
<DependentUpon>CtrlCameraRunBase.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="MotionCard\CtrlMotionCardAxisOperation.resx">
+ <DependentUpon>CtrlMotionCardAxisOperation.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="MotionCard\CtrlMotionCardAxisStatus.resx">
<DependentUpon>CtrlMotionCardAxisStatus.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MotionCard\CtrlMotionCardIOStatus.resx">
<DependentUpon>CtrlMotionCardIOStatus.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="MotionCard\CtrlMotionCardOperationBase.resx">
- <DependentUpon>CtrlMotionCardOperationBase.cs</DependentUpon>
+ <EmbeddedResource Include="MotionCard\FrmMotionCardOperationBase.resx">
+ <DependentUpon>FrmMotionCardOperationBase.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="CtrlPLCRunBase.resx">
<DependentUpon>CtrlPLCRunBase.cs</DependentUpon>
@@ -158,10 +167,6 @@
<ProjectReference Include="..\Bro.Common.Model\Bro.Common.Model.csproj">
<Project>{1A3CBFE7-3F78-42C3-95C5-10360450DBEA}</Project>
<Name>Bro.Common.Model</Name>
- </ProjectReference>
- <ProjectReference Include="..\Bro.Device.GTSCard\Bro.Device.GTSCard.csproj">
- <Project>{B536003E-70BA-4701-B8FD-BAFA303AB4E2}</Project>
- <Name>Bro.Device.GTSCard</Name>
</ProjectReference>
<ProjectReference Include="..\Bro.UI.Model.Winform\Bro.UI.Model.Winform.csproj">
<Project>{741f6491-57c7-479a-b391-09bba9fba9dc}</Project>
--
Gitblit v1.8.0