From f6babc35d3901ff747c4d72465f28aeb358c24dc Mon Sep 17 00:00:00 2001 From: Your Name <you@example.com> Date: Tue, 10 Jan 2017 11:15:48 +0100 Subject: [PATCH] change path to be compatible with both user --- Makefile | 1 + opi/EMU.opi | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index bc82311..129ed5a 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ STARTUPS += startup/EMU.cmd MISCS =misc/ExtractDataTOTracePlot.py MISCS +=protocol/pmacVariables.proto DOC = doc/README.md +OPIS += opi/ USR_DEPENDENCIES = fastacquisition,1.1.0 USR_DEPENDENCIES += dataacquisition,1.0.1 diff --git a/opi/EMU.opi b/opi/EMU.opi index 6bc061b..3eaa530 100644 --- a/opi/EMU.opi +++ b/opi/EMU.opi @@ -140,7 +140,7 @@ <macros> <include_parent_macros>true</include_parent_macros> </macros> - <visible>true</visible> + <visible>false</visible> <border_color> <color red="0" green="128" blue="255" /> </border_color> @@ -325,7 +325,7 @@ $(pv_value)</tooltip> <macros> <include_parent_macros>true</include_parent_macros> </macros> - <visible>false</visible> + <visible>true</visible> <border_color> <color red="0" green="128" blue="255" /> </border_color> @@ -712,7 +712,7 @@ $(pv_value)</tooltip> <macros> <include_parent_macros>true</include_parent_macros> </macros> - <visible>true</visible> + <visible>false</visible> <border_color> <color red="0" green="128" blue="255" /> </border_color> @@ -9698,7 +9698,7 @@ $(trace_0_y_pv_value)</tooltip> <macros> <include_parent_macros>true</include_parent_macros> </macros> - <visible>false</visible> + <visible>true</visible> <border_color> <color red="0" green="128" blue="255" /> </border_color> @@ -9727,7 +9727,7 @@ $(trace_0_y_pv_value)</tooltip> <enabled>true</enabled> <wuid>-25f0d7e:158d972c59b:-7e2e</wuid> <scripts> - <path pathString="/CSS/emu/opi/Scripts/PlcOpi.js" checkConnect="true" sfe="false" seoe="false"> + <path pathString="/CSS/emu/Scripts/PlcOpi.js" checkConnect="true" sfe="false" seoe="false"> <pv trig="true">loc://pagePLC</pv> </path> </scripts> -- GitLab