7203 Commits

Author SHA1 Message Date
1360fbac87 eiger: block trigger till next wait for trigger and give error if it wasnt ready when trigger sent 2021-06-25 16:56:48 +02:00
bdfd151a01 wip 2021-06-25 16:54:01 +02:00
bbb2473387 wip 2021-06-25 16:46:07 +02:00
b296109513 wip 2021-06-25 16:41:00 +02:00
0d01de451a wip 2021-06-25 16:24:26 +02:00
927d642bf7 wip 2021-06-25 11:21:47 +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
Dhanya Thattil
1a88cbd266
Merge pull request #254 from slsdetectorgroup/patternrefactor
RefactorPatternRedundancy
2021-06-21 16:29:25 +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
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
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