From 24ca305fae0cc911852452c42a799a46e30fc8a9 Mon Sep 17 00:00:00 2001 From: Vincent Esposito Date: Thu, 27 Oct 2022 17:54:53 -0700 Subject: [PATCH 1/4] add the right expert screen for Smaract MCS2 motors --- scripts/motor-expert-screen | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/motor-expert-screen b/scripts/motor-expert-screen index 8d139d18..b9cc53c7 100755 --- a/scripts/motor-expert-screen +++ b/scripts/motor-expert-screen @@ -25,7 +25,7 @@ PREFIX=`echo $1 | cut -d . -f 1` source /reg/g/pcds/setup/epicsenv-3.14.12.sh export PCDS_EDMS=/reg/g/pcds/package/epics/3.14/screens/edm #export EDMDATAFILES=.:${PCDS_EDMS}/xps8:${PCDS_EDMS}/ims # normal EDMDATAFILES line -export EDMDATAFILES=.:${PCDS_EDMS}/xps8:/reg/g/pcds/package/epics/3.14/ioc/common/ims/R2.2.3/imsScreens +export EDMDATAFILES=.:${PCDS_EDMS}/xps8:/reg/g/pcds/package/epics/3.14/ioc/common/ims/R2.2.3/imsScreens:/reg/g/pcds/epics/ioc/common/smaract/R1.0.10/motorScreens # this ldpathmunge gives access to xdotool for xpp-control, xpp-daq source /reg/g/pcds/setup/pathmunge.sh @@ -49,6 +49,7 @@ else fi fi + # xdotool is used to move the new window to the mouse location # if xdotool is not installed, the move window commands will skip @@ -80,6 +81,8 @@ elif [ "${rtyp}" == 'motor' ]; then caget "$PREFIX:PN" > /dev/null 2>&1 if [ $? -eq 0 ]; then /reg/g/pcds/package/epics/3.14//modules/pcds_motion/${OLD_VERSION}/launch-motor.sh "$PREFIX" > /dev/null 2>&1 & + elif [[ $PREFIX == *"MCS2"* ]]; then # smaracts have motor prefix, so we catch them with the PREFIX + edm -x -eolc -m "MOTOR=$PREFIX" mcs2_main.edl > /dev/null 2>&1 & else cd /reg/neh/home/klg/epics/ioc/common/aerotech/current/motorScreens #cd /reg/neh/home4/mcbrowne/trunk2/ioc/common/aerotech/current/motorScreens From 3f7781a63193d00c73b4bc57bc238c54a5f6f8dd Mon Sep 17 00:00:00 2001 From: Vincent Esposito Date: Thu, 27 Oct 2022 17:59:50 -0700 Subject: [PATCH 2/4] use latest version of the released IOC --- scripts/motor-expert-screen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/motor-expert-screen b/scripts/motor-expert-screen index b9cc53c7..2f9869d9 100755 --- a/scripts/motor-expert-screen +++ b/scripts/motor-expert-screen @@ -25,7 +25,7 @@ PREFIX=`echo $1 | cut -d . -f 1` source /reg/g/pcds/setup/epicsenv-3.14.12.sh export PCDS_EDMS=/reg/g/pcds/package/epics/3.14/screens/edm #export EDMDATAFILES=.:${PCDS_EDMS}/xps8:${PCDS_EDMS}/ims # normal EDMDATAFILES line -export EDMDATAFILES=.:${PCDS_EDMS}/xps8:/reg/g/pcds/package/epics/3.14/ioc/common/ims/R2.2.3/imsScreens:/reg/g/pcds/epics/ioc/common/smaract/R1.0.10/motorScreens +export EDMDATAFILES=.:${PCDS_EDMS}/xps8:/reg/g/pcds/package/epics/3.14/ioc/common/ims/R2.2.3/imsScreens:/reg/g/pcds/epics/ioc/common/smaract/R1.0.11/motorScreens # this ldpathmunge gives access to xdotool for xpp-control, xpp-daq source /reg/g/pcds/setup/pathmunge.sh From 61fd9ae96dc882ef8176089ccbb065b2e0ae2084 Mon Sep 17 00:00:00 2001 From: Vincent Esposito Date: Thu, 27 Oct 2022 18:05:41 -0700 Subject: [PATCH 3/4] typo --- scripts/motor-expert-screen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/motor-expert-screen b/scripts/motor-expert-screen index 2f9869d9..325b5f4e 100755 --- a/scripts/motor-expert-screen +++ b/scripts/motor-expert-screen @@ -81,7 +81,7 @@ elif [ "${rtyp}" == 'motor' ]; then caget "$PREFIX:PN" > /dev/null 2>&1 if [ $? -eq 0 ]; then /reg/g/pcds/package/epics/3.14//modules/pcds_motion/${OLD_VERSION}/launch-motor.sh "$PREFIX" > /dev/null 2>&1 & - elif [[ $PREFIX == *"MCS2"* ]]; then # smaracts have motor prefix, so we catch them with the PREFIX + elif [[ $PREFIX == *"MCS2"* ]]; then # smaracts have "motor" rtyp, so we catch them with the PREFIX edm -x -eolc -m "MOTOR=$PREFIX" mcs2_main.edl > /dev/null 2>&1 & else cd /reg/neh/home/klg/epics/ioc/common/aerotech/current/motorScreens From 02f87eddca4b6de0f8616b45fabd0bd3dec31935 Mon Sep 17 00:00:00 2001 From: Vincent Esposito Date: Thu, 27 Oct 2022 18:24:57 -0700 Subject: [PATCH 4/4] add support for mmc-100 too --- scripts/motor-expert-screen | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/motor-expert-screen b/scripts/motor-expert-screen index 325b5f4e..26e3a5e9 100755 --- a/scripts/motor-expert-screen +++ b/scripts/motor-expert-screen @@ -25,7 +25,7 @@ PREFIX=`echo $1 | cut -d . -f 1` source /reg/g/pcds/setup/epicsenv-3.14.12.sh export PCDS_EDMS=/reg/g/pcds/package/epics/3.14/screens/edm #export EDMDATAFILES=.:${PCDS_EDMS}/xps8:${PCDS_EDMS}/ims # normal EDMDATAFILES line -export EDMDATAFILES=.:${PCDS_EDMS}/xps8:/reg/g/pcds/package/epics/3.14/ioc/common/ims/R2.2.3/imsScreens:/reg/g/pcds/epics/ioc/common/smaract/R1.0.11/motorScreens +export EDMDATAFILES=.:${PCDS_EDMS}/xps8:/reg/g/pcds/package/epics/3.14/ioc/common/ims/R2.2.3/imsScreens:/cds/group/pcds/epics/ioc/common/smaract/R1.0.11/motorScreens:/cds/group/pcds/epics/ioc/common/mmc/R1.0.6/mmcScreens # this ldpathmunge gives access to xdotool for xpp-control, xpp-daq source /reg/g/pcds/setup/pathmunge.sh @@ -77,6 +77,8 @@ if [ "${rtyp}" == 'xps8p' ]; then ext=0000 fi edm -x -eolc -m "CNAME=${base}_${ext},POS=$PREFIX" XPS8_Positioner.edl > /dev/null 2>&1 & +elif [ "${rtyp}" == 'mmca' ]; then # MMC-100 axis + edm -x -eolc -m "MOTOR=$PREFIX" mmc_main.edl > /dev/null 2>&1 & elif [ "${rtyp}" == 'motor' ]; then caget "$PREFIX:PN" > /dev/null 2>&1 if [ $? -eq 0 ]; then