761 Commits

Author SHA1 Message Date
da4d47052d binaries in 2021-07-22 14:01:26 +02:00
5b05a30287 merge conflict fix 2021-07-22 13:52:55 +02:00
97ff58c978 binaries in 2021-07-22 13:48:17 +02:00
05b7e0ef42 conflict merge fix 2021-07-22 11:53:00 +02:00
da996314e7 merge conflict 2021-07-22 11:15:57 +02:00
d052efbd23 binaries in 2021-07-21 14:12:15 +02:00
91eba6a8b8 binaries in 2021-07-21 12:32:04 +02:00
ec7ba7c508 wip to change to enum for portposition 2021-07-20 16:05:08 +02:00
efe26b2b0d minor enum modif 2021-07-20 14:59:42 +02:00
e02493d4e4 veotalg for g2 2021-07-20 14:57:31 +02:00
af16ad4040 vetoalg: wip 2021-07-20 12:58:05 +02:00
Erik Frojdh
09391b767a support for scoped enums and operators in Python 2021-07-16 14:48:22 +02:00
5e685ea5a6 resolving merge from 5.2.0-rc 2021-07-15 21:16:42 +02:00
c3ad736d3c binaries in 2021-07-15 16:28:40 +02:00
780d4bfe0a gotthard2: vetostream (detector: only 3gbe, 10gbe via numudpinterfaces) 2021-07-15 16:21:17 +02:00
4d7fb4e4e0 wip 2021-07-15 14:48:41 +02:00
8354395f64 wip 2021-07-15 13:44:42 +02:00
86d1a18ca1 binaries in 2021-07-14 15:28:53 +02:00
e1c76fb04a binaries in 2021-07-14 12:27:30 +02:00
c6aaf2f8b1 binaries in 2021-07-14 09:41:50 +02:00
fdf6632356 wip 2021-07-05 15:20:34 +02:00
5ad2299e83 binaries in 2021-07-02 19:55:45 +02:00
cbdb05a3a8 wip 2021-07-01 15:11:22 +02:00
54b9b9938c binaries in after merge conflict 2021-07-01 14:35:29 +02:00
9d666da4cf binaries in 2021-06-28 13:33:24 +02:00
18fe63f594 wip 2021-06-28 13:32:44 +02:00
c63f3b327f wip 2021-06-25 17:20:34 +02:00
61d62c57bc binaries in 2021-06-25 15:43:06 +02:00
69be046131 wip 2021-06-24 17:56:07 +02:00
755738a42e wip 2021-06-22 20:50:50 +02:00
1ab3bb8496 bianries in 2021-06-21 16:35:31 +02:00
137b0cc288 merge from developer 2021-06-21 16:34:42 +02:00
e4bf8a5d97 binaries in 2021-06-21 16:33:28 +02:00
5ca4c7f943 merged from developer 2021-06-21 16:32:36 +02:00
d0faf64014 binaries in 2021-06-21 16:21:51 +02:00
ceeb4400a0 removing send complete frames fromstop acquisition 2021-06-16 10:25:49 +02:00
74ca9d6fcc binaries in 2021-06-15 16:57:23 +02:00
bfdd62253a binaries in 2021-06-15 15:00:15 +02:00
d0b2c13fa3 binaries in 2021-06-15 11:50:21 +02:00
d0d9ffb3b6 binaries in 2021-06-10 12:11:45 +02:00
2b8e4c8981 Merge branch 'stopacq' of github.com:slsdetectorgroup/slsDetectorPackage into stopacq 2021-06-10 12:10:28 +02:00
0b2a4a879e removed masterflags enum, especially in gotthard server 2021-06-10 12:10:17 +02:00
6fa9d7f367 binaries in 2021-06-09 17:41:54 +02:00
6ca3f075b7 binaries in after merge fix 2021-06-08 12:31:13 +02:00
45992b28a5 merge fix 2021-06-08 12:29:33 +02:00
6e9ad425f8 binaries in 2021-06-08 09:49:10 +02:00
16a228415d binaries in 2021-06-07 15:00:56 +02:00
238b6e8753 binaries in 2021-06-04 17:15:43 +02:00
be6e2d7fb3 binaries in 2021-06-02 17:06:15 +02:00
65b022a946 binaries in 2021-05-28 15:39:02 +02:00