Readded the PMAC driver for HRPT

.gitea/workflows/action.yaml

@@ -1,21 +0,0 @@
-name: Test And Build
-on: [push]
-
-jobs:
-  Lint:
-    runs-on: linepics
-    steps:
-      - name: checkout repo
-        uses: actions/checkout@v4
-      - name: cppcheck
-        run: cppcheck --std=c++17 --addon=cert --addon=misc --error-exitcode=1 sinqEPICSApp/src/*.cpp
-      - name: formatting
-        run: clang-format --style=file --Werror --dry-run sinqEPICSApp/src/*.cpp sinqEPICSApp/src/*.c sinqEPICSApp/src/*.h
-  Build:
-    runs-on: linepics
-    steps:
-      - name: checkout repo
-        uses: actions/checkout@v4
-      - run: |
-          sed -i 's/ARCH_FILTER=.*/ARCH_FILTER=linux%/' Makefile.RHEL8
-          make -f Makefile.RHEL8 install

.gitlab-ci.yml

@@ -0,0 +1,51 @@
+default:
+  image: docker.psi.ch:5000/wall_e/sinqepics:latest
+    
+stages:
+  - test
+  - build
+
+cppcheck:
+  stage: test
+  script:
+    - cppcheck --std=c++17 --addon=cert --addon=misc --error-exitcode=1 sinqEPICSApp/
+  allow_failure: true # Long term this needs to be removed
+  artifacts:
+    expire_in: 1 week
+  tags:
+    - docker
+
+formatting:
+  stage: test
+  script:
+    - clang-format --style=file --Werror --dry-run sinqEPICSApp/src/*.cpp sinqEPICSApp/src/*.c sinqEPICSApp/src/*.h
+  allow_failure: true # Long term this needs to be removed
+  artifacts:
+    expire_in: 1 week
+  tags:
+    - docker
+
+# clangtidy:
+#   stage: test
+#   script:
+#     - curl https://docker.psi.ch:5000/v2/_catalog
+# #     - dnf update -y
+# #     - dnf install -y clang-tools-extra
+# #     - clang-tidy sinqEPICSApp/src/*.cpp sinqEPICSApp/src/*.c sinqEPICSApp/src/*.h -checks=cppcoreguidelines-*,cert-*
+# #   tags:
+# #     - docker
+
+build_module:
+  stage: build
+  script:
+    - sed -i 's/ARCH_FILTER=.*/ARCH_FILTER=linux%/' Makefile.RHEL8
+    - make -f Makefile.RHEL8 install
+    - cp -rT "/ioc/modules/sinq/$(ls -U /ioc/modules/sinq/ | head -1)" "./sinq-${CI_COMMIT_SHORT_SHA}"
+  artifacts:
+    name: "sinq-${CI_COMMIT_SHORT_SHA}"
+    paths:
+      - "sinq-${CI_COMMIT_SHORT_SHA}/*"
+    expire_in: 1 week
+  when: always
+  tags:
+    - docker

Makefile.RHEL8

@@ -4,7 +4,7 @@ include /ioc/tools/driver.makefile
 MODULE=sinq
 BUILDCLASSES=Linux
 EPICS_VERSIONS=7.0.7
-ARCH_FILTER=RHEL8%
+ARCH_FILTER=RHEL%
 
 # additional module dependencies
 REQUIRED+=SynApps
@@ -12,11 +12,13 @@ REQUIRED+=stream
 REQUIRED+=scaler
 REQUIRED+=motorBase
 
+# Release version
+LIBVERSION=2025-with-pmac
+
 # DB files to include in the release
 TEMPLATES += sinqEPICSApp/Db/dimetix.db
 TEMPLATES += sinqEPICSApp/Db/slsvme.db
 TEMPLATES += sinqEPICSApp/Db/spsamor.db
-TEMPLATES += sinqEPICSApp/Db/el734.db
 
 # DBD files to include in the release
 DBDS += sinqEPICSApp/src/sinq.dbd
@@ -30,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

sinqEPICSApp/Db/el734.db

@@ -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")
-}
-

sinqEPICSApp/src/PhytronDriver.cpp

@@ -250,8 +250,6 @@ PhytronAxis::PhytronAxis(PhytronController *pC, int axisNo, int enc)
   haveBrake = 0;
   brakeIO = -1;
   next_poll = -1;
-  homing = 0;
-  homing_direction = 0; 
 }
 
 int PhytronAxis::setBrake(int brakeNO)

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)