Skip to content

Commit d0b04dc

Browse files
ghalymghalym
committed
Tagging version v3.5.0
1 parent 964d341 commit d0b04dc

File tree

2 files changed

+74
-57
lines changed

2 files changed

+74
-57
lines changed

‎lcls-twincat-pmps/PMPS/PMPS.plcproj

+60-57
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
23
<PropertyGroup>
34
<FileVersion>1.0.0.0</FileVersion>
45
<SchemaVersion>2.0</SchemaVersion>
@@ -16,7 +17,7 @@
1617
<Implicit_Jitter_Distribution>{9571b800-3cbb-4490-9af6-a1013ff71bd1}</Implicit_Jitter_Distribution>
1718
<LibraryReferences>{1c1d8a93-1736-437e-b538-e21ada2f6c38}</LibraryReferences>
1819
<Company>SLAC - LCLS</Company>
19-
<Released>false</Released>
20+
<Released>true</Released>
2021
<Author>Alex Wallace and contributors</Author>
2122
<Description>Collection of PMPS functionality for LCLS PLCs</Description>
2223
<CombineIds>false</CombineIds>
@@ -28,18 +29,20 @@
2829
<Event>
2930
<CommandType>Copy</CommandType>
3031
<DeploymentType>ActivateConfiguration</DeploymentType>
31-
<Command1 />
32-
<Command2 />
32+
<Command1/>
33+
<Command2/>
3334
</Event>
3435
</Events>
3536
</DeploymentEvents>
36-
<ProjectVersion>0.0.0</ProjectVersion>
37+
<ProjectVersion>3.5.0</ProjectVersion>
3738
</PropertyGroup>
3839
<ItemGroup>
3940
<Compile Include="AncillaryComponents\FB_JsonDocToSafeBP.TcPOU">
4041
<SubType>Code</SubType>
4142
</Compile>
42-
<Compile Include="AncillaryComponents\FB_JsonFileToJsonDoc.TcPOU">
43+
<Compile Include="Version\Global_Version.TcGVL">
44+
<SubType>Code</SubType>
45+
</Compile><Compile Include="AncillaryComponents\FB_JsonFileToJsonDoc.TcPOU">
4346
<SubType>Code</SubType>
4447
</Compile>
4548
<Compile Include="AncillaryComponents\FB_TempSensor_FFO.TcPOU">
@@ -433,26 +436,26 @@
433436
</Compile>
434437
</ItemGroup>
435438
<ItemGroup>
436-
<Folder Include="DUTs" />
437-
<Folder Include="DUTs\InternalDUT" />
438-
<Folder Include="DUTs\UserDUT" />
439-
<Folder Include="GVLs" />
440-
<Folder Include="HelperFunctions" />
441-
<Folder Include="HelperFunctions\TypeTranslators" />
442-
<Folder Include="MajorComponents" />
443-
<Folder Include="MajorComponents\BPTM" />
444-
<Folder Include="MajorComponents\SimulationFB" />
445-
<Folder Include="MajorComponents\Stoppers" />
446-
<Folder Include="MajorComponents\PhotonEnergyInterface" />
447-
<Folder Include="MajorComponents\Arbiter" />
448-
<Folder Include="MajorComponents\InterPlcComm" />
449-
<Folder Include="MajorComponents\FastFaults" />
450-
<Folder Include="MajorComponents\PMPS_MPS_Interface" />
451-
<Folder Include="ImplicitChecks" />
452-
<Folder Include="AncillaryComponents" />
453-
<Folder Include="TestComponents" />
454-
<Folder Include="TestComponents\DUT" />
455-
<Folder Include="VISUs" />
439+
<Folder Include="DUTs"/>
440+
<Folder Include="Version"/><Folder Include="DUTs\InternalDUT"/>
441+
<Folder Include="DUTs\UserDUT"/>
442+
<Folder Include="GVLs"/>
443+
<Folder Include="HelperFunctions"/>
444+
<Folder Include="HelperFunctions\TypeTranslators"/>
445+
<Folder Include="MajorComponents"/>
446+
<Folder Include="MajorComponents\BPTM"/>
447+
<Folder Include="MajorComponents\SimulationFB"/>
448+
<Folder Include="MajorComponents\Stoppers"/>
449+
<Folder Include="MajorComponents\PhotonEnergyInterface"/>
450+
<Folder Include="MajorComponents\Arbiter"/>
451+
<Folder Include="MajorComponents\InterPlcComm"/>
452+
<Folder Include="MajorComponents\FastFaults"/>
453+
<Folder Include="MajorComponents\PMPS_MPS_Interface"/>
454+
<Folder Include="ImplicitChecks"/>
455+
<Folder Include="AncillaryComponents"/>
456+
<Folder Include="TestComponents"/>
457+
<Folder Include="TestComponents\DUT"/>
458+
<Folder Include="VISUs"/>
456459
</ItemGroup>
457460
<ItemGroup>
458461
<PlaceholderReference Include="LCLS General">
@@ -485,26 +488,26 @@
485488
</PlaceholderReference>
486489
</ItemGroup>
487490
<ItemGroup>
488-
<SubObject Include="FB_BPControlDevice.FB_init" />
491+
<SubObject Include="FB_BPControlDevice.FB_init"/>
489492
<SubObject Include="FB_BPTM_Test.InterruptedTransition">
490493
<ExcludeFromBuild>true</ExcludeFromBuild>
491494
</SubObject>
492-
<SubObject Include="FB_evRangeCalculator_Test.BasicFunction" />
493-
<SubObject Include="FB_eVWithinSpec_Test.evWithinRangeChecks" />
494-
<SubObject Include="FB_FastFault_Test.FFCombinedFunctionality" />
495-
<SubObject Include="FB_FastFault_Test.FFRegistration" />
496-
<SubObject Include="FB_KStopper.FB_init" />
497-
<SubObject Include="FB_LinearDeviceStateTable.A_Add" />
498-
<SubObject Include="FB_LinearDeviceStateTable.A_Count" />
499-
<SubObject Include="FB_LinearDeviceStateTable.A_GetFirst" />
500-
<SubObject Include="FB_LinearDeviceStateTable.A_GetNext" />
501-
<SubObject Include="FB_LinearDeviceStateTable.A_Lookup" />
502-
<SubObject Include="FB_LinearDeviceStateTable.A_Remove" />
503-
<SubObject Include="FB_LinearDeviceStateTable.A_Reset" />
504-
<SubObject Include="FB_LStopper.FB_init" />
505-
<SubObject Include="FB_PhotonEnergyWatcher_Test.PEWatcherBasicFunction" />
506-
<SubObject Include="FB_SafeBPCompare_Test.BeamOffIsSafe" />
507-
<SubObject Include="FB_SafeBPCompare_Test.BPComparisonCheck" />
495+
<SubObject Include="FB_evRangeCalculator_Test.BasicFunction"/>
496+
<SubObject Include="FB_eVWithinSpec_Test.evWithinRangeChecks"/>
497+
<SubObject Include="FB_FastFault_Test.FFCombinedFunctionality"/>
498+
<SubObject Include="FB_FastFault_Test.FFRegistration"/>
499+
<SubObject Include="FB_KStopper.FB_init"/>
500+
<SubObject Include="FB_LinearDeviceStateTable.A_Add"/>
501+
<SubObject Include="FB_LinearDeviceStateTable.A_Count"/>
502+
<SubObject Include="FB_LinearDeviceStateTable.A_GetFirst"/>
503+
<SubObject Include="FB_LinearDeviceStateTable.A_GetNext"/>
504+
<SubObject Include="FB_LinearDeviceStateTable.A_Lookup"/>
505+
<SubObject Include="FB_LinearDeviceStateTable.A_Remove"/>
506+
<SubObject Include="FB_LinearDeviceStateTable.A_Reset"/>
507+
<SubObject Include="FB_LStopper.FB_init"/>
508+
<SubObject Include="FB_PhotonEnergyWatcher_Test.PEWatcherBasicFunction"/>
509+
<SubObject Include="FB_SafeBPCompare_Test.BeamOffIsSafe"/>
510+
<SubObject Include="FB_SafeBPCompare_Test.BPComparisonCheck"/>
508511
</ItemGroup>
509512
<ItemGroup>
510513
<LibraryReference Include="TcUnit,1.2.0.0,www.tcunit.org">
@@ -571,9 +574,9 @@
571574
</PlaceholderResolution>
572575
</ItemGroup>
573576
<ItemGroup>
574-
<PinnedGlobalDataType Include="ST_BeamParams_IO" />
575-
<PinnedGlobalDataType Include="ST_PMPS_Aperture_IO" />
576-
<PinnedGlobalDataType Include="ST_PMPS_Attenuator_IO" />
577+
<PinnedGlobalDataType Include="ST_BeamParams_IO"/>
578+
<PinnedGlobalDataType Include="ST_PMPS_Aperture_IO"/>
579+
<PinnedGlobalDataType Include="ST_PMPS_Attenuator_IO"/>
577580
</ItemGroup>
578581
<ItemGroup>
579582
<None Include="PMPS.tmc">
@@ -590,8 +593,8 @@
590593
<v>{8F99A816-E488-41E4-9FA3-846536012284}</v>
591594
<o>
592595
<v n="Name">"{8F99A816-E488-41E4-9FA3-846536012284}"</v>
593-
<d n="SubKeys" t="Hashtable" />
594-
<d n="Values" t="Hashtable" />
596+
<d n="SubKeys" t="Hashtable"/>
597+
<d n="Values" t="Hashtable"/>
595598
</o>
596599
<v>{29BD8D0C-3586-4548-BB48-497B9A01693F}</v>
597600
<o>
@@ -600,16 +603,16 @@
600603
<v>Rules</v>
601604
<o>
602605
<v n="Name">"Rules"</v>
603-
<d n="SubKeys" t="Hashtable" />
604-
<d n="Values" t="Hashtable" />
606+
<d n="SubKeys" t="Hashtable"/>
607+
<d n="Values" t="Hashtable"/>
605608
</o>
606609
</d>
607-
<d n="Values" t="Hashtable" />
610+
<d n="Values" t="Hashtable"/>
608611
</o>
609612
<v>{40450F57-0AA3-4216-96F3-5444ECB29763}</v>
610613
<o>
611614
<v n="Name">"{40450F57-0AA3-4216-96F3-5444ECB29763}"</v>
612-
<d n="SubKeys" t="Hashtable" />
615+
<d n="SubKeys" t="Hashtable"/>
613616
<d n="Values" t="Hashtable" ckt="String">
614617
<v>ActiveVisuExtensionsLength</v>
615618
<v>0</v>
@@ -620,7 +623,7 @@
620623
<v>{192FAD59-8248-4824-A8DE-9177C94C195A}</v>
621624
<o>
622625
<v n="Name">"{192FAD59-8248-4824-A8DE-9177C94C195A}"</v>
623-
<d n="SubKeys" t="Hashtable" />
626+
<d n="SubKeys" t="Hashtable"/>
624627
<d n="Values" t="Hashtable" ckt="String" cvt="String">
625628
<v>CurrentUmlCompilerVersion</v>
626629
<v>4.0.5.0</v>
@@ -629,20 +632,20 @@
629632
<v>{F66C7017-BDD8-4114-926C-81D6D687E35F}</v>
630633
<o>
631634
<v n="Name">"{F66C7017-BDD8-4114-926C-81D6D687E35F}"</v>
632-
<d n="SubKeys" t="Hashtable" />
633-
<d n="Values" t="Hashtable" />
635+
<d n="SubKeys" t="Hashtable"/>
636+
<d n="Values" t="Hashtable"/>
634637
</o>
635638
<v>{246001F4-279D-43AC-B241-948EB31120E1}</v>
636639
<o>
637640
<v n="Name">"{246001F4-279D-43AC-B241-948EB31120E1}"</v>
638-
<d n="SubKeys" t="Hashtable" />
641+
<d n="SubKeys" t="Hashtable"/>
639642
<d n="Values" t="Hashtable" ckt="String" cvt="String">
640643
<v>GlobalVisuImageFilePath</v>
641644
<v>%APPLICATIONPATH%\</v>
642645
</d>
643646
</o>
644647
</d>
645-
<d n="Values" t="Hashtable" />
648+
<d n="Values" t="Hashtable"/>
646649
</o>
647650
</Data>
648651
<TypeList>

‎lcls-twincat-pmps/PMPS/Version/Global_Version.TcGVL

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.18">
3+
<GVL Name="Global_Version" Id="{e2437db5-fa24-4fec-a6f9-8b8888fd7afb}">
4+
<Declaration><![CDATA[{attribute 'TcGenerated'}
5+
{attribute 'no-analysis'}
6+
{attribute 'linkalways'}
7+
// This function has been automatically generated from the project information.
8+
VAR_GLOBAL CONSTANT
9+
{attribute 'const_non_replaced'}
10+
stLibVersion_PMPS : ST_LibVersion := (iMajor := 3, iMinor := 5, iBuild := 0, iRevision := 0, nFlags := 1, sVersion := '3.5.0');
11+
END_VAR
12+
]]></Declaration>
13+
</GVL>
14+
</TcPlcObject>

0 commit comments

Comments
 (0)