Updated after merge resolution

This commit is contained in:
aaronlong
2020-03-04 10:09:51 +00:00
parent f22b6bfaa4
commit bb7af4fcdf
2 changed files with 3 additions and 8 deletions

View File

@@ -33,14 +33,6 @@
<Instance Id="#x08502040" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tc_project_app\tc_project_app.tmc">
<Name>tc_project_app Instance</Name>
<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
<Vars VarGrpType="2">
<Name>PlcTask Outputs</Name>
<Var>
<Name>MAIN.bOutput1</Name>
<Comment><![CDATA[*****Outputs: Power for Limit switches and Home Sensors (every 4th output)*******]]></Comment>
<Type>BOOL</Type>
</Var>
</Vars>
<TaskPouOids>
<TaskPouOid Prio="20" OTCID="#x08502041"/>
</TaskPouOids>

View File

@@ -7,6 +7,9 @@
<PouCall>
<Name>MAIN</Name>
</PouCall>
<PouCall>
<Name>tcUNIT_APP_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>