Quellcode durchsuchen

update

git-svn-id: http://10.4.3.168:50001/svn/Furnace@111 dbcde07d-dcf5-c148-8a84-ac3097b7778e
Jiangjinyuan vor 1 Monat
Ursprung
Commit
a248ced2b6

+ 3 - 0
Furnace/FurnaceRT/Config/FurnaceGemModel.xml

@@ -8411,6 +8411,9 @@
     <ECID id="1030010004" valueType="Ascii" logicalName="Minics.config4" value="" min="" max="" eventTrigger="" units="" description="config4" isArray="false" />
     <ECID id="1030010005" valueType="Ascii" logicalName="Minics.config5" value="" min="" max="" eventTrigger="" units="" description="config5" isArray="false" />
     <ECID id="1030010006" valueType="Ascii" logicalName="Minics.CurrentTableName" value="" min="" max="" eventTrigger="" units="" description="CurrentTableName" isArray="false" />
+    <ECID id="1030010007" valueType="Ascii" logicalName="Minics.EnableMinics" value="" min="" max="" eventTrigger="" units="" description="" isArray="false" />
+    <ECID id="1030010008" valueType="Ascii" logicalName="Minics.ip" value="" min="" max="" eventTrigger="" units="" description="ip" isArray="false" />
+    <ECID id="1030010009" valueType="Ascii" logicalName="Minics.port" value="" min="" max="" eventTrigger="" units="" description="port" isArray="false" />
     <ECID id="3310000001" valueType="Ascii" logicalName="PM1.RecipeEditParameter.WaferRobotParameter.Parameter.P151.Axis" value="" min="" max="" eventTrigger="" units="" description="" isArray="false" />
     <ECID id="3310000002" valueType="Ascii" logicalName="PM1.RecipeEditParameter.WaferRobotParameter.Parameter.P151.SettingItem" value="" min="" max="" eventTrigger="" units="" description="" isArray="false" />
     <ECID id="3310000003" valueType="Ascii" logicalName="PM1.RecipeEditParameter.WaferRobotParameter.Parameter.P151.SetValue" value="" min="" max="" eventTrigger="" units="" description="" isArray="false" />

+ 5 - 2
Furnace/FurnaceRT/Config/System.sccfg

@@ -17,7 +17,6 @@
 
 		<config default="true" name="IsScheduleMaintenance" description="" max="" min="" paramter="" tag="" unit="" type="Bool" />
 		<config default="true" name="IsServiceControlMode" description="Is Service Control Mode" max="" min="" paramter="" tag="" unit="" type="Bool" />
-		<config default="true" name="EnableMinics" description="" max="" min="" paramter="" tag="" unit="" type="Bool"  visible="false" />
 
 		<config default="false" name="BypassInterlock" description="Bypass Interlock" max="0" min="0" paramter="" tag="" unit="" type="Bool" />
 
@@ -416,10 +415,14 @@
 		</configs>
 	</configs>
 	<configs name="Minics">
+
+		<config default="127.0.0.1" name="ip" description="ip" max="" min="" paramter="" tag="" unit=""  type="String"   />
+		<config default="50052" name="port" description="port" max="" min="" paramter="" tag="" unit=""  type="String"   />
 		<config default="1" name="config1" description="config1" max="" min="" paramter="" tag="" unit=""  type="String"   />
 		<config default="2" name="config2" description="config2" max="" min="" paramter="" tag="" unit=""  type="String"   />
 		<config default="3" name="config3" description="config3" max="" min="" paramter="" tag="" unit=""  type="String"   />
-		
+		<config default="true" name="EnableMinics" description="" max="" min="" paramter="" tag="" unit="" type="Bool"  visible="false" />
+
 	</configs>
 	<configs name="FFU" visible="false">
 		<config default="350" name="LSPEED" description="" max="9999" min="0" paramter="" tag="" unit=""  type="Double"   />

Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
Furnace/FurnaceRT/Config/VIDs/_ECID.xml


+ 3 - 3
Furnace/FurnaceRT/Equipments/PMs/PMAux.cs

@@ -150,7 +150,7 @@ namespace FurnaceRT.Equipments.PMs
 
         private void InitAUX()
         {
-            if (SC.ContainsItem("System.EnableMinics") && SC.GetValue<bool>("System.EnableMinics"))
+            if (SC.ContainsItem("Minics.EnableMinics") && SC.GetValue<bool>("Minics.EnableMinics"))
                 return;
 
             GetAuxNames();
@@ -442,7 +442,7 @@ namespace FurnaceRT.Equipments.PMs
         }
         private void MonitorAux()
         {
-            if (SC.ContainsItem("System.EnableMinics") && SC.GetValue<bool>("System.EnableMinics"))
+            if (SC.ContainsItem("Minics.EnableMinics") && SC.GetValue<bool>("Minics.EnableMinics"))
             {
                 if (_initTimer.IsRunning && _initTimer.ElapsedMilliseconds < 3000)
                 {
@@ -815,7 +815,7 @@ namespace FurnaceRT.Equipments.PMs
         }
         private void SetAUXParameters(object[] param)
         {
-            if (SC.ContainsItem("System.EnableMinics") && SC.GetValue<bool>("System.EnableMinics"))
+            if (SC.ContainsItem("Minics.EnableMinics") && SC.GetValue<bool>("Minics.EnableMinics"))
                 return;
 
             if (param != null && param.Length > 0 &&

+ 4 - 1
Furnace/FurnaceRT/Equipments/PMs/PMMethods.cs

@@ -77,7 +77,10 @@ namespace FurnaceRT.Equipments.PMs
             Dictionary<string, List<string>> result = new Dictionary<string, List<string>>();
             string sourcePath = $"{PathManager.GetCfgDir()}";
             string backUpFolderPath = Path.Combine(sourcePath, BackUpDireEnum.BackUp.ToString());
-
+            if (!Directory.Exists(backUpFolderPath))
+            {
+                Directory.CreateDirectory(backUpFolderPath);
+            }
             var allDires = new DirectoryInfo(backUpFolderPath).GetDirectories();
             foreach (var item in allDires)
             {

+ 1 - 1
Furnace/FurnaceRT/Equipments/PMs/PMModule.cs

@@ -291,7 +291,7 @@ namespace FurnaceRT.Equipments.PMs
             DATA.Subscribe($"{Module}.IsOnline", () => IsOnline);
             DATA.Subscribe($"{Module}.IsProcessing", () => IsProcessing);
             DATA.Subscribe($"{Module}.RunningMode", () => SC.ContainsItem("System.RunningMode") ? SC.GetStringValue("System.RunningMode") == ConfigEnum.Debug.ToString() : false);
-            DATA.Subscribe($"{Module}.EnableMinics", () => SC.ContainsItem("System.EnableMinics") ? SC.GetValue<bool>("System.EnableMinics") : false);
+            DATA.Subscribe($"{Module}.EnableMinics", () => SC.ContainsItem("Minics.EnableMinics") ? SC.GetValue<bool>("Minics.EnableMinics") : false);
 
             //DATA.Subscribe($"{Module}.WaferSize", () => WaferManager.Instance.GetWaferSize(_module, 0).ToString());
 

+ 4 - 2
Furnace/FurnaceRT/Instances/ToolLoader.cs

@@ -37,6 +37,7 @@ using Aitex.Core.RT.ParameterCenter;
 using FurnaceRT.Parameter;
 using Aitex.Core.RT.SCCore;
 using MECF.Framework.Common.Minics;
+using DocumentFormat.OpenXml.Drawing.Charts;
 
 namespace FurnaceRT.Instances
 {
@@ -87,13 +88,14 @@ namespace FurnaceRT.Instances
             WaferManager.Instance.Initialize();
             CarrierManager.Instance.Initialize();
             CarrierManager.Instance.Initialize();
-            Singleton<MinicsManager>.Instance.Initialize("10.4.6.24", 50052);
+
+            Singleton<MinicsManager>.Instance.Initialize(SC.GetStringValue("Minics.ip"), int.Parse(SC.GetStringValue("Minics.port")));
 
             Singleton<DeviceManager>.Instance.DisableAsyncInitialize = true;
 
             Singleton<DeviceManager>.Instance.Initialize(PathManager.GetCfgDir() + $"IO\\{SC.GetStringValue("System.SetUp.ToolType")}\\DeviceModelPM.xml", "Furnace", ModuleName.PM1, "PM1", false);
 
-            if (SC.GetStringValue("System.SetUp.ToolType") == "ELK" && !(SC.ContainsItem("System.EnableMinics") && SC.GetValue<bool>("System.EnableMinics")))
+            if (SC.GetStringValue("System.SetUp.ToolType") == "ELK" && !(SC.ContainsItem("Minics.EnableMinics") && SC.GetValue<bool>("Minics.EnableMinics")))
             {
                 Singleton<DeviceManager>.Instance.Initialize(PathManager.GetCfgDir() + $"IO\\{SC.GetStringValue("System.SetUp.ToolType")}\\DeviceModelGasLine.xml", "Furnace", ModuleName.PM1, "GasLine1", false);
                 Singleton<DeviceManager>.Instance.Initialize(PathManager.GetCfgDir() + $"IO\\{SC.GetStringValue("System.SetUp.ToolType")}\\DeviceModelGasLine.xml", "Furnace", ModuleName.PM1, "GasLine2", false);