update Efem MapRoutine

CyberX8_RT/Config/Devices/WagoControllerCfg.xml

@@ -76,9 +76,10 @@
 			<AI Name="AI1"  Address="0" Scaling="0=3276.7,-757=16383.5" DataType="short"/>
 			<AI Name="AI2"  Address="1" DataType="short"/>
 			<AI Name="AI3"  Address="2" DataType="short"/>
+			<AI Name="AI4"  Address="3" DataType="short"/>
 			<AI Name="r_LoaderA_LS_Vacuum_anlg"  Address="4" Scaling="1=0,5=-757.5" DataType="short"/>
 			<AI Name="r_LoaderB_LS_Vacuum_anlg"  Address="5" Scaling="1=0,5=-757.5" DataType="short"/>
-			<AI Name="AI6"  Address="5" DataType="short"/>
+			<AI Name="AI6"  Address="6" DataType="short"/>
 			<AI Name="r_LOADER_GasFlowSensor_FLOW"  Address="7" Scaling="1=0,5=500" DataType="short"/>
 		</AIGroup>
 		<AIGroup Name="N2">

CyberX8_RT/Config/Layout/ToolLayoutConfiguration.xml

@@ -890,7 +890,7 @@
 			<PermittedWaferSizeInMM>200</PermittedWaferSizeInMM>
 			<ResourceID>Dummy1</ResourceID>
 			<Type>Dummy</Type>
-			<MaxNumberOfSlots>16</MaxNumberOfSlots>
+			<MaxNumberOfSlots>25</MaxNumberOfSlots>
 			<DummyCassetteID>1</DummyCassetteID>
 		</Item>
 
@@ -899,7 +899,7 @@
 			<PermittedWaferSizeInMM>200</PermittedWaferSizeInMM>
 			<ResourceID>Dummy2</ResourceID>
 			<Type>Dummy</Type>
-			<MaxNumberOfSlots>16</MaxNumberOfSlots>
+			<MaxNumberOfSlots>25</MaxNumberOfSlots>
 			<DummyCassetteID>2</DummyCassetteID>
 		</Item>
 

CyberX8_RT/Config/System.sccfg

@@ -103,9 +103,9 @@
 			<config default="58" name="Cassete100Station" nameView="Cassete100Station" description="Wafer 150 Cassete station number" max="120" min="0" paramter="" tag="" unit="s" type="Integer"/>
 		</configs>
 		<configs name="Dummy1" nameView="Dummy1">
-			<config default="59" name="Cassete200Station" nameView="Cassete200Station" description="Wafer 200 Cassete station number" max="120" min="0" paramter="" tag="" unit="s" type="Integer"/>
-			<config default="60" name="Cassete150Station" nameView="Cassete150Station" description="Wafer 150 Cassete station number" max="120" min="0" paramter="" tag="" unit="s" type="Integer"/>
-			<config default="61" name="Cassete100Station" nameView="Cassete100Station" description="Wafer 150 Cassete station number" max="120" min="0" paramter="" tag="" unit="s" type="Integer"/>
+			<config default="64" name="Cassete200Station" nameView="Cassete200Station" description="Wafer 200 Cassete station number" max="120" min="0" paramter="" tag="" unit="s" type="Integer"/>
+			<config default="65" name="Cassete150Station" nameView="Cassete150Station" description="Wafer 150 Cassete station number" max="120" min="0" paramter="" tag="" unit="s" type="Integer"/>
+			<config default="66" name="Cassete100Station" nameView="Cassete100Station" description="Wafer 150 Cassete station number" max="120" min="0" paramter="" tag="" unit="s" type="Integer"/>
 		</configs>
 		<configs name="Dummy2" nameView="Dummy2">
 			<config default="62" name="Cassete200Station" nameView="Cassete200Station" description="Wafer 200 Cassete station number" max="120" min="0" paramter="" tag="" unit="s" type="Integer"/>

CyberX8_RT/Devices/EFEM/DummyDevice.cs

@@ -48,7 +48,7 @@ namespace CyberX8_RT.Devices.EFEM
         /// <summary>
         /// 是否存在Cassete
         /// </summary>
-        public bool HasCassette { get; set; }
+        public bool HasCassette { get { return _hasCassete; } }
         #endregion
         /// <summary>
         /// 构造函数
@@ -98,7 +98,7 @@ namespace CyberX8_RT.Devices.EFEM
             else if (variable == CASSETE_150_PRESENT)
             {
                 _cassete150Present = cassete;
-                if (cassete)
+                if (cassete&&!_cassete200Present)
                 {
                     _waferSize = WaferSize.WS6;
                 }
@@ -106,7 +106,7 @@ namespace CyberX8_RT.Devices.EFEM
             else if (variable == CASSETE_100_PRESENT)
             {
                 _cassete100Present = cassete;
-                if (cassete)
+                if (cassete&&!_cassete200Present&&!_cassete150Present)
                 {
                     _waferSize = WaferSize.WS4;
                 }

CyberX8_RT/Devices/EFEM/Loadport.cs

@@ -187,7 +187,7 @@ namespace CyberX8_RT.Devices.EFEM
             else if (variable == CASSETE_150_PRESENT)
             {
                 _cassete150Present = cassete;
-                if (cassete)
+                if (cassete&&!_cassete200Present)
                 {
                     WaferSize = WaferSize.WS6;
                 }
@@ -195,7 +195,7 @@ namespace CyberX8_RT.Devices.EFEM
             else if (variable == CASSETE_100_PRESENT)
             {
                 _cassete100Present = cassete;
-                if (cassete)
+                if (cassete && !_cassete200Present&&!_cassete150Present)
                 {
                     WaferSize = WaferSize.WS4;
                 }

CyberX8_RT/Devices/EFEM/SunWayRobot.cs

@@ -25,6 +25,7 @@ using MECF.Framework.Common.Beckhoff.Station;
 using System.Runtime.Remoting.Contexts;
 using System.Windows.Markup;
 using CyberX8_RT.Modules.LPs;
+using MECF.Framework.Common.ToolLayout;
 
 namespace CyberX8_RT.Devices.EFEM
 {
@@ -63,7 +64,7 @@ namespace CyberX8_RT.Devices.EFEM
                 }
                 else if (_busyTrig.M)
                 {
-                    int timeOut = 30000;
+                    int timeOut = 20000;
                     if (_busyWatch.ElapsedMilliseconds > timeOut)
                     {
                         _busyWatch.Stop();
@@ -844,19 +845,34 @@ namespace CyberX8_RT.Devices.EFEM
             {
                 return;
             }
+            if(!msg.StartsWith("MAP"))
+            {
+                return;
+            }
 
-            string[] sWaferInfo = msg.Split(' ');
+            string[] sWaferInfo = msg.Split(new char[] { ' ', '\r', '\n' });
             if (sWaferInfo.Length <= 2)
             {
                 return;
             }
+
             int slotMap = SC.GetValue<int>("EFEM.LoadPort.SlotNumber");
+
+            if (ModuleHelper.IsDummy(_currentMessage.Module))
+            {
+                DummyCassetteItem item = DummyCasseteItemManager.Instance.GetDummyCassetteItem(_currentMessage.Module.ToString());
+                if (item != null)
+                {
+                    slotMap = item.MaxNumberOfSlots;
+                }
+            }
+
             //Map 结果(1 1 1 1 1 1 1 ...0)
             int startIndex = 1;
             int count = slotMap >= sWaferInfo.Length-startIndex? sWaferInfo.Length-startIndex : slotMap;
             bool result = true;
 
-            for (int index = startIndex; index < count; index++)
+            for (int index = startIndex; index <= count; index++)
             {
                 int waferState = int.Parse(sWaferInfo[index]);
                 //合理的映射到内部支持的叠片/交叉片
@@ -923,7 +939,7 @@ namespace CyberX8_RT.Devices.EFEM
             else if (ModuleHelper.IsDummy(moduleName))
             {
                 DummyDevice dummyDevice = Singleton<RouteManager>.Instance.EFEM.GetDummyDevice(moduleName - ModuleName.Dummy1);
-                if (dummyDevice.HasCassette)
+                if (!dummyDevice.HasCassette)
                 {
                     LOG.WriteLog(eEvent.ERR_EFEM_COMMON_FAILED, Module.ToString(), $"{moduleName} does not have cassete.");
                     return 0;

CyberX8_RT/Instances/ToolLoader.cs

@@ -96,7 +96,7 @@ namespace CyberX8_RT.Instances
             BarcodeReaderConfigManager.Instance.Initialize();
             PowerSupplierDeviceConfigManager.Instance.Initialize();
             IOModuleManager.Instance.Initialize();
-            TwincatAdoManager.Instance.Initialize();
+            //TwincatAdoManager.Instance.Initialize();
             PersistentManager.Instance.Initialize();
             AlarmListManager.Instance.Initialize();
             Singleton<DeviceManager>.Instance.Initialize();

CyberX8_RT/Modules/EFEM/EfemMapDummyRoutine.cs

@@ -42,6 +42,7 @@ namespace CyberX8_RT.Modules.EFEM
         public EfemMapDummyRoutine(EfemBase efem) : base(ModuleName.EfemRobot)
         {
             _efem = efem;
+            _robotMapRoutine=new EfemRobotMapRoutine(efem);
         }
         /// <summary>
         /// 启动

CyberX8_RT/Modules/EFEM/EfemRobotMapRoutine.cs

@@ -77,7 +77,7 @@ namespace CyberX8_RT.Modules.EFEM
         }
         private bool GotoMap()
         {
-            return _efem.GotoMap(_module, Aitex.Sorter.Common.Hand.Blade1);
+            return _efem.GotoMap(_module, Hand.Blade1);
         }
         private bool Map()
         {
@@ -86,7 +86,7 @@ namespace CyberX8_RT.Modules.EFEM
 
         private bool Back()
         {
-            return _efem.GotoMap(_module, Aitex.Sorter.Common.Hand.Blade1, "RE");
+            return _efem.GotoMap(_module, Hand.Blade1, "RE");
         }
 
         private bool RequestMap()

CyberX8_RT/Modules/LPs/LoadPortMapRoutine.cs

@@ -11,6 +11,7 @@ using CyberX8_Core;
 using System.Windows.Controls;
 using CyberX8_RT.Modules.EFEM;
 using MECF.Framework.Common.Utilities;
+using CyberX8_RT.Devices.EFEM;
 
 namespace CyberX8_RT.Modules.LPs
 {
@@ -28,9 +29,10 @@ namespace CyberX8_RT.Modules.LPs
 
         private EfemRobotMapRoutine _robotMapRoutine;
 
-        public LoadPortMapRoutine(LoadPortModule lpModule) : base(ModuleHelper.Converter(lpModule.Module))
+        public LoadPortMapRoutine(LoadPortModule lpModule,EfemBase efemBase) : base(ModuleHelper.Converter(lpModule.Module))
         {
             Name = "Map";
+            _robotMapRoutine=new EfemRobotMapRoutine(efemBase);
         }
 
         public RState Start(params object[] objs)

CyberX8_RT/Modules/LPs/LoadPortModule.cs

@@ -203,7 +203,7 @@ namespace CyberX8_RT.Modules.LPs
             //_closeDoor = new LoadPortCloseDoorRoutine(this);
             _clamp = new LoadPortClampRoutine(this);
             //_dock = new LoadPortDockRoutine(this);
-            _map = new LoadPortMapRoutine(this);
+            _map = new LoadPortMapRoutine(this,_efem);
             //_openDoor = new LoadPortOpenDoorRoutine(this);
             _readCarrierId = new LoadPortReadCarrierIdRoutine(this);
             _writeCarrierId = new LoadPortWriteCarrierIdRoutine(this);

Framework/Common/Device/Wago/WagoControllerCfgManager.cs

@@ -95,7 +95,7 @@ namespace MECF.Framework.Common.Device.Wago
         /// <summary>
         /// 转换器
         /// </summary>
-        private IByteTransform byteTransform = new SmallEndianByteTransformBase();
+        private IByteTransform byteTransform = new BigEndianByteTransformBase();
         #endregion
         /// <summary>
         /// 初始化

Framework/Common/Device/Wago/WagoModbusDevice.cs

@@ -346,6 +346,7 @@ namespace MECF.Framework.Common.Device.Wago
                     if (command.CommandCode == AI_READ_CMD)
                     {
                         WagoControllerCfgManager.Instance.UpdateWagoAIData(_name, datas);
+                        LOG.WriteBackgroundLog(eEvent.INFO_WAGO, "Wago", string.Join(" ", Array.ConvertAll(datas,O=>O.ToString("X2"))));
                     }
                     else
                     {