Modified safety for better alarm messages and cleaned up

This commit is contained in:
Matthias Heisig
2025-09-12 16:07:02 +02:00
parent 269bdabebe
commit d882effb35
12 changed files with 231 additions and 148 deletions

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<safetyApplicationLanguageDiagram Crc="1453501372" dslVersion="1.5.0.0" Id="0e425414-dc5e-400f-8c45-5d939e9e5bdf" absoluteBounds="0, 0, 21.5, 16.625" name="TwinSAFE">
<safetyApplicationLanguageDiagram Crc="3843353485" dslVersion="1.5.0.0" Id="0e425414-dc5e-400f-8c45-5d939e9e5bdf" absoluteBounds="0, 0, 21.5, 16.625" name="TwinSAFE">
<safetyApplicationMoniker name="/" />
<nestedChildShapes>
<networkSwimLane Id="87fd410b-4e49-4cfc-85e7-e42c22913ee0" absoluteBounds="0, 0, 21.5, 16.63">
@@ -166,7 +166,7 @@
<inPortShapeMoniker Id="7aa7c008-961a-465f-bcec-795f90f5176d" />
</nodes>
</wiredLinkConnector>
<userFunctionBlockShape Id="7aecaf35-2b8b-4942-a8af-df2d39590b46" absoluteBounds="2.25, 11.25, 2.6149738788604737, 5.129999999999999">
<userFunctionBlockShape Id="7aecaf35-2b8b-4942-a8af-df2d39590b46" absoluteBounds="2.25, 11.25, 2.6149737596511842, 5.129999999999999">
<userFunctionBlockMoniker name="//Network1/UserFunctionBlock1" />
<relativeChildShapes>
<inPortShape Id="62b1b6a8-2c2b-4b95-aff8-6462df221970" absoluteBounds="2.17, 11.725, 0.15, 0.15">
@@ -233,17 +233,17 @@
<metaInPortMoniker name="//Network1/UserFunctionBlock1/iUnit2NegTank" />
<relativeChildShapes />
</inPortShape>
<outPortShape Id="1eeb6c98-9f65-4e7e-bde3-d37990f0914f" absoluteBounds="4.7649738788604736, 11.725, 0.15, 0.15">
<outPortShape Id="1eeb6c98-9f65-4e7e-bde3-d37990f0914f" absoluteBounds="4.7649737596511841, 11.725, 0.15, 0.15">
<metaOutPortMoniker name="//Network1/UserFunctionBlock1/xSegmentsInRange" />
<relativeChildShapes />
</outPortShape>
<outPortShape Id="5c430c7c-c8c1-4ebe-8649-8cdd0ffb2ed4" absoluteBounds="4.7649738788604736, 11.995, 0.15, 0.15">
<outPortShape Id="5c430c7c-c8c1-4ebe-8649-8cdd0ffb2ed4" absoluteBounds="4.7649737596511841, 11.995, 0.15, 0.15">
<metaOutPortMoniker name="//Network1/UserFunctionBlock1/xTanksInRange" />
<relativeChildShapes />
</outPortShape>
</relativeChildShapes>
</userFunctionBlockShape>
<userFunctionBlockShape Id="0dd735e1-32c6-4e2a-ae91-cc62fab6235a" absoluteBounds="2.25, 5.875, 2.6149738788604737, 5.129999999999999">
<userFunctionBlockShape Id="0dd735e1-32c6-4e2a-ae91-cc62fab6235a" absoluteBounds="2.25, 5.875, 2.6149737596511842, 5.129999999999999">
<userFunctionBlockMoniker name="//Network1/UserFunctionBlock3" />
<relativeChildShapes>
<inPortShape Id="a4fb08dc-f261-4fdc-8ff7-c74fe26a75bd" absoluteBounds="2.17, 6.35, 0.15, 0.15">
@@ -310,17 +310,17 @@
<metaInPortMoniker name="//Network1/UserFunctionBlock3/iUnit2NegTank" />
<relativeChildShapes />
</inPortShape>
<outPortShape Id="64c4871f-5b78-4659-aacd-692c06f62d12" absoluteBounds="4.7649738788604736, 6.35, 0.15, 0.15">
<outPortShape Id="64c4871f-5b78-4659-aacd-692c06f62d12" absoluteBounds="4.7649737596511841, 6.35, 0.15, 0.15">
<metaOutPortMoniker name="//Network1/UserFunctionBlock3/xSegmentsInRange" />
<relativeChildShapes />
</outPortShape>
<outPortShape Id="39dea8c2-68c7-4166-a774-66971c7bce13" absoluteBounds="4.7649738788604736, 6.62, 0.15, 0.15">
<outPortShape Id="39dea8c2-68c7-4166-a774-66971c7bce13" absoluteBounds="4.7649737596511841, 6.62, 0.15, 0.15">
<metaOutPortMoniker name="//Network1/UserFunctionBlock3/xTanksInRange" />
<relativeChildShapes />
</outPortShape>
</relativeChildShapes>
</userFunctionBlockShape>
<userFunctionBlockShape Id="0ee4be93-e3e2-4126-8fe9-b543e56a3235" absoluteBounds="2.25, 0.5, 2.6149738788604737, 5.129999999999999">
<userFunctionBlockShape Id="0ee4be93-e3e2-4126-8fe9-b543e56a3235" absoluteBounds="2.25, 0.5, 2.6149737596511842, 5.129999999999999">
<userFunctionBlockMoniker name="//Network1/UserFunctionBlock4" />
<relativeChildShapes>
<inPortShape Id="35f08037-4900-4796-8656-31542500e3a9" absoluteBounds="2.17, 0.975, 0.15, 0.15">
@@ -387,52 +387,52 @@
<metaInPortMoniker name="//Network1/UserFunctionBlock4/iUnit2NegTank" />
<relativeChildShapes />
</inPortShape>
<outPortShape Id="89b18794-54a2-4178-add7-78b52d756877" absoluteBounds="4.7649738788604736, 0.975, 0.15, 0.15">
<outPortShape Id="89b18794-54a2-4178-add7-78b52d756877" absoluteBounds="4.7649737596511841, 0.975, 0.15, 0.15">
<metaOutPortMoniker name="//Network1/UserFunctionBlock4/xSegmentsInRange" />
<relativeChildShapes />
</outPortShape>
<outPortShape Id="cee41663-f0a4-42fc-9d83-bdd4ff22c185" absoluteBounds="4.7649738788604736, 1.245, 0.15, 0.15">
<outPortShape Id="cee41663-f0a4-42fc-9d83-bdd4ff22c185" absoluteBounds="4.7649737596511841, 1.245, 0.15, 0.15">
<metaOutPortMoniker name="//Network1/UserFunctionBlock4/xTanksInRange" />
<relativeChildShapes />
</outPortShape>
</relativeChildShapes>
</userFunctionBlockShape>
<wiredLinkConnector Id="6f3aa2af-6cba-4cfb-b44a-2b7256508296" edgePoints="[(4.91497387886047 : 11.8); (5.44622387886047 : 11.8); (5.44622387886047 : 2.485); (6.15872387886048 : 2.485 : JumpStart); (6.22539054552714 : 2.485 : JumpEnd); (7.295 : 2.485)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" color="0, 0, 0" thickness="0.01" expandedManuallyRouted="false">
<wiredLinkConnector Id="6f3aa2af-6cba-4cfb-b44a-2b7256508296" edgePoints="[(4.91497375965118 : 11.8); (5.44622387886047 : 11.8); (5.44622387886047 : 2.485); (6.15872387886048 : 2.485 : JumpStart); (6.22539054552714 : 2.485 : JumpEnd); (7.295 : 2.485)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" color="0, 0, 0" thickness="0.01" expandedManuallyRouted="false">
<wiredLinkMoniker Id="31d02c6f-81f8-493c-a5ff-5a357a66a40c" />
<nodes>
<outPortShapeMoniker Id="1eeb6c98-9f65-4e7e-bde3-d37990f0914f" />
<inPortShapeMoniker Id="4a182bba-fff2-497f-b31b-98c09753e83f" />
</nodes>
</wiredLinkConnector>
<wiredLinkConnector Id="2ace8898-5d50-4b05-83e6-d6018c48786c" edgePoints="[(4.91497387886047 : 12.07); (6.34414054552714 : 12.07); (6.34414054552714 : 5.985); (7.295 : 5.985)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" color="0, 0, 0" thickness="0.01" expandedManuallyRouted="false">
<wiredLinkConnector Id="2ace8898-5d50-4b05-83e6-d6018c48786c" edgePoints="[(4.91497375965118 : 12.07); (6.34414054552714 : 12.07); (6.34414054552714 : 5.985); (7.295 : 5.985)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" color="0, 0, 0" thickness="0.01" expandedManuallyRouted="false">
<wiredLinkMoniker Id="507f6e4e-eeb5-46f3-b79d-9861383ce327" />
<nodes>
<outPortShapeMoniker Id="5c430c7c-c8c1-4ebe-8649-8cdd0ffb2ed4" />
<inPortShapeMoniker Id="79018406-f9c1-4366-a044-8a431b649abb" />
</nodes>
</wiredLinkConnector>
<wiredLinkConnector Id="bacbd28d-ed88-473b-af86-9638f20d0d0f" edgePoints="[(4.91497387886047 : 6.425); (5.28997387886047 : 6.425); (5.28997387886047 : 2.215); (6.15872387886048 : 2.215 : JumpStart); (6.22539054552714 : 2.215 : JumpEnd); (7.295 : 2.215)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" color="0, 0, 0" thickness="0.01" expandedManuallyRouted="false">
<wiredLinkConnector Id="bacbd28d-ed88-473b-af86-9638f20d0d0f" edgePoints="[(4.91497375965118 : 6.425); (5.28997387886047 : 6.425); (5.28997387886047 : 2.215); (6.15872387886048 : 2.215 : JumpStart); (6.22539054552714 : 2.215 : JumpEnd); (7.295 : 2.215)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" color="0, 0, 0" thickness="0.01" expandedManuallyRouted="false">
<wiredLinkMoniker Id="6ecd8309-471f-4efa-96ec-95cf021a9e49" />
<nodes>
<outPortShapeMoniker Id="64c4871f-5b78-4659-aacd-692c06f62d12" />
<inPortShapeMoniker Id="c75d1940-5ac0-4c4b-930a-31563619fefc" />
</nodes>
</wiredLinkConnector>
<wiredLinkConnector Id="8a786287-dbe2-4c7a-8edf-5f2c6c6d756b" edgePoints="[(4.91497387886047 : 6.695); (5.41289054552714 : 6.695 : JumpStart); (5.4795572121938 : 6.695 : JumpEnd); (6.0358072121938 : 6.695); (6.0358072121938 : 5.715); (7.295 : 5.715)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" color="0, 0, 0" thickness="0.01" expandedManuallyRouted="false">
<wiredLinkConnector Id="8a786287-dbe2-4c7a-8edf-5f2c6c6d756b" edgePoints="[(4.91497375965118 : 6.695); (5.41289054552714 : 6.695 : JumpStart); (5.4795572121938 : 6.695 : JumpEnd); (6.0358072121938 : 6.695); (6.0358072121938 : 5.715); (7.295 : 5.715)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" color="0, 0, 0" thickness="0.01" expandedManuallyRouted="false">
<wiredLinkMoniker Id="4495e191-e670-445f-8d38-9767762eeb28" />
<nodes>
<outPortShapeMoniker Id="39dea8c2-68c7-4166-a774-66971c7bce13" />
<inPortShapeMoniker Id="b4f2e1ee-61c5-440d-b3d3-6f740b531bf0" />
</nodes>
</wiredLinkConnector>
<wiredLinkConnector Id="06786d90-d12d-4bde-8a36-ed3ec9084e44" edgePoints="[(4.91497387886047 : 1.05); (6.50359137177228 : 1.05); (6.50359137177228 : 1.945); (7.295 : 1.945)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" color="0, 0, 0" thickness="0.01" expandedManuallyRouted="false">
<wiredLinkConnector Id="06786d90-d12d-4bde-8a36-ed3ec9084e44" edgePoints="[(4.91497375965118 : 1.05); (6.50359137177228 : 1.05); (6.50359137177228 : 1.945); (7.295 : 1.945)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" color="0, 0, 0" thickness="0.01" expandedManuallyRouted="false">
<wiredLinkMoniker Id="ea6cb91a-74d5-4e14-91c4-c0c4be627464" />
<nodes>
<outPortShapeMoniker Id="89b18794-54a2-4178-add7-78b52d756877" />
<inPortShapeMoniker Id="82ba91bc-eb63-4902-a314-5ba22c33b3bc" />
</nodes>
</wiredLinkConnector>
<wiredLinkConnector Id="b9d5cf4e-c7b1-4faa-b6cb-0423cf4072f8" edgePoints="[(4.91497387886047 : 1.32); (6.19205721219381 : 1.32); (6.19205721219381 : 5.445); (7.295 : 5.445)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" color="0, 0, 0" thickness="0.01" expandedManuallyRouted="false">
<wiredLinkConnector Id="b9d5cf4e-c7b1-4faa-b6cb-0423cf4072f8" edgePoints="[(4.91497375965118 : 1.32); (6.19205721219381 : 1.32); (6.19205721219381 : 5.445); (7.295 : 5.445)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Caller" color="0, 0, 0" thickness="0.01" expandedManuallyRouted="false">
<wiredLinkMoniker Id="ba066453-c03a-4db3-8619-24bcf2fc14b0" />
<nodes>
<outPortShapeMoniker Id="cee41663-f0a4-42fc-9d83-bdd4ff22c185" />