Merge branch 'release/1.3.1'

BaseComponents.tsproj

@@ -136,7 +136,7 @@
 		</System>
 		<Plc>
 			<Project GUID="{4E62D9E7-436C-457D-8DC4-82D2FEF91C96}" Name="BasicComponents" PrjFilePath="BasicComponents\BasicComponents.plcproj" TmcFilePath="BasicComponents\BasicComponents.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" CopyTmcToTarget="true" CopyTpyToTarget="false" SymbolicMapping="true">
-				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcHash="{B7757519-28FA-424D-AB4A-AF3716E16F4E}" TmcPath="BasicComponents\BasicComponents.tmc">
+				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcHash="{994AF725-57BD-C8F2-A11E-43E32EDE2B55}" TmcPath="BasicComponents\BasicComponents.tmc">
 					<Name>BasicComponents Instance</Name>
 					<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 					<Vars VarGrpType="2" AreaNo="1">

BasicComponents/BasicComponents.plcproj

@@ -21,7 +21,7 @@
     <GlobalVersionStructureIncluded>false</GlobalVersionStructureIncluded>
     <Company>Heisig GmbH</Company>
     <Title>BaseComponents</Title>
-    <ProjectVersion>1.3</ProjectVersion>
+    <ProjectVersion>1.3.1</ProjectVersion>
     <DefaultNamespace>BC</DefaultNamespace>
     <Author>M.Heisig</Author>
     <Description>Basic components fb's (Valves, AI, AO, Motors, etc.)</Description>

BasicComponents/POUs/Components/Utilities/FB_AlarmMessage.TcPOU

@@ -103,6 +103,18 @@ _fbSourceInfo.sName := _sLeft;
 _fbAlarmMessage.CreateEx(stEventEntry := stEventEntry, bWithConfirmation := xWithConfirmation);]]></ST>
       </Implementation>
     </Method>
+    <Method Name="M_OneShot" Id="{c9a496b6-62af-4667-8e90-61cb03facef6}">
+      <Declaration><![CDATA[METHOD M_OneShot
+VAR_INPUT
+END_VAR
+]]></Declaration>
+      <Implementation>
+        <ST><![CDATA[// Raise alarm
+IF xRelease AND (NOT xInUnitTestMode) AND (NOT _fbAlarmMessage.bRaised) THEN
+	_fbAlarmMessage.Raise(0);
+END_IF]]></ST>
+      </Implementation>
+    </Method>
     <Property Name="Raised" Id="{2254f7ab-28c0-02ea-0e65-a373d9d5b007}">
       <Declaration><![CDATA[PROPERTY Raised : BOOL]]></Declaration>
       <Get Name="Get" Id="{402fa563-3cdd-092f-24cf-a227bf8b3ef3}">