AIK-FAT/TC_iTomcat-ES2-Detector-Tower-FAT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged master into MBP-116

Browse Source 
Merge remote-tracking branch 'origin/master' into MBP-116-motion-function-blocks-outputs
This commit is contained in:
kleines
2020-06-04 18:07:14 +02:00
parent b49c9f6101 5d7df10f13
commit de92272d7a
6 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
solution.sln
View File

@@ -53,4 +53,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3F42AC3D-5210-4834-8C00-062CE02B7502}
EndGlobalSection
EndGlobal

20
solution/_Config/PLC/tc_project_app.xti Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0"?>
<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4023.119" ClassName="CNestedPlcProjDef">
<Project GUID="{FB261665-FD20-4BF2-97F8-2854C82B752D}" Name="tc_project_app" PrjFilePath="..\..\tc_project_app\tc_project_app.plcproj" TmcFilePath="..\..\tc_project_app\tc_project_app.tmc" ReloadTmc="true" AmsPort="852" FileArchiveSettings="#x000e" SymbolicMapping="true">
<Instance Id="#x08502040" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tc_project_app\tc_project_app.tmc">
<Name>tc_project_app Instance</Name>
<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
<Vars VarGrpType="2">
<Name>PlcTask Outputs</Name>
<Var>
<Name>MAIN.bOutput1</Name>
<Comment><![CDATA[Outputs: Power for Limit switches and Home Sensors (every 4th output)]]></Comment>
<Type>BOOL</Type>
</Var>
</Vars>
<TaskPouOids>
<TaskPouOid Prio="20" OTCID="#x08502041"/>
</TaskPouOids>
</Instance>
</Project>
</TcSmItem>

2
solution/solution.tsproj
View File

@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4023.119">
<Project ProjectGUID="{9CF97348-B9D3-4938-B1F2-5F0B0B6AA66A}" TargetNetId="5.54.104.144.1.1" Target64Bit="true" ShowHideConfigurations="#x106">
<Project ProjectGUID="{9CF97348-B9D3-4938-B1F2-5F0B0B6AA66A}" TargetNetId="169.254.216.243.1.1" Target64Bit="true" ShowHideConfigurations="#x106">
<System>
<Licenses>
<Target>

22
solution/tc_project_app/GlobalTextList.TcGTLO
View File

@@ -15,6 +15,11 @@
<v n="TextDefault">"%2.4f"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"821"</v>
<v n="TextDefault">"%s"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"940"</v>
<v n="TextDefault">"%x"</v>
@@ -175,6 +180,11 @@
<v n="TextDefault">"eWriteParameter"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"768"</v>
<v n="TextDefault">"eWriteParameter"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"955"</v>
<v n="TextDefault">"fAcceleration"</v>
@@ -320,6 +330,16 @@
<v n="TextDefault">"toggle"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"445"</v>
<v n="TextDefault">"Write"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"322"</v>
<v n="TextDefault">"WriteParameters"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
</l>
<l n="Languages" t="ArrayList" />
<v n="GuidInit">{062c6d5a-aca0-4f82-8481-8e26e8c8681e}</v>
@@ -336,4 +356,4 @@
</TypeList>
</XmlArchive>
</GlobalTextList>
</TcPlcObject>
</TcPlcObject>

2
solution/tc_project_app/tc_mca_std_lib

Submodule solution/tc_project_app/tc_mca_std_lib updated: 311a6be50d...28e6f65681

5
solution/tc_project_app/tc_project_app.plcproj
View File

@@ -6,7 +6,7 @@
<ProjectGuid>{fb261665-fd20-4bf2-97f8-2854c82b752d}</ProjectGuid>
<SubObjectsSortedByName>True</SubObjectsSortedByName>
<Name>tc_project_app</Name>
<ProgramVersion>3.1.4022.6</ProgramVersion>
<ProgramVersion>3.1.4023.0</ProgramVersion>
<Application>{047dee04-c246-47b2-8ccc-a15e36987c43}</Application>
<TypeSystem>{ae4eb5ee-6030-47a6-bf35-5a6afd9efeeb}</TypeSystem>
<Implicit_Task_Info>{5ef19bd0-aca2-493f-b2a1-89e363647697}</Implicit_Task_Info>
@@ -36,6 +36,9 @@
<Compile Include="tc_mca_std_lib\DUTs\E_HomingRoutines.TcTLEO">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\DUTs\E_AxisParameters.TcTLEO">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\DUTs\E_MotorTypeClass.TcDUT">
<SubType>Code</SubType>
</Compile>