Commit for merge

This commit is contained in:
Luke Nisbet
2020-04-06 17:21:03 +01:00
parent 48a6b2e793
commit dfb809b53d
7 changed files with 18 additions and 2798 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -7,7 +7,7 @@ VAR_GLOBAL
END_VAR
VAR_GLOBAL CONSTANT
axisNum : UINT:=2;
axisNum : UINT:=0;
END_VAR]]></Declaration>
</GVL>
</TcPlcObject>

View File

@@ -200,6 +200,11 @@
<v n="TextDefault">"fPosition"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"149"</v>
<v n="TextDefault">"fRatio"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"708"</v>
<v n="TextDefault">"Free Entries:"</v>
@@ -215,6 +220,11 @@
<v n="TextDefault">"gearIn"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"717"</v>
<v n="TextDefault">"gearInMultiMaster"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"300"</v>
<v n="TextDefault">"gearOut"</v>
@@ -270,6 +280,11 @@
<v n="TextDefault">"moveVelocity"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"575"</v>
<v n="TextDefault">"nIndex"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"709"</v>
<v n="TextDefault">"Overflows:"</v>

View File

@@ -7,9 +7,6 @@
<PouCall>
<Name>MAIN</Name>
</PouCall>
<PouCall>
<Name>tcUNIT_STD_LIB_RUN</Name>
</PouCall>
<TaskFBGuid>{26d89752-95b4-4b52-80c0-c79242bc34d7}</TaskFBGuid>
<Fb_init>{137c4fd1-c794-4dee-a041-b4fea1d22866}</Fb_init>
<Fb_exit>{2478772d-357b-433f-886f-15340bef9bdf}</Fb_exit>

View File

@@ -78,50 +78,16 @@
<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">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\Motion\Homing\FB_HomeFinish.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\Motion\Homing\FB_HomePrepare.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\Motion\Homing\FB_HomeReadNcVelocities.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\Motion\Homing\FB_HomeReadSoftLimEnable.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\Motion\Homing\FB_HomeToSwitch.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\Motion\Homing\FB_HomeVirtual.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\Motion\Homing\FB_HomeWriteNcVelocities.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\Motion\Homing\FB_HomeWriteSoftLimEnable.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\Motion\Homing\FB_Homing.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\VISUs\Error_Log_Visu.TcVIS">
<SubType>Code</SubType>
<DependentUpon>Visualization Manager.TcVMO</DependentUpon>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\VISUs\languageSupport.TcTLO">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\VISUs\MainVisu.TcVIS">
<SubType>Code</SubType>
<DependentUpon>Visualization Manager.TcVMO</DependentUpon>
</Compile>
<Compile Include="tc_mca_std_lib\POUs\VISUs\visuTextLinks.TcTLO">
<SubType>Code</SubType>
</Compile>
<Compile Include="Test\app_tests\tcUNIT_APP_RUN.TcPOU">
<SubType>Code</SubType>
</Compile>