revise robot cycle

CyberX8_MainPages/ViewModels/RobotCycleViewModel.cs

@@ -36,6 +36,7 @@ namespace CyberX8_MainPages.ViewModels
         /// </summary>
         private ModuleName _selectedDummyName = ModuleName.Dummy1;
         private ModuleName _selectedSrdName = ModuleName.SRD1;
+        private ModuleName _selectedPufName = ModuleName.PUF1;
         /// <summary>
         /// 输入的Cycle次数
         /// </summary>
@@ -55,7 +56,11 @@ namespace CyberX8_MainPages.ViewModels
         /// <summary>
         /// 是否选中srd
         /// </summary>
-        private bool _isSrdSelected = false ;
+        private bool _isSrdSelected = false ;
+        /// <summary>
+        /// 是否选中puf
+        /// </summary>
+        private bool _isPufSelected = false;
         #region 系统数据
         /// <summary>
         /// 定时器
@@ -92,6 +97,11 @@ namespace CyberX8_MainPages.ViewModels
         {
             get { return _selectedSrdName; }
             set { SetProperty(ref _selectedSrdName, value); }
+        }
+        public ModuleName SelectedPufName
+        {
+            get { return _selectedPufName; }
+            set { SetProperty(ref _selectedPufName, value); }
         }
         public int InPutCycleTimes
         {
@@ -118,6 +128,11 @@ namespace CyberX8_MainPages.ViewModels
         {
             get { return _isSrdSelected; }
             set { SetProperty(ref _isSrdSelected, value); }
+        }
+        public bool IsPufSelected
+        {
+            get { return _isPufSelected; }
+            set { SetProperty(ref _isPufSelected, value); }
         }
         #endregion
 
@@ -130,6 +145,8 @@ namespace CyberX8_MainPages.ViewModels
         public ICommand LPChangeCommand { get; set; }
  
         public ICommand AlignerChangeCommand { get; set; }
+        
+        public ICommand PufChangeCommand { get; set; }
    
         public ICommand DummyChangeCommand { get; set; }
         
@@ -145,6 +162,7 @@ namespace CyberX8_MainPages.ViewModels
             RobotCycleAbortCommand = new DelegateCommand<object>(RobotCycleAbortAction);
             LPChangeCommand = new DelegateCommand<object>(LPChangeAction);
             AlignerChangeCommand = new DelegateCommand<object>(AlignerChangeAction);
+            PufChangeCommand = new DelegateCommand<object>(PufChangeAction);
             DummyChangeCommand = new DelegateCommand<object>(DummyChangeAction);
             SrdChangeCommand = new DelegateCommand<object>(SrdChangeAction);
         }
@@ -158,15 +176,23 @@ namespace CyberX8_MainPages.ViewModels
             if (!IsSrdSelected)
             {
                 SelectedSrdName = ModuleName.Unknown;
+            }
+            if (!IsPufSelected)
+            {
+                SelectedPufName = ModuleName.Unknown;
             }
-            if(!IsDummySelected && !IsSrdSelected)
+            if (!IsDummySelected && !IsSrdSelected)
             {
                 MessageBox.Show("Selected at least on module between srd and dummy!");
                 return;
             }
             List<string> sequences = new List<string>();
             sequences.Add(SelectedLPName.ToString());
-            sequences.Add(SelectedAlignerName.ToString());
+            sequences.Add(SelectedAlignerName.ToString());
+            if (SelectedPufName != ModuleName.Unknown)
+            {
+                sequences.Add(SelectedPufName.ToString());
+            }
             if (SelectedSrdName != ModuleName.Unknown)
             {
                 sequences.Add(SelectedSrdName.ToString());
@@ -200,6 +226,10 @@ namespace CyberX8_MainPages.ViewModels
         private void AlignerChangeAction(object param)
         {
             
+        }
+        private void PufChangeAction(object param)
+        {
+
         }
         private void DummyChangeAction(object param)
         {

CyberX8_MainPages/Views/RobotCycleView.xaml

@@ -22,6 +22,7 @@
                 <RowDefinition Height="70"/>
                 <RowDefinition Height="70"/>
                 <RowDefinition Height="70"/>
+                <RowDefinition Height="70"/>
                 <RowDefinition />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
@@ -107,17 +108,30 @@
                     </RadioButton>
                 </Grid>
             </GroupBox>
+            <CheckBox Grid.Row="4" Grid.Column="0" Margin="30,12,0,0"  VerticalAlignment="Center" HorizontalAlignment="Left" Content="PufSelect"  FontSize="16" FontWeight="Bold" 
+                    IsChecked="{Binding IsPufSelected,Mode=TwoWay}"/>
+            <GroupBox Header="Puf Select" FontSize="14" FontWeight="Bold"  Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="3" IsEnabled="{Binding IsPufSelected}">
+                <Grid>
+                    <RadioButton Content="PUF1"  x:Name="puf1" IsChecked="True" Margin="215,0,0,0" FontSize="19" VerticalContentAlignment="Center" HorizontalAlignment="Left">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Checked">
+                                <i:InvokeCommandAction Command="{Binding PufChangeCommand}" CommandParameter="{Binding ElementName=puf1,Path=Content}"/>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </RadioButton>
+                </Grid>
+            </GroupBox>
             <CheckBox Grid.Row="3" Grid.Column="0" Margin="30,12,0,0"  VerticalAlignment="Center" HorizontalAlignment="Left" Content="SrdSelect"  FontSize="16" FontWeight="Bold" 
                 IsChecked="{Binding IsSrdSelected,Mode=TwoWay}"/>
-            <TextBlock  Grid.Row="4" Grid.Column="0" Text="Cycle :" FontSize="19" VerticalAlignment="Center" Margin="58,0,0,0"/>
-            <TextBox Grid.Row="4" Grid.Column="1" Height="35" Width="80" FontSize="15" HorizontalAlignment="Left"  Margin="0,0,0,0" Background="White" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"  Text="{Binding InPutCycleTimes,Mode=TwoWay}" />
+            <TextBlock  Grid.Row="5" Grid.Column="0" Text="Cycle :" FontSize="19" VerticalAlignment="Center" Margin="58,0,0,0"/>
+            <TextBox Grid.Row="5" Grid.Column="1" Height="35" Width="80" FontSize="15" HorizontalAlignment="Left"  Margin="0,0,0,0" Background="White" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"  Text="{Binding InPutCycleTimes,Mode=TwoWay}" />
 
-            <TextBlock  Grid.Row="5" Grid.Column="0" Text="Current :" FontSize="19" VerticalAlignment="Center" Margin="58,0,0,0"/>
-            <Border Grid.Row="5" Grid.Column="1" Margin="0,0,0,0" Background="Black" Height="35" Width="80" HorizontalAlignment="Left">
+            <TextBlock  Grid.Row="6" Grid.Column="0" Text="Current :" FontSize="19" VerticalAlignment="Center" Margin="58,0,0,0"/>
+            <Border Grid.Row="6" Grid.Column="1" Margin="0,0,0,0" Background="Black" Height="35" Width="80" HorizontalAlignment="Left">
                 <TextBlock  Text="{Binding CurrentCycle}" Foreground="Lime" FontSize="16" FontWeight="Bold" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center"/>
             </Border>
-            <Button Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" Content="Start" Width="120" Height="36" Command="{Binding RobotCycleStartCommand}" FontSize="18" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-            <Button Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2" Content="Aobot" Width="120" Height="36" Command="{Binding RobotCycleAbortCommand}" FontSize="18" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+            <Button Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="2" Content="Start" Width="120" Height="36" Command="{Binding RobotCycleStartCommand}" FontSize="18" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+            <Button Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="2" Content="Aobot" Width="120" Height="36" Command="{Binding RobotCycleAbortCommand}" FontSize="18" HorizontalAlignment="Center" VerticalAlignment="Center"/>
         </Grid>
     </Canvas>
 </UserControl>

CyberX8_RT/Modules/EFEM/CycleRobotCycleNewRoutine.cs

@@ -1,6 +1,7 @@
 using Aitex.Core.Common;
 using Aitex.Core.RT.Log;
 using Aitex.Core.RT.Routine;
+using Aitex.Core.Util;
 using CyberX8_Core;
 using CyberX8_RT.Devices.EFEM;
 using CyberX8_RT.Modules.Rinse;
@@ -41,6 +42,7 @@ namespace CyberX8_RT.Modules.EFEM
         private List<ModuleName> _sequences;
         private int _alignerAngle;
         private List<EfemCycleAction> _actions;
+        private int _dummySlotNumber = 25; //当前cycle中的dummy slot 数量
 
         public CycleRobotCycleNewRoutine(EfemBase efem) : base(ModuleName.EfemRobot)
         {
@@ -64,6 +66,7 @@ namespace CyberX8_RT.Modules.EFEM
                 LOG.Write(eEvent.ERR_EFEM_ROBOT, Module, $"Input Robot Cycle Times{_cycleTimes} error");
                 return RState.Failed;
             }
+            
             return Runner.Start(Module, "Start CycleRobotCycleRoutine");
         }
         private void GenerateCycleAction()
@@ -93,8 +96,20 @@ namespace CyberX8_RT.Modules.EFEM
                         _actions.AddRange(GenerateCycle(_sequences[i], ModuleHelper.IsDummy(_sequences[i]) ? count : 0, _sequences[0],
                             item.Slot));
                     }
+                    if (ModuleHelper.IsDummy(_sequences[i]))
+                    {
+                        WaferInfo[] dummywaferInfos = WaferManager.Instance.GetWafers(_sequences[i]);
+                        if (dummywaferInfos != null)
+                        {
+                            _dummySlotNumber = dummywaferInfos.Length;
+                        }
+                    }
                 }
                 count++;
+                if(count >= _dummySlotNumber)
+                {
+                    count = 0;
+                }
             }
         }