Skip to content

Commit d12bfa6

Browse files
authored
Merge pull request #43 from EuropeanSpallationSource/MBP-369-slits-multimaster
MBP-369: Slits multimaster
2 parents 799d04f + f91dd46 commit d12bfa6

File tree

6 files changed

+663
-258
lines changed

6 files changed

+663
-258
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<TcPlcObject Version="1.1.0.1">
3+
<DUT Name="ST_AxisParamSpec" Id="{786e4eb1-46f0-0178-3b79-82a7fdcac1a2}">
4+
<Declaration><![CDATA[TYPE ST_AxisParamSpec :
5+
STRUCT
6+
eParam: E_AxisParameters;
7+
fValue: LREAL;
8+
END_STRUCT
9+
END_TYPE
10+
]]></Declaration>
11+
</DUT>
12+
</TcPlcObject>

DUTs/E_AxisParamCheckState.TcDUT

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<TcPlcObject Version="1.1.0.1">
3+
<DUT Name="E_AxisParamCheckState" Id="{1344f39b-70f2-0dc2-3c34-7a926795d442}">
4+
<Declaration><![CDATA[{attribute 'qualified_only'}
5+
{attribute 'strict'}
6+
TYPE E_AxisParamCheckState :
7+
(
8+
eInit,
9+
eSelectParam,
10+
eWaitRead,
11+
eCheck,
12+
eParamValid,
13+
eParamInvalid,
14+
eNext,
15+
eFinish
16+
);
17+
END_TYPE
18+
]]></Declaration>
19+
</DUT>
20+
</TcPlcObject>

DUTs/E_AxisParameters.TcTLEO

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<EnumerationTextList Name="E_AxisParameters" Id="{9199cc42-106a-4663-aaa5-d49855d9aa9f}">
44
<Declaration><![CDATA[{attribute 'qualified_only'}
55
{attribute 'strict'}
6+
{attribute 'to_string'}
67
TYPE E_AxisParameters :
78
(
89
//PLCopen specific parameters Index-Group 0x4000 + ID

DUTs/E_SlitPairStates.TcDUT

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,26 @@
55
{attribute 'strict'}
66
TYPE E_SlitPairStates :
77
(
8-
INIT := 0,
9-
INIT_CLEAR_GEARING,
10-
INIT_GEAROUT_CHECK,
11-
CHECK_HOME_STATUS,
12-
HOME_BLADES,
13-
CHECK_BLADE_HOME_COMPLETE,
14-
HOME_GAP,
15-
CHECK_GAP_HOME_COMPLETE,
16-
GEARIN_SLITS,
17-
CHECK_GEARIN_SLITS_COMPLETE,
18-
SLITS_OPERATIONAL,
19-
GEAROUT_BLADES,
20-
CHECK_GEAROUT_COMPLETE,
21-
CLEAR_GAP_CALIBRATION,
22-
ERROR,
23-
ERROR_GEAROUT,
24-
ERROR_GEAROUT_CHECK,
25-
ERROR_RESET_AXES,
26-
ERROR_RESET_CHECK
8+
eStartup := 0,
9+
eInit,
10+
eInitClearGearing,
11+
eInitGearOutCheck,
12+
eCheckHomeStatus,
13+
eHomeBlades,
14+
eCheckBladeHomeComplete,
15+
eHomeGap,
16+
eCheckGapHomeComplete,
17+
eGearInSlits,
18+
eCheckGearInSlitsComplete,
19+
eSlitsOperational,
20+
eGearOutBlades,
21+
eCheckGearOutComplete,
22+
eResetCalibration,
23+
eError,
24+
eErrorGearOut,
25+
eErrorGearOutCheck,
26+
eErrorResetAxes,
27+
eErrorResetCheck
2728
);
2829
END_TYPE
2930
]]></Declaration>

DUTs/E_SlitSoftLimits.TcDUT

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<TcPlcObject Version="1.1.0.1">
3+
<DUT Name="E_SlitSoftLimits" Id="{5a8c53db-c513-01b1-1e81-1ca22261b4f2}">
4+
<Declaration><![CDATA[{attribute 'qualified_only'}
5+
{attribute 'strict'}
6+
TYPE E_SlitSoftLimits :
7+
(
8+
eStart := 0,
9+
eWriteGapCentreFwd,
10+
eWriteGapCentreBwd,
11+
eWriteGapSizeFwd,
12+
eFinish
13+
);
14+
END_TYPE
15+
]]></Declaration>
16+
</DUT>
17+
</TcPlcObject>

0 commit comments

Comments
 (0)