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

Venus/Venus_Core/DataName.cs

@@ -1,4 +1,4 @@
-using System.Security.Cryptography.X509Certificates;
+
 
 namespace Venus_Core
 {

Venus/Venus_Core/DeviceName.cs

@@ -104,4 +104,10 @@ namespace Venus_Core
         OuterChiller,
         TopChiller
     }
+    public enum EPDType
+    {
+        Socket,
+        WCF,
+        None
+    }
 }

Venus/Venus_MainPages/ViewModels/OverKepler2300ViewModel.cs

@@ -1142,7 +1142,7 @@ namespace Venus_MainPages.ViewModels
             timer = new DispatcherTimer();
             timer.Interval = TimeSpan.FromSeconds(0.5);
             timer.Tick += timer_Tick;
-            timer.Start();
+            //timer.Start();
 
         }
         #endregion

Venus/Venus_MainPages/ViewModels/RecipeViewModel.cs

@@ -34,13 +34,6 @@ using RecipeStep = Venus_Core.RecipeStep;
 
 namespace Venus_MainPages.ViewModels
 {
-    public enum EPDType
-    {
-        Socket,
-        WCF,
-        None
-    }
-
     internal class RecipeViewModel : BindableBase
     {
         #region 私有字段     

Venus/Venus_RT/App.config

@@ -32,7 +32,7 @@
 	<connectionStrings>
 		<add name="PostgreSQL"   connectionString="Server=localhost;Port=5432;User Id=postgres;Password=123456;Database=postgres;Enlist=true;Preload Reader=true;" />
 		<!--0是other,1是kepler2300，2是Kepler2200，3是VenusSE，4是VenusDE-->
-		<add name="ConfigType"   connectionString="2"/>
+		<add name="ConfigType"   connectionString="1"/>
 	</connectionStrings>
 	<system.serviceModel>
 		<!--<diagnostics>

Venus/Venus_RT/Config/DataGroup.xml

@@ -20,7 +20,15 @@
 		<DataItem name ="PMB.IsAlarm"                     Red="blinking" Yellow="Off"       Green="Off" Blue="Off"  Buzzer="On"/>
 		<DataItem name ="PMC.IsAlarm"                     Red="blinking" Yellow="Off"       Green="Off" Blue="Off"  Buzzer="On"/>
 		<DataItem name ="PMD.IsAlarm"                     Red="blinking" Yellow="Off"       Green="Off" Blue="Off"  Buzzer="On"/>
-		
+
+		<DataItem name ="LLA.IsAlarm"                     Red="blinking" Yellow="Off"       Green="Off" Blue="Off"  Buzzer="On"/>
+		<DataItem name ="LLA.IsBusy"                      Red="Off"      Yellow="Off"       Green="On"  Blue="Off"  Buzzer="Off"/>
+
+		<DataItem name ="LLB.IsAlarm"                     Red="blinking" Yellow="Off"       Green="Off" Blue="Off"  Buzzer="On"/>
+		<DataItem name ="LLB.IsBusy"                      Red="Off"      Yellow="Off"       Green="On"  Blue="Off"  Buzzer="Off"/>
+
+
+
 	</DataGroup>
 	<DataGroup name="UserDefine" display="" fix="false">
 

Venus/Venus_RT/Config/SignalTower.xml

@@ -15,5 +15,7 @@
 	<STEvent name ="PMC.IsAlarm"        Red="On"       Yellow="Off"  Green="Off" Blue="Off"  Buzzer="On"/>	
 	<STEvent name ="PMD.IsAlarm"        Red="On"       Yellow="Off"  Green="Off" Blue="Off"  Buzzer="On"/>
 
+	<STEvent name ="LLA.Alarm"         Red="On"      Yellow="Off"       Green="Off"  Blue="Off"  Buzzer="On"/>
+	<STEvent name ="LLB.Alarm"         Red="On"      Yellow="Off"       Green="Off"  Blue="Off"  Buzzer="On"/>
 </STEvents>
 

Venus/Venus_RT/Devices/EFEM/JetEfem.cs

@@ -522,8 +522,8 @@ namespace Venus_RT.Devices.EFEM
 
         public override bool SetLamp(LightType light, LightStatus status)
         {
-            if (!CheckEfemStatus())
-                return false;
+            //if (!CheckEfemStatus())
+            //    return false;
 
             _currentMsg = new EfemMessage
             {

Venus/Venus_RT/Modules/EFEM/EfemEntity.cs

@@ -1012,7 +1012,7 @@ namespace Venus_RT.Modules
 
         public void Monitor()
         {
-            if(Singleton<RouteManager>.Instance.EFEM.RobotStatus == RState.End && _pendingCmds.Count > 0)
+            if(Singleton<RouteManager>.Instance.EFEM.RobotStatus != RState.Running && _pendingCmds.Count > 0)
             {
                 var lightCommand = _pendingCmds.Dequeue();
                 _efem.SetLamp(lightCommand.Key, lightCommand.Value);

Venus/Venus_RT/Modules/LLs/LLEntity.cs

@@ -162,7 +162,7 @@ namespace Venus_RT.Modules
             DATA.Subscribe($"{Module}.FsmLastMessage", () => (((MSG)fsm.LastMsg).ToString()), SubscriptionAttribute.FLAG.IgnoreSaveDB);
             DATA.Subscribe($"{Module}.IsOnline", () => IsOnline, SubscriptionAttribute.FLAG.IgnoreSaveDB);
             DATA.Subscribe($"{Module}.IsInclude", () => IsInclude, SubscriptionAttribute.FLAG.IgnoreSaveDB);
-
+            DATA.Subscribe($"{Module}.IsBusy", () => IsBusy, SubscriptionAttribute.FLAG.IgnoreSaveDB);
             return true;
         }
         private void InitFsmMap()

Venus/Venus_RT/Modules/PMs/PMProcessRoutine.cs

@@ -323,6 +323,8 @@ namespace Venus_RT.Modules.PMs
                     kepler2300Names.Add($"{Module}.MfcGas7.FeedBack");
                     kepler2300Names.Add($"{Module}.MfcGas8.FeedBack");
                     kepler2300Names.Add($"{Module}.Rf.ForwardPower");
+                    kepler2300Names.Add($"{Module}.BiasRf.ForwardPower");
+
                     _fdc.Reset(kepler2300Names);
                     break;
             }