Merge branch 'main' of https://git.psi.ch/sinq-epics-modules/sinqmotor

(https://forge.frm2.tum.de/review/c/frm2/nicos/nicos/+/35285)

README.md

@@ -75,7 +75,8 @@ dbLoadTemplate("$(TOP)/mcu1.substitutions", "INSTR=$(INSTR)$(NAME):,CONTROLLER=$
 
 ### Substitution file
 
-The substitution file is a table containing axis-specific information which is used to create the axis-specific PVs. To work with sinqMotor, "mcu1.substitutions" needs to look like this:
+The substitution file is a table containing axis-specific information which is used to create the axis-specific PVs.
+To work with sinqMotor, "mcu1.substitutions" needs to look like this (the order of columns does not matter):
 ```
 file "$(SINQDBPATH)"
 {
@@ -93,13 +94,13 @@ The variable `SINQDBPATH` has been set in "mcu1.cmd" before calling `dbLoadTempl
 
 - `AXIS`: Index of the axis, corresponds to the physical connection of the axis to the MCU.
 - `M`: The full PV name is created by concatenating the variables INSTR, NAME and M. For example, the PV of the first axis would be "SQ:SINQTEST:mcu1:lin1".
-- `DESC`: Description of the motor. This field is just for documentation and is not needed for operating a motor.
 - `EGU`: Engineering units. For a linear motor, this is mm, for a rotaty motor, this is degree.
 - `DIR`: If set to "Neg", the axis direction is inverted.
 - `MRES`: This is a scaling factor determining the resolution of the position readback value. For example, 0.001 means a precision of 1 um. A detailed description can be found in section [Motor record resolution MRES](#motor-record-resolution-mres).
 
 #### Optional parameters
 The default values for those parameters are given for the individual records in db/sinqMotor.db
+- `DESC`: Description of the motor. This field is just for documentation and is not needed for operating a motor.
 - `MSGTEXTSIZE`: Buffer size for the motor message record in characters
 - `ENABLEMOVWATCHDOG`: Sets `setWatchdogEnabled` during IOC startup to the given value.
 - `LIMITSOFFSET`: If the motor limits are read out from the controller, they can 

db/sinqMotor.db

@@ -1,18 +1,18 @@
 # The main asyn motor record. Some fields are populated from the substitution 
 # files via macros:
-# - $(INSTR): Name of the instrument, e.g. "SQ:SINQTEST:"
-# - $(M): Name of the motor in EPICS, e.g. "lin1"
-# - $(DESC): Short description of the motor
-# - $(DIR): This value is usually set to "Pos". If the motor axis direction 
+# - INSTR: Name of the instrument, e.g. "SQ:SINQTEST:"
+# - M: Name of the motor in EPICS, e.g. "lin1"
+# - DESC: Short description of the motor. If not given, this is equal to M
+# - DIR: This value is usually set to "Pos". If the motor axis direction 
 # should be inverted, this value can be set to "Neg"
-# - $(CONTROLLER): Name of the motor controller, e.g. "mcu1"
-# - $(AXIS): Number of the axis, e.g. "1"
-# - $(MRES): Motor record resolution. See the README.md for a detailed discussion
-# - $(EGU): Engineering units. In case of a rotary axis, this is "degree", in 
+# - CONTROLLER: Name of the motor controller, e.g. "mcu1"
+# - AXIS: Number of the axis, e.g. "1"
+# - MRES: Motor record resolution. See the README.md for a detailed discussion
+# - EGU: Engineering units. In case of a rotary axis, this is "degree", in 
 # case of a linear axis this is "mm".
 record(motor,"$(INSTR)$(M)")
 {
-    field(DESC,"$(DESC)")
+    field(DESC,"$(DESC=$(M))")
     field(DTYP,"asynMotor")
     field(DIR,"$(DIR=Pos)")
     field(OUT,"@asyn($(CONTROLLER),$(AXIS))")

src/sinqController.h

@@ -10,8 +10,9 @@ Stefan Mathis, November 2024
 
 #define motorMessageIsFromDriverString "MOTOR_MESSAGE_DRIVER"
 #define motorMessageTextString "MOTOR_MESSAGE_TEXT"
-#define IncrementalEncoder "Incremental encoder"
-#define AbsoluteEncoder "Absolute encoder"
+#define IncrementalEncoder "incremental"
+#define AbsoluteEncoder "absolute"
+#define NoEncoder "none"
 
 class epicsShareClass sinqController : public asynMotorController {
   public: