diff --git a/BaseComponents.tsproj b/BaseComponents.tsproj index 2a3426e..8c93cc4 100644 --- a/BaseComponents.tsproj +++ b/BaseComponents.tsproj @@ -136,357 +136,9 @@ - + BasicComponents Instance {08500001-0000-0000-F000-000000000064} - - PlcTask Inputs - - PRG_MAIN._fbAnalogInputTest._fbAIErrorLowOn.iAnalogValue - - INT - - - PRG_MAIN._fbAnalogInputTest._fbAIErrorLowOn.xUnderrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIErrorLowOn.xOverrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIErrorLowOn.xErrorCard - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIWarningLowOn.iAnalogValue - - INT - - - PRG_MAIN._fbAnalogInputTest._fbAIWarningLowOn.xUnderrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIWarningLowOn.xOverrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIWarningLowOn.xErrorCard - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIWarningHighOn.iAnalogValue - - INT - - - PRG_MAIN._fbAnalogInputTest._fbAIWarningHighOn.xUnderrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIWarningHighOn.xOverrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIWarningHighOn.xErrorCard - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIErrorHighOn.iAnalogValue - - INT - - - PRG_MAIN._fbAnalogInputTest._fbAIErrorHighOn.xUnderrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIErrorHighOn.xOverrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIErrorHighOn.xErrorCard - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIOverrangeOn.iAnalogValue - - INT - - - PRG_MAIN._fbAnalogInputTest._fbAIOverrangeOn.xUnderrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIOverrangeOn.xOverrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIOverrangeOn.xErrorCard - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIUnderrangeOn.iAnalogValue - - INT - - - PRG_MAIN._fbAnalogInputTest._fbAIUnderrangeOn.xUnderrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIUnderrangeOn.xOverrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIUnderrangeOn.xErrorCard - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIErrorLowOff.iAnalogValue - - INT - - - PRG_MAIN._fbAnalogInputTest._fbAIErrorLowOff.xUnderrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIErrorLowOff.xOverrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIErrorLowOff.xErrorCard - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIWarningLowOff.iAnalogValue - - INT - - - PRG_MAIN._fbAnalogInputTest._fbAIWarningLowOff.xUnderrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIWarningLowOff.xOverrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIWarningLowOff.xErrorCard - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIWarningHighOff.iAnalogValue - - INT - - - PRG_MAIN._fbAnalogInputTest._fbAIWarningHighOff.xUnderrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIWarningHighOff.xOverrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIWarningHighOff.xErrorCard - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIErrorHighOff.iAnalogValue - - INT - - - PRG_MAIN._fbAnalogInputTest._fbAIErrorHighOff.xUnderrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIErrorHighOff.xOverrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIErrorHighOff.xErrorCard - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIUnderrangeOff.iAnalogValue - - INT - - - PRG_MAIN._fbAnalogInputTest._fbAIUnderrangeOff.xUnderrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIUnderrangeOff.xOverrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIUnderrangeOff.xErrorCard - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIOverrangeOff.iAnalogValue - - INT - - - PRG_MAIN._fbAnalogInputTest._fbAIOverrangeOff.xUnderrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIOverrangeOff.xOverrange - - BOOL - - - PRG_MAIN._fbAnalogInputTest._fbAIOverrangeOff.xErrorCard - - BOOL - - - PRG_MAIN._fbValve_TimeoutTestOpen._fbValveTimeout.xOpenFeedback - BOOL - - - PRG_MAIN._fbValve_TimeoutTestOpen._fbValveTimeout.xCloseFeedback - BOOL - - - PRG_MAIN._fbValve_TimeoutTestClose._fbValveTimeout.xOpenFeedback - BOOL - - - PRG_MAIN._fbValve_TimeoutTestClose._fbValveTimeout.xCloseFeedback - BOOL - - - PRG_MAIN._fbValve_TimoutTriggerOpen._fbValveTimeout.xOpenFeedback - BOOL - - - PRG_MAIN._fbValve_TimoutTriggerOpen._fbValveTimeout.xCloseFeedback - BOOL - - - PRG_MAIN._fbValve_TimoutTriggerClose._fbValveTimeout.xOpenFeedback - BOOL - - - PRG_MAIN._fbValve_TimoutTriggerClose._fbValveTimeout.xCloseFeedback - BOOL - - - PRG_MAIN._fbValveTestHMI._fbValveOC.xOpenFeedback - BOOL - - - PRG_MAIN._fbValveTestHMI._fbValveOC.xCloseFeedback - BOOL - - - - PlcTask Outputs - - PRG_MAIN._fbValve_TimeoutTestOpen._fbValveTimeout.xOpenValve - - BOOL - - - PRG_MAIN._fbValve_TimeoutTestOpen._fbValveTimeout.xCloseValve - - BOOL - - - PRG_MAIN._fbValve_TimeoutTestClose._fbValveTimeout.xOpenValve - - BOOL - - - PRG_MAIN._fbValve_TimeoutTestClose._fbValveTimeout.xCloseValve - - BOOL - - - PRG_MAIN._fbValve_TimoutTriggerOpen._fbValveTimeout.xOpenValve - - BOOL - - - PRG_MAIN._fbValve_TimoutTriggerOpen._fbValveTimeout.xCloseValve - - BOOL - - - PRG_MAIN._fbValve_TimoutTriggerClose._fbValveTimeout.xOpenValve - - BOOL - - - PRG_MAIN._fbValve_TimoutTriggerClose._fbValveTimeout.xCloseValve - - BOOL - - - PRG_MAIN._fbValveTestHMI._fbValveOC.xOpenValve - - BOOL - - - PRG_MAIN._fbValveTestHMI._fbValveOC.xCloseValve - - BOOL - - 0 diff --git a/BasicComponents.library b/BasicComponents.library index b8f96a4..3f4a5d3 100644 Binary files a/BasicComponents.library and b/BasicComponents.library differ diff --git a/BasicComponents/BasicComponents.plcproj b/BasicComponents/BasicComponents.plcproj index 124a628..e505420 100644 --- a/BasicComponents/BasicComponents.plcproj +++ b/BasicComponents/BasicComponents.plcproj @@ -21,7 +21,7 @@ false Heisig GmbH BaseComponents - 1.3.4 + 2.0.0 BC M.Heisig Basic components fb's (Valves, AI, AO, Motors, etc.) @@ -45,212 +45,231 @@ - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + + Code + + + Code + + Code true - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + + Code + + + Code + + + Code + + Code true - + Code true - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + + Code + + Code + + + + + + + + + + + + + + + + + + - - - - - - - true - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - @@ -304,8 +323,8 @@ - - + + "<ProjectRoot>" {192FAD59-8248-4824-A8DE-9177C94C195A} @@ -2686,16 +2705,16 @@ - - - System.Boolean - System.Collections.Hashtable - System.Int32 - {54dd0eac-a6d8-46f2-8c27-2f43c7e49861} - System.String - System.UInt32 - - + + + System.Boolean + System.Collections.Hashtable + System.Int32 + {54dd0eac-a6d8-46f2-8c27-2f43c7e49861} + System.String + System.UInt32 + + \ No newline at end of file diff --git a/BasicComponents/POUs/Components/Analog/Types/ST_ANALOG_EW_CONFIG.TcDUT b/BasicComponents/Components/Analog/DUTs/ST_ANALOG_EW_CONFIG.TcDUT similarity index 100% rename from BasicComponents/POUs/Components/Analog/Types/ST_ANALOG_EW_CONFIG.TcDUT rename to BasicComponents/Components/Analog/DUTs/ST_ANALOG_EW_CONFIG.TcDUT diff --git a/BasicComponents/POUs/Components/Analog/Types/ST_ANALOG_EW_DELAYS.TcDUT b/BasicComponents/Components/Analog/DUTs/ST_ANALOG_EW_DELAYS.TcDUT similarity index 100% rename from BasicComponents/POUs/Components/Analog/Types/ST_ANALOG_EW_DELAYS.TcDUT rename to BasicComponents/Components/Analog/DUTs/ST_ANALOG_EW_DELAYS.TcDUT diff --git a/BasicComponents/POUs/Components/Analog/Types/ST_ANALOG_EW_LEVELS.TcDUT b/BasicComponents/Components/Analog/DUTs/ST_ANALOG_EW_LEVELS.TcDUT similarity index 100% rename from BasicComponents/POUs/Components/Analog/Types/ST_ANALOG_EW_LEVELS.TcDUT rename to BasicComponents/Components/Analog/DUTs/ST_ANALOG_EW_LEVELS.TcDUT diff --git a/BasicComponents/POUs/Components/Analog/Types/ST_ANALOG_IO_CONFIG.TcDUT b/BasicComponents/Components/Analog/DUTs/ST_ANALOG_IO_CONFIG.TcDUT similarity index 100% rename from BasicComponents/POUs/Components/Analog/Types/ST_ANALOG_IO_CONFIG.TcDUT rename to BasicComponents/Components/Analog/DUTs/ST_ANALOG_IO_CONFIG.TcDUT diff --git a/BasicComponents/Components/Analog/DUTs/ST_AnalogInput_IO.TcDUT b/BasicComponents/Components/Analog/DUTs/ST_AnalogInput_IO.TcDUT new file mode 100644 index 0000000..cca463b --- /dev/null +++ b/BasicComponents/Components/Analog/DUTs/ST_AnalogInput_IO.TcDUT @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/BasicComponents/Components/Analog/DUTs/ST_AnalogOutput_IO.TcDUT b/BasicComponents/Components/Analog/DUTs/ST_AnalogOutput_IO.TcDUT new file mode 100644 index 0000000..b493847 --- /dev/null +++ b/BasicComponents/Components/Analog/DUTs/ST_AnalogOutput_IO.TcDUT @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/BasicComponents/POUs/Components/Analog/FB_AnalogInput.TcPOU b/BasicComponents/Components/Analog/POUs/FB_AnalogInput.TcPOU similarity index 97% rename from BasicComponents/POUs/Components/Analog/FB_AnalogInput.TcPOU rename to BasicComponents/Components/Analog/POUs/FB_AnalogInput.TcPOU index 1aeda2a..abf1b2a 100644 --- a/BasicComponents/POUs/Components/Analog/FB_AnalogInput.TcPOU +++ b/BasicComponents/Components/Analog/POUs/FB_AnalogInput.TcPOU @@ -3,19 +3,6 @@ + + + + + \ No newline at end of file diff --git a/BasicComponents/Components/AxisPTP/POUs/FB_AxisPTP.TcPOU b/BasicComponents/Components/AxisPTP/POUs/FB_AxisPTP.TcPOU new file mode 100644 index 0000000..e129bd4 --- /dev/null +++ b/BasicComponents/Components/AxisPTP/POUs/FB_AxisPTP.TcPOU @@ -0,0 +1,564 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BasicComponents/POUs/Components/Controller/FB_Limit.TcPOU b/BasicComponents/Components/Controller/POUs/FB_Limit.TcPOU similarity index 100% rename from BasicComponents/POUs/Components/Controller/FB_Limit.TcPOU rename to BasicComponents/Components/Controller/POUs/FB_Limit.TcPOU diff --git a/BasicComponents/POUs/Components/Controller/FB_PI.TcPOU b/BasicComponents/Components/Controller/POUs/FB_PI.TcPOU similarity index 100% rename from BasicComponents/POUs/Components/Controller/FB_PI.TcPOU rename to BasicComponents/Components/Controller/POUs/FB_PI.TcPOU diff --git a/BasicComponents/POUs/Components/Controller/FB_PID.TcPOU b/BasicComponents/Components/Controller/POUs/FB_PID.TcPOU similarity index 100% rename from BasicComponents/POUs/Components/Controller/FB_PID.TcPOU rename to BasicComponents/Components/Controller/POUs/FB_PID.TcPOU diff --git a/BasicComponents/POUs/Components/Controller/FB_RampGenerator.TcPOU b/BasicComponents/Components/Controller/POUs/FB_RampGenerator.TcPOU similarity index 100% rename from BasicComponents/POUs/Components/Controller/FB_RampGenerator.TcPOU rename to BasicComponents/Components/Controller/POUs/FB_RampGenerator.TcPOU diff --git a/BasicComponents/POUs/Components/EventListener/Types/E_EventType.TcDUT b/BasicComponents/Components/EventListener/DUTs/E_EventType.TcDUT similarity index 100% rename from BasicComponents/POUs/Components/EventListener/Types/E_EventType.TcDUT rename to BasicComponents/Components/EventListener/DUTs/E_EventType.TcDUT diff --git a/BasicComponents/POUs/Components/EventListener/Types/ST_BufferEventEntry.TcDUT b/BasicComponents/Components/EventListener/DUTs/ST_BufferEventEntry.TcDUT similarity index 100% rename from BasicComponents/POUs/Components/EventListener/Types/ST_BufferEventEntry.TcDUT rename to BasicComponents/Components/EventListener/DUTs/ST_BufferEventEntry.TcDUT diff --git a/BasicComponents/POUs/Components/EventListener/FB_EventListener.TcPOU b/BasicComponents/Components/EventListener/POUs/FB_EventListener.TcPOU similarity index 100% rename from BasicComponents/POUs/Components/EventListener/FB_EventListener.TcPOU rename to BasicComponents/Components/EventListener/POUs/FB_EventListener.TcPOU diff --git a/BasicComponents/POUs/Components/Motor/FB_MotorBecker.TcPOU b/BasicComponents/Components/Motor/FB_MotorBecker.TcPOU similarity index 100% rename from BasicComponents/POUs/Components/Motor/FB_MotorBecker.TcPOU rename to BasicComponents/Components/Motor/FB_MotorBecker.TcPOU diff --git a/BasicComponents/POUs/Components/Motor/Types/ST_MOTOR_BECKER_CONFIG.TcDUT b/BasicComponents/Components/Motor/Types/ST_MOTOR_BECKER_CONFIG.TcDUT similarity index 100% rename from BasicComponents/POUs/Components/Motor/Types/ST_MOTOR_BECKER_CONFIG.TcDUT rename to BasicComponents/Components/Motor/Types/ST_MOTOR_BECKER_CONFIG.TcDUT diff --git a/BasicComponents/POUs/Components/Utilities/FB_AlarmMessage.TcPOU b/BasicComponents/Components/Utilities/FB_AlarmMessage.TcPOU similarity index 100% rename from BasicComponents/POUs/Components/Utilities/FB_AlarmMessage.TcPOU rename to BasicComponents/Components/Utilities/FB_AlarmMessage.TcPOU diff --git a/BasicComponents/POUs/Components/Utilities/FB_Blinker.TcPOU b/BasicComponents/Components/Utilities/FB_Blinker.TcPOU similarity index 100% rename from BasicComponents/POUs/Components/Utilities/FB_Blinker.TcPOU rename to BasicComponents/Components/Utilities/FB_Blinker.TcPOU diff --git a/BasicComponents/POUs/Components/Utilities/FB_ReleaseSignal.TcPOU b/BasicComponents/Components/Utilities/FB_ReleaseSignal.TcPOU similarity index 100% rename from BasicComponents/POUs/Components/Utilities/FB_ReleaseSignal.TcPOU rename to BasicComponents/Components/Utilities/FB_ReleaseSignal.TcPOU diff --git a/BasicComponents/POUs/Components/Utilities/FC_HashFNV1a_32Bit.TcPOU b/BasicComponents/Components/Utilities/FC_HashFNV1a_32Bit.TcPOU similarity index 100% rename from BasicComponents/POUs/Components/Utilities/FC_HashFNV1a_32Bit.TcPOU rename to BasicComponents/Components/Utilities/FC_HashFNV1a_32Bit.TcPOU diff --git a/BasicComponents/POUs/Components/Utilities/F_GetTaskCycleTime.TcPOU b/BasicComponents/Components/Utilities/F_GetTaskCycleTime.TcPOU similarity index 100% rename from BasicComponents/POUs/Components/Utilities/F_GetTaskCycleTime.TcPOU rename to BasicComponents/Components/Utilities/F_GetTaskCycleTime.TcPOU diff --git a/BasicComponents/POUs/Components/Valves/Types/ST_ValveAnalogConfig.TcDUT b/BasicComponents/Components/Valves/DUTs/ST_ValveAnalogConfig.TcDUT similarity index 100% rename from BasicComponents/POUs/Components/Valves/Types/ST_ValveAnalogConfig.TcDUT rename to BasicComponents/Components/Valves/DUTs/ST_ValveAnalogConfig.TcDUT diff --git a/BasicComponents/Components/Valves/DUTs/ST_ValveAnalog_IO.TcDUT b/BasicComponents/Components/Valves/DUTs/ST_ValveAnalog_IO.TcDUT new file mode 100644 index 0000000..e7a5fa6 --- /dev/null +++ b/BasicComponents/Components/Valves/DUTs/ST_ValveAnalog_IO.TcDUT @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/BasicComponents/POUs/Components/Valves/Types/ST_ValveConfig.TcDUT b/BasicComponents/Components/Valves/DUTs/ST_ValveConfig.TcDUT similarity index 100% rename from BasicComponents/POUs/Components/Valves/Types/ST_ValveConfig.TcDUT rename to BasicComponents/Components/Valves/DUTs/ST_ValveConfig.TcDUT diff --git a/BasicComponents/Components/Valves/DUTs/ST_Valve_IO.TcDUT b/BasicComponents/Components/Valves/DUTs/ST_Valve_IO.TcDUT new file mode 100644 index 0000000..8f67b51 --- /dev/null +++ b/BasicComponents/Components/Valves/DUTs/ST_Valve_IO.TcDUT @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file diff --git a/BasicComponents/POUs/Components/Valves/FB_Valve.TcPOU b/BasicComponents/Components/Valves/POUs/FB_Valve.TcPOU similarity index 96% rename from BasicComponents/POUs/Components/Valves/FB_Valve.TcPOU rename to BasicComponents/Components/Valves/POUs/FB_Valve.TcPOU index 7360b4c..ef7271e 100644 --- a/BasicComponents/POUs/Components/Valves/FB_Valve.TcPOU +++ b/BasicComponents/Components/Valves/POUs/FB_Valve.TcPOU @@ -3,8 +3,7 @@ iSetpoint, xError => _xAnalogOutputError, + stIO := stIO.stAnalogOutputIO, stHMIInterface:= stHMIInterface.stSetpoint); IF _fbAnalogOutput.xError THEN @@ -250,10 +243,6 @@ ELSE END_IF _fbAnalogInput( - iAnalogValue:= iFeedbackValue, - xUnderrange:= _xHasUnderrangeFeedback AND xFeedbackUnderrange, - xOverrange:= _xHasOverrangeFeedback AND xFeedbackOverrange, - xErrorCard:= _xHasCardError AND xErrorCard, stAnalogIOConfig:= stValveConfig.stAnalogInputConfig, stAnalogEWConfig:= stValveConfig.stAnalogInputEWConfig, xReleaseErrors:= xReleaseErrors, @@ -267,7 +256,8 @@ _fbAnalogInput( xErrorLow=> , xWarningLow=> , xWarningHigh=> , - xErrorHigh=> ); + xErrorHigh=> , + stIO := stIO.stAnalogInputIO); IF _fbAnalogInput.xError THEN _xError := TRUE; @@ -279,8 +269,8 @@ END_IF // Handle open close feedback -_xIsOpen := (stValveConfig.xHasOpenFeedback AND xOpenFeedback AND (NOT xCloseFeedback)) OR ((NOT stValveConfig.xHasOpenFeedback) AND (_rCurrentValvePosition >= stValveConfig.rPVIsOpen)); -_xIsClosed := (stValveConfig.xHasClosedFeedback AND xCloseFeedback AND (NOT xOpenFeedback)) OR ((NOT stValveConfig.xHasClosedFeedback) AND (_rCurrentValvePosition <= stValveConfig.rPVIsOpen)); +_xIsOpen := (stValveConfig.xHasOpenFeedback AND stIO.i_xOpenFeedback AND (NOT stIO.i_xCloseFeedback)) OR ((NOT stValveConfig.xHasOpenFeedback) AND (_rCurrentValvePosition >= stValveConfig.rPVIsOpen)); +_xIsClosed := (stValveConfig.xHasClosedFeedback AND stIO.i_xCloseFeedback AND (NOT stIO.i_xOpenFeedback)) OR ((NOT stValveConfig.xHasClosedFeedback) AND (_rCurrentValvePosition <= stValveConfig.rPVIsOpen)); // Calculate target tolerance diff --git a/BasicComponents/DUTs/E_CmdResult.TcDUT b/BasicComponents/DUTs/E_CmdResult.TcDUT new file mode 100644 index 0000000..7e49151 --- /dev/null +++ b/BasicComponents/DUTs/E_CmdResult.TcDUT @@ -0,0 +1,24 @@ + + + + + + \ No newline at end of file diff --git a/BasicComponents/POUs/GVL/GVL_CONFIGS.TcGVL b/BasicComponents/GVLs/GVL_CONFIGS.TcGVL similarity index 100% rename from BasicComponents/POUs/GVL/GVL_CONFIGS.TcGVL rename to BasicComponents/GVLs/GVL_CONFIGS.TcGVL diff --git a/BasicComponents/POUs/Constants/GVL_TYPE_CONST.TcGVL b/BasicComponents/GVLs/GVL_TYPE_CONST.TcGVL similarity index 100% rename from BasicComponents/POUs/Constants/GVL_TYPE_CONST.TcGVL rename to BasicComponents/GVLs/GVL_TYPE_CONST.TcGVL diff --git a/BasicComponents/POUs/HMI/Datentypen/ST_HMI_ANALOG_MOTOR_DATA.TcDUT b/BasicComponents/HMI/Datentypen/ST_HMI_ANALOG_MOTOR_DATA.TcDUT similarity index 100% rename from BasicComponents/POUs/HMI/Datentypen/ST_HMI_ANALOG_MOTOR_DATA.TcDUT rename to BasicComponents/HMI/Datentypen/ST_HMI_ANALOG_MOTOR_DATA.TcDUT diff --git a/BasicComponents/POUs/HMI/Datentypen/ST_HMI_ANALOG_VALUE.TcDUT b/BasicComponents/HMI/Datentypen/ST_HMI_ANALOG_VALUE.TcDUT similarity index 100% rename from BasicComponents/POUs/HMI/Datentypen/ST_HMI_ANALOG_VALUE.TcDUT rename to BasicComponents/HMI/Datentypen/ST_HMI_ANALOG_VALUE.TcDUT diff --git a/BasicComponents/POUs/HMI/Datentypen/ST_HMI_ANALOG_VALVE_DATA.TcDUT b/BasicComponents/HMI/Datentypen/ST_HMI_ANALOG_VALVE_DATA.TcDUT similarity index 100% rename from BasicComponents/POUs/HMI/Datentypen/ST_HMI_ANALOG_VALVE_DATA.TcDUT rename to BasicComponents/HMI/Datentypen/ST_HMI_ANALOG_VALVE_DATA.TcDUT diff --git a/BasicComponents/POUs/HMI/Datentypen/ST_HMI_CONTROL_BUTTON.TcDUT b/BasicComponents/HMI/Datentypen/ST_HMI_CONTROL_BUTTON.TcDUT similarity index 100% rename from BasicComponents/POUs/HMI/Datentypen/ST_HMI_CONTROL_BUTTON.TcDUT rename to BasicComponents/HMI/Datentypen/ST_HMI_CONTROL_BUTTON.TcDUT diff --git a/BasicComponents/POUs/HMI/Datentypen/ST_HMI_INTEGER_VALUE.TcDUT b/BasicComponents/HMI/Datentypen/ST_HMI_INTEGER_VALUE.TcDUT similarity index 100% rename from BasicComponents/POUs/HMI/Datentypen/ST_HMI_INTEGER_VALUE.TcDUT rename to BasicComponents/HMI/Datentypen/ST_HMI_INTEGER_VALUE.TcDUT diff --git a/BasicComponents/POUs/HMI/Datentypen/ST_HMI_INTERLOCK.TcDUT b/BasicComponents/HMI/Datentypen/ST_HMI_INTERLOCK.TcDUT similarity index 100% rename from BasicComponents/POUs/HMI/Datentypen/ST_HMI_INTERLOCK.TcDUT rename to BasicComponents/HMI/Datentypen/ST_HMI_INTERLOCK.TcDUT diff --git a/BasicComponents/POUs/HMI/Datentypen/ST_HMI_VALVE_DATA.TcDUT b/BasicComponents/HMI/Datentypen/ST_HMI_VALVE_DATA.TcDUT similarity index 100% rename from BasicComponents/POUs/HMI/Datentypen/ST_HMI_VALVE_DATA.TcDUT rename to BasicComponents/HMI/Datentypen/ST_HMI_VALVE_DATA.TcDUT diff --git a/BasicComponents/POUs/HMI/Datentypen/T_INTERLOCK.TcDUT b/BasicComponents/HMI/Datentypen/T_INTERLOCK.TcDUT similarity index 100% rename from BasicComponents/POUs/HMI/Datentypen/T_INTERLOCK.TcDUT rename to BasicComponents/HMI/Datentypen/T_INTERLOCK.TcDUT diff --git a/BasicComponents/POUs/HMI/Enum/E_HMI_ANALOG_VALUE_STATUS.TcDUT b/BasicComponents/HMI/Enum/E_HMI_ANALOG_VALUE_STATUS.TcDUT similarity index 100% rename from BasicComponents/POUs/HMI/Enum/E_HMI_ANALOG_VALUE_STATUS.TcDUT rename to BasicComponents/HMI/Enum/E_HMI_ANALOG_VALUE_STATUS.TcDUT diff --git a/BasicComponents/POUs/HMI/Enum/E_HMI_BUTTON_FEEDBACK.TcDUT b/BasicComponents/HMI/Enum/E_HMI_BUTTON_FEEDBACK.TcDUT similarity index 100% rename from BasicComponents/POUs/HMI/Enum/E_HMI_BUTTON_FEEDBACK.TcDUT rename to BasicComponents/HMI/Enum/E_HMI_BUTTON_FEEDBACK.TcDUT diff --git a/BasicComponents/POUs/HMI/Enum/E_HMI_MODE.TcDUT b/BasicComponents/HMI/Enum/E_HMI_MODE.TcDUT similarity index 100% rename from BasicComponents/POUs/HMI/Enum/E_HMI_MODE.TcDUT rename to BasicComponents/HMI/Enum/E_HMI_MODE.TcDUT diff --git a/BasicComponents/POUs/HMI/Enum/E_HMI_MOTOR_STATUS.TcDUT b/BasicComponents/HMI/Enum/E_HMI_MOTOR_STATUS.TcDUT similarity index 100% rename from BasicComponents/POUs/HMI/Enum/E_HMI_MOTOR_STATUS.TcDUT rename to BasicComponents/HMI/Enum/E_HMI_MOTOR_STATUS.TcDUT diff --git a/BasicComponents/POUs/HMI/Enum/E_HMI_VALVE_STATUS.TcDUT b/BasicComponents/HMI/Enum/E_HMI_VALVE_STATUS.TcDUT similarity index 100% rename from BasicComponents/POUs/HMI/Enum/E_HMI_VALVE_STATUS.TcDUT rename to BasicComponents/HMI/Enum/E_HMI_VALVE_STATUS.TcDUT diff --git a/BasicComponents/POUs/Components/AxisPTP/FB_AxisPTP.TcPOU b/BasicComponents/POUs/Components/AxisPTP/FB_AxisPTP.TcPOU deleted file mode 100644 index 61f2d5d..0000000 --- a/BasicComponents/POUs/Components/AxisPTP/FB_AxisPTP.TcPOU +++ /dev/null @@ -1,599 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/BasicComponents/POUs/PRG_MAIN.TcPOU b/BasicComponents/PRG_MAIN.TcPOU similarity index 53% rename from BasicComponents/POUs/PRG_MAIN.TcPOU rename to BasicComponents/PRG_MAIN.TcPOU index 75b1bcd..a90dad3 100644 --- a/BasicComponents/POUs/PRG_MAIN.TcPOU +++ b/BasicComponents/PRG_MAIN.TcPOU @@ -4,20 +4,20 @@ _xError, rScaledValue=> ); @@ -179,13 +179,13 @@ _stAnalogEWConfig.stDelays := _stDelayConfig; // run analog input _fbAnalogInput( - iAnalogValue:= 1234, + i_iAnalogValue:= 1234, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, xReleaseLimitErrors := TRUE, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xInUnitTestMode := TRUE, xError=> _xError, rScaledValue=> ); @@ -229,12 +229,12 @@ _stAnalogEWConfig.stDelays := _stDelayConfig; // run analog input _fbAnalogInput( - iAnalogValue:= 1234, + i_iAnalogValue:= 1234, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xInUnitTestMode := TRUE, xError=> _xError, rScaledValue=> _rResult); @@ -281,12 +281,12 @@ _stAnalogEWConfig.stDelays := _stDelayConfig; // Check with active release signal _fbAI( - iAnalogValue:= 95, + i_iAnalogValue:= 95, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -304,10 +304,10 @@ AssertTrue(Condition:= _xResultErrorHigh, Message:= 'Error high is not active'); // Check without active release signal _fbAI( - iAnalogValue:= 95, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_iAnalogValue:= 95, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= FALSE, xError=> _xResultError, rScaledValue=> , @@ -365,12 +365,12 @@ _stAnalogEWConfig.stDelays := _stDelayConfig; IF NOT _xErrorHighOffInitDone THEN _xErrorHighOffInitDone := TRUE; _fbAIErrorHighOff( - iAnalogValue:= 95, + i_iAnalogValue:= 95, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -382,10 +382,10 @@ IF NOT _xErrorHighOffInitDone THEN ELSE _fbErrorHighOffTimer(IN := TRUE, PT := timOffTime); _fbAIErrorHighOff( - iAnalogValue:= 50, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_iAnalogValue:= 50, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -454,12 +454,12 @@ _fbErrorHighOnTimer(IN := TRUE, PT := timOnTime); // Check with active release signal _fbAIErrorHighOn( - iAnalogValue:= 95, + i_iAnalogValue:= 95, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -518,12 +518,12 @@ _stAnalogEWConfig.stDelays := _stDelayConfig; // Error low with release _fbAI( - iAnalogValue:= 0, + i_iAnalogValue:= 0, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -542,10 +542,10 @@ AssertFalse(Condition:= _xResultErrorHigh, Message:= 'Error high is active'); // Error low without release _fbAI( - iAnalogValue:= 0, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_iAnalogValue:= 0, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= FALSE, xError=> _xResultError, rScaledValue=> , @@ -602,12 +602,12 @@ _stAnalogEWConfig.stDelays := _stDelayConfig; IF NOT _xErrorLowOffInitDone THEN _xErrorLowOffInitDone := TRUE; _fbAIErrorLowOff( - iAnalogValue:= 5, + i_iAnalogValue:= 5, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -619,10 +619,10 @@ IF NOT _xErrorLowOffInitDone THEN ELSE _fbErrorLowOffTimer(IN := TRUE, PT := timOffTime); _fbAIErrorLowOff( - iAnalogValue:= 50, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_iAnalogValue:= 50, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -688,12 +688,12 @@ _fbErrorLowOnTimer(IN := TRUE, PT := timOnTime); // Check with active release signal _fbAIErrorLowOn( - iAnalogValue:= 5, + i_iAnalogValue:= 5, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -753,12 +753,12 @@ _stAnalogEWConfig.stDelays := _stDelayConfig; // run analog input _fbAnalogInput( - iAnalogValue:= 3071, // 0,75 * 4095 = 3071,25 + i_iAnalogValue:= 3071, // 0,75 * 4095 = 3071,25 stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xError=> , xInUnitTestMode := TRUE, rScaledValue=> _rResult); @@ -807,12 +807,12 @@ _stAnalogEWConfig.stDelays := _stDelayConfig; // run AI to check for overrange error _fbAI( - iAnalogValue:= 50, + i_iAnalogValue:= 50, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= FALSE, - xOverrange:= TRUE, - xErrorCard:= , + i_xUnderrange:= FALSE, + i_xOverrange:= TRUE, + i_xErrorCard:= , xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -866,12 +866,12 @@ IF NOT _xOverrangeOffInitDone THEN _xOverrangeOffInitDone := TRUE; // run AI to check for overrange error _fbAIOverrangeOff( - iAnalogValue:= 50, + i_iAnalogValue:= 50, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= FALSE, - xOverrange:= TRUE, - xErrorCard:= , + i_xUnderrange:= FALSE, + i_xOverrange:= TRUE, + i_xErrorCard:= , xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -884,12 +884,12 @@ END_IF // run AI cyclically until overrange error is supposed to be off _fbAIOverrangeOff( - iAnalogValue:= 50, + i_iAnalogValue:= 50, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= , + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= , xReleaseErrors := TRUE, xReleaseHardwareErrors := TRUE, xReleaseLimitErrors:= TRUE, @@ -945,12 +945,12 @@ _fbOverrangeOnTimer(IN := TRUE, PT := T#100MS); // run AI to check for overrange error _fbAIOverrangeOn( - iAnalogValue:= 50, + i_iAnalogValue:= 50, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= FALSE, - xOverrange:= TRUE, - xErrorCard:= , + i_xUnderrange:= FALSE, + i_xOverrange:= TRUE, + i_xErrorCard:= , xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -1003,12 +1003,12 @@ _stAnalogEWConfig.stDelays := _stDelayConfig; // run AI to check for underrange error _fbAI( - iAnalogValue:= 50, + i_iAnalogValue:= 50, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= TRUE, - xOverrange:= FALSE, - xErrorCard:= , + i_xUnderrange:= TRUE, + i_xOverrange:= FALSE, + i_xErrorCard:= , xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -1062,12 +1062,12 @@ IF NOT _xUnderrangeOffInitDone THEN _xUnderrangeOffInitDone := TRUE; // run AI to check for underrange error _fbAIUnderrangeOff( - iAnalogValue:= 50, + i_iAnalogValue:= 50, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= TRUE, - xOverrange:= FALSE, - xErrorCard:= , + i_xUnderrange:= TRUE, + i_xOverrange:= FALSE, + i_xErrorCard:= , xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -1080,12 +1080,12 @@ END_IF // run AI cyclically until underrange error is supposed to be off _fbAIUnderrangeOff( - iAnalogValue:= 0, + i_iAnalogValue:= 0, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= , + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= , xReleaseErrors := TRUE, xReleaseHardwareErrors := TRUE, xReleaseLimitErrors:= TRUE, @@ -1141,12 +1141,12 @@ _fbUnderrangeOnTimer(IN := TRUE, PT := T#100MS); // run AI to check for underrange error _fbAIUnderrangeOn( - iAnalogValue:= 50, + i_iAnalogValue:= 50, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= TRUE, - xOverrange:= FALSE, - xErrorCard:= , + i_xUnderrange:= TRUE, + i_xOverrange:= FALSE, + i_xErrorCard:= , xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -1200,12 +1200,12 @@ _stAnalogEWConfig.stDelays := _stDelayConfig; // Check with active release signal _fbAI( - iAnalogValue:= 85, + i_iAnalogValue:= 85, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -1224,10 +1224,10 @@ AssertFalse(Condition:= _xResultErrorHigh, Message:= 'Error high is active'); // Check without active release signal _fbAI( - iAnalogValue:= 85, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_iAnalogValue:= 85, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= FALSE, xError=> _xResultError, rScaledValue=> , @@ -1283,12 +1283,12 @@ _stAnalogEWConfig.stDelays := _stDelayConfig; IF NOT _xWarningHighOffInitDone THEN _xWarningHighOffInitDone := TRUE; _fbAIWarningHighOff( - iAnalogValue:= 85, + i_iAnalogValue:= 85, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -1300,10 +1300,10 @@ IF NOT _xWarningHighOffInitDone THEN ELSE _fbWarningHighOffTimer(IN := TRUE, PT := timOffTime); _fbAIWarningHighOff( - iAnalogValue:= 50, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_iAnalogValue:= 50, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -1369,12 +1369,12 @@ _fbWarningHighOnTimer(IN := TRUE, PT := timOnTime); // Check with active release signal _fbAIWarningHighOn( - iAnalogValue:= 85, + i_iAnalogValue:= 85, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -1433,12 +1433,12 @@ _stAnalogEWConfig.stDelays := _stDelayConfig; // Warning low with release _fbAI( - iAnalogValue:= 15, + i_iAnalogValue:= 15, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -1457,10 +1457,10 @@ AssertFalse(Condition:= _xResultErrorHigh, Message:= 'Error high is active'); // Warning low without release _fbAI( - iAnalogValue:= 15, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_iAnalogValue:= 15, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= FALSE, xError=> _xResultError, rScaledValue=> , @@ -1517,12 +1517,12 @@ _stAnalogEWConfig.stDelays := _stDelayConfig; IF NOT _xWarningLowOffInitDone THEN _xWarningLowOffInitDone := TRUE; _fbAIWarningLowOff( - iAnalogValue:= 15, + i_iAnalogValue:= 15, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -1534,10 +1534,10 @@ IF NOT _xWarningLowOffInitDone THEN ELSE _fbWarningLowOffTimer(IN := TRUE, PT := timOffTime); _fbAIWarningLowOff( - iAnalogValue:= 50, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_iAnalogValue:= 50, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , @@ -1603,12 +1603,12 @@ _fbWarningLowOnTimer(IN := TRUE, PT := timOnTime); // Check with active release signal _fbAIWarningLowOn( - iAnalogValue:= 15, + i_iAnalogValue:= 15, stAnalogIOConfig := _stAnalogInputConfig, stAnalogEWConfig := _stAnalogEWConfig, - xUnderrange:= FALSE, - xOverrange:= FALSE, - xErrorCard:= FALSE, + i_xUnderrange:= FALSE, + i_xOverrange:= FALSE, + i_xErrorCard:= FALSE, xReleaseLimitErrors:= TRUE, xError=> _xResultError, rScaledValue=> , diff --git a/BasicComponents/POUs/Unittests/AOTests/FB_AnalogOutputTest.TcPOU b/BasicComponents/Unittests/AOTests/FB_AnalogOutputTest.TcPOU similarity index 96% rename from BasicComponents/POUs/Unittests/AOTests/FB_AnalogOutputTest.TcPOU rename to BasicComponents/Unittests/AOTests/FB_AnalogOutputTest.TcPOU index 3098565..a98217a 100644 --- a/BasicComponents/POUs/Unittests/AOTests/FB_AnalogOutputTest.TcPOU +++ b/BasicComponents/Unittests/AOTests/FB_AnalogOutputTest.TcPOU @@ -63,7 +63,7 @@ _fbAnalogOutput( xReleaseErrors := , xConfirmAlarms := , stHMIInterface := _stHMIInterface, - iAnalogValue => _iAnalogOutput, + o_iAnalogValue => _iAnalogOutput, xError => _xError, xInUnitTestMode := TRUE); @@ -112,7 +112,7 @@ _fbAnalogOutput( xReleaseErrors := , xConfirmAlarms := , stHMIInterface := _stHMIInterface, - iAnalogValue => _iAnalogOutput, + o_iAnalogValue => _iAnalogOutput, xError => _xError, xInUnitTestMode := TRUE); @@ -170,7 +170,7 @@ _fbAnalogOutput( xReleaseErrors := , xConfirmAlarms := , stHMIInterface := _stHMIInterface, - iAnalogValue => _iAnalogOutput, + o_iAnalogValue => _iAnalogOutput, xError => _xError, xInUnitTestMode := TRUE); @@ -198,7 +198,7 @@ _fbAnalogOutput( xReleaseErrors := , xConfirmAlarms := , stHMIInterface := _stHMIInterface, - iAnalogValue => _iAnalogOutput, + o_iAnalogValue => _iAnalogOutput, xError => _xError); // reading error from HMI interface @@ -251,7 +251,7 @@ _fbAnalogOutput( xReleaseErrors := , xConfirmAlarms := , stHMIInterface := _stHMIInterface, - iAnalogValue => _iAnalogOutput, + o_iAnalogValue => _iAnalogOutput, xError => _xError, xInUnitTestMode := TRUE); @@ -266,7 +266,7 @@ _fbAnalogOutput( xReleaseErrors := , xConfirmAlarms := , stHMIInterface := _stHMIInterface, - iAnalogValue => _iAnalogOutput, + o_iAnalogValue => _iAnalogOutput, xError => _xError); // and evaluate result @@ -280,7 +280,7 @@ _fbAnalogOutput( xReleaseErrors := , xConfirmAlarms := , stHMIInterface := _stHMIInterface, - iAnalogValue => _iAnalogOutput, + o_iAnalogValue => _iAnalogOutput, xError => _xError); // and evaluate result @@ -294,7 +294,7 @@ _fbAnalogOutput( xReleaseErrors := , xConfirmAlarms := , stHMIInterface := _stHMIInterface, - iAnalogValue => _iAnalogOutput, + o_iAnalogValue => _iAnalogOutput, xError => _xError); // and evaluate result @@ -308,7 +308,7 @@ _fbAnalogOutput( xReleaseErrors := , xConfirmAlarms := , stHMIInterface := _stHMIInterface, - iAnalogValue => _iAnalogOutput, + o_iAnalogValue => _iAnalogOutput, xError => _xError); // and evaluate result @@ -359,7 +359,7 @@ _fbAnalogOutput( xReleaseErrors := , xConfirmAlarms := , stHMIInterface := _stHMIInterface, - iAnalogValue => _iAnalogOutput, + o_iAnalogValue => _iAnalogOutput, xError => _xError, xInUnitTestMode := TRUE); @@ -410,7 +410,7 @@ _fbAnalogOutput( xReleaseErrors := , xConfirmAlarms := , stHMIInterface := _stHMIInterface, - iAnalogValue => _iAnalogOutput, + o_iAnalogValue => _iAnalogOutput, xError => _xError, xInUnitTestMode := TRUE); @@ -454,7 +454,7 @@ _fbAnalogOutput( xReleaseErrors := , xConfirmAlarms := , stHMIInterface := _stHMIInterface, - iAnalogValue => _iAnalogOutput, + o_iAnalogValue => _iAnalogOutput, xError => _xError, xInUnitTestMode := TRUE); diff --git a/BasicComponents/POUs/Unittests/AnalogValveTests/FB_ValveAnalog_Test.TcPOU b/BasicComponents/Unittests/AnalogValveTests/FB_ValveAnalog_Test.TcPOU similarity index 93% rename from BasicComponents/POUs/Unittests/AnalogValveTests/FB_ValveAnalog_Test.TcPOU rename to BasicComponents/Unittests/AnalogValveTests/FB_ValveAnalog_Test.TcPOU index 44cd6fe..00f6ad6 100644 --- a/BasicComponents/POUs/Unittests/AnalogValveTests/FB_ValveAnalog_Test.TcPOU +++ b/BasicComponents/Unittests/AnalogValveTests/FB_ValveAnalog_Test.TcPOU @@ -63,7 +63,7 @@ _fbValve.ReqAutomaticMode(); _fbValve.rSPAutomatic := 100; // needs one cycle to write values (scaled feedback ~75, tolerance 95 to 105) -_fbValve(xAutomaticOpen := TRUE, stValveConfig := _stValveConfig, stHMIInterface := _stHMIValve, iFeedbackValue := 3000, xError => _xError, xInUnitTestMode := TRUE); +_fbValve(xAutomaticOpen := TRUE, stValveConfig := _stValveConfig, stHMIInterface := _stHMIValve, i_iFeedbackValue := 3000, xError => _xError, xInUnitTestMode := TRUE); // assert result AssertTrue(_xError, 'Expected NotInRangeError, got no error.'); @@ -102,7 +102,7 @@ _xOpenFeedback := FALSE; _xCloseFeedback := FALSE; _fbValve.xReleaseManualMode := TRUE; _fbValve.ReqManualMode(); -_fbValve(xOpenFeedback := _xOpenFeedback, xCloseFeedback := _xCloseFeedback, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig, xInUnitTestMode := TRUE); +_fbValve(i_xOpenFeedback := _xOpenFeedback, i_xCloseFeedback := _xCloseFeedback, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig, xInUnitTestMode := TRUE); // We should now be in manual mode @@ -112,7 +112,7 @@ AssertTrue(Condition := _fbValve.IsInManualMode, Message := 'Valve did not chang // Test closed _xOpenFeedback := FALSE; _xCloseFeedback := TRUE; -_fbValve(xOpenFeedback := _xOpenFeedback, xCloseFeedback := _xCloseFeedback, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig, xInUnitTestMode := TRUE); +_fbValve(i_xOpenFeedback := _xOpenFeedback, i_xCloseFeedback := _xCloseFeedback, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig, xInUnitTestMode := TRUE); AssertTrue(Condition := _fbValve.IsClosed, Message := 'Valve should be closed'); AssertFalse(Condition := _fbValve.IsOpen, Message := 'Valve should not be open'); @@ -120,14 +120,14 @@ AssertFalse(Condition := _fbValve.IsOpen, Message := 'Valve should not be open') _xOpenFeedback := TRUE; _xCloseFeedback := FALSE; _stHMIValve.stSetpoint.rValue := 100.0; -_fbValve(xOpenFeedback := _xOpenFeedback, xCloseFeedback := _xCloseFeedback, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig, xInUnitTestMode := TRUE); +_fbValve(i_xOpenFeedback := _xOpenFeedback, i_xCloseFeedback := _xCloseFeedback, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig, xInUnitTestMode := TRUE); AssertTrue(Condition := _fbValve.IsOpen, Message := 'Valve should be open'); AssertFalse(Condition := _fbValve.IsClosed, Message := 'Valve should not be closed'); // Test open and close _xOpenFeedback := TRUE; _xCloseFeedback := TRUE; -_fbValve(xOpenFeedback := _xOpenFeedback, xCloseFeedback := _xCloseFeedback, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig, xInUnitTestMode := TRUE); +_fbValve(i_xOpenFeedback := _xOpenFeedback, i_xCloseFeedback := _xCloseFeedback, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig, xInUnitTestMode := TRUE); AssertFalse(Condition := _fbValve.IsClosed OR _fbValve.IsOpen, Message := 'Valve should not signal open or closed with both feedback signals high'); TEST_FINISHED();]]> @@ -161,7 +161,7 @@ _stValveConfig.xHasAnalogFeedback := TRUE; _fbValve( stValveConfig := _stValveConfig, stHMIInterface := _stHMIValve, - xFeedbackOverrange := TRUE, + i_xFeedbackOverrange := TRUE, xError => _xError, xInUnitTestMode := TRUE); @@ -199,7 +199,7 @@ _stValveConfig.xHasAnalogFeedback := TRUE; _fbValve( stValveConfig := _stValveConfig, stHMIInterface := _stHMIValve, - xFeedbackUnderrange := TRUE, + i_xFeedbackUnderrange := TRUE, xError => _xError, xInUnitTestMode := TRUE); @@ -487,7 +487,7 @@ IF _fbValve.IsOpen THEN // Valve should now be closed AssertFalse(Condition := _fbValve.IsOpen, Message := 'Valve should not be open with active Interlock'); AssertTrue(Condition := _fbValve.IsClosed, Message := 'Close output not active with active Interlock'); - AssertEquals_INT(Expected := 0, Actual := _fbValve.iSetpoint, Message := 'Analog output should be zero'); + AssertEquals_INT(Expected := 0, Actual := _fbValve.o_iSetpoint, Message := 'Analog output should be zero'); ELSE AssertTrue(Condition := _fbValve.IsOpen, Message := 'Valve did not open before the test'); END_IF @@ -535,7 +535,7 @@ IF _fbValve.IsOpen THEN // Valve should now be closed AssertFalse(Condition := _fbValve.IsOpen, Message := 'Valve should not be open with active Interlock'); AssertTrue(Condition := _fbValve.IsClosed, Message := 'Close output not active with active Interlock'); - AssertEquals_INT(Expected := 0, Actual := _fbValve.iSetpoint, Message := 'Analog output should be zero'); + AssertEquals_INT(Expected := 0, Actual := _fbValve.o_iSetpoint, Message := 'Analog output should be zero'); ELSE AssertTrue(Condition := _fbValve.IsOpen, Message := 'Valve did not open before the test'); END_IF diff --git a/BasicComponents/POUs/Unittests/ReleaseSignalTests/FB_ReleaseSignalTest.TcPOU b/BasicComponents/Unittests/ReleaseSignalTests/FB_ReleaseSignalTest.TcPOU similarity index 100% rename from BasicComponents/POUs/Unittests/ReleaseSignalTests/FB_ReleaseSignalTest.TcPOU rename to BasicComponents/Unittests/ReleaseSignalTests/FB_ReleaseSignalTest.TcPOU diff --git a/BasicComponents/POUs/Unittests/UtilitiesTests/FB_BlinkerTest.TcPOU b/BasicComponents/Unittests/UtilitiesTests/FB_BlinkerTest.TcPOU similarity index 100% rename from BasicComponents/POUs/Unittests/UtilitiesTests/FB_BlinkerTest.TcPOU rename to BasicComponents/Unittests/UtilitiesTests/FB_BlinkerTest.TcPOU diff --git a/BasicComponents/POUs/Unittests/UtilitiesTests/FB_HashFNV1a_32BitTest.TcPOU b/BasicComponents/Unittests/UtilitiesTests/FB_HashFNV1a_32BitTest.TcPOU similarity index 100% rename from BasicComponents/POUs/Unittests/UtilitiesTests/FB_HashFNV1a_32BitTest.TcPOU rename to BasicComponents/Unittests/UtilitiesTests/FB_HashFNV1a_32BitTest.TcPOU diff --git a/BasicComponents/POUs/Unittests/UtilitiesTests/FB_PT1Test.TcPOU b/BasicComponents/Unittests/UtilitiesTests/FB_PT1Test.TcPOU similarity index 100% rename from BasicComponents/POUs/Unittests/UtilitiesTests/FB_PT1Test.TcPOU rename to BasicComponents/Unittests/UtilitiesTests/FB_PT1Test.TcPOU diff --git a/BasicComponents/POUs/Unittests/UtilitiesTests/FB_RampGeneratorTest.TcPOU b/BasicComponents/Unittests/UtilitiesTests/FB_RampGeneratorTest.TcPOU similarity index 100% rename from BasicComponents/POUs/Unittests/UtilitiesTests/FB_RampGeneratorTest.TcPOU rename to BasicComponents/Unittests/UtilitiesTests/FB_RampGeneratorTest.TcPOU diff --git a/BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestHMI.TcPOU b/BasicComponents/Unittests/ValveTests/FB_ValveTestHMI.TcPOU similarity index 88% rename from BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestHMI.TcPOU rename to BasicComponents/Unittests/ValveTests/FB_ValveTestHMI.TcPOU index 356cc0a..4d0d771 100644 --- a/BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestHMI.TcPOU +++ b/BasicComponents/Unittests/ValveTests/FB_ValveTestHMI.TcPOU @@ -46,13 +46,13 @@ _fbValve( wProcessINTLKUsed:= _wInterlocksUsed, stHMIInterface:= _stHMIValve, xError=> , - xOpenFeedback:= , - xCloseFeedback:= , + i_xOpenFeedback:= , + i_xCloseFeedback:= , xReleaseErrors:= , xConfirmAlarms:= , stValveConfig:= _stValveConfig, - xOpenValve=> , - xCloseValve=> ); + o_xOpenValve=> , + o_xCloseValve=> ); // Valve should now be in manual mode and xRequest should have been reset AssertTrue(Condition := _fbValve.IsInManualMode, Message := 'Valve did not change to manual mode'); @@ -90,13 +90,13 @@ _fbValve( wProcessINTLKUsed:= _wInterlocksUsed, stHMIInterface:= _stHMIValve, xError=> , - xOpenFeedback:= , - xCloseFeedback:= , + i_xOpenFeedback:= , + i_xCloseFeedback:= , xReleaseErrors:= , xConfirmAlarms:= , stValveConfig:= _stValveConfig, - xOpenValve=> , - xCloseValve=> ); + o_xOpenValve=> , + o_xCloseValve=> ); AssertFalse(Condition := _stHMIValve.stManualButton.xRelease, Message := 'Manual mode button was released but should not have been'); @@ -108,13 +108,13 @@ _fbValve( wProcessINTLKUsed:= _wInterlocksUsed, stHMIInterface:= _stHMIValve, xError=> , - xOpenFeedback:= , - xCloseFeedback:= , + i_xOpenFeedback:= , + i_xCloseFeedback:= , xReleaseErrors:= , xConfirmAlarms:= , stValveConfig:= , - xOpenValve=> , - xCloseValve=> ); + o_xOpenValve=> , + o_xCloseValve=> ); AssertTrue(Condition := _stHMIValve.stManualButton.xRelease, Message := 'Manual mode button was not released but should have been'); @@ -151,13 +151,13 @@ _fbValveOC( wProcessINTLKUsed:= _wInterlocksUsed, stHMIInterface:= _stHMIValve, xError=> , - xOpenFeedback:= , - xCloseFeedback:= , + i_xOpenFeedback:= , + i_xCloseFeedback:= , xReleaseErrors:= , xConfirmAlarms:= , stValveConfig:= _stValveConfig, - xOpenValve=> , - xCloseValve=> ); + o_xOpenValve=> , + o_xCloseValve=> ); // Valve should now be in manual mode AssertTrue(Condition := _fbValveOC.IsInManualMode, Message := 'Valve did not change to manual mode pre test'); @@ -170,16 +170,16 @@ _fbValveOC( wProcessINTLKUsed:= _wInterlocksUsed, stHMIInterface:= _stHMIValve, xError=> , - xOpenFeedback:= , - xCloseFeedback:= , + i_xOpenFeedback:= , + i_xCloseFeedback:= , xReleaseErrors:= , xConfirmAlarms:= , stValveConfig:= , - xOpenValve=> , - xCloseValve=> ); + o_xOpenValve=> , + o_xCloseValve=> ); // test for valve state and HMI feedback -AssertTrue(Condition := _fbValveOC.xOpenValve, Message := 'Valve did not open as requested by hmi button'); +AssertTrue(Condition := _fbValveOC.o_xOpenValve, Message := 'Valve did not open as requested by hmi button'); AssertFalse(Condition := _stHMIValve.stOpenButton.xRequest, Message := 'Valve did not reset open request'); _eExpectedOpenButtonFeedback := E_HMI_BUTTON_FEEDBACK.ACTIVE; _eExpectedCloseButtonFeedback := E_HMI_BUTTON_FEEDBACK.NONE; @@ -194,16 +194,16 @@ _fbValveOC( wProcessINTLKUsed:= _wInterlocksUsed, stHMIInterface:= _stHMIValve, xError=> , - xOpenFeedback:= , - xCloseFeedback:= , + i_xOpenFeedback:= , + i_xCloseFeedback:= , xReleaseErrors:= , xConfirmAlarms:= , stValveConfig:= , - xOpenValve=> , - xCloseValve=> ); + o_xOpenValve=> , + o_xCloseValve=> ); // test for valve state and HMI feedback -AssertTrue(Condition := _fbValveOC.xCloseValve, Message := 'Valve did not close as requested by hmi button'); +AssertTrue(Condition := _fbValveOC.o_xCloseValve, Message := 'Valve did not close as requested by hmi button'); AssertFalse(Condition := _stHMIValve.stCloseButton.xRequest, Message := 'Valve did not reset close request'); _eExpectedOpenButtonFeedback := E_HMI_BUTTON_FEEDBACK.NONE; _eExpectedCloseButtonFeedback := E_HMI_BUTTON_FEEDBACK.ACTIVE; @@ -243,13 +243,13 @@ _fbValve( wProcessINTLKUsed:= wInterlocksUsed, stHMIInterface:= _stHMIValve, xError=> , - xOpenFeedback:= , - xCloseFeedback:= , + i_xOpenFeedback:= , + i_xCloseFeedback:= , xReleaseErrors:= , xConfirmAlarms:= , stValveConfig:= _stValveConfig, - xOpenValve=> , - xCloseValve=> ); + o_xOpenValve=> , + o_xCloseValve=> ); // Valve should now be in manual mode AssertTrue(Condition := _fbValve.IsInManualMode, Message := 'Valve did not change to manual mode pre test'); @@ -265,15 +265,15 @@ _fbValve( wProcessINTLKUsed:= wInterlocksUsed, stHMIInterface:= _stHMIValve, xError=> , - xOpenFeedback:= , - xCloseFeedback:= , + i_xOpenFeedback:= , + i_xCloseFeedback:= , xReleaseErrors:= , xConfirmAlarms:= , stValveConfig:= , - xOpenValve=> , - xCloseValve=> ); + o_xOpenValve=> , + o_xCloseValve=> ); -AssertFalse(Condition := _fbValve.xOpenValve, Message := 'Valve did not block manual open command with active interlock'); +AssertFalse(Condition := _fbValve.o_xOpenValve, Message := 'Valve did not block manual open command with active interlock'); TEST_FINISHED();]]> diff --git a/BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTimoutClose.TcPOU b/BasicComponents/Unittests/ValveTests/FB_ValveTestTimoutClose.TcPOU similarity index 89% rename from BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTimoutClose.TcPOU rename to BasicComponents/Unittests/ValveTests/FB_ValveTestTimoutClose.TcPOU index b0e27bf..b0bd758 100644 --- a/BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTimoutClose.TcPOU +++ b/BasicComponents/Unittests/ValveTests/FB_ValveTestTimoutClose.TcPOU @@ -48,8 +48,8 @@ CASE _iState OF 10: // set close feedback after 50ms and call valve block _xOpenFeedback := FALSE; - _xCloseFeedback := _fbValveTimeout.xCloseValve AND _fbDelayFeedbackSignalTimer.Q; - _fbValveTimeout(xOpenFeedback := _xOpenFeedback, xCloseFeedback := _xCloseFeedback, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig); + _xCloseFeedback := _fbValveTimeout.o_xCloseValve AND _fbDelayFeedbackSignalTimer.Q; + _fbValveTimeout(i_xOpenFeedback := _xOpenFeedback, i_xCloseFeedback := _xCloseFeedback, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig); // test timeout after 200ms IF _fbTimeoutCloseTestTimer.Q THEN diff --git a/BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTimoutOpen.TcPOU b/BasicComponents/Unittests/ValveTests/FB_ValveTestTimoutOpen.TcPOU similarity index 89% rename from BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTimoutOpen.TcPOU rename to BasicComponents/Unittests/ValveTests/FB_ValveTestTimoutOpen.TcPOU index 502ee48..b72fc3b 100644 --- a/BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTimoutOpen.TcPOU +++ b/BasicComponents/Unittests/ValveTests/FB_ValveTestTimoutOpen.TcPOU @@ -48,9 +48,9 @@ CASE _iState OF 10: // set open feedback after 50ms and call valve block - _xOpenFeedback := _fbValveTimeout.xOpenValve AND _fbDelayFeedbackSignalTimer.Q; + _xOpenFeedback := _fbValveTimeout.o_xOpenValve AND _fbDelayFeedbackSignalTimer.Q; _xCloseFeedback := FALSE; - _fbValveTimeout(xOpenFeedback := _xOpenFeedback, xCloseFeedback := _xCloseFeedback, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig); + _fbValveTimeout(i_xOpenFeedback := _xOpenFeedback, i_xCloseFeedback := _xCloseFeedback, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig); // test timeout after 200ms IF _fbTimeoutOpenTestTimer.Q THEN diff --git a/BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTriggerTimoutClose.TcPOU b/BasicComponents/Unittests/ValveTests/FB_ValveTestTriggerTimoutClose.TcPOU similarity index 92% rename from BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTriggerTimoutClose.TcPOU rename to BasicComponents/Unittests/ValveTests/FB_ValveTestTriggerTimoutClose.TcPOU index 1ef858b..20d0afe 100644 --- a/BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTriggerTimoutClose.TcPOU +++ b/BasicComponents/Unittests/ValveTests/FB_ValveTestTriggerTimoutClose.TcPOU @@ -50,7 +50,7 @@ CASE _iState OF // both feedback false and call valve block _xOpenFeedback := FALSE; _xCloseFeedback := FALSE; - _fbValveTimeout(xOpenFeedback := _xOpenFeedback, xCloseFeedback := _xCloseFeedback, xInUnitTestMode := TRUE, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig); + _fbValveTimeout(i_xOpenFeedback := _xOpenFeedback, i_xCloseFeedback := _xCloseFeedback, xInUnitTestMode := TRUE, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig); // test timeout after 200ms IF _fbTimeoutCloseTestTimer.Q THEN diff --git a/BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTriggerTimoutOpen.TcPOU b/BasicComponents/Unittests/ValveTests/FB_ValveTestTriggerTimoutOpen.TcPOU similarity index 92% rename from BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTriggerTimoutOpen.TcPOU rename to BasicComponents/Unittests/ValveTests/FB_ValveTestTriggerTimoutOpen.TcPOU index 2dd502d..d793682 100644 --- a/BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTriggerTimoutOpen.TcPOU +++ b/BasicComponents/Unittests/ValveTests/FB_ValveTestTriggerTimoutOpen.TcPOU @@ -51,7 +51,7 @@ CASE _iState OF // both feedback false and call valve block _xOpenFeedback := FALSE; _xCloseFeedback := FALSE; - _fbValveTimeout(xOpenFeedback := _xOpenFeedback, xCloseFeedback := _xCloseFeedback, xInUnitTestMode := TRUE, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig); + _fbValveTimeout(i_xOpenFeedback := _xOpenFeedback, i_xCloseFeedback := _xCloseFeedback, xInUnitTestMode := TRUE, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig); // test timeout after 200ms IF _fbTimeoutOpenTestTimer.Q THEN diff --git a/BasicComponents/POUs/Unittests/ValveTests/FB_Valve_Test.TcPOU b/BasicComponents/Unittests/ValveTests/FB_Valve_Test.TcPOU similarity index 88% rename from BasicComponents/POUs/Unittests/ValveTests/FB_Valve_Test.TcPOU rename to BasicComponents/Unittests/ValveTests/FB_Valve_Test.TcPOU index 3979e99..17fd003 100644 --- a/BasicComponents/POUs/Unittests/ValveTests/FB_Valve_Test.TcPOU +++ b/BasicComponents/Unittests/ValveTests/FB_Valve_Test.TcPOU @@ -53,7 +53,7 @@ _xOpenFeedback := FALSE; _xCloseFeedback := FALSE; _fbValve.xReleaseManualMode := TRUE; _fbValve.ReqManualMode(); -_fbValve(xOpenFeedback := _xOpenFeedback, xCloseFeedback := _xCloseFeedback, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig, xInUnitTestMode := TRUE); +_fbValve(i_xOpenFeedback := _xOpenFeedback, i_xCloseFeedback := _xCloseFeedback, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig, xInUnitTestMode := TRUE); // We should now be in manual mode AssertTrue(Condition := _fbValve.IsInManualMode, Message := 'Valve did not changed to manual mode'); @@ -65,7 +65,7 @@ AssertFalse(Condition := _fbValve.IsClosed OR _fbValve.IsOpen, Message := 'Valve // Test closed _xOpenFeedback := FALSE; _xCloseFeedback := TRUE; -_fbValve(xOpenFeedback := _xOpenFeedback, xCloseFeedback := _xCloseFeedback,stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig, xInUnitTestMode := TRUE); +_fbValve(i_xOpenFeedback := _xOpenFeedback, i_xCloseFeedback := _xCloseFeedback,stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig, xInUnitTestMode := TRUE); AssertTrue(Condition := _fbValve.IsClosed, Message := 'Valve should be closed'); AssertFalse(Condition := _fbValve.IsOpen, Message := 'Valve should not be open'); @@ -74,14 +74,14 @@ _xOpenFeedback := TRUE; _xCloseFeedback := FALSE; _stHMIValve.stOpenButton.xRequest := TRUE; _fbValve(stHMIInterface := _stHMIValve); -_fbValve(xOpenFeedback := _xOpenFeedback, xCloseFeedback := _xCloseFeedback, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig, xInUnitTestMode := TRUE); +_fbValve(i_xOpenFeedback := _xOpenFeedback, i_xCloseFeedback := _xCloseFeedback, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig, xInUnitTestMode := TRUE); AssertTrue(Condition := _fbValve.IsOpen, Message := 'Valve should be open'); AssertFalse(Condition := _fbValve.IsClosed, Message := 'Valve should not be closed'); // Test open and close _xOpenFeedback := TRUE; _xCloseFeedback := TRUE; -_fbValve(xOpenFeedback := _xOpenFeedback, xCloseFeedback := _xCloseFeedback, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig, xInUnitTestMode := TRUE); +_fbValve(i_xOpenFeedback := _xOpenFeedback, i_xCloseFeedback := _xCloseFeedback, stHMIInterface := _stHMIValve, stValveConfig := _stValveConfig, xInUnitTestMode := TRUE); AssertFalse(Condition := _fbValve.IsClosed OR _fbValve.IsOpen, Message := 'Valve should not signal open or closed with both feedback signals high'); TEST_FINISHED();]]> @@ -347,16 +347,16 @@ IF _fbValve.IsOpen THEN _fbValve(wProcessINTLK := _wInterlocks, wProcessINTLKUsed := _wInterlocksUsed, stHMIInterface := _stHMIValve); // Valve should now be closed - AssertFalse(Condition := _fbValve.xOpenValve, Message := 'Valve should not be open with active Interlock'); - AssertTrue(Condition := _fbValve.xCloseValve, Message := 'Close output not active with active Interlock'); + AssertFalse(Condition := _fbValve.o_xOpenValve, Message := 'Valve should not be open with active Interlock'); + AssertTrue(Condition := _fbValve.o_xCloseValve, Message := 'Close output not active with active Interlock'); // Test the same with open valve when interlock active _stValveConfig.xNormallyOpen := TRUE; _fbValve(stValveConfig := _stValveConfig, wProcessINTLK := _wInterlocks, wProcessINTLKUsed := _wInterlocksUsed, stHMIInterface := _stHMIValve); // Valve should now be open - AssertTrue(Condition := _fbValve.xOpenValve, Message := 'Valve should be open with active Interlock and inverted config'); - AssertFalse(Condition := _fbValve.xCloseValve, Message := 'Close output active with active Interlock and inverted config'); + AssertTrue(Condition := _fbValve.o_xOpenValve, Message := 'Valve should be open with active Interlock and inverted config'); + AssertFalse(Condition := _fbValve.o_xCloseValve, Message := 'Close output active with active Interlock and inverted config'); ELSE AssertTrue(Condition := _fbValve.IsOpen, Message := 'Valve did not open before the test'); END_IF @@ -405,16 +405,16 @@ IF _fbValve.IsOpen THEN _fbValve(wProcessINTLK := _wInterlocks, wProcessINTLKUsed := _wInterlocksUsed, stHMIInterface := _stHMIValve); // Valve should now be closed - AssertFalse(Condition := _fbValve.xOpenValve, Message := 'Valve should not be open with active Interlock'); - AssertTrue(Condition := _fbValve.xCloseValve, Message := 'Close output not active with active Interlock'); + AssertFalse(Condition := _fbValve.o_xOpenValve, Message := 'Valve should not be open with active Interlock'); + AssertTrue(Condition := _fbValve.o_xCloseValve, Message := 'Close output not active with active Interlock'); // Test the same with open valve when interlock active _stValveConfig.xNormallyOpen := TRUE; _fbValve(stValveConfig := _stValveConfig, wProcessINTLK := _wInterlocks, wProcessINTLKUsed := _wInterlocksUsed, stHMIInterface := _stHMIValve); // Valve should now be open - AssertTrue(Condition := _fbValve.xOpenValve, Message := 'Valve should be open with active Interlock and inverted config'); - AssertFalse(Condition := _fbValve.xCloseValve, Message := 'Close output active with active Interlock and inverted config'); + AssertTrue(Condition := _fbValve.o_xOpenValve, Message := 'Valve should be open with active Interlock and inverted config'); + AssertFalse(Condition := _fbValve.o_xCloseValve, Message := 'Close output active with active Interlock and inverted config'); AssertTrue(Condition := _stHMIValve.stOpenButton.eFeedback = E_HMI_BUTTON_FEEDBACK.ACTIVE, Message := 'Open button should be set active with active Interlock and inverted config'); ELSE AssertTrue(Condition := _fbValve.IsOpen, Message := 'Valve did not open before the test');