|
|
65b4c69847
|
REST implementation removed from slsReceiver
|
2017-12-05 11:03:52 +01:00 |
|
|
|
61791c078c
|
Merge remote branch 'slsDetectorGui/3.0.1' into 3.0.1
|
2017-12-04 16:48:17 +01:00 |
|
|
|
36802cdb14
|
Merge remote branch 'slsReceiverSoftware/3.0.1' into 3.0.1
|
2017-12-04 16:48:17 +01:00 |
|
|
|
e26cf3b673
|
Merge remote branch 'slsDetectorSoftware/3.0.1' into 3.0.1
|
2017-12-04 16:48:15 +01:00 |
|
|
|
aab62fccc1
|
Merge remote branch 'slsDetectorGui/3.0' into 3.0
|
2017-12-04 16:48:09 +01:00 |
|
|
|
73ce4abd58
|
Merge remote branch 'slsReceiverSoftware/3.0' into 3.0
|
2017-12-04 16:48:08 +01:00 |
|
|
|
c12b137b79
|
Merge remote branch 'slsDetectorSoftware/3.0' into 3.0
|
2017-12-04 16:48:07 +01:00 |
|
|
|
d1e3d50a87
|
cosmetic print outs
|
2017-12-01 12:43:14 +01:00 |
|
|
|
a06f29f473
|
minor cosmetics
|
2017-12-01 11:23:17 +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 |
|
|
|
e9343a5bd0
|
remove warning
|
2017-11-30 19:07:05 +01:00 |
|
|
|
70bf6eb4cb
|
restream stop from receiver
|
2017-11-30 18:39:08 +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 |
|
|
|
baee38802b
|
wait state between acquistion finished and ready for next acquire in gui, check if acquiringflag is set then reset it
|
2017-11-30 16:20:26 +01:00 |
|
|
|
712c9a4524
|
zmq connect earlier in gui to prevent losing first messages
|
2017-11-29 12:13:02 +01:00 |
|
|
|
b75985088d
|
twice connect bug fix in zmq
|
2017-11-28 18:50:18 +01:00 |
|
|
|
a351fa8f28
|
switching from black to white background for receiver
|
2017-11-28 11:18:30 +01:00 |
|
|
|
4825ace129
|
switching from black to white background for receiver
|
2017-11-28 11:18:22 +01:00 |
|
|
|
ba71529ff2
|
comment in users
|
2017-11-28 10:50:35 +01:00 |
|
|
|
1fce54ec4b
|
zmqport in users fixed
|
2017-11-28 10:35:06 +01:00 |
|
|
|
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 |
|
|
|
d5c310a2db
|
only call register call back which already enables streaming in client and receiveR
|
2017-11-28 09:36:14 +01:00 |
|
|
|
9f91b78696
|
update comments
|
2017-11-28 09:26:12 +01:00 |
|
|
|
d1eab6f750
|
updated slsdetector users for zmqport set up
|
2017-11-28 09:24:40 +01:00 |
|
|
|
c0a114345b
|
bug fix set error mask when setting wrong settings
|
2017-11-27 16:11:33 +01:00 |
|
|
|
386ef7766c
|
zmq streaming should work with external gui now
|
2017-11-27 16:01:12 +01:00 |
|
|
|
375b1c9485
|
not required to restart client datastreaming due to connect everytime for acquire
|
2017-11-27 15:40:36 +01:00 |
|
|
|
65d7922286
|
merge solved
|
2017-11-23 18:24:24 +01:00 |
|
|
|
eb89e9bf96
|
Merge branch '3.0.1' into zmqchange
|
2017-11-23 18:22:27 +01:00 |
|
|
|
9f733c1dfb
|
Merge branch '3.0.1' into zmqchange
|
2017-11-23 18:22:26 +01:00 |
|
|
|
59b5fe9424
|
receiver read freq should save value in shm even if no receiver present
|
2017-11-23 18:22:03 +01:00 |
|
|
|
16e4fbf8dd
|
receiver read freq should save value in shm even if no receiver present
|
2017-11-23 18:21:54 +01:00 |
|
|
|
d40a2e0efa
|
receiver read freq should save value in shm even if no receiver present
|
2017-11-23 18:21:29 +01:00 |
|
|
|
5eb8402742
|
bugfix zmq streaming both on
|
2017-11-23 17:28:35 +01:00 |
|
|
|
dc5384f0f9
|
copy zmq port even if receiver not online, else it is lost
|
2017-11-23 17:20:07 +01:00 |
|
|
|
20dc338c90
|
when changing network parameter, switch off data streaming only if on
|
2017-11-23 17:00:12 +01:00 |
|
|
|
b14ea217ee
|
Merge branch '3.0.1' into zmqchange
|
2017-11-23 16:34:14 +01:00 |
|
|
|
da3ca9f306
|
changes to use ZmqSocket.h externally without further changes
|
2017-11-23 16:28:02 +01:00 |
|
|
|
ad64df01c7
|
somewhere
|
2017-11-23 14:53:40 +01:00 |
|
|
|
8538604c0f
|
somewhere
|
2017-11-23 14:53:37 +01:00 |
|
|
|
d23c9d52ed
|
somewhere
|
2017-11-23 14:53:33 +01:00 |
|
|
|
3b292bdeb6
|
need to enable data streaming for client
|
2017-11-23 10:27:59 +01:00 |
|
|
|
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 |
|
|
|
4749e8c4e4
|
modified users client to work without config and better print out
|
2017-11-23 09:34:12 +01:00 |
|
|
|
447451231c
|
modified users client to work without config and better print out
|
2017-11-22 18:09:16 +01:00 |
|
|
|
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 |
|
|
|
ea3c722552
|
made a bin in manual api to be able to compile here
|
2017-11-22 17:47:16 +01:00 |
|
|
|
4ecbfada5b
|
Merge branch '3.0.1' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0.1
|
2017-11-22 17:43:12 +01:00 |
|
|
|
d47abb140f
|
removed detreceivernocall
|
2017-11-22 17:43:00 +01:00 |
|
