Merge branch 'master' of http://git.jetplasma-oa.com/JetPlasma/Virgo_Mask

Framework/Common/Device/Bases/SignalTowerBase.cs

@@ -233,6 +233,7 @@ namespace MECF.Framework.Common.Device.Bases
                 if (light.Value != null && (light.Key == LightType.Red || light.Key == LightType.Buzzer))
                 {
                     LOG.Info($"Close {light.Key}");
+                    _lights[light.Key].StateSetPoint = TowerLightStatus.Off;
                     light.Value.SetOff(TowerLightStatus.Off);
                 }
             }

VirgoRT/Config/RecipeFormat.xml

@@ -28,7 +28,7 @@
 					<Item DisplayName="TVPosition" ControlName="TVPositionCtrl" />
 				</Step>
 				<Step ModuleName="Pressure" DeviceType="PressureControl" DisplayName="TVPosition" ControlName="PressureControl.SetTVPosition" InputType="NumInput" Min="0" Max="100" Description="Throttle valve position" />
-				<Step ModuleName="Pressure" DeviceType="PressureControl" DisplayName="TVPressure" ControlName="PressureControl.SetTVPressure" InputType="NumInput" Min="0" Max="100000" Description="Throttle valve pressure" />
+				<Step ModuleName="Pressure" DeviceType="PressureControl" DisplayName="TVPressure" ControlName="PressureControl.SetTVPressure" InputType="NumInput" Min="0" Max="5000" Description="Throttle valve pressure" />
 			</Group>
 		</Catalog>
 		<!--###########################################-->

VirgoRT/Config/System.sccfg

@@ -15,7 +15,7 @@
 		<config default="LP1,LP2,EfemRobot,EFEM,Aligner1,Buffer,PMA,PMB,Flipper" name="InstalledModules" description="Installed modules" max="" min="" paramter="" tag="" unit="" visible="false" type="String" />
 		<config default="2" name="MaxInternalWaferCount" nameView="Max Internal wafer count" description="Max Internal wafer count" max="25" min="1" paramter="" tag="" unit="" visible="false" type="Integer" />
 		<!--<config default="30" name="DefaultCoolingTime" nameView="Default Cooling Time" description="Default Cooling Time" max="300" min="1" paramter="" tag="" unit="s" type="Integer" />-->
-		<config default="Default" name="LogFilePath"  nameView="LogFilePath"  description="Log File Path" max="" min="" paramter="" tag=""  unit="" type="String" />
+		<config default="Default" name="LogFilePath"  nameView="LogFilePath"  description="Log File Path" max="" min="" paramter="" tag=""  unit="" visible="false"  type="String" />
 		<config default="true" name="RecipeFolderByType" nameView="Recipe File Saved In Folder Process or Clean" description="Recipe file saved in process or clean folders" max="0" min="0" paramter="" tag="" unit="" type="Bool" visible="false"/>
     <config default="false" name="IsIgnoreCDAPressure2Alarm" nameView="IsIgnoreCDAPressure2Alarm" description="Is Ignore CDAPressure2 Alarm" max="" min="" paramter="" tag="" unit="" type="Bool" visible="false"/>
     <config default="0" name="ChamberType"  nameView="Chamber Mode" description="0=>VirgoMask,1=>VirgoR" max="10" min="0" paramter="" tag=""  unit="" type="Integer" visible="false"/>
@@ -65,9 +65,9 @@
 	
 	<!--EFEM-->
 	<configs name="EFEM" nameView="EFEM">
-		<config default="30" name="HomeTimeout" nameView="Home Timeout" description="Home Timeout" max="300" min="1" paramter="" tag="" unit="s" type="Integer" />
+		<config default="60" name="HomeTimeout" nameView="Home Timeout" description="Home Timeout" max="300" min="1" paramter="" tag="" unit="s" type="Integer" visible="false" />
 		<config default="60" name="MotionTimeout" nameView="Motion Timeout" description="motion time out" max="600" min="1" paramter="" tag="" unit="s" type="Integer" />
-		<config default="20" name="AlignerTimeout" nameView="Aligner Timeout" description="aligner time out" max="600" min="1" paramter="" tag="" unit="s" type="Integer" />
+		<config default="20" name="AlignerTimeout" nameView="Aligner Timeout" description="aligner time out" max="600" min="1" paramter="" tag="" unit="s" type="Integer" visible="false" />
 		<config default="0" name="AlignAngle" nameView="Aligner Angle" description="" max="360" min="0" paramter="" tag="" unit="" type="Double" visible="false"/>
 		<config default="127.0.0.1:13000" name="IPAddress" nameView="IP Address" description="EFEM IP and Port;default 10.0.0.100:13000" max="" min="" paramter="" tag="" unit="" type="String" visible="false"/>
 		<config default="true" name="CheckSideDoorOnEAPMap" nameView="CheckSideDoorOnEAPMap" description="Check side door on EAP map" max="" min="" paramter="" tag="" unit="" type="Bool" visible="false"/>
@@ -498,7 +498,7 @@
       <config default="5" name="ManualSpeed" nameView="Lift Servo Manual Speed" description="Lift Servo manual speed" max="30" min="0"  paramter="" tag="" unit="mm/s" type="Double" />
       <config default="30" name="SoftUpLimit" nameView="Lift Servo Soft Up Limit" description="Lift Servo  Soft Up Limit" max="50" min="-50"  paramter="" tag="" unit="mm" type="Double" />
       <config default="-30" name="SoftDownLimit" nameView="Lift Servo Soft Down Limit" description="Lift Servo  limit position" max="50" min="-50"  paramter="" tag="" unit="mm" type="Double" />
-      <config default="300" name="AccDecSpeedTime" nameView="Lift Servo Acc-Dec Speed Time" description="Lift Servo Acc-Dec Speed Time" max="1000" min="100"  paramter="" tag="" unit="ms" type="Double" />
+      <config default="300" name="AccDecSpeedTime" nameView="Lift Servo Acc-Dec Speed Time" description="Lift Servo Acc-Dec Speed Time" max="1000" min="100"  paramter="" tag="" unit="ms" type="Double" visible="false" />
       <config default="0" name="Position1" nameView="Lift Servo Position1" description="Lift Servo Position1" max="1000" min="-100"  paramter="" tag="" unit="mm" type="Double" />
       <config default="0" name="Position2" nameView="Lift Servo Position2" description="Lift Servo Position2" max="1000" min="-100"  paramter="" tag="" unit="mm" type="Double" />
       <config default="0" name="Position3" nameView="Lift Servo Position3" description="Lift Servo Position3" max="1000" min="-100"  paramter="" tag="" unit="mm" type="Double" />
@@ -908,7 +908,7 @@
       <config default="5" name="ManualSpeed" nameView="Lift Servo Manual Speed" description="Lift Servo manual speed" max="30" min="0"  paramter="" tag="" unit="mm/s" type="Double" />
       <config default="30" name="SoftUpLimit" nameView="Lift Servo Soft Up Limit" description="Lift Servo  Soft Up Limit" max="50" min="-50"  paramter="" tag="" unit="mm" type="Double" />
       <config default="-30" name="SoftDownLimit" nameView="Lift Servo Soft Down Limit" description="Lift Servo  limit position" max="50" min="-50"  paramter="" tag="" unit="mm" type="Double" />
-      <config default="300" name="AccDecSpeedTime" nameView="Lift Servo Acc-Dec Speed Time" description="Lift Servo Acc-Dec Speed Time" max="1000" min="100"  paramter="" tag="" unit="ms" type="Double" />
+      <config default="300" name="AccDecSpeedTime" nameView="Lift Servo Acc-Dec Speed Time" description="Lift Servo Acc-Dec Speed Time" max="1000" min="100"  paramter="" tag="" unit="ms" type="Double" visible="false" />
       <config default="0" name="Position1" nameView="Lift Servo Position1" description="Lift Servo Position1" max="1000" min="-100"  paramter="" tag="" unit="mm" type="Double" />
       <config default="0" name="Position2" nameView="Lift Servo Position2" description="Lift Servo Position2" max="1000" min="-100"  paramter="" tag="" unit="mm" type="Double" />
       <config default="0" name="Position3" nameView="Lift Servo Position3" description="Lift Servo Position3" max="1000" min="-100"  paramter="" tag="" unit="mm" type="Double" />

VirgoRT/Modules/PMs/Process.cs

@@ -501,7 +501,7 @@ namespace VirgoRT.Modules.PMs
                                         }
                                         else
                                         {
-                                            EV.PostInfoLog(Module, $"工艺 {CurrentRecipeRunningName} 完毕");
+                                            EV.PostInfoLog(Module, $"Recipe {CurrentRecipeRunningName} finish");
 
                                             CurStepNum = _recipeStepList.Count - 1;
                                             _state = RecipeEngineState.RecipeCompleted;

VirgoRT/Modules/RouteManager.cs

@@ -5,6 +5,7 @@ using Aitex.Core.RT.DataCenter;
 using Aitex.Core.RT.Device;
 using Aitex.Core.RT.Event;
 using Aitex.Core.RT.Fsm;
+using Aitex.Core.RT.Log;
 using Aitex.Core.RT.OperationCenter;
 using Aitex.Core.RT.Routine;
 using Aitex.Core.RT.SCCore;
@@ -770,10 +771,17 @@ namespace VirgoRT.Modules
 
             Singleton<DeviceEntity>.Instance.PostMsg(DeviceEntity.MSG.RESET);
 
-            var tower = DEVICE.GetDevice<VirgoSignalTower>("System.SignalTower");
-            if(tower != null)
+            if(!IsAlarm && !IsEntityError)
             {
-                tower.CloseAllLight(null, null);
+                var tower = DEVICE.GetDevice<VirgoSignalTower>("System.SignalTower");
+                if (tower != null)
+                {
+                    tower.CloseAllLight(null, null);
+                }
+            }
+            else
+            {
+                LOG.Info($"System error:{IsAlarm},EFEM error:{(EFEM?.IsError ?? false)},PMA error:{(PMA?.IsError ?? false)} PMB error:{(PMB?.IsError ?? false)}");
             }
 
             if (fsm.State == (int)RtState.Error)