瀏覽代碼

Revise SRDHome, PrewetKeepwet;

niuyx 2 月之前
父節點
當前提交
d637aec5ae

+ 1 - 2
CyberX8_RT/Modules/Prewet/PrewetKeepWetRoutine.cs

@@ -59,7 +59,7 @@ namespace CyberX8_RT.Modules.Prewet
         {
             Runner.Run(KeepwetStep.Idle_KeepwetPrepare, ResetLinmot, _delay_1ms)
                 .WaitWithStopCondition(KeepwetStep.Idle_KeepwetPrepareWait, CheckResetLinmotEndStatus, CheckResetLinmotStopStatus)
-                .Run(KeepwetStep.Idle_KeepWetStart, ExecuteWetScan, _delay_1ms)
+                .Run(KeepwetStep.Idle_KeepWetStart, ExecuteWetScan, _delay_1s)
                 .WaitWithStopCondition(KeepwetStep.Idle_KeepWetScan,CheckLinmotScanEndStatus,CheckLinmotScanStopStatus)
                 .Run(KeepwetStep.Idle_KeepWetPause, KeepWetComplete, _delay_1ms)
                 .End(KeepwetStep.End, NullFun, _delay_1ms);
@@ -141,7 +141,6 @@ namespace CyberX8_RT.Modules.Prewet
             bool result=_linMotAxis.Status==RState.Failed||_linMotAxis.Status==RState.Timeout;
             if(!result)
             {
-
                 //Pressure
                 if (_prewetDevice.PrewetPumpData.PumpPressureData.IsError)
                 {

+ 3 - 4
CyberX8_RT/Modules/Prewet/PrewetLotTrackUtil.cs

@@ -88,8 +88,8 @@ namespace CyberX8_RT.Modules.Prewet
                         sw.WriteLine($"SingleWafer:{headerData.IsSingleWafe}");
                         sw.WriteLine($"ProcessTime:{headerData.ProcessTime}");
                         sw.Write(CVS_SPLIT_CHAR);
-                        string str = $"TimeStamp{CVS_SPLIT_CHAR}StateMachine{CVS_SPLIT_CHAR}Pressure{CVS_SPLIT_CHAR}Flow{CVS_SPLIT_CHAR}PumpMode{CVS_SPLIT_CHAR}" +
-                            $"CurrentScan{CVS_SPLIT_CHAR}ScanOn{CVS_SPLIT_CHAR}PressureTarget{CVS_SPLIT_CHAR}ValveState{CVS_SPLIT_CHAR}PumpSpeed{CVS_SPLIT_CHAR}PumpControlCurrent";
+                        string str = $"TimeStamp{CVS_SPLIT_CHAR}StateMachine{CVS_SPLIT_CHAR}Pressure{CVS_SPLIT_CHAR}Flow{CVS_SPLIT_CHAR}" +
+                            $"CurrentScan{CVS_SPLIT_CHAR}ScanOn{CVS_SPLIT_CHAR}ValveState";
                         sw.WriteLine(str);
                     }
                         
@@ -97,8 +97,7 @@ namespace CyberX8_RT.Modules.Prewet
                     {
                         PrewetLotTrackData data = datas[i];
                         string tmp = $"{CVS_SPLIT_CHAR}{data.TimeStamp.ToString("HH:mm:ss")}{CVS_SPLIT_CHAR}{data.StateMachine}{CVS_SPLIT_CHAR}{data.Pressure.ToString("F3")}{CVS_SPLIT_CHAR}{data.Flow.ToString("F3")}" +
-                            $"{CVS_SPLIT_CHAR}{data.PumpMode}{CVS_SPLIT_CHAR}{data.CurrentScan}{CVS_SPLIT_CHAR}{data.ScanOn}{CVS_SPLIT_CHAR}{data.PressureTarget.ToString("F3")}{CVS_SPLIT_CHAR}" +
-                            $"{data.ValveState}{CVS_SPLIT_CHAR}{data.PumpSpeed}{CVS_SPLIT_CHAR}{data.PumpControlCurrent.ToString("F3")}";
+                            $"{CVS_SPLIT_CHAR}{data.CurrentScan}{CVS_SPLIT_CHAR}{data.ScanOn}{CVS_SPLIT_CHAR}{data.ValveState}";
                         sw.WriteLine(tmp);
                     }
                     sw.WriteLine("");

+ 6 - 0
CyberX8_RT/Modules/SRD/SRDHomeRoutine.cs

@@ -122,6 +122,12 @@ namespace CyberX8_RT.Modules.Transporter
                 LOG.WriteLog(eEvent.ERR_SRD, Module, $"CDA or N2 is not enabled");
                 return false;
             }
+            //Check LoadDI
+            if (!systemFacilities.LoaderDiEnable)
+            {
+                LOG.WriteLog(eEvent.ERR_SRD, Module, "Load DI is Disable");
+                return false;
+            }
             return true;
         }
         /// <summary>

+ 2 - 2
CyberX8_Themes/UserControls/PrewetLeftSideControl.xaml

@@ -170,9 +170,9 @@
                            IsError="{Binding ElementName=self,Path=PumpData.PumpFlowData.IsError}" 
                            IsWarning="{Binding ElementName=self,Path=PumpData.PumpFlowData.IsWarning}"/>
         <TextBlock Grid.Row="5" Grid.Column="5"  VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="18" Width="60" Background="LightGray" Foreground="White" 
-                   Text="{Binding ElementName=self,Path=PumpData.PumpFlowData.MaxError}"></TextBlock>
-        <TextBlock Grid.Row="5" Grid.Column="6" VerticalAlignment="Center"  HorizontalAlignment="Center" FontSize="18" Width="60" Background="LightGray" Foreground="White" 
                    Text="{Binding ElementName=self,Path=PumpData.PumpFlowData.MaxWarning}"></TextBlock>
+        <TextBlock Grid.Row="5" Grid.Column="6" VerticalAlignment="Center"  HorizontalAlignment="Center" FontSize="18" Width="60" Background="LightGray" Foreground="White" 
+                   Text="{Binding ElementName=self,Path=PumpData.PumpFlowData.MaxError}"></TextBlock>
         <TextBlock Grid.Row="5" Grid.Column="7" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="12" Background="Transparent">L/min</TextBlock>
         <!--<Grid Grid.Row="11" Grid.Column="0">
             <Label  Content="Pressure Target" FontSize="16" FontWeight="Bold" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="10,0,0,0"/>