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 | 12 ++++++------ 1 files changed, 6 insertions(+), 6 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 5b0a3f6..4d1cb18 100644 --- a/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj +++ b/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj @@ -107,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> @@ -145,8 +145,8 @@ <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> -- Gitblit v1.8.0