Browse Source

Revise FFU;

niuyx 3 weeks ago
parent
commit
c2f7200a25

+ 21 - 27
Framework/RTEquipmentLibrary/RTEquipmentLibrary/HardwareUnits/FFUs/AAF/FfuAAF.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using Aitex.Core.RT.DataCenter;
+using Aitex.Core.RT.DataCenter;
 using Aitex.Core.RT.Device;
 using Aitex.Core.RT.Event;
 using Aitex.Core.RT.Log;
@@ -9,7 +6,9 @@ using Aitex.Core.RT.OperationCenter;
 using Aitex.Core.RT.SCCore;
 using Aitex.Core.Util;
 using MECF.Framework.Common.Communications;
-using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.FFUs.MayAir;
+using System;
+using System.Collections.Generic;
+using System.Threading;
 
 namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.FFUs.AAF
 {
@@ -47,7 +46,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.FFUs.AAF
         {
             get
             {
-                if(SC.ContainsItem($"{_scRoot}.{Name}.EnableLogMessage"))
+                if (SC.ContainsItem($"{_scRoot}.{Name}.EnableLogMessage"))
                     return SC.GetValue<bool>($"{_scRoot}.{Name}.EnableLogMessage");
                 return false;
             }
@@ -78,7 +77,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.FFUs.AAF
         }
 
         public string Address
-        {get;set; }
+        { get; set; }
 
         public bool IsConnected
         {
@@ -112,7 +111,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.FFUs.AAF
             _ffuCount = ffucount;
         }
 
-         ~FfuAAF()
+        ~FfuAAF()
         {
             _connection.Disconnect();
 
@@ -134,15 +133,15 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.FFUs.AAF
 
         public void QuerySpeed()
         {
-            
+
             _lstHandler.AddLast(new FfuAAFQuerySpeedHandler(this, 1, 1));
 
             if (_ffuCount == 2)
-            {               
+            {
                 _lstHandler.AddLast(new FfuAAFQuerySpeedHandler(this, 3, 1));
             }
             if (_ffuCount == 3)
-            {                
+            {
                 _lstHandler.AddLast(new FfuAAFQuerySpeedHandler(this, 5, 1));
             }
         }
@@ -174,7 +173,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.FFUs.AAF
             int address = SC.GetValue<int>($"{_scRoot}.{Name}.DeviceAddress");
 
             _deviceAddress = address.ToString("D3");
-            
+
 
             _nMaxSpeed = SC.GetValue<int>($"{_scRoot}.{Name}.MaxSpeed");
             _connection = new FfuAAFConnection(portName);
@@ -245,7 +244,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.FFUs.AAF
             OP.Subscribe("FFU1.SetFFUSpeedBySC", (cmd, param) =>
             {
                 int speed = SC.GetValue<int>("System.FFU1FanSpeedSetPoint");
-                SetSpeed(speed,1);
+                SetSpeed(speed, 1);
                 EV.PostInfoLog(Module, "Set FFU1 speed");
                 return true;
             });
@@ -260,7 +259,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.FFUs.AAF
 
             return true;
         }
-        
+
         private bool OnTimer()
         {
             try
@@ -275,7 +274,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.FFUs.AAF
                     {
                         _lstHandler.Clear();
                     }
-                    
+
                     if (_trigRetryConnect.Q)
                     {
                         _connection.SetPortAddress(SC.GetStringValue($"{_scRoot}.{Name}.Address"));
@@ -287,23 +286,23 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.FFUs.AAF
                     return true;
                 }
 
-                
+
                 if (_lstHandler.Count == 0)
                 {
-                    lock(_locker)
+                    lock (_locker)
                         QuerySpeed();
                 }
                 if (!_connection.IsBusy)
                 {
                     HandlerBase handler = null;
                     lock (_locker)
-                    {                        
+                    {
 
                         if (_lstHandler.Count > 0)
                         {
                             handler = _lstHandler.First.Value;
                             _lstHandler.RemoveFirst();
-                        }                        
+                        }
                     }
 
                     if (handler != null)
@@ -347,14 +346,14 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.FFUs.AAF
         }
 
 
-     
+
 
 
         public void SetSpeed(float speed)
         {
             lock (_locker)
             {
-                _lstHandler.AddFirst(new FfuAAFSetSpeedHandler(this, 0, 1, Convert.ToInt32(speed)));
+                _lstHandler.AddFirst(new FfuAAFSetSpeedHandler(this, 1, 1, Convert.ToInt32(speed)));
 
                 //_lstHandler.Clear();
                 //if (_connection.IsBusy) _connection.ForceClear();
@@ -366,19 +365,14 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.FFUs.AAF
             }
         }
 
-        public void SetSpeed(float speed,int ffuAddress)
+        public void SetSpeed(float speed, int ffuAddress)
         {
             lock (_locker)
             {
                 _lstHandler.AddFirst(new FfuAAFSetSpeedHandler(this, ffuAddress, 1, Convert.ToInt32(speed)));
 
-
-
                 //_lstHandler.Clear();
                 //if (_connection.IsBusy) _connection.ForceClear();
-
-
-
                 //List<byte> cmddata = new List<byte>() { 0x35, (byte)(0x40+ ffuAddress), 0x01, (byte)(speed * 250 / _nMaxSpeed) };
                 //byte checksum = ModRTU_CRC(cmddata.ToArray());
                 //cmddata.Add(checksum);

+ 1 - 0
Jet/Jet_001_2P_Jet/EfemRT/Config/2LPJet006/DeviceDefine.xml

@@ -10,6 +10,7 @@
 	<LoadPortType>OpenStageWithWaferSize</LoadPortType>
 	<LoadPortQuantity>1</LoadPortQuantity>
 	<RFIDInstallment>00</RFIDInstallment>
+	<FfuMemoBusControl>false</FfuMemoBusControl>
 
 	<!--Robot 设置项-->
 	<RobotType>NXC100</RobotType>

+ 1 - 1
Jet/Jet_001_2P_Jet/EfemRT/Devices/Ffu.cs

@@ -190,7 +190,7 @@ namespace EFEM.RT.Devices
         {
             OP.Subscribe($"{Name}.SetSpeed", (cmd, param) =>
             {
-                if (int.TryParse((string) param[0], out var speed))
+                if (!int.TryParse((string) param[0], out var speed))
                 {
                     EV.PostWarningLog(Module, "invalid speed.");
                     return false;

+ 1 - 1
Jet/Jet_001_2P_Jet/EfemSimulator/Config/SimUILayout1.xml

@@ -7,7 +7,7 @@
 		<SubView Id="robot" Name="Robot" ViewClass="EfemSimulator.Device.Robot.Rorze.RorzeRobot751View" Assembly="EfemSimulator" Port="10110"/>
 		<SubView Id="lp1" Name="LoadPort1" ViewClass="EfemSimulator.Device.LoadPorts.FortrendSmif.SmifPortView" Assembly="EfemSimulator" Port="COM12"/>
 		<SubView Id="lp2" Name="LoadPort2" ViewClass="EfemSimulator.Device.LoadPorts.FortrendSmif.SmifPort1View" Assembly="EfemSimulator" Port="COM14"/>
-		<SubView Id="ffu1" Name="FFU" ViewClass="MECF.Framework.Simulator.Core.FFUs.FfuView" Assembly="MECF.Framework.Simulator.Core" Port="COM34"/>
+		<SubView Id="ffu1" Name="FFU" ViewClass="MECF.Framework.Simulator.Core.FFUs.FfuView" Assembly="MECF.Framework.Simulator.Core" Port="COM20"/>
 	</Navigation>
 	
 </MECFUI>

+ 1 - 1
Jet/Jet_001_2P_Jet/EfemSimulator/Config/SimUILayout2.xml

@@ -7,6 +7,6 @@
 		<SubView Id="robot" Name="Robot" ViewClass="EfemSimulator.Device.Robot.Rorze.RorzeRobot751View" Assembly="EfemSimulator" Port="10110"/>
 		<SubView Id="lp1" Name="LoadPort1" ViewClass="EfemSimulator.Device.LoadPorts.Hirata.HirataView" Assembly="EfemSimulator" Port="COM12"/>
 		<SubView Id="lp2" Name="LoadPort2" ViewClass="EfemSimulator.Device.LoadPorts.Hirata.HirataView" Assembly="EfemSimulator" Port="COM14"/>
-		<SubView Id="ffu1" Name="FFU" ViewClass="MECF.Framework.Simulator.Core.FFUs.FfuView" Assembly="MECF.Framework.Simulator.Core" Port="COM34"/>
+		<SubView Id="ffu1" Name="FFU" ViewClass="MECF.Framework.Simulator.Core.FFUs.FfuView" Assembly="MECF.Framework.Simulator.Core" Port="COM20"/>
 	</Navigation>
 </MECFUI>