Removed PMAC drivers

Commented out the PMAC drivers to avoid namespace clashes with the new
turboPmac driver library.
This commit is contained in:
2025-04-17 16:52:52 +02:00
parent eb1bb58c36
commit d0c009ea38
3 changed files with 12 additions and 7 deletions

View File

@ -10,10 +10,10 @@ ARCH_FILTER=RHEL%
REQUIRED+=SynApps
REQUIRED+=stream
REQUIRED+=scaler
REQUIRED+=asynMotor
REQUIRED+=motorBase
# Release version
LIBVERSION=2024-amor-no-autoenable-lift-axis
LIBVERSION=2025
# DB files to include in the release
TEMPLATES += sinqEPICSApp/Db/dimetix.db
@ -32,9 +32,9 @@ SOURCES += sinqEPICSApp/src/NanotecDriver.cpp
SOURCES += sinqEPICSApp/src/stptok.cpp
SOURCES += sinqEPICSApp/src/PhytronDriver.cpp
SOURCES += sinqEPICSApp/src/EuroMoveDriver.cpp
SOURCES += sinqEPICSApp/src/pmacAsynIPPort.c
SOURCES += sinqEPICSApp/src/pmacAxis.cpp
SOURCES += sinqEPICSApp/src/pmacController.cpp
# SOURCES += sinqEPICSApp/src/pmacAsynIPPort.c
# SOURCES += sinqEPICSApp/src/pmacAxis.cpp
# SOURCES += sinqEPICSApp/src/pmacController.cpp
SOURCES += sinqEPICSApp/src/MasterMACSDriver.cpp
SOURCES += sinqEPICSApp/src/C804Axis.cpp
SOURCES += sinqEPICSApp/src/C804Controller.cpp

View File

@ -143,6 +143,11 @@ asynStatus EL734Controller::transactController(int axisNo, char command[COMLEN],
pasynOctetSyncIO->flush(pasynUserController_);
if (axis != NULL)
{
axis->updateMsgTxtFromDriver("");
}
status = pasynOctetSyncIO->writeRead(pasynUserController_, command, strlen(command),
reply, COMLEN, 2., &out, &in, &reason);
if (status != asynSuccess)

View File

@ -5,9 +5,9 @@ registrar(EL734Register)
registrar(PhytronRegister)
registrar(EuroMoveRegister)
registrar(NanotecRegister)
registrar(pmacControllerRegister)
# registrar(pmacControllerRegister)
registrar(C804ControllerRegister)
registrar(pmacAsynIPPortRegister)
# registrar(pmacAsynIPPortRegister)
registrar(MasterMACSRegister)
registrar(SINQControllerRegister)