Started to change to HAL architecture

PLC/00_Main/PRG_Main.TcPOU

@@ -127,7 +127,6 @@ _fbCoolplate(stHMIInterface := GVL_SCADA.stMachine.stCoolplate);
 _fbAligner(stCommand:= , stStatus=> , stAdmin=> , xConfirmAlarms:= GVL_SCADA.stMachine.stConfirmAlarmsBtn.xRequest, stHMIInterface := GVL_SCADA.stMachine.stAligner);
 
 _fbMediaCabinet(
-	xReleaseManualMode := TRUE,
 	xReleaseErrors := _xReleaseAlarms,
 	xConfirmAlarms := GVL_SCADA.stMachine.stConfirmAlarmsBtn.xRequest,
 	stHMIInterface := GVL_SCADA.stMachine.stMediaCabinet);

PLC/01_Stationen/Aligner/DUTs/HAL/ST_Aligner_IO.TcDUT

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TcPlcObject Version="1.1.0.1">
+  <DUT Name="ST_Aligner_IO" Id="{2573b629-32bc-4e57-b75e-bbc93eacf509}">
+    <Declaration><![CDATA[TYPE ST_Aligner_IO :
+STRUCT
+	i_xVacuumOk AT %I* : BOOL;
+	
+	i_diXOffset AT %I* : DINT;
+	i_diYOffset AT %I* : DINT;
+END_STRUCT
+END_TYPE
+]]></Declaration>
+  </DUT>
+</TcPlcObject>

PLC/01_Stationen/Aligner/FB_Aligner.TcPOU

@@ -5,7 +5,6 @@
 VAR_INPUT
 	xEnableVacuum : BOOL;
 	xExecute : BOOL;
-	xReleaseManualMode : BOOL;
 	xReleaseAlarms : BOOL;
 	xConfirmAlarms : BOOL;
 END_VAR
@@ -58,7 +57,7 @@ _fbValveVacuum(
 	xAutomaticOpen:= xEnableVacuum, 
 	xReleaseErrors:= xReleaseAlarms, 
 	stValveConfig:= _stValveVacuumConfig, 
-	xReleaseManualMode:= xReleaseManualMode, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms,  
 	stHMIInterface:= stHMIInterface.stVacuumValve);
 	

PLC/01_Stationen/Etcher/FB_Etcher.TcPOU

@@ -7,7 +7,6 @@ VAR_INPUT
 	xEnableVacuum : BOOL;
 	xOpenChuckClamp : BOOL;
 	xEjectChuck : BOOL;
-	xReleaseManualMode : BOOL;
 	xReleaseAlarms : BOOL;
 	xConfirmAlarms : BOOL;
 END_VAR
@@ -106,7 +105,7 @@ _fbValveDoor(
 	xAutomaticOpen:= xOpenDoor, 
 	xReleaseErrors:= xReleaseAlarms, 
 	stValveConfig:= _stValveDoorCfg, 
-	xReleaseManualMode:= xReleaseManualMode, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms,  
 	stHMIInterface:= stHMIInterface.stDoorValve);
 	
@@ -126,7 +125,7 @@ _fbValveVacuum(
 	xAutomaticOpen := xEnableVacuum,
 	xReleaseErrors:= xReleaseAlarms, 
 	stValveConfig:= _stValveVacuumConfig, 
-	xReleaseManualMode:= xReleaseManualMode, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms,  
 	stHMIInterface:= stHMIInterface.stVacuumValve);
 
@@ -134,7 +133,7 @@ _fbUnlockLeft(
 	xAutomaticOpen:= _xOpenChuckClamp, 
 	xReleaseErrors:= xReleaseAlarms, 
 	stValveConfig:= _stValveUnlockLeftCfg, 
-	xReleaseManualMode:= xReleaseManualMode, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms, 
 	stHMIInterface:= stHMIInterface.stChuckUnlockLeft);
 	
@@ -142,7 +141,7 @@ _fbUnlockRight(
 	xAutomaticOpen:= _xOpenChuckClamp, 
 	xReleaseErrors:= xReleaseAlarms, 
 	stValveConfig:= _stValveUnlockRightCfg, 
-	xReleaseManualMode:= xReleaseManualMode, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms, 
 	stHMIInterface:= stHMIInterface.stChuckUnlockRight);
 	
@@ -150,7 +149,7 @@ _fbEjectFront(
 	xAutomaticOpen:= _xEjectChuck, 
 	xReleaseErrors:= xReleaseAlarms, 
 	stValveConfig:= _stValveClampingFrontCfg, 
-	xReleaseManualMode:= xReleaseManualMode, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms, 
 	stHMIInterface:= stHMIInterface.stChuckEjectFront);
 	
@@ -158,7 +157,7 @@ _fbEjectBack(
 	xAutomaticOpen:= _xEjectChuck, 
 	xReleaseErrors:= xReleaseAlarms, 
 	stValveConfig:= _stValveEjectBackCfg, 
-	xReleaseManualMode:= xReleaseManualMode, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms, 
 	stHMIInterface:= stHMIInterface.stChuckEjectBack);
 	
@@ -177,7 +176,7 @@ _fbRobot(stPackMLHMIInterface := stHMIInterface.stMecaCmds);
 _fbValveEnableFilmetch(
 	xReleaseErrors:= xReleaseAlarms, 
 	stValveConfig:= _stValveConfig, 
-	xReleaseManualMode:= xReleaseManualMode,
+	xReleaseManualMode:= _xReleaseManualMode,
 	xConfirmAlarms := xConfirmAlarms, 
 	stHMIInterface:= stHMIInterface.stValveFilmetch);
 

PLC/01_Stationen/HVTester/POUs/FB_HVTester.TcPOU

@@ -30,14 +30,14 @@ END_VAR
       <ST><![CDATA[_fbDoorValve(
 	xReleaseErrors:= xReleaseAlarms, 
 	stValveConfig:= _stDoorValveConfig, 
-	xReleaseManualMode:= TRUE, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms, 
 	stHMIInterface:= stHMIInterface.stDoorValve);
 	
 _fbTestChamberValve(
 	xReleaseErrors:= xReleaseAlarms, 
 	stValveConfig:= _stTestChamberValveConfig, 
-	xReleaseManualMode:= TRUE, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms, 
 	stHMIInterface:= stHMIInterface.stTestChamberValve);
 	
@@ -45,7 +45,7 @@ _fbReleaseChamberMovement(
 	xAutomaticOpen := TRUE,
 	xReleaseErrors:= xReleaseAlarms, 
 	stValveConfig:= _stReleaseValveConfig, 
-	xReleaseManualMode:= TRUE, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms, 
 	stHMIInterface:= stHMIInterface.stReleaseChamberValve);
 

PLC/01_Stationen/Hotplate/POUs/FB_Hotplate.TcPOU

@@ -150,7 +150,8 @@ VAR_INPUT
 END_VAR
 ]]></Declaration>
       <Implementation>
-        <ST><![CDATA[stHMIInterface.stEnableBtn.xRelease := (NOT _xEnable);
+        <ST><![CDATA[{warning disable C0371}
+stHMIInterface.stEnableBtn.xRelease := (NOT _xEnable) AND _xReleaseManualMode;
 IF _xEnable THEN
 	stHMIInterface.stEnableBtn.eFeedback := 1;
 	stHMIInterface.stDisableBtn.eFeedback := 0;

PLC/01_Stationen/MediaStation/DUTs/HAL/ST_MediaCabinet_IO.TcDUT

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TcPlcObject Version="1.1.0.1">
+  <DUT Name="ST_MediaCabinet_IO" Id="{4cd66bd0-a52a-4f12-b907-78c31a0ae205}">
+    <Declaration><![CDATA[TYPE ST_MediaCabinet_IO :
+STRUCT
+	// (1) Acetic acid 99%
+	stTank1AceticAcidHighIO : ST_Tank_IO;
+	
+	// (2) Sulfuric acid
+	stTank2SulfuricAcidIO : ST_Tank_IO;
+	
+	// (3) Nitric acid 65% mixing
+	stTank3NitricAcidIO : ST_Tank_IO;
+	
+	// (4) Acetic acid 10%
+	stTank4AceticAcidLowIO : ST_Tank_IO;
+	
+	// (5) Hydrofluoric acid 40%
+	stTank5HydrofluoricAcidIO : ST_Tank_IO;
+	
+	// (6) Sulfuric acid mixing
+	stTank6SulfuricAcidMixingIO : ST_Tank_IO;
+	
+	// (7) Hydrofluoric acid 40% for mixing
+	stTank7HydrofluoricAcidMixingIO : ST_Tank_IO;
+	
+	// (8) SEF
+	stTank8SEFIO : ST_Tank_IO;
+	
+	// (9) Filmetch
+	stTank9FilmetchIO : ST_Tank_IO;
+END_STRUCT
+END_TYPE
+]]></Declaration>
+  </DUT>
+</TcPlcObject>

PLC/01_Stationen/MediaStation/DUTs/HAL/ST_Tank_IO.TcDUT

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TcPlcObject Version="1.1.0.1">
+  <DUT Name="ST_Tank_IO" Id="{dfa73416-0b16-4c4f-94ca-fabd1404e589}">
+    <Declaration><![CDATA[TYPE ST_Tank_IO :
+STRUCT
+	i_xOverfull AT %I* : BOOL;
+	i_xFull AT %I* : BOOL;
+	i_xEmpty AT %I* : BOOL;
+END_STRUCT
+END_TYPE
+]]></Declaration>
+  </DUT>
+</TcPlcObject>

PLC/01_Stationen/MediaStation/DUTs/ST_HMI_MediaCabinet.TcDUT

@@ -3,6 +3,8 @@
   <DUT Name="ST_HMI_MediaCabinet" Id="{531277fd-be49-4a36-8089-70f1b95b2250}">
     <Declaration><![CDATA[TYPE ST_HMI_MediaCabinet :
 STRUCT
+	stStationCmds : ST_HMI_PackML;
+
 	// (1) Acetic acid 99%
 	stTankAceticAcidHigh : ST_HMI_Tank;
 	

PLC/01_Stationen/MediaStation/POUs/FB_LeviPump.TcPOU

@@ -195,7 +195,8 @@ VAR_INPUT
 END_VAR
 ]]></Declaration>
       <Implementation>
-        <ST><![CDATA[// Copy requested state into internal buffer
+        <ST><![CDATA[{warning disable C0371}
+// Copy requested state into internal buffer
 _wStateReq := wState;
 
 // Send pump state change request

PLC/01_Stationen/MediaStation/POUs/FB_MediaCabinet.TcPOU

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TcPlcObject Version="1.1.0.1">
   <POU Name="FB_MediaCabinet" Id="{9de34b64-23ba-4fef-b086-9297bbd06f24}" SpecialFunc="None">
-    <Declaration><![CDATA[FUNCTION_BLOCK FB_MediaCabinet
+    <Declaration><![CDATA[FUNCTION_BLOCK FB_MediaCabinet EXTENDS FB_PackMLGeneric
 VAR_INPUT
-	xReleaseManualMode : BOOL;
 	xReleaseErrors : BOOL;
 	xConfirmAlarms : BOOL;
 END_VAR
@@ -60,55 +59,55 @@ END_VAR
     <Implementation>
       <ST><![CDATA[_fbTankAceticAcidHigh(
 	xReleaseErrors:= xReleaseErrors, 
-	xReleaseManualMode:= xReleaseManualMode, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms, 
 	stHMIInterface:= stHMIInterface.stTankAceticAcidHigh);
 	
 _fbTankSulfuricAcid(
 	xReleaseErrors:= xReleaseErrors, 
-	xReleaseManualMode:= xReleaseManualMode, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms, 
 	stHMIInterface:= stHMIInterface.stTankSulfuricAcid);
 	
 _fbTankNitricAcid(
 	xReleaseErrors:= xReleaseErrors, 
-	xReleaseManualMode:= xReleaseManualMode, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms, 
 	stHMIInterface:= stHMIInterface.stTankNitricAcid);
 	
 _fbTankAceticAcidLow(
 	xReleaseErrors:= xReleaseErrors, 
-	xReleaseManualMode:= xReleaseManualMode, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms, 
 	stHMIInterface:= stHMIInterface.stTankAceticAcidLow);
 	
 _fbTankHydrofluoricAcid(
 	xReleaseErrors:= xReleaseErrors, 
-	xReleaseManualMode:= xReleaseManualMode, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms, 
 	stHMIInterface:= stHMIInterface.stTankHydrofluoricAcid);
 	
 _fbTankSulfuricAcidMixing(
 	xReleaseErrors:= xReleaseErrors, 
-	xReleaseManualMode:= xReleaseManualMode, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms, 
 	stHMIInterface:= stHMIInterface.stTankSulfuricAcidMixing);
 	
 _fbTankHydrofluoricAcidMixing(
 	xReleaseErrors:= xReleaseErrors, 
-	xReleaseManualMode:= xReleaseManualMode, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms, 
 	stHMIInterface:= stHMIInterface.stTankHydrofluoricAcidMixing);
 	
 _fbTankSEF(
 	xReleaseErrors:= xReleaseErrors, 
-	xReleaseManualMode:= xReleaseManualMode, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms, 
 	stHMIInterface:= stHMIInterface.stTankSEF);
 	
 _fbTankFilmetch(
 	xReleaseErrors:= xReleaseErrors, 
-	xReleaseManualMode:= xReleaseManualMode, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms, 
 	stHMIInterface:= stHMIInterface.stTankFilmetch);
 	
@@ -116,7 +115,7 @@ _fbTankFilmetch(
 _fbValveFilmetchOut(
 	xReleaseErrors:= xReleaseErrors, 
 	stValveConfig:= _stValveConfig, 
-	xReleaseManualMode:= xReleaseManualMode, 
+	xReleaseManualMode:= _xReleaseManualMode, 
 	xConfirmAlarms:= xConfirmAlarms, 
 	stHMIInterface:= stHMIInterface.stValveFilmetch);
 	
@@ -128,7 +127,8 @@ _fbLeviPump9(
 	rSpeedSP:= 2000, 
 	fbModbusMaster:= _fbMBMaster);
 
-]]></ST>
+// Call isa88 base state machine
+SUPER^(stPackMLHMIInterface := stHMIInterface.stStationCmds);]]></ST>
     </Implementation>
     <Method Name="FB_Init" Id="{860f10c9-69ca-4ad7-9edc-00af754d0af0}">
       <Declaration><![CDATA[//FB_Init is always available implicitly and it is used primarily for initialization.

PLC/01_Stationen/MediaStation/POUs/FB_Tank.TcPOU

@@ -145,7 +145,8 @@ VAR_INPUT
 END_VAR
 ]]></Declaration>
       <Implementation>
-        <ST><![CDATA[// Start emptying tank
+        <ST><![CDATA[{warning disable C0371}
+// Start emptying tank
 IF stHMIInterface.stEmptyButton.xRequest THEN
 	stHMIInterface.stEmptyButton.xRequest := FALSE;
 	IF stHMIInterface.stEmptyButton.xRelease THEN
@@ -168,7 +169,8 @@ VAR_INPUT
 END_VAR
 ]]></Declaration>
       <Implementation>
-        <ST><![CDATA[// Overfull sensor is NC
+        <ST><![CDATA[{warning disable C0371}
+// Overfull sensor is NC
 stHMIInterface.xOverfull := (NOT i_xOverfull);
 stHMIInterface.xFull := i_xFull;
 stHMIInterface.xEmpty := (NOT i_xEmpty);

PLC/GVLs/GVL_IO.TcGVL

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TcPlcObject Version="1.1.0.1">
+  <GVL Name="GVL_IO" Id="{af1f1967-ece5-41b0-9a22-6f9c542631c5}">
+    <Declaration><![CDATA[{attribute 'qualified_only'}
+VAR_GLOBAL
+	// TIID^Device 1 (EtherCAT)^Tank_1_4_9 (EK1100)^M1_KL04 (EL1018)^Channel 5^Tank9NotEmpty
+	stMediaCabinetIO : ST_MediaCabinet_IO;
+END_VAR]]></Declaration>
+  </GVL>
+</TcPlcObject>

PLC/LibraryCandidates/PackML/POUs/FB_PackMLGeneric.TcPOU

@@ -46,6 +46,9 @@ VAR
 	
 	// State state machine variable
 	_iSSM : INT := 0;
+	
+	// Internal manual mode release flag when changed to manual mode
+	_xReleaseManualMode : BOOL;
 END_VAR
 ]]></Declaration>
     <Implementation>
@@ -87,6 +90,8 @@ IF _eLastState <> _stStatus.eStateCurrent THEN
 	_eLastState := _stStatus.eStateCurrent;
 END_IF
 
+// Set release manual mode flag when we are in manual mode
+_xReleaseManualMode := (_stStatus.eUnitModeCurrent = E_PackMLUnitMode.MANUAL);
 
 // Call state method according to current state
 CASE _stStatus.eStateCurrent OF

PLC/PLC.plcproj

@@ -37,6 +37,9 @@
     <Compile Include="00_Main\ST_TrayFeederCamPosData.TcDUT">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="01_Stationen\Aligner\DUTs\HAL\ST_Aligner_IO.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="01_Stationen\Aligner\FB_Aligner.TcPOU">
       <SubType>Code</SubType>
     </Compile>
@@ -185,6 +188,12 @@
     <Compile Include="01_Stationen\MediaStation\DUTs\E_LeviPumpState.TcDUT">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="01_Stationen\MediaStation\DUTs\HAL\ST_MediaCabinet_IO.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="01_Stationen\MediaStation\DUTs\HAL\ST_Tank_IO.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="01_Stationen\MediaStation\DUTs\ST_HMI_MediaCabinet.TcDUT">
       <SubType>Code</SubType>
     </Compile>
@@ -252,6 +261,10 @@
     <Compile Include="GlobalTextList.TcGTLO">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="GVLs\GVL_IO.TcGVL">
+      <SubType>Code</SubType>
+      <LinkAlways>true</LinkAlways>
+    </Compile>
     <Compile Include="GVLs\GVL_SCADA.TcGVL">
       <SubType>Code</SubType>
       <LinkAlways>true</LinkAlways>
@@ -388,6 +401,8 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="01_Stationen\Aligner\DUTs" />
+    <Folder Include="01_Stationen\Aligner\DUTs\HAL" />
     <Folder Include="01_Stationen\Coolplate\DUTs" />
     <Folder Include="01_Stationen\Coolplate\POUs" />
     <Folder Include="01_Stationen\Etcher\Mecademics" />
@@ -407,6 +422,7 @@
     <Folder Include="01_Stationen\Coolplate" />
     <Folder Include="01_Stationen\MediaStation" />
     <Folder Include="01_Stationen\MediaStation\DUTs" />
+    <Folder Include="01_Stationen\MediaStation\DUTs\HAL" />
     <Folder Include="01_Stationen\MediaStation\POUs" />
     <Folder Include="01_Stationen\Input" />
     <Folder Include="01_Stationen\Output" />

_Config/PLC/PLC Instance.xti

@@ -385,10 +385,13 @@
 				<Link VarA="PlcTask Outputs^PRG_Main._fbRobot.stJobs" VarB="Module 3 (Default IO)^Std. Out (64 Bytes)^Output DWORD 1 (JobNr/PLCJobNr)"/>
 			</OwnerB>
 			<OwnerB Name="TIID^Device 1 (EtherCAT)^Tank_1_4_9 (EK1100)^M1_KL02 (EL1918)">
+				<Link VarA="PlcTask Inputs^GVL_IO.stMediaCabinetIO.stTankFilmetchIO.i_xOverfull" VarB="Module 1 (FSOE)^FSoE Inputs^FSOE^Tank9NotOverFull" AutoLink="true" Size="1"/>
 				<Link VarA="PlcTask Inputs^PRG_Main._fbMediaCabinet._fbTankAceticAcidLow.i_xOverfull" VarB="Module 1 (FSOE)^FSoE Inputs^FSOE^Tank4NotOverFull" Size="1"/>
 				<Link VarA="PlcTask Inputs^PRG_Main._fbMediaCabinet._fbTankFilmetch.i_xOverfull" VarB="Module 1 (FSOE)^FSoE Inputs^FSOE^Tank9NotOverFull" Size="1"/>
 			</OwnerB>
 			<OwnerB Name="TIID^Device 1 (EtherCAT)^Tank_1_4_9 (EK1100)^M1_KL04 (EL1018)">
+				<Link VarA="PlcTask Inputs^GVL_IO.stMediaCabinetIO.stTankFilmetchIO.i_xEmpty" VarB="Channel 5^Tank9NotEmpty" AutoLink="true" Size="1"/>
+				<Link VarA="PlcTask Inputs^GVL_IO.stMediaCabinetIO.stTankFilmetchIO.i_xFull" VarB="Channel 6^Tank9Full" AutoLink="true" Size="1"/>
 				<Link VarA="PlcTask Inputs^PRG_Main._fbMediaCabinet._fbTankAceticAcidLow.i_xEmpty" VarB="Channel 3^Tank4NotEmpty" Size="1"/>
 				<Link VarA="PlcTask Inputs^PRG_Main._fbMediaCabinet._fbTankAceticAcidLow.i_xFull" VarB="Channel 4^Tank4Full" Size="1"/>
 				<Link VarA="PlcTask Inputs^PRG_Main._fbMediaCabinet._fbTankFilmetch.i_xEmpty" VarB="Channel 5^Tank9NotEmpty" Size="1"/>