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
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
7c1693e606
Added support for the AMOR SLS VME Magnet controllers to the sinq IOC application
...
refs #DM-91
2016-07-08 13:53:21 +02:00
c75957f284
The SINQ IOC working in the ESS EPICS environment
2016-06-16 15:20:55 +02:00
8f0c240e76
Removed unnecessary stuff from the Makefile which was introduced while trying to get this to compile
2016-06-03 16:54:30 +02:00
5dff3bc23b
First compile on the ESS EPICS environment. Success for the motor code.
...
Still missing:
* scaler support
* cleanup of Makefile
2016-06-03 16:52:02 +02:00
4b377d1b2e
Fixed Nanotex driver to work with the real HW and the simulation
2016-05-03 11:58:24 +02:00
e224004969
Integrated lakeshore 336 support into the SINQ IOC
...
See lakeshore.cmd for the pains involved
2015-08-21 16:16:18 +02:00
06b982ed09
sinqepicsapp with lates nanotec support
2015-08-18 09:12:23 +02:00
cdf309114a
A first sort of working version of a asyn driver for the Nanotoec SMCI
...
motors. Homing still needs more testing
2015-07-30 14:12:45 +02:00
fd4b41d131
Initial commit of SINQ EPICS Application
2014-11-03 11:37:50 +01:00
