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

添加昂坤测温，修改开腔动画

This commit is contained in:
Han Qiang Qiang 2024-07-03 14:53:57 +08:00
parent d09c262503 448c487794
commit fa8d924e5c
19 changed files with 107 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/Mainframe/Config/Common/Common.xml
View File

@ -8,6 +8,10 @@
<AKunTemp id="AKunTemp" module="" display="AKunTemp" scBasePath="TempSensors" MaxChannels="4" MinimalTemp="600"/>
</AKunTemps>
<AKunTemps classType="MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Temps.AKunTriggerTemp" assembly="MECF.Framework.RT.EquipmentLibrary">
<AKunTemp id="AKunTriggerTemp" module="" display="AKunTriggerTemp" scBasePath="TempSensors" MaxChannels="1" WaferNum="3" MinimalTemp="600"/>
</AKunTemps>
<SensorTemps classType="MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Temps.SensorTemp" assembly="MECF.Framework.RT.EquipmentLibrary">
<SensorTemp id="SensorTemp1" module="" display="SensorTemp1" scBasePath="TempSensors.Sensor" MaxChannels="1" MinimalTemp="600"/>
<SensorTemp id="SensorTemp2" module="" display="SensorTemp2" scBasePath="TempSensors.Sensor" MaxChannels="1" MinimalTemp="600"/>
@ -16,10 +20,10 @@
</SensorTemps>
<StrongTemps classType="MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Temps.StrongTemp" assembly="MECF.Framework.RT.EquipmentLibrary">
<StrongTemp id="StrongTemp1" module="" display="StrongTemp1" scBasePath="TempSensors.Strong"/>
<StrongTemp id="StrongTemp2" module="" display="StrongTemp2" scBasePath="TempSensors.Strong"/>
<StrongTemp id="StrongTemp3" module="" display="StrongTemp3" scBasePath="TempSensors.Strong"/>
<StrongTemp id="StrongTemp4" module="" display="StrongTemp4" scBasePath="TempSensors.Strong"/>
<StrongTemp id="StrongTemp1" module="" display="StrongTemp1" scBasePath="TempSensors.Strong" MaxChannels="1" MinimalTemp="600"/>
<StrongTemp id="StrongTemp2" module="" display="StrongTemp2" scBasePath="TempSensors.Strong" MaxChannels="1" MinimalTemp="600"/>
<StrongTemp id="StrongTemp3" module="" display="StrongTemp3" scBasePath="TempSensors.Strong" MaxChannels="1" MinimalTemp="600"/>
<StrongTemp id="StrongTemp4" module="" display="StrongTemp4" scBasePath="TempSensors.Strong" MaxChannels="1" MinimalTemp="600"/>
</StrongTemps>
</DeviceModelDefine>

42
Modules/Mainframe/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.599",
"PreReleaseTagWithDash": "-----multiplate-develop.599",
"PreReleaseTag": "----multiplate-develop.600",
"PreReleaseTagWithDash": "-----multiplate-develop.600",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 599,
"WeightedPreReleaseNumber": 599,
"PreReleaseNumber": 600,
"WeightedPreReleaseNumber": 600,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.bc9416d7c712b306beb0edf9711bc3823feff2c2",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.d09c262503609b15e328b57cc9e7b80be53f7a99",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.599",
"LegacySemVer": "23.9.2-----multiplate-de599",
"LegacySemVerPadded": "23.9.2-----multiplate-d0599",
"AssemblySemVer": "23.9.2.599",
"AssemblySemFileVer": "23.9.2.599",
"FullSemVer": "23.9.2-----multiplate-develop.599",
"InformationalVersion": "23.9.2-----multiplate-develop.599+Branch.----multiplate-develop.Sha.bc9416d7c712b306beb0edf9711bc3823feff2c2",
"SemVer": "23.9.2-----multiplate-develop.600",
"LegacySemVer": "23.9.2-----multiplate-de600",
"LegacySemVerPadded": "23.9.2-----multiplate-d0600",
"AssemblySemVer": "23.9.2.600",
"AssemblySemFileVer": "23.9.2.600",
"FullSemVer": "23.9.2-----multiplate-develop.600",
"InformationalVersion": "23.9.2-----multiplate-develop.600+Branch.----multiplate-develop.Sha.d09c262503609b15e328b57cc9e7b80be53f7a99",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "bc9416d7c712b306beb0edf9711bc3823feff2c2",
"ShortSha": "bc9416d",
"NuGetVersionV2": "23.9.2-----multiplate-d0599",
"NuGetVersion": "23.9.2-----multiplate-d0599",
"NuGetPreReleaseTagV2": "----multiplate-d0599",
"NuGetPreReleaseTag": "----multiplate-d0599",
"Sha": "d09c262503609b15e328b57cc9e7b80be53f7a99",
"ShortSha": "d09c262",
"NuGetVersionV2": "23.9.2-----multiplate-d0600",
"NuGetVersion": "23.9.2-----multiplate-d0600",
"NuGetPreReleaseTagV2": "----multiplate-d0600",
"NuGetPreReleaseTag": "----multiplate-d0600",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 599,
"CommitsSinceVersionSourcePadded": "0599",
"UncommittedChanges": 1,
"CommitsSinceVersionSource": 600,
"CommitsSinceVersionSourcePadded": "0600",
"UncommittedChanges": 0,
"CommitDate": "2024-07-02"
}

17
SicRT/Config/System.sccfg
View File

@ -1097,9 +1097,9 @@
<config default="AKunTemp.t2" name="OuterTemp" description="设置Outer温度数据通道，重启生效" max="" min="" paramter="AETemp.t1;AETemp.t2;AETemp.t3;AETemp.t4;AKunTemp.t1;AKunTemp.t2;AKunTemp.t3;AKunTemp.t4;SensorTemp1.t1;SensorTemp2.t1;SensorTemp3.t1;SensorTemp4.t1;StrongTemp1.t1;StrongTemp2.t1;StrongTemp3.t1;StrongTemp4.t1;Disabled" tag="ReadOnlySelection" unit="" type="String" visible="false"/>
<config default="Disabled" name="InnerTemp" description="设置Inner温度数据通道，重启生效" max="" min="" paramter="AETemp.t1;AETemp.t2;AETemp.t3;AETemp.t4;AKunTemp.t1;AKunTemp.t2;AKunTemp.t3;AKunTemp.t4;SensorTemp1.t1;SensorTemp2.t1;SensorTemp3.t1;SensorTemp4.t1;StrongTemp1.t1;StrongTemp2.t1;StrongTemp3.t1;StrongTemp4.t1;Disabled" tag="ReadOnlySelection" unit="" type="String" visible="false"/>
<config default="AKunTemp.CH1" name="Middle" description="设置Middle温度数据通道，重启生效" max="" min="" paramter="AETemp.CH1;AETemp.CH2;AETemp.CH3;AETemp.CH4;AKunTemp.CH1;AKunTemp.CH2;AKunTemp.CH3;AKunTemp.CH4;SensorTemp1.CH1;SensorTemp2.CH1;SensorTemp3.CH1;SensorTemp4.CH1;StrongTemp1.CH1;StrongTemp2.CH1;StrongTemp3.CH1;StrongTemp4.CH1;Disabled" tag="ReadOnlySelection" unit="" type="String" />
<config default="AKunTemp.CH2" name="Outer" description="设置Outer温度数据通道，重启生效" max="" min="" paramter="AETemp.CH1;AETemp.CH2;AETemp.CH3;AETemp.CH4;AKunTemp.CH1;AKunTemp.CH2;AKunTemp.CH3;AKunTemp.CH4;SensorTemp1.CH1;SensorTemp2.CH1;SensorTemp3.CH1;SensorTemp4.CH1;StrongTemp1.CH1;StrongTemp2.CH1;StrongTemp3.CH1;StrongTemp4.CH1;Disabled" tag="ReadOnlySelection" unit="" type="String" />
<config default="AKunTemp.CH3" name="Inner" description="设置Inner温度数据通道，重启生效" max="" min="" paramter="AETemp.CH1;AETemp.CH2;AETemp.CH3;AETemp.CH4;AKunTemp.CH1;AKunTemp.CH2;AKunTemp.CH3;AKunTemp.CH4;SensorTemp1.CH1;SensorTemp2.CH1;SensorTemp3.CH1;SensorTemp4.CH1;StrongTemp1.CH1;StrongTemp2.CH1;StrongTemp3.CH1;StrongTemp4.CH1;Disabled" tag="ReadOnlySelection" unit="" type="String" />
<config default="AKunTemp.CH1" name="Middle" description="设置Middle温度数据通道，重启生效" max="" min="" paramter="AETemp.CH1;AETemp.CH2;AETemp.CH3;AETemp.CH4;AKunTriggerTemp.CH1;AKunTriggerTemp.CH2;AKunTriggerTemp.CH3;AKunTemp.CH1;AKunTemp.CH2;AKunTemp.CH3;AKunTemp.CH4;SensorTemp1.CH1;SensorTemp2.CH1;SensorTemp3.CH1;SensorTemp4.CH1;StrongTemp1.CH1;StrongTemp2.CH1;StrongTemp3.CH1;StrongTemp4.CH1;Disabled" tag="ReadOnlySelection" unit="" type="String" />
<config default="AKunTemp.CH2" name="Outer" description="设置Outer温度数据通道，重启生效" max="" min="" paramter="AETemp.CH1;AETemp.CH2;AETemp.CH3;AETemp.CH4;AKunTriggerTemp.CH1;AKunTriggerTemp.CH2;AKunTriggerTemp.CH3;AKunTemp.CH1;AKunTemp.CH2;AKunTemp.CH3;AKunTemp.CH4;SensorTemp1.CH1;SensorTemp2.CH1;SensorTemp3.CH1;SensorTemp4.CH1;StrongTemp1.CH1;StrongTemp2.CH1;StrongTemp3.CH1;StrongTemp4.CH1;Disabled" tag="ReadOnlySelection" unit="" type="String" />
<config default="AKunTemp.CH3" name="Inner" description="设置Inner温度数据通道，重启生效" max="" min="" paramter="AETemp.CH1;AETemp.CH2;AETemp.CH3;AETemp.CH4;AKunTriggerTemp.CH1;AKunTriggerTemp.CH2;AKunTriggerTemp.CH3;AKunTemp.CH1;AKunTemp.CH2;AKunTemp.CH3;AKunTemp.CH4;SensorTemp1.CH1;SensorTemp2.CH1;SensorTemp3.CH1;SensorTemp4.CH1;StrongTemp1.CH1;StrongTemp2.CH1;StrongTemp3.CH1;StrongTemp4.CH1;Disabled" tag="ReadOnlySelection" unit="" type="String" />
</configs>
</configs>
<configs name="PM2">
@ -1701,9 +1701,9 @@
<config default="AKunTemp.t4" name="OuterTemp" description="设置Outer温度数据通道，重启生效" max="" min="" paramter="AETemp.t1;AETemp.t2;AETemp.t3;AETemp.t4;AKunTemp.t1;AKunTemp.t2;AKunTemp.t3;AKunTemp.t4;SensorTemp1.t1;SensorTemp2.t1;SensorTemp3.t1;SensorTemp4.t1;StrongTemp1.t1;StrongTemp2.t1;StrongTemp3.t1;StrongTemp4.t1;Disabled" tag="ReadOnlySelection" unit="" type="String" visible="false"/>
<config default="Disabled" name="InnerTemp" description="设置Inner温度数据通道，重启生效" max="" min="" paramter="AETemp.t1;AETemp.t2;AETemp.t3;AETemp.t4;AKunTemp.t1;AKunTemp.t2;AKunTemp.t3;AKunTemp.t4;SensorTemp1.t1;SensorTemp2.t1;SensorTemp3.t1;SensorTemp4.t1;StrongTemp1.t1;StrongTemp2.t1;StrongTemp3.t1;StrongTemp4.t1;Disabled" tag="ReadOnlySelection" unit="" type="String" visible="false"/>
<config default="Disabled" name="Middle" description="设置Middle温度数据通道，重启生效" max="" min="" paramter="AETemp.CH1;AETemp.CH2;AETemp.CH3;AETemp.CH4;AKunTemp.CH1;AKunTemp.CH2;AKunTemp.CH3;AKunTemp.CH4;SensorTemp1.CH1;SensorTemp2.CH1;SensorTemp3.CH1;SensorTemp4.CH1;StrongTemp1.CH1;StrongTemp2.CH1;StrongTemp3.CH1;StrongTemp4.CH1;Disabled" tag="ReadOnlySelection" unit="" type="String" />
<config default="Disabled" name="Outer" description="设置Outer温度数据通道，重启生效" max="" min="" paramter="AETemp.CH1;AETemp.CH2;AETemp.CH3;AETemp.CH4;AKunTemp.CH1;AKunTemp.CH2;AKunTemp.CH3;AKunTemp.CH4;SensorTemp1.CH1;SensorTemp2.CH1;SensorTemp3.CH1;SensorTemp4.CH1;StrongTemp1.CH1;StrongTemp2.CH1;StrongTemp3.CH1;StrongTemp4.CH1;Disabled" tag="ReadOnlySelection" unit="" type="String" />
<config default="Disabled" name="Inner" description="设置Inner温度数据通道，重启生效" max="" min="" paramter="AETemp.CH1;AETemp.CH2;AETemp.CH3;AETemp.CH4;AKunTemp.CH1;AKunTemp.CH2;AKunTemp.CH3;AKunTemp.CH4;SensorTemp1.CH1;SensorTemp2.CH1;SensorTemp3.CH1;SensorTemp4.CH1;StrongTemp1.CH1;StrongTemp2.CH1;StrongTemp3.CH1;StrongTemp4.CH1;Disabled" tag="ReadOnlySelection" unit="" type="String" />
<config default="Disabled" name="Middle" description="设置Middle温度数据通道，重启生效" max="" min="" paramter="AETemp.CH1;AETemp.CH2;AETemp.CH3;AETemp.CH4;AKunTriggerTemp.CH1;AKunTriggerTemp.CH2;AKunTriggerTemp.CH3;AKunTemp.CH1;AKunTemp.CH2;AKunTemp.CH3;AKunTemp.CH4;SensorTemp1.CH1;SensorTemp2.CH1;SensorTemp3.CH1;SensorTemp4.CH1;StrongTemp1.CH1;StrongTemp2.CH1;StrongTemp3.CH1;StrongTemp4.CH1;Disabled" tag="ReadOnlySelection" unit="" type="String" />
<config default="Disabled" name="Outer" description="设置Outer温度数据通道，重启生效" max="" min="" paramter="AETemp.CH1;AETemp.CH2;AETemp.CH3;AETemp.CH4;AKunTriggerTemp.CH1;AKunTriggerTemp.CH2;AKunTriggerTemp.CH3;AKunTemp.CH1;AKunTemp.CH2;AKunTemp.CH3;AKunTemp.CH4;SensorTemp1.CH1;SensorTemp2.CH1;SensorTemp3.CH1;SensorTemp4.CH1;StrongTemp1.CH1;StrongTemp2.CH1;StrongTemp3.CH1;StrongTemp4.CH1;Disabled" tag="ReadOnlySelection" unit="" type="String" />
<config default="Disabled" name="Inner" description="设置Inner温度数据通道，重启生效" max="" min="" paramter="AETemp.CH1;AETemp.CH2;AETemp.CH3;AETemp.CH4;AKunTriggerTemp.CH1;AKunTriggerTemp.CH2;AKunTriggerTemp.CH3;AKunTemp.CH1;AKunTemp.CH2;AKunTemp.CH3;AKunTemp.CH4;SensorTemp1.CH1;SensorTemp2.CH1;SensorTemp3.CH1;SensorTemp4.CH1;StrongTemp1.CH1;StrongTemp2.CH1;StrongTemp3.CH1;StrongTemp4.CH1;Disabled" tag="ReadOnlySelection" unit="" type="String" />
</configs>
</configs>
@ -2074,6 +2074,11 @@
<config default="127.0.0.1:53888" name="Address" description="AKun IP address，Default IP: 127.0.0.1:53888" max="" min="" paramter="" tag="" unit="" type="String" />
<config default="10" name="ControllerAverageTime" description="AKun温度平滑时间,AKun间隔/ms采样温度，设置后立即生效" max="10000" min="1" paramter="" tag="" unit="ms" type="Integer" />
</configs>
<configs name="AKunTriggerTemp">
<config default="false" name="EnableDevice" description="AKun带Trigger设备启用，设置后重启生效" max="" min="" paramter="" tag="" unit="" type="Bool" />
<config default="127.0.0.1:55888" name="Address" description="AKunTrigger IP address，Default IP: 127.0.0.1:55888" max="" min="" paramter="" tag="" unit="" type="String" />
</configs>
<configs name="Sensor">
<configs name="SensorTemp1">

2
SicRT/Equipments/Systems/DeviceManager.cs
View File

@ -37,7 +37,7 @@ namespace SicRT.Instances
// aeTemp.Initialize(_address, _enableLog);
// QueueDevice(aeTemp);
//}
//if (SC.GetConfigItem("TempOmron.EnableDevice").BoolValue)
//{
// var Omron1 = new TempOmron("PM1", "TempOmron", "TempOmron");

42
SicRT/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.599",
"PreReleaseTagWithDash": "-----multiplate-develop.599",
"PreReleaseTag": "----multiplate-develop.600",
"PreReleaseTagWithDash": "-----multiplate-develop.600",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 599,
"WeightedPreReleaseNumber": 599,
"PreReleaseNumber": 600,
"WeightedPreReleaseNumber": 600,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.bc9416d7c712b306beb0edf9711bc3823feff2c2",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.d09c262503609b15e328b57cc9e7b80be53f7a99",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.599",
"LegacySemVer": "23.9.2-----multiplate-de599",
"LegacySemVerPadded": "23.9.2-----multiplate-d0599",
"AssemblySemVer": "23.9.2.599",
"AssemblySemFileVer": "23.9.2.599",
"FullSemVer": "23.9.2-----multiplate-develop.599",
"InformationalVersion": "23.9.2-----multiplate-develop.599+Branch.----multiplate-develop.Sha.bc9416d7c712b306beb0edf9711bc3823feff2c2",
"SemVer": "23.9.2-----multiplate-develop.600",
"LegacySemVer": "23.9.2-----multiplate-de600",
"LegacySemVerPadded": "23.9.2-----multiplate-d0600",
"AssemblySemVer": "23.9.2.600",
"AssemblySemFileVer": "23.9.2.600",
"FullSemVer": "23.9.2-----multiplate-develop.600",
"InformationalVersion": "23.9.2-----multiplate-develop.600+Branch.----multiplate-develop.Sha.d09c262503609b15e328b57cc9e7b80be53f7a99",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "bc9416d7c712b306beb0edf9711bc3823feff2c2",
"ShortSha": "bc9416d",
"NuGetVersionV2": "23.9.2-----multiplate-d0599",
"NuGetVersion": "23.9.2-----multiplate-d0599",
"NuGetPreReleaseTagV2": "----multiplate-d0599",
"NuGetPreReleaseTag": "----multiplate-d0599",
"Sha": "d09c262503609b15e328b57cc9e7b80be53f7a99",
"ShortSha": "d09c262",
"NuGetVersionV2": "23.9.2-----multiplate-d0600",
"NuGetVersion": "23.9.2-----multiplate-d0600",
"NuGetPreReleaseTagV2": "----multiplate-d0600",
"NuGetPreReleaseTag": "----multiplate-d0600",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 599,
"CommitsSinceVersionSourcePadded": "0599",
"UncommittedChanges": 1,
"CommitsSinceVersionSource": 600,
"CommitsSinceVersionSourcePadded": "0600",
"UncommittedChanges": 0,
"CommitDate": "2024-07-02"
}

42
SicSimulator/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.599",
"PreReleaseTagWithDash": "-----multiplate-develop.599",
"PreReleaseTag": "----multiplate-develop.600",
"PreReleaseTagWithDash": "-----multiplate-develop.600",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 599,
"WeightedPreReleaseNumber": 599,
"PreReleaseNumber": 600,
"WeightedPreReleaseNumber": 600,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.bc9416d7c712b306beb0edf9711bc3823feff2c2",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.d09c262503609b15e328b57cc9e7b80be53f7a99",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.599",
"LegacySemVer": "23.9.2-----multiplate-de599",
"LegacySemVerPadded": "23.9.2-----multiplate-d0599",
"AssemblySemVer": "23.9.2.599",
"AssemblySemFileVer": "23.9.2.599",
"FullSemVer": "23.9.2-----multiplate-develop.599",
"InformationalVersion": "23.9.2-----multiplate-develop.599+Branch.----multiplate-develop.Sha.bc9416d7c712b306beb0edf9711bc3823feff2c2",
"SemVer": "23.9.2-----multiplate-develop.600",
"LegacySemVer": "23.9.2-----multiplate-de600",
"LegacySemVerPadded": "23.9.2-----multiplate-d0600",
"AssemblySemVer": "23.9.2.600",
"AssemblySemFileVer": "23.9.2.600",
"FullSemVer": "23.9.2-----multiplate-develop.600",
"InformationalVersion": "23.9.2-----multiplate-develop.600+Branch.----multiplate-develop.Sha.d09c262503609b15e328b57cc9e7b80be53f7a99",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "bc9416d7c712b306beb0edf9711bc3823feff2c2",
"ShortSha": "bc9416d",
"NuGetVersionV2": "23.9.2-----multiplate-d0599",
"NuGetVersion": "23.9.2-----multiplate-d0599",
"NuGetPreReleaseTagV2": "----multiplate-d0599",
"NuGetPreReleaseTag": "----multiplate-d0599",
"Sha": "d09c262503609b15e328b57cc9e7b80be53f7a99",
"ShortSha": "d09c262",
"NuGetVersionV2": "23.9.2-----multiplate-d0600",
"NuGetVersion": "23.9.2-----multiplate-d0600",
"NuGetPreReleaseTagV2": "----multiplate-d0600",
"NuGetPreReleaseTag": "----multiplate-d0600",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 599,
"CommitsSinceVersionSourcePadded": "0599",
"UncommittedChanges": 1,
"CommitsSinceVersionSource": 600,
"CommitsSinceVersionSourcePadded": "0600",
"UncommittedChanges": 0,
"CommitDate": "2024-07-02"
}

2
SicUI/Controls/BodyLid.xaml.cs
View File

@ -329,7 +329,7 @@ namespace SicUI.Controls
this.PicTR.Source = new BitmapImage(new Uri("pack://application:,,,/SicUI;component/Themes/Images/parts/bodymove/khr.png"));
this.PicTL.Source = new BitmapImage(new Uri("pack://application:,,,/SicUI;component/Themes/Images/parts/bodymove/khl.png"));
if (!SwingLockSH)
if (!TightenSH || !SwingLockSH)
{
this.PicTop.Source = new BitmapImage(new Uri("pack://application:,,,/SicUI;component/Themes/Images/parts/bodymove/Showerhead.png"));
this.picMiddle.Source = new BitmapImage(new Uri("pack://application:,,,/SicUI;component/Themes/Images/parts/bodymove/Middle2.png"));

3
SicUI/Models/PMs/PMMotionView.xaml
View File

@ -21,8 +21,7 @@
<Canvas>
<local:MoveBody
Canvas.Left="-160"
Canvas.Top="-72"
Visibility="Visible" />
Canvas.Top="-72"/>
<Grid Canvas.Left="573" Canvas.Top="373">

2
SicUI/Models/PMs/PMMotionViewModel.cs
View File

@ -119,7 +119,7 @@ namespace SicUI.Models.PMs
[Subscription("ChamberMoveBody.UpFaceback")]
public bool IsChamMoveBodyUp { get; set; }
[Subscription("ChamberMoveBody.DownFaceback")]
public bool IsChamMoveBodyDown { get; set; }
public bool IsChamMoveBodyDown{ get; set; }
[Subscription("ChamberMoveBody.UpLatchFaceback")]
public bool IsChamMoveBodyUpLatch { get; set; }

42
SicUI/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.599",
"PreReleaseTagWithDash": "-----multiplate-develop.599",
"PreReleaseTag": "----multiplate-develop.600",
"PreReleaseTagWithDash": "-----multiplate-develop.600",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 599,
"WeightedPreReleaseNumber": 599,
"PreReleaseNumber": 600,
"WeightedPreReleaseNumber": 600,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.bc9416d7c712b306beb0edf9711bc3823feff2c2",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.d09c262503609b15e328b57cc9e7b80be53f7a99",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.599",
"LegacySemVer": "23.9.2-----multiplate-de599",
"LegacySemVerPadded": "23.9.2-----multiplate-d0599",
"AssemblySemVer": "23.9.2.599",
"AssemblySemFileVer": "23.9.2.599",
"FullSemVer": "23.9.2-----multiplate-develop.599",
"InformationalVersion": "23.9.2-----multiplate-develop.599+Branch.----multiplate-develop.Sha.bc9416d7c712b306beb0edf9711bc3823feff2c2",
"SemVer": "23.9.2-----multiplate-develop.600",
"LegacySemVer": "23.9.2-----multiplate-de600",
"LegacySemVerPadded": "23.9.2-----multiplate-d0600",
"AssemblySemVer": "23.9.2.600",
"AssemblySemFileVer": "23.9.2.600",
"FullSemVer": "23.9.2-----multiplate-develop.600",
"InformationalVersion": "23.9.2-----multiplate-develop.600+Branch.----multiplate-develop.Sha.d09c262503609b15e328b57cc9e7b80be53f7a99",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "bc9416d7c712b306beb0edf9711bc3823feff2c2",
"ShortSha": "bc9416d",
"NuGetVersionV2": "23.9.2-----multiplate-d0599",
"NuGetVersion": "23.9.2-----multiplate-d0599",
"NuGetPreReleaseTagV2": "----multiplate-d0599",
"NuGetPreReleaseTag": "----multiplate-d0599",
"Sha": "d09c262503609b15e328b57cc9e7b80be53f7a99",
"ShortSha": "d09c262",
"NuGetVersionV2": "23.9.2-----multiplate-d0600",
"NuGetVersion": "23.9.2-----multiplate-d0600",
"NuGetPreReleaseTagV2": "----multiplate-d0600",
"NuGetPreReleaseTag": "----multiplate-d0600",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 599,
"CommitsSinceVersionSourcePadded": "0599",
"UncommittedChanges": 1,
"CommitsSinceVersionSource": 600,
"CommitsSinceVersionSourcePadded": "0600",
"UncommittedChanges": 0,
"CommitDate": "2024-07-02"
}

BIN
ThirdParty/MECF.Framework/MECF.Framework.Common.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/Sicentury.Core.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/Sicentury.Localization.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll vendored
View File

Binary file not shown.