From dad212b4af954356dcafe10590a772969ff339ce Mon Sep 17 00:00:00 2001
From: Simon-Cooper <39404307+Simon-Cooper@users.noreply.github.com>
Date: Thu, 20 Jun 2019 15:38:37 +0100
Subject: [PATCH] Third NC axis to configuration Add third axis for testing
 gear-in/out Update to latest tc-std-lib commit of MBP-95

---
 solution/tc_project_app/VISUs/MainVisu.TcVIS | 99 ++++++++++----------
 solution/tc_project_app/tc_mca_std_lib       |  2 +-
 2 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/solution/tc_project_app/VISUs/MainVisu.TcVIS b/solution/tc_project_app/VISUs/MainVisu.TcVIS
index 66d0170..ba44e3d 100644
--- a/solution/tc_project_app/VISUs/MainVisu.TcVIS
+++ b/solution/tc_project_app/VISUs/MainVisu.TcVIS
@@ -3151,7 +3151,7 @@
                 <v n="VisualElementIdentifier">"GenElemInst_106"</v>
                 <n n="VisualElementOfflinePaintCommands" />
                 <n n="VisualElementFrameInformation" />
-                <d n="VisualElementInputActions" t="Hashtable" ckt="String" cvt="IInputAction[]">
+                <d n="VisualElementInputActions" t="Hashtable" ckt="String" cvt="STSnippetInputAction[]">
                   <v>OnMouseClick</v>
                   <a cet="STSnippetInputAction">
                     <o>
@@ -3315,14 +3315,14 @@ GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
                       <v n="Id">3774423699L</v>
                       <v n="Value">""moveVelocity""</v>
                     </o>
-                    <o>
-                      <v n="Id">823443203L</v>
-                      <v n="Value">"453"</v>
-                    </o>
                     <o>
                       <v n="Id">2496894244L</v>
                       <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].status.bGeared"</v>
                     </o>
+                    <o>
+                      <v n="Id">823443203L</v>
+                      <v n="Value">"453"</v>
+                    </o>
                   </l>
                 </o>
                 <v n="VisualElementName">"Button"</v>
@@ -3495,14 +3495,14 @@ GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
                       <v n="Id">3774423699L</v>
                       <v n="Value">""moveRelative""</v>
                     </o>
-                    <o>
-                      <v n="Id">823443203L</v>
-                      <v n="Value">"50"</v>
-                    </o>
                     <o>
                       <v n="Id">2496894244L</v>
                       <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].status.bGeared"</v>
                     </o>
+                    <o>
+                      <v n="Id">823443203L</v>
+                      <v n="Value">"50"</v>
+                    </o>
                   </l>
                 </o>
                 <v n="VisualElementName">"Button"</v>
@@ -3675,14 +3675,14 @@ GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
                       <v n="Id">3774423699L</v>
                       <v n="Value">""moveModulo""</v>
                     </o>
-                    <o>
-                      <v n="Id">823443203L</v>
-                      <v n="Value">"935"</v>
-                    </o>
                     <o>
                       <v n="Id">2496894244L</v>
                       <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].status.bGeared"</v>
                     </o>
+                    <o>
+                      <v n="Id">823443203L</v>
+                      <v n="Value">"935"</v>
+                    </o>
                   </l>
                 </o>
                 <v n="VisualElementName">"Button"</v>
@@ -3870,14 +3870,14 @@ GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
                       <v n="Id">3774423699L</v>
                       <v n="Value">""stop""</v>
                     </o>
-                    <o>
-                      <v n="Id">823443203L</v>
-                      <v n="Value">"293"</v>
-                    </o>
                     <o>
                       <v n="Id">2496894244L</v>
                       <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].status.bGeared"</v>
                     </o>
+                    <o>
+                      <v n="Id">823443203L</v>
+                      <v n="Value">"293"</v>
+                    </o>
                   </l>
                 </o>
                 <v n="VisualElementName">"Button"</v>
@@ -4042,14 +4042,14 @@ GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
                       <v n="Id">3774423699L</v>
                       <v n="Value">""jogBw""</v>
                     </o>
-                    <o>
-                      <v n="Id">823443203L</v>
-                      <v n="Value">"331"</v>
-                    </o>
                     <o>
                       <v n="Id">2496894244L</v>
                       <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].status.bGeared"</v>
                     </o>
+                    <o>
+                      <v n="Id">823443203L</v>
+                      <v n="Value">"331"</v>
+                    </o>
                   </l>
                 </o>
                 <v n="VisualElementName">"Button"</v>
@@ -4058,11 +4058,11 @@ GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
                 <v n="VisualElementIdentifier">"GenElemInst_124"</v>
                 <n n="VisualElementOfflinePaintCommands" />
                 <n n="VisualElementFrameInformation" />
-                <d n="VisualElementInputActions" t="Hashtable" ckt="String">
-                  <v>OnMouseDown</v>
+                <d n="VisualElementInputActions" t="Hashtable" ckt="String" cvt="STSnippetInputAction[]">
+                  <v>OnMouseUp</v>
                   <a cet="STSnippetInputAction">
                     <o>
-                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].control.bJogBwd:= TRUE;"</v>
+                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].control.bJogBwd:= FALSE;"</v>
                     </o>
                   </a>
                   <v>OnMouseClick</v>
@@ -4072,10 +4072,10 @@ GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
 "</v>
                     </o>
                   </a>
-                  <v>OnMouseUp</v>
+                  <v>OnMouseDown</v>
                   <a cet="STSnippetInputAction">
                     <o>
-                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].control.bJogBwd:= FALSE;"</v>
+                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].control.bJogBwd:= TRUE;"</v>
                     </o>
                   </a>
                 </d>
@@ -4234,14 +4234,14 @@ GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
                       <v n="Id">3774423699L</v>
                       <v n="Value">""jogFw""</v>
                     </o>
-                    <o>
-                      <v n="Id">823443203L</v>
-                      <v n="Value">"468"</v>
-                    </o>
                     <o>
                       <v n="Id">2496894244L</v>
                       <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].status.bGeared"</v>
                     </o>
+                    <o>
+                      <v n="Id">823443203L</v>
+                      <v n="Value">"468"</v>
+                    </o>
                   </l>
                 </o>
                 <v n="VisualElementName">"Button"</v>
@@ -4251,10 +4251,10 @@ GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
                 <n n="VisualElementOfflinePaintCommands" />
                 <n n="VisualElementFrameInformation" />
                 <d n="VisualElementInputActions" t="Hashtable" ckt="String" cvt="STSnippetInputAction[]">
-                  <v>OnMouseDown</v>
+                  <v>OnMouseUp</v>
                   <a cet="STSnippetInputAction">
                     <o>
-                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].control.bJogFwd:= TRUE;"</v>
+                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].control.bJogFwd:= FALSE;"</v>
                     </o>
                   </a>
                   <v>OnMouseClick</v>
@@ -4264,10 +4264,10 @@ GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
 "</v>
                     </o>
                   </a>
-                  <v>OnMouseUp</v>
+                  <v>OnMouseDown</v>
                   <a cet="STSnippetInputAction">
                     <o>
-                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].control.bJogFwd:= FALSE;"</v>
+                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].control.bJogFwd:= TRUE;"</v>
                     </o>
                   </a>
                 </d>
@@ -5206,7 +5206,7 @@ GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
                     <v n="VisualElementIdentifier">"GenElemInst_120"</v>
                     <n n="VisualElementOfflinePaintCommands" />
                     <n n="VisualElementFrameInformation" />
-                    <d n="VisualElementInputActions" t="Hashtable" ckt="String" cvt="IInputAction[]">
+                    <d n="VisualElementInputActions" t="Hashtable" ckt="String" cvt="ToggleVarInputAction[]">
                       <v>OnMouseClick</v>
                       <a cet="ToggleVarInputAction">
                         <o>
@@ -11625,7 +11625,7 @@ GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
                     <v n="VisualElementIdentifier">"GenElemInst_164"</v>
                     <n n="VisualElementOfflinePaintCommands" />
                     <n n="VisualElementFrameInformation" />
-                    <d n="VisualElementInputActions" t="Hashtable" ckt="String" cvt="IInputAction[]">
+                    <d n="VisualElementInputActions" t="Hashtable" ckt="String" cvt="STSnippetInputAction[]">
                       <v>OnMouseClick</v>
                       <a cet="STSnippetInputAction">
                         <o>
@@ -11801,7 +11801,7 @@ GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
                     <v n="VisualElementIdentifier">"GenElemInst_166"</v>
                     <n n="VisualElementOfflinePaintCommands" />
                     <n n="VisualElementFrameInformation" />
-                    <d n="VisualElementInputActions" t="Hashtable" ckt="String" cvt="IInputAction[]">
+                    <d n="VisualElementInputActions" t="Hashtable" ckt="String" cvt="STSnippetInputAction[]">
                       <v>OnMouseClick</v>
                       <a cet="STSnippetInputAction">
                         <o>
@@ -12003,8 +12003,8 @@ GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
                 <v>30701c7d-977e-49b5-bb21-a0cecf1ead9e</v>
                 <v>ContainsPoint</v>
                 <v>64d72d51-c7db-4404-bae2-6d221f8a4519</v>
-                <v>HasInputAccess</v>
-                <v>4fd74a45-ea1a-4196-9703-ba786a24fb65</v>
+                <v>SetStaticState</v>
+                <v>f70ff323-614c-45b7-a312-0594be5bd320</v>
                 <v>HasInputAccessIntern</v>
                 <v>af8ccc95-fff9-4fe4-9416-a0dfb29be3e1</v>
                 <v>GetTooltip</v>
@@ -12023,8 +12023,6 @@ GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
                 <v>3e518730-123c-436c-b9fa-f2a4d7b1bedd</v>
                 <v>SetClientData</v>
                 <v>79534304-3f33-4434-8fe5-447c29f883f2</v>
-                <v>HasVisibilityAccessIntern</v>
-                <v>d1f92235-4ac0-4e45-9519-7b09eda8f71b</v>
                 <v>GetInstance</v>
                 <v>bab24c33-7699-42b2-aecb-eae4d06946ba</v>
                 <v>GetClientData</v>
@@ -12041,12 +12039,14 @@ GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
                 <v>92c953f5-cb0d-4f1b-9ad0-6f00f1be0217</v>
                 <v>Initialize</v>
                 <v>6b50d36a-e27e-4aa8-8e09-34acfbfdddbe</v>
-                <v>Destruct</v>
-                <v>278b4e73-b2b6-4e4e-a29e-df9f9243725f</v>
-                <v>SetStaticState</v>
-                <v>f70ff323-614c-45b7-a312-0594be5bd320</v>
+                <v>HasInputAccess</v>
+                <v>4fd74a45-ea1a-4196-9703-ba786a24fb65</v>
+                <v>HasVisibilityAccessIntern</v>
+                <v>d1f92235-4ac0-4e45-9519-7b09eda8f71b</v>
                 <v>GetSurroundingRect</v>
                 <v>7361ce2b-ad02-452c-a585-935c78b9613e</v>
+                <v>ElementInfo</v>
+                <v>864206f7-8f61-45ac-a91b-23cae6e958d8</v>
                 <v>GetResult</v>
                 <v>8317aaba-0bb5-48f9-8b2e-9d0b5c9c65a8</v>
                 <v>GetLocalUsergroup</v>
@@ -12069,8 +12069,8 @@ GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
                 <v>a5ca5f52-0a7a-4bed-a5a1-8439dd60c0c5</v>
                 <v>HandleInput</v>
                 <v>3b347ea6-12e3-4e3a-9b73-ab3ec97ee6b1</v>
-                <v>ElementInfo</v>
-                <v>864206f7-8f61-45ac-a91b-23cae6e958d8</v>
+                <v>Destruct</v>
+                <v>278b4e73-b2b6-4e4e-a29e-df9f9243725f</v>
               </d>
               <v n="FbName">"NotImportant"</v>
               <v n="FbGuid">{98c8ae72-e756-4d11-b6a5-5914882e2424}</v>
@@ -12083,10 +12083,10 @@ GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
               <d n="FbMethods" t="CaseInsensitiveHashtable" ckt="String" cvt="Guid">
                 <v>FB_Init</v>
                 <v>13be6eec-7fc2-4282-abbf-b24b2da58ba8</v>
-                <v>FB_Reinit</v>
-                <v>639e5dca-e06b-4c9e-8c1b-9a863c3c34f7</v>
                 <v>FB_Exit</v>
                 <v>95930a16-400d-44f0-9930-76888846236f</v>
+                <v>FB_Reinit</v>
+                <v>639e5dca-e06b-4c9e-8c1b-9a863c3c34f7</v>
               </d>
               <v n="FbName">"NotImportant"</v>
               <v n="FbGuid">{a9f37f15-844b-497f-805b-d8708d84591d}</v>
@@ -12199,7 +12199,6 @@ GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
         <Type n="Guid">System.Guid</Type>
         <Type n="Hashtable">System.Collections.Hashtable</Type>
         <Type n="HotkeyConfiguration">{6b108d46-58af-4e41-a3f4-174d8f160cc4}</Type>
-        <Type n="IInputAction[]">_3S.CoDeSys.VisualElem.IInputAction[], VisualElem, Version=3.5.10.0, Culture=neutral, PublicKeyToken=null</Type>
         <Type n="InputBoxInputAction">{e8e7e747-f76f-4dee-ab1c-b9637e41ac26}</Type>
         <Type n="InputBoxInputAction[]">_3S.CoDeSys.VisualElem.InputBoxInputAction[], VisualElem.plugin, Version=3.5.10.32, Culture=neutral, PublicKeyToken=null</Type>
         <Type n="Int16">System.Int16</Type>
diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib
index 63439ec..221d0d0 160000
--- a/solution/tc_project_app/tc_mca_std_lib
+++ b/solution/tc_project_app/tc_mca_std_lib
@@ -1 +1 @@
-Subproject commit 63439ecde299754c957958a98f3756bc6b9a6d09
+Subproject commit 221d0d09e929f442222b88322d1261dc9cc1b040