Merge branch 'master' into MBP-155-access-to-NC-parameters

2020-07-01 12:35:17 +02:00
parent c335b85e40 96ff81ced1
commit 02addfc848
2 changed files with 7 additions and 2 deletions
--- a/solution/tc_project_app/GlobalTextList.TcGTLO
+++ b/solution/tc_project_app/GlobalTextList.TcGTLO
@@ -250,6 +250,11 @@
              <v n="TextDefault">"gearOut"</v>
              <l n="LanguageTexts" t="ArrayList" />
            </o>
+            <o>
+              <v n="TextID">"523"</v>
+              <v n="TextDefault">"halt"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
            <o>
              <v n="TextID">"169"</v>
              <v n="TextDefault">"homeDirect"</v>
@@ -356,4 +361,4 @@
      </TypeList>
    </XmlArchive>
  </GlobalTextList>
-</TcPlcObject>
+</TcPlcObject>
--- a/solution/tc_project_app/tc_mca_std_lib
+++ b/solution/tc_project_app/tc_mca_std_lib