Commit Graph

208 Commits

Author SHA1 Message Date
Dhanya Maliakal
bcf8d40fd2 minor changes, but posted semaphore in stop receiver so rxr not waiting forever for gui when it will never come 2015-06-12 17:46:50 +02:00
b27f691d03 Revert "Solved merge conflicts"
This reverts commit c222221d18bd5db7d9a8c86071fe2fbdc0ce25ac.
2015-06-11 11:30:40 +02:00
28ed7d6b2d Solved merge conflicts 2015-06-11 11:25:49 +02:00
Dhanya Maliakal
fdaca88225 includes 32 bit subframes 2015-06-10 13:26:51 +02:00
Dhanya Maliakal
849d0de5cb not much valuable change 2015-06-10 12:23:38 +02:00
Dhanya Maliakal
4f88e831c4 checks if receiver udp object was created before executing functions and hence always returns a ret 2015-05-26 17:01:42 +02:00
Dhanya Maliakal
cb51de145b Merge branch 'startlater' 2015-05-26 12:31:51 +02:00
Dhanya Maliakal
99196aa272 ignore 16 byte messages 2015-05-26 12:08:21 +02:00
Dhanya Maliakal
c840305189 starting receiver only at set detector type works 2015-05-21 17:39:17 +02:00
Dhanya Maliakal
92dfb366f6 gemma offline reading works 2015-05-19 10:12:09 +02:00
Dhanya Maliakal
49b0dce727 not significant 2015-05-13 10:30:39 +02:00
Dhanya Maliakal
11f6d883be Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software 2015-05-12 14:28:48 +02:00
Dhanya Maliakal
d9809925af debugging statements 2015-05-12 14:28:13 +02:00
992a298abc added dunny implementation as an example to combine TCPIP interface and custom UDP reciever 2015-04-21 15:09:50 +02:00
a513ff2c79 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software 2015-04-15 10:16:44 +02:00
Dhanya Maliakal
15bbb099d3 for mapping 32 bit eiger 2015-04-14 17:11:56 +02:00
Dhanya Maliakal
6cd28165ca top image reconstruct works with make flga 2015-04-10 17:11:26 +02:00
Dhanya Maliakal
b5e8c104db printouts for eigermapping 2015-03-31 14:45:41 +02:00
Dhanya Maliakal
e35867227f writing frame number to the file for eiger 2015-03-30 17:16:31 +02:00
248848c666 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software 2015-03-24 09:49:41 +01:00
1df89d4ce2 test 2015-03-23 11:41:19 +01:00
9e78bae614 solved bad_alloc 2015-03-23 11:18:24 +01:00
Dhanya Maliakal
89ad2112c6 difference between acquisition index and frame index 2015-03-12 12:25:23 +01:00
Dhanya Maliakal
6063c712f7 copy first frame to latest data no matter what and also copy only if more than packets per frame 2015-03-10 15:04:50 +01:00
cd67991357 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software 2015-03-06 10:43:22 +01:00
c7aea8f2a6 Some changes for the JCTB software 2015-03-06 10:43:05 +01:00
Dhanya Maliakal
2f82469531 fifo debug with color done 2015-03-05 15:21:12 +01:00
Dhanya Maliakal
5682a6b458 moved startframeindice to before stop listening for gotthard 2015-02-25 10:34:57 +01:00
Dhanya Maliakal
3ee146a2ca moved start of frame to after stoplistening, for eiger to ignore incomplete frames 2015-02-24 16:19:33 +01:00
Dhanya Maliakal
651a13f811 so that gui can reread the same frame from receiver, guidataready is set to zero only once 2015-02-23 15:25:06 +01:00
Dhanya Maliakal
6d8fcaa423 debugging output change 2015-02-13 11:58:36 +01:00
Dhanya Maliakal
1e55577fc2 no change 2015-02-10 16:54:39 +01:00
Dhanya Maliakal
c5f8067735 Merge branch 'dhanya_devel' 2015-02-10 16:44:57 +01:00
Dhanya Maliakal
bea1791b4d initializing variables and copying ot gui only full frames 2015-02-10 12:21:31 +01:00
Dhanya Maliakal
e975a75be9 some code refraction to get rid of memeory leakage 2015-02-04 16:11:13 +01:00
Dhanya Maliakal
7fd12f97b4 some unnecessary printouts 2015-01-30 16:49:30 +01:00
Dhanya Maliakal
f30833a460 got rid of unnecessary printouts in receiver 2015-01-30 15:03:35 +01:00
Dhanya Maliakal
2b248eb793 unnecessary long wait in receiver 2015-01-30 10:58:30 +01:00
Maliakal Dhanya
76c9d2c61b lot of couts and some pre and post 2015-01-14 10:48:36 +01:00
Maliakal Dhanya
169c0a43ce updating version numbers 2014-12-08 10:25:42 +01:00
Maliakal Dhanya
f79f3cf021 makefile crash if files dont exist in make clean, fixed 2014-12-08 09:17:56 +01:00
Maliakal Dhanya
dc4e74087d makefile crash if files dont exist in make clean, fixed 2014-12-08 09:16:19 +01:00
Maliakal Dhanya
52d3140a3a a version of receiver for gemma with bottom 2014-12-02 10:12:00 +01:00
Maliakal Dhanya
6787c2e1e0 got rid of unnecessary usleep before transmitting in receiver 2014-12-01 17:18:26 +01:00
Maliakal Dhanya
bc79546e4e changes for eiger to compensate for 16 bytes and return while at the same time works for first frame being less than expected :266240 2014-11-28 14:29:09 +01:00
Maliakal Dhanya
5b2a896ed3 to return if it catches only 16 bytes or less than expected, but compensates for first frame being only 266240 for eiger 2014-11-28 14:28:56 +01:00
1d5580b0d4 JMCB max frames 2014-11-25 11:54:54 +01:00
Maliakal Dhanya
4770d74c12 return even if eiger got only 16 bytes of a packet 2014-11-18 17:29:12 +01:00
2eaefaba3a added log level control 2014-11-18 10:51:52 +01:00
a2fdcce711 fixed non-rest compilation 2014-11-17 17:06:50 +01:00