Commit Graph

110 Commits

Author SHA1 Message Date
c805385ad1 Allow enable/disable (tentative) 2022-05-20 08:35:42 +00:00
929f9f600d Add PMAC V3
- limit switches: use PXX37, PXX38 insteam of MXX21, MXX22
- if the motor is running query for axis position (QXX10) and status (PXX00)
- else query also error status (PXX01) and limit switches (PXX37-8)
- make the requests in 1+1 transactions
2022-05-20 08:35:42 +00:00
8c3e68394f Changes to Scaler, add build for version 7 in Makefile 2022-05-20 10:25:41 +02:00
646607e476 EuroMove fix "addrCommand" bug in controller 2022-03-02 06:41:39 +01:00
68a265b199 EL734 positioning failure + improve logging 2022-03-02 06:39:18 +01:00
542abcbaad pmac improve handling of the error message 2022-03-02 06:37:33 +01:00
efbd0e19cf Updated EuromoveDriver to work with Prologix GPIB-Ethernet
Improved threshold handling on EL737
Minor changes
2021-06-17 09:30:28 +02:00
6de4a878ef Merge branch 'amor-selene'
Conflicts:
	.gitignore
	sinqEPICSApp/src/pmacAxis.cpp
	sinqEPICSApp/src/pmacAxis.h
	sinqEPICSApp/src/pmacController.cpp
	sinqEPICSApp/src/pmacController.h
2020-10-01 09:31:23 +02:00
d86da602d2 Added .gitignore 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
2020-07-09 14:15:26 +02:00
d1d74f4db3 Merge branch 'master' of ssh://git.psi.ch/sinqdev/sinqepicsapp 2020-06-23 09:20:17 +02:00
d1beb9b0d8 Merge branch 'master' of ssh://git.psi.ch/sinqdev/sinqepicsapp into amor-selene 2020-06-23 09:19:25 +02:00
3ae13875cf Added fucking brake support to Phytron 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
2020-03-18 15:53:44 +01:00
a25f8cabb9 Selene positions do not need factor *1000 2020-02-19 15:39:23 +01:00
c4fe45c0cb Add a set PV for the SeleneMotor
- make the number of extra parameters in SINQController configurable
    - add database entry for the motor set field
    - add the new function "setMotorPosition_" to the Selene controller
    - execute Qx59=<pos> to set the new position
2020-02-18 12:32:24 +01:00
3b7133ecfe Make sure that the SINQ library version stays the same 2020-02-18 12:31:25 +01:00
e9a615d0fa Changes in pmac controller 2020-02-17 11:10:02 +01:00
12249d5471 Implemented Homing on the EuroMove driver 2020-02-10 10:00:56 +01:00
6d823e2265 Removed a debug statement from EuroMoveDriver.cpp 2020-01-24 13:04:40 +01:00
75de7a3a4c First version of a driver for the LLB EuroMove controller. USB feature still missing. 2020-01-21 14:17:17 +01:00
5aefbd4684 Fixed a bug in the pmac driver which caused wrong state 5/6 errors to be
found on a slow motor.
2019-10-30 11:32:33 +01:00
3133d933fa Minor fixes to the PhytronDriver
Removed some annoying messages grom Nanotec Driver
2019-10-10 11:35:25 +02:00
bf2ff63a4b Fixed bugs in EL734
Phytron motor driver is now working
May be fixed inverted limits on pmac
2019-05-23 16:50:10 +02:00
b4b093efdf Some cleanup in EL734Driver.cpp 2019-05-20 09:17:33 +02:00
f424477a6a Fixed a bug with inproperly cleared MsgTxt in SINQAxis
Extended pmacAxis to properly deal with HRPT pmac motors which have an extra error condition
2019-05-13 12:03:24 +02:00
3bea34700e Added MsgTxt support to Nanotec motor driver 2019-01-08 11:55:50 +01:00
02ab5ff9b8 Added MsgTxt support to pmac controller driver 2019-01-08 11:47:02 +01:00
972131d86a Added new system disconnect reporting to the phytron driver 2019-01-08 11:35:09 +01:00
f909c41a2b Updated the Phytron driver to use MsgTxt
Updated the Phytron driver to use a selector in order to support the use case of multiple phytrons on one channel
The chnages still need to be tested
2019-01-08 09:41:34 +01:00
460030e410 Made EL737 send an empty string in MsgTxt on success
Fixed a type in an error message
2018-11-07 16:26:58 +01:00
2a964503a4 Added a number of auxiliary Makefiles
- MakeScaler.RHEL7 to build the EPICS scaler module from source. We use a better one then the standard one.
- MakeAutoSave.RHEL7 to build  autosave from the PSI module system
- Modified the EL734Driver to set the MsgTxt to NULL when everything is happy
2018-11-07 16:18:16 +01:00
1687ebf4c7 Added a README to sinqEPICSApp 2017-11-08 09:58:18 +01:00
7023f52336 Modified devScalerEL737 to process threshold and thresholdcounter as fields external to
the scaler record. This is to replace the preset hack previously used to implement this
functionality.
2017-08-21 16:30:15 +02:00
83a995a16d Fixed the value reading bug in devScalerEL737 (wrong function signature)
Nihkil added mor error codes to devScalerEL737
2017-08-21 14:42:09 +02:00
124aa97cd6 Fixed a bug in el737_read which had a wrong function signature. May have changed over the years.
This caused every second monitor to be 0. A number type mismatch.
2017-08-14 14:52:04 +02:00
bd3b808312 Commented the various Makefiles to say what they are for. 2017-08-09 16:51:38 +02:00
9a3b0f7666 Improved error reporting to the MsgTxt additional field 2017-08-08 17:32:32 +02:00
0eed0c9357 Fixed bad logic in devScalerEL7373.c:connectSlaveRecords() which caused a core dump when accessing non existing
slave records
2017-07-25 08:01:27 +02:00
7263a0772f Added support for an addition Pause, Status and MsgTxt field to the EL737 scaler driver 2017-07-24 09:45:57 +02:00
9c507a05ba Merge branch 'errtxt'
Also made sinqepicsApp work with the module based build system now being operational at PSI
Conflicts:
	iocBoot/iocsinqEPICS/envPaths
	iocBoot/iocsinqEPICS/st.cmd
	sinqEPICSApp/src/Makefile
2017-07-04 08:38:40 +02:00
dc966bc976 Merge branch 'ess' 2017-05-17 11:23:50 +02:00
edd3005f85 Merge branch 'phytron' 2017-05-17 11:22:43 +02:00
af4d16d25f Implemented a feature which allows for an additional field for having a text message
with a motor axis. To this purpose a new derived class SINQAxis and SINQController were
added which other drivers using this feature can derive from. The proof of concept and
test platform is the EL734 driver.
2017-03-20 16:40:25 +01:00
6ea6fdcb85 I added a driver for the EL755 magnet controller using streamdevice 2017-03-07 16:37:19 +01:00
389e7f9157 The ESS module version is now working!
References DM-89
2017-02-17 11:09:23 +01:00
8858761e74 I now have a ESS style module Makefile.EEE which compiles.... I just do not yet know if it
works.....
2017-02-14 17:21:39 +01:00
002210b7a6 Added a driver for the phytron MCC-2 motor controller. It now works against the
simulation.
2016-09-01 16:13:39 +02:00
2950f21353 Added support for the dimetix distance measurement device
Refs #DM-93
2016-08-09 15:36:22 +02:00
28999f2212 Added support for the AMOR SPS-S5 using streamdevice 2016-08-04 14:38:50 +02:00