Merge branch 'feature/ManualModeSwitch' into develop
# Conflicts: # PLC/PLC.tmc # PLC/POUs/FB_String.TcPOU # PLC/POUs/MAIN.TcPOU # Uniper.tsproj
This commit is contained in:
Matthias Heisig
251
Uniper.tsproj
251
Uniper.tsproj
@@ -211,175 +211,6 @@
|
||||
<Elements>2</Elements>
|
||||
</ArrayInfo>
|
||||
</DataType>
|
||||
<DataType>
|
||||
<Name GUID="{E80DD7BA-FA01-494C-9EFA-D70175C5A769}" PersistentType="true">Valve</Name>
|
||||
<DisplayName TxtId=""><![CDATA[NewEventClass_DisplayText]]></DisplayName>
|
||||
<EventId>
|
||||
<Name Id="1">DidNotOpen</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Valve {0} did not open]]></DisplayName>
|
||||
<Severity>Error</Severity>
|
||||
</EventId>
|
||||
<EventId>
|
||||
<Name Id="2">DidNotClose</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Valve {0} did not close]]></DisplayName>
|
||||
<Severity>Error</Severity>
|
||||
</EventId>
|
||||
<EventId>
|
||||
<Name Id="3">AnalogFeedbackOC</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Valve {0} feedback open circuit]]></DisplayName>
|
||||
<Severity>Error</Severity>
|
||||
</EventId>
|
||||
<EventId>
|
||||
<Name Id="4">AnalogOutputOC</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Valve {0} setpoint open circuit]]></DisplayName>
|
||||
<Severity>Error</Severity>
|
||||
</EventId>
|
||||
<EventId>
|
||||
<Name Id="5">NotInRange</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Valve {0} not in range]]></DisplayName>
|
||||
<Severity>Error</Severity>
|
||||
</EventId>
|
||||
<Hides>
|
||||
<Hide GUID="{A66B1A96-231E-4D22-984B-B87F2C52E839}"/>
|
||||
<Hide GUID="{8D2936D5-25F2-47C8-97B6-4481B7AAD8F3}"/>
|
||||
<Hide GUID="{96DFB2DE-AF09-4551-9778-F003B06E04B7}"/>
|
||||
<Hide GUID="{3A6B8F21-36EE-4C1B-AF71-DDA93E1487C9}"/>
|
||||
<Hide GUID="{36CE3237-F78C-4684-A4BE-F21EBBAD18C5}"/>
|
||||
<Hide GUID="{24213FB9-3972-44F6-8515-7BA9D877156C}"/>
|
||||
</Hides>
|
||||
</DataType>
|
||||
<DataType>
|
||||
<Name GUID="{0B767148-8FC5-4340-B6EB-6151E49FC9FF}" PersistentType="true">AnalogInput</Name>
|
||||
<DisplayName TxtId=""><![CDATA[EventClass2_DisplayText]]></DisplayName>
|
||||
<EventId>
|
||||
<Name Id="1">AIOpenCircuit</Name>
|
||||
<DisplayName TxtId=""><![CDATA[{0} input open circuit]]></DisplayName>
|
||||
<Severity>Error</Severity>
|
||||
</EventId>
|
||||
<EventId>
|
||||
<Name Id="2">AICardFailure</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Analog Input {0} card error]]></DisplayName>
|
||||
<Severity>Error</Severity>
|
||||
</EventId>
|
||||
<EventId>
|
||||
<Name Id="3">AIShortCircuit</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Analog Input {0} short circuit]]></DisplayName>
|
||||
<Severity>Error</Severity>
|
||||
</EventId>
|
||||
<EventId>
|
||||
<Name Id="4">AIConfigError</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Analog Input {0} configuration error]]></DisplayName>
|
||||
<Severity>Error</Severity>
|
||||
</EventId>
|
||||
<EventId>
|
||||
<Name Id="5">ErrorLow</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Analog Input {0}: Input Value below error limit ({1})]]></DisplayName>
|
||||
<Severity>Error</Severity>
|
||||
</EventId>
|
||||
<EventId>
|
||||
<Name Id="6">WarningLow</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Analog Input {0}: Input Value below warning limit ({1})]]></DisplayName>
|
||||
<Severity>Warning</Severity>
|
||||
</EventId>
|
||||
<EventId>
|
||||
<Name Id="7">WarningHigh</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Analog Input {0}: Input Value above warning limit ({1})]]></DisplayName>
|
||||
<Severity>Warning</Severity>
|
||||
</EventId>
|
||||
<EventId>
|
||||
<Name Id="8">ErrorHigh</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Analog Input {0}: Input Value above error limit ({1})]]></DisplayName>
|
||||
<Severity>Error</Severity>
|
||||
</EventId>
|
||||
<Hides>
|
||||
<Hide GUID="{CFDBCB17-E009-47CB-8A48-51761620D915}"/>
|
||||
<Hide GUID="{5E91174A-345C-4D54-8553-597C5E766BAF}"/>
|
||||
<Hide GUID="{86CD9907-35FF-480E-984B-6EFADE355DCD}"/>
|
||||
<Hide GUID="{BC062530-6B1F-4820-A83D-33A4FB6C0C84}"/>
|
||||
<Hide GUID="{44250485-E247-49CF-9C69-8B4A83218CB2}"/>
|
||||
<Hide GUID="{D3C401D7-7A06-4D3C-B4ED-7DC241738A86}"/>
|
||||
<Hide GUID="{491585E4-F904-46E4-8B7A-9E2E09D0776D}"/>
|
||||
<Hide GUID="{E651709D-C546-4D1A-AAF4-C04C86D8BBCC}"/>
|
||||
<Hide GUID="{C86A293A-2791-4AD8-8B78-23D947BEEC89}"/>
|
||||
<Hide GUID="{C77DE3ED-386D-4374-B6DC-C8CB11D67580}"/>
|
||||
<Hide GUID="{38F14EC9-A62F-4644-93C3-CA6A2EE67BF5}"/>
|
||||
</Hides>
|
||||
</DataType>
|
||||
<DataType>
|
||||
<Name GUID="{8BFB4FDD-3EEC-40D7-987E-004CDA8B9B54}" PersistentType="true">AnalogOutput</Name>
|
||||
<DisplayName TxtId=""><![CDATA[EventClass3_DisplayText]]></DisplayName>
|
||||
<EventId>
|
||||
<Name Id="1">ConfigError</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Analog output {0} config error]]></DisplayName>
|
||||
<Severity>Error</Severity>
|
||||
</EventId>
|
||||
<Hides>
|
||||
<Hide GUID="{54E80CE6-E875-4F9C-8D39-994706A44F88}"/>
|
||||
</Hides>
|
||||
</DataType>
|
||||
<DataType>
|
||||
<Name GUID="{BF1D9A4D-48E1-4CE9-9A52-161E93CC0C6D}" PersistentType="true">Motor</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Motor events]]></DisplayName>
|
||||
<EventId>
|
||||
<Name Id="1">MCBTripped</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Motor {0} MCB tripped]]></DisplayName>
|
||||
<Severity>Error</Severity>
|
||||
</EventId>
|
||||
<EventId>
|
||||
<Name Id="2">RepairSwitchOpen</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Motor {0} repair switch open]]></DisplayName>
|
||||
<Severity>Error</Severity>
|
||||
</EventId>
|
||||
<EventId>
|
||||
<Name Id="3">NotInTarget</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Motor {0} not in target]]></DisplayName>
|
||||
<Severity>Error</Severity>
|
||||
</EventId>
|
||||
<Hides>
|
||||
<Hide GUID="{CD94E289-CD48-4A3B-883C-E499B8084333}"/>
|
||||
<Hide GUID="{0C25CDAF-808F-44FD-9C1B-E5B09043546B}"/>
|
||||
</Hides>
|
||||
</DataType>
|
||||
<DataType>
|
||||
<Name GUID="{5466C29D-AD56-41C6-975E-83491F74ED8B}" PersistentType="true">ORPSensor</Name>
|
||||
<DisplayName TxtId=""><![CDATA[ORP Sensor Events]]></DisplayName>
|
||||
<EventId>
|
||||
<Name Id="1">NotConnected</Name>
|
||||
<DisplayName TxtId=""><![CDATA[ORP Sensor {0} notconnected]]></DisplayName>
|
||||
<Severity>Warning</Severity>
|
||||
</EventId>
|
||||
<EventId>
|
||||
<Name Id="2">MaintenanceRequired</Name>
|
||||
<DisplayName TxtId=""><![CDATA[ORP Sensor {0} maintenance required]]></DisplayName>
|
||||
<Severity>Warning</Severity>
|
||||
</EventId>
|
||||
<EventId>
|
||||
<Name Id="3">CalibrationRequired</Name>
|
||||
<DisplayName TxtId=""><![CDATA[ORP Sensor {0} calibration required]]></DisplayName>
|
||||
<Severity>Warning</Severity>
|
||||
</EventId>
|
||||
<EventId>
|
||||
<Name Id="4">ChangeSensor</Name>
|
||||
<DisplayName TxtId=""><![CDATA[ORP Sensor {0} requires change of sensor]]></DisplayName>
|
||||
<Severity>Warning</Severity>
|
||||
</EventId>
|
||||
<Hides>
|
||||
<Hide GUID="{97127F9E-2976-45D3-9492-641711C64B55}"/>
|
||||
<Hide GUID="{61126A0A-4204-4E1D-B1AC-1E6F4AE81250}"/>
|
||||
<Hide GUID="{32EB06D3-F8B3-4A5E-8DC6-8BD2F9E634D1}"/>
|
||||
<Hide GUID="{E764B929-1547-4D29-BDAC-05C9047988C0}"/>
|
||||
<Hide GUID="{FF9A57E6-A3C7-4D22-B084-6DBB7E11D933}"/>
|
||||
</Hides>
|
||||
</DataType>
|
||||
<DataType>
|
||||
<Name GUID="{C1141D67-F77A-4C56-9A6D-82359097C6E6}" PersistentType="true">SafetyDoor</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Safety door errors]]></DisplayName>
|
||||
<EventId>
|
||||
<Name Id="1">SafetyNotOk</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Safety Door {0} not ok]]></DisplayName>
|
||||
<Severity>Error</Severity>
|
||||
</EventId>
|
||||
</DataType>
|
||||
<DataType>
|
||||
<Name GUID="{CFB36F3F-28DF-4B2F-BE05-E9357D2B464E}" PersistentType="true">TestBench</Name>
|
||||
<DisplayName TxtId=""><![CDATA[Test Bench events]]></DisplayName>
|
||||
@@ -439,7 +270,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="{EF59466B-E9F3-64A6-7CD8-A94E7152C4DB}" TmcPath="PLC\PLC.tmc">
|
||||
<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcHash="{3746FC02-B3A8-434D-F26F-358D6D1B8911}" TmcPath="PLC\PLC.tmc">
|
||||
<Name>PLC Instance</Name>
|
||||
<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
|
||||
<Vars VarGrpType="2" AreaNo="1">
|
||||
@@ -448,21 +279,6 @@
|
||||
<Name>MAIN._xShowAckEmergencyStop</Name>
|
||||
<Type>BOOL</Type>
|
||||
</Var>
|
||||
<Var>
|
||||
<Name>MAIN.xSafetyRun</Name>
|
||||
<Comment><![CDATA[ UPS
|
||||
_fbUPS : FB_S_UPS_BAPI;
|
||||
Safety]]></Comment>
|
||||
<Type>BOOL</Type>
|
||||
</Var>
|
||||
<Var>
|
||||
<Name>MAIN.xSafetyErrAck</Name>
|
||||
<Type>BOOL</Type>
|
||||
</Var>
|
||||
<Var>
|
||||
<Name>MAIN._xShowErrorOnButton</Name>
|
||||
<Type>BOOL</Type>
|
||||
</Var>
|
||||
<Var>
|
||||
<Name>MAIN._afbStrings[0].xCloseDCCB</Name>
|
||||
<Comment><![CDATA[ Signal to close dc circuit breaker]]></Comment>
|
||||
@@ -1467,6 +1283,19 @@ _fbUPS : FB_S_UPS_BAPI;
|
||||
<Comment><![CDATA[ Motor speed setpoint]]></Comment>
|
||||
<Type>INT</Type>
|
||||
</Var>
|
||||
<Var>
|
||||
<Name>MAIN.xSafetyRun</Name>
|
||||
<Comment><![CDATA[ Safety]]></Comment>
|
||||
<Type>BOOL</Type>
|
||||
</Var>
|
||||
<Var>
|
||||
<Name>MAIN.xSafetyErrAck</Name>
|
||||
<Type>BOOL</Type>
|
||||
</Var>
|
||||
<Var>
|
||||
<Name>MAIN._xShowErrorOnButton</Name>
|
||||
<Type>BOOL</Type>
|
||||
</Var>
|
||||
</Vars>
|
||||
<Vars VarGrpType="1">
|
||||
<Name>PlcTask Inputs</Name>
|
||||
@@ -1478,32 +1307,6 @@ _fbUPS : FB_S_UPS_BAPI;
|
||||
<Name>MAIN._xString1DCSafetyOk</Name>
|
||||
<Type>BOOL</Type>
|
||||
</Var>
|
||||
<Var>
|
||||
<Name>MAIN.xSafetyResterTaster</Name>
|
||||
<Type>BOOL</Type>
|
||||
</Var>
|
||||
<Var>
|
||||
<Name>MAIN._xHarwareResetButton</Name>
|
||||
<Comment><![CDATA[ Hardware reset button]]></Comment>
|
||||
<Type>BOOL</Type>
|
||||
</Var>
|
||||
<Var>
|
||||
<Name>MAIN._uiEtherCATState</Name>
|
||||
<Comment><![CDATA[ String EtherCAT state]]></Comment>
|
||||
<Type>UINT</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._afbStrings[0].xSafetyIntlksOk</Name>
|
||||
<Comment><![CDATA[ All safetyinterlocks from safety plc are ok]]></Comment>
|
||||
@@ -7028,6 +6831,32 @@ _fbUPS : FB_S_UPS_BAPI;
|
||||
EL30xx also sets this if an underrange or overrange error is present]]></Comment>
|
||||
<Type>BOOL</Type>
|
||||
</Var>
|
||||
<Var>
|
||||
<Name>MAIN.xSafetyResterTaster</Name>
|
||||
<Type>BOOL</Type>
|
||||
</Var>
|
||||
<Var>
|
||||
<Name>MAIN._xHarwareResetButton</Name>
|
||||
<Comment><![CDATA[ Hardware reset button]]></Comment>
|
||||
<Type>BOOL</Type>
|
||||
</Var>
|
||||
<Var>
|
||||
<Name>MAIN._uiEtherCATState</Name>
|
||||
<Comment><![CDATA[ String EtherCAT state]]></Comment>
|
||||
<Type>UINT</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>
|
||||
</Vars>
|
||||
<Contexts>
|
||||
<Context>
|
||||
|
||||
Reference in New Issue
Block a user