Merge pull request #202 from ISISComputingGroup/Ticket2787_harmonise_…

…motor_ioc

Ticket2787: Harmonise Galil Motor ioc

GALIL/iocBoot/iocGALIL-IOC-01/GALIL_01_positions.req

@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_positions.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_positions.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_positions.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_positions.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_positions.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_positions.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_positions.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_positions.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_positions.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_positions.req" P=$(P),CCP=10
+file "GALIL_controller_positions.req" "P=$(P),CCP=$(CCP)"

GALIL/iocBoot/iocGALIL-IOC-01/GALIL_01_settings.req

@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_settings.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_settings.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_settings.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_settings.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_settings.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_settings.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_settings.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_settings.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_settings.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_settings.req" P=$(P),CCP=10
+file "GALIL_controller_settings.req" "P=$(P),CCP=$(CCP)"

GALIL/iocBoot/iocGALIL-IOC-01/config.xml

@@ -4,16 +4,8 @@
 <ioc_desc>Galil motor controller</ioc_desc>
 <ioc_details>Galil Motor Details</ioc_details>
 <macros>
-<macro name="GALILADDR01" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 1 (MTR01* PVs)" />
-<macro name="GALILADDR02" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 2 (MTR02* PVs)" />
-<macro name="GALILADDR03" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 3 (MTR03* PVs)" />
-<macro name="GALILADDR04" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 4 (MTR04* PVs)" />
-<macro name="GALILADDR05" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 5 (MTR05* PVs)" />
-<macro name="GALILADDR06" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 6 (MTR06* PVs)" />
-<macro name="GALILADDR07" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 7 (MTR07* PVs)" />
-<macro name="GALILADDR08" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 8 (MTR08* PVs)" />
-<macro name="GALILADDR09" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 9 (MTR09* PVs)" />
-<macro name="GALILADDR10" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 10 (MTR10* PVs)" />
+<macro name="GALILADDR" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller (MTR01* PVs)" />
+<macro name="MTRCTRL" pattern="^[0-9]{1,2}$" description="Controller number used in motor address assignment" />
 </macros>
 <pvsets>
 <pvset name="Motor Limits" description="Motor high and low limits" />

GALIL/iocBoot/iocGALIL-IOC-01/galildb.cmd

@@ -1,22 +1,21 @@
-## GALILCRATE set prior to call
+## MTRCTRL set prior to call
 
-## GALILCRATE is the galil crate number - 01, 02, ...
+## MTRCTRL is the galil crate number - 01, 02, ...
 
-dbLoadRecords("$(TOP)/db/galil_motor.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE),IFSIM=$(IFSIM),IFNOTSIM=$(IFNOTSIM)")
+dbLoadRecords("$(TOP)/db/galil_motor.db", "P=$(MYPVPREFIX)MOT,CCP=$(MTRCTRL)")
 
 #Load extra functionality, untop of motorRecord features for axis/motors (eg. runtime gear ratio changes between master & slaves)
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_ctrl_extras.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE),IFSIM=$(IFSIM),IFNOTSIM=$(IFNOTSIM)")
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_motor_extras.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE),IFSIM=$(IFSIM),IFNOTSIM=$(IFNOTSIM)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_ctrl_extras.db", "P=$(MYPVPREFIX)MOT,CCP=$(MTRCTRL)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_motor_extras.db", "P=$(MYPVPREFIX)MOT,CCP=$(MTRCTRL)")
 
 #Load digital IO databases
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_digital_ports.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE),IFSIM=$(IFSIM),IFNOTSIM=$(IFNOTSIM)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_digital_ports.db", "P=$(MYPVPREFIX)MOT,CCP=$(MTRCTRL)")
 
 #Load analog IO databases
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_analog_ports.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE),IFSIM=$(IFSIM),IFNOTSIM=$(IFNOTSIM)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_analog_ports.db", "P=$(MYPVPREFIX)MOT,CCP=$(MTRCTRL)")
 
 #Load user defined functions
-#dbLoadRecords("$(TOP)/db/galil_userdef_records.db", "P=$(MYPVPREFIX)MOT,CC=$(GCID),CCP=$(GALILCRATE),IFSIM=$(IFSIM),IFNOTSIM=$(IFNOTSIM)")
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_userdef_records8.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE),IFSIM=$(IFSIM),IFNOTSIM=$(IFNOTSIM)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_userdef_records8.db", "P=$(MYPVPREFIX)MOT,CCP=$(MTRCTRL)")
 
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_profileMoveController.db", "P=$(MYPVPREFIX)MOT:,CC=$(GCID),CCP=$(GALILCRATE),IFSIM=$(IFSIM),IFNOTSIM=$(IFNOTSIM)")
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_profileMoveAxis.db", "P=$(MYPVPREFIX)MOT:,CC=$(GCID),CCP=$(GALILCRATE),IFSIM=$(IFSIM),IFNOTSIM=$(IFNOTSIM)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_profileMoveController.db", "P=$(MYPVPREFIX)MOT:,CCP=$(MTRCTRL)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_profileMoveAxis.db", "P=$(MYPVPREFIX)MOT:,CCP=$(MTRCTRL)")

GALIL/iocBoot/iocGALIL-IOC-01/motorsim.cmd

@@ -8,29 +8,3 @@ motorSimConfigAxis("Galil", 4, 32000, -32000,  0, 0)
 motorSimConfigAxis("Galil", 5, 32000, -32000,  0, 0) 
 motorSimConfigAxis("Galil", 6, 32000, -32000,  0, 0) 
 motorSimConfigAxis("Galil", 7, 32000, -32000,  0, 0) 
-
-# Setup the Asyn layer (portname, low-level driver drvet name, card, number of axes on card)
-# number crates from 0
-# Create simulated motors: ( start card , start axis , low limit, high limit, home posn, # cards, # axes to setup)
-#motorSimCreate( 0, 0, -32000, 32000, 0, $(GALILNUMCRATES), 8 )
-#$(IFDMC01) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC01) drvAsynMotorConfigure("Galil", "motorSim", $(GCID), 8)#calc("GCID", "0", 2, 2)
-#$(IFDMC01) calc("GCID", "$(GCID) + 1", 2, 2)
-#$(IFDMC02) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC02) calc("GCID", "$(GCID) + 1", 2, 2)
-#$(IFDMC03) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC03) calc("GCID", "$(GCID) + 1", 2, 2)
-#$(IFDMC04) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC04) calc("GCID", "$(GCID) + 1", 2, 2)
-#$(IFDMC05) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC05) calc("GCID", "$(GCID) + 1", 2, 2)
-#$(IFDMC06) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC06) calc("GCID", "$(GCID) + 1", 2, 2)
-#$(IFDMC07) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC07) calc("GCID", "$(GCID) + 1", 2, 2)
-#$(IFDMC08) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC08) calc("GCID", "$(GCID) + 1", 2, 2)
-#$(IFDMC09) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC09) calc("GCID", "$(GCID) + 1", 2, 2)
-#$(IFDMC10) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC10) calc("GCID", "$(GCID) + 1", 2, 2)

GALIL/iocBoot/iocGALIL-IOC-01/st-axis.cmd

@@ -0,0 +1,4 @@
+epicsEnvSet("AMOTORNAME", "MTR$(MTRCTRL)0$(MN)")
+epicsEnvSet("AMOTORPV", "MOT:$(AMOTORNAME)")
+
+dbLoadRecords("$(AXIS)/db/axis.db", "P=$(MYPVPREFIX),AXIS=$(IOCNAME):AXIS$(MN),mAXIS=$(AMOTORPV)")

GALIL/iocBoot/iocGALIL-IOC-01/st-common.cmd

@@ -18,29 +18,25 @@ set_requestfile_path("${MOTOR}/motorApp/Db", "")
 ## as all Galils cd to GALIL-IOC-01 need to add this explicitly so info generated req files are found
 set_requestfile_path("${TOP}/iocBoot/iocGALIL-IOC-01", "")
 
-# how many galil crates we have
-# GALILNUMCRATES set in icpconfig
-
-# this defines macros we can use for conditional loading later
-stringtest("IFDMC01", "$(GALILADDR01=)")
-stringtest("IFDMC02", "$(GALILADDR02=)")
-stringtest("IFDMC03", "$(GALILADDR03=)")
-stringtest("IFDMC04", "$(GALILADDR04=)")
-stringtest("IFDMC05", "$(GALILADDR05=)")
-stringtest("IFDMC06", "$(GALILADDR06=)")
-stringtest("IFDMC07", "$(GALILADDR07=)")
-stringtest("IFDMC08", "$(GALILADDR08=)")
-stringtest("IFDMC09", "$(GALILADDR09=)")
-stringtest("IFDMC10", "$(GALILADDR10=)")
-
+# Make sure controller number is 2 digits long
+calc("MTRCTRL", "$(MTRCTRL=01)", 2, 2)
 
 epicsEnvSet("GALILCONFIG","$(ICPCONFIGROOT)/galil")
 
 ## uncomment to see every command sent to every galil, of define in st.cmd for just one galil
 #epicsEnvSet("GALIL_DEBUG_FILE", "galil_debug.txt")
 
-# configure galil and motors
-< galil.cmd
+# create simulated motor if required
+$(IFSIM) < motorsim.cmd
+
+# load the galil db files
+< galildb.cmd
+
+# configure the galil
+$(IFNOTSIM) < $(GALILCONFIG)/galil$(MTRCTRL).cmd
+
+# load the generic ISIS axis db for each axis
+iocshCmdLoop("< st-axis.cmd", "MN=\$(I)", "I", 1, 8)
 
 # configure jaws
 < $(GALILCONFIG)/jaws.cmd
@@ -62,7 +58,7 @@ $(IFNOTTESTDEVSIM) < $(GALILCONFIG)/motorExtensions.cmd
 $(IFTESTDEVSIM) < $(MOTOREXT)/settings/motorExtensions.cmd
 
 ## motor util package
-dbLoadRecords("$(MOTOR)/db/motorUtil.db","P=$(MYPVPREFIX)$(IOCNAME):,PVPREFIX=$(MYPVPREFIX),IFDMC01=$(IFDMC01),IFDMC02=$(IFDMC02),IFDMC03=$(IFDMC03),IFDMC04=$(IFDMC04),IFDMC05=$(IFDMC05),IFDMC06=$(IFDMC06),IFDMC07=$(IFDMC07),IFDMC08=$(IFDMC08),IFDMC09=$(IFDMC09),IFDMC10=$(IFDMC10)")
+dbLoadRecords("$(MOTOR)/db/motorUtil.db","P=$(MYPVPREFIX)$(IOCNAME):,$(IFIOC)= ,PVPREFIX=$(MYPVPREFIX)")
 
 ##ISIS## Stuff that needs to be done after all records are loaded but before iocInit is called 
 < $(IOCSTARTUP)/preiocinit.cmd
@@ -72,7 +68,6 @@ dbLoadRecords("$(MOTOR)/db/motorUtil.db","P=$(MYPVPREFIX)$(IOCNAME):,PVPREFIX=$(
 #asynSetTraceFile("Galil",-1,"galil.trace")
 #asynSetTraceIOMask("Galil",-1,0x2)
 
-
 iocInit()
 
 ## motor util package
@@ -83,10 +78,10 @@ motorUtilInit("$(MYPVPREFIX)$(IOCNAME):")
 < $(IOCSTARTUP)/postiocinit.cmd
 
 # Save motor positions every 5 seconds
-$(IFNOTTESTDEVSIM) create_monitor_set("$(IOCNAME)_positions.req", 5, "P=$(MYPVPREFIX)MOT:,IFDMC01=$(IFDMC01),IFDMC02=$(IFDMC02),IFDMC03=$(IFDMC03),IFDMC04=$(IFDMC04),IFDMC05=$(IFDMC05),IFDMC06=$(IFDMC06),IFDMC07=$(IFDMC07),IFDMC08=$(IFDMC08),IFDMC09=$(IFDMC09),IFDMC10=$(IFDMC10)")
+$(IFNOTTESTDEVSIM) create_monitor_set("$(IOCNAME)_positions.req", 5, "P=$(MYPVPREFIX)MOT:,CCP=$(MTRCTRL)")
 
 # Save motor settings every 30 seconds
-$(IFNOTTESTDEVSIM) create_monitor_set("$(IOCNAME)_settings.req", 30, "P=$(MYPVPREFIX)MOT:,IFDMC01=$(IFDMC01),IFDMC02=$(IFDMC02),IFDMC03=$(IFDMC03),IFDMC04=$(IFDMC04),IFDMC05=$(IFDMC05),IFDMC06=$(IFDMC06),IFDMC07=$(IFDMC07),IFDMC08=$(IFDMC08),IFDMC09=$(IFDMC09),IFDMC10=$(IFDMC10)")
+$(IFNOTTESTDEVSIM) create_monitor_set("$(IOCNAME)_settings.req", 30, "P=$(MYPVPREFIX)MOT:,CCP=$(MTRCTRL)")
 
 ## Start any sequence programs
 #seq sncxxx,"user=icsHost"

GALIL/iocBoot/iocGALIL-IOC-02/GALIL_02_positions.req

@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_positions.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_positions.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_positions.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_positions.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_positions.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_positions.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_positions.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_positions.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_positions.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_positions.req" P=$(P),CCP=10
+file "GALIL_controller_positions.req" P=$(P),CCP=$(CCP)

GALIL/iocBoot/iocGALIL-IOC-02/GALIL_02_settings.req

@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_settings.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_settings.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_settings.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_settings.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_settings.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_settings.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_settings.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_settings.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_settings.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_settings.req" P=$(P),CCP=10
+file "GALIL_controller_settings.req" P=$(P),CCP=$(CCP)

GALIL/iocBoot/iocGALIL-IOC-03/GALIL_03_positions.req

@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_positions.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_positions.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_positions.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_positions.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_positions.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_positions.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_positions.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_positions.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_positions.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_positions.req" P=$(P),CCP=10
+file "GALIL_controller_positions.req" P=$(P),CCP=$(CCP)

GALIL/iocBoot/iocGALIL-IOC-03/GALIL_03_settings.req

@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_settings.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_settings.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_settings.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_settings.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_settings.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_settings.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_settings.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_settings.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_settings.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_settings.req" P=$(P),CCP=10
+file "GALIL_controller_settings.req" P=$(P),CCP=$(CCP)

GALIL/iocBoot/iocGALIL-IOC-04/GALIL_04_positions.req

@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_positions.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_positions.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_positions.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_positions.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_positions.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_positions.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_positions.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_positions.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_positions.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_positions.req" P=$(P),CCP=10
+file "GALIL_controller_positions.req" P=$(P),CCP=$(CCP)

GALIL/iocBoot/iocGALIL-IOC-04/GALIL_04_settings.req

@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_settings.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_settings.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_settings.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_settings.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_settings.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_settings.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_settings.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_settings.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_settings.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_settings.req" P=$(P),CCP=10
+file "GALIL_controller_settings.req" P=$(P),CCP=$(CCP)

GALIL/iocBoot/iocGALIL-IOC-05/GALIL_05_positions.req

@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_positions.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_positions.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_positions.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_positions.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_positions.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_positions.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_positions.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_positions.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_positions.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_positions.req" P=$(P),CCP=10
+file "GALIL_controller_positions.req" P=$(P),CCP=$(CCP)

GALIL/iocBoot/iocGALIL-IOC-05/GALIL_05_settings.req

@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_settings.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_settings.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_settings.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_settings.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_settings.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_settings.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_settings.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_settings.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_settings.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_settings.req" P=$(P),CCP=10
+file "GALIL_controller_settings.req" P=$(P),CCP=$(CCP)

GALIL/iocBoot/iocGALIL-IOC-06/GALIL_06_positions.req

@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_positions.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_positions.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_positions.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_positions.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_positions.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_positions.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_positions.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_positions.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_positions.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_positions.req" P=$(P),CCP=10
+file "GALIL_controller_positions.req" P=$(P),CCP=$(CCP)

GALIL/iocBoot/iocGALIL-IOC-06/GALIL_06_settings.req

@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_settings.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_settings.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_settings.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_settings.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_settings.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_settings.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_settings.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_settings.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_settings.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_settings.req" P=$(P),CCP=10
+file "GALIL_controller_settings.req" P=$(P),CCP=$(CCP)