64 Commits

Author SHA1 Message Date
e0c0469795 added auto_monitor forwarder to sls_info 2022-11-17 19:50:11 +01:00
8c6a96ca2c Merge branch 'sls_info' of gitlab.psi.ch:/bec/ophyd_devices into sls_info 2022-11-17 19:36:46 +01:00
Wakonig Klaus
08a8272ac0 removed duplicated pv 2022-11-17 19:36:13 +01:00
e20588
7bf193eaa6 improvements for sls info 2022-11-17 18:19:47 +01:00
f5096a90e5 Merge branch 'master' into sls_info 2022-11-11 20:17:08 +01:00
e9869d8ef1 Merge branch 'master' of gitlab.psi.ch:/bec/ophyd_devices 2022-11-11 20:13:47 +01:00
e20588
c7cabc3eeb cleanup 2022-11-11 18:07:23 +01:00
e20588
7b221ea979 online_changes 2022-11-11 11:34:15 +01:00
bba6109330 added eiger1p5M 2022-11-11 09:45:06 +01:00
bd7b18c1ef added beamlineinfo to int 2022-11-02 11:22:28 +01:00
bd8d081c5b added beamlineinfo 2022-11-02 11:18:55 +01:00
2a365493f2 Merge branch 'online_changes' into 'master'
Online changes

See merge request bec/ophyd_devices!5
2022-11-02 08:57:27 +00:00
ca5a03b2f1 Merge branch 'master' into online_changes 2022-10-31 13:28:57 +01:00
7be2f9af79 added lsamx/lsamy from config 2022-10-31 13:28:27 +01:00
6b4cf3f79c Merge branch 'online_changes' into 'master'
added enabled-set

See merge request bec/ophyd_devices!4
2022-10-14 16:13:41 +00:00
e20216
d71e82127e added enabled-set 2022-10-14 18:08:14 +02:00
78a944e46e Merge branch 'online_changes' into 'master'
added device enable/disable routines to rt_lamni

See merge request bec/ophyd_devices!3
2022-10-14 07:23:41 +00:00
d6452db5d4 added device enable/disable routines to rt_lamni 2022-10-14 09:22:00 +02:00
31fbefb1d6 Merge branch 'online_changes' into 'master'
Online changes

See merge request bec/ophyd_devices!2
2022-10-12 16:16:29 +00:00
faa6e0db1a fixed tests 2022-10-12 18:14:50 +02:00
be8d113e5b Update .gitlab-ci.yml 2022-10-12 16:01:59 +00:00
22bbfb1d59 Update .gitlab-ci.yml 2022-10-12 15:56:40 +00:00
cdc0f8294a Update .gitlab-ci.yml 2022-10-12 15:55:20 +00:00
ab61aa61ae updated ci file 2022-10-12 17:50:46 +02:00
28cb54c254 fixed formatting for socket 2022-10-12 17:41:54 +02:00
e20216
ed77e575bf added bec logger 2022-10-12 16:00:14 +02:00
e20216
0b774f25dd fixed bug that lead galil to quit unexpectedly 2022-10-12 15:59:49 +02:00
e20216
e66208ca18 fixed bug in rt readout 2022-10-12 15:58:24 +02:00
a8a2637d07 added SynSignalRO 2022-09-18 13:55:35 +02:00
e20216
fbace69f0f update timestamp on read 2022-09-16 17:44:21 +02:00
fbdccf4dd7 replaced staging in tests by direct controller.on calls 2022-09-08 21:54:34 +02:00
80e101a5ef removed controller.on methods from staging; improvements for detector sim 2022-09-08 21:50:31 +02:00
d60b58a5f5 added first version of a detector sim 2022-09-06 20:00:52 +02:00
a3b3efc4a5 minor cleanup 2022-09-06 16:45:30 +02:00
000bdfda12 added pre-commit hook 2022-09-06 16:44:02 +02:00
ac234edd56 enforced black 2022-09-06 16:22:05 +02:00
e6ce939eef improvements for flyer sim 2022-09-05 22:09:58 +02:00
49106b0539 added threadlocks to signals 2022-08-02 11:46:41 +02:00
4a0210ca88 Merge branch 'master' of gitlab.psi.ch:/bec/ophyd_devices 2022-08-02 11:35:48 +02:00
5ceadfb648 added threadlock decorator to all socket calls; cleanup 2022-08-02 11:35:39 +02:00
e20216
4a32d71f37 online changes; added threadlock for galil 2022-07-26 13:59:46 +02:00
bf0b1cb280 removed signal entry for now 2022-07-25 19:05:33 +02:00
98a1426a98 black; added push events to rt_lamni 2022-07-25 19:03:53 +02:00
069887c5cb Merge branch 'master' of gitlab.psi.ch:/bec/ophyd_devices 2022-07-25 14:01:10 +02:00
619ff60e73 added flyer sim 2022-07-25 14:01:05 +02:00
e20216
2434ba30e9 Merge branch 'master' of https://gitlab.psi.ch/bec/ophyd_devices 2022-07-25 13:59:16 +02:00
e20216
6e541cc0d0 online changes; added bec logger; added limits to custom devices 2022-07-25 13:58:59 +02:00
c97d69e03b Update .gitlab-ci.yml 2022-07-21 12:45:57 +00:00
75420a0095 Update .gitlab-ci.yml 2022-07-21 12:44:29 +00:00
e9998f194a Update .gitlab-ci.yml 2022-07-21 12:42:12 +00:00