7348 Commits

Author SHA1 Message Date
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
709293be68 Merge branch 'stopacq' of github.com:slsdetectorgroup/slsDetectorPackage into stopacq 2021-06-15 12:46:09 +02:00
f111ac733b without getmaster, getmaster needs to go to stop server 2021-06-15 12:45:58 +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
26acde979f refactor on the gui from review missed out in pr 2021-06-11 11:54:22 +02:00
Dhanya Thattil
621bb6cbfd
Merge pull request #252 from slsdetectorgroup/guicounters
added counters for m3 gui
2021-06-11 09:24:58 +02:00
b4d2f2ee1c wip 2021-06-10 18:27:42 +02:00
f01e5fd5ec moved counters in gui from data output tab to settings tab 2021-06-10 18:07:52 +02:00
1bcf10a211 minor 2021-06-10 15:43:17 +02:00
b9aa7bcc8e added counters for m3 gui 2021-06-10 15:41:49 +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
2be8ee8079 udpated in python 2021-06-09 11:42:46 +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
Dhanya Thattil
ac5dece221
Merge pull request #242 from slsdetectorgroup/m3dacfix
m3dacfix
2021-06-08 12:19:46 +02:00
6f54291a84 documentation, wip 2021-06-08 12:14:06 +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
1e640d90de refactor minor 2021-06-08 09:47:15 +02:00
74f5c52bc9 binaries in 2021-06-08 08:29:26 +02:00
9e32c746cd WIP 2021-06-07 16:43:39 +02:00
1b068cdf2d wip 2021-06-07 15:06:34 +02:00
16a228415d binaries in 2021-06-07 15:00:56 +02:00
48cef99e62 eiger blocking trigger WIP, new fw, 3 bits: 1 for exp, 1 for falling exp toggle, 1 for rising exp toggle 2021-06-07 15:00:06 +02:00
238b6e8753 binaries in 2021-06-04 17:15:43 +02:00
6949e22bf8 wip 2021-06-04 16:52:48 +02:00
28c1e2491b wip 2021-06-04 16:52:19 +02:00
d33cf25a95 wip 2021-06-04 16:51:36 +02:00
b5790983ce wip 2021-06-04 16:31:51 +02:00
5e17c9c525 Merge branch 'blocktrigger' of github.com:slsdetectorgroup/slsDetectorPackage into blocktrigger 2021-06-04 12:35:53 +02:00
0afe093afc wip 2021-06-04 12:30:59 +02:00
215454d7cc Merge branch 'developer' into blocktrigger 2021-06-04 10:16:00 +02:00
81aa8c9ac5 wip 2021-06-04 10:15:37 +02:00
be6e2d7fb3 binaries in 2021-06-02 17:06:15 +02:00
cf5d2cd97e WIP 2021-06-02 17:05:40 +02:00
cf7828e0ce eiger server: blocking software trigger 2021-06-02 16:59:20 +02:00
Erik Fröjdh
201d304874
Better control of what is built (#247)
* allow for build only detector libs

* allow receiver libs only

* option for shared libraries
2021-06-02 16:09:28 +02:00
Dhanya Thattil
129ec6930f
Merge pull request #246 from slsdetectorgroup/rxpartial
virtual prints extra missing packets instead of negative
2021-05-28 16:49:15 +02:00
65b022a946 binaries in 2021-05-28 15:39:02 +02:00