From d0c009ea389c7f26aa7ecc902a3ce3c1f7bb732f Mon Sep 17 00:00:00 2001
From: smathis <stefan.mathis@psi.ch>
Date: Thu, 17 Apr 2025 16:52:52 +0200
Subject: [PATCH] Removed PMAC drivers

Commented out the PMAC drivers to avoid namespace clashes with the new
turboPmac driver library.
---
 Makefile.RHEL8                   | 10 +++++-----
 sinqEPICSApp/src/EL734Driver.cpp |  5 +++++
 sinqEPICSApp/src/sinq.dbd        |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Makefile.RHEL8 b/Makefile.RHEL8
index 99d85b5..2ee2f2f 100644
--- a/Makefile.RHEL8
+++ b/Makefile.RHEL8
@@ -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
diff --git a/sinqEPICSApp/src/EL734Driver.cpp b/sinqEPICSApp/src/EL734Driver.cpp
index e2fd8b7..cde5824 100644
--- a/sinqEPICSApp/src/EL734Driver.cpp
+++ b/sinqEPICSApp/src/EL734Driver.cpp
@@ -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)
diff --git a/sinqEPICSApp/src/sinq.dbd b/sinqEPICSApp/src/sinq.dbd
index 4bccb8a..3aedd3d 100644
--- a/sinqEPICSApp/src/sinq.dbd
+++ b/sinqEPICSApp/src/sinq.dbd
@@ -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)