|
|
12348ac76c
|
merge conflict fix
|
2017-12-01 09:20:44 +01:00 |
|
|
|
18422ce215
|
setbit and clear bit moved to slsdet, readreg, writereg,setbit,clearbit in multi cannot give -1, instead api gives error if checked
|
2017-12-01 09:18:42 +01:00 |
|
|
|
5b88203bd9
|
merge conflict from 3.0.1 to restream stop from recieveR
|
2017-11-30 19:05:35 +01:00 |
|
|
|
ca855e6d39
|
restream stop from receiver
|
2017-11-30 18:37:11 +01:00 |
|
|
|
2227265357
|
removed external gui flag, acquiring flag is now not reset in stop acquisition, slsdet does not have acquiring flag anymore, busy accomodating acquiringflag, acquire cleanup, in acquire made lock for receiver more local, moved setacquiringflag false to bottom of acquire
|
2017-11-30 16:25:23 +01:00 |
|
|
|
1edb41242c
|
ensure gui gets measurement finished after dummy packet received from receiver/ext process
|
2017-11-29 15:22:10 +01:00 |
|
|
|
397344a264
|
Merge branch '3.0.1' into developer
|
2017-11-29 12:13:09 +01:00 |
|
|
|
712c9a4524
|
zmq connect earlier in gui to prevent losing first messages
|
2017-11-29 12:13:02 +01:00 |
|
|
|
7c1423d654
|
zmqip fix to restart reciever streaming form command line, fix to not have sls_receiver_defs in zmqSocket.h incldue
|
2017-11-28 16:31:43 +01:00 |
|
|
|
6a41b5ce3a
|
using file index from zmq
|
2017-11-28 14:45:29 +01:00 |
|
|
|
ca19993149
|
makng the zmq work without external flag
|
2017-11-27 17:06:18 +01:00 |
|
|
|
386ef7766c
|
zmq streaming should work with external gui now
|
2017-11-27 16:01:12 +01:00 |
|
|
|
3439ccbec9
|
updates for merge for r_readfreq without reciever
|
2017-11-23 18:30:48 +01:00 |
|
|
|
65d7922286
|
merge solved
|
2017-11-23 18:24:24 +01:00 |
|
|
|
16e4fbf8dd
|
receiver read freq should save value in shm even if no receiver present
|
2017-11-23 18:21:54 +01:00 |
|
|
|
ab5229bcbf
|
bugfix zmq ip was being overwritten
|
2017-11-23 17:48:30 +01:00 |
|
|
|
5eb8402742
|
bugfix zmq streaming both on
|
2017-11-23 17:28:35 +01:00 |
|
|
|
935fecefde
|
copy zmq ip even if receiver not online, else it is lost
|
2017-11-23 17:18:40 +01:00 |
|
|
|
20dc338c90
|
when changing network parameter, switch off data streaming only if on
|
2017-11-23 17:00:12 +01:00 |
|
|
|
a57e8edd88
|
jctb setting dr correctly
|
2017-11-23 16:15:38 +01:00 |
|
|
|
8538604c0f
|
somewhere
|
2017-11-23 14:53:37 +01:00 |
|
|
|
fb3c903c04
|
Merge branch '3.0.1' into developer
|
2017-11-22 17:06:51 +01:00 |
|
|
|
6753f8ba6c
|
network parameter should return with extra plus at the end like hostname
|
2017-11-22 17:06:43 +01:00 |
|
|
|
590fac9e07
|
making nx and ny available for jctb in call back
|
2017-11-22 15:08:09 +01:00 |
|
|
|
8328b30cbd
|
removed merge conflicts from bug fix of zmq buffering while acquire from command line
|
2017-11-21 14:58:07 +01:00 |
|
|
|
2067f47f34
|
Merge branch '3.0.1' into developer
|
2017-11-21 14:15:59 +01:00 |
|
|
|
167a6cff3e
|
restart streaming if port changed in multi level, sls detector level:need to take care of it on your own
|
2017-11-21 13:42:11 +01:00 |
|
|
|
5f0575236e
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-11-21 12:10:33 +01:00 |
|
|
|
45e0cf71eb
|
put trimval should work also for MYTHEN
|
2017-11-21 12:09:52 +01:00 |
|
|
|
c5c23e73d5
|
works zmq separated for client and rx, ports and ip included in expert advanced mode
|
2017-11-17 17:39:04 +01:00 |
|
|
|
428855d801
|
in between
|
2017-11-17 14:02:00 +01:00 |
|
|
|
51499fa503
|
merge conflict from 3.0.1
|
2017-11-17 11:35:02 +01:00 |
|
|
|
4097c37b31
|
in between
|
2017-11-16 16:01:31 +01:00 |
|
|
|
7dee07b9c5
|
somewhere
|
2017-11-16 09:12:54 +01:00 |
|
|
|
fd34bab34b
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:19:07 +01:00 |
|
|
|
2b0d07387a
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:16:47 +01:00 |
|
|
|
dda86cfe9b
|
somewhere in separating zmq rxr and client
|
2017-11-14 16:26:17 +01:00 |
|
|
|
4c4a26c0e3
|
Merge branch '3.0.1' into developer
|
2017-11-13 13:39:39 +01:00 |
|
|
|
70848c9891
|
bugfix ratecorr always gave back -100
|
2017-11-13 13:39:28 +01:00 |
|
|
|
1af065fdb1
|
infinite loop with gettotalnumberofchannels in gappixels initialization resulting in bus error fix
|
2017-11-13 11:13:26 +01:00 |
|
|
|
3c6d572369
|
including dynamic range in gui call back
|
2017-11-02 11:02:40 +01:00 |
|
|
|
82f503aa09
|
dynamic range also updates offsets, 4 bit mode gap pixels work in call back from gui
|
2017-10-31 12:50:31 +01:00 |
|
|
|
79bce5e006
|
4 bit mode works without gappixels
|
2017-10-26 16:01:18 +02:00 |
|
|
|
9c82a8f726
|
temp in between, trying to get 4 bitmode to work without gap pixels
|
2017-10-26 11:19:58 +02:00 |
|
|
|
4f2af046d3
|
Merge branch 'developer' into gappixels
|
2017-10-12 14:58:41 +02:00 |
|
|
|
311059d748
|
merge fix from 3.0.1 which includes server without crash, multi settimer -1 bug, need to recompile eiger server for this branch
|
2017-10-12 14:42:57 +02:00 |
|
|
|
f2f061ae18
|
bug fix: using int instead of int64_t , eg exptime is -1 on return
|
2017-10-12 09:47:13 +02:00 |
|
|
|
44bf4c52ed
|
changes for eiger server to return error if error
|
2017-10-06 13:48:06 +02:00 |
|
|
|
812606a7b4
|
conflict resolution with developer
|
2017-10-03 15:12:49 +02:00 |
|
|
|
03a2f979a9
|
fixing merge conflict in error_Defs
|
2017-10-03 14:32:30 +02:00 |
|
