Sic-Software
/
SicMultiplate
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修正三色灯没有显示的问题。 

修正TMBaseRoutine中SetRobortExtendToDO()函数出错时没有报Alarm，而是显示为Info的问题。
This commit is contained in:
DESKTOP-GPE37UV\THINKAPD 2023-03-14 16:12:44 +08:00
parent 574bc6c9fa
commit 7bb3fd91a5
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
FrameworkLocal/UICore/DeviceControl/AITSignalTower.xaml
View File

@ -24,7 +24,7 @@
Width="30" Width="30"
Height="20" Height="20"
VerticalAlignment="Top" VerticalAlignment="Top"
Source="pack://application:,,,/MECF.Framework.Common;component/Resources/red.png" Source="pack://application:,,,/MECF.Framework.UI.Core;component/Resources/red.png"
Stretch="Fill"> Stretch="Fill">
<Image.Effect> <Image.Effect>
<DropShadowEffect <DropShadowEffect
@ -45,7 +45,7 @@
Height="20" Height="20"
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
PreviewMouseDown="rectangle2_PreviewMouseDown" PreviewMouseDown="rectangle2_PreviewMouseDown"
Source="pack://application:,,,/MECF.Framework.Common;component/Resources/yellow.png" Source="pack://application:,,,/MECF.Framework.UI.Core;component/Resources/yellow.png"
Stretch="Fill"> Stretch="Fill">
<Image.Effect> <Image.Effect>
<DropShadowEffect <DropShadowEffect
@ -65,7 +65,7 @@
Canvas.Left="0" Canvas.Left="0"
Canvas.Top="0" Canvas.Top="0"
Width="30" Width="30"
Source="pack://application:,,,/MECF.Framework.Common;component/Resources/Lime.png" Source="pack://application:,,,/MECF.Framework.UI.Core;component/Resources/Lime.png"
Stretch="Fill"> Stretch="Fill">
<Image.Effect> <Image.Effect>
<DropShadowEffect <DropShadowEffect
@ -86,7 +86,7 @@
Canvas.Top="0" Canvas.Top="0"
Width="30" Width="30"
Height="20" Height="20"
Source="pack://application:,,,/MECF.Framework.Common;component/Resources/Blue.png" Source="pack://application:,,,/MECF.Framework.UI.Core;component/Resources/Blue.png"
Stretch="Fill" Stretch="Fill"
Visibility="Hidden"> Visibility="Hidden">
<Image.Effect> <Image.Effect>
@ -108,7 +108,7 @@
Canvas.Top="0" Canvas.Top="0"
Width="30" Width="30"
Height="30" Height="30"
Source="pack://application:,,,/MECF.Framework.Common;component/Resources/lights.png" Source="pack://application:,,,/MECF.Framework.UI.Core;component/Resources/lights.png"
Stretch="Fill"> Stretch="Fill">
<Image.Effect> <Image.Effect>
<DropShadowEffect <DropShadowEffect

2
FrameworkLocal/UICore/UICore.csproj
View File

@ -1214,7 +1214,7 @@
<Resource Include="Resources\HeaterShining.png" /> <Resource Include="Resources\HeaterShining.png" />
<Resource Include="Resources\lights.png" /> <Resource Include="Resources\lights.png" />
<Resource Include="Resources\Lime.png" /> <Resource Include="Resources\Lime.png" />
<Content Include="Resources\default_ui.ico" /> <Resource Include="Resources\default_ui.ico" />
<Resource Include="Resources\Loading1.gif" /> <Resource Include="Resources\Loading1.gif" />
<Resource Include="Resources\Login\按钮.png" /> <Resource Include="Resources\Login\按钮.png" />
<Resource Include="Resources\Login\按钮_悬停.png" /> <Resource Include="Resources\Login\按钮_悬停.png" />

12
Modules/Mainframe/TMs/TMBaseRoutine.cs
View File

@ -217,7 +217,7 @@ namespace Mainframe.TMs
/// 发送DO信号 /// 发送DO信号
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id"></param>
protected void SetRobortExtendToDO(int id, ModuleName target, int timeout) protected void SetRobotExtendToDO(int id, ModuleName target, int timeout)
{ {
Tuple<bool, Result> ret = ExecuteAndWait(id, () => Tuple<bool, Result> ret = ExecuteAndWait(id, () =>
{ {
@ -234,7 +234,7 @@ namespace Mainframe.TMs
{ {
if (!_tmIoInterLock.SetRobotExtenLLEnable(true, out string reasen)) if (!_tmIoInterLock.SetRobotExtenLLEnable(true, out string reasen))
{ {
Notify(reasen); Stop(reasen);
return false; return false;
} }
} }
@ -242,7 +242,7 @@ namespace Mainframe.TMs
{ {
if (!_tmIoInterLock.SetRobotExtendUnLoadEnable(true, out string reasen)) if (!_tmIoInterLock.SetRobotExtendUnLoadEnable(true, out string reasen))
{ {
Notify(reasen); Stop(reasen);
return false; return false;
} }
} }
@ -250,7 +250,7 @@ namespace Mainframe.TMs
{ {
if (!_tmIoInterLock.SetRobotExtendBufferEnable(true, out string reasen)) if (!_tmIoInterLock.SetRobotExtendBufferEnable(true, out string reasen))
{ {
Notify(reasen); Stop(reasen);
return false; return false;
} }
} }
@ -258,7 +258,7 @@ namespace Mainframe.TMs
{ {
if (!_tmIoInterLock.SetRobotExtendPMAEnable(true, out string reasen)) if (!_tmIoInterLock.SetRobotExtendPMAEnable(true, out string reasen))
{ {
Notify(reasen); Stop(reasen);
return false; return false;
} }
@ -267,7 +267,7 @@ namespace Mainframe.TMs
{ {
if (!_tmIoInterLock.SetRobotExtendPMBEnable(true, out string reasen)) if (!_tmIoInterLock.SetRobotExtendPMBEnable(true, out string reasen))
{ {
Notify(reasen); Stop(reasen);
return false; return false;
} }

2
Modules/Mainframe/TMs/TMRobotPickRoutine.cs
View File

@ -262,7 +262,7 @@ namespace Mainframe.TMs
RobotRequestWaferPresent((int)RoutineStep.BeforePickRequestWaferPresent, RobotDevice, _blade, _pickTimeout); RobotRequestWaferPresent((int)RoutineStep.BeforePickRequestWaferPresent, RobotDevice, _blade, _pickTimeout);
CheckWaferInfoByRobotRQ((int)RoutineStep.AfterPickCheckWaferInfoByRobotSensor, RobotDevice, _blade, 1000); CheckWaferInfoByRobotRQ((int)RoutineStep.AfterPickCheckWaferInfoByRobotSensor, RobotDevice, _blade, 1000);
WaitPMReadySensor((int)RoutineStep.WaitPMSensor, _target,5); WaitPMReadySensor((int)RoutineStep.WaitPMSensor, _target,5);
SetRobortExtendToDO((int)RoutineStep.SetRobortExtendToDo, _target, 2); SetRobotExtendToDO((int)RoutineStep.SetRobortExtendToDo, _target, 2);
CheckRobotReady((int)RoutineStep.CheckRobotReady, RobotDevice, _pickTimeout); CheckRobotReady((int)RoutineStep.CheckRobotReady, RobotDevice, _pickTimeout);
Pick((int)RoutineStep.Pick, RobotDevice, _target, _targetSlot, _blade, _pickTimeout); Pick((int)RoutineStep.Pick, RobotDevice, _target, _targetSlot, _blade, _pickTimeout);
IsPicking = false; IsPicking = false;

2
Modules/Mainframe/TMs/TMRobotPlaceRoutine.cs
View File

@ -250,7 +250,7 @@ namespace Mainframe.TMs
CheckWaferInfoByRobotRQ((int)RoutineStep.BeforePlaceCheckWaferInfoByRobotSensor, RobotDevice, _blade, 10); CheckWaferInfoByRobotRQ((int)RoutineStep.BeforePlaceCheckWaferInfoByRobotSensor, RobotDevice, _blade, 10);
WaitPMReadySensor((int)RoutineStep.WaitPMSensor, _target, 5); WaitPMReadySensor((int)RoutineStep.WaitPMSensor, _target, 5);
SetRobortExtendToDO((int)RoutineStep.SetRobortExtendToDo, _target, 2); SetRobotExtendToDO((int)RoutineStep.SetRobortExtendToDo, _target, 2);
CheckRobotReady((int)RoutineStep.CheckRobotReady, RobotDevice, _placeTimeout); CheckRobotReady((int)RoutineStep.CheckRobotReady, RobotDevice, _placeTimeout);
Place((int)RoutineStep.Place, RobotDevice, _target, _targetSlot, _blade, _placeTimeout); Place((int)RoutineStep.Place, RobotDevice, _target, _targetSlot, _blade, _placeTimeout);