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
|
c0bfe46aa1
|
enabling client in developer user api
|
2017-11-22 18:00:41 +01:00 |
|
Dhanya Maliakal
|
26829585dc
|
Merge branch '3.0.1' into developer
|
2017-11-22 17:47:28 +01:00 |
|
Dhanya Maliakal
|
ea3c722552
|
made a bin in manual api to be able to compile here
|
2017-11-22 17:47:16 +01:00 |
|
Dhanya Maliakal
|
c0a1f83691
|
Merge branch '3.0.1' into developer
|
2017-11-22 17:43:49 +01:00 |
|
Dhanya Maliakal
|
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 |
|
Dhanya Maliakal
|
d47abb140f
|
removed detreceivernocall
|
2017-11-22 17:43:00 +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 |
|
|
|
400585be6a
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-11-22 12:34:28 +01:00 |
|
|
|
dcfa6fb100
|
Fixed filename problem with CPU readout and trimval command for mythen
|
2017-11-22 12:34:14 +01:00 |
|
Gemma Tinti
|
f2f00fec06
|
Merge branch '3.0.1' into developer
|
2017-11-21 15:35:19 +01:00 |
|
Gemma Tinti
|
e023cb186f
|
manual
|
2017-11-21 15:34:56 +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 |
|
Dhanya Maliakal
|
2067f47f34
|
Merge branch '3.0.1' into developer
|
2017-11-21 14:15:59 +01:00 |
|
Dhanya Maliakal
|
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 |
|
Dhanya Maliakal
|
2cc11f1ff0
|
bug fix: enabledatastreaming get should return shared memory variable and not from receiver, bug fix:zmq buffering when acquire form command line, stopping sockets when command line acquire or receiver start, restarting sockets at change of port numbers and a refresh button for the same
|
2017-11-21 13:39:12 +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 |
|
Dhanya Maliakal
|
bd228fac27
|
bug fix in cleanup code, indexing
|
2017-11-20 17:19:03 +01:00 |
|
Dhanya Maliakal
|
b7ca7f5319
|
just cleanuped code
|
2017-11-20 17:15:13 +01:00 |
|
Gemma Tinti
|
11c9ab16f9
|
Merge branch '3.0.1' into developer
|
2017-11-20 16:44:21 +01:00 |
|
Gemma Tinti
|
d1d530f0e7
|
manual
|
2017-11-20 16:43:39 +01:00 |
|
Dhanya Maliakal
|
e6d22a97e2
|
Merge branch '3.0.1' into developer
|
2017-11-20 15:14:13 +01:00 |
|
Dhanya Maliakal
|
a0c014eb7d
|
changed rate correction back to what it was before in users class, enabling sets defaults
|
2017-11-20 15:14:01 +01:00 |
|
Dhanya Maliakal
|
99037449f4
|
in between moench stuff
|
2017-11-20 14:23:32 +01:00 |
|
Dhanya Maliakal
|
c5c23e73d5
|
works zmq separated for client and rx, ports and ip included in expert advanced mode
|
2017-11-17 17:39:04 +01:00 |
|
Dhanya Maliakal
|
23b415d837
|
streaming port set return same as get simple change
|
2017-11-17 14:04:03 +01:00 |
|
Dhanya Maliakal
|
428855d801
|
in between
|
2017-11-17 14:02:00 +01:00 |
|
Dhanya Maliakal
|
51499fa503
|
merge conflict from 3.0.1
|
2017-11-17 11:35:02 +01:00 |
|
Dhanya Maliakal
|
dcf4d98a75
|
show warnings, update binaries conflict from merge
|
2017-11-17 11:33:52 +01:00 |
|
Dhanya Maliakal
|
b020270734
|
edited cmake to show warnings
|
2017-11-17 08:46:59 +01:00 |
|
Dhanya Maliakal
|
f647bdaa48
|
updated users class to reflect zmq changes (separation), fixed warnings
|
2017-11-17 08:46:43 +01:00 |
|
Dhanya Maliakal
|
4097c37b31
|
in between
|
2017-11-16 16:01:31 +01:00 |
|
Dhanya Maliakal
|
a89265faf8
|
Merge branch '3.0.1' into zmqseparate
|
2017-11-16 15:09:14 +01:00 |
|
Dhanya Maliakal
|
8e0414d1b9
|
separating zmqport, enabling in client and receiver works
|
2017-11-16 15:01:22 +01:00 |
|
Dhanya Maliakal
|
2fca426ec0
|
Merge branch '3.0' into zmqseparate
|
2017-11-16 13:49:11 +01:00 |
|
Dhanya Maliakal
|
bf89dd44f3
|
updated binaries
|
2017-11-16 12:34:12 +01:00 |
|
Dhanya Maliakal
|
d9fcac0236
|
updated merge from 3.0 hotfix setdac
|
2017-11-16 12:32:38 +01:00 |
|
Dhanya Maliakal
|
875ca44c0b
|
updated server hotfix binary
|
2017-11-16 12:30:41 +01:00 |
|
Dhanya Maliakal
|
4c9cc1b477
|
Merge branch '3.0' into 3.0.1
|
2017-11-16 12:29:34 +01:00 |
|
Dhanya Maliakal
|
f192164e32
|
fixed setdac bug that comes rarely, moved serialize spi to 32bit
|
2017-11-16 12:27:58 +01:00 |
|
Dhanya Maliakal
|
7dee07b9c5
|
somewhere
|
2017-11-16 09:12:54 +01:00 |
|
Dhanya Maliakal
|
fd34bab34b
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:19:07 +01:00 |
|
Dhanya Maliakal
|
2b0d07387a
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:16:47 +01:00 |
|
Dhanya Maliakal
|
7c9958db04
|
updated binary merge from 3.0 regarding settings
|
2017-11-15 10:36:55 +01:00 |
|
Dhanya Maliakal
|
956625bb50
|
Merge branch '3.0' into developer
|
2017-11-15 10:35:20 +01:00 |
|
