Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
cb70054a72 |
@ -4,7 +4,7 @@ include /ioc/tools/driver.makefile
|
|||||||
MODULE=sinq
|
MODULE=sinq
|
||||||
BUILDCLASSES=Linux
|
BUILDCLASSES=Linux
|
||||||
EPICS_VERSIONS=7.0.7
|
EPICS_VERSIONS=7.0.7
|
||||||
ARCH_FILTER=RHEL8%
|
ARCH_FILTER=RHEL%
|
||||||
|
|
||||||
# additional module dependencies
|
# additional module dependencies
|
||||||
REQUIRED+=SynApps
|
REQUIRED+=SynApps
|
||||||
@ -12,11 +12,13 @@ REQUIRED+=stream
|
|||||||
REQUIRED+=scaler
|
REQUIRED+=scaler
|
||||||
REQUIRED+=motorBase
|
REQUIRED+=motorBase
|
||||||
|
|
||||||
|
# Release version
|
||||||
|
LIBVERSION=2025-with-pmac
|
||||||
|
|
||||||
# DB files to include in the release
|
# DB files to include in the release
|
||||||
TEMPLATES += sinqEPICSApp/Db/dimetix.db
|
TEMPLATES += sinqEPICSApp/Db/dimetix.db
|
||||||
TEMPLATES += sinqEPICSApp/Db/slsvme.db
|
TEMPLATES += sinqEPICSApp/Db/slsvme.db
|
||||||
TEMPLATES += sinqEPICSApp/Db/spsamor.db
|
TEMPLATES += sinqEPICSApp/Db/spsamor.db
|
||||||
TEMPLATES += sinqEPICSApp/Db/el734.db
|
|
||||||
|
|
||||||
# DBD files to include in the release
|
# DBD files to include in the release
|
||||||
DBDS += sinqEPICSApp/src/sinq.dbd
|
DBDS += sinqEPICSApp/src/sinq.dbd
|
||||||
@ -30,9 +32,9 @@ SOURCES += sinqEPICSApp/src/NanotecDriver.cpp
|
|||||||
SOURCES += sinqEPICSApp/src/stptok.cpp
|
SOURCES += sinqEPICSApp/src/stptok.cpp
|
||||||
SOURCES += sinqEPICSApp/src/PhytronDriver.cpp
|
SOURCES += sinqEPICSApp/src/PhytronDriver.cpp
|
||||||
SOURCES += sinqEPICSApp/src/EuroMoveDriver.cpp
|
SOURCES += sinqEPICSApp/src/EuroMoveDriver.cpp
|
||||||
# SOURCES += sinqEPICSApp/src/pmacAsynIPPort.c
|
SOURCES += sinqEPICSApp/src/pmacAsynIPPort.c
|
||||||
# SOURCES += sinqEPICSApp/src/pmacAxis.cpp
|
SOURCES += sinqEPICSApp/src/pmacAxis.cpp
|
||||||
# SOURCES += sinqEPICSApp/src/pmacController.cpp
|
SOURCES += sinqEPICSApp/src/pmacController.cpp
|
||||||
SOURCES += sinqEPICSApp/src/MasterMACSDriver.cpp
|
SOURCES += sinqEPICSApp/src/MasterMACSDriver.cpp
|
||||||
SOURCES += sinqEPICSApp/src/C804Axis.cpp
|
SOURCES += sinqEPICSApp/src/C804Axis.cpp
|
||||||
SOURCES += sinqEPICSApp/src/C804Controller.cpp
|
SOURCES += sinqEPICSApp/src/C804Controller.cpp
|
||||||
|
@ -1,34 +0,0 @@
|
|||||||
record(motor,"$(P)$(M)")
|
|
||||||
{
|
|
||||||
field(DESC,"$(DESC)")
|
|
||||||
field(DTYP,"$(DTYP)")
|
|
||||||
field(DIR,"$(DIR)")
|
|
||||||
field(VELO,"$(VELO)")
|
|
||||||
field(HVEL,"$(VELO)")
|
|
||||||
field(VBAS,"$(VELO)")
|
|
||||||
field(VMAX, "${VMAX}")
|
|
||||||
field(ACCL,"$(ACCL)")
|
|
||||||
field(BDST,"$(BDST)")
|
|
||||||
field(BVEL,"$(BVEL)")
|
|
||||||
field(BACC,"$(BACC)")
|
|
||||||
field(OUT,"@asyn($(PORT),$(ADDR))")
|
|
||||||
field(MRES,"$(MRES)")
|
|
||||||
field(PREC,"$(PREC)")
|
|
||||||
field(EGU,"$(EGU)")
|
|
||||||
field(DHLM,"$(DHLM)")
|
|
||||||
field(DLLM,"$(DLLM)")
|
|
||||||
field(INIT,"$(INIT)")
|
|
||||||
field(PINI, "NO")
|
|
||||||
field(TWV,"1")
|
|
||||||
field(RTRY,"0")
|
|
||||||
}
|
|
||||||
|
|
||||||
# The message text
|
|
||||||
record(waveform, "$(P)$(M)-MsgTxt") {
|
|
||||||
field(DTYP, "asynOctetRead")
|
|
||||||
field(INP, "@asyn($(PORT),$(N),1) MOTOR_MESSAGE_TEXT")
|
|
||||||
field(FTVL, "CHAR")
|
|
||||||
field(NELM, "80")
|
|
||||||
field(SCAN, "I/O Intr")
|
|
||||||
}
|
|
||||||
|
|
@ -250,8 +250,6 @@ PhytronAxis::PhytronAxis(PhytronController *pC, int axisNo, int enc)
|
|||||||
haveBrake = 0;
|
haveBrake = 0;
|
||||||
brakeIO = -1;
|
brakeIO = -1;
|
||||||
next_poll = -1;
|
next_poll = -1;
|
||||||
homing = 0;
|
|
||||||
homing_direction = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int PhytronAxis::setBrake(int brakeNO)
|
int PhytronAxis::setBrake(int brakeNO)
|
||||||
|
@ -5,9 +5,9 @@ registrar(EL734Register)
|
|||||||
registrar(PhytronRegister)
|
registrar(PhytronRegister)
|
||||||
registrar(EuroMoveRegister)
|
registrar(EuroMoveRegister)
|
||||||
registrar(NanotecRegister)
|
registrar(NanotecRegister)
|
||||||
# registrar(pmacControllerRegister)
|
registrar(pmacControllerRegister)
|
||||||
registrar(C804ControllerRegister)
|
registrar(C804ControllerRegister)
|
||||||
# registrar(pmacAsynIPPortRegister)
|
registrar(pmacAsynIPPortRegister)
|
||||||
registrar(MasterMACSRegister)
|
registrar(MasterMACSRegister)
|
||||||
registrar(SINQControllerRegister)
|
registrar(SINQControllerRegister)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user