142 Commits

Author SHA1 Message Date
Erik Frojdh
34043c358f Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-09-10 11:53:31 +02:00
Erik Frojdh
da9c7c354e adc- 2020-09-10 11:53:17 +02:00
Dhanya Thattil
4d499e231d
Merge pull request #178 from slsdetectorgroup/eigertempblockingfix
eiger temp fix: tempfpgafl and tempfpgafr cannot be used during block…
2020-09-10 11:48:31 +02:00
0a7809286b eiger temp fix: tempfpgafl and tempfpgafr cannot be used during blocking acquire as it goes through control server now 2020-09-10 11:47:42 +02:00
Dhanya Thattil
3cd4f3897b
M3: software trigger (#175) 2020-09-10 10:15:45 +02:00
8e49a114db moench: removed api that goes only to processor (future: one has to use rX_jsonaddheader or rx_jsonpara to set key and values) 2020-09-08 12:34:56 +02:00
311cebcd00 m3:added parallel mode 2020-09-08 12:16:02 +02:00
42b5ff3a62 WIP, doc 2020-09-02 10:25:36 +02:00
e4274e3f95 WIP, doc 2020-08-31 14:17:09 +02:00
e0df9fcd99 wip, doc 2020-08-28 19:47:19 +02:00
30307220e3 QIP, doc 2020-08-28 18:12:08 +02:00
f19799343e WIP, doc 2020-08-27 17:58:15 +02:00
6d8168722a WIP, doc 2020-08-26 11:11:51 +02:00
d44388a44e mv to mV 2020-08-25 17:27:29 +02:00
Erik Frojdh
0253933271 newline in command docs 2020-08-25 14:46:06 +02:00
bc09b8bfb9 WIP doc 2020-08-21 17:13:43 +02:00
cf6a48d7a9 WIP doc 2020-08-21 13:20:32 +02:00
4f45110cda WIP doc 2020-08-21 13:05:33 +02:00
ffd694eda1 temlist and tempvalues added 2020-08-20 15:16:28 +02:00
429eb8da53 doc wip 2020-08-20 12:58:17 +02:00
eeb386fef5 mythen3: txndelay frame added 2020-08-18 15:27:30 +02:00
d4e11e56ea added drlist and timinglist, moved daclist and settingslist from cmdprozy.cpp to .h 2020-08-14 15:47:39 +02:00
16af67924e bugfix: load trimbits also for individual setting 2020-08-12 17:11:09 +02:00
380b062216 configure mac 2020-08-04 16:55:31 +02:00
7dfeb987db changing command from vhighvoltage to highvoltage 2020-07-30 11:50:03 +02:00
a76ed6d8db tengiga enable 2020-07-17 18:34:23 +02:00
b7cb341ee3 dr 2020-07-17 17:33:43 +02:00
67bb0dff1a rx_zmqstartfnum, not tested 2020-07-16 12:18:18 +02:00
ca298580f3 badchannels done 2020-07-15 18:24:17 +02:00
d7f490701b confadc added to client, removed conf adc depending on burst mode 2020-07-15 13:30:30 +02:00
7752b86d97 veto file in 2020-07-14 18:51:47 +02:00
35dbc3813d filter and cds gain, burst and continuous value to asic changed, bug fix to scanning function addresses in server_funcs.c 2020-07-14 17:09:51 +02:00
Dhanya Thattil
4db3473e32
Merge pull request #111 from slsdetectorgroup/shm
Shm
2020-07-07 13:35:52 +02:00
95089b5faa WIP 2020-07-03 16:06:12 +02:00
Erik Frojdh
cec26f81e1 more using .empty() 2020-06-29 17:41:06 +02:00
Erik Frojdh
19e40cf0e6 using .empty() on stl containers 2020-06-29 17:20:56 +02:00
902366fede inbetween WIP, startstatemachien ugly 2020-06-26 19:08:03 +02:00
301073e60b WIP 2020-06-23 10:53:17 +02:00
159b0a0367 WIP 2020-06-23 09:30:17 +02:00
f6911c4238 WIP 2020-06-23 09:02:26 +02:00
1d53dc65cd WIP 2020-06-23 08:48:54 +02:00
7cc05ead89 WIP 2020-06-18 12:41:10 +02:00
Dhanya Thattil
f5160b0978
exposing receiver thread ids to client (#102)
* exposing receiver thread ids to client

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2020-06-09 16:18:37 +02:00
099805ba8b WIP 2020-06-04 17:02:56 +02:00
1e2a3f2767 WIP 2020-06-04 15:21:53 +02:00
4053594c4d WIP 2020-06-03 14:40:51 +02:00
Erik Frojdh
e2eb1598d3 jf stuff 2020-05-28 09:28:53 +02:00
46daa7e2de merge from developer (mythen3 branch) 2020-05-27 14:19:33 +02:00
9493ae3da9 WIP 2020-05-27 11:30:47 +02:00
d71e40729a external signals 2020-05-20 17:05:42 +02:00