 Dhanya Maliakal
|
3b684c4662
|
Merge branch '3.0.1' into developer
|
2017-12-05 13:41:26 +01:00 |
|
|
Dhanya Maliakal
|
d00c837977
|
updated write config and write parameters list
|
2017-12-05 13:41:16 +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
|
12348ac76c
|
merge conflict fix
|
2017-12-01 09:20:44 +01:00 |
|
|
Dhanya Maliakal
|
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 |
|
|
Dhanya Maliakal
|
5b88203bd9
|
merge conflict from 3.0.1 to restream stop from recieveR
|
2017-11-30 19:05:35 +01:00 |
|
|
Dhanya Maliakal
|
ca855e6d39
|
restream stop from receiver
|
2017-11-30 18:37:11 +01:00 |
|
|
Dhanya Maliakal
|
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 |
|
|
Dhanya Maliakal
|
1edb41242c
|
ensure gui gets measurement finished after dummy packet received from receiver/ext process
|
2017-11-29 15:22:10 +01:00 |
|
|
Dhanya Maliakal
|
397344a264
|
Merge branch '3.0.1' into developer
|
2017-11-29 12:13:09 +01:00 |
|
|
Dhanya Maliakal
|
712c9a4524
|
zmq connect earlier in gui to prevent losing first messages
|
2017-11-29 12:13:02 +01:00 |
|
|
Dhanya Maliakal
|
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 |
|
|
Dhanya Maliakal
|
6a41b5ce3a
|
using file index from zmq
|
2017-11-28 14:45:29 +01:00 |
|
|
Dhanya Maliakal
|
57fc89a6bb
|
comment users
|
2017-11-28 10:51:05 +01:00 |
|
|
Dhanya Maliakal
|
ba71529ff2
|
comment in users
|
2017-11-28 10:50:35 +01:00 |
|
|
Dhanya Maliakal
|
1fce54ec4b
|
zmqport in users fixed
|
2017-11-28 10:35:06 +01:00 |
|
|
Dhanya Maliakal
|
41f24489bc
|
zmqip in users fixed
|
2017-11-28 10:33:40 +01:00 |
|
|
Dhanya Maliakal
|
bca7c649d7
|
Merge branch '3.0.1' into developer
|
2017-11-28 09:37:09 +01:00 |
|
|
Dhanya Maliakal
|
1dd300f713
|
only call register call back which already enables streaming in client and receiver, added to postprocessing
|
2017-11-28 09:36:54 +01:00 |
|
|
Dhanya Maliakal
|
747e9af431
|
Merge branch '3.0.1' into developer
|
2017-11-28 09:26:55 +01:00 |
|
|
Dhanya Maliakal
|
9f91b78696
|
update comments
|
2017-11-28 09:26:12 +01:00 |
|
|
Dhanya Maliakal
|
620f7651a0
|
Merge branch '3.0.1' into developer
|
2017-11-28 09:24:57 +01:00 |
|
|
Dhanya Maliakal
|
d1eab6f750
|
updated slsdetector users for zmqport set up
|
2017-11-28 09:24:40 +01:00 |
|
|
Dhanya Maliakal
|
ca19993149
|
makng the zmq work without external flag
|
2017-11-27 17:06:18 +01:00 |
|
|
Dhanya Maliakal
|
c0a114345b
|
bug fix set error mask when setting wrong settings
|
2017-11-27 16:11:33 +01:00 |
|
|
Dhanya Maliakal
|
386ef7766c
|
zmq streaming should work with external gui now
|
2017-11-27 16:01:12 +01:00 |
|
|
Dhanya Maliakal
|
3439ccbec9
|
updates for merge for r_readfreq without reciever
|
2017-11-23 18:30:48 +01:00 |
|
|
Dhanya Maliakal
|
65d7922286
|
merge solved
|
2017-11-23 18:24:24 +01:00 |
|
|
Dhanya Maliakal
|
16e4fbf8dd
|
receiver read freq should save value in shm even if no receiver present
|
2017-11-23 18:21:54 +01:00 |
|
|
Dhanya Maliakal
|
ab5229bcbf
|
bugfix zmq ip was being overwritten
|
2017-11-23 17:48:30 +01:00 |
|
|
Dhanya Maliakal
|
5eb8402742
|
bugfix zmq streaming both on
|
2017-11-23 17:28:35 +01:00 |
|
|
Dhanya Maliakal
|
585661412c
|
Merge branch '3.0.1' into developer
|
2017-11-23 17:20:13 +01:00 |
|
|
Dhanya Maliakal
|
dc5384f0f9
|
copy zmq port even if receiver not online, else it is lost
|
2017-11-23 17:20:07 +01:00 |
|
|
Dhanya Maliakal
|
935fecefde
|
copy zmq ip even if receiver not online, else it is lost
|
2017-11-23 17:18:40 +01:00 |
|
|
Dhanya Maliakal
|
20dc338c90
|
when changing network parameter, switch off data streaming only if on
|
2017-11-23 17:00:12 +01:00 |
|
|
Dhanya Maliakal
|
a57e8edd88
|
jctb setting dr correctly
|
2017-11-23 16:15:38 +01:00 |
|
|
Dhanya Maliakal
|
8538604c0f
|
somewhere
|
2017-11-23 14:53:37 +01:00 |
|
|
Dhanya Maliakal
|
2ac170db98
|
removed data streaming shutdown from command line to allow external gui
|
2017-11-23 11:52:46 +01:00 |
|
|
Dhanya Maliakal
|
34908edd6a
|
Merge branch '3.0.1' into developer
|
2017-11-23 10:22:03 +01:00 |
|
|
Dhanya Maliakal
|
856ad76247
|
included setreceiver online in users class, so that one can start using users without config file
|
2017-11-23 10:21:54 +01:00 |
|
|
Dhanya Maliakal
|
0b45d73e0c
|
Merge branch '3.0.1' into developer
|
2017-11-22 18:02:45 +01:00 |
|
|
Dhanya Maliakal
|
7860637b46
|
switching off data streaming from command line only in receiver start and not in receiver as a whoel put command
|
2017-11-22 18:02:36 +01:00 |
|
|
Dhanya Maliakal
|
fb3c903c04
|
Merge branch '3.0.1' into developer
|
2017-11-22 17:06:51 +01:00 |
|
|
Dhanya Maliakal
|
6753f8ba6c
|
network parameter should return with extra plus at the end like hostname
|
2017-11-22 17:06:43 +01:00 |
|
|
Dhanya Maliakal
|
db6947cc9c
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-11-22 15:08:33 +01:00 |
|
|
Dhanya Maliakal
|
590fac9e07
|
making nx and ny available for jctb in call back
|
2017-11-22 15:08:09 +01:00 |
|
 bergamaschi
|
400585be6a
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-11-22 12:34:28 +01:00 |
|
|
bergamaschi
|
dcfa6fb100
|
Fixed filename problem with CPU readout and trimval command for mythen
|
2017-11-22 12:34:14 +01:00 |
|
|
Dhanya Maliakal
|
8328b30cbd
|
removed merge conflicts from bug fix of zmq buffering while acquire from command line
|
2017-11-21 14:58:07 +01:00 |
|