Skip to content

Commit

Permalink
Merge remote-tracking branch 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
tboegi committed May 20, 2024
2 parents 41d916c + 464f59b commit b548037
Show file tree
Hide file tree
Showing 3 changed files with 137 additions and 15 deletions.
83 changes: 72 additions & 11 deletions ethercatmcExApp/op/Boy/IOC.opi
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ $(pv_value)</tooltip>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
<actions hook="false" hook_all="false">
<action type="OPEN_DISPLAY">
<path>motor-2-pils.opi</path>
<path>motor-2.opi</path>
<macros>
<include_parent_macros>true</include_parent_macros>
<PREFIX>LabS-MCAG:MC-MCU-19:</PREFIX>
Expand Down Expand Up @@ -487,7 +487,7 @@ $(pv_value)</tooltip>
</foreground_color>
<height>31</height>
<image></image>
<name>Action Button_8</name>
<name>Action Button_2</name>
<push_action_index>0</push_action_index>
<pv_name></pv_name>
<pv_value />
Expand All @@ -499,17 +499,78 @@ $(pv_value)</tooltip>
</scale_options>
<scripts />
<style>0</style>
<text>MC-MCU019</text>
<text>MC-MCU019-ads</text>
<toggle_button>false</toggle_button>
<tooltip>$(pv_name)
$(pv_value)</tooltip>
<visible>true</visible>
<widget_type>Action Button</widget_type>
<width>180</width>
<wuid>1d681a25:1922fd92503:-61ae</wuid>
<wuid>656a2d8c:15258ee659a:-788d</wuid>
<x>0</x>
<y>252</y>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
<actions hook="false" hook_all="false">
<action type="OPEN_DISPLAY">
<path>motor-4-pils.opi</path>
<macros>
<include_parent_macros>true</include_parent_macros>
<PREFIX>LabS-MCAG:MC-MCU-19:</PREFIX>
<P>LabS-MCAG:MC-MCU-19:</P>
<M1>m1</M1>
<M2>m2</M2>
<M3>m3</M3>
<M4>m4</M4>
</macros>
<mode>1</mode>
<description></description>
</action>
</actions>
<alarm_pulsing>false</alarm_pulsing>
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
<background_color>
<color red="240" green="240" blue="240" />
</background_color>
<border_alarm_sensitive>false</border_alarm_sensitive>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
<border_style>0</border_style>
<border_width>1</border_width>
<enabled>true</enabled>
<font>
<opifont.name fontName=".SF NS Text" height="11" style="0" pixels="false">Default</opifont.name>
</font>
<forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
<foreground_color>
<color red="0" green="0" blue="0" />
</foreground_color>
<height>31</height>
<image></image>
<name>Action Button_2</name>
<push_action_index>0</push_action_index>
<pv_name></pv_name>
<pv_value />
<rules />
<scale_options>
<width_scalable>true</width_scalable>
<height_scalable>true</height_scalable>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<scripts />
<style>0</style>
<text>MC-MCU019-pils</text>
<toggle_button>false</toggle_button>
<tooltip>$(pv_name)
$(pv_value)</tooltip>
<visible>true</visible>
<widget_type>Action Button</widget_type>
<width>180</width>
<wuid>656a2d8c:15258ee659a:-788d</wuid>
<x>0</x>
<y>288</y>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
<actions hook="false" hook_all="false">
<action type="OPEN_DISPLAY">
Expand Down Expand Up @@ -569,7 +630,7 @@ $(pv_value)</tooltip>
<width>180</width>
<wuid>1d681a25:1522fd92503:-61ae</wuid>
<x>0</x>
<y>288</y>
<y>324</y>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
<actions hook="false" hook_all="false">
Expand Down Expand Up @@ -630,7 +691,7 @@ $(pv_value)</tooltip>
<width>180</width>
<wuid>1d681a25:1522fd92503:-61ae</wuid>
<x>0</x>
<y>324</y>
<y>360</y>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
<actions hook="false" hook_all="false">
Expand Down Expand Up @@ -689,7 +750,7 @@ $(pv_value)</tooltip>
<width>180</width>
<wuid>1d681a25:1522fd92503:-61ae</wuid>
<x>0</x>
<y>360</y>
<y>396</y>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
<actions hook="false" hook_all="false">
Expand Down Expand Up @@ -750,7 +811,7 @@ $(pv_value)</tooltip>
<width>180</width>
<wuid>1d681a25:1522fd92503:-61ae</wuid>
<x>0</x>
<y>396</y>
<y>432</y>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
<actions hook="false" hook_all="false">
Expand Down Expand Up @@ -808,7 +869,7 @@ $(pv_value)</tooltip>
<width>180</width>
<wuid>61faf7d7:15c52a5e3ff:-7ec9</wuid>
<x>0</x>
<y>432</y>
<y>468</y>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
<actions hook="false" hook_all="false">
Expand Down Expand Up @@ -865,7 +926,7 @@ $(pv_value)</tooltip>
<width>180</width>
<wuid>1d681a25:1522fd92503:-61af</wuid>
<x>0</x>
<y>468</y>
<y>504</y>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
<actions hook="false" hook_all="false">
Expand Down Expand Up @@ -922,7 +983,7 @@ $(pv_value)</tooltip>
<width>180</width>
<wuid>1d681a25:1522fd92503:-61af</wuid>
<x>0</x>
<y>504</y>
<y>540</y>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
<actions hook="false" hook_all="false">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
<actions hook="false" hook_all="false">
<action type="OPEN_DISPLAY">
<path>motor-2-pils.opi</path>
<path>motor-2.opi</path>
<macros>
<include_parent_macros>true</include_parent_macros>
<PREFIX>LabS-MCAG:MC-MCU-19:</PREFIX>
Expand Down Expand Up @@ -34,7 +34,7 @@
</foreground_color>
<height>31</height>
<image></image>
<name>Action Button_8</name>
<name>Action Button_2</name>
<push_action_index>0</push_action_index>
<pv_name></pv_name>
<pv_value />
Expand All @@ -46,14 +46,14 @@
</scale_options>
<scripts />
<style>0</style>
<text>MC-MCU019</text>
<text>MC-MCU019-ads</text>
<toggle_button>false</toggle_button>
<tooltip>$(pv_name)
$(pv_value)</tooltip>
<visible>true</visible>
<widget_type>Action Button</widget_type>
<width>180</width>
<wuid>1d681a25:1922fd92503:-61ae</wuid>
<wuid>656a2d8c:15258ee659a:-788d</wuid>
<x>0</x>
<y>0</y>
</widget>
61 changes: 61 additions & 0 deletions ethercatmcExApp/op/Boy/tools/IOC-MCU019-pils.mid
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
<actions hook="false" hook_all="false">
<action type="OPEN_DISPLAY">
<path>motor-4-pils.opi</path>
<macros>
<include_parent_macros>true</include_parent_macros>
<PREFIX>LabS-MCAG:MC-MCU-19:</PREFIX>
<P>LabS-MCAG:MC-MCU-19:</P>
<M1>m1</M1>
<M2>m2</M2>
<M3>m3</M3>
<M4>m4</M4>
</macros>
<mode>1</mode>
<description></description>
</action>
</actions>
<alarm_pulsing>false</alarm_pulsing>
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
<background_color>
<color red="240" green="240" blue="240" />
</background_color>
<border_alarm_sensitive>false</border_alarm_sensitive>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
<border_style>0</border_style>
<border_width>1</border_width>
<enabled>true</enabled>
<font>
<opifont.name fontName=".SF NS Text" height="11" style="0" pixels="false">Default</opifont.name>
</font>
<forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
<foreground_color>
<color red="0" green="0" blue="0" />
</foreground_color>
<height>31</height>
<image></image>
<name>Action Button_2</name>
<push_action_index>0</push_action_index>
<pv_name></pv_name>
<pv_value />
<rules />
<scale_options>
<width_scalable>true</width_scalable>
<height_scalable>true</height_scalable>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<scripts />
<style>0</style>
<text>MC-MCU019-pils</text>
<toggle_button>false</toggle_button>
<tooltip>$(pv_name)
$(pv_value)</tooltip>
<visible>true</visible>
<widget_type>Action Button</widget_type>
<width>180</width>
<wuid>656a2d8c:15258ee659a:-788d</wuid>
<x>0</x>
<y>0</y>
</widget>

0 comments on commit b548037

Please sign in to comment.