Some fixes before the FAT

- Refactored inverter Heartbeat check
- Added SafetyComError on EtherCAT checking
- Adjusted lower pressure value for safety plc from 200 mBar to 300mBar
This commit is contained in:
Matthias Heisig
2025-06-06 19:09:12 +02:00
parent 38f44128d1
commit 58f3c751d3
12 changed files with 826 additions and 882 deletions

View File

@@ -269,7 +269,7 @@
</System>
<Plc>
<Project GUID="{9AE64910-5EB2-4866-93FD-EFE059C38C36}" Name="PLC" PrjFilePath="PLC\PLC.plcproj" TmcFilePath="PLC\PLC.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" CopyTmcToTarget="true" CopyTpyToTarget="false" SymbolicMapping="true">
<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcHash="{6897FEAD-F22A-6122-B58E-0696201C9577}" TmcPath="PLC\PLC.tmc">
<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcHash="{55C23C39-543E-5832-4693-13ED9A590041}" TmcPath="PLC\PLC.tmc">
<Name>PLC Instance</Name>
<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
<Vars VarGrpType="2" AreaNo="1">
@@ -1328,11 +1328,6 @@
<Name>MAIN._fbSafety.xTemperaturesInRange</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._afbStrings[0].xSafetyComError</Name>
<Comment><![CDATA[ Safety communication error]]></Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._afbStrings[0].xECWcState</Name>
<Type>BOOL</Type>
@@ -1350,6 +1345,11 @@
<Comment><![CDATA[ Repair switch closed]]></Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._afbStrings[0].xSafetyComError</Name>
<Comment><![CDATA[ Safety communication error]]></Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._afbStrings[0].xSafetyIntlksOk</Name>
<Comment><![CDATA[ All safetyinterlocks from safety plc are ok]]></Comment>
@@ -4117,11 +4117,6 @@
EL30xx also sets this if an underrange or overrange error is present]]></Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._afbStrings[1].xSafetyComError</Name>
<Comment><![CDATA[ Safety communication error]]></Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._afbStrings[1].xECWcState</Name>
<Type>BOOL</Type>
@@ -4139,6 +4134,11 @@
<Comment><![CDATA[ Repair switch closed]]></Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._afbStrings[1].xSafetyComError</Name>
<Comment><![CDATA[ Safety communication error]]></Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._afbStrings[1].xSafetyIntlksOk</Name>
<Comment><![CDATA[ All safetyinterlocks from safety plc are ok]]></Comment>