Commit Graph

  • 354e9d90fb Fixed missing initializer for variables in Phytron-Axis master smathis 2025-06-20 13:45:30 +02:00
  • deea821e3f Merge pull request 'el734' (#2) from el734 into master soederqvist_a 2025-06-11 15:07:19 +02:00
  • 7a46788fd5 Install a el734 db file el734 soederqvist_a 2025-06-11 12:57:47 +02:00
  • cb70054a72 Readded the PMAC driver for HRPT 2025-with-pmac with-pmac smathis 2025-05-12 16:27:39 +02:00
  • 9e77eb585c Merge branch 'lift_axis_no_autoenable' 2025 smathis 2025-04-17 17:00:19 +02:00
  • d0c009ea38 Removed PMAC drivers lift_axis_no_autoenable smathis 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 smathis 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. smathis 2024-10-24 10:34:19 +02:00
  • 3cccfe930c Removed typo from C804Axis.cpp smathis 2024-10-18 09:53:47 +02:00
  • 8860d0c59f Updated the first-time-poll of C804 Axis smathis 2024-09-18 13:19:32 +02:00
  • b6c38be113 Initial driver version for the C804 controller smathis 2024-09-17 11:53:31 +02:00
  • 848da9dfe3 SINQSW-107 adds missing commands that were in previous version SINQSW-107-counterbox-v2 Edward Wall 2024-10-18 09:22:10 +02:00
  • af61358351 SINQSW-107 draft streamdevice based counterbox driver Edward Wall 2024-10-17 17:09:49 +02:00
  • b14b50c25a Merge branch 'can-we-have-pipelines' into 'master' wall_e 2024-10-14 10:07:16 +02:00
  • 477ffdbc0b Adds CI-Pipeline with Formatting, Linter Checks and Build Steps wall_e 2024-10-14 10:07:16 +02:00
  • b700fca383 Commit first working version of the new PMAC-V3 driver. This version has been tested on the SINQTEST instrument. However, some important improvements (such as central polling in the controller) are still missing. They will be implemented in the next commit. pmacV3-rewrite smathis 2024-10-11 17:19:41 +02:00
  • 0a23ec8f22 clang is too old Edward Wall 2024-10-10 13:22:09 +02:00
  • d44dbaaf0f clang is too old SINQSW-107-adds-new-counterbox-commands Edward Wall 2024-10-10 13:19:59 +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. smathis 2024-10-04 17:03:15 +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. smathis 2024-10-04 14:57:21 +02:00
  • fd763a26ae First draft for the new pmacV3 controller and axis. This draft is still buggy, please don't use it in production. The commit is only done to save the progress made so far. The changes to the C804 controller and axis are caused by applying clang-format. smathis 2024-10-04 13:29:05 +02:00
  • 501c5badea ran formatter Edward Wall 2024-09-30 17:12:30 +02:00
  • 39098fd0d1 Adds .clang-format style for formatting files Edward Wall 2024-09-25 16:21:01 +02:00
  • d44fdbf736 Updated the first-time-poll of C804 Axis smathis 2024-09-18 13:19:32 +02:00
  • 20e5c35d44 Initial driver version for the C804 controller smathis 2024-09-17 11:53:31 +02:00
  • 1539bfc66a bugfix: don't need to run on initialisation Edward Wall 2024-09-23 09:04:08 +02:00
  • 9e4f24dd9f Playing around with the initHooks.h trying to discover when different things are available and what order things are started exploring_ioc_hooks Edward Wall 2024-09-20 14:27:40 +02:00
  • 9ca5af4507 In the poll method, it is now checked whether the parameter library has been initialized. If this isn't the case, the poll is repeated (this is triggered by returning an error from the poll method) C804_driver smathis 2024-09-20 13:13:13 +02:00
  • 4272ed2f50 Bugfix: A disabled PMac is no longer consider moving Edward Wall 2024-09-18 10:48:59 +02:00
  • 87b7bece94 Bugfix: A disabled PMac is no longer consider moving Edward Wall 2024-09-18 10:48:59 +02:00
  • 36b6e8b991 Updated the first-time-poll of C804 Axis smathis 2024-09-18 13:19:32 +02:00
  • d88e5877a7 Bugfix: A disabled PMac is no longer consider moving 2024-v2 Edward Wall 2024-09-18 10:48:59 +02:00
  • 118e177e04 Bugfix: A disabled PMac is no longer consider moving Edward Wall 2024-09-18 10:48:59 +02:00
  • 001b712900 Initial driver version for the C804 controller smathis 2024-09-17 11:53:31 +02:00
  • f61daf0b49 just adds some warnings for potentially incorrect code Edward Wall 2024-09-11 15:07:25 +02:00
  • 6dbd0fc0d7 Merge branch 'SINQSW-86-read-after-motor-reconnection' into 'master' mathis_s 2024-09-10 09:21:15 +02:00
  • e657ea675c SINQSW-86 fix build error wall_e 2024-09-10 09:21:15 +02:00
  • 5c0c917be9 Merge branch 'initializer_for_EL734Axis' into 'master' mathis_s 2024-09-10 09:19:24 +02:00
  • 35c12274b0 Merge branch 'master' into 'initializer_for_EL734Axis' mathis_s 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. smathis 2024-09-10 08:58:59 +02:00
  • 33f118ce1e Fixed type in pmacController.cpp koennecke 2024-08-20 11:14:18 +02:00
  • adf8b30692 Minor changes to SINQ drivers: - Fixed enable/disable at MasterMACS koennecke 2024-08-20 11:12:18 +02:00
  • c972cce072 Added girder translation axis drivers Mathis Stefan 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. koennecke 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 koennecke 2024-06-07 08:58:53 +02:00
  • d9d6dae19f Updated the sync utilities koennecke 2024-05-23 16:00:32 +02:00
  • 32a8c27dbf Merge branch 'speed' koennecke 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 koennecke 2024-02-23 11:30:46 +01:00
  • b4e201ae86 Final version of the SINQ EPICS module for RHEL7 in 2023 koennecke 2024-01-11 14:05:49 +01:00
  • 9422353107 Alex: Committing Mark's fixes to el737 devsup soederqvist_a 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 koennecke 2023-08-28 15:01:48 +02:00
  • 7a81e2c5a0 Reduced output from MasterMacsDriver koennecke 2023-07-13 10:57:07 +02:00
  • f1a17bc295 Added AMOR detector tower special pmac motors: working now koennecke 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. koennecke 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 koennecke 2023-05-31 09:13:41 +02:00
  • f333a27482 Added missing file after merging MasterMACS koennecke 2023-03-21 15:05:25 +01:00
  • 4a2731b054 Added yet another missing file koennecke 2023-03-21 14:58:21 +01:00
  • 9055a86b57 Added two missing files koennecke 2023-03-21 14:56:38 +01:00
  • ccd73babd5 First working version of the MasterMACS EPICS driver Also added some test code koennecke 2023-03-21 14:55:07 +01:00
  • b8896b7a85 Implemented speed for the PMAC controller koennecke 2023-02-22 11:54:54 +01:00
  • acf1751081 Merge branch 'master' into speed koennecke 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 koennecke 2023-02-17 10:45:15 +01:00
  • d706915a46 Implemented changing speed on EL734 Added a test IOCs for EL734 koennecke 2023-02-17 10:43:51 +01:00
  • 3c9932dc18 - Reduced poll rate of EL737 - Removed unneeded hardware limit reading code from EL734 koennecke 2023-02-16 14:29:05 +01:00
  • 9b9072b83b Improved error handling in the EL737 scalerRecord driver koennecke 2023-01-31 11:42:04 +01:00
  • 3b2a21094c Fixed pmacV3 axis codes koennecke 2023-01-12 15:16:09 +01:00
  • a899a28182 sMore debugging output in devScalerEL737 koennecke 2023-01-11 15:08:18 +01:00
  • 0cbfe45893 Fixed ErormoveDriver to stop only on end switches when the target exceeds the limits. Otherwise motors would get stuck on the switches when trying to move off them. pmacV3 koennecke 2022-08-16 10:54:10 +02:00
  • bb1c10c7cd EL737 Increase timeout brambilla_m 2022-07-21 13:42:31 +02:00
  • 339da2e9ff PMAC V3: axis status 5,6 not a failure brambilla_m 2022-07-21 13:37:32 +02:00
  • 80877aa6ab pmacV3 read speed and evaluate ETA brambilla_m 2022-05-27 15:19:56 +02:00
  • afc92bde3f Improved status reporting koennecke 2022-05-12 09:31:22 +02:00
  • 8e2c1af10e Some cleanup, force reload encoder before enable brambilla_m 2022-04-06 11:45:06 +02:00
  • f5da0d54bd Reduce polling, se MsgTxt if move when disabled brambilla_m 2022-03-22 11:01:06 +01:00
  • ad05433602 Bugfix + cleanup Michele Brambilla 2022-03-10 15:26:08 +01:00
  • 92364a1de8 Can set and read enable, something broken with movements and status Michele Brambilla 2022-03-10 12:57:14 +01:00
  • 403eecafae pmac Enable PV successfully tested Michele Brambilla 2022-03-07 16:40:46 +01:00
  • fbf2331a05 pmacV3 read axis state brambilla_m 2022-03-03 14:13:09 +01:00
  • 14bbda3364 Add pmacV3 poll Michele Brambilla 2022-03-02 16:11:18 +01:00
  • c7fea08718 pmacV3 enable/disable axis Michele Brambilla 2022-03-02 15:24:15 +01:00
  • edc71af235 Bugfix pmacV3 Michele Brambilla 2022-03-02 11:04:28 +01:00
  • c805385ad1 Allow enable/disable (tentative) brambilla_m 2022-02-28 15:33:47 +01:00
  • 929f9f600d Add PMAC V3 brambilla_m 2022-02-25 14:56:21 +01:00
  • 8c3e68394f Changes to Scaler, add build for version 7 in Makefile brambilla_m 2022-05-19 11:54:49 +02:00
  • 646607e476 EuroMove fix "addrCommand" bug in controller Michele Brambilla 2022-03-02 06:41:39 +01:00
  • 68a265b199 EL734 positioning failure + improve logging Michele Brambilla 2022-03-02 06:39:18 +01:00
  • 542abcbaad pmac improve handling of the error message Michele Brambilla 2022-03-02 06:37:33 +01:00
  • efbd0e19cf Updated EuromoveDriver to work with Prologix GPIB-Ethernet Improved threshold handling on EL737 Minor changes koennecke 2021-06-17 09:30:28 +02:00
  • 6de4a878ef Merge branch 'amor-selene' koennecke 2020-10-01 09:31:23 +02:00
  • d86da602d2 Added .gitignore koennecke 2020-07-09 14:19:13 +02:00
  • c9e7830274 - Fixed reference run for Phytron - Added brake handling to phytron - Added code to set speed for phytron - Removed scaling on Selene pmac limits - Removed enabling on Selene pmac axis koennecke 2020-07-09 14:15:26 +02:00
  • d1d74f4db3 Merge branch 'master' of ssh://git.psi.ch/sinqdev/sinqepicsapp koennecke 2020-06-23 09:20:17 +02:00
  • d1beb9b0d8 Merge branch 'master' of ssh://git.psi.ch/sinqdev/sinqepicsapp into amor-selene koennecke 2020-06-23 09:19:25 +02:00
  • 3ae13875cf Added fucking brake support to Phytron Mark Koennecke 2020-06-23 09:18:12 +02:00
  • f56ef2c74c Committing the last status of selene work in the corona lockdown. The problem is in the MCU, probably koennecke 2020-03-18 15:53:44 +01:00
  • a25f8cabb9 Selene positions do not need factor *1000 michele-brambilla 2020-02-19 15:39:23 +01:00
  • c4fe45c0cb Add a set PV for the SeleneMotor michele-brambilla 2020-02-17 11:10:02 +01:00
  • 3b7133ecfe Make sure that the SINQ library version stays the same michele-brambilla 2020-02-18 10:00:30 +01:00
  • e9a615d0fa Changes in pmac controller michele-brambilla 2020-02-17 11:10:02 +01:00
  • 12249d5471 Implemented Homing on the EuroMove driver koennecke 2020-02-10 10:00:56 +01:00