Commit Graph

  • f53770a2fc some changes to remove possible warnings Dhanya Maliakal 2017-05-11 14:41:07 +02:00
  • 0e9cf558b4 Modified JUNGFRAU_MODULE_ID to match the detector type definition that is tx. with the new header. lopez_c 2017-05-10 16:47:10 +02:00
  • 95bf19a417 deleting socket and insignificant changes Dhanya Maliakal 2017-05-08 15:08:59 +02:00
  • 8471765e30 insignificant Dhanya Maliakal 2017-05-08 14:48:29 +02:00
  • 6d7fb07a4c fixing the standard header pointers for it to work Dhanya Maliakal 2017-05-08 12:33:31 +02:00
  • 1e8c7bd637 not necessary to check file name Dhanya Maliakal 2017-05-08 12:33:00 +02:00
  • a1fc93b398 changes including warnings and zmq Dhanya Maliakal 2017-05-04 17:52:58 +02:00
  • 0722ef3125 changes including warnings and zmq Dhanya Maliakal 2017-05-04 17:52:47 +02:00
  • 49b4ae2f56 changed zmq method, and resolved warnings and from esrf Dhanya Maliakal 2017-05-03 17:57:56 +02:00
  • e2d1d58acf Alejandro changes from ESRF Dhanya Maliakal 2017-05-02 08:36:36 +02:00
  • 44339d3b89 c_Str() not access global variables from thread Dhanya Maliakal 2017-05-02 08:25:45 +02:00
  • 404bb4a653 changed -lpthread to -pthread Dhanya Maliakal 2017-05-02 08:15:11 +02:00
  • 066550d38c zmq changes for no dummy data end Dhanya Maliakal 2017-05-01 14:02:13 +02:00
  • 020eaded36 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer Dhanya Maliakal 2017-05-01 13:11:16 +02:00
  • 445da80df8 resolved warnings, also from esrf: todo: include changes in zmq Dhanya Maliakal 2017-05-01 13:11:10 +02:00
  • f937b8ca5d Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer lopez_c 2017-05-01 12:21:07 +02:00
  • 7901b6f463 Modified "calcChecksum" function in jungfrauDetectorServer/firmware_funcs.c to compute properly the new IP header checksum for a new application header of 48 bytes. l_lopez 2017-05-01 12:14:06 +02:00
  • e9f6dcf479 strtok is not thread safe..used to set receiver udp ip etc to detector, fixed Dhanya Maliakal 2017-05-01 10:24:16 +02:00
  • 264485c8ff changed all -lpthread to -pthread Dhanya Maliakal 2017-05-01 09:53:37 +02:00
  • 3525bb3f9f changed all -lpthread to -pthread Dhanya Maliakal 2017-05-01 09:44:33 +02:00
  • 78d1504d66 changed all -lpthread to -pthread Dhanya Maliakal 2017-05-01 09:39:19 +02:00
  • c6cb499758 added the jungfrau binary Dhanya Maliakal 2017-04-28 13:41:08 +02:00
  • bc57ea5725 added the binary Dhanya Maliakal 2017-04-28 11:31:12 +02:00
  • 27f752ff9e removed wrong edits in merging (not reflected in git browser, weird); changing server names anyway Dhanya Maliakal 2017-04-28 11:30:09 +02:00
  • b9275646ad crazy amount of changes, both necessary and unnecessary;need to narrow down the real change later Dhanya Maliakal 2017-04-27 14:05:04 +02:00
  • 9e2f2697c7 crazy amount of changes, both necessary and unnecessary;need to narrow down the real change later Dhanya Maliakal 2017-04-27 13:58:25 +02:00
  • b6b0df62b6 updaterev Dhanya Maliakal 2017-04-20 08:26:29 +02:00
  • 0ba537e479 removed headersize compile error Dhanya Maliakal 2017-04-20 08:26:16 +02:00
  • 75ddf535dc updaterev Dhanya Maliakal 2017-04-19 17:59:53 +02:00
  • b1de501bef updaterev Dhanya Maliakal 2017-04-19 17:59:46 +02:00
  • 0f3a63f101 changed zmq default port starting at 40001 to be able to view in wireshark and removed headersize for warning Dhanya Maliakal 2017-04-19 17:42:38 +02:00
  • 3b4b2d707f changes without ostringstream done Dhanya Maliakal 2017-04-19 10:17:39 +02:00
  • f405aa1733 split zmq_msg_t so its not reused Dhanya Maliakal 2017-04-19 10:17:30 +02:00
  • df0fdb7ecb changes without ostringstream done Dhanya Maliakal 2017-04-19 10:16:45 +02:00
  • 91b7a87557 just started changin frm ostringstream Dhanya Maliakal 2017-04-18 15:32:01 +02:00
  • 9468b9ca1e updaterev Dhanya Maliakal 2017-04-11 13:39:59 +02:00
  • d7982e178e updaterev Dhanya Maliakal 2017-04-11 13:39:53 +02:00
  • 9cf5714a5b removing warnings shown from esrf debian Dhanya Maliakal 2017-04-11 13:39:35 +02:00
  • 0c9ac8911a removing warnings shown from esrf debian Dhanya Maliakal 2017-04-11 13:39:28 +02:00
  • 4730c8c0a9 updaterev Dhanya Maliakal 2017-04-11 13:31:49 +02:00
  • 43efb8acfd removing warnings shown from esrf debian Dhanya Maliakal 2017-04-11 13:31:32 +02:00
  • 6ecca8fcb0 updaterev Dhanya Maliakal 2017-04-11 09:03:26 +02:00
  • 17cb63a57f updaterev Dhanya Maliakal 2017-04-11 09:03:19 +02:00
  • 4f83fcb001 updaterev Dhanya Maliakal 2017-04-11 09:02:10 +02:00
  • ab94af6d29 removed verbose etc Dhanya Maliakal 2017-04-07 15:08:40 +02:00
  • 7c725cc69b .c_str() must not access global variables from thread Dhanya Maliakal 2017-04-07 14:57:19 +02:00
  • f0198d2d2e alejandro's changes from ESRF Dhanya Maliakal 2017-04-07 14:50:17 +02:00
  • 5ddccbdee4 changed all -lpthread to -pthread Dhanya Maliakal 2017-04-07 14:28:00 +02:00
  • 8fb39b8c7e changed all -lpthread to -pthread Dhanya Maliakal 2017-04-07 14:27:27 +02:00
  • bd5293f4b1 changed all -lpthread to -pthread Dhanya Maliakal 2017-04-07 14:26:09 +02:00
  • b91180f5b2 changed all -lpthread to -pthread Dhanya Maliakal 2017-04-07 14:26:03 +02:00
  • 7c3b5065a5 changed all -lpthread to -pthread Dhanya Maliakal 2017-04-07 14:25:09 +02:00
  • 9aef802bea changed all -lpthread to -pthread Dhanya Maliakal 2017-04-07 14:24:49 +02:00
  • f7d85231f2 solved warnings except sscanf for uint64_t Dhanya Maliakal 2017-04-07 14:12:21 +02:00
  • 5b3a911e8d solved warnings except sscanf for uint64_t Dhanya Maliakal 2017-04-07 14:11:34 +02:00
  • 65f5e1c1ab strtok is not thread safe..used to set receiver udp ip etc to detector, fixed Dhanya Maliakal 2017-04-06 15:04:33 +02:00
  • b401a6c33b in between stage Dhanya Maliakal 2017-04-04 11:20:38 +02:00
  • faefcc4799 Merge branch '2.3' into developer Gemma Tinti 2017-03-29 11:25:28 +02:00
  • 1afb9e3e48 manual Gemma Tinti 2017-03-29 11:23:44 +02:00
  • 09d3372cc0 manual Gemma Tinti 2017-03-29 10:11:16 +02:00
  • 671587c029 manual Gemma Tinti 2017-03-29 10:09:52 +02:00
  • fb0b0b96ec need to automize parameter passing Dhanya Maliakal 2017-03-24 16:58:17 +01:00
  • 72d89fefc3 modified release Dhanya Maliakal 2017-03-24 16:58:00 +01:00
  • a11313fe96 removed copies Dhanya Maliakal 2017-03-24 15:15:30 +01:00
  • aba3a67b80 Merge branch '2.3' into developer Dhanya Maliakal 2017-03-24 14:20:38 +01:00
  • cacb4c9d93 updaterev Dhanya Maliakal 2017-03-24 13:42:11 +01:00
  • 86490226ed removing the return value usage in start acquisition callback, callbacks will be called if registered, and we will write files if file write enabled Dhanya Maliakal 2017-03-24 13:41:56 +01:00
  • eb203c93b2 removing the return value usage in start acquisition callback, callbacks will be called if registered, and we will write files if file write enabled Dhanya Maliakal 2017-03-24 13:41:30 +01:00
  • 2bb8fa596a from the merge of 2.3 Dhanya Maliakal 2017-03-24 12:22:49 +01:00
  • bb52676f50 merged from 2.3 without udpstandard Dhanya Maliakal 2017-03-24 10:34:31 +01:00
  • 536f8937cb merging Dhanya Maliakal 2017-03-24 09:10:09 +01:00
  • e8b14f8c8a done Dhanya Maliakal 2017-03-24 08:26:10 +01:00
  • aca09bcd4e done Dhanya Maliakal 2017-03-24 08:25:50 +01:00
  • fdb4fa28db retrying Dhanya Maliakal 2017-03-24 08:22:50 +01:00
  • 93362963e2 removed changes for test Dhanya Maliakal 2017-03-24 08:12:38 +01:00
  • 33a7375c72 changes to test Dhanya Maliakal 2017-03-24 08:12:10 +01:00
  • 97bad0fcb9 changes Dhanya Maliakal 2017-03-24 08:06:09 +01:00
  • 059711af37 retrying a test Dhanya Maliakal 2017-03-24 07:59:36 +01:00
  • f0c5106764 trying a test Dhanya Maliakal 2017-03-24 07:59:14 +01:00
  • 4182615aa9 trying a test Dhanya Maliakal 2017-03-24 07:58:27 +01:00
  • ff2c42e921 Merge branch '2.3' into developer Dhanya Maliakal 2017-03-23 15:38:48 +01:00
  • 44be9829d4 removed anna from support as she prefered it Dhanya Maliakal 2017-03-23 15:38:24 +01:00
  • e450f5ec6a updaterev Dhanya Maliakal 2017-03-23 15:17:34 +01:00
  • 70a7217353 changed the header size to a better number Dhanya Maliakal 2017-03-23 15:17:21 +01:00
  • 7dfb1b7192 added a release text Dhanya Maliakal 2017-03-23 15:17:03 +01:00
  • da8d535dae updaterev Dhanya Maliakal 2017-03-23 14:09:01 +01:00
  • 404be013a2 changes to new callback arguments without filepointer Dhanya Maliakal 2017-03-23 14:08:43 +01:00
  • 6d4c0d0d46 modified users for new callback argument without filepointer Dhanya Maliakal 2017-03-23 14:07:56 +01:00
  • 54371bc6be updaterev Dhanya Maliakal 2017-03-23 13:48:18 +01:00
  • 5c230e2ac5 updaterev Dhanya Maliakal 2017-03-23 13:48:12 +01:00
  • 0814f6369d udpaterev Dhanya Maliakal 2017-03-23 13:46:16 +01:00
  • 9e658e7947 udpaterev Dhanya Maliakal 2017-03-23 13:46:02 +01:00
  • bf57be309f updated server Dhanya Maliakal 2017-03-23 13:44:44 +01:00
  • 6f34dddb5a changed the file header size t0 1kb and changed its description in the header Dhanya Maliakal 2017-03-23 13:41:37 +01:00
  • c47f2f3449 solved the gui 4 bit bug where no data was displayed: due to byterperchannel being int and a 0 Dhanya Maliakal 2017-03-23 13:31:22 +01:00
  • 5dcacaae2a frame and packet counters for the delay was buggy, not looking at lsb and msb, fixed Dhanya Maliakal 2017-03-23 12:38:19 +01:00
  • b9eb3d5a52 somewere stuck with virtual template overloading Dhanya Maliakal 2017-03-23 11:56:17 +01:00
  • 78078f4ef3 esrf suggestion for volatile in multithread threadpool Dhanya Maliakal 2017-03-23 11:55:56 +01:00
  • ea66f2d12f manual Gemma Tinti 2017-03-20 14:51:18 +01:00
  • de16c2a7f1 manual Gemma Tinti 2017-03-20 12:42:28 +01:00