aio代码更新

DoubleLineClient_3D.sln

 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.3.32811.315
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31613.86
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "source\Common\Common.csproj", "{43CDD09E-FCF3-4960-A01D-3BBFE9933122}"
 EndProject
@@ -15,7 +15,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ABBRobotTest", "source\ABBR
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DoubleLineClient", "source\DoubleLineClient_3D\DoubleLineClient.csproj", "{0D2542F5-DD62-4352-82D0-383D9A045E74}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DL.IOModule", "..\RC1250-FeederLineClient\source\DL.IOModule\DL.IOModule.csproj", "{F85A7412-B5B3-4291-A448-A10564602E1A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DL.IOModule", "source\DL.IOModule\DL.IOModule.csproj", "{F85A7412-B5B3-4291-A448-A10564602E1A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

source/DeviceLibrary/DeviceLibrary.csproj

@@ -88,6 +88,7 @@
     <Compile Include="agvClient\AgvClient_Dbline.cs" />
     <Compile Include="bean\RobotBase.cs" />
     <Compile Include="deviceLibrary\ABB\ABBControl.cs" />
+    <Compile Include="deviceLibrary\IO\AIOBOX\AIOBOX.cs" />
     <Compile Include="doubleLine\DoubleLineBean.cs" />
     <Compile Include="doubleLine\DoubleLineBean_bufShelf.cs" />
     <Compile Include="doubleLine\DoubleLineBean_lineShelf.cs" />
@@ -120,10 +121,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\RC1250-FeederLineClient\source\DL.IOModule\DL.IOModule.csproj">
-      <Project>{f85a7412-b5b3-4291-a448-a10564602e1a}</Project>
-      <Name>DL.IOModule</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Common\Common.csproj">
       <Project>{43cdd09e-fcf3-4960-a01d-3bbfe9933122}</Project>
       <Name>Common</Name>

source/DeviceLibrary/deviceLibrary/IO/AIOBOX/AIOBOXManager.cs

@@ -9,8 +9,8 @@ using OnlineStore.Common;
 using OnlineStore.LoadCSVLibrary;
 using System.Threading.Tasks;
 //using Asa.IOModule; 
-using DL.IOModule;
 using System.Windows.Forms;
+using Asa.IOModule;
 
 namespace OnlineStore.DeviceLibrary
 {
@@ -82,9 +82,9 @@ namespace OnlineStore.DeviceLibrary
             string logName = "IO模块[" + ioIp + "] DI[" + DILength + "]  DO[" + DOLength + "]，[" + DIMS + "] [" + DOMS + "]";
             try
             {
-                aioBox = new AIOBOX();
+                aioBox = new AIOBOX(Box_Type.DI, DILength,Box_Type.DO,DOLength);
                 aioBox.IP = ioIp;
-                aioBox.SetType(IOType.DI, DILength, IOType.DO, DOLength);
+                //aioBox.SetType(IOType.DI, DILength, IOType.DO, DOLength);
                 //DI主动上传
                 aioBox.Upload = true;
 

source/DeviceLibrary/deviceLibrary/IO/IOManager.cs

@@ -23,9 +23,18 @@ namespace OnlineStore.DeviceLibrary
                 ConfigIO configIo = LineManager.Config.DOList[ioType];
                 instance.WriteSingleDO(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr(), ioValue);
                 Thread.Sleep(60);
-                while (!IOValue(ioType).Equals(ioValue))
+
+                int tryTime = 0;
+                while (tryTime < 10)
+                {
+                    IO_VALUE currValue = instance.GetDOValue(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr());
+                    if (currValue.Equals(ioValue))
                     {
+                        break;
+                    }
                     instance.WriteSingleDO(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr(), ioValue);
+                    tryTime++;
+                    LogUtil.error("IOMove: tryTime=" + tryTime + ", ioType =" + ioType + ",ioValue=" + ioValue + ",currValue=" + currValue);
                     Thread.Sleep(60);
                 }
             }

source/DeviceLibrary/doubleLine/DoubleLineBean_lineShelf.cs

@@ -175,8 +175,14 @@ namespace OnlineStore.DeviceLibrary
             else
             {
                 inLineWatch.Stop();
+                if (MoveInfo.MoveType.Equals(LineMoveType.LeftShelf)&&MoveInfo.MoveStep.Equals(MoveStep.SI04_InStopDown))
+                {
+                }
+                else
+                { 
                     CheckAndMove(IO_Type.Line_StopCylinder, IO_VALUE.LOW);
                 }
+            }
 
             //右侧出口
             if (IOValue(IO_Type.R_StopCheck1).Equals(IO_VALUE.HIGH) && ROutProcess.Equals(false))