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

Merge branch 'develop' of http://112.124.35.216:65000/Sic-Software/MoS2 into develop

Browse Source
This commit is contained in:
hanqiangqiang 2026-08-19 09:14:59 +08:00
commit 4e66258b59
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
App/Modules/SicModules/Config/TM/DeviceModelSystem.xml
View File

@ -137,7 +137,6 @@
</IoTempMeters>
<IoLift4s classType="Aitex.Core.RT.Device.Unit.IoLift4" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoLift4 id="LLLift" module="LoadLock" display="LLLift" schematicId="LLLift" unit="" aioType="" diUp="DI_LoadLockWaferCYUPFB" diDown="DI_LoadLockWaferCYDownFB" doUp="DO_LoadLockWaferCYUP" doDown="DO_LoadLockWaferCYDown" scTimeout="10"/>
<IoLift4 id="LoadLidLock" module="LoadLock" display="LoadLidLock" schematicId="LoadLidLock" unit="" aioType="" diUp="DI_LoadLidLocked" diDown="DI_LoadLidUnlocked" doUp="DO_LoadLidLock" doDown="DO_LoadLidUnlock" scTimeout="10" />
</IoLift4s>
<TMRobots assembly="SicModules" classType="SicModules.TMs.SicTMRobot">
<TMRobot id="TMRobot" module="TMRobot" display="" schematicId="" unit="" />

11
App/Modules/SicModules/UnLoads/UnLoadModule.cs
View File

@ -345,21 +345,22 @@ namespace SicModules.UnLoads
});*/
DATA.Subscribe($"{Name}.UnderVAC", () =>
{
if (_unLoadDevice.CheckVacuum())
if(_unLoadDevice != null)
{
return true;
return _unLoadDevice.CheckVacuum();
}
return false;
});
DATA.Subscribe($"{Name}.LidState", () =>
{
if (_unLoadDevice.CheckLidClose())
if(_unLoadDevice != null)
{
return "Closed";
return _unLoadDevice.CheckLidClose() ? "Closed" : "Open";
}
return "Open";
return "Closed";
});
}

15
App/SicUI/MainViewModel.cs
View File

@ -1374,15 +1374,20 @@ namespace SicUI.Client
if (menuInfo.System is "PM1" or "PM2")
{
var rect = FindVisualChildByName<Rectangle>(container, "InnerBG");
rect.Fill = menuInfo.Selected
if(rect != null)
{
rect.Fill = menuInfo.Selected
? BgActiveContent
: new SolidColorBrush((Color)ColorConverter.ConvertFromString("#FF346294"));
}
var bgBorder = FindVisualChildByName<Border>(container, "BG");
bgBorder.Background = menuInfo.Selected
? BgActiveContent
: new SolidColorBrush((Color)ColorConverter.ConvertFromString("#FF346294"));
if (bgBorder != null)
{
bgBorder.Background = menuInfo.Selected
? BgActiveContent
: new SolidColorBrush((Color)ColorConverter.ConvertFromString("#FF346294"));
}
}
}
}