Some refactoring after static code analysis
This commit is contained in:
@@ -5,7 +5,6 @@
|
||||
VAR_INPUT
|
||||
xEnable : BOOL;
|
||||
rTargetTemp : REAL;
|
||||
rDeadBand : REAL := 5.0;
|
||||
|
||||
xConfirmAlarms : BOOL;
|
||||
END_VAR
|
||||
@@ -17,10 +16,10 @@ VAR_IN_OUT
|
||||
stHMIInterface : ST_HCPlateHMIInterface;
|
||||
END_VAR
|
||||
VAR
|
||||
_xEnableHotplate AT %Q* : BOOL;
|
||||
xEnableHotplate AT %Q* : BOOL;
|
||||
|
||||
_axSlotFree : ARRAY [0..(GVL_HeatCoolConfig.HEAT_COOL_PLATES_NUM_SLOTS - 1)] OF BOOL;
|
||||
_tonSlotTimer : ARRAY[0..(GVL_HeatCoolConfig.HEAT_COOL_PLATES_NUM_SLOTS - 1)] OF TON;
|
||||
// _axSlotFree : ARRAY [0..(GVL_HeatCoolConfig.HEAT_COOL_PLATES_NUM_SLOTS - 1)] OF BOOL;
|
||||
// _atonSlotTimer : ARRAY[0..(GVL_HeatCoolConfig.HEAT_COOL_PLATES_NUM_SLOTS - 1)] OF TON;
|
||||
|
||||
// Temp sensor
|
||||
_fbTempSensor : FB_AnalogInput('Temp sensor');
|
||||
@@ -39,10 +38,7 @@ VAR
|
||||
timHardwareSignalLevelOff := T#1S));
|
||||
|
||||
_fbPITempControl : FB_PI;
|
||||
_xSaturatedUpper : BOOL;
|
||||
_xSaturatedLower : BOOL;
|
||||
_rMV : REAL;
|
||||
_fbPulsOut : TP;
|
||||
_fbLimit : FB_Limit;
|
||||
_fbPWMOut : FB_PWM;
|
||||
END_VAR
|
||||
]]></Declaration>
|
||||
@@ -73,28 +69,18 @@ _fbPITempControl(
|
||||
rKp:= 6,
|
||||
rTn:= 0,
|
||||
xEnable:= stHMIInterface.xEnable,
|
||||
xSaturatedUpper:= _xSaturatedUpper,
|
||||
xSaturatedLower:= _xSaturatedLower,
|
||||
rMV=> _rMV);
|
||||
rMV=> _fbLimit.rIn);
|
||||
|
||||
IF _rMV >= 100.0 THEN
|
||||
_rMV := 100.0;
|
||||
_xSaturatedUpper := TRUE;
|
||||
ELSE
|
||||
_xSaturatedUpper := FALSE;
|
||||
END_IF
|
||||
|
||||
IF _rMV <=0 THEN
|
||||
_rMV := 0.0;
|
||||
_xSaturatedLower := TRUE;
|
||||
ELSE
|
||||
_xSaturatedLower := FALSE;
|
||||
END_IF
|
||||
_fbLimit(
|
||||
rMin:= 0,
|
||||
rMax:= 100.0,
|
||||
rOut=> _fbPWMOut.rPWM,
|
||||
xClampedUpper=> _fbPITempControl.xSaturatedUpper,
|
||||
xClampedLower=> _fbPITempControl.xSaturatedLower);
|
||||
|
||||
_fbPWMOut(
|
||||
rPWM:= _rMV,
|
||||
timPeriod:= T#10S,
|
||||
xOutput=> _xEnableHotplate);
|
||||
xOutput=> xEnableHotplate);
|
||||
|
||||
// Output HMI Interface
|
||||
stHMIInterface.rPV := _fbTempSensor.rScaledValue;
|
||||
|
||||
Reference in New Issue
Block a user