Change E-Stop so that it can also work with one string
- Also optimized CV charging
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<safetyApplication Crc="1720726332" xmlns:dm0="http://schemas.microsoft.com/VisualStudio/2008/DslTools/Core" dslVersion="1.5.0.0" Id="ee0f6780-d690-4a7b-bca6-dedf942a933e" name="" mapState="false" mapDiag="false" groupOrderId="1" passificationAllowed="false" temporaryDeactivationAllowed="true" permamentDeactivationAllowed="true" xmlid="0" analogFBOutputReplacementValues="Zero" verifyAnalogFBInputsIfStart="false" userFbId="00000000-0000-0000-0000-000000000000" xmlns="http://schemas.microsoft.com/dsltools/SafetyApplicationLanguage">
|
||||
<safetyApplication Crc="3987103492" xmlns:dm0="http://schemas.microsoft.com/VisualStudio/2008/DslTools/Core" dslVersion="1.5.0.0" Id="ee0f6780-d690-4a7b-bca6-dedf942a933e" name="" mapState="false" mapDiag="false" groupOrderId="0" passificationAllowed="false" temporaryDeactivationAllowed="true" permamentDeactivationAllowed="true" xmlid="0" analogFBOutputReplacementValues="Zero" verifyAnalogFBInputsIfStart="false" userFbId="00000000-0000-0000-0000-000000000000" xmlns="http://schemas.microsoft.com/dsltools/SafetyApplicationLanguage">
|
||||
<networks>
|
||||
<safetyApplicationHasNetworks Id="0128b245-705e-4f3e-bf21-12c6b95cf2f3">
|
||||
<Network Id="8b3e94c9-8993-4028-8d2f-eefe0ea6472c" name="Network1" networkName="Network1" intId="1" networkOrderId="0">
|
||||
@@ -69,6 +69,85 @@
|
||||
</functionBlocks>
|
||||
</Network>
|
||||
</safetyApplicationHasNetworks>
|
||||
<safetyApplicationHasNetworks Id="90d5d4e6-4f1e-4628-b733-144c9de76cd2">
|
||||
<Network Id="671fb8c4-89cf-44be-8d23-cbb6701fd61e" name="Network2" networkName="Network2" intId="2" networkOrderId="1">
|
||||
<functionBlocks>
|
||||
<networkHasFunctionBlocks Id="f5bccaca-47e4-49db-8768-2e8ce3056245">
|
||||
<fBEstop Id="4559e424-0981-4a85-b7cc-1dc0ccd1402e" name="FBEstop1" instanceName="FBEstop1" orderOfExecution="2" mapState="false" mapDiag="false" functionName="safeEstop" safeInputsAfterDiscError="true">
|
||||
<inPorts>
|
||||
<functioBlockHasInPorts Id="99543c9a-c578-4231-9661-a7be54d0c76a">
|
||||
<inPort Id="497dfd32-770c-4ea1-8d8b-42400c79a8b8" name="Restart" portName="Restart" portNum="2" objectIndex="0" varId="1" filter="3" portDataType="1" maxDeviation="0" resetTime="0">
|
||||
<fbPortGlobalVariableReferences>
|
||||
<functionBlockPortHasFbPortGlobalVariableReferences Id="7cceb12e-cc05-44ac-94e5-bbe7a80d67b1">
|
||||
<fbPortGlobalVariableReference Id="296b1094-2edc-4e64-a25c-c197dc359662" variableId="3b4f283a-d376-4bbc-8717-cb4b3d88342e" lastKnownPath="GVL1.xNotHaltRestart" />
|
||||
</functionBlockPortHasFbPortGlobalVariableReferences>
|
||||
</fbPortGlobalVariableReferences>
|
||||
</inPort>
|
||||
</functioBlockHasInPorts>
|
||||
<functioBlockHasInPorts Id="80bd272c-3ec8-4fd5-b42f-99dbe7b85fb6">
|
||||
<inPort Id="8f4735d3-2ce2-4771-ba00-54e5f6567269" name="EStopIn1" portName="EStopIn1" portNum="4" objectIndex="8" varId="3" filter="2" portDataType="1" channelInterface="Two-Channel" discrepancyTime="100" deactivate1="Break Contact (NC)" deactivate2="Break Contact (NC)" maxDeviation="0" resetTime="0" />
|
||||
</functioBlockHasInPorts>
|
||||
<functioBlockHasInPorts Id="b8763669-4c36-4061-ac05-f5f285139c33">
|
||||
<inPort Id="65be6133-a359-4aab-8f4c-0d983aaaab2f" name="EStopIn2" portName="EStopIn2" portNum="5" objectIndex="9" varId="4" filter="2" portDataType="1" channelInterface="Both Deactivated" maxDeviation="0" resetTime="0" />
|
||||
</functioBlockHasInPorts>
|
||||
<functioBlockHasInPorts Id="42c86461-6936-43cc-a130-768353224eb7">
|
||||
<inPort Id="5264fae5-29d3-498e-b2ae-1247fd18b1f3" name="EStopIn3" portName="EStopIn3" portNum="6" objectIndex="10" varId="5" filter="2" portDataType="1" channelInterface="Both Deactivated" maxDeviation="0" resetTime="0" />
|
||||
</functioBlockHasInPorts>
|
||||
<functioBlockHasInPorts Id="1460bdd1-b085-419a-9397-c2f13846d5bb">
|
||||
<inPort Id="9bc7d598-3230-4992-85cc-9d55a1ebb4f4" name="EStopIn4" portName="EStopIn4" portNum="7" objectIndex="11" varId="6" filter="2" portDataType="1" channelInterface="Both Deactivated" maxDeviation="0" resetTime="0" />
|
||||
</functioBlockHasInPorts>
|
||||
<functioBlockHasInPorts Id="c9f6ec40-0d88-4032-9c23-60c05aa681c5">
|
||||
<inPort Id="0b949dcb-b246-4595-9507-c9ed36c6a5f1" name="EStopIn5" portName="EStopIn5" portNum="8" objectIndex="12" varId="7" filter="2" portDataType="1" channelInterface="Both Deactivated" maxDeviation="0" resetTime="0" />
|
||||
</functioBlockHasInPorts>
|
||||
<functioBlockHasInPorts Id="0f987205-ab14-40ad-9ec0-4d1323b40512">
|
||||
<inPort Id="0b89af62-dc43-4b92-baf0-bb227ea062fa" name="EStopIn6" portName="EStopIn6" portNum="9" objectIndex="13" varId="8" filter="2" portDataType="1" channelInterface="Both Deactivated" maxDeviation="0" resetTime="0" />
|
||||
</functioBlockHasInPorts>
|
||||
<functioBlockHasInPorts Id="1c02c553-e882-4f5b-88ac-c03bd8fec13f">
|
||||
<inPort Id="d4d86a3d-f795-4951-9f8e-4f37fcda55bc" name="EStopIn7" portName="EStopIn7" portNum="10" objectIndex="14" varId="9" filter="2" portDataType="1" channelInterface="Both Deactivated" maxDeviation="0" resetTime="0" />
|
||||
</functioBlockHasInPorts>
|
||||
<functioBlockHasInPorts Id="585c08cd-8d08-4e23-aca3-ead3e434563b">
|
||||
<inPort Id="62b181b3-e033-4f24-b742-8c9920eadb5f" name="EStopIn8" portName="EStopIn8" portNum="11" objectIndex="15" varId="10" filter="2" portDataType="1" channelInterface="Both Deactivated" maxDeviation="0" resetTime="0" />
|
||||
</functioBlockHasInPorts>
|
||||
<functioBlockHasInPorts Id="75ca15a3-99cf-4388-813b-e27c4f6970f8">
|
||||
<inPort Id="cae43924-b9fd-484e-8d4b-0eb8e678040b" name="EDM1" portName="EDM1" portNum="13" objectIndex="1" varId="12" filter="3" portDataType="1" maxDeviation="0" resetTime="0" />
|
||||
</functioBlockHasInPorts>
|
||||
<functioBlockHasInPorts Id="eb16d72f-4f48-4be0-997e-e8e0f605eac7">
|
||||
<inPort Id="a5f6b637-d894-4275-89d9-5917f08c90b0" name="EDM2" portName="EDM2" portNum="14" objectIndex="2" varId="13" filter="3" portDataType="1" maxDeviation="0" resetTime="0" />
|
||||
</functioBlockHasInPorts>
|
||||
</inPorts>
|
||||
<outPorts>
|
||||
<functionBlockHasOutPorts Id="0a9741e4-91bf-427e-8e46-47b98c429f21">
|
||||
<outPort Id="eadf126d-30c6-44af-9303-689245516d46" name="Error" portName="Error" portNum="4" objectIndex="0" varId="16" filter="7" portDataType="1" replacementValue="0" />
|
||||
</functionBlockHasOutPorts>
|
||||
<functionBlockHasOutPorts Id="a92f7e81-dc0b-4719-bdfe-375c50e630b1">
|
||||
<outPort Id="5257f24c-a541-4d7e-a17c-47c0eb1c0658" name="EStopOut" portName="EStopOut" portNum="11" objectIndex="1" varId="23" filter="7" portDataType="1" replacementValue="1">
|
||||
<fbPortGlobalVariableReferences>
|
||||
<functionBlockPortHasFbPortGlobalVariableReferences Id="eecb2744-5c10-44ec-b99f-25b03bc2b7ef">
|
||||
<fbPortGlobalVariableReference Id="6722c939-f096-474c-8644-626606a23c14" variableId="470a26a4-f34a-41f5-9dc7-8b857cf4fdda" lastKnownPath="GVL1.xNotHaltRegalString1Ok" />
|
||||
</functionBlockPortHasFbPortGlobalVariableReferences>
|
||||
</fbPortGlobalVariableReferences>
|
||||
</outPort>
|
||||
</functionBlockHasOutPorts>
|
||||
<functionBlockHasOutPorts Id="379edb31-c68b-4f0b-9fdc-2685efdbeaca">
|
||||
<outPort Id="3f849045-0b93-4743-8e4f-168a6bcf5af1" name="EStopDelOut" portName="EStopDelOut" portNum="12" objectIndex="2" varId="26" filter="7" portDataType="1" replacementValue="1">
|
||||
<fbPortGlobalVariableReferences>
|
||||
<functionBlockPortHasFbPortGlobalVariableReferences Id="45f23705-d80c-424a-a287-ee5722cc19bb">
|
||||
<fbPortGlobalVariableReference Id="1907cab7-0053-4fa1-86c0-fdd12b7ef9c8" variableId="34175068-eb12-4ad7-ac89-538b91b7f333" lastKnownPath="GVL1.xNotHaltRegalString1OkDelay" />
|
||||
</functionBlockPortHasFbPortGlobalVariableReferences>
|
||||
</fbPortGlobalVariableReferences>
|
||||
</outPort>
|
||||
</functionBlockHasOutPorts>
|
||||
</outPorts>
|
||||
<parameterPorts>
|
||||
<functionBlockHasParamPorts Id="ec4d6418-354e-48c3-8747-e8162644a6ff">
|
||||
<parameterPort Id="413d15bf-3532-4dc9-bcdd-4c79d5a31dc7" name="Delay Time (ms)" portName="Delay Time (ms)" portNum="8" objectIndex="0" varId="0" filter="0" portDataType="0" timing="100" userFbPortName="Delay Time (ms)" useInUserFb="false" />
|
||||
</functionBlockHasParamPorts>
|
||||
</parameterPorts>
|
||||
</fBEstop>
|
||||
</networkHasFunctionBlocks>
|
||||
</functionBlocks>
|
||||
</Network>
|
||||
</safetyApplicationHasNetworks>
|
||||
</networks>
|
||||
<twinSAFEGroupAliasPorts>
|
||||
<safetyApplicationHasTwinSAFEGroupAliasPort Id="c66ef078-cf59-4438-8086-6bcea2342270">
|
||||
@@ -150,5 +229,69 @@
|
||||
</targetUsages>
|
||||
</variable>
|
||||
</safetyApplicationHasVariables>
|
||||
<safetyApplicationHasVariables Id="9f4514e1-9b93-4f77-98e3-b4f82c8d63a0">
|
||||
<variable Id="4f4b32ec-8210-4d12-bf74-c098b4f1a4fe" name="xNotHaltCh1VonStringOk" isLocal="false">
|
||||
<sourceUsages>
|
||||
<variableHasSourceUsages Id="3c5f9a39-8613-49cc-a4fd-1ecbbff75b1f">
|
||||
<variableUsages Id="9d091da7-e8a1-4fe7-ae2a-15f406c76581">
|
||||
<usages>
|
||||
<variableUsagesHasUsages Id="6320735a-129d-4a25-a59b-4cb581d1ca0f">
|
||||
<aliasDeviceIoUsage Id="3f4f18b1-9f0e-438f-8bc8-f8a4dc2f2d4d" sdsId="26" channelId="2" functionId="1327742742" />
|
||||
</variableUsagesHasUsages>
|
||||
</usages>
|
||||
</variableUsages>
|
||||
</variableHasSourceUsages>
|
||||
</sourceUsages>
|
||||
<targetUsages>
|
||||
<variableHasTargetUsages Id="754eff0f-0cff-476a-96c1-baaf167d5021">
|
||||
<variableUsages Id="b861d26b-f707-4973-8bc2-9b1282177455">
|
||||
<usages>
|
||||
<variableUsagesHasUsages Id="d03fbf7b-e370-415e-b061-b0716140cec4">
|
||||
<fbPortUsage Id="4ef3ac4c-4e1c-4e13-ad3a-252c095a0e36">
|
||||
<functionBlockPort>
|
||||
<fbPortUsageReferencesFunctionBlockPort Id="d4e5b88f-dfb6-4ef5-8c69-456c66527a90">
|
||||
<inPortMoniker name="//Network2/FBEstop1/EStopIn1" />
|
||||
</fbPortUsageReferencesFunctionBlockPort>
|
||||
</functionBlockPort>
|
||||
</fbPortUsage>
|
||||
</variableUsagesHasUsages>
|
||||
</usages>
|
||||
</variableUsages>
|
||||
</variableHasTargetUsages>
|
||||
</targetUsages>
|
||||
</variable>
|
||||
</safetyApplicationHasVariables>
|
||||
<safetyApplicationHasVariables Id="b1cf7cb5-8947-429e-ad64-defc8f9df912">
|
||||
<variable Id="7d9a55d3-e277-4606-ab22-db87bed9ce87" name="xNotHaltCh2VonStringOk" isLocal="false">
|
||||
<sourceUsages>
|
||||
<variableHasSourceUsages Id="9cf33fd7-a70d-4166-9b8b-e84d745a98b9">
|
||||
<variableUsages Id="4c3c6e01-3fa1-4c82-b41b-829f00111784">
|
||||
<usages>
|
||||
<variableUsagesHasUsages Id="b4a81de1-551e-45ba-bc58-49388e8d2477">
|
||||
<aliasDeviceIoUsage Id="875b0684-6575-4081-8310-711b7f7c3ed7" sdsId="26" channelId="3" functionId="1327939349" />
|
||||
</variableUsagesHasUsages>
|
||||
</usages>
|
||||
</variableUsages>
|
||||
</variableHasSourceUsages>
|
||||
</sourceUsages>
|
||||
<targetUsages>
|
||||
<variableHasTargetUsages Id="259937ce-9093-4fc3-92d3-002768d25147">
|
||||
<variableUsages Id="677c0be5-b6ff-4da0-bc9c-446cc1adb084">
|
||||
<usages>
|
||||
<variableUsagesHasUsages Id="8194dfa1-0570-4d34-a346-ef281f46c781">
|
||||
<fbPortUsage Id="da53a1a5-febc-4674-a44f-2e5651cd3d07">
|
||||
<functionBlockPort>
|
||||
<fbPortUsageReferencesFunctionBlockPort Id="8f2570bb-7716-4753-a25f-ebed540e5881">
|
||||
<inPortMoniker name="//Network2/FBEstop1/EStopIn2" />
|
||||
</fbPortUsageReferencesFunctionBlockPort>
|
||||
</functionBlockPort>
|
||||
</fbPortUsage>
|
||||
</variableUsagesHasUsages>
|
||||
</usages>
|
||||
</variableUsages>
|
||||
</variableHasTargetUsages>
|
||||
</targetUsages>
|
||||
</variable>
|
||||
</safetyApplicationHasVariables>
|
||||
</variables>
|
||||
</safetyApplication>
|
||||
Reference in New Issue
Block a user