Fixed version requirement for the 0.13.x series of turboPmac drivers

by the poll.

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "sinqmotor"]
-	path = sinqmotor
-	url = https://gitea.psi.ch/lin-epics-modules/sinqmotor
-[submodule "sinqMotor"]
-	path = sinqMotor
-	url = https://gitea.psi.ch/lin-epics-modules/sinqMotor

Makefile

@@ -1,4 +1,4 @@
-# Include the external Makefile
+# Use the PSI build system
 include /ioc/tools/driver.makefile
 
 MODULE=turboPmac
@@ -8,30 +8,28 @@ ARCH_FILTER=RHEL%
 
 # Additional module dependencies
 REQUIRED+=motorBase
+REQUIRED+=sinqMotor
 
 # Specify the version of motorBase we want to build against
 motorBase_VERSION=7.2.2
 
+# Specify the version of sinqMotor we want to build against
+sinqMotor_VERSION=0.14
+
 # These headers allow to depend on this library for derived drivers.
 HEADERS += src/pmacAsynIPPort.h
 HEADERS += src/turboPmacAxis.h
 HEADERS += src/turboPmacController.h
 
 # Source files to build
-SOURCES += sinqMotor/src/msgPrintControl.cpp
-SOURCES += sinqMotor/src/sinqAxis.cpp
-SOURCES += sinqMotor/src/sinqController.cpp
 SOURCES += src/pmacAsynIPPort.c
 SOURCES += src/turboPmacAxis.cpp
 SOURCES += src/turboPmacController.cpp
 
 # Store the record files
-TEMPLATES += sinqMotor/db/asynRecord.db
-TEMPLATES += sinqMotor/db/sinqMotor.db
 TEMPLATES += db/turboPmac.db
 
 # This file registers the motor-specific functions in the IOC shell.
-DBDS += sinqMotor/src/sinqMotor.dbd
 DBDS += src/turboPmac.dbd
 
-USR_CFLAGS += -Wall -Wextra -Weffc++ -Wunused-result -Werror # -Wpedantic // Does not work because EPICS macros trigger warnings
+USR_CFLAGS += -Wall -Wextra -Weffc++ -Wunused-result -Werror # -Wpedantic // Does not work because EPICS macros trigger warnings

README.md

@@ -73,4 +73,4 @@ Please see the documentation for the module sinqMotor: https://git.psi.ch/sinq-e
 
 ### How to build it
 
-This driver can be compiled and installed by running `make install` from the same directory where the Makefile is located. However, since it uses the git submodule sinqMotor, make sure that the correct version of the submodule repository is checked out AND the change is commited (`git status` shows no non-committed changes). Please see the section "Usage as static dependency" in https://git.psi.ch/sinq-epics-modules/sinqmotor/-/blob/main/README.md for more details.
+Please see the documentation for the module sinqMotor: https://git.psi.ch/sinq-epics-modules/sinqmotor/-/blob/main/README.md.

src/turboPmacAxis.cpp

@@ -1271,11 +1271,14 @@ asynStatus turboPmacAxis::enable(bool on) {
     // Status of parameter library operations
     asynStatus pl_status = asynSuccess;
 
+    /*
+    Continue regardless of the status returned by the poll; we just want to
+    find out whether the motor is currently moving or not. If the poll
+    function fails before it can determine that, it is assumed that the motor
+    is not moving.
+    */
     bool moving = false;
-    rw_status = doPoll(&moving);
-    if (rw_status != asynSuccess) {
-        return rw_status;
-    }
+    doPoll(&moving);
 
     // =========================================================================