Heisig_GmbH/infineon_plc
1
0
Fork 0
Code Issues Activity

Some refactoring after static code analysis

Browse Source
This commit is contained in:
Matthias Heisig
2026-02-08 12:48:29 +01:00
parent bdaaf1fe9f
commit 69ef2c6904
43 changed files with 3244 additions and 1097 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
PLC/LibraryCandidates/FB_PI.TcPOU
View File

@@ -1,82 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1">
<POU Name="FB_PI" Id="{d504557e-7fd7-4784-a00a-5d7d1bed0c95}" SpecialFunc="None">
<Declaration><![CDATA[FUNCTION_BLOCK FB_PI
VAR_INPUT
rSP : REAL;
rPV : REAL;
rKp : REAL;
rTn : REAL;
xEnable : BOOL;
xSaturatedUpper : BOOL := FALSE;
xSaturatedLower : BOOL := FALSE;
END_VAR
VAR_OUTPUT
rMV : REAL;
END_VAR
VAR
_rError : REAL := 0.0;
_rIntegral : REAL := 0.0;
_rProportinal : REAL := 0.0;
_rDeltaIntegral : REAL := 0.0;
_fbGetCurTaskIdx : GETCURTASKINDEX;
_rT : REAL;
_xFirstCylce : BOOL := TRUE;
END_VAR
]]></Declaration>
<Implementation>
<ST><![CDATA[IF _xFirstCylce THEN
_xFirstCylce := FALSE;
// Get current task time
_fbGetCurTaskIdx();
_rT := LREAL_TO_REAL(UDINT_TO_LREAL(TwinCAT_SystemInfoVarList._TASKInfo[_fbGetCurTaskIdx.index].CycleTime) * 10E-5);
END_IF
IF xEnable THEN
_rError := rSP - rPV;
ELSE
_rError := 0.0;
_rIntegral := 0.0;
rMV := 0.0;
RETURN;
END_IF
// Calculate proportinal part
_rProportinal := rKp * _rError;
// Calculate controller output
rMV := _rProportinal + _rIntegral;
// Calculate integral for this step
IF rTn <> 0 THEN
_rDeltaIntegral := (rKp * _rT / rTn) * _rError;
ELSE
_rDeltaIntegral := 0;
END_IF
// Only add new integral part if we are going away from the upper or lower bound
IF (xSaturatedUpper AND (_rDeltaIntegral > 0.0)) THEN
_rDeltaIntegral := 0.0;
END_IF
IF (xSaturatedLower AND (_rDeltaIntegral < 0.0)) THEN
_rDeltaIntegral := 0.0;
END_IF
// Calculate integral part
_rIntegral := _rIntegral + _rDeltaIntegral;
// Reset integral with deactivated integral time
IF (rTn = 0.0) AND (_rIntegral <> 0) THEN
_rIntegral := 0.0;
END_IF]]></ST>
</Implementation>
</POU>
</TcPlcObject>

3
PLC/LibraryCandidates/PackML/DUTs/PackTags/ST_PMLa.TcDUT
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1">
<DUT Name="ST_PMLa" Id="{16746b45-38ff-4f58-95c8-eb6734adb976}">
<Declaration><![CDATA[TYPE ST_PMLa :
<Declaration><![CDATA[{attribute 'analysis' := '-33'}
TYPE ST_PMLa :
STRUCT
astProductData : ARRAY[0..(GVL_PackML_Conf.MAX_PRODUCT_DATA-1)] OF ST_PackML_ProductData;
diStopReason : DINT;

3
PLC/LibraryCandidates/PackML/DUTs/PackTags/ST_PMLc.TcDUT
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1">
<DUT Name="ST_PMLc" Id="{5cf4c850-57ba-42f8-9986-b146207e1b2f}">
<Declaration><![CDATA[TYPE ST_PMLc :
<Declaration><![CDATA[{attribute 'analysis' := '-33'}
TYPE ST_PMLc :
STRUCT
eUnitMode : E_PackMLUnitMode;
xUnitModeChangeRequest : BOOL;

3
PLC/LibraryCandidates/PackML/DUTs/PackTags/ST_PMLs.TcDUT
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1">
<DUT Name="ST_PMLs" Id="{dace328e-4599-42b5-ac3b-2a705ec8e2f3}">
<Declaration><![CDATA[TYPE ST_PMLs :
<Declaration><![CDATA[{attribute 'analysis' := '-33'}
TYPE ST_PMLs :
STRUCT
eUnitModeCurrent : E_PackMLUnitMode;
eStateCurrent : E_PackMLState;

3
PLC/LibraryCandidates/PackML/DUTs/PackTags/ST_PackMLPI.TcDUT
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1">
<DUT Name="ST_PackMLPI" Id="{e7198eb6-2cd3-41c0-be59-e7dbcf10a569}">
<Declaration><![CDATA[TYPE ST_PackMLPI :
<Declaration><![CDATA[{attribute 'analysis' := '-33'}
TYPE ST_PackMLPI :
STRUCT
astParameterReal : ARRAY[0..(GVL_PackML_Conf.MAX_PARAMS-1)] OF ST_PackMLParamREAL;
astParameterString : ARRAY[0..(GVL_PackML_Conf.MAX_PARAMS-1)] OF ST_PackMLParamSTRING;

10
PLC/LibraryCandidates/PackML/DUTs/PackTags/ST_PackMLParamDINT.TcDUT
View File

@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1">
<DUT Name="ST_PackMLParamDINT" Id="{f9801bf5-a73d-450f-b9fc-a5d8229e4946}">
<Declaration><![CDATA[TYPE ST_PackMLParamDINT :
<Declaration><![CDATA[{attribute 'naming' := 'off'}
{attribute 'analysis' := '-33'}
TYPE ST_PackMLParamDINT :
STRUCT
diID : DINT;
sName : STRING;
sUnit : STRING(6);
ID : DINT;
Name : STRING;
Unit : STRING(6);
Value : DINT;
END_STRUCT
END_TYPE

10
PLC/LibraryCandidates/PackML/DUTs/PackTags/ST_PackMLParamLREAL.TcDUT
View File

@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1">
<DUT Name="ST_PackMLParamLREAL" Id="{195fabe8-44c0-43ec-8434-75e38b68efb7}">
<Declaration><![CDATA[TYPE ST_PackMLParamLREAL :
<Declaration><![CDATA[{attribute 'naming' := 'off'}
{attribute 'analysis' := '-33'}
TYPE ST_PackMLParamLREAL :
STRUCT
diID : DINT;
sName : STRING;
sUnit : STRING(6);
ID : DINT;
Name : STRING;
Unit : STRING(6);
Value : LREAL;
END_STRUCT
END_TYPE

10
PLC/LibraryCandidates/PackML/DUTs/PackTags/ST_PackMLParamREAL.TcDUT
View File

@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1">
<DUT Name="ST_PackMLParamREAL" Id="{373303ba-9979-4979-a439-c899a36baa12}">
<Declaration><![CDATA[TYPE ST_PackMLParamREAL :
<Declaration><![CDATA[{attribute 'naming' := 'off'}
{attribute 'analysis' := '-33'}
TYPE ST_PackMLParamREAL :
STRUCT
diID : DINT;
sName : STRING;
sUnit : STRING(6);
ID : DINT;
Name : STRING;
Unit : STRING(6);
Value : REAL;
END_STRUCT
END_TYPE

10
PLC/LibraryCandidates/PackML/DUTs/PackTags/ST_PackMLParamSTRING.TcDUT
View File

@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1">
<DUT Name="ST_PackMLParamSTRING" Id="{85353d3e-e4c9-4e83-857e-8ce7ed43abaf}">
<Declaration><![CDATA[TYPE ST_PackMLParamSTRING :
<Declaration><![CDATA[{attribute 'naming' := 'off'}
{attribute 'analysis' := '-33'}
TYPE ST_PackMLParamSTRING :
STRUCT
diID : DINT;
sName : STRING;
sUnit : STRING(6);
ID : DINT;
Name : STRING;
Unit : STRING(6);
Value : STRING;
END_STRUCT
END_TYPE

3
PLC/LibraryCandidates/PackML/DUTs/PackTags/ST_PackMLRecipe.TcDUT
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1">
<DUT Name="ST_PackMLRecipe" Id="{b453a4b5-bb40-4669-97f2-8d8ab8d3dc26}">
<Declaration><![CDATA[TYPE ST_PackMLRecipe :
<Declaration><![CDATA[{attribute 'analysis' := '-33'}
TYPE ST_PackMLRecipe :
STRUCT
diID : DINT;
sName : STRING;

3
PLC/LibraryCandidates/PackML/DUTs/PackTags/ST_PackML_ProductData.TcDUT
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1">
<DUT Name="ST_PackML_ProductData" Id="{2af30e31-0927-41d2-9df4-7ed222070c13}">
<Declaration><![CDATA[TYPE ST_PackML_ProductData :
<Declaration><![CDATA[{attribute 'analysis' := '-33'}
TYPE ST_PackML_ProductData :
STRUCT
diProcessedCount : DINT;
diDefectiveCount : DINT;

8
PLC/LibraryCandidates/PackML/DUTs/ST_PackMLStateMachineConfig.TcDUT
View File

@@ -4,14 +4,14 @@
<Declaration><![CDATA[TYPE ST_PackMLStateMachineConfig :
STRUCT
xClearingDisabled : BOOL;
// xStoppedDisabled : BOOL;
// xStoppedDisabled required state
xStartingDisabled : BOOL;
// xIdleDisabled : BOOL;
// xIdleDisabled required state
xSuspededDisabled : BOOL;
// xExecuteDisabled : BOOL;
// xExecuteDisabled required state
xStoppingDisabled : BOOL;
xAbortingDisabled : BOOL;
// xAbortedDisabled : BOOL;
// xAbortedDisabled required state
xHoldingDisabled : BOOL;
xHeldDisabled : BOOL;
xUnholdingDisabled : BOOL;

2
PLC/LibraryCandidates/PackML/GVL_PackML_Conf.TcGVL
View File

@@ -2,6 +2,8 @@
<TcPlcObject Version="1.1.0.1">
<GVL Name="GVL_PackML_Conf" Id="{b46d8e14-5a19-467d-bb78-56321e43ef47}">
<Declaration><![CDATA[{attribute 'qualified_only'}
{attribute 'naming' := 'off'}
{attribute 'analysis' := '-43'}
VAR_GLOBAL CONSTANT
MAX_PARAMS : UINT := 10;
MAX_PRODUCT_DATA : UINT := 10;

3
PLC/LibraryCandidates/PackML/POUs/FB_PackMLGeneric.TcPOU
View File

@@ -27,9 +27,6 @@ VAR
// Internal unit mode
_eMode : E_PackMLUnitMode;
// Internal unit state
_eState : E_PackMLState;
// Last state
_eLastState : E_PackMLState;

6
PLC/LibraryCandidates/PackML/POUs/FB_PackMLStateMachine.TcPOU
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1">
<POU Name="FB_PackMLStateMachine" Id="{784ceb84-1721-424f-89d1-422a24198e57}" SpecialFunc="None">
<Declaration><![CDATA[FUNCTION_BLOCK FB_PackMLStateMachine
<Declaration><![CDATA[{attribute 'analysis' := '-178'}
FUNCTION_BLOCK FB_PackMLStateMachine
VAR_INPUT
eMode : E_PackMLUnitMode;
eCmd : E_PackMLCmd;
@@ -419,6 +420,9 @@ END_VAR
E_PackMLState.CLEARING:
_eState := E_PackMLState.STOPPED;
ELSE
;
END_CASE
eState := _eState;]]></ST>