lin-epics-modules/sinqMotor
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjusted the encoder type naming to that of the new NICOS class

Browse Source 
(https://forge.frm2.tum.de/review/c/frm2/nicos/nicos/+/35285)
This commit is contained in:
mathis_s
2024-12-11 09:49:17 +01:00
parent 26754e608d
commit 61087d2e44
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
db/sinqMotor.db
View File

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

5
src/sinqController.h
View File

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