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

Solved merge conflicts

Browse Source
This commit is contained in:
Kristina Jurisic
2021-06-28 10:30:53 +02:00
parent ef6507744c
commit 13a09ebb2b
1 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
solution/tc_project_app/GlobalTextList.TcGTLO
View File

@@ -11,14 +11,11 @@
<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" />
@@ -139,7 +136,6 @@
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"485"</v>
<v n="TextDefault">"bMovingExtend"</v>
<l n="LanguageTexts" t="ArrayList" />
@@ -172,15 +168,11 @@
<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>
<v n="TextID">"786"</v>
<v n="TextDefault">"Bwd Enable"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
@@ -333,11 +325,6 @@
<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>
@@ -399,7 +386,6 @@
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"19"</v>
<v n="TextDefault">"Limit switches simulation"</v>
<l n="LanguageTexts" t="ArrayList" />
@@ -412,15 +398,6 @@
<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>