172 Commits

Author SHA1 Message Date
1d53dc65cd WIP 2020-06-23 08:48:54 +02:00
9d3bbc0a68 WIP 2020-06-22 15:02:28 +02:00
801f2c4559 WIP 2020-06-22 09:33:09 +02:00
5bf6b7a338 Refactor of ZmqSocket (#109)
Changed data type of address from char[1000] to string to reduce stack size of object.

Removed redundant calls to Close

Removed function exposing the socket descriptor

Using functions from network_utils instead of duplicates

Added tests
2020-06-19 12:41:03 +02:00
1f3fd010a7 reordering WIP 2020-06-17 15:25:59 +02:00
5f91198328 clang-tidy nullptr 2020-06-10 08:30:12 +02:00
265e96d675 clang-tidy nullptr 2020-06-10 08:27:35 +02:00
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
d71e40729a external signals 2020-05-20 17:05:42 +02:00
cd90f09a30 WIP 2020-05-19 18:24:32 +02:00
ea7cc9db8c less public headers 2020-05-15 10:52:23 +02:00
3962714b48 format + exception.cpp 2020-05-13 14:48:52 +02:00
eff664e790 cleanup 2020-05-11 18:28:06 +02:00
ea4044e4b1 format support lib 2020-05-05 10:07:19 +02:00
68f76e5356 more like UdpRxSocket 2020-04-20 17:24:53 +02:00
655a410d43 cleaned up UdpRxSocket 2020-04-16 09:45:44 +02:00
9f3ad4e2f4 merge from 4.2.0 2020-04-07 15:14:27 +02:00
fdb6e3f3d4 Removeshm (#90)
* eiger: moved rate correction outside, fixed threshold energy bug in client (binaries not  updated yet)

* removed dr and deadtiem from shm

* help for rx_status and status to point them to rx_Start, rx_stop, start and stop

* moved progress to receiver

* removed currentsettings from eiger shm

* updated server binaries, and client api

* moench and ctb virtual servers compile fix

* gui: moved acquire to a concurrent qt thread so it doesnt block updateplot
2020-04-06 10:44:44 +02:00
d58eb1dc6e Gappixels (#89)
* WIP

* WIP virtual delays, imagetest for saturation

* WIP, vertical and horizontal

* WIP

* gap pixels work, fixed 32 bit data out (10gbe=0) for virtual servers

* quad works (also in virtual), handling gappixels and quad

* jungfrau gapppixels work

* jungfrau: done

* complete image or missing packets given in json header and gui

* eiger virtual 4 bit mode bug fix

* working version of zmq add json header, except printout

* printout bug

* fix for json para

* to map WIP

* map done

* map print , mapwith result left

* json result works, testing added

* updated server binaries

* compiling on rhels7, variable size char array iniitalization

* zmqsocket parsing didnt need Document

* const to map, json para is strings not map

* json add header: mapping cleaner without insert make_pair
2020-03-30 14:54:35 +02:00
fb051355b8 moved string conversion to .cpp 2020-03-26 15:06:23 +01:00
75692c3539 zmq server address copy warning fix 2020-03-19 11:36:32 +01:00
b608ec6fbd zmqsocket: fname to string to remove warning in copying maxstr in maxstr in json header 2020-03-19 10:24:08 +01:00
4813b5567a Minimal shared memory for receiver 2020-03-19 07:01:32 +01:00
b751238fc1 ZmqSocket 2020-03-18 12:12:01 +01:00
0de0d82a1a replaced old logger 2020-03-11 12:40:12 +01:00
f1bce15a57 replaced udp socket 2020-02-17 17:43:14 +01:00
ec66079f65 renamed ServerInterface 2020-02-04 08:57:35 +01:00
6170c42618 explicit also in MacAddr 2020-01-16 16:57:04 +01:00
c1fac7cdb7 fixed conversion for IpAddr 2020-01-16 16:31:11 +01:00
f3598c1f39 nullptr 2020-01-16 14:17:57 +01:00
12d168a6ef const strref 2019-12-03 10:12:47 +01:00
2f2e4da628 Moved CmdLineProxy 2019-11-05 11:07:07 +01:00
5c06549982 Cleanup of the CmdProxy and migrated some commands (#52)
* migrated rx_fifodepth

* Moved and cleand CmdProxy

* rx_slient

* new commands

* examples

* fixed result string print
2019-08-23 14:32:44 +02:00
57ac5c0dab moved CmdLineParser to sls:: 2019-08-23 10:42:35 +02:00
c36dfc3992 even more tests 2019-08-12 12:09:44 +02:00
4ceee97c03 Api (#48)
* WIP

* WIP

* WIP

* cleaned up multi

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* split up python module

* WIP

* WIP

* WIP

* WIP

* WIP

* ok

* fixed bugs from rebase

* WIP

* fixed broken test

* WIP

* fixed python

* WIP

* sphinx help

* including new commands

* docs

* WIP

* WIP

* more tests

* added missing public header

* WIP
2019-08-07 11:21:07 +02:00
b524e0c95f removed online flags, apiversion in shm, ret for ok and fail, bind socket help in exception message (#43)
* removed online flag, removed rxronline flag, added useReceier flag that is set only when rxr hostname is set, removed setonline, setreceiveronline flag, removed ret for ok or fail, using exceptions for this, changed cannot bind socket printout

* fixed python
2019-07-26 16:33:39 +02:00
d3101baacb receiver create path (#35) 2019-06-25 11:14:04 +02:00
e80ce1b4c4 added -h --help option to display help 2019-06-21 17:27:47 +02:00
17b08b6e53 removed MySocketTCP and old ServerInterface 2019-06-18 15:54:22 +02:00
1fed3553b9 cleaning up tcp 2019-06-07 16:13:34 +02:00
170aca0e1f zmqip now uint 2019-06-06 18:17:04 +02:00
c86a1e7d48 WIP 2019-06-06 17:00:05 +02:00
3cfeb74529 minor 2019-06-06 10:36:40 +02:00
5944957977 cleaning up socket 2019-06-06 10:34:57 +02:00
03f8b389ad WIP 2019-06-05 17:30:21 +02:00
3d6404952a fix sending 2019-06-05 15:51:21 +02:00
b5e4d7d8fb fixed reading and double print in client 2019-06-05 15:40:28 +02:00
1db7521cfa exceptions TCP (#31)
* WIP

* first test

* format

* test frames

* also 0:

* WIP

* WIP

* first test

* format

* test frames

* also 0:

* test and less local

* pass ret by value

* level

* WIP

* WIP

* cleaning up interface

* removed ref

* another

* updated api version

* cleanup

* cleanup

* WIP

* fixes

* fixed tests
2019-06-05 15:25:18 +02:00
29141ac1a6 set starting frame number of next acquisition for both jungfrau and e… (#27)
* set starting frame number of next acquisition for both jungfrau and eiger. firmware has not implemented a get, so workaround. tests included. frame number 0 not allowed due to Eiger. Eiger max frame is 48 bit, while jungfrau is 64 bit

* made argument of setstartingframenumber const
2019-06-03 11:07:53 +02:00