|
|
e0bb7d74f4
|
esrf changes: eiver: initialise global optind variable before calling getopt_long: Needed when multiple receivers are instantiated in the same process
|
2018-04-23 17:43:54 +02:00 |
|
|
|
d38108e527
|
esrf changes: slsReceiver: extend CircularFifo to support blocking/non-blocking transfers:
* Add blocking push (for performance) and non-blocking pop (for symmetry), default to blocking operations
* Fix memory fault if Fifo allocation fails
* Fix fifoFree initialisation to fifoSize elements (was fifoSize - 1)
|
2018-04-23 17:32:40 +02:00 |
|
|
|
e024774323
|
added storage cells
|
2018-04-13 15:05:43 +02:00 |
|
|
|
d3c807975f
|
adding a semaphore to handle end of acq
|
2018-04-12 15:50:27 +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 |
|
|
|
fe2ba8621b
|
updating versioning to only have date
|
2018-03-27 11:00:15 +02:00 |
|
|
|
14546247e4
|
adding a receiver callback to be able to give modified size from the callback
|
2018-03-22 14:34:03 +01: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 |
|
|
|
b58c3e8951
|
solving merging conflicts from 3.1.0 to developer
|
2018-03-14 15:45:35 +01:00 |
|
|
|
7859df6aa3
|
bug fix: 1000+ errors on gui startup(setreceiveronline not done), removed gui mesage popup for different output paths, fixed jungfrau to have multiple detectors in x dir in gui
|
2018-02-26 12:44:32 +01:00 |
|
Dhanya Maliakal
|
65a91c519e
|
Merge branch '3.0.1' into developer
|
2017-12-14 14:29:16 +01:00 |
|
Dhanya Maliakal
|
0649626842
|
made the color fix for black/white backgrounds
|
2017-12-14 14:29:07 +01:00 |
|
Dhanya Maliakal
|
d6bdbf8524
|
Merge branch '3.0.1' into developer
|
2017-12-11 13:51:20 +01:00 |
|
Dhanya Maliakal
|
bb3e5351b4
|
solving warnings from latest linux
|
2017-12-11 13:51:11 +01:00 |
|
Dhanya Maliakal
|
24c305ec59
|
solved conflicts from merge of version being used to binary
|
2017-12-06 19:07:06 +01:00 |
|
Dhanya Maliakal
|
bf9905ad2a
|
possible to use binary --version or -v to get the branch and versionid
|
2017-12-06 19:05:35 +01:00 |
|
Dhanya Maliakal
|
c4a242e10a
|
changed all variables from svn to git, included --version for receiver binary
|
2017-12-06 10:29:57 +01:00 |
|
Dhanya Maliakal
|
0ef52138e1
|
merge conflict sorted, removing rest
|
2017-12-05 11:25:10 +01:00 |
|
Dhanya Maliakal
|
65b4c69847
|
REST implementation removed from slsReceiver
|
2017-12-05 11:03:52 +01:00 |
|
Dhanya Maliakal
|
2ae5a959fe
|
fix in receiver merge conflict (before the respos merge)
|
2017-12-04 18:35:57 +01:00 |
|
Dhanya Maliakal
|
9f152ce1f3
|
merge conflict resolved
|
2017-12-01 12:44:34 +01:00 |
|
Dhanya Maliakal
|
d1e3d50a87
|
cosmetic print outs
|
2017-12-01 12:43:14 +01:00 |
|
Dhanya Maliakal
|
a06f29f473
|
minor cosmetics
|
2017-12-01 11:23:17 +01:00 |
|
Dhanya Maliakal
|
0e26734023
|
restreaming stop fix
|
2017-11-30 19:13:55 +01:00 |
|
Dhanya Maliakal
|
fd64ba289e
|
Merge branch '3.0.1' into developer
|
2017-11-30 19:07:21 +01:00 |
|
Dhanya Maliakal
|
e9343a5bd0
|
remove warning
|
2017-11-30 19:07:05 +01:00 |
|
Dhanya Maliakal
|
6f3898441e
|
merge conflict from 3.0.1 to restream stop from recieveR
|
2017-11-30 19:05:47 +01:00 |
|
Dhanya Maliakal
|
70bf6eb4cb
|
restream stop from receiver
|
2017-11-30 18:39:08 +01:00 |
|
Dhanya Maliakal
|
a89847538d
|
merge ocnflict for white background
|
2017-11-28 11:29:15 +01:00 |
|
Dhanya Maliakal
|
a351fa8f28
|
switching from black to white background for receiver
|
2017-11-28 11:18:30 +01:00 |
|
Dhanya Maliakal
|
4466213882
|
makng the zmq work without external flag
|
2017-11-27 17:06:27 +01:00 |
|
Dhanya Maliakal
|
a0c9018455
|
Merge branch '3.0.1' into developer
|
2017-11-23 18:24:34 +01:00 |
|
Dhanya Maliakal
|
eb89e9bf96
|
Merge branch '3.0.1' into zmqchange
|
2017-11-23 18:22:27 +01:00 |
|
Dhanya Maliakal
|
59b5fe9424
|
receiver read freq should save value in shm even if no receiver present
|
2017-11-23 18:22:03 +01:00 |
|
Dhanya Maliakal
|
ad64df01c7
|
somewhere
|
2017-11-23 14:53:40 +01:00 |
|
Dhanya Maliakal
|
114c45c04a
|
making gui work temporarily for jctb
|
2017-11-22 09:27:42 +01:00 |
|
Dhanya Maliakal
|
5d34358f44
|
changin zmqip in rxr should also restart streaming
|
2017-11-21 15:11:29 +01:00 |
|
Dhanya Maliakal
|
a0ad1fb3a3
|
Merge branch '3.0.1' into developer
|
2017-11-21 14:15:59 +01:00 |
|
Dhanya Maliakal
|
d00df32e49
|
changing zmq rxr port should restart data streaming
|
2017-11-21 13:39:49 +01:00 |
|
Dhanya Maliakal
|
46aeee00f1
|
somewhere
|
2017-11-21 12:30:58 +01:00 |
|
Dhanya Maliakal
|
97260510f2
|
gap pixels should be allowed to set to 0 for other detectors
|
2017-11-20 09:43:41 +01:00 |
|
Dhanya Maliakal
|
662f502d4c
|
zmq always needs an ip in header
|
2017-11-17 17:40:57 +01:00 |
|
Dhanya Maliakal
|
2e234f1bbd
|
Merge branch '3.0.1' into developer
|
2017-11-17 11:36:02 +01:00 |
|
Dhanya Maliakal
|
a79864a5ae
|
bugfix enabledata streaming send int for update
|
2017-11-17 11:35:54 +01:00 |
|
Dhanya Maliakal
|
1dee950870
|
merge conflict from 3.0.1
|
2017-11-17 11:35:15 +01:00 |
|
Dhanya Maliakal
|
823d537825
|
fixed warnings
|
2017-11-17 09:26:20 +01:00 |
|
Dhanya Maliakal
|
c69ae52e76
|
somewhere
|
2017-11-16 09:12:57 +01:00 |
|
Dhanya Maliakal
|
32d32dbcdc
|
in between separating datastreaming in client and receiver
|
2017-11-15 16:16:59 +01:00 |
|
Dhanya Maliakal
|
db2fef5d69
|
conflict resolved in merge from 3.0.1 to include file index in zmq streaming
|
2017-11-14 12:14:26 +01:00 |
|
