base: update module motorParker

The motorParker module was updated to a new tag, adding support for the
OEM controller. The Parker IOC build was removed due to
the new IOC build support (#133).

Author: guirodrigueslima

CHANGES.md

@@ -18,6 +18,8 @@
   * This approach is experimental and intended for internal use within 
     the epics-in-docker project only. It is not yet considered stable 
     or supported for external use.
+* base: update module motorParker. by @guirodrigueslima in
+  https://github.com/cnpem/epics-in-docker/pull/139
 
 ## v0.14.1
 

base/install_motor.sh

@@ -14,16 +14,19 @@ git submodule update --init --depth 1 -j ${JOBS} \
     motorMotorSim
 
 git submodule update --init -j ${JOBS} \
-    motorPIGCS2
+    motorPIGCS2 \
+    motorParker
 
 git -C motorPIGCS2 checkout ${PIGCS2_VERSION}
+git -C motorParker checkout ${PARKER_VERSION}
 
 rm -rf .git
 
 module_releases="
 MOTOR=${EPICS_MODULES_PATH}/motor
 MOTOR_MOTORSIM=${EPICS_MODULES_PATH}/motor/modules/motorMotorSim
 MOTOR_PIGCS2=${EPICS_MODULES_PATH}/motor/modules/motorPIGCS2
+MOTOR_PIGCS2=${EPICS_MODULES_PATH}/motor/modules/motorParker
 "
 echo "$module_releases" >> ${EPICS_RELEASE_FILE}
 
@@ -79,16 +82,3 @@ CALC
 MOTOR
 BUSY
 "
-
-download_from_github cnpem motorParker $PARKER_VERSION
-install_module motorParker MOTOR_PARKER "
-EPICS_BASE
-ASYN
-MOTOR
-"
-install_module -i motorParker/iocs/parkerIOC PARKER "
-EPICS_BASE
-ASYN
-MOTOR
-MOTOR_PARKER
-"

base/motor_versions.sh

@@ -1,4 +1,4 @@
 MOTOR_VERSION=R7-3-1
 PIGCS2_VERSION=60af8bdb17c1717e4545d8170f820e358ce31458
 PMAC_VERSION=2-6-4b3
-PARKER_VERSION=R1-1-1-oem-3
+PARKER_VERSION=R1-2

images/docker-compose-motorparker.yml

@@ -23,20 +23,19 @@ services:
           motor
           asyn
         IOC_DBS:
-          /opt/epics/modules/motorParker/db/ACRAuxBi.template
-          /opt/epics/modules/motorParker/db/ACRAuxBoRBV.template
-          /opt/epics/modules/motorParker/db/ACRAuxBo.template
-          /opt/epics/modules/motorParker/db/ACRAuxLi.template
-          /opt/epics/modules/motorParker/db/ACRAuxRead.template
-          /opt/epics/modules/motorParker/db/ACRAux.template
-          /opt/epics/modules/motorParker/db/OEMLimitSwitch.template
+          /opt/epics/modules/motor/db/ACRAuxBi.template
+          /opt/epics/modules/motor/db/ACRAuxBoRBV.template
+          /opt/epics/modules/motor/db/ACRAuxBo.template
+          /opt/epics/modules/motor/db/ACRAuxLi.template
+          /opt/epics/modules/motor/db/ACRAuxRead.template
+          /opt/epics/modules/motor/db/ACRAux.template
+          /opt/epics/modules/motor/db/OEMSupport.template
         IOC_CMDS:
-          /opt/epics/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/PC6K-postInit.cmd
-          /opt/epics/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/PC6K.cmd
-          /opt/epics/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/PC6K.substitutions
-          /opt/epics/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/envPaths
-          /opt/epics/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/motor.substitutions.acr
-          /opt/epics/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/motor.substitutions.oem
-          /opt/epics/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/st.cmd
-          /opt/epics/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/st.cmd.acr
-          /opt/epics/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/st.cmd.oem
+          /opt/epics/modules/motor/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/PC6K-postInit.cmd
+          /opt/epics/modules/motor/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/PC6K.cmd
+          /opt/epics/modules/motor/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/PC6K.substitutions
+          /opt/epics/modules/motor/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/motor.substitutions.acr
+          /opt/epics/modules/motor/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/motor.substitutions.oem
+          /opt/epics/modules/motor/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/st.cmd
+          /opt/epics/modules/motor/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/st.cmd.acr
+          /opt/epics/modules/motor/modules/motorParker/iocs/parkerIOC/iocBoot/iocParker/st.cmd.oem