923 Commits

Author SHA1 Message Date
0d01de451a wip 2021-06-25 16:24:26 +02:00
61d62c57bc binaries in 2021-06-25 15:43:06 +02:00
927d642bf7 wip 2021-06-25 11:21:47 +02:00
69be046131 wip 2021-06-24 17:56:07 +02:00
d3c6996d80 wip 2021-06-24 07:27:05 +02:00
61c5018a46 wip 2021-06-23 10:28:14 +02:00
01dfc08bbe qip 2021-06-23 08:42:56 +02:00
04645dfae2 wip 2021-06-23 08:34:15 +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
6ca67632c0 wip 2021-06-21 16:21:12 +02:00
fc6a0d4a26 Wip 2021-06-21 14:08:08 +02:00
9c19fc3272 wip 2021-06-21 13:39:20 +02:00
789d0df81c wip 2021-06-21 12:31:35 +02:00
bb91375533 wip 2021-06-21 09:37:31 +02:00
665a3be6d8 wip 2021-06-18 19:38:47 +02:00
a8c0049f88 wip 2021-06-18 14:22:01 +02:00
fd2cc856b8 wip 2021-06-18 12:25:14 +02:00
2ae2f84441 wip 2021-06-17 17:39:49 +02:00
028edd0d08 wip 2021-06-17 07:13:27 +02:00
e110bfd5a7 usleep between sending frames and stop acquisition assures complete frames, require firmware update to remove usleep 2021-06-16 11:11:04 +02:00
ceeb4400a0 removing send complete frames fromstop acquisition 2021-06-16 10:25:49 +02:00
370fe4628a wip 2021-06-15 16:56:16 +02:00
74903314ce wip 2021-06-15 16:31:29 +02:00
4ea53cd3bd Merge branch 'stopacq' of github.com:slsdetectorgroup/slsDetectorPackage into stopacq 2021-06-15 16:27:19 +02:00
994f0a71a6 wip 2021-06-15 16:27:09 +02:00
19b16bc6e8 binaries in 2021-06-15 15:01:07 +02:00
b740cb7312 Merge branch 'stopacq' of github.com:slsdetectorgroup/slsDetectorPackage into stopacq 2021-06-15 15:00:25 +02:00
bfdd62253a binaries in 2021-06-15 15:00:15 +02:00
22bcac4c0b gotthard stop server should also know if there is a master for ismaster() to work 2021-06-15 14:59:50 +02:00
1ae8ceb73c binaries in 2021-06-15 13:01:41 +02:00
b11f6c56e7 getmaster through stop server, allowing stopacq to first go to slave for eiger, eiger stop to first check reg value to send complete frames before calling stop 2021-06-15 12:59:54 +02:00
d0b2c13fa3 binaries in 2021-06-15 11:50:21 +02:00
130613f730 fix for stopacq 2021-06-15 11:48:38 +02:00
a9f892483d wip 2021-06-11 17:29:01 +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
bdc3a5f3d9 connect ismaster for eiger and gotthard1 and using ismaster to stop master last for eiger 2021-06-09 17:40:05 +02:00
4de8234478 eiger stop sends last frame, software or firmwarebug 2021-06-09 15:04:48 +02:00
08a588bb01 wip: eiger stop acquisition send complete frmes 2021-06-09 12:31:26 +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
e00c62a7a5 m3 server: fixed absolute addressing for isMaster 2021-06-08 11:37:11 +02:00
6e9ad425f8 binaries in 2021-06-08 09:49:10 +02:00