diff --git a/solution.sln b/solution.sln
index 976e55d..1bff69d 100644
--- a/solution.sln
+++ b/solution.sln
@@ -33,22 +33,6 @@ Global
{9CF97348-B9D3-4938-B1F2-5F0B0B6AA66A}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
{9CF97348-B9D3-4938-B1F2-5F0B0B6AA66A}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
{9CF97348-B9D3-4938-B1F2-5F0B0B6AA66A}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
- {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
- {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
- {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMT2)
- {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Debug|TwinCAT OS (ARMT2).Build.0 = Debug|TwinCAT OS (ARMT2)
- {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
- {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
- {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
- {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
- {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
- {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
- {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMT2)
- {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Release|TwinCAT OS (ARMT2).Build.0 = Release|TwinCAT OS (ARMT2)
- {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
- {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
- {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
- {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
{FB261665-FD20-4BF2-97F8-2854C82B752D}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
{FB261665-FD20-4BF2-97F8-2854C82B752D}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
{FB261665-FD20-4BF2-97F8-2854C82B752D}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMT2)
@@ -65,6 +49,22 @@ Global
{FB261665-FD20-4BF2-97F8-2854C82B752D}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
{FB261665-FD20-4BF2-97F8-2854C82B752D}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
{FB261665-FD20-4BF2-97F8-2854C82B752D}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
+ {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
+ {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
+ {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMT2)
+ {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Debug|TwinCAT OS (ARMT2).Build.0 = Debug|TwinCAT OS (ARMT2)
+ {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
+ {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
+ {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
+ {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
+ {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
+ {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
+ {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMT2)
+ {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Release|TwinCAT OS (ARMT2).Build.0 = Release|TwinCAT OS (ARMT2)
+ {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
+ {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
+ {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
+ {F935F1DE-0753-4702-B418-1DC0ED040A4D}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/solution/solution.tsproj b/solution/solution.tsproj
index 9f5acc4..5567116 100644
--- a/solution/solution.tsproj
+++ b/solution/solution.tsproj
@@ -885,14 +885,14 @@ External Setpoint Generation:
PlcTaskCom
-
+
PlcTask
-
+
tc_epicscommodule Instance
{08500001-0000-0000-F000-000000000064}
@@ -901,7 +901,7 @@ External Setpoint Generation:
-
+
tc_project_app Instance
{08500001-0000-0000-F000-000000000064}
diff --git a/solution/tc_project_app/POUs/MAIN.TcPOU b/solution/tc_project_app/POUs/MAIN.TcPOU
index 8b7a3e3..3d0d5b3 100644
--- a/solution/tc_project_app/POUs/MAIN.TcPOU
+++ b/solution/tc_project_app/POUs/MAIN.TcPOU
@@ -182,7 +182,7 @@ END_VAR
false
false
true
- 9L
+ 67L
@@ -347,6 +347,38 @@ END_VAR
false
20L
+
+ ""
+
+ ""
+ ""
+ ""
+
+ 0
+ false
+ false
+
+ true
+ false
+ false
+ 69L
+
+
+ ""
+
+ ""
+ ""
+ ""
+
+ 0
+ false
+ false
+
+ true
+ false
+ false
+ 70L
+
@@ -354,123 +386,7 @@ END_VAR
true
false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
- 0
- true
- false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
- 0
- false
- false
-
-
+
@@ -759,8 +675,8 @@ END_VAR
- ""
-
+ "bHomeSensor"
+ "BOOL"
""
""
""
@@ -835,8 +751,8 @@ END_VAR
- "bHomeSensor"
- "BOOL"
+ "M1Link.Axis"
+ "AXIS_REF"
""
""
"%I*"
@@ -852,63 +768,6 @@ END_VAR
59L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 62L
-
- 61L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 64L
-
- 63L
-
-
-
- "M1Link.axis"
- "AXIS_REF"
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 66L
-
- 65L
-
@@ -926,14 +785,11 @@ END_VAR
bJogBwd
bLimitFwd
bLimitBwd
- bEnableSoftLimitFwd
- bEnableSoftLimitBwd
- fSoftLimitFwd
- fSoftLimitBwd
fOverride
bHomeSensor
+ fHomePosition
+ nHomeRevOffset
MasterAxis
- nMotionAxisID
Axis
@@ -951,14 +807,11 @@ END_VAR
BOOL
BOOL
BOOL
- BOOL
- BOOL
- LREAL
- LREAL
LREAL
BOOL
+ LREAL
+ UINT
AXIS_REF
- UDINT
AXIS_REF[REF]
@@ -971,10 +824,12 @@ END_VAR
bError
bHomed
nErrorId
+ nMotionAxisID
Status
fActVelocity
fActPosition
fActDiff
+ sErrorMessage
BOOL
@@ -984,10 +839,12 @@ END_VAR
BOOL
BOOL
UDINT
+ UDINT
ST_AxisStatus
LREAL
LREAL
LREAL
+ STRING
FunctionBlock
@@ -996,7 +853,7 @@ END_VAR
false
false
- 10L
+ 68L
diff --git a/solution/tc_project_app/PlcTask.TcTTO b/solution/tc_project_app/PlcTask.TcTTO
index 4a5267b..dfc6cfd 100644
--- a/solution/tc_project_app/PlcTask.TcTTO
+++ b/solution/tc_project_app/PlcTask.TcTTO
@@ -1,8 +1,8 @@
-
+
- 10000
+ 1000
20
MAIN
@@ -12,6 +12,5 @@
{2478772d-357b-433f-886f-15340bef9bdf}
{c16ee410-277f-45f0-a92e-1ec5f87024b9}
{291eb57a-f9a9-4722-b7d3-fd700e5db288}
-
\ No newline at end of file
diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib
index 40d37cd..ecc7217 160000
--- a/solution/tc_project_app/tc_mca_std_lib
+++ b/solution/tc_project_app/tc_mca_std_lib
@@ -1 +1 @@
-Subproject commit 40d37cd9eb7e23600d3cc1b0db2361f427cb976c
+Subproject commit ecc7217d00648a9592525f40d75f551b543723eb
diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj
index 04dbc43..fcabc7d 100644
--- a/solution/tc_project_app/tc_project_app.plcproj
+++ b/solution/tc_project_app/tc_project_app.plcproj
@@ -34,6 +34,9 @@
Code
+
+ Code
+
Code
@@ -280,6 +283,33 @@
Code
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
Code