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-02 13:05:45 +08:00
parent 80f65eba5e
commit ebf69eda70
7 changed files with 98 additions and 89 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" 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": "----Trigger--.593",
"PreReleaseTagWithDash": "-----Trigger--.593",
"PreReleaseTag": "----Trigger--.594",
"PreReleaseTagWithDash": "-----Trigger--.594",
"PreReleaseLabel": "----Trigger--",
"PreReleaseLabelWithDash": "-----Trigger--",
"PreReleaseNumber": 593,
"WeightedPreReleaseNumber": 593,
"PreReleaseNumber": 594,
"WeightedPreReleaseNumber": 594,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----Trigger--.Sha.acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859",
"FullBuildMetaData": "Branch.----Trigger--.Sha.80f65eba5e607d301fa38110760f143575d8cedf",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----Trigger--.593",
"LegacySemVer": "23.9.2-----Trigger--593",
"LegacySemVerPadded": "23.9.2-----Trigger--0593",
"AssemblySemVer": "23.9.2.593",
"AssemblySemFileVer": "23.9.2.593",
"FullSemVer": "23.9.2-----Trigger--.593",
"InformationalVersion": "23.9.2-----Trigger--.593+Branch.----Trigger--.Sha.acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859",
"SemVer": "23.9.2-----Trigger--.594",
"LegacySemVer": "23.9.2-----Trigger--594",
"LegacySemVerPadded": "23.9.2-----Trigger--0594",
"AssemblySemVer": "23.9.2.594",
"AssemblySemFileVer": "23.9.2.594",
"FullSemVer": "23.9.2-----Trigger--.594",
"InformationalVersion": "23.9.2-----Trigger--.594+Branch.----Trigger--.Sha.80f65eba5e607d301fa38110760f143575d8cedf",
"BranchName": "测试昂坤Trigger测温",
"EscapedBranchName": "----Trigger--",
"Sha": "acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859",
"ShortSha": "acb370d",
"NuGetVersionV2": "23.9.2-----trigger--0593",
"NuGetVersion": "23.9.2-----trigger--0593",
"NuGetPreReleaseTagV2": "----trigger--0593",
"NuGetPreReleaseTag": "----trigger--0593",
"Sha": "80f65eba5e607d301fa38110760f143575d8cedf",
"ShortSha": "80f65eb",
"NuGetVersionV2": "23.9.2-----trigger--0594",
"NuGetVersion": "23.9.2-----trigger--0594",
"NuGetPreReleaseTagV2": "----trigger--0594",
"NuGetPreReleaseTag": "----trigger--0594",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 593,
"CommitsSinceVersionSourcePadded": "0593",
"UncommittedChanges": 0,
"CommitsSinceVersionSource": 594,
"CommitsSinceVersionSourcePadded": "0594",
"UncommittedChanges": 7,
"CommitDate": "2024-06-28"
}

5
SicRT/Config/System.sccfg
View File

@ -2067,6 +2067,11 @@
<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">
<config default="false" name="EnableDevice" description="Sensor1启用，设置后重启生效" max="" min="" paramter="" tag="" unit="" type="Bool" />

42
SicRT/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----Trigger--.593",
"PreReleaseTagWithDash": "-----Trigger--.593",
"PreReleaseTag": "----Trigger--.594",
"PreReleaseTagWithDash": "-----Trigger--.594",
"PreReleaseLabel": "----Trigger--",
"PreReleaseLabelWithDash": "-----Trigger--",
"PreReleaseNumber": 593,
"WeightedPreReleaseNumber": 593,
"PreReleaseNumber": 594,
"WeightedPreReleaseNumber": 594,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----Trigger--.Sha.acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859",
"FullBuildMetaData": "Branch.----Trigger--.Sha.80f65eba5e607d301fa38110760f143575d8cedf",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----Trigger--.593",
"LegacySemVer": "23.9.2-----Trigger--593",
"LegacySemVerPadded": "23.9.2-----Trigger--0593",
"AssemblySemVer": "23.9.2.593",
"AssemblySemFileVer": "23.9.2.593",
"FullSemVer": "23.9.2-----Trigger--.593",
"InformationalVersion": "23.9.2-----Trigger--.593+Branch.----Trigger--.Sha.acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859",
"SemVer": "23.9.2-----Trigger--.594",
"LegacySemVer": "23.9.2-----Trigger--594",
"LegacySemVerPadded": "23.9.2-----Trigger--0594",
"AssemblySemVer": "23.9.2.594",
"AssemblySemFileVer": "23.9.2.594",
"FullSemVer": "23.9.2-----Trigger--.594",
"InformationalVersion": "23.9.2-----Trigger--.594+Branch.----Trigger--.Sha.80f65eba5e607d301fa38110760f143575d8cedf",
"BranchName": "测试昂坤Trigger测温",
"EscapedBranchName": "----Trigger--",
"Sha": "acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859",
"ShortSha": "acb370d",
"NuGetVersionV2": "23.9.2-----trigger--0593",
"NuGetVersion": "23.9.2-----trigger--0593",
"NuGetPreReleaseTagV2": "----trigger--0593",
"NuGetPreReleaseTag": "----trigger--0593",
"Sha": "80f65eba5e607d301fa38110760f143575d8cedf",
"ShortSha": "80f65eb",
"NuGetVersionV2": "23.9.2-----trigger--0594",
"NuGetVersion": "23.9.2-----trigger--0594",
"NuGetPreReleaseTagV2": "----trigger--0594",
"NuGetPreReleaseTag": "----trigger--0594",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 593,
"CommitsSinceVersionSourcePadded": "0593",
"UncommittedChanges": 0,
"CommitsSinceVersionSource": 594,
"CommitsSinceVersionSourcePadded": "0594",
"UncommittedChanges": 7,
"CommitDate": "2024-06-28"
}

42
SicSimulator/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----Trigger--.593",
"PreReleaseTagWithDash": "-----Trigger--.593",
"PreReleaseTag": "----Trigger--.594",
"PreReleaseTagWithDash": "-----Trigger--.594",
"PreReleaseLabel": "----Trigger--",
"PreReleaseLabelWithDash": "-----Trigger--",
"PreReleaseNumber": 593,
"WeightedPreReleaseNumber": 593,
"PreReleaseNumber": 594,
"WeightedPreReleaseNumber": 594,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----Trigger--.Sha.acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859",
"FullBuildMetaData": "Branch.----Trigger--.Sha.80f65eba5e607d301fa38110760f143575d8cedf",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----Trigger--.593",
"LegacySemVer": "23.9.2-----Trigger--593",
"LegacySemVerPadded": "23.9.2-----Trigger--0593",
"AssemblySemVer": "23.9.2.593",
"AssemblySemFileVer": "23.9.2.593",
"FullSemVer": "23.9.2-----Trigger--.593",
"InformationalVersion": "23.9.2-----Trigger--.593+Branch.----Trigger--.Sha.acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859",
"SemVer": "23.9.2-----Trigger--.594",
"LegacySemVer": "23.9.2-----Trigger--594",
"LegacySemVerPadded": "23.9.2-----Trigger--0594",
"AssemblySemVer": "23.9.2.594",
"AssemblySemFileVer": "23.9.2.594",
"FullSemVer": "23.9.2-----Trigger--.594",
"InformationalVersion": "23.9.2-----Trigger--.594+Branch.----Trigger--.Sha.80f65eba5e607d301fa38110760f143575d8cedf",
"BranchName": "测试昂坤Trigger测温",
"EscapedBranchName": "----Trigger--",
"Sha": "acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859",
"ShortSha": "acb370d",
"NuGetVersionV2": "23.9.2-----trigger--0593",
"NuGetVersion": "23.9.2-----trigger--0593",
"NuGetPreReleaseTagV2": "----trigger--0593",
"NuGetPreReleaseTag": "----trigger--0593",
"Sha": "80f65eba5e607d301fa38110760f143575d8cedf",
"ShortSha": "80f65eb",
"NuGetVersionV2": "23.9.2-----trigger--0594",
"NuGetVersion": "23.9.2-----trigger--0594",
"NuGetPreReleaseTagV2": "----trigger--0594",
"NuGetPreReleaseTag": "----trigger--0594",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 593,
"CommitsSinceVersionSourcePadded": "0593",
"UncommittedChanges": 0,
"CommitsSinceVersionSource": 594,
"CommitsSinceVersionSourcePadded": "0594",
"UncommittedChanges": 7,
"CommitDate": "2024-06-28"
}

42
SicUI/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----Trigger--.593",
"PreReleaseTagWithDash": "-----Trigger--.593",
"PreReleaseTag": "----Trigger--.594",
"PreReleaseTagWithDash": "-----Trigger--.594",
"PreReleaseLabel": "----Trigger--",
"PreReleaseLabelWithDash": "-----Trigger--",
"PreReleaseNumber": 593,
"WeightedPreReleaseNumber": 593,
"PreReleaseNumber": 594,
"WeightedPreReleaseNumber": 594,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----Trigger--.Sha.acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859",
"FullBuildMetaData": "Branch.----Trigger--.Sha.80f65eba5e607d301fa38110760f143575d8cedf",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----Trigger--.593",
"LegacySemVer": "23.9.2-----Trigger--593",
"LegacySemVerPadded": "23.9.2-----Trigger--0593",
"AssemblySemVer": "23.9.2.593",
"AssemblySemFileVer": "23.9.2.593",
"FullSemVer": "23.9.2-----Trigger--.593",
"InformationalVersion": "23.9.2-----Trigger--.593+Branch.----Trigger--.Sha.acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859",
"SemVer": "23.9.2-----Trigger--.594",
"LegacySemVer": "23.9.2-----Trigger--594",
"LegacySemVerPadded": "23.9.2-----Trigger--0594",
"AssemblySemVer": "23.9.2.594",
"AssemblySemFileVer": "23.9.2.594",
"FullSemVer": "23.9.2-----Trigger--.594",
"InformationalVersion": "23.9.2-----Trigger--.594+Branch.----Trigger--.Sha.80f65eba5e607d301fa38110760f143575d8cedf",
"BranchName": "测试昂坤Trigger测温",
"EscapedBranchName": "----Trigger--",
"Sha": "acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859",
"ShortSha": "acb370d",
"NuGetVersionV2": "23.9.2-----trigger--0593",
"NuGetVersion": "23.9.2-----trigger--0593",
"NuGetPreReleaseTagV2": "----trigger--0593",
"NuGetPreReleaseTag": "----trigger--0593",
"Sha": "80f65eba5e607d301fa38110760f143575d8cedf",
"ShortSha": "80f65eb",
"NuGetVersionV2": "23.9.2-----trigger--0594",
"NuGetVersion": "23.9.2-----trigger--0594",
"NuGetPreReleaseTagV2": "----trigger--0594",
"NuGetPreReleaseTag": "----trigger--0594",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 593,
"CommitsSinceVersionSourcePadded": "0593",
"UncommittedChanges": 0,
"CommitsSinceVersionSource": 594,
"CommitsSinceVersionSourcePadded": "0594",
"UncommittedChanges": 7,
"CommitDate": "2024-06-28"
}