Remove sm300

.gitattributes

@@ -1,5 +1,27 @@
-#Which files need CRLF handling
+# Set the default behavior, in case people don't have core.autocrlf set.
 * text=auto
-*.sh eol=lf
-*.bat eol=crlf
-*.cmd -text
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.c text
+*.cpp text
+*.h text
+*.hpp text
+*.java text
+*.sh text eol=lf
+*.bat text
+*.cmd text
+*.db text
+*.dbd text
+*.template text
+*.substitutions text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.sln text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary
+*.class binary
+*.vi binary
+

.gitignore

@@ -1,5 +1,5 @@
 *~
-O.*
+O.*/
 *.swp
 *BAK.adl
 bin/
@@ -12,7 +12,12 @@ lib/
 templates/
 cdCommands
 envPaths
-dllPath.bat
+dllPath*.bat
+runIOC.bat
+runIOC.sh
+relPaths.sh
+iocBoot/iocmotorSim/motor.substitutions.local
+.project
 auto_settings.sav*
 auto_positions.sav*
 .ccfxprepdir/

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "modules/motorNewport"]
 	path = modules/motorNewport
-	url = https://github.com/epics-motor/motorNewport.git
+	url = https://github.com/ISISComputingGroup/motorNewport.git
+    branch = ibex
 [submodule "modules/motorOms"]
 	path = modules/motorOms
 	url = https://github.com/epics-motor/motorOms.git
@@ -24,7 +25,8 @@
 	url = https://github.com/epics-motor/motorKohzu.git
 [submodule "modules/motorMclennan"]
 	path = modules/motorMclennan
-	url = https://github.com/epics-motor/motorMclennan.git
+	url = https://github.com/ISISComputingGroup/motorMclennan.git
+    branch = ibex
 [submodule "modules/motorMicroMo"]
 	path = modules/motorMicroMo
 	url = https://github.com/epics-motor/motorMicroMo.git
@@ -84,16 +86,20 @@
 	url = https://github.com/epics-motor/motorSmarAct.git
 [submodule "modules/motorMotorSim"]
 	path = modules/motorMotorSim
-	url = https://github.com/epics-motor/motorMotorSim.git
+	url = https://github.com/ISISComputingGroup/motorMotorSim.git
+    branch = ibex
 [submodule "modules/motorMXmotor"]
 	path = modules/motorMXmotor
 	url = https://github.com/epics-motor/motorMXmotor.git
 [submodule "modules/motorParker"]
 	path = modules/motorParker
 	url = https://github.com/epics-motor/motorParker.git
-[submodule ".ci"]
-	path = .ci
-	url = https://github.com/epics-base/ci-scripts
 [submodule "modules/motorAcsMotion"]
 	path = modules/motorAcsMotion
 	url = https://github.com/epics-motor/motorAcsMotion.git
+[submodule ".ci"]
+	path = .ci
+	url = https://github.com/epics-base/ci-scripts
+[submodule "modules/motorLinMot"]
+	path = modules/motorLinMot
+	url = https://github.com/ISISComputingGroup/motorLinMot.git

configure/RELEASE

@@ -47,3 +47,18 @@ IPAC=$(SUPPORT)/ipac-R2-15
 -include $(TOP)/../RELEASE.local
 -include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
 -include $(TOP)/configure/RELEASE.local
+
+ASYN=$(SUPPORT)/asyn/master
+AUTOSAVE=$(SUPPORT)/autosave/master
+BUSY=$(SUPPORT)/busy/master
+CALC=$(SUPPORT)/calc/master
+IPAC=$(SUPPORT)/ipac/master
+SNCSEQ=$(SUPPORT)/seq/master
+SSCAN=$(SUPPORT)/sscan/master
+ONCRPC=$(SUPPORT)/oncrpc/master
+LUA=$(SUPPORT)/lua/master
+# optional extra local definitions here
+-include $(TOP)/configure/RELEASE.private
+
+include $(TOP)/../../../ISIS_CONFIG
+-include $(TOP)/../../../ISIS_CONFIG.$(EPICS_HOST_ARCH)

modules/Makefile

@@ -7,8 +7,8 @@ SUBMODULES += motorOms
 SUBMODULES += motorNewport
 SUBMODULES += motorAMCI
 SUBMODULES += motorAcs
-SUBMODULES += motorAcsMotion
-SUBMODULES += motorAcsTech80
+#SUBMODULES += motorAcsMotion
+#SUBMODULES += motorAcsTech80
 SUBMODULES += motorAerotech
 SUBMODULES += motorAttocube
 SUBMODULES += motorDeltaTau
@@ -19,7 +19,7 @@ endif
 SUBMODULES += motorIms
 SUBMODULES += motorKohzu
 SUBMODULES += motorMclennan
-SUBMODULES += motorMicos
+#SUBMODULES += motorMicos
 SUBMODULES += motorMicroMo
 SUBMODULES += motorMicronix
 SUBMODULES += motorMotorSim
@@ -38,10 +38,13 @@ SUBMODULES += motorPIGCS2
 ifdef LUA
 SUBMODULES += motorScriptMotor
 endif
-SUBMODULES += motorSmarAct
+#SUBMODULES += motorSmarAct
 SUBMODULES += motorSmartMotor
 SUBMODULES += motorThorLabs
 
+## isis facility extras
+SUBMODULES += motorLinMot
+
 # Allow sites to add extra submodules
 -include Makefile.local
 
@@ -73,6 +76,14 @@ ifdef BUSY
 	$(ECHO) Creating $@, BUSY = $(BUSY)
 	@echo BUSY = $(BUSY)>> $@
 endif
+ifdef CALC
+	$(ECHO) Creating $@, CALC = $(CALC)
+	@echo CALC = $(CALC)>> $@
+endif
+ifdef SSCAN
+	$(ECHO) Creating $@, SSCAN = $(SSCAN)
+	@echo SSCAN = $(SSCAN)>> $@
+endif
 ifdef IPAC
 	$(ECHO) Creating $@, IPAC = $(IPAC)
 	@echo IPAC = $(IPAC)>> $@

motorApp/Db/SoftMotorEx.db

@@ -30,7 +30,7 @@ record(motor, "$(user):linear") {
   field(OUT, "#C0 S0 @")
   field(MRES, "0.001")
   field(PREC, "3")
-  field(EGU, "mm.")
+  field(EGU, "mm")
   field(DHLM, "1000")
   field(DLLM, "-1000")
   field(RTRY, "0")
@@ -46,7 +46,7 @@ record(motor, "$(user):rotary") {
   field(RRES, "1.0")
   field(URIP, "Yes")
   field(PREC, "3")
-  field(EGU, "deg.")
+  field(EGU, "degree")
   field(DHLM, "45")
   field(DLLM, "-45")
   field(RTRY, "0")

motorApp/Db/asyn_motor.db

@@ -22,17 +22,25 @@ record(motor, "$(P)$(M)") {
   field(DLLM, "$(DLLM)")
   field(INIT, "$(INIT)")
   field(RTRY, "$(RTRY=10)")
-  field(RSTM, "$(RSTM=NearZero)")
+  field(RSTM, "$(RSTM=Never)")
   field(TWV, "1")
   field(SDIS, "$(P)$(M)_able.VAL")
+  # ISIS local archiving and alarm
+  info(archive, "0.02 VAL RBV DVAL OFF MSTA DIR CNEN MOVN DMOV MISS RCNT")
+  info(alarm, "Motors")
 }
 
+# ISIS local aliases for genie_python
+alias("$(P)$(M)", "$(P)$(M):SP")
+alias("$(P)$(M)", "$(P)$(M):SP:RBV")
+
 record(bo, "$(P)$(M)_able") {
   field(DESC, "motor enable")
   field(PINI, "YES")
   field(OUT, "$(P)$(M).DISP")
   field(ZNAM, "Enable")
   field(ONAM, "Disable")
+  field(UDFS, "NO_ALARM")
 }
 
 record(calcout, "$(P)$(M)_vCh") {
@@ -88,6 +96,20 @@ record(ao,"$(P)$(M)Resolution") {
     field(PREC, "$(PREC)")
 }
 
+# allow splitting out of MSTA
+record(mbbiDirect, "$(P)$(M):_MSTABITS")
+{
+    field(INP, "$(P)$(M).MSTA CP")
+}
+
+record(bi, "$(P)$(M)_HOMED")
+{
+    field(DESC, "Motor Homed")
+    field(ZNAM, "No")
+    field(ONAM, "Yes")
+    field(INP, "$(P)$(M):_MSTABITS.BE CP")
+}
+
 #! Further lines contain data used by VisualDCT
 #! View(405,484,0.9)
 #! Record("$(P)$(M)",840,675,0,0,"$(P)$(M)")

motorApp/Db/asyn_motor_model2.db

@@ -22,7 +22,7 @@ record(motor, "$(P)$(M)") {
   field(DLLM, "$(DLLM)")
   field(INIT, "$(INIT)")
   field(RTRY, "$(RTRY=10)")
-  field(RSTM, "$(RSTM=NearZero)")
+  field(RSTM, "$(RSTM=Never)")
   field(TWV, "1")
   field(SDIS, "$(P)$(M)_able.VAL")
 }
@@ -33,6 +33,7 @@ record(bo, "$(P)$(M)_able") {
   field(OUT, "$(P)$(M).DISP")
   field(ZNAM, "Enable")
   field(ONAM, "Disable")
+  field(UDFS, "NO_ALARM")
 }
 
 record(calcout, "$(P)$(M)_vCh") {

motorApp/Db/asyn_motor_positions.req

@@ -1,2 +1,2 @@
 # FILE... motor_positions.req
-$(P)$(M).DVAL
+#$(P)$(M).DVAL

motorApp/Db/basic_asyn_motor.db

@@ -17,9 +17,18 @@ record(motor,"$(P)$(M)")
 	field(DHLM,"$(DHLM)")
 	field(DLLM,"$(DLLM)")
 	field(INIT,"$(INIT)")
+	field(RTRY,"$(RTRY=10)")
+	field(RSTM,"$(RSTM=Never)")
 	field(TWV,"1")
+	# ISIS local archiving and alarm
+	info(archive, "0.02 VAL RBV DVAL OFF MSTA DIR CNEN MOVN DMOV MISS RCNT")
+	info(alarm, "Motors")
 }
 
+# ISIS local aliases for genie_python
+alias("$(P)$(M)", "$(P)$(M):SP")
+alias("$(P)$(M)", "$(P)$(M):SP:RBV")
+
 # These records make the motor resolution, offset and direction available to the driver
 # which is needed for profile moves and other applications
 
@@ -54,3 +63,49 @@ record(ao,"$(P)$(M)Resolution") {
     field(PREC, "$(PREC)")
 }
 
+# ISIS enable/disable
+record(bo, "$(P)$(M)_able") {
+  field(DESC, "motor enable")
+  field(PINI, "YES")
+  field(OUT, "$(P)$(M).DISP")
+  field(ZNAM, "Enable")
+  field(ONAM, "Disable")
+  field(UDFS, "NO_ALARM")
+}
+
+record(ao,"$(P)$(M)_MRESMON")
+{
+    field(OMSL, "closed_loop")
+    field(DOL, "$(P)$(M).MRES CP")
+    field(DTYP, "asynFloat64")
+    field(OUT, "@asyn($(PORT),$(ADDR))MOTOR_RESOLUTION")
+}
+
+record(calcout,"$(P)$(M)_MERATMON")
+{
+    field(INPA, "$(P)$(M).MRES CP")
+    field(INPB, "$(P)$(M).ERES CP")
+	field(CALC, "(A != 0 && B != 0) ? A / B : 0")
+	field(OOPT, "When Non-zero")
+    field(OUT, "$(P)$(M)_MERAT PP")
+}
+
+record(ao,"$(P)$(M)_MERAT")
+{
+    field(DTYP, "asynFloat64")
+    field(OUT, "@asyn($(PORT),$(ADDR))MOTOR_ENCODER_RATIO")
+}
+
+# allow splitting out of MSTA
+record(mbbiDirect, "$(P)$(M):_MSTABITS")
+{
+    field(INP, "$(P)$(M).MSTA CP")
+}
+
+record(bi, "$(P)$(M)_HOMED")
+{
+    field(DESC, "Motor Homed")
+    field(ZNAM, "No")
+    field(ONAM, "Yes")
+    field(INP, "$(P)$(M):_MSTABITS.BE CP")
+}

motorApp/Db/basic_asyn_motor_model2.db

@@ -18,4 +18,5 @@ record(motor,"$(P)$(M)")
 	field(DLLM,"$(DLLM)")
 	field(INIT,"$(INIT)")
 	field(TWV,"1")
+	field(RSTM,"$(RSTM=Never)")
 }

motorApp/Db/basic_motor.db

@@ -17,6 +17,27 @@ grecord(motor,"$(P)$(M)")
 	field(DHLM,"$(DHLM)")
 	field(DLLM,"$(DLLM)")
 	field(INIT,"$(INIT)")
+    field(RSTM,"$(RSTM=Never)")
 	field(TWV,"1")
+	# ISIS local archiving and alarm
+	info(archive, "0.02 VAL RBV DVAL OFF MSTA DIR CNEN MOVN DMOV MISS RCNT")
+	info(alarm, "Motors")
 }
 
+# allow splitting out of MSTA
+record(mbbiDirect, "$(P)$(M):_MSTABITS")
+{
+    field(INP, "$(P)$(M).MSTA CP")
+}
+
+record(bi, "$(P)$(M)_HOMED")
+{
+    field(DESC, "Motor Homed")
+    field(ZNAM, "No")
+    field(ONAM, "Yes")
+    field(INP, "$(P)$(M):_MSTABITS.BE CP")
+}
+
+# ISIS local aliases for genie_python
+alias("$(P)$(M)", "$(P)$(M):SP")
+alias("$(P)$(M)", "$(P)$(M):SP:RBV")

motorApp/Db/basic_motor_settings.req

@@ -45,4 +45,7 @@ $(P)$(M).PREM
 $(P)$(M).POST
 $(P)$(M).FLNK
 $(P)$(M).RMOD
+$(P)$(M).ADEL
+$(P)$(M).MDEL
+$(P)$(M).SPMG
 $(P)$(M).RSTM

motorApp/Db/linmot_extra.db

@@ -0,0 +1,3 @@
+record(motor, "$(P)$(M)") {
+  field(OFF, "$(OFF)")
+}