diff --git a/BaseComponents.tsproj b/BaseComponents.tsproj index 1af1e57..479ff0e 100644 --- a/BaseComponents.tsproj +++ b/BaseComponents.tsproj @@ -116,12 +116,13 @@ - + - + {9FD32FC8-0CF9-4C5B-95FB-F35423496A77} + @@ -129,11 +130,14 @@ PlcTask + + + - - - PLC Instance + + + BasicComponents Instance {08500001-0000-0000-F000-000000000064} PlcTask Outputs @@ -190,46 +194,6 @@ PlcTask Inputs - - 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 - PRG_MAIN._fbAnalogInputTest._fbAIErrorLowOn.iAnalogValue @@ -482,6 +446,46 @@ EL30xx also sets this if an underrange or overrange error is present]]> 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 + @@ -500,8 +504,5 @@ - - - diff --git a/BasicComponents.library b/BasicComponents.library new file mode 100644 index 0000000..4ba6317 Binary files /dev/null and b/BasicComponents.library differ diff --git a/PLC/PLC.plcproj b/BasicComponents/BasicComponents.plcproj similarity index 98% rename from PLC/PLC.plcproj rename to BasicComponents/BasicComponents.plcproj index fda4ecf..492bd9f 100644 --- a/PLC/PLC.plcproj +++ b/BasicComponents/BasicComponents.plcproj @@ -8,7 +8,7 @@ true false false - PLC + BasicComponents 3.1.4026.19 {7cc9c530-510c-48e6-a294-2e6b5e6fa820} {951d7a0c-817c-4013-8204-ecd29ee0162e} @@ -19,6 +19,31 @@ false false false + Heisig GmbH + BaseComponents + 1.0 + BC + M.Heisig + Basic components fb's (Valves, AI, AO, Motors, etc.) + + + {3d49e892-ba18-4f02-888a-850f97d52db7} + 1.0.0.0 + Heisig GmbH + + + {eb1097e9-64c5-43a2-8e69-a580a5ac7866} + 1.0.0.0 + + {3d49e892-ba18-4f02-888a-850f97d52db7} + + Standard Libraries + + + + {3d49e892-ba18-4f02-888a-850f97d52db7} + {eb1097e9-64c5-43a2-8e69-a580a5ac7866} + @@ -53,6 +78,7 @@ Code + true Code @@ -187,7 +213,9 @@ - + + true + @@ -252,11 +280,16 @@ Content + + + Content + + - - + + "<ProjectRoot>" {192FAD59-8248-4824-A8DE-9177C94C195A} @@ -2631,16 +2664,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/PLC/POUs/Components/Analog/FB_AnalogInput.TcPOU b/BasicComponents/POUs/Components/Analog/FB_AnalogInput.TcPOU similarity index 100% rename from PLC/POUs/Components/Analog/FB_AnalogInput.TcPOU rename to BasicComponents/POUs/Components/Analog/FB_AnalogInput.TcPOU diff --git a/PLC/POUs/Components/Analog/FB_AnalogOutput.TcPOU b/BasicComponents/POUs/Components/Analog/FB_AnalogOutput.TcPOU similarity index 100% rename from PLC/POUs/Components/Analog/FB_AnalogOutput.TcPOU rename to BasicComponents/POUs/Components/Analog/FB_AnalogOutput.TcPOU diff --git a/PLC/POUs/Components/Analog/Types/ST_ANALOG_EW_CONFIG.TcDUT b/BasicComponents/POUs/Components/Analog/Types/ST_ANALOG_EW_CONFIG.TcDUT similarity index 100% rename from PLC/POUs/Components/Analog/Types/ST_ANALOG_EW_CONFIG.TcDUT rename to BasicComponents/POUs/Components/Analog/Types/ST_ANALOG_EW_CONFIG.TcDUT diff --git a/PLC/POUs/Components/Analog/Types/ST_ANALOG_EW_DELAYS.TcDUT b/BasicComponents/POUs/Components/Analog/Types/ST_ANALOG_EW_DELAYS.TcDUT similarity index 100% rename from PLC/POUs/Components/Analog/Types/ST_ANALOG_EW_DELAYS.TcDUT rename to BasicComponents/POUs/Components/Analog/Types/ST_ANALOG_EW_DELAYS.TcDUT diff --git a/PLC/POUs/Components/Analog/Types/ST_ANALOG_EW_LEVELS.TcDUT b/BasicComponents/POUs/Components/Analog/Types/ST_ANALOG_EW_LEVELS.TcDUT similarity index 100% rename from PLC/POUs/Components/Analog/Types/ST_ANALOG_EW_LEVELS.TcDUT rename to BasicComponents/POUs/Components/Analog/Types/ST_ANALOG_EW_LEVELS.TcDUT diff --git a/PLC/POUs/Components/Analog/Types/ST_ANALOG_IO_CONFIG.TcDUT b/BasicComponents/POUs/Components/Analog/Types/ST_ANALOG_IO_CONFIG.TcDUT similarity index 100% rename from PLC/POUs/Components/Analog/Types/ST_ANALOG_IO_CONFIG.TcDUT rename to BasicComponents/POUs/Components/Analog/Types/ST_ANALOG_IO_CONFIG.TcDUT diff --git a/PLC/POUs/Components/EventListener/FB_EventListener.TcPOU b/BasicComponents/POUs/Components/EventListener/FB_EventListener.TcPOU similarity index 100% rename from PLC/POUs/Components/EventListener/FB_EventListener.TcPOU rename to BasicComponents/POUs/Components/EventListener/FB_EventListener.TcPOU diff --git a/PLC/POUs/Components/EventListener/Types/E_EventType.TcDUT b/BasicComponents/POUs/Components/EventListener/Types/E_EventType.TcDUT similarity index 100% rename from PLC/POUs/Components/EventListener/Types/E_EventType.TcDUT rename to BasicComponents/POUs/Components/EventListener/Types/E_EventType.TcDUT diff --git a/PLC/POUs/Components/EventListener/Types/ST_BufferEventEntry.TcDUT b/BasicComponents/POUs/Components/EventListener/Types/ST_BufferEventEntry.TcDUT similarity index 100% rename from PLC/POUs/Components/EventListener/Types/ST_BufferEventEntry.TcDUT rename to BasicComponents/POUs/Components/EventListener/Types/ST_BufferEventEntry.TcDUT diff --git a/PLC/POUs/Components/Motor/FB_MotorBecker.TcPOU b/BasicComponents/POUs/Components/Motor/FB_MotorBecker.TcPOU similarity index 100% rename from PLC/POUs/Components/Motor/FB_MotorBecker.TcPOU rename to BasicComponents/POUs/Components/Motor/FB_MotorBecker.TcPOU diff --git a/PLC/POUs/Components/Motor/Types/ST_MOTOR_BECKER_CONFIG.TcDUT b/BasicComponents/POUs/Components/Motor/Types/ST_MOTOR_BECKER_CONFIG.TcDUT similarity index 100% rename from PLC/POUs/Components/Motor/Types/ST_MOTOR_BECKER_CONFIG.TcDUT rename to BasicComponents/POUs/Components/Motor/Types/ST_MOTOR_BECKER_CONFIG.TcDUT diff --git a/PLC/POUs/Components/Utilities/FB_AlarmMessage.TcPOU b/BasicComponents/POUs/Components/Utilities/FB_AlarmMessage.TcPOU similarity index 100% rename from PLC/POUs/Components/Utilities/FB_AlarmMessage.TcPOU rename to BasicComponents/POUs/Components/Utilities/FB_AlarmMessage.TcPOU diff --git a/PLC/POUs/Components/Utilities/FB_Blinker.TcPOU b/BasicComponents/POUs/Components/Utilities/FB_Blinker.TcPOU similarity index 100% rename from PLC/POUs/Components/Utilities/FB_Blinker.TcPOU rename to BasicComponents/POUs/Components/Utilities/FB_Blinker.TcPOU diff --git a/PLC/POUs/Components/Utilities/FB_RampGenerator.TcPOU b/BasicComponents/POUs/Components/Utilities/FB_RampGenerator.TcPOU similarity index 98% rename from PLC/POUs/Components/Utilities/FB_RampGenerator.TcPOU rename to BasicComponents/POUs/Components/Utilities/FB_RampGenerator.TcPOU index 6b479ea..5983a0e 100644 --- a/PLC/POUs/Components/Utilities/FB_RampGenerator.TcPOU +++ b/BasicComponents/POUs/Components/Utilities/FB_RampGenerator.TcPOU @@ -56,7 +56,7 @@ IF _xFirstCycle THEN // Get current task cycle time _fbGetCurTaskIdx(); // Convert 100ns to 1ms - _rCycleTime := UDINT_TO_REAL(TwinCAT_SystemInfoVarList._TASKInfo[_fbGetCurTaskIdx.index].CycleTime) * 10E-5; + _rCycleTime := UDINT_TO_REAL(TwinCAT_SystemInfoVarList._TaskInfo[_fbGetCurTaskIdx.index].CycleTime) * 10E-5; END_IF // Clamp setpoint to min max values diff --git a/PLC/POUs/Components/Utilities/FB_ReleaseSignal.TcPOU b/BasicComponents/POUs/Components/Utilities/FB_ReleaseSignal.TcPOU similarity index 100% rename from PLC/POUs/Components/Utilities/FB_ReleaseSignal.TcPOU rename to BasicComponents/POUs/Components/Utilities/FB_ReleaseSignal.TcPOU diff --git a/PLC/POUs/Components/Utilities/FC_HashFNV1a_32Bit.TcPOU b/BasicComponents/POUs/Components/Utilities/FC_HashFNV1a_32Bit.TcPOU similarity index 100% rename from PLC/POUs/Components/Utilities/FC_HashFNV1a_32Bit.TcPOU rename to BasicComponents/POUs/Components/Utilities/FC_HashFNV1a_32Bit.TcPOU diff --git a/PLC/POUs/Components/Valves/FB_Valve.TcPOU b/BasicComponents/POUs/Components/Valves/FB_Valve.TcPOU similarity index 98% rename from PLC/POUs/Components/Valves/FB_Valve.TcPOU rename to BasicComponents/POUs/Components/Valves/FB_Valve.TcPOU index 1136261..7360b4c 100644 --- a/PLC/POUs/Components/Valves/FB_Valve.TcPOU +++ b/BasicComponents/POUs/Components/Valves/FB_Valve.TcPOU @@ -144,11 +144,11 @@ _xOpenValve := ((_xManualOpen AND _xManualModeActive AND (NOT _xAutomaticModeAct // Check for interlocks // If not, use valve state from settings IF (NOT _xProcessINTLKOk) OR (NOT _xSafetyINTLKOk) THEN - _xOpenValve := stValveConfig.xOpenWhenInterlocksActive; + _xOpenValve := stValveConfig.xNormallyOpen; // Also reset manual open command if safetyinterlocks are set - IF (NOT _xSafetyINTLKOk) AND (_xManualOpen <> stValveConfig.xOpenWhenInterlocksActive) THEN - _xManualOpen := stValveConfig.xOpenWhenInterlocksActive; + IF (NOT _xSafetyINTLKOk) AND (_xManualOpen <> stValveConfig.xNormallyOpen) THEN + _xManualOpen := stValveConfig.xNormallyOpen; END_IF END_IF diff --git a/PLC/POUs/Components/Valves/FB_ValveAnalog.TcPOU b/BasicComponents/POUs/Components/Valves/FB_ValveAnalog.TcPOU similarity index 99% rename from PLC/POUs/Components/Valves/FB_ValveAnalog.TcPOU rename to BasicComponents/POUs/Components/Valves/FB_ValveAnalog.TcPOU index 208da0f..2d6372a 100644 --- a/PLC/POUs/Components/Valves/FB_ValveAnalog.TcPOU +++ b/BasicComponents/POUs/Components/Valves/FB_ValveAnalog.TcPOU @@ -80,7 +80,7 @@ VAR // Name of valve // Will be set in constructor and can be changed with the name property - _sName : STRING; + _sName : STRING(80); // Analog input {attribute 'hide'} diff --git a/PLC/POUs/Components/Valves/Types/ST_ValveAnalogConfig.TcDUT b/BasicComponents/POUs/Components/Valves/Types/ST_ValveAnalogConfig.TcDUT similarity index 100% rename from PLC/POUs/Components/Valves/Types/ST_ValveAnalogConfig.TcDUT rename to BasicComponents/POUs/Components/Valves/Types/ST_ValveAnalogConfig.TcDUT diff --git a/PLC/POUs/Components/Valves/Types/ST_ValveConfig.TcDUT b/BasicComponents/POUs/Components/Valves/Types/ST_ValveConfig.TcDUT similarity index 95% rename from PLC/POUs/Components/Valves/Types/ST_ValveConfig.TcDUT rename to BasicComponents/POUs/Components/Valves/Types/ST_ValveConfig.TcDUT index 36de109..ad97b0a 100644 --- a/PLC/POUs/Components/Valves/Types/ST_ValveConfig.TcDUT +++ b/BasicComponents/POUs/Components/Valves/Types/ST_ValveConfig.TcDUT @@ -23,7 +23,7 @@ STRUCT // Set to TRUE if valve should be open instead // of closed with activated interlocks - xOpenWhenInterlocksActive : BOOL := FALSE; + xNormallyOpen : BOOL := FALSE; // Valve is used {attribute 'OPC.UA.DA' := '1'} diff --git a/PLC/POUs/Constants/GVL_TYPE_CONST.TcGVL b/BasicComponents/POUs/Constants/GVL_TYPE_CONST.TcGVL similarity index 100% rename from PLC/POUs/Constants/GVL_TYPE_CONST.TcGVL rename to BasicComponents/POUs/Constants/GVL_TYPE_CONST.TcGVL diff --git a/PLC/POUs/GVL/GVL_CONFIGS.TcGVL b/BasicComponents/POUs/GVL/GVL_CONFIGS.TcGVL similarity index 100% rename from PLC/POUs/GVL/GVL_CONFIGS.TcGVL rename to BasicComponents/POUs/GVL/GVL_CONFIGS.TcGVL diff --git a/PLC/POUs/HMI/Datentypen/ST_HMI_ANALOG_MOTOR_DATA.TcDUT b/BasicComponents/POUs/HMI/Datentypen/ST_HMI_ANALOG_MOTOR_DATA.TcDUT similarity index 100% rename from PLC/POUs/HMI/Datentypen/ST_HMI_ANALOG_MOTOR_DATA.TcDUT rename to BasicComponents/POUs/HMI/Datentypen/ST_HMI_ANALOG_MOTOR_DATA.TcDUT diff --git a/PLC/POUs/HMI/Datentypen/ST_HMI_ANALOG_VALUE.TcDUT b/BasicComponents/POUs/HMI/Datentypen/ST_HMI_ANALOG_VALUE.TcDUT similarity index 100% rename from PLC/POUs/HMI/Datentypen/ST_HMI_ANALOG_VALUE.TcDUT rename to BasicComponents/POUs/HMI/Datentypen/ST_HMI_ANALOG_VALUE.TcDUT diff --git a/PLC/POUs/HMI/Datentypen/ST_HMI_ANALOG_VALVE_DATA.TcDUT b/BasicComponents/POUs/HMI/Datentypen/ST_HMI_ANALOG_VALVE_DATA.TcDUT similarity index 100% rename from PLC/POUs/HMI/Datentypen/ST_HMI_ANALOG_VALVE_DATA.TcDUT rename to BasicComponents/POUs/HMI/Datentypen/ST_HMI_ANALOG_VALVE_DATA.TcDUT diff --git a/PLC/POUs/HMI/Datentypen/ST_HMI_CONTROL_BUTTON.TcDUT b/BasicComponents/POUs/HMI/Datentypen/ST_HMI_CONTROL_BUTTON.TcDUT similarity index 100% rename from PLC/POUs/HMI/Datentypen/ST_HMI_CONTROL_BUTTON.TcDUT rename to BasicComponents/POUs/HMI/Datentypen/ST_HMI_CONTROL_BUTTON.TcDUT diff --git a/PLC/POUs/HMI/Datentypen/ST_HMI_INTEGER_VALUE.TcDUT b/BasicComponents/POUs/HMI/Datentypen/ST_HMI_INTEGER_VALUE.TcDUT similarity index 100% rename from PLC/POUs/HMI/Datentypen/ST_HMI_INTEGER_VALUE.TcDUT rename to BasicComponents/POUs/HMI/Datentypen/ST_HMI_INTEGER_VALUE.TcDUT diff --git a/PLC/POUs/HMI/Datentypen/ST_HMI_INTERLOCK.TcDUT b/BasicComponents/POUs/HMI/Datentypen/ST_HMI_INTERLOCK.TcDUT similarity index 100% rename from PLC/POUs/HMI/Datentypen/ST_HMI_INTERLOCK.TcDUT rename to BasicComponents/POUs/HMI/Datentypen/ST_HMI_INTERLOCK.TcDUT diff --git a/PLC/POUs/HMI/Datentypen/ST_HMI_ORP_SENSOR_DATA.TcDUT b/BasicComponents/POUs/HMI/Datentypen/ST_HMI_ORP_SENSOR_DATA.TcDUT similarity index 100% rename from PLC/POUs/HMI/Datentypen/ST_HMI_ORP_SENSOR_DATA.TcDUT rename to BasicComponents/POUs/HMI/Datentypen/ST_HMI_ORP_SENSOR_DATA.TcDUT diff --git a/PLC/POUs/HMI/Datentypen/ST_HMI_VALVE_DATA.TcDUT b/BasicComponents/POUs/HMI/Datentypen/ST_HMI_VALVE_DATA.TcDUT similarity index 100% rename from PLC/POUs/HMI/Datentypen/ST_HMI_VALVE_DATA.TcDUT rename to BasicComponents/POUs/HMI/Datentypen/ST_HMI_VALVE_DATA.TcDUT diff --git a/PLC/POUs/HMI/Datentypen/T_INTERLOCK.TcDUT b/BasicComponents/POUs/HMI/Datentypen/T_INTERLOCK.TcDUT similarity index 100% rename from PLC/POUs/HMI/Datentypen/T_INTERLOCK.TcDUT rename to BasicComponents/POUs/HMI/Datentypen/T_INTERLOCK.TcDUT diff --git a/PLC/POUs/HMI/Enum/E_HMI_ANALOG_VALUE_STATUS.TcDUT b/BasicComponents/POUs/HMI/Enum/E_HMI_ANALOG_VALUE_STATUS.TcDUT similarity index 100% rename from PLC/POUs/HMI/Enum/E_HMI_ANALOG_VALUE_STATUS.TcDUT rename to BasicComponents/POUs/HMI/Enum/E_HMI_ANALOG_VALUE_STATUS.TcDUT diff --git a/PLC/POUs/HMI/Enum/E_HMI_BUTTON_FEEDBACK.TcDUT b/BasicComponents/POUs/HMI/Enum/E_HMI_BUTTON_FEEDBACK.TcDUT similarity index 100% rename from PLC/POUs/HMI/Enum/E_HMI_BUTTON_FEEDBACK.TcDUT rename to BasicComponents/POUs/HMI/Enum/E_HMI_BUTTON_FEEDBACK.TcDUT diff --git a/PLC/POUs/HMI/Enum/E_HMI_MODE.TcDUT b/BasicComponents/POUs/HMI/Enum/E_HMI_MODE.TcDUT similarity index 100% rename from PLC/POUs/HMI/Enum/E_HMI_MODE.TcDUT rename to BasicComponents/POUs/HMI/Enum/E_HMI_MODE.TcDUT diff --git a/PLC/POUs/HMI/Enum/E_HMI_MOTOR_STATUS.TcDUT b/BasicComponents/POUs/HMI/Enum/E_HMI_MOTOR_STATUS.TcDUT similarity index 100% rename from PLC/POUs/HMI/Enum/E_HMI_MOTOR_STATUS.TcDUT rename to BasicComponents/POUs/HMI/Enum/E_HMI_MOTOR_STATUS.TcDUT diff --git a/PLC/POUs/HMI/Enum/E_HMI_VALVE_STATUS.TcDUT b/BasicComponents/POUs/HMI/Enum/E_HMI_VALVE_STATUS.TcDUT similarity index 100% rename from PLC/POUs/HMI/Enum/E_HMI_VALVE_STATUS.TcDUT rename to BasicComponents/POUs/HMI/Enum/E_HMI_VALVE_STATUS.TcDUT diff --git a/PLC/POUs/PRG_MAIN.TcPOU b/BasicComponents/POUs/PRG_MAIN.TcPOU similarity index 100% rename from PLC/POUs/PRG_MAIN.TcPOU rename to BasicComponents/POUs/PRG_MAIN.TcPOU diff --git a/PLC/POUs/Unittests/AITests/FB_AnalogInputTest.TcPOU b/BasicComponents/POUs/Unittests/AITests/FB_AnalogInputTest.TcPOU similarity index 100% rename from PLC/POUs/Unittests/AITests/FB_AnalogInputTest.TcPOU rename to BasicComponents/POUs/Unittests/AITests/FB_AnalogInputTest.TcPOU diff --git a/PLC/POUs/Unittests/AOTests/FB_AnalogOutputTest.TcPOU b/BasicComponents/POUs/Unittests/AOTests/FB_AnalogOutputTest.TcPOU similarity index 100% rename from PLC/POUs/Unittests/AOTests/FB_AnalogOutputTest.TcPOU rename to BasicComponents/POUs/Unittests/AOTests/FB_AnalogOutputTest.TcPOU diff --git a/PLC/POUs/Unittests/AnalogValveTests/FB_ValveAnalog_Test.TcPOU b/BasicComponents/POUs/Unittests/AnalogValveTests/FB_ValveAnalog_Test.TcPOU similarity index 100% rename from PLC/POUs/Unittests/AnalogValveTests/FB_ValveAnalog_Test.TcPOU rename to BasicComponents/POUs/Unittests/AnalogValveTests/FB_ValveAnalog_Test.TcPOU diff --git a/PLC/POUs/Unittests/ReleaseSignalTests/FB_ReleaseSignalTest.TcPOU b/BasicComponents/POUs/Unittests/ReleaseSignalTests/FB_ReleaseSignalTest.TcPOU similarity index 100% rename from PLC/POUs/Unittests/ReleaseSignalTests/FB_ReleaseSignalTest.TcPOU rename to BasicComponents/POUs/Unittests/ReleaseSignalTests/FB_ReleaseSignalTest.TcPOU diff --git a/PLC/POUs/Unittests/UtilitiesTests/FB_BlinkerTest.TcPOU b/BasicComponents/POUs/Unittests/UtilitiesTests/FB_BlinkerTest.TcPOU similarity index 100% rename from PLC/POUs/Unittests/UtilitiesTests/FB_BlinkerTest.TcPOU rename to BasicComponents/POUs/Unittests/UtilitiesTests/FB_BlinkerTest.TcPOU diff --git a/PLC/POUs/Unittests/UtilitiesTests/FB_HashFNV1a_32BitTest.TcPOU b/BasicComponents/POUs/Unittests/UtilitiesTests/FB_HashFNV1a_32BitTest.TcPOU similarity index 100% rename from PLC/POUs/Unittests/UtilitiesTests/FB_HashFNV1a_32BitTest.TcPOU rename to BasicComponents/POUs/Unittests/UtilitiesTests/FB_HashFNV1a_32BitTest.TcPOU diff --git a/PLC/POUs/Unittests/UtilitiesTests/FB_PT1Test.TcPOU b/BasicComponents/POUs/Unittests/UtilitiesTests/FB_PT1Test.TcPOU similarity index 100% rename from PLC/POUs/Unittests/UtilitiesTests/FB_PT1Test.TcPOU rename to BasicComponents/POUs/Unittests/UtilitiesTests/FB_PT1Test.TcPOU diff --git a/PLC/POUs/Unittests/UtilitiesTests/FB_RampGeneratorTest.TcPOU b/BasicComponents/POUs/Unittests/UtilitiesTests/FB_RampGeneratorTest.TcPOU similarity index 100% rename from PLC/POUs/Unittests/UtilitiesTests/FB_RampGeneratorTest.TcPOU rename to BasicComponents/POUs/Unittests/UtilitiesTests/FB_RampGeneratorTest.TcPOU diff --git a/PLC/POUs/Unittests/ValveTests/FB_ValveTestHMI.TcPOU b/BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestHMI.TcPOU similarity index 100% rename from PLC/POUs/Unittests/ValveTests/FB_ValveTestHMI.TcPOU rename to BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestHMI.TcPOU diff --git a/PLC/POUs/Unittests/ValveTests/FB_ValveTestTimoutClose.TcPOU b/BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTimoutClose.TcPOU similarity index 100% rename from PLC/POUs/Unittests/ValveTests/FB_ValveTestTimoutClose.TcPOU rename to BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTimoutClose.TcPOU diff --git a/PLC/POUs/Unittests/ValveTests/FB_ValveTestTimoutOpen.TcPOU b/BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTimoutOpen.TcPOU similarity index 100% rename from PLC/POUs/Unittests/ValveTests/FB_ValveTestTimoutOpen.TcPOU rename to BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTimoutOpen.TcPOU diff --git a/PLC/POUs/Unittests/ValveTests/FB_ValveTestTriggerTimoutClose.TcPOU b/BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTriggerTimoutClose.TcPOU similarity index 100% rename from PLC/POUs/Unittests/ValveTests/FB_ValveTestTriggerTimoutClose.TcPOU rename to BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTriggerTimoutClose.TcPOU diff --git a/PLC/POUs/Unittests/ValveTests/FB_ValveTestTriggerTimoutOpen.TcPOU b/BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTriggerTimoutOpen.TcPOU similarity index 100% rename from PLC/POUs/Unittests/ValveTests/FB_ValveTestTriggerTimoutOpen.TcPOU rename to BasicComponents/POUs/Unittests/ValveTests/FB_ValveTestTriggerTimoutOpen.TcPOU diff --git a/PLC/POUs/Unittests/ValveTests/FB_Valve_Test.TcPOU b/BasicComponents/POUs/Unittests/ValveTests/FB_Valve_Test.TcPOU similarity index 99% rename from PLC/POUs/Unittests/ValveTests/FB_Valve_Test.TcPOU rename to BasicComponents/POUs/Unittests/ValveTests/FB_Valve_Test.TcPOU index 0da7afa..3979e99 100644 --- a/PLC/POUs/Unittests/ValveTests/FB_Valve_Test.TcPOU +++ b/BasicComponents/POUs/Unittests/ValveTests/FB_Valve_Test.TcPOU @@ -351,7 +351,7 @@ IF _fbValve.IsOpen THEN AssertTrue(Condition := _fbValve.xCloseValve, Message := 'Close output not active with active Interlock'); // Test the same with open valve when interlock active - _stValveConfig.xOpenWhenInterlocksActive := TRUE; + _stValveConfig.xNormallyOpen := TRUE; _fbValve(stValveConfig := _stValveConfig, wProcessINTLK := _wInterlocks, wProcessINTLKUsed := _wInterlocksUsed, stHMIInterface := _stHMIValve); // Valve should now be open @@ -409,7 +409,7 @@ IF _fbValve.IsOpen THEN AssertTrue(Condition := _fbValve.xCloseValve, Message := 'Close output not active with active Interlock'); // Test the same with open valve when interlock active - _stValveConfig.xOpenWhenInterlocksActive := TRUE; + _stValveConfig.xNormallyOpen := TRUE; _fbValve(stValveConfig := _stValveConfig, wProcessINTLK := _wInterlocks, wProcessINTLKUsed := _wInterlocksUsed, stHMIInterface := _stHMIValve); // Valve should now be open diff --git a/PLC/PlcTask.TcTTO b/BasicComponents/PlcTask.TcTTO similarity index 100% rename from PLC/PlcTask.TcTTO rename to BasicComponents/PlcTask.TcTTO diff --git a/LibraryCategories.libcat.xml b/LibraryCategories.libcat.xml new file mode 100644 index 0000000..e302404 --- /dev/null +++ b/LibraryCategories.libcat.xml @@ -0,0 +1,16 @@ + + + + 3d49e892-ba18-4f02-888a-850f97d52db7 + 1.0.0.0 + Heisig GmbH + + + eb1097e9-64c5-43a2-8e69-a580a5ac7866 + 1.0.0.0 + + 3d49e892-ba18-4f02-888a-850f97d52db7 + + Standard Libraries + + \ No newline at end of file