berti_r/Motion_test
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved merge conflicts

Browse Source
This commit is contained in:
Kristina Jurisic
2021-06-28 10:21:47 +02:00
parent ef3266b3de a7e214719e
commit ef6507744c
3 changed files with 52 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
solution/tc_project_app/GlobalTextList.TcGTLO
View File

@@ -11,11 +11,14 @@
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"587"</v>
<v n="TextDefault">"%1d"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"951"</v>
<v n="TextDefault">"%2.2f"</v>
<l n="LanguageTexts" t="ArrayList" />
@@ -136,6 +139,7 @@
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"485"</v>
<v n="TextDefault">"bMovingExtend"</v>
<l n="LanguageTexts" t="ArrayList" />
@@ -168,6 +172,15 @@
<o>
<v n="TextID">"933"</v>
<v n="TextDefault">"bValveOn"</v>
<v n="TextID">"786"</v>
<v n="TextDefault">"Bwd Enable"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"571"</v>
<v n="TextDefault">"BWD Limit"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
@@ -315,6 +328,16 @@
<v n="TextDefault">"fVelocity"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"668"</v>
<v n="TextDefault">"Fwd Enable"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"737"</v>
<v n="TextDefault">"FWD Limit"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"688"</v>
<v n="TextDefault">"fWriteAxisParameter"</v>
@@ -355,6 +378,16 @@
<v n="TextDefault">"homeSensorPos"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"784"</v>
<v n="TextDefault">"Interlock Bwd"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"505"</v>
<v n="TextDefault">"Interlock Fwd"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"116"</v>
<v n="TextDefault">"jogBw"</v>
@@ -366,6 +399,7 @@
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"19"</v>
<v n="TextDefault">"Limit switches simulation"</v>
<l n="LanguageTexts" t="ArrayList" />
@@ -378,6 +412,15 @@
<o>
<v n="TextID">"459"</v>
<v n="TextDefault">"LimitFwd"</v>
<v n="TextID">"167"</v>
<v n="TextDefault">"Limit Bwd"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"11"</v>
<v n="TextDefault">"Limit Fwd"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>

2
solution/tc_project_app/tc_mca_std_lib

Submodule solution/tc_project_app/tc_mca_std_lib updated: 2b31a72911...46ec05ea41

8
solution/tc_project_app/tc_project_app.plcproj
View File

@@ -31,9 +31,11 @@
<Compile Include="POUs\Application_Specific\Applications\Application_Template.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\Application_Specific\Applications\Pneumatics_Template.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\Application_Specific\Axes\Axis_Template.TcPOU">
<SubType>Code</SubType>
</Compile>
@@ -145,10 +147,15 @@
<ItemGroup>
<Folder Include="DUTs" />
<Folder Include="GVLs" />
<Folder Include="POUs\Application_Specific" />
<Folder Include="POUs\Application_Specific\Applications" />
<Folder Include="POUs\Application_Specific\Axes" />
<Folder Include="tc_mca_std_lib\DUTs\Pneumatics" />
<Folder Include="POUs\Application_Specific\Applications" />
<Folder Include="POUs\Application_Specific\Axes" />
<Folder Include="tc_mca_std_lib\POUs\Motion\Homing" />
<Folder Include="tc_mca_std_lib\POUs\Pneumatics" />
<Folder Include="tc_mca_std_lib\VISUs" />
@@ -158,6 +165,7 @@
<Folder Include="tc_mca_std_lib\POUs" />
<Folder Include="tc_mca_std_lib\POUs\Motion" />
<Folder Include="POUs" />
<Folder Include="POUs\Application_Specific" />
</ItemGroup>
<ItemGroup>
<PlaceholderReference Include="System_VisuElemEventTable">