Commit Graph

3499 Commits

Author SHA1 Message Date
49ba893d7e zmq buffering when acquire form command line, stopping sockets when command line acquire or receiver start, restarting sockets at change of port numbers and a refresh button for the same 2017-11-21 13:38:31 +01:00
d1d530f0e7 manual 2017-11-20 16:43:39 +01:00
a0c014eb7d changed rate correction back to what it was before in users class, enabling sets defaults 2017-11-20 15:14:01 +01:00
23b415d837 streaming port set return same as get simple change 2017-11-17 14:04:03 +01:00
a79864a5ae bugfix enabledata streaming send int for update 2017-11-17 11:35:54 +01:00
823d537825 fixed warnings 2017-11-17 09:26:20 +01:00
d7137e0c75 fixed segmentation fault issue of xputsn the right way, fixed warnings 2017-11-17 09:26:05 +01:00
2569ffbf10 fixed warnings, back to int warning in debugstream due to 64 bit 2017-11-17 08:53:05 +01:00
b020270734 edited cmake to show warnings 2017-11-17 08:46:59 +01:00
f647bdaa48 updated users class to reflect zmq changes (separation), fixed warnings 2017-11-17 08:46:43 +01:00
c1e735c1b4 fixed a few warnings 2017-11-17 08:46:04 +01:00
4097c37b31 in between 2017-11-16 16:01:31 +01:00
a89265faf8 Merge branch '3.0.1' into zmqseparate 2017-11-16 15:09:14 +01:00
8e0414d1b9 separating zmqport, enabling in client and receiver works 2017-11-16 15:01:22 +01:00
bbcf75bc09 separating zmqport, enabling in client and receiver works 2017-11-16 15:00:59 +01:00
065b4a8e0f including zmq port change in gui 2017-11-16 13:50:30 +01:00
2fca426ec0 Merge branch '3.0' into zmqseparate 2017-11-16 13:49:11 +01:00
875ca44c0b updated server hotfix binary 2017-11-16 12:30:41 +01:00
4c9cc1b477 Merge branch '3.0' into 3.0.1 2017-11-16 12:29:34 +01:00
f340eef4bc updated server hotfix binary 2017-11-16 12:29:09 +01:00
f192164e32 fixed setdac bug that comes rarely, moved serialize spi to 32bit 2017-11-16 12:27:58 +01:00
c69ae52e76 somewhere 2017-11-16 09:12:57 +01:00
7dee07b9c5 somewhere 2017-11-16 09:12:54 +01:00
0e8d2de253 somewhere 2017-11-16 09:12:49 +01:00
fd34bab34b in between separating datastreaming in client and receiver 2017-11-15 17:19:07 +01:00
2b0d07387a in between separating datastreaming in client and receiver 2017-11-15 17:16:47 +01:00
eb4ab306c7 in between separating datastreaming in client and receiver 2017-11-15 17:16:37 +01:00
32d32dbcdc in between separating datastreaming in client and receiver 2017-11-15 16:16:59 +01:00
6d6133be59 Merge branch '3.0' into zmqseparate 2017-11-15 10:34:30 +01:00
bee751cebb updated binaries 2017-11-15 09:31:49 +01:00
fee95d228e Merge branch '3.0' into 3.0.1 2017-11-15 09:29:05 +01:00
ea0c436fc8 updated binaries 2017-11-15 08:07:59 +01:00
90fb8258ca updated binaries 2017-11-14 17:52:51 +01:00
dd1cf42a73 proper fix for settings, including dacs 2017-11-14 17:51:13 +01:00
dda86cfe9b somewhere in separating zmq rxr and client 2017-11-14 16:26:17 +01:00
a3a30d9b50 manual 2017-11-14 15:18:39 +01:00
b814515d0a manual 2017-11-14 12:42:30 +01:00
0ae706d9a5 file index sent along with zmq stream 2017-11-14 12:13:06 +01:00
6693d08331 fixed help of acquire doing an actual acquisition 2017-11-14 11:53:37 +01:00
4903164f95 added high voltage to users class 2017-11-14 10:58:54 +01:00
ef257d12e7 prev bug fix of ratecorr for eiger from users, made simpler 2017-11-14 09:13:32 +01:00
7e0af1cc7c bugfix: users rate correction able to set for eiger 2017-11-14 09:08:08 +01:00
52a9303a5e removed compression from gui in expert mode 2017-11-13 15:32:24 +01:00
409519a3db fixed the double plot due to unzooming in gui 2017-11-13 15:25:49 +01:00
70848c9891 bugfix ratecorr always gave back -100 2017-11-13 13:39:28 +01:00
dedc00f1bd compiling with rflag 2017-11-13 12:28:27 +01:00
e1c7176c00 Merge branch '3.0.1' of git.psi.ch:sls_detectors_software/sls_receiver_software into 3.0.1 2017-11-10 16:31:01 +01:00
53caebe0f3 replaced gethostbyname with getaddrinfo as it is not thread safe 2017-11-10 16:30:48 +01:00
739187943d replaced gethostbyname with getaddrinfo as it is not thread safe 2017-11-10 16:30:38 +01:00
fb0afc282d gotthard server, too fast now sets stopped bit high and stops acquisition, so polling status also made aware of stopped bit 2017-11-09 14:01:36 +01:00