354e9d90fb
Fixed missing initializer for variables in Phytron-Axis
2025-06-20 13:46:10 +02:00
deea821e3f
Merge pull request 'el734' ( #2 ) from el734 into master
...
Reviewed-on: #2
2025-06-11 15:07:19 +02:00
7a46788fd5
Install a el734 db file
...
also remove explicit libversion in the makefile
2025-06-11 15:05:14 +02:00
9e77eb585c
Merge branch 'lift_axis_no_autoenable'
2025-04-17 17:00:19 +02:00
d0c009ea38
Removed PMAC drivers
...
Commented out the PMAC drivers to avoid namespace clashes with the new
turboPmac driver library.
2025-04-17 16:52:52 +02:00
7e1fc78f76
Moved curses from top-level import to function-level import and added a
...
comment why that is necessary
2024-10-24 10:49:18 +02:00
9e0d8a4322
Added a new script utils/decodeMasterMACStatusR10.py which allows to
...
decode the R10 status message of the MasterMACs controller.
Also fixed a bug in utils/deltatau.py (error when printing too much text
at once)
2024-10-24 10:34:19 +02:00
3cccfe930c
Removed typo from C804Axis.cpp
2024-10-18 09:53:47 +02:00
8860d0c59f
Updated the first-time-poll of C804 Axis
2024-10-18 09:48:17 +02:00
b6c38be113
Initial driver version for the C804 controller
2024-10-18 09:48:17 +02:00
b14b50c25a
Merge branch 'can-we-have-pipelines' into 'master'
...
Adds CI-Pipeline with Formatting, Linter Checks and Build Steps
See merge request sinqdev/sinqepicsapp!4
2024-10-14 10:07:16 +02:00
477ffdbc0b
Adds CI-Pipeline with Formatting, Linter Checks and Build Steps
2024-10-14 10:07:16 +02:00
0a23ec8f22
clang is too old
2024-10-10 13:22:09 +02:00
eb1bb58c36
Fixed an uninitialized memory bug: In AmorDetectorAxis, the variables
...
det_starting and det_startTime were not initialized before reading them
in the poll function, leading to erratic behaviour.
2024-10-04 17:04:56 +02:00
80205727c7
File pmacAxis.h:
...
The default constructor of LiftAxis just forwards to the pmacAxis
constructor, which has an optional argument "autoenable" with the default
value "true". However, we want that argument to be false, hence we provide
an explicit constructor.
File C804Axis.cpp:
Removed a typing error
File Makefile.RHEL8:
Switched compilation target name to 2024-amor-no-autoenable-lift-axis to
not disturb other instruments. The newly created library is meant just
for Amor. if no problems occur, we can upstream the changes to master
at the end of October and create a new library "2023-v3".
2024-10-04 14:57:21 +02:00
39098fd0d1
Adds .clang-format style for formatting files
2024-09-25 16:21:01 +02:00
d44fdbf736
Updated the first-time-poll of C804 Axis
2024-09-23 16:21:02 +02:00
20e5c35d44
Initial driver version for the C804 controller
2024-09-23 16:21:02 +02:00
1539bfc66a
bugfix: don't need to run on initialisation
2024-09-23 09:04:08 +02:00
d88e5877a7
Bugfix: A disabled PMac is no longer consider moving
2024-09-18 10:57:57 +02:00
118e177e04
Bugfix: A disabled PMac is no longer consider moving
2024-09-18 10:48:59 +02:00
f61daf0b49
just adds some warnings for potentially incorrect code
2024-09-11 15:07:25 +02:00
6dbd0fc0d7
Merge branch 'SINQSW-86-read-after-motor-reconnection' into 'master'
...
SINQSW-86 fix build error
See merge request sinqdev/sinqepicsapp!2
2024-09-10 09:21:15 +02:00
e657ea675c
SINQSW-86 fix build error
2024-09-10 09:21:15 +02:00
5c0c917be9
Merge branch 'initializer_for_EL734Axis' into 'master'
...
Girder axis and initializer EL734Axis
See merge request sinqdev/sinqepicsapp!3
2024-09-10 09:19:24 +02:00
35c12274b0
Merge branch 'master' into 'initializer_for_EL734Axis'
...
# Conflicts:
# sinqEPICSApp/src/EL734Driver.cpp
2024-09-10 09:19:06 +02:00
a6a8f14b26
The member variable oredMSR of EL734Axis contains the axis status from the previous poll.
...
Therefore, it needs to initialized with a sensible value (i.e. 1 which
means that the axis is standing still and has no errors.
2024-09-10 08:58:59 +02:00
33f118ce1e
Fixed type in pmacController.cpp
2024-08-20 11:14:18 +02:00
adf8b30692
Minor changes to SINQ drivers:
...
- Fixed enable/disable at MasterMACS
2024-08-20 11:12:18 +02:00
c972cce072
Added girder translation axis drivers
2024-07-18 13:43:12 +02:00
64c8b08ce4
Fixed an initialisation bug in EL734Driver which prevented motors from
...
being polled. The value in question was next_poll which is now set to -1
in the constructor.
2024-06-07 13:36:34 +02:00
30228adf50
- Fixed a enable PV initialisation bug in MasterMACS
...
- Made the HRPT axis base itself on V3 of the pmacAxis
- Improved and added utils programs
2024-06-07 08:58:53 +02:00
d9d6dae19f
Updated the sync utilities
2024-05-23 16:00:32 +02:00
32a8c27dbf
Merge branch 'speed'
2024-02-23 11:34:26 +01:00
235e403fb3
- Added Makefile.RHEL8 for RHEL8
...
- Added a interMessagePeriod to SINQController, pmacController and MasterMACSController. Also a iocsh command to modify this at runtime
2024-02-23 11:30:46 +01:00
b4e201ae86
Final version of the SINQ EPICS module for RHEL7 in 2023
...
- Fixes to MasterMACS, mostly.
- Minor changes
2024-01-11 14:05:49 +01:00
9422353107
Alex: Committing Mark's fixes to el737 devsup
2023-09-12 16:43:24 +02:00
e3ac2962f5
- Many improvements to the MasterMACS driver
...
- Slowing down the pmac driver
- Fixing a bug in the Nanotec driver which caused an IOC crash when the
motor sends bad data
2023-08-28 15:01:48 +02:00
7a81e2c5a0
Reduced output from MasterMacsDriver
2023-07-13 10:57:07 +02:00
f1a17bc295
Added AMOR detector tower special pmac motors: working now
2023-07-07 13:54:21 +02:00
8a6441927a
Implemented that enable commands are only sent when a status chnage is required
...
Stop commands are only sent by EL734 and pmac when actually moving. The
motor record logic calls stop() in an excessive way.
2023-05-31 09:37:22 +02:00
72afd02b4e
Many improvements to the MasterMACS motor driver. It is working but the hardware is shaky.
...
Added support for dose rate controlled Phytron motors. Not tested!
Small bug fixes
2023-05-31 09:13:41 +02:00
f333a27482
Added missing file after merging MasterMACS
2023-03-21 15:05:25 +01:00
4a2731b054
Added yet another missing file
2023-03-21 14:58:21 +01:00
9055a86b57
Added two missing files
2023-03-21 14:56:38 +01:00
ccd73babd5
First working version of the MasterMACS EPICS driver
...
Also added some test code
2023-03-21 14:55:07 +01:00
b8896b7a85
Implemented speed for the PMAC controller
2023-02-22 11:54:54 +01:00
acf1751081
Merge branch 'master' into speed
2023-02-17 10:46:06 +01:00
61290b5e2c
Added utility programs which update motor subsitutions files from
...
the values read rom the actual controller
2023-02-17 10:45:15 +01:00
d706915a46
Implemented changing speed on EL734
...
Added a test IOCs for EL734
2023-02-17 10:43:51 +01:00
