|  | @@ -225,11 +225,20 @@ namespace FurnaceRT.Devices
 | 
												
													
														
															|  |                  {
 |  |                  {
 | 
												
													
														
															|  |                      if (IsUnloadCompleted)
 |  |                      if (IsUnloadCompleted)
 | 
												
													
														
															|  |                      {
 |  |                      {
 | 
												
													
														
															|  | -                        var sensorFTRHomeCX = DEVICE.GetDevice<IoSensor>($"PM1.SensorFTRHomeCX");
 |  | 
 | 
												
													
														
															|  | -                        if (sensorFTRHomeCX != null && sensorFTRHomeCX.Value)
 |  | 
 | 
												
													
														
															|  | 
 |  | +
 | 
												
													
														
															|  | 
 |  | +                        if (_isSimulatorMode)
 | 
												
													
														
															|  |                          {
 |  |                          {
 | 
												
													
														
															|  |                              ConfirmRemoveCarrier();
 |  |                              ConfirmRemoveCarrier();
 | 
												
													
														
															|  |                          }
 |  |                          }
 | 
												
													
														
															|  | 
 |  | +                        else
 | 
												
													
														
															|  | 
 |  | +                        {
 | 
												
													
														
															|  | 
 |  | +                            var sensorFTRHomeCX = DEVICE.GetDevice<IoSensor>($"PM1.SensorFTRHomeCX");
 | 
												
													
														
															|  | 
 |  | +                            if (sensorFTRHomeCX != null && sensorFTRHomeCX.Value)
 | 
												
													
														
															|  | 
 |  | +                            {
 | 
												
													
														
															|  | 
 |  | +                                ConfirmRemoveCarrier();
 | 
												
													
														
															|  | 
 |  | +                            }
 | 
												
													
														
															|  | 
 |  | +                        }
 | 
												
													
														
															|  | 
 |  | +
 | 
												
													
														
															|  |                      }
 |  |                      }
 | 
												
													
														
															|  |                      else if (IsLoadCompleted)
 |  |                      else if (IsLoadCompleted)
 | 
												
													
														
															|  |                      {
 |  |                      {
 | 
												
											
												
													
														
															|  | @@ -343,19 +352,27 @@ namespace FurnaceRT.Devices
 | 
												
													
														
															|  |  
 |  |  
 | 
												
													
														
															|  |              if (_cstAddtrg.Q && IsUnloadCompleted)
 |  |              if (_cstAddtrg.Q && IsUnloadCompleted)
 | 
												
													
														
															|  |              {
 |  |              {
 | 
												
													
														
															|  | -                var sensorFTRHomeCX = DEVICE.GetDevice<IoSensor>($"PM1.SensorFTRHomeCX");
 |  | 
 | 
												
													
														
															|  | -                if (sensorFTRHomeCX != null && sensorFTRHomeCX.Value)
 |  | 
 | 
												
													
														
															|  | 
 |  | +                if (!Singleton<EquipmentManager>.Instance.IsAutoMode && !Singleton<EquipmentManager>.Instance.IsReturnWaferMode)
 | 
												
													
														
															|  |                  {
 |  |                  {
 | 
												
													
														
															|  | -                    if (!Singleton<EquipmentManager>.Instance.IsAutoMode && !Singleton<EquipmentManager>.Instance.IsReturnWaferMode)
 |  | 
 | 
												
													
														
															|  | 
 |  | +                    if (!CarrierManager.Instance.CheckHasCarrier(Name, 0))
 | 
												
													
														
															|  |                      {
 |  |                      {
 | 
												
													
														
															|  | -                        if (!CarrierManager.Instance.CheckHasCarrier(Name, 0))
 |  | 
 | 
												
													
														
															|  | -                        {
 |  | 
 | 
												
													
														
															|  | -                            CarrierManager.Instance.CreateCarrier(Name, CarrierType.SD, Name);
 |  | 
 | 
												
													
														
															|  | -                        }
 |  | 
 | 
												
													
														
															|  | 
 |  | +                        CarrierManager.Instance.CreateCarrier(Name, CarrierType.SD, Name);
 | 
												
													
														
															|  |                      }
 |  |                      }
 | 
												
													
														
															|  | -
 |  | 
 | 
												
													
														
															|  | 
 |  | +                }
 | 
												
													
														
															|  | 
 |  | +                if (_isSimulatorMode)
 | 
												
													
														
															|  | 
 |  | +                {
 | 
												
													
														
															|  |                      ConfirmAddCarrier();
 |  |                      ConfirmAddCarrier();
 | 
												
													
														
															|  | 
 |  | +
 | 
												
													
														
															|  | 
 |  | +                }
 | 
												
													
														
															|  | 
 |  | +                else
 | 
												
													
														
															|  | 
 |  | +                {
 | 
												
													
														
															|  | 
 |  | +                    var sensorFTRHomeCX = DEVICE.GetDevice<IoSensor>($"PM1.SensorFTRHomeCX");
 | 
												
													
														
															|  | 
 |  | +                    if (sensorFTRHomeCX != null && sensorFTRHomeCX.Value)
 | 
												
													
														
															|  | 
 |  | +                    {
 | 
												
													
														
															|  | 
 |  | +                        ConfirmAddCarrier();
 | 
												
													
														
															|  | 
 |  | +                    }
 | 
												
													
														
															|  |                  }
 |  |                  }
 | 
												
													
														
															|  | 
 |  | +
 | 
												
													
														
															|  |              }
 |  |              }
 | 
												
													
														
															|  |          }
 |  |          }
 | 
												
													
														
															|  |          protected virtual void ConfirmAddCarrier()
 |  |          protected virtual void ConfirmAddCarrier()
 |