Last changes before SAT

This commit is contained in:
Matthias Heisig
2025-10-14 16:19:19 +02:00
parent eaaa2371e8
commit 2d65d0b3db
28 changed files with 630 additions and 352 deletions

View File

@@ -193,15 +193,6 @@
<BitOffs>136</BitOffs>
</SubItem>
</DataType>
<DataType>
<Name GUID="{18071995-0000-0000-0000-002000000003}" IecBaseType="true" BitType="true" AutoDeleteType="true" HideSubItems="true">ARRAY [0..2] OF BIT</Name>
<BitSize>3</BitSize>
<BaseType GUID="{18071995-0000-0000-0000-000000000010}">BIT</BaseType>
<ArrayInfo>
<LBound>0</LBound>
<Elements>3</Elements>
</ArrayInfo>
</DataType>
<DataType>
<Name GUID="{18071995-0000-0000-0000-002000000002}" IecBaseType="true" BitType="true" AutoDeleteType="true" HideSubItems="true">ARRAY [0..1] OF BIT</Name>
<BitSize>2</BitSize>
@@ -211,6 +202,15 @@
<Elements>2</Elements>
</ArrayInfo>
</DataType>
<DataType>
<Name GUID="{18071995-0000-0000-0000-002000000003}" IecBaseType="true" BitType="true" AutoDeleteType="true" HideSubItems="true">ARRAY [0..2] OF BIT</Name>
<BitSize>3</BitSize>
<BaseType GUID="{18071995-0000-0000-0000-000000000010}">BIT</BaseType>
<ArrayInfo>
<LBound>0</LBound>
<Elements>3</Elements>
</ArrayInfo>
</DataType>
<DataType>
<Name GUID="{CFB36F3F-28DF-4B2F-BE05-E9357D2B464E}" PersistentType="true">TestBench</Name>
<DisplayName TxtId=""><![CDATA[Test Bench events]]></DisplayName>
@@ -263,7 +263,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="{9C701697-89D3-568B-2A51-D299CC13321A}" TmcPath="PLC\PLC.tmc">
<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcHash="{7A0A10A8-E570-D90E-3A50-0E33EDF44656}" TmcPath="PLC\PLC.tmc">
<Name>PLC Instance</Name>
<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
<Vars VarGrpType="2" AreaNo="1">
@@ -1308,6 +1308,18 @@
<Name>MAIN._xEmergencyStopOk</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._fbSafety.xVoltagesInRange</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._fbSafety.xPressureInRange</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._fbSafety.xTemperaturesInRange</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN.xNAProtectionOK</Name>
<Type>BOOL</Type>
@@ -1321,18 +1333,6 @@
<Comment><![CDATA[ Hardware reset button]]></Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._fbSafety.xVoltagesInRange</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._fbSafety.xPressureInRange</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._fbSafety.xTemperaturesInRange</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._uiEtherCATState</Name>
<Comment><![CDATA[ String EtherCAT state]]></Comment>
@@ -1419,8 +1419,19 @@
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._afbStrings[0].xSafetyComError</Name>
<Comment><![CDATA[ Safety communication error]]></Comment>
<Name>MAIN._afbStrings[0].xLocalComError</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._afbStrings[0].xTempComError</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._afbStrings[0].xPressureComError</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._afbStrings[0].xVoltageComError</Name>
<Type>BOOL</Type>
</Var>
<Var>
@@ -4271,8 +4282,19 @@
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._afbStrings[1].xSafetyComError</Name>
<Comment><![CDATA[ Safety communication error]]></Comment>
<Name>MAIN._afbStrings[1].xLocalComError</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._afbStrings[1].xTempComError</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._afbStrings[1].xPressureComError</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN._afbStrings[1].xVoltageComError</Name>
<Type>BOOL</Type>
</Var>
<Var>
@@ -8538,11 +8560,20 @@ Bit1: Value bigger/equal Limit2]]></Comment>
<Entry Name="LocalSafety.xAllParamsOK_61" Index="#x7000" Sub="#x02">
<Type>BIT</Type>
</Entry>
<Entry Name="LocalSafety.SafetyComError_64" Index="#x7000" Sub="#x03">
<Entry Name="LocalSafety.LocalComError_64" Index="#x7000" Sub="#x03">
<Type>BIT</Type>
</Entry>
<Entry Name="LocalSafety.VoltageComError_65" Index="#x7000" Sub="#x04">
<Type>BIT</Type>
</Entry>
<Entry Name="LocalSafety.PressureComError_66" Index="#x7000" Sub="#x05">
<Type>BIT</Type>
</Entry>
<Entry Name="LocalSafety.TempComError_67" Index="#x7000" Sub="#x06">
<Type>BIT</Type>
</Entry>
<Entry>
<Type GUID="{18071995-0000-0000-0000-002000000005}">ARRAY [0..4] OF BIT</Type>
<Type GUID="{18071995-0000-0000-0000-002000000002}">ARRAY [0..1] OF BIT</Type>
</Entry>
</Pdo>
<Pdo Name="StandardOutputs" Index="#x17f0" InOut="1" Flags="#x2011" SyncMan="2">
@@ -26772,11 +26803,20 @@ Bit1: Value bigger/equal Limit2]]></Comment>
<Entry Name="LocalSafety.xAllParamsOK_61" Index="#x7000" Sub="#x02">
<Type>BIT</Type>
</Entry>
<Entry Name="LocalSafety.SafetyComError_64" Index="#x7000" Sub="#x03">
<Entry Name="LocalSafety.LocalComError_64" Index="#x7000" Sub="#x03">
<Type>BIT</Type>
</Entry>
<Entry Name="LocalSafety.VoltageComError_65" Index="#x7000" Sub="#x04">
<Type>BIT</Type>
</Entry>
<Entry Name="LocalSafety.PressureComError_66" Index="#x7000" Sub="#x05">
<Type>BIT</Type>
</Entry>
<Entry Name="LocalSafety.TempComError_67" Index="#x7000" Sub="#x06">
<Type>BIT</Type>
</Entry>
<Entry>
<Type GUID="{18071995-0000-0000-0000-002000000005}">ARRAY [0..4] OF BIT</Type>
<Type GUID="{18071995-0000-0000-0000-002000000002}">ARRAY [0..1] OF BIT</Type>
</Entry>
</Pdo>
<Pdo Name="StandardOutputs" Index="#x17f0" InOut="1" Flags="#x2011" SyncMan="2">
@@ -44415,8 +44455,11 @@ Bit1: Value smaller than Limit2]]></Comment>
</OwnerB>
<OwnerB Name="TIID^X103 (EtherCAT)^-41K1 (EK1100)^-48K1 (EK1122)^-10K1 X1 SCS S1 (EK1100)^=STRNG01-15K1 (EL2912)">
<Link VarA="PlcTask Inputs^MAIN._afbStrings[0].xDCCBOpen" VarB="StandardInputs^LocalSafety.DCCBOpen_19"/>
<Link VarA="PlcTask Inputs^MAIN._afbStrings[0].xSafetyComError" VarB="StandardInputs^LocalSafety.SafetyComError_64"/>
<Link VarA="PlcTask Inputs^MAIN._afbStrings[0].xLocalComError" VarB="StandardInputs^LocalSafety.LocalComError_64"/>
<Link VarA="PlcTask Inputs^MAIN._afbStrings[0].xPressureComError" VarB="StandardInputs^LocalSafety.PressureComError_66"/>
<Link VarA="PlcTask Inputs^MAIN._afbStrings[0].xSafetyIntlksOk" VarB="StandardInputs^LocalSafety.xAllParamsOK_61"/>
<Link VarA="PlcTask Inputs^MAIN._afbStrings[0].xTempComError" VarB="StandardInputs^LocalSafety.TempComError_67"/>
<Link VarA="PlcTask Inputs^MAIN._afbStrings[0].xVoltageComError" VarB="StandardInputs^LocalSafety.VoltageComError_65"/>
<Link VarA="PlcTask Outputs^MAIN._afbStrings[0].xCloseDCCB" VarB="StandardOutputs^LocalSafety.PLCCloseDCCB_17"/>
<Link VarA="PlcTask Outputs^MAIN._afbStrings[0].xResetSafetyDCCB" VarB="StandardOutputs^LocalSafety.PLCResetLocalMon_6"/>
<Link VarA="PlcTask Outputs^MAIN.xSafetyErrAck" VarB="StandardOutputs^LocalSafety.ErrAck_63"/>
@@ -44435,8 +44478,11 @@ Bit1: Value smaller than Limit2]]></Comment>
</OwnerB>
<OwnerB Name="TIID^X103 (EtherCAT)^-41K1 (EK1100)^-48K1 (EK1122)^-10K1 X1 SCS S2 (EK1100)^=STRNG02-15K1 (EL2912)">
<Link VarA="PlcTask Inputs^MAIN._afbStrings[1].xDCCBOpen" VarB="StandardInputs^LocalSafety.DCCBOpen_19"/>
<Link VarA="PlcTask Inputs^MAIN._afbStrings[1].xSafetyComError" VarB="StandardInputs^LocalSafety.SafetyComError_64"/>
<Link VarA="PlcTask Inputs^MAIN._afbStrings[1].xLocalComError" VarB="StandardInputs^LocalSafety.LocalComError_64"/>
<Link VarA="PlcTask Inputs^MAIN._afbStrings[1].xPressureComError" VarB="StandardInputs^LocalSafety.PressureComError_66"/>
<Link VarA="PlcTask Inputs^MAIN._afbStrings[1].xSafetyIntlksOk" VarB="StandardInputs^LocalSafety.xAllParamsOK_61"/>
<Link VarA="PlcTask Inputs^MAIN._afbStrings[1].xTempComError" VarB="StandardInputs^LocalSafety.TempComError_67"/>
<Link VarA="PlcTask Inputs^MAIN._afbStrings[1].xVoltageComError" VarB="StandardInputs^LocalSafety.VoltageComError_65"/>
<Link VarA="PlcTask Outputs^MAIN._afbStrings[1].xCloseDCCB" VarB="StandardOutputs^LocalSafety.PLCCloseDCCB_17"/>
<Link VarA="PlcTask Outputs^MAIN._afbStrings[1].xResetSafetyDCCB" VarB="StandardOutputs^LocalSafety.PLCResetLocalMon_6"/>
<Link VarA="PlcTask Outputs^MAIN.xSafetyErrAck" VarB="StandardOutputs^LocalSafety.ErrAck_63"/>