Merge pull request #8 from epics-motor/model3_ioc

Updates the iocBoot directory to load the Model 3 driver, not the obsolete Model 2 driver.

iocs/motorSimIOC/iocBoot/iocMotorSim/Makefile

@@ -1,8 +1,8 @@
 TOP = ../..
 include $(TOP)/configure/CONFIG
-#ARCH = linux-x86_64
+ARCH = linux-x86_64
 #ARCH = vxWorks-ppc32
-ARCH = $(EPICS_HOST_ARCH)
+#ARCH = $(EPICS_HOST_ARCH)
 TARGETS = cdCommands
 TARGETS += envPaths
 include $(TOP)/configure/RULES.ioc

iocs/motorSimIOC/iocBoot/iocMotorSim/motor.substitutions

@@ -6,9 +6,8 @@ pattern
 {IOC:,  2,  "m$(N)",  "asynMotor",  motorSim1,  1,     "motor $(N)",  degrees,  Pos,  1,     .1,    .2,    0,     1,     .2,    0.01,  5,     100,   -100,  ""}
 {IOC:,  3,  "m$(N)",  "asynMotor",  motorSim1,  2,     "motor $(N)",  degrees,  Pos,  1,     .1,    .2,    0,     1,     .2,    0.01,  5,     100,   -100,  ""}
 {IOC:,  4,  "m$(N)",  "asynMotor",  motorSim1,  3,     "motor $(N)",  degrees,  Pos,  1,     .1,    .2,    0,     1,     .2,    0.01,  5,     100,   -100,  ""}
-
-{IOC:,  5,  "m$(N)",  "asynMotor",  motorSim2,  0,     "motor $(N)",  degrees,  Pos,  1,     .1,    .2,    0,     1,     .2,    0.01,  5,     100,   -100,  ""}
-{IOC:,  6,  "m$(N)",  "asynMotor",  motorSim2,  1,     "motor $(N)",  degrees,  Pos,  1,     .1,    .2,    0,     1,     .2,    0.01,  5,     100,   -100,  ""}
-{IOC:,  7,  "m$(N)",  "asynMotor",  motorSim2,  2,     "motor $(N)",  degrees,  Pos,  1,     .1,    .2,    0,     1,     .2,    0.01,  5,     100,   -100,  ""}
-{IOC:,  8,  "m$(N)",  "asynMotor",  motorSim2,  3,     "motor $(N)",  degrees,  Pos,  1,     .1,    .2,    0,     1,     .2,    0.01,  5,     100,   -100,  ""}
+{IOC:,  5,  "m$(N)",  "asynMotor",  motorSim1,  4,     "motor $(N)",  degrees,  Pos,  1,     .1,    .2,    0,     1,     .2,    0.01,  5,     100,   -100,  ""}
+{IOC:,  6,  "m$(N)",  "asynMotor",  motorSim1,  5,     "motor $(N)",  degrees,  Pos,  1,     .1,    .2,    0,     1,     .2,    0.01,  5,     100,   -100,  ""}
+{IOC:,  7,  "m$(N)",  "asynMotor",  motorSim1,  6,     "motor $(N)",  degrees,  Pos,  1,     .1,    .2,    0,     1,     .2,    0.01,  5,     100,   -100,  ""}
+{IOC:,  8,  "m$(N)",  "asynMotor",  motorSim1,  7,     "motor $(N)",  degrees,  Pos,  1,     .1,    .2,    0,     1,     .2,    0.01,  5,     100,   -100,  ""}
 }

iocs/motorSimIOC/iocBoot/iocMotorSim/st.cmd

@@ -1,24 +1,31 @@
-#!../../bin/linux-x86_64/motorSim
+# The is the ASYN example for communication to 4 simulated motors
+# "#!" marks lines that can be uncommented.
 
 < envPaths
 
-cd "${TOP}"
+dbLoadDatabase("$(TOP)/dbd/motorSim.dbd")
+motorSim_registerRecordDeviceDriver(pdbbase)
 
-## Register all support components
-dbLoadDatabase "dbd/motorSim.dbd"
-motorSim_registerRecordDeviceDriver pdbbase
+dbLoadTemplate("motor.substitutions")
 
-cd "${TOP}/iocBoot/${IOC}"
+motorSimCreateController("motorSim1", 8)
+#asynSetTraceIOMask("motorSim1", 0, HEX)
+#asynSetTraceMask("motorSim1", 0, ERROR|FLOW|DRIVER)
 
-
-## motorUtil (allstop & alldone)
-dbLoadRecords("$(MOTOR)/db/motorUtil.db", "P=motorSim:")
-
-##
+# motorSimConfigAxis(port, axis, lowLimit, highLimit, home, start)
+motorSimConfigAxis("motorSim1", 0, 20000, -20000,  500, 0)
+motorSimConfigAxis("motorSim1", 1, 20000, -20000, 1500, 0)
+motorSimConfigAxis("motorSim1", 2, 20000, -20000, 2500, 0)
+motorSimConfigAxis("motorSim1", 3, 20000, -20000, 3000, 0)
+motorSimConfigAxis("motorSim1", 4, 20000, -20000,  500, 0)
+motorSimConfigAxis("motorSim1", 5, 20000, -20000, 1500, 0)
+motorSimConfigAxis("motorSim1", 6, 20000, -20000, 2500, 0)
+motorSimConfigAxis("motorSim1", 7, 20000, -20000, 3000, 0)
 
 iocInit
 
 ## motorUtil (allstop & alldone)
 motorUtilInit("motorSim:")
 
 # Boot complete
+