From 66552d5ffc44387e41433114286dee1d4bb2aed5 Mon Sep 17 00:00:00 2001
From: smathis <stefan.mathis@psi.ch>
Date: Mon, 12 May 2025 11:58:56 +0200
Subject: [PATCH] Pinned sinqMotor version

---
 Makefile  | 21 +++++++++++++++++----
 sinqMotor |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 1c9fa85..c5d088e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Use the PSI build system
+# Include the external Makefile
 include /ioc/tools/driver.makefile
 
 MODULE=turboPmac
@@ -8,13 +8,12 @@ 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=mathis_s
+# Specify the commit / tag of sinqMotor we want to statically link into this driver
+SINQMOTOR = 0.1
 
 # These headers allow to depend on this library for derived drivers.
 HEADERS += src/pmacAsynIPPort.h
@@ -22,14 +21,28 @@ 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
+
+# Check out the correct version of sinqMotor and call this Makefile again with
+# the originall install command
+sinqinstall::
+	git submodule update --init --recursive
+	cd sinqMotor && git fetch --tags && git checkout $(SINQMOTOR)
+	cd ..
+	@$(MAKE) install
\ No newline at end of file
diff --git a/sinqMotor b/sinqMotor
index 4d1c21f..5502c39 160000
--- a/sinqMotor
+++ b/sinqMotor
@@ -1 +1 @@
-Subproject commit 4d1c21fd741c94271758d0c82cd5560a178f10c7
+Subproject commit 5502c39219c1690477a4a56fef1b4eb5bae67e2f