Browse Source

1、SecsGem增加了UTF-8编码的支持;
2、增加了Unload Complete事件上报;
3、CreateJob增加了Sequence校验;
4、增加SVID.xml自动根据PM设置更新PM所有Status Variable

chenkui 1 year ago
parent
commit
63d58afa42

+ 5 - 2
Venus/Framework/Common/Jobs/SequenceInfo.cs

@@ -201,9 +201,12 @@ namespace MECF.Framework.Common.Jobs
                     LOG.WriteExeption(ex);
                     return null;
                 }
+                return info;
+            }
+            else
+            {
+                return null;
             }
-
-            return info;
         }
     }
 }

BIN
Venus/ThirdParty/SecsGem.Core.Application.dll


BIN
Venus/ThirdParty/SecsGem.Core.dll


BIN
Venus/ThirdParty/SecsGem.Hsms.Core.dll


BIN
Venus/ThirdParty/SecsGemSerial.Application.dll


BIN
Venus/ThirdParty/SecsGemSerial.Core.dll


BIN
Venus/Venus_RT/Config/SVID.xls


+ 3 - 1
Venus/Venus_RT/Config/System.sccfg

@@ -69,7 +69,9 @@
 		<config default="Enabled" name="DefaultCommunicationState" description="Default Communication State" max="0" min="0" paramter="" tag="" unit="" type="String" />
 		<config default="Online" name="DefaultControlState" description="Default Control State" max="0" min="0" paramter="" tag="" unit="" type="String" />
 		<config default="Remote" name="DefaultControlSubState" description="Default Control SubState" max="0" min="0" paramter="" tag="" unit="" type="String" />
-		<config default="ASCII" name="Encoding" description="Encoding" max="0" min="0" paramter="" tag="" unit="" type="String" />
+		<config default="ASCII" name="HsmsEncoding" description="HsmsEncoding" max="0" min="0" paramter="" tag="" unit="" type="String" />
+		<config default="ASCII" name="SerialEncoding" description="SerialEncoding" max="0" min="0" paramter="" tag="" unit="" type="String" />
+		<config default="true" name="EnableReWriteStatusVariable" nameView="EnableReWriteStatusVariable" description="Enable ReWrite Equipment PM Status Variable" max="0" min="0" paramter="" tag="" unit="" type="Bool" />
 	</configs>
 
 	<!--Router-->

+ 3 - 1
Venus/Venus_RT/Config/System_Kepler2200.sccfg

@@ -70,7 +70,9 @@
 		<config default="Enabled" name="DefaultCommunicationState" description="Default Communication State" max="0" min="0" paramter="" tag="" unit="" type="String" />
 		<config default="Online" name="DefaultControlState" description="Default Control State" max="0" min="0" paramter="" tag="" unit="" type="String" />
 		<config default="Remote" name="DefaultControlSubState" description="Default Control SubState" max="0" min="0" paramter="" tag="" unit="" type="String" />
-		<config default="ASCII" name="Encoding" description="Encoding" max="0" min="0" paramter="" tag="" unit="" type="String" />
+		<config default="ASCII" name="HsmsEncoding" description="HsmsEncoding" max="0" min="0" paramter="" tag="" unit="" type="String" />
+		<config default="ASCII" name="SerialEncoding" description="SerialEncoding" max="0" min="0" paramter="" tag="" unit="" type="String" />
+		<config default="true" name="EnableReWriteStatusVariable" nameView="EnableReWriteStatusVariable" description="Enable ReWrite Equipment PM Status Variable" max="0" min="0" paramter="" tag="" unit="" type="Bool" />
 	</configs>
 
 	<!--Router-->

+ 3 - 1
Venus/Venus_RT/Config/System_Kepler2300.sccfg

@@ -69,7 +69,9 @@
 		<config default="Enabled" name="DefaultCommunicationState" description="Default Communication State" max="0" min="0" paramter="" tag="" unit="" type="String" />
 		<config default="Online" name="DefaultControlState" description="Default Control State" max="0" min="0" paramter="" tag="" unit="" type="String" />
 		<config default="Remote" name="DefaultControlSubState" description="Default Control SubState" max="0" min="0" paramter="" tag="" unit="" type="String" />
-		<config default="ASCII" name="Encoding" description="Encoding" max="0" min="0" paramter="" tag="" unit="" type="String" />
+		<config default="ASCII" name="HsmsEncoding" description="HsmsEncoding" max="0" min="0" paramter="" tag="" unit="" type="String" />
+		<config default="ASCII" name="SerialEncoding" description="SerialEncoding" max="0" min="0" paramter="" tag="" unit="" type="String" />
+		<config default="true" name="EnableReWriteStatusVariable" nameView="EnableReWriteStatusVariable" description="Enable ReWrite Equipment PM Status Variable" max="0" min="0" paramter="" tag="" unit="" type="Bool" />
 	</configs>
 
 	<!--Router-->

+ 3 - 1
Venus/Venus_RT/Config/System_Venus.sccfg

@@ -69,7 +69,9 @@
 		<config default="Enabled" name="DefaultCommunicationState" description="Default Communication State" max="0" min="0" paramter="" tag="" unit="" type="String" />
 		<config default="Online" name="DefaultControlState" description="Default Control State" max="0" min="0" paramter="" tag="" unit="" type="String" />
 		<config default="Remote" name="DefaultControlSubState" description="Default Control SubState" max="0" min="0" paramter="" tag="" unit="" type="String" />
-		<config default="ASCII" name="Encoding" description="Encoding" max="0" min="0" paramter="" tag="" unit="" type="String" />
+		<config default="ASCII" name="HsmsEncoding" description="HsmsEncoding" max="0" min="0" paramter="" tag="" unit="" type="String" />
+		<config default="ASCII" name="SerialEncoding" description="SerialEncoding" max="0" min="0" paramter="" tag="" unit="" type="String" />
+		<config default="true" name="EnableReWriteStatusVariable" nameView="EnableReWriteStatusVariable" description="Enable ReWrite Equipment PM Status Variable" max="0" min="0" paramter="" tag="" unit="" type="Bool" />
 	</configs>
 
 	<!--Router-->

+ 3 - 1
Venus/Venus_RT/Config/System_VenusDE.sccfg

@@ -69,7 +69,9 @@
 		<config default="Enabled" name="DefaultCommunicationState" description="Default Communication State" max="0" min="0" paramter="" tag="" unit="" type="String" />
 		<config default="Online" name="DefaultControlState" description="Default Control State" max="0" min="0" paramter="" tag="" unit="" type="String" />
 		<config default="Remote" name="DefaultControlSubState" description="Default Control SubState" max="0" min="0" paramter="" tag="" unit="" type="String" />
-		<config default="ASCII" name="Encoding" description="Encoding" max="0" min="0" paramter="" tag="" unit="" type="String" />
+		<config default="ASCII" name="HsmsEncoding" description="HsmsEncoding" max="0" min="0" paramter="" tag="" unit="" type="String" />
+		<config default="ASCII" name="SerialEncoding" description="SerialEncoding" max="0" min="0" paramter="" tag="" unit="" type="String" />
+		<config default="true" name="EnableReWriteStatusVariable" nameView="EnableReWriteStatusVariable" description="Enable ReWrite Equipment PM Status Variable" max="0" min="0" paramter="" tag="" unit="" type="Bool" />
 	</configs>
 
 	<!--Router-->

+ 3 - 1
Venus/Venus_RT/Config/System_VenusSE.sccfg

@@ -69,7 +69,9 @@
 		<config default="Enabled" name="DefaultCommunicationState" description="Default Communication State" max="0" min="0" paramter="" tag="" unit="" type="String" />
 		<config default="Online" name="DefaultControlState" description="Default Control State" max="0" min="0" paramter="" tag="" unit="" type="String" />
 		<config default="Remote" name="DefaultControlSubState" description="Default Control SubState" max="0" min="0" paramter="" tag="" unit="" type="String" />
-		<config default="ASCII" name="Encoding" description="Encoding" max="0" min="0" paramter="" tag="" unit="" type="String" />
+		<config default="ASCII" name="HsmsEncoding" description="HsmsEncoding" max="0" min="0" paramter="" tag="" unit="" type="String" />
+		<config default="ASCII" name="SerialEncoding" description="SerialEncoding" max="0" min="0" paramter="" tag="" unit="" type="String" />
+		<config default="true" name="EnableReWriteStatusVariable" nameView="EnableReWriteStatusVariable" description="Enable ReWrite Equipment PM Status Variable" max="0" min="0" paramter="" tag="" unit="" type="Bool" />
 	</configs>
 
 	<!--Router-->

+ 1 - 1
Venus/Venus_RT/Devices/EFEM/Loadport.cs

@@ -327,9 +327,9 @@ namespace Venus_RT.Devices.EFEM
             }
             else
             {
+                _faCallback.UnloadComplete(this);
 
             }
-            _faCallback.LoadComplete(this);
 
         }
         #endregion

+ 1 - 1
Venus/Venus_RT/Modules/AutoCycle.cs

@@ -354,7 +354,7 @@ namespace Venus_RT.Modules
                 pj.Sequence = SequenceInfoHelper.GetInfo(indexSequence[seqs[i]]);
                 if(pj.Sequence==null)
                 {
-                    reason = $"invalid sequence[{seqs[i]}]";
+                    reason = $"invalid sequence[{indexSequence[seqs[i]]}]";
                     return false;
                 }
                 pj.ControlJobName = cj.Name;

+ 5 - 0
Venus/Venus_RT/Modules/SystemDispatcher.cs

@@ -884,6 +884,11 @@ namespace Venus_RT.Modules
                 ProcessJobInfo pj = new ProcessJobInfo();
                 pj.Name = jobId + "_" + (i + 1);
                 pj.Sequence = SequenceInfoHelper.GetInfo(indexSequence[seqs[i]]);
+                if (pj.Sequence == null)
+                {
+                    reason = $"invalid sequence[{indexSequence[seqs[i]]}]";
+                    return false;
+                }
                 pj.ControlJobName = cj.Name;
                 pj.LotName = lotId;
                 pj.SlotWafers = seqSlotWafers[seqs[i]];

+ 3 - 0
Venus/Venus_RT/Venus_RT.csproj

@@ -481,6 +481,9 @@
     <Content Include="Config\System_VenusDE.sccfg">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Config\SVID.xls">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

+ 5 - 0
Venus/Venus_Simulator/Devices/EfemSimulator.cs

@@ -171,6 +171,11 @@ namespace Venus_Simulator.Devices
             case EfemOperation.StateTrack:
                     strINF = "INF:STATE/TRACK/000;";
                     break;
+            case EfemOperation.CarrierId:
+                strINF = strACK.Replace(ACK, "INF");
+                strINF = strINF.TrimEnd(';');
+                strINF += "/12345678;";
+                break;
             case EfemOperation.Align:
             case EfemOperation.Pick:
             case EfemOperation.Place: