Merge branch 'master' into federicor/update-templates

solution/_Config/PLC/tc_project_app.xti

@@ -1,7 +1,7 @@
 <?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.62" 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" ClearInvalidPersist="true" SymbolicMapping="true">
-		<Instance Id="#x08502040" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tc_project_app\tc_project_app.tmc" TmcHash="{6DABFE35-762D-6BDB-AC11-EBB8BC5AE2B1}">
+		<Instance Id="#x08502040" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tc_project_app\tc_project_app.tmc" TmcHash="{C4BD3855-3315-D1A6-F8E7-1C5E39A5801C}">
 			<Name>tc_project_app Instance</Name>
 			<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 			<Vars VarGrpType="1">

solution/tc_project_app/GlobalTextList.TcGTLO

@@ -235,6 +235,16 @@
               <v n="TextDefault">"Current pressure value (bar)"</v>
               <l n="LanguageTexts" t="ArrayList" />
             </o>
+            <o>
+              <v n="TextID">"1386"</v>
+              <v n="TextDefault">"disSoftLimBw"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
+            <o>
+              <v n="TextID">"269"</v>
+              <v n="TextDefault">"disSoftLimFw"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
             <o>
               <v n="TextID">"986"</v>
               <v n="TextDefault">"ehomeDirect"</v>
@@ -340,6 +350,16 @@
               <v n="TextDefault">"English"</v>
               <l n="LanguageTexts" t="ArrayList" />
             </o>
+            <o>
+              <v n="TextID">"1496"</v>
+              <v n="TextDefault">"enSoftLimBw"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
+            <o>
+              <v n="TextID">"850"</v>
+              <v n="TextDefault">"enSoftLimFw"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
             <o>
               <v n="TextID">"720"</v>
               <v n="TextDefault">"eReadCoEParameter"</v>
@@ -695,6 +715,11 @@
               <v n="TextDefault">"Stop at any Limit Swtich"</v>
               <l n="LanguageTexts" t="ArrayList" />
             </o>
+            <o>
+              <v n="TextID">"1033"</v>
+              <v n="TextDefault">"SWLimitSwitches"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
             <o>
               <v n="TextID">"108"</v>
               <v n="TextDefault">"Test Language"</v>

solution/tc_project_app/POUs/Application_Specific/Applications/Cabinet_Configuration.TcPOU

@@ -11,7 +11,7 @@ END_VAR
     <Implementation>
       <ST><![CDATA[//Cabinet monitoring
 (*fbCabinetMonitoring(
-    nEcMasterNetId:= ,
+    nEcMasterNetId:=  , //AMS NetId of Device (EtherCAT) from I/Os
     aErrorID=> ,
     aErrorMsg=> ,
     nEcMasterFramesLost=> ,

solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU

@@ -3,7 +3,8 @@
   <POU Name="Shutter_Operator_panel_Template" Id="{09741edf-58a0-0d9d-0563-de91fec8904d}" SpecialFunc="None">
     <Declaration><![CDATA[PROGRAM Shutter_Operator_panel_Template
 VAR
-    (*//Variables used to control the LEDs of the Safety Shutter Operator panel
+    //Variables used to control the LEDs of the Safety Shutter Operator panel
+(*
     {attribute 'TcLinkTo' := 'TIID^Device 1 (EtherCAT)^KF201 (EK1200)^KF217 (EK1521)^KF01 (EK1501-0100)^KF03 (EL2014)^DIG Outputs^Channel 1^Output'}
     bExtendedLight AT %Q*: BOOL; //Power output for Open position + LED
     {attribute 'TcLinkTo' := 'TIID^Device 1 (EtherCAT)^KF201 (EK1200)^KF217 (EK1521)^KF01 (EK1501-0100)^KF03 (EL2014)^DIG Outputs^Channel 3^Output'}

solution/tc_project_app/POUs/MAIN.TcPOU

@@ -124,6 +124,9 @@ GVL.fbGetCurTaskIndex();
 //Call the programs that are defined in the "Application Specific" folder.
 //Create as many programs in that folder as axes and applications you have or need
 
+//Cabinet monitoring and pressure limits for pneumatics
+//Cabinet_Configuration();
+
 //Axes initial parameters and program
 Axis_Template();
 //Pneumatics_Template();