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

Test: Delete redundancy in linking FB and interfaces in AXES()

Browse Source
This commit is contained in:
Federico Rojas
2022-09-30 16:07:16 +02:00
parent 0d6a9e255a
commit 33c2c06338
6 changed files with 25 additions and 1634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
solution.sln
View File

@@ -33,6 +33,22 @@ 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)
{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)
{FB261665-FD20-4BF2-97F8-2854C82B752D}.Debug|TwinCAT OS (ARMT2).Build.0 = Debug|TwinCAT OS (ARMT2)
{FB261665-FD20-4BF2-97F8-2854C82B752D}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
{FB261665-FD20-4BF2-97F8-2854C82B752D}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
{FB261665-FD20-4BF2-97F8-2854C82B752D}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
{FB261665-FD20-4BF2-97F8-2854C82B752D}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
{FB261665-FD20-4BF2-97F8-2854C82B752D}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
{FB261665-FD20-4BF2-97F8-2854C82B752D}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
{FB261665-FD20-4BF2-97F8-2854C82B752D}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMT2)
{FB261665-FD20-4BF2-97F8-2854C82B752D}.Release|TwinCAT OS (ARMT2).Build.0 = Release|TwinCAT OS (ARMT2)
{FB261665-FD20-4BF2-97F8-2854C82B752D}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
{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)
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

1562
solution/_Config/NC/Axes/Axis 2.xti
View File

File diff suppressed because it is too large Load Diff

70
solution/_Config/PLC/tc_project_app.xti
View File

@@ -1,77 +1,9 @@
<?xml version="1.0"?>
<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.32" ClassName="CNestedPlcProjDef">
<Project GUID="{FB261665-FD20-4BF2-97F8-2854C82B752D}" Name="tc_project_app" PrjFilePath="..\..\tc_project_app\tc_project_app.plcproj" TmcFilePath="..\..\tc_project_app\tc_project_app.tmc" ReloadTmc="true" AmsPort="852" FileArchiveSettings="#x000e" SymbolicMapping="true">
<Instance Id="#x08502040" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tc_project_app\tc_project_app.tmc" TmcHash="{3F0869C5-5C4C-2774-FAAE-E6295D2C6021}">
<Instance Id="#x08502040" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tc_project_app\tc_project_app.tmc" TmcHash="{60EA1325-E00F-D8F3-BA3C-C725B2C639A2}">
<Name>tc_project_app Instance</Name>
<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
<Vars VarGrpType="1">
<Name>PlcTask Inputs</Name>
<Var>
<Name>GVL.astAxes[1].stStatus.nEncoderRawCounter</Name>
<Comment><![CDATA[Raw encoder counter value]]></Comment>
<Type>UDINT</Type>
</Var>
<Var>
<Name>GVL.astAxes[1].stStatus.nStepperDriveCounter</Name>
<Comment><![CDATA[Raw internal counter from stepper drive]]></Comment>
<Type>UDINT</Type>
</Var>
<Var>
<Name>GVL.astAxes[1].stInputs.bLimitFwd</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL.astAxes[1].stInputs.bLimitBwd</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL.astAxes[1].stInputs.bHomeSensor</Name>
<Comment><![CDATA[Reference siganl for homing]]></Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL.astAxes[1].Axis.NcToPlc</Name>
<Type GUID="{10036166-C9D3-404B-BDD3-323034AAA7F4}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
</Var>
<Var>
<Name>GVL.astAxes[2].stStatus.nEncoderRawCounter</Name>
<Comment><![CDATA[Raw encoder counter value]]></Comment>
<Type>UDINT</Type>
</Var>
<Var>
<Name>GVL.astAxes[2].stStatus.nStepperDriveCounter</Name>
<Comment><![CDATA[Raw internal counter from stepper drive]]></Comment>
<Type>UDINT</Type>
</Var>
<Var>
<Name>GVL.astAxes[2].stInputs.bLimitFwd</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL.astAxes[2].stInputs.bLimitBwd</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL.astAxes[2].stInputs.bHomeSensor</Name>
<Comment><![CDATA[Reference siganl for homing]]></Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL.astAxes[2].Axis.NcToPlc</Name>
<Type GUID="{10036166-C9D3-404B-BDD3-323034AAA7F4}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
</Var>
</Vars>
<Vars VarGrpType="2" AreaNo="1">
<Name>PlcTask Outputs</Name>
<Var>
<Name>GVL.astAxes[1].Axis.PlcToNc</Name>
<Type GUID="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" Namespace="MC">PLCTONC_AXIS_REF</Type>
</Var>
<Var>
<Name>GVL.astAxes[2].Axis.PlcToNc</Name>
<Type GUID="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" Namespace="MC">PLCTONC_AXIS_REF</Type>
</Var>
</Vars>
<Contexts>
<Context>
<Id NeedCalleeCall="true">0</Id>

BIN
solution/tc_project_app/LineIDs.dbg
View File

Binary file not shown.

9
solution/tc_project_app/POUs/MAIN.TcPOU
View File

@@ -40,14 +40,19 @@ AXES();]]></ST>
IF _TaskInfo[fbGetCurTaskIndex.index].FirstCycle THEN
FOR GVL.iAxis := 1 TO GVL_APP.nAXIS_NUM DO
afbAxes[GVL.iAxis].stAxis REF= astAxes[GVL.iAxis];
aIAxes[GVL.iAxis] := afbAxes[GVL.iAxis];
//aIAxes[GVL.iAxis] := afbAxes[GVL.iAxis];
END_FOR
//Custom axis types defined and linked to aiAxes here
//fbCustomAxis extends FB_axis
//fbCustomAxis.stAxis REF= astAxes[x];
END_IF
//Execute FB_Axis logic
FOR GVL.iAxis := 1 TO GVL_APP.nAXIS_NUM DO
aIAxes[GVL.iAxis].Run();
afbAxes[GVL.iAxis].Run();
//aIAxes[GVL.iAxis].Run();
//Run the Run() of the custom axis
//fbCustomAxis.Run();
END_FOR
//Execute Pneumatic Axis logic

2
solution/tc_project_app/tc_mca_std_lib

Submodule solution/tc_project_app/tc_mca_std_lib updated: c17684688b...e2becdb1a3