diff --git a/UpgradeLog.htm b/UpgradeLog.htm
new file mode 100644
index 0000000..103b560
Binary files /dev/null and b/UpgradeLog.htm differ
diff --git a/solution/TrialLicense.tclrs b/solution/TrialLicense.tclrs
new file mode 100644
index 0000000..3b78bf8
--- /dev/null
+++ b/solution/TrialLicense.tclrs
@@ -0,0 +1,2 @@
+
+{647C6958-3A0C-73AB-3631-FCA93A32D91D}2019-03-28T10:01:002019-04-05T00:00:00c5d3cb1031fe69b92637f818532268e150e73209fbcde806d6a45fa5c587430d79f2c1228179d00673ab0c897cec2974facbbdea6732800f514190342df993e6cf6c8900d81c6168e82abc6419353caaa16eae89c3652b99dc5724bd894c9688d636d924d65f9bd2be9c76a54d9389d9c2e80b95ac96243e653e4af19badfbdfa010ba61245f038ad5eef223906c4cade2def8629cdbed3a49da1c64a666625c6c23b0d87507ee78907eaf7e2d8bf7b2ce4fd5d511ecc80ae9058fbc8fabd02bf239827c8abad467f34390374768fe2427b583c8af5c86ee51c2f4bbadd341b0daccb1e0c5625b4894babedd35d3cb816a514aab66bc4fcaa5762164e6e078da{4C256767-E6E6-4AF5-BD68-9F7ABAD0C200}TC3 ADSTC1000{3FF18E97-7754-401B-93FB-70544DE28A13}TC3 IOTC1100{66689887-CCBD-452C-AC9A-039D997C6E66}TC3 PLCTC1200{A19036CF-A53B-4E3A-99FF-023EF5C4798B}TC3 NC PTP Axis10{520DE751-9DB6-47CB-8240-BD5C466E7E64}TC3 NC PTPTF5000{3EBB9639-5FF3-42B6-8847-35C70DC013C8}TC3 TCP/IPTF6310
diff --git a/solution/solution.tsproj b/solution/solution.tsproj
index 5a083bc..313b9a2 100644
--- a/solution/solution.tsproj
+++ b/solution/solution.tsproj
@@ -881,6 +881,11 @@ External Setpoint Generation:
+
+
+ {3EBB9639-5FF3-42B6-8847-35C70DC013C8}
+
+
PlcTaskCom
@@ -890,6 +895,25 @@ External Setpoint Generation:
+
+
+
+ NC-Task 1 SAF
+
+ Inputs
+
+
+ Outputs
+
+
+ Image
+
+
+
+ NC-Task 1 SVB
+
+
+
@@ -907,40 +931,35 @@ External Setpoint Generation:
PlcTask Inputs
- MAIN.bLimitFwd1
+ GVL.axes[1].bLimitFwd
-
+
BOOL
- MAIN.bLimitBwd1
+ GVL.axes[1].bLimitBwd
+
+
+
BOOL
- MAIN.bHomeSensor1
+ GVL.axes[1].bHomeSensor
+
+
+
BOOL
- MAIN.bLimitFwd2
+ GVL.axes[1].bEncLAtch
+
+
+
BOOL
- MAIN.bLimitBwd2
- BOOL
-
-
- MAIN.bHomeSensor2
- BOOL
-
-
- MAIN.M1Link.Axis.NcToPlc
+ GVL.axes[1].Axis.NcToPlc
NCTOPLC_AXIS_REF
AxisState
@@ -988,254 +1007,20 @@ External Setpoint Generation:
-
- MAIN.M1Link.InfoData_State
- UINT
-
-
- MAIN.M2Link.Axis.NcToPlc
- NCTOPLC_AXIS_REF
-
- AxisState
-
-
-
-
-
- HomingState
-
-
-
-
-
- CoupleState
-
-
-
-
-
-
- MAIN.M2Link.InfoData_State
- UINT
-
-
- MAIN.M1.MasterAxis.NcToPlc
- NCTOPLC_AXIS_REF
-
- AxisState
-
-
-
-
-
- HomingState
-
-
-
-
-
- CoupleState
-
-
-
-
-
-
- MAIN.M2.MasterAxis.NcToPlc
- NCTOPLC_AXIS_REF
-
- AxisState
-
-
-
-
-
- HomingState
-
-
-
-
-
- CoupleState
-
-
-
-
-
-
- MAIN.fbEL1808.Channel_1_Input
- BOOL
-
-
- MAIN.fbEL1808.Channel_2_Input
- BOOL
-
-
- MAIN.fbEL1808.Channel_3_Input
- BOOL
-
-
- MAIN.fbEL1808.Channel_4_Input
- BOOL
-
-
- MAIN.fbEL1808.Channel_5_Input
- BOOL
-
-
- MAIN.fbEL1808.Channel_6_Input
- BOOL
-
-
- MAIN.fbEL1808.Channel_7_Input
- BOOL
-
-
- MAIN.fbEL1808.Channel_8_Input
- BOOL
-
-
- MAIN.fbEL1808.WcState_WcState
- BOOL
-
-
- MAIN.fbEL1808.InfoData_State
- UINT
-
PlcTask Outputs
MAIN.bOutput1
-
+
BOOL
- MAIN.M1Link.Axis.PlcToNc
+ GVL.axes[1].Axis.PlcToNc
PLCTONC_AXIS_REF
-
- MAIN.M2Link.Axis.PlcToNc
- PLCTONC_AXIS_REF
-
-
- MAIN.M1.MasterAxis.PlcToNc
- PLCTONC_AXIS_REF
-
-
- MAIN.M2.MasterAxis.PlcToNc
- PLCTONC_AXIS_REF
-
-
- MAIN.bOutput5
-
-
-
- BOOL
-
diff --git a/solution/tc_project_app/POUs/MAIN.TcPOU b/solution/tc_project_app/POUs/MAIN.TcPOU
index ccf7cfd..639c474 100644
--- a/solution/tc_project_app/POUs/MAIN.TcPOU
+++ b/solution/tc_project_app/POUs/MAIN.TcPOU
@@ -4,60 +4,15 @@
@@ -85,1704 +38,15 @@ END_VAR
AXES();
ERROR();]]>
-
+
-
-
-
-
- ""
- "Fbd"
-
-
- false
- false
- false
-
- ""
- ""
- ""
- false
-
-
- "FB_NcAxis"
-
- "M1Link"
- "FB_NcAxis"
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- true
- 3L
-
-
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 5L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 6L
-
-
-
-
- 0
- true
- false
-
-
-
-
-
- "true"
- "BOOL"
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 8L
-
- 7L
-
-
-
-
- En
-
-
- BOOL
-
-
-
-
- EnO
- bError
- Status
-
-
- BOOL
- BOOL
- ST_AxisStatus
-
-
- FunctionBlock
- false
- false
-
- false
- false
- 4L
-
-
-
- 2L
-
-
- false
- false
- false
-
- ""
- ""
- ""
- false
-
-
- "FB_DriveVirtual"
-
- "m1"
- "FB_DriveVirtual"
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- true
- 67L
-
-
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 11L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 12L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 13L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 14L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 15L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 16L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 17L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 18L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 19L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 20L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 69L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 70L
-
-
-
-
- 0
- true
- false
-
-
-
-
-
- "true"
- "BOOL"
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 22L
-
- 21L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 24L
-
- 23L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 26L
-
- 25L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 28L
-
- 27L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 30L
-
- 29L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 32L
-
- 31L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 34L
-
- 33L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 36L
-
- 35L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 38L
-
- 37L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 40L
-
- 39L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 42L
-
- 41L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 44L
-
- 43L
-
-
-
- "bLimitFwd1"
- "BOOL"
- ""
- ""
- "%I*"
-
- 0
- false
- false
-
- false
- false
- false
- 46L
-
- 45L
-
-
-
- "bLimitBwd1"
- "BOOL"
- ""
- ""
- "%I*"
-
- 0
- false
- false
-
- false
- false
- false
- 48L
-
- 47L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 50L
-
- 49L
-
-
-
- "bHomeSensor1"
- "BOOL"
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 52L
-
- 51L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 54L
-
- 53L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 56L
-
- 55L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 58L
-
- 57L
-
-
-
- "M1Link.Axis"
- "AXIS_REF"
- ""
- ""
- "%I*"
-
- 0
- false
- false
-
- false
- false
- false
- 60L
-
- 59L
-
-
-
-
- En
- bEnable
- bReset
- bExecute
- nCommand
- nCmdData
- fVelocity
- fPosition
- fAcceleration
- fDeceleration
- bJogFwd
- bJogBwd
- bLimitFwd
- bLimitBwd
- fOverride
- bHomeSensor
- fHomePosition
- nHomeRevOffset
- MasterAxis
- Axis
-
-
- BOOL
- BOOL
- BOOL
- BOOL
- UINT
- UINT
- LREAL
- LREAL
- LREAL
- LREAL
- BOOL
- BOOL
- BOOL
- BOOL
- LREAL
- BOOL
- LREAL
- UINT
- AXIS_REF
- AXIS_REF[REF]
-
-
-
-
- EnO
- bEnabled
- bBusy
- bDone
- bError
- bHomed
- nErrorId
- nMotionAxisID
- Status
- fActVelocity
- fActPosition
- fActDiff
- sErrorMessage
-
-
- BOOL
- BOOL
- BOOL
- BOOL
- BOOL
- BOOL
- UDINT
- UDINT
- ST_AxisStatus
- LREAL
- LREAL
- LREAL
- STRING
-
-
- FunctionBlock
- false
- false
-
- false
- false
- 68L
-
-
-
- 1L
-
-
- false
- false
- false
-
- ""
- ""
- ""
- false
-
-
- "FB_NcAxis"
-
- "M2Link"
- "FB_NcAxis"
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- true
- 88L
-
-
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 90L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 91L
-
-
-
-
- 0
- true
- false
-
-
-
-
-
- "true"
- "BOOL"
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 93L
-
- 92L
-
-
-
-
- En
-
-
- BOOL
-
-
-
-
- EnO
- bError
- Status
-
-
- BOOL
- BOOL
- ST_AxisStatus
-
-
- FunctionBlock
- false
- false
-
- false
- false
- 89L
-
-
-
- 87L
-
-
- false
- false
- false
-
- ""
- ""
- ""
- false
-
-
- "FB_DriveVirtual"
-
- "m2"
- "FB_DriveVirtual"
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- true
- 95L
-
-
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 97L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 98L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 99L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 100L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 101L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 102L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 103L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 104L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 105L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 106L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 107L
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- true
- false
- false
- 108L
-
-
-
-
- 0
- true
- false
-
-
-
-
-
- "true"
- "BOOL"
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 110L
-
- 109L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 112L
-
- 111L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 114L
-
- 113L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 116L
-
- 115L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 118L
-
- 117L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 120L
-
- 119L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 122L
-
- 121L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 124L
-
- 123L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 126L
-
- 125L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 128L
-
- 127L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 130L
-
- 129L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 132L
-
- 131L
-
-
-
- "bLimitFwd2"
- "BOOL"
- ""
- ""
- "%I*"
-
- 0
- false
- false
-
- false
- false
- false
- 134L
-
- 133L
-
-
-
- "bLimitBwd2"
- "BOOL"
- ""
- ""
- "%I*"
-
- 0
- false
- false
-
- false
- false
- false
- 136L
-
- 135L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 138L
-
- 137L
-
-
-
- "bHomeSensor2"
- "BOOL"
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 140L
-
- 139L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 142L
-
- 141L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 144L
-
- 143L
-
-
-
- ""
-
- ""
- ""
- ""
-
- 0
- false
- false
-
- false
- false
- false
- 146L
-
- 145L
-
-
-
- "M2Link.Axis"
- "AXIS_REF"
- ""
- ""
- "%I*"
-
- 0
- false
- false
-
- false
- false
- false
- 148L
-
- 147L
-
-
-
-
- En
- bEnable
- bReset
- bExecute
- nCommand
- nCmdData
- fVelocity
- fPosition
- fAcceleration
- fDeceleration
- bJogFwd
- bJogBwd
- bLimitFwd
- bLimitBwd
- fOverride
- bHomeSensor
- fHomePosition
- nHomeRevOffset
- MasterAxis
- Axis
-
-
- BOOL
- BOOL
- BOOL
- BOOL
- UINT
- UINT
- LREAL
- LREAL
- LREAL
- LREAL
- BOOL
- BOOL
- BOOL
- BOOL
- LREAL
- BOOL
- LREAL
- UINT
- AXIS_REF
- AXIS_REF[REF]
-
-
-
-
- EnO
- bEnabled
- bBusy
- bDone
- bError
- bHomed
- nErrorId
- nMotionAxisID
- Status
- fActVelocity
- fActPosition
- fActDiff
- sErrorMessage
-
-
- BOOL
- BOOL
- BOOL
- BOOL
- BOOL
- BOOL
- UDINT
- UDINT
- ST_AxisStatus
- LREAL
- LREAL
- LREAL
- STRING
-
-
- FunctionBlock
- false
- false
-
- false
- false
- 96L
-
-
-
- 94L
-
-
- false
- false
- false
-
- ""
- ""
- ""
- false
-
-
- 86L
-
-
- 0
- true
-
-
-
- System.Boolean
- {acfc6f68-8e3a-4af5-bf81-3dd512095a46}
- {9de7f100-1b87-424c-a62e-45b0cfc85ed2}
- {668066f2-6069-46b3-8962-8db8d13d7db2}
- System.Int32
- System.Int64
- {d9a99d73-b633-47db-b876-a752acb25871}
- {25e509de-33d4-4447-93f8-c9e4ea381c8b}
- {c9b2f165-48a2-4a45-8326-3952d8a3d708}
- {bffb3c53-f105-4e85-aba2-e30df579d75f}
- {f40d3e09-c02c-4522-a88c-dac23558cfc4}
- {71496971-9e0c-4677-a832-b9583b571130}
- System.String
-
-
-
+
@@ -1832,6 +96,15 @@ fbEL1808(
+
+
+
+
+
+
+
+
+
diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj
index 42f51c4..325287e 100644
--- a/solution/tc_project_app/tc_project_app.plcproj
+++ b/solution/tc_project_app/tc_project_app.plcproj
@@ -22,7 +22,10 @@
Code
-
+
+ Code
+
+
Code
@@ -133,10 +136,7 @@
Code
-
- Code
-
-
+
Code
@@ -166,6 +166,9 @@
Code
+
+ Code
+
Code
Visualization Manager.TcVMO
@@ -265,6 +268,10 @@
Tc2_Utilities, * (Beckhoff Automation GmbH)
Tc2_Utilities
+
+ Tc3_MC2_AdvancedHoming, * (Beckhoff Automation GmbH)
+ Tc3_MC2_AdvancedHoming
+
Tc3_Module, * (Beckhoff Automation GmbH)
Tc3_Module