Change E-Stop so that it can also work with one string

- Also optimized CV charging
This commit is contained in:
Matthias Heisig
2025-10-07 16:23:37 +02:00
parent 8ea7fd74e2
commit eaaa2371e8
16 changed files with 689 additions and 346 deletions

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<GlobalVariables Crc="2758743379" Id="12c44f92-6465-47ce-89f7-613cad033491" FileFormatVersion="1.0">
<GlobalVariables Crc="3854622282" Id="12c44f92-6465-47ce-89f7-613cad033491" FileFormatVersion="1.0">
<Variable Id="b420cc6c-39c2-4c75-bb48-acf00ba7ef01">
<Name>xNotHaltSchaltschrankCh1</Name>
<SourceUsages>
@@ -148,71 +148,14 @@
</AliasDeviceIoUsage>
</SourceUsages>
<TargetUsages>
<FbPortUsage Id="ff5ea199-1009-4785-8d72-be95f6550c6f">
<FbPortUsage Id="346a3822-ed04-4fde-b077-52f1bf6c8a13">
<ModelElementId>f40fa17f-ee60-40e6-afd0-a4ff3f333ac1</ModelElementId>
</FbPortUsage>
<FbPortUsage Id="8a6ba4fa-a957-4c48-bd73-bf304f69c43f">
<ModelElementId>c5035e66-889e-4017-b2b8-035e1758dbe6</ModelElementId>
<FbPortUsage Id="a31f1a6e-c6d7-4f76-84c0-593dc80c2942">
<ModelElementId>497dfd32-770c-4ea1-8d8b-42400c79a8b8</ModelElementId>
</FbPortUsage>
</TargetUsages>
</Variable>
<Variable Id="3666207e-b87b-470a-a00e-dc8cf9a39624">
<Name>xNotHaltRegalString1Ch1</Name>
<SourceUsages>
<AliasDeviceIoUsage Id="90f72321-a8ee-4498-b2f3-5e6ee9fe60a1">
<SdsId>26</SdsId>
<ChannelId>2</ChannelId>
<FunctionId>1327742742</FunctionId>
</AliasDeviceIoUsage>
</SourceUsages>
<TargetUsages>
<FbPortUsage Id="70132f8b-086b-47c0-878a-80b0545c1054">
<ModelElementId>0208ec07-4e73-4e98-82f9-f5ec1fc51646</ModelElementId>
</FbPortUsage>
</TargetUsages>
</Variable>
<Variable Id="b89e5a29-9951-4f77-87d6-c370b60789c8">
<Name>xNotHaltRegalString1Ch2</Name>
<SourceUsages>
<AliasDeviceIoUsage Id="43aa494e-e8e2-4162-a0b3-60c87a4f58eb">
<SdsId>26</SdsId>
<ChannelId>3</ChannelId>
<FunctionId>1327939349</FunctionId>
</AliasDeviceIoUsage>
</SourceUsages>
<TargetUsages>
<FbPortUsage Id="9f457ba6-1e36-4f06-a2aa-2444fbd3f314">
<ModelElementId>5ae9a84e-e023-421e-9861-820a4c425bb2</ModelElementId>
</FbPortUsage>
</TargetUsages>
</Variable>
<Variable Id="73fa5b99-a58a-4c74-817d-5d26701aa3d8">
<Name>xNotHaltRegalString2Ch1</Name>
<SourceUsages>
<AliasDeviceIoUsage Id="162771af-9e00-4ce6-a509-dad6107718e1">
<SdsId>27</SdsId>
<ChannelId>2</ChannelId>
<FunctionId>1327742742</FunctionId>
</AliasDeviceIoUsage>
</SourceUsages>
<TargetUsages>
<FbPortUsage Id="d2a06f2c-b1b8-43ce-a402-544839fc1e43">
<ModelElementId>53a11715-872f-4c57-98dd-0522c0f608a5</ModelElementId>
</FbPortUsage>
</TargetUsages>
</Variable>
<Variable Id="eb89a43f-f715-4c55-9198-694215469e51">
<Name>xNotHaltRegalString2Ch2</Name>
<SourceUsages>
<AliasDeviceIoUsage Id="98dd3d02-59d1-43b2-969b-0267fb3be628">
<SdsId>27</SdsId>
<ChannelId>3</ChannelId>
<FunctionId>1327939349</FunctionId>
</AliasDeviceIoUsage>
</SourceUsages>
<TargetUsages>
<FbPortUsage Id="d3967535-7b6b-4dcb-bd50-1c8da7bd0651">
<ModelElementId>e4e16c14-19bb-47d4-95cc-878ecfaa10b1</ModelElementId>
<FbPortUsage Id="81e8678c-cf7d-43d1-b14e-3c90fcb3e005">
<ModelElementId>336968a3-e5f5-4dd8-a188-11d2e30ce80e</ModelElementId>
</FbPortUsage>
</TargetUsages>
</Variable>
@@ -276,4 +219,56 @@
</FbPortUsage>
</TargetUsages>
</Variable>
<Variable Id="470a26a4-f34a-41f5-9dc7-8b857cf4fdda">
<Name>xNotHaltRegalString1Ok</Name>
<SourceUsages>
<FbPortUsage Id="544b610d-0c8e-41b0-b22a-50781eaa3c73">
<ModelElementId>5257f24c-a541-4d7e-a17c-47c0eb1c0658</ModelElementId>
</FbPortUsage>
</SourceUsages>
<TargetUsages>
<FbPortUsage Id="8f55662e-9514-4f80-adfc-74c7c488fc94">
<ModelElementId>34590447-ed64-453b-a1b9-a2c43b9ea301</ModelElementId>
</FbPortUsage>
</TargetUsages>
</Variable>
<Variable Id="a206d633-4703-4d1d-b69b-7558aa4b78f1">
<Name>xNotHaltRegalString2Ok</Name>
<SourceUsages>
<FbPortUsage Id="276c6fe1-06ba-41a9-a7af-168bfadb8f51">
<ModelElementId>e592f68f-b4c4-4a31-9939-cfe184190178</ModelElementId>
</FbPortUsage>
</SourceUsages>
<TargetUsages>
<FbPortUsage Id="ef267542-db9d-4032-acde-bc7a414a4659">
<ModelElementId>7d674340-ae8f-4834-bfc9-50845e6344e7</ModelElementId>
</FbPortUsage>
</TargetUsages>
</Variable>
<Variable Id="34175068-eb12-4ad7-ac89-538b91b7f333">
<Name>xNotHaltRegalString1OkDelay</Name>
<SourceUsages>
<FbPortUsage Id="b1801235-cc04-43da-897d-e7aff47d4166">
<ModelElementId>3f849045-0b93-4743-8e4f-168a6bcf5af1</ModelElementId>
</FbPortUsage>
</SourceUsages>
<TargetUsages>
<FbPortUsage Id="9415cf4c-d4cb-402b-a172-9418d845837c">
<ModelElementId>437b7852-b2f1-47fa-8d91-5eb8a49ea9f6</ModelElementId>
</FbPortUsage>
</TargetUsages>
</Variable>
<Variable Id="00334237-19c0-45b1-a8f2-4c034ae45ee0">
<Name>xNotHaltRegalString2OkDelay</Name>
<SourceUsages>
<FbPortUsage Id="b629d26d-451b-4b4c-b564-74407792e735">
<ModelElementId>8f1f6df5-d9cf-4c65-8a05-70dcbe95667a</ModelElementId>
</FbPortUsage>
</SourceUsages>
<TargetUsages>
<FbPortUsage Id="a025a4b8-f286-4167-a489-48b95dd52e8c">
<ModelElementId>f12cd8e1-ce57-4e8d-bce8-837114286a11</ModelElementId>
</FbPortUsage>
</TargetUsages>
</Variable>
</GlobalVariables>