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

Add homing of FB_DriveVirtual V2 into FB_DriveVirtual V1

Browse Source 
Homing sequences of FB_DriveVirtual V2 put into FB_Axis
FB_DriveVirtual change name to FB_Axis
Add enum for motion commands in the ST_AxisStruct
Add Case statement for the some motion functions
Delete FB_NcAxis, FB_Communication, FB_DriveVirtual_V2, ST_CommStates, DUT_AxisStatus
This commit is contained in:
Federico Rojas
2019-04-05 13:22:53 +02:00
parent e5ba869ae8
commit d8555784b5
3 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
solution/solution.tsproj
View File

@@ -1819,7 +1819,7 @@ External Setpoint Generation:
</SubVar>
</Var>
<Var>
<Name>MAIN.aFBAxes[1].fbDriveVirtual.InfoData_State</Name>
<Name>MAIN.aFBAxes[1].InfoData_State</Name>
<Type>UINT</Type>
</Var>
</Vars>

2
solution/tc_project_app/tc_mca_std_lib

Submodule solution/tc_project_app/tc_mca_std_lib updated: 8211cc0b78...d0c85c1acb

29
solution/tc_project_app/tc_project_app.plcproj
View File

@@ -22,18 +22,18 @@
<Compile Include="POUs\MAIN.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\DUTs\AxisFunctions.TcTLEO">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\DUTs\MotionFunctions.TcDUT">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\DUTs\ST_AxisStruct.TcDUT">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\DUTs\CommStates.TcDUT">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\DUTs\DUT_AxisStatus_v0_01.TcDUT">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\DUTs\IndexerStruct.TcDUT">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\GVLs\GVL.TcGVL">
<SubType>Code</SubType>
</Compile>
@@ -67,12 +67,6 @@
<Compile Include="tc_mca_std_lib\POUs\ErrorHandling\ST_ErrorSystem.TcDUT">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\FB_Axis.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\FB_Communication.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\Hardware\EtherCAT_Terminals\Analog_Inputs\EL3174_0002.TcPOU">
<SubType>Code</SubType>
</Compile>
@@ -148,16 +142,7 @@
<Compile Include="tc_mca_std_lib\POUs\Hardware\Other\EK1200.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\Motion\FB_DriveVirtual.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\Motion\FB_DriveVirtual_V2.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\Motion\FB_HomingSeq.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\Motion\FB_NcAxis.TcPOU">
<Compile Include="tc_mca_std_lib\POUs\Motion\FB_Axis.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\Motion\Homing\FB_HomeDirect.TcPOU">