Skip to content
Snippets Groups Projects
Commit e5157dbc authored by Javier Cereijo Garcia's avatar Javier Cereijo Garcia
Browse files

Merge branch 'master' into 'master' 

MEBT EMU motion: updated motor record instance names

See merge request !30
parents a0b3e07f d43636b8
No related branches found
No related tags found
1 merge request!30MEBT EMU motion: updated motor record instance names
Pipeline #116293 failed
Stage: deploy
    Hide whitespace changes
    Inline Side-by-side
    99-Shared/emumotion/MEBTEMUmotion.bob
    + 8
    − 8
    View file @ e5157dbc
    ...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
    <widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
    <name>Embedded Display</name> <name>Embedded Display</name>
    <macros> <macros>
    <M>Slit-Axis1</M> <M>Axis</M>
    <P>PBI-EMU02:Ctrl-ECAT-100:</P> <P>MEBT-010:PBI-EMUS-001:</P>
    <R>$(M)-</R> <R>$(M)-</R>
    </macros> </macros>
    <file>ecmcOneAxisOperator.bob</file> <file>ecmcOneAxisOperator.bob</file>
    ...@@ -56,8 +56,8 @@ ...@@ -56,8 +56,8 @@
    <widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
    <name>Embedded Display_1</name> <name>Embedded Display_1</name>
    <macros> <macros>
    <M>Slit-Axis2</M> <M>Axis</M>
    <P>PBI-EMU02:Ctrl-ECAT-100:</P> <P>MEBT-010:PBI-EMUS-002:</P>
    <R>$(M)-</R> <R>$(M)-</R>
    </macros> </macros>
    <file>ecmcOneAxisOperator.bob</file> <file>ecmcOneAxisOperator.bob</file>
    ...@@ -69,8 +69,8 @@ ...@@ -69,8 +69,8 @@
    <widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
    <name>Embedded Display_2</name> <name>Embedded Display_2</name>
    <macros> <macros>
    <M>Grid-Axis1</M> <M>Axis</M>
    <P>PBI-EMU02:Ctrl-ECAT-100:</P> <P>MEBT-010:PBI-EMUG-001:</P>
    <R>$(M)-</R> <R>$(M)-</R>
    </macros> </macros>
    <file>ecmcOneAxisOperator.bob</file> <file>ecmcOneAxisOperator.bob</file>
    ...@@ -82,8 +82,8 @@ ...@@ -82,8 +82,8 @@
    <widget type="embedded" version="2.0.0"> <widget type="embedded" version="2.0.0">
    <name>Embedded Display_3</name> <name>Embedded Display_3</name>
    <macros> <macros>
    <M>Grid-Axis2</M> <M>Axis</M>
    <P>PBI-EMU02:Ctrl-ECAT-100:</P> <P>MEBT-010:PBI-EMUG-002:</P>
    <R>$(M)-</R> <R>$(M)-</R>
    </macros> </macros>
    <file>ecmcOneAxisOperator.bob</file> <file>ecmcOneAxisOperator.bob</file>
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment