Commit Graph

55 Commits

Author SHA1 Message Date
633c646239 eiger bug fix: 4 bit mode gap pixels, also added quad to shm 2019-08-14 15:31:18 +02:00
350b4f0368 bug fix on quad: if no data streaming enabled in the beginning 2019-07-22 17:09:34 +02:00
445f3c66fd bug fix for previous commit to work for bottom module 2019-07-10 17:56:32 +02:00
1189b991e5 quad implemented 2019-07-10 17:39:43 +02:00
c2db073d5e receiver and client: changed xcoord to row and ycoord to column, zcoord to reserved 2018-09-26 15:03:04 +02:00
d67b4765ea Removing redundant null byte from end of json header 2018-09-17 12:32:33 +02:00
3cab1bc0fe minor cleaning of ZmqSocket 2018-08-10 14:34:59 +02:00
39ebd81230 Zmqsocket merge with Erik's (removing header message) and mine(socketdescriptor safe destruction in constructor exception) 2018-08-09 18:21:30 +02:00
823c855ef4 Zmqsocket merge with Erik's (removing header message) and mine(socketdescriptor safe destruction in constructor exception) 2018-08-09 18:19:47 +02:00
a0512a01d5 Exceptions: zmq socket class descriptors made into its own class for auto destruction upon construction exception, similarly for other try blocks. slsDetector and multislsdetector left to do 2018-08-09 18:12:56 +02:00
bdd37fa7c2 commenting zmq detail 2018-08-09 17:58:55 +02:00
a96a019435 string lenght 2018-08-09 17:46:07 +02:00
dd3f4aa81d switched from zmq_msg_revc to zmq_recv 2018-08-09 17:40:04 +02:00
d3a0319863 esrf changes: Listener, DataProcessor, DataStreamer, Fifo, ZmqSocket constructors return an exception when it fails 2018-05-02 16:49:27 +02:00
28af3c2642 insignificant print 2018-04-09 17:44:55 +02:00
2bd8e6c166 zmq fixed to have additional json headers using rx_zmqjsonheader 2018-04-09 16:33:14 +02:00
8cf6e0cbd6 in between 2018-04-06 17:48:10 +02:00
61897cbd41 in between 2018-04-04 14:27:53 +02:00
a74e8f68f7 size change in receiver call back API now streamed, gui allows smaller packet size than expected to be caught and replaced the rest with 0xFF 2018-03-21 17:08:38 +01:00
e17e4c3171 Merge branch '3.0.1' into developer 2017-11-28 18:50:27 +01:00
b75985088d twice connect bug fix in zmq 2017-11-28 18:50:18 +01:00
8bba57e77d fix to not have sls_receiver_defs in zmqSocket.h incldue 2017-11-28 16:32:15 +01:00
8388d1f503 using file index from zmq 2017-11-28 14:45:48 +01:00
4466213882 makng the zmq work without external flag 2017-11-27 17:06:27 +01:00
2c276db579 solved merge conflict in changes to use ZmqSocket.h externally 2017-11-23 16:35:31 +01:00
b14ea217ee Merge branch '3.0.1' into zmqchange 2017-11-23 16:34:14 +01:00
da3ca9f306 changes to use ZmqSocket.h externally without further changes 2017-11-23 16:28:02 +01:00
ad64df01c7 somewhere 2017-11-23 14:53:40 +01:00
662f502d4c zmq always needs an ip in header 2017-11-17 17:40:57 +01:00
1dee950870 merge conflict from 3.0.1 2017-11-17 11:35:15 +01:00
32d32dbcdc in between separating datastreaming in client and receiver 2017-11-15 16:16:59 +01:00
db2fef5d69 conflict resolved in merge from 3.0.1 to include file index in zmq streaming 2017-11-14 12:14:26 +01:00
0ae706d9a5 file index sent along with zmq stream 2017-11-14 12:13:06 +01:00
6fa4e4cef8 Merge branch '3.0.1' into gappixels 2017-11-10 16:37:28 +01:00
53caebe0f3 replaced gethostbyname with getaddrinfo as it is not thread safe 2017-11-10 16:30:48 +01:00
d0b379a2d5 double* changed to char* in gui data call back, effect in receiver is change in zmqsocket.h from int* to char* 2017-10-02 13:21:49 +02:00
5ff574b33f made default streamer to be the ip related to hostname, otherwise can be specified from the client, also made it compatible with chip test board detector now 2017-09-12 15:04:56 +02:00
c086e9c19f allow for slow joiner in zmq 2017-09-01 13:58:00 +02:00
05c5ad711b solving the issue of deleting context by setting linger to 0 so that all open sockets are closed 2017-08-28 12:03:15 +02:00
2d52058a55 Printing thread Ids created and exited, others (if others) are zmqs internal threading, moved all zmq socket type to publish subscriber type: (non blocking in send if no client) as per Aldos gui and probably faster, as only clients to receiver standard impl is aldos gui/slsDetectorGui/xiaoqiangs call back via detector class 2017-08-24 16:06:00 +02:00
a4c07ba9a0 added black background for reciever to see gray font better 2017-06-30 12:19:27 +02:00
1c7ff1dd8c adding printouts , resetting an image size for each listen image, if last image is not complete, it should be checked with rc==0 and not if itis transmitting, else it doesnt send last incomplete image 2017-06-21 17:07:45 +02:00
cbd1570a8c fixed gui getting stuck (wrong datathreadmask more than 64 bits cuz of 72 sockets), gotthard detector receiver updated 2017-06-20 12:43:28 +02:00
3007694b77 bug (from eiger_newheader) with imagesize of fifo different from actual image size 2017-06-16 13:53:27 +02:00
0e2d0f07e8 getting hostname from ip (for all, cuz hostname can have dots too 2017-05-19 10:21:33 +02:00
a276b6b7f5 fixed bug rx_hostname being hostname or ip in zmqsockt, and num packets correctly reflects num good frames 2017-05-18 10:53:29 +02:00
ea875a14f9 fixed bug when rx_hostname was an ip and using zmqsocket 2017-05-17 15:58:12 +02:00
6d7fb07a4c fixing the standard header pointers for it to work 2017-05-08 12:33:31 +02:00
a1fc93b398 changes including warnings and zmq 2017-05-04 17:52:58 +02:00
49b4ae2f56 changed zmq method, and resolved warnings and from esrf 2017-05-03 17:57:56 +02:00