diff --git a/iocBoot/iocNoAsyn/README b/iocBoot/iocNoAsyn/README index 7b78aa2d..42335a47 100644 --- a/iocBoot/iocNoAsyn/README +++ b/iocBoot/iocNoAsyn/README @@ -10,20 +10,20 @@ To build any examples; To build the OMS example in this directory; - in /motorApp/Makefile: #!DIRS += OmsSrc must be uncommented. -- in /motorExApp/Makefile: #!DIRS += NoMPF must be uncommented. +- in /motorExApp/Makefile: #!DIRS += NoAsyn must be uncommented. -- in /motorExApp/NoMPF/Makefile: #!NoMPFVx_LIBS += oms must be +- in /motorExApp/NoAsyn/Makefile: #!NoAsynVx_LIBS += oms must be uncommented. Finally, cd ; gnumake clean uninstall; gnumake To run the MX example, uncomment the following; -in /motorExApp/NoMPF/Makefile: #NoMPF_LIBS += MXmotor -in /motorExApp/NoMPF/NoMPFInclude.dbd: #include "devMXmotor.dbd" +in /motorExApp/NoAsyn/Makefile: #NoAsyn_LIBS += MXmotor +in /motorExApp/NoAsyn/NoAsynInclude.dbd: #include "devMXmotor.dbd" and rebuild. Assuming the EPICS_HOST_ARCH environment variable is set correctly, start the ioc from this directory by executing the following command. -../../bin/${EPICS_HOST_ARCH}/NoMPF st.cmd.mx +../../bin/${EPICS_HOST_ARCH}/NoAsyn st.cmd.mx diff --git a/iocBoot/iocNoAsyn/st.cmd.Vx b/iocBoot/iocNoAsyn/st.cmd.Vx index 7b9da16a..6197248f 100644 --- a/iocBoot/iocNoAsyn/st.cmd.Vx +++ b/iocBoot/iocNoAsyn/st.cmd.Vx @@ -16,11 +16,11 @@ cd topbin # be added before any C++ code is loaded (see SPR #28980). sysCplusEnable=1 -ld < NoMPFVx.munch +ld < NoAsynVx.munch cd startup -dbLoadDatabase("$(TOP)/dbd/NoMPFVx.dbd") -NoMPFVx_registerRecordDeviceDriver(pdbbase) +dbLoadDatabase("$(TOP)/dbd/NoAsynVx.dbd") +NoAsynVx_registerRecordDeviceDriver(pdbbase) dbLoadTemplate("motor.substitutions") dbLoadRecords("$(MOTOR)/db/motorUtil.db", "P=IOC:") diff --git a/iocBoot/iocNoAsyn/st.cmd.mx b/iocBoot/iocNoAsyn/st.cmd.mx index 88373485..cf4dfbce 100644 --- a/iocBoot/iocNoAsyn/st.cmd.mx +++ b/iocBoot/iocNoAsyn/st.cmd.mx @@ -1,13 +1,13 @@ # This example if for running a motor record that uses the MX device -# driver support on a Unix host. This example does not require MPF. +# driver support on a Unix host. This example does not require Asyn. # Start errlog Task before any possible error messsage to prevent # erroneous "Interrupted system call" message on Linux OS host. errlogInit(0) -dbLoadDatabase("../../dbd/NoMPF.dbd",0,0) +dbLoadDatabase("../../dbd/NoAsyn.dbd",0,0) registerRecordDeviceDriver(pdbbase) -dbLoadRecords("../../db/NoMPF_MX.db","user=rls") +dbLoadRecords("../../db/NoAsyn_MX.db","user=rls") MXmotorSetup(1, "MXexample.dat", 10) iocInit() diff --git a/iocBoot/iocNoMPF/MXexample.dat b/iocBoot/iocNoMPF/MXexample.dat deleted file mode 100644 index 51b8c910..00000000 --- a/iocBoot/iocNoMPF/MXexample.dat +++ /dev/null @@ -1,17 +0,0 @@ -d_spacing variable inline double "" "" 1 1 3.13555 -Io device scaler soft_scaler "" "" 0 0 0 timer1 energy 101 ./i0.dat 0 -It device scaler soft_scaler "" "" 0 0 0 timer1 energy 101 ./it.dat 0 -#rls:m2 device motor soft_motor "" "" 250000 0 -20000000 20000000 0 -1 -1 5e-05 0 deg 10000 0 2000 -energy device motor energy_motor "" "" 0 0 0 1e+08 0 -1 -1 1 0 eV rls:m1 d_spacing 0.017453 -timer1 device timer soft_timer "" "" -# -# Newport test records -# -newport_rs232 interface rs232 tty "" "" 9600 8 N 1 N 0x0d 0x0d /dev/ttyb -newport interface generic mm4000 "" "" newport_rs232 -rls:m1 device motor mm4000_motor "" "" 0 0 -1.0e38 1.0e38 0 -1 -1 1 0 deg newport 1 -# -# IMS test records -# -#ims_rs232 interface rs232 tty "" "" 9600 8 N 1 N 0x0d0a 0x0d0a /dev/ttyS0 -#rls:m3 device motor panther_hi "" "" 0 0 -10000000 10000000 0 -1 -1 1 0 steps ims_rs232 0 18340 2001 5 5 8 F 1 6 50 -1 diff --git a/iocBoot/iocNoMPF/Makefile b/iocBoot/iocNoMPF/Makefile deleted file mode 100644 index 19285a0e..00000000 --- a/iocBoot/iocNoMPF/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -TOP = ../.. -include $(TOP)/configure/CONFIG -ARCH = vxWorks-68040 -#!ARCH = vxWorks-ppc604_long -TARGETS = cdCommands -TARGETS += envPaths -include $(TOP)/configure/RULES.ioc - diff --git a/iocBoot/iocNoMPF/README b/iocBoot/iocNoMPF/README deleted file mode 100644 index 7b78aa2d..00000000 --- a/iocBoot/iocNoMPF/README +++ /dev/null @@ -1,29 +0,0 @@ -To build any examples; - -- in /configure/RELEASE: EPICS_BASE, TEMPLATE_TOP and MSI must - be defined. - -- in /Makefile: the following two lines must be uncommented; - #!DIRS := $(DIRS) $(filter-out $(DIRS), motorExApp) - #!DIRS := $(DIRS) $(filter-out $(DIRS), iocBoot) - -To build the OMS example in this directory; -- in /motorApp/Makefile: #!DIRS += OmsSrc must be uncommented. - -- in /motorExApp/Makefile: #!DIRS += NoMPF must be uncommented. - -- in /motorExApp/NoMPF/Makefile: #!NoMPFVx_LIBS += oms must be - uncommented. - -Finally, cd ; gnumake clean uninstall; gnumake - - -To run the MX example, uncomment the following; -in /motorExApp/NoMPF/Makefile: #NoMPF_LIBS += MXmotor -in /motorExApp/NoMPF/NoMPFInclude.dbd: #include "devMXmotor.dbd" -and rebuild. - -Assuming the EPICS_HOST_ARCH environment variable is set correctly, -start the ioc from this directory by executing the following command. - -../../bin/${EPICS_HOST_ARCH}/NoMPF st.cmd.mx diff --git a/iocBoot/iocNoMPF/i0.dat b/iocBoot/iocNoMPF/i0.dat deleted file mode 100644 index 785f9902..00000000 --- a/iocBoot/iocNoMPF/i0.dat +++ /dev/null @@ -1,101 +0,0 @@ -8950 157555 -8951 157823 -8952 158170 -8953 158333 -8954 158463 -8955 158458 -8956 158788 -8957 159070 -8958 159189 -8959 159292 -8960 159053 -8961 159275 -8962 159347 -8963 159396 -8964 159627 -8965 159326 -8966 159460 -8967 159690 -8968 159627 -8969 159682 -8970 159745 -8971 159840 -8972 160053 -8973 160313 -8974 160410 -8975 160762 -8976 160887 -8977 160988 -8978 161028 -8979 161064 -8980 160984 -8981 161161 -8982 161015 -8983 161069 -8984 161088 -8985 161018 -8986 161200 -8987 161327 -8988 161337 -8989 161322 -8990 161497 -8991 161496 -8992 161410 -8993 161410 -8994 161614 -8995 161683 -8996 161831 -8997 161831 -8998 161877 -8999 161999 -9000 162046 -9001 162095 -9002 161911 -9003 162190 -9004 162038 -9005 162164 -9006 162293 -9007 162129 -9008 162230 -9009 162170 -9010 161890 -9011 162286 -9012 162331 -9013 162317 -9014 162374 -9015 162483 -9016 162509 -9017 162320 -9018 162310 -9019 162430 -9020 162345 -9021 162376 -9022 162439 -9023 162552 -9024 162582 -9025 162625 -9026 162761 -9027 162845 -9028 162663 -9029 162692 -9030 162701 -9031 162561 -9032 162617 -9033 162586 -9034 162531 -9035 162564 -9036 162557 -9037 162583 -9038 162535 -9039 162504 -9040 162304 -9041 161609 -9042 159694 -9043 160016 -9044 162222 -9045 162759 -9046 162825 -9047 162820 -9048 162698 -9049 162699 -9050 162860 diff --git a/iocBoot/iocNoMPF/it.dat b/iocBoot/iocNoMPF/it.dat deleted file mode 100644 index cd291a2e..00000000 --- a/iocBoot/iocNoMPF/it.dat +++ /dev/null @@ -1,101 +0,0 @@ -8950 395527 -8951 397385 -8952 399842 -8953 400917 -8954 401645 -8955 401494 -8956 403659 -8957 405675 -8958 406268 -8959 406722 -8960 404554 -8961 405881 -8962 405794 -8963 405550 -8964 406522 -8965 403507 -8966 403562 -8967 404049 -8968 402105 -8969 400442 -8970 398177 -8971 394713 -8972 389458 -8973 377355 -8974 345928 -8975 280021 -8976 213430 -8977 187933 -8978 188234 -8979 193119 -8980 188754 -8981 178281 -8982 166890 -8983 156640 -8984 143264 -8985 127337 -8986 112287 -8987 99609 -8988 89420 -8989 83563 -8990 82755 -8991 85219 -8992 88971 -8993 92543 -8994 95141 -8995 95149 -8996 92518 -8997 87593 -8998 83236 -8999 81763 -9000 83340 -9001 86828 -9002 89978 -9003 93541 -9004 95689 -9005 98596 -9006 101057 -9007 101874 -9008 102134 -9009 101552 -9010 100100 -9011 99666 -9012 98004 -9013 95900 -9014 93743 -9015 91861 -9016 89868 -9017 87733 -9018 85903 -9019 84462 -9020 82911 -9021 82220 -9022 82327 -9023 83211 -9024 84657 -9025 86522 -9026 88822 -9027 91046 -9028 92728 -9029 94292 -9030 95520 -9031 96048 -9032 96604 -9033 96630 -9034 96310 -9035 95917 -9036 95300 -9037 94749 -9038 94274 -9039 94140 -9040 93972 -9041 93150 -9042 89742 -9043 89947 -9044 93355 -9045 93570 -9046 92953 -9047 92474 -9048 92023 -9049 91978 -9050 92163 diff --git a/iocBoot/iocNoMPF/motor.substitutions b/iocBoot/iocNoMPF/motor.substitutions deleted file mode 100644 index a2f6f02d..00000000 --- a/iocBoot/iocNoMPF/motor.substitutions +++ /dev/null @@ -1,14 +0,0 @@ -file "$(MOTOR)/db/basic_motor.db" -{ -pattern -{P, N, M, DTYP, C, S, DESC, EGU, DIR, VELO, VBAS, ACCL, BDST, BVEL, BACC, MRES, PREC, DHLM, DLLM, INIT} -{IOC:, 1, "m$(N)", "PMAC", 0, 0, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{IOC:, 2, "m$(N)", "PMAC", 0, 1, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{IOC:, 3, "m$(N)", "PMAC", 0, 2, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{IOC:, 4, "m$(N)", "PMAC", 0, 3, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{IOC:, 5, "m$(N)", "PMAC", 0, 4, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{IOC:, 6, "m$(N)", "PMAC", 0, 5, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{IOC:, 7, "m$(N)", "PMAC", 0, 6, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{IOC:, 8, "m$(N)", "PMAC", 0, 7, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -{IOC:, 9, "m$(N)", "PMAC", 0, 8, "motor $(N)", degrees, Pos, 1, .1, .2, 0, 1, .2, 0.01, 5, 100, -100, ""} -} diff --git a/iocBoot/iocNoMPF/st.cmd.Vx b/iocBoot/iocNoMPF/st.cmd.Vx deleted file mode 100644 index 7b9da16a..00000000 --- a/iocBoot/iocNoMPF/st.cmd.Vx +++ /dev/null @@ -1,83 +0,0 @@ -# This example if for OMS VME8/44 controllers. Since OMS controllers -# communicate across the VME backplace, this example does not require -# ASYN. - -# "#!" marks lines that can be uncommented. - -#The following must be added for many board support packages -#!cd "... IOC st.cmd complete directory path ... " - -< cdCommands -#!< ../nfsCommands - -cd topbin - -# If the VxWorks kernel was built using the project facility, the following must -# be added before any C++ code is loaded (see SPR #28980). -sysCplusEnable=1 - -ld < NoMPFVx.munch - -cd startup -dbLoadDatabase("$(TOP)/dbd/NoMPFVx.dbd") -NoMPFVx_registerRecordDeviceDriver(pdbbase) - -dbLoadTemplate("motor.substitutions") -dbLoadRecords("$(MOTOR)/db/motorUtil.db", "P=IOC:") - -#!dbLoadRecords("$(TOP)/motorApp/Db/SoftMotorEx.db","user=IOC,motor=m1", startup) - -# OMS VME driver setup parameters: -# (1)cards, (2)base address(short, 16-byte boundary), -# (3)interrupt vector (0=disable or 64 - 255), (4)interrupt level (1 - 6), -# (5)motor task polling rate (min=1Hz,max=60Hz) -#!omsSetup(1, 0xFC00, 180, 5, 10) -#!drvOMSdebug = 4 - -# OMS VME58 driver setup parameters: -# (1)cards, (2)base address(short, 4k boundary), -# (3)interrupt vector (0=disable or 64 - 255), (4)interrupt level (1 - 6), -# (5)motor task polling rate (min=1Hz,max=60Hz) -#!oms58Setup(1, 0x1000, 190, 5, 10) -#!drvOms58debug = 4 - -# OMS MAXv driver setup parameters: -# (1)number of cards in array. -# (2)VME Address Type (16,24,32). -# (3)Base Address on 4K (0x1000) boundary. -# (4)interrupt vector (0=disable or 64 - 255). -# (5)interrupt level (1 - 6). -# (6)motor task polling rate (min=1Hz,max=60Hz). -#!MAXvSetup(1, 16, 0xF000, 190, 5, 10) -#!MAXvSetup(1, 24, 0xF00000, 190, 5, 10) -#!MAXvSetup(1, 32, 0xB0000000, 190, 5, 10) -#!drvMAXvdebug=4 - -# OMS MAXv configuration string: -# (1) number of card being configured (0-14). -# (2) configuration string; axis type (PSO/PSE/PSM) MUST be set here. -# For example, set which TTL signal level defines -# an active limit switch. Set X,Y,Z,T to active low and set U,V,R,S -# to active high. Set all axes to open-loop stepper (PSO). See MAXv -# User's Manual for LL/LH and PSO/PSE/PSM commands. -#config0="AX LL PSO; AY LL PSO; AZ LL PSO; AT LL PSO; AU LH PSO; AV LH PSO; AR LH PSO; AS LH PSO;" - -#!config0="AX LH PSM; AY LL PSO; AZ LL PSO; AT LL PSO; AU LH PSO; AV LH PSO; AR LH PSO; AS LH PSO;" -#!MAXvConfig(0, config0) - - -# PMAC VME driver setup parameters: -# (1)cards, (2) VME Address Type (24,32) -# (3)Mailbox base address, (4)DPRAM base address, -# (5)interrupt vector (0=disable or 64 - 255), -# (6)interrupt level (1 - 6), -# (7)motor task polling rate (min=1Hz,max=60Hz) -#!PmacSetup(1, 32, 0xB07FA000, 0xB0700000, 0, 5, 2) -#!PmacSetup(1, 24, 0x7FA000, 0x700000, 0, 5, 2) -#!drvPmacdebug = 4 - -iocInit - -# motorUtil (allstop & alldone) -motorUtilInit("IOC:") - diff --git a/iocBoot/iocNoMPF/st.cmd.mx b/iocBoot/iocNoMPF/st.cmd.mx deleted file mode 100644 index 88373485..00000000 --- a/iocBoot/iocNoMPF/st.cmd.mx +++ /dev/null @@ -1,13 +0,0 @@ -# This example if for running a motor record that uses the MX device -# driver support on a Unix host. This example does not require MPF. - -# Start errlog Task before any possible error messsage to prevent -# erroneous "Interrupted system call" message on Linux OS host. -errlogInit(0) - -dbLoadDatabase("../../dbd/NoMPF.dbd",0,0) -registerRecordDeviceDriver(pdbbase) -dbLoadRecords("../../db/NoMPF_MX.db","user=rls") -MXmotorSetup(1, "MXexample.dat", 10) - -iocInit()