 Dhanya Maliakal
|
98e09b29d5
|
merge conflict solved -1 in adc in gui
|
2017-12-05 15:39:02 +01:00 |
|
|
Dhanya Maliakal
|
7aaf95a565
|
-1 in getadc fixed in gui as well
|
2017-12-05 15:37:34 +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
|
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
|
ca19993149
|
makng the zmq work without external flag
|
2017-11-27 17:06:18 +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
|
16e4fbf8dd
|
receiver read freq should save value in shm even if no receiver present
|
2017-11-23 18:21:54 +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
|
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
|
2067f47f34
|
Merge branch '3.0.1' into developer
|
2017-11-21 14:15:59 +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 |
|
 bergamaschi
|
5f0575236e
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-11-21 12:10:33 +01:00 |
|
|
bergamaschi
|
45e0cf71eb
|
put trimval should work also for MYTHEN
|
2017-11-21 12:09:52 +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
|
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
|
2b0d07387a
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:16:47 +01:00 |
|
|
Dhanya Maliakal
|
dda86cfe9b
|
somewhere in separating zmq rxr and client
|
2017-11-14 16:26:17 +01:00 |
|
|
Dhanya Maliakal
|
6693d08331
|
fixed help of acquire doing an actual acquisition
|
2017-11-14 11:53:37 +01:00 |
|
|
Dhanya Maliakal
|
812606a7b4
|
conflict resolution with developer
|
2017-10-03 15:12:49 +02:00 |
|
|
Dhanya Maliakal
|
03a2f979a9
|
fixing merge conflict in error_Defs
|
2017-10-03 14:32:30 +02:00 |
|
|
Dhanya Maliakal
|
352ade6457
|
just skeleton of gappixels
|
2017-09-27 17:08:00 +02:00 |
|
|
Dhanya Maliakal
|
af98d2bb53
|
added silent mode in receiver during real time acquisition, doesnt print packet loss regularly or file name created each time
|
2017-09-27 10:09:02 +02:00 |
|
|
Dhanya Maliakal
|
092487c08e
|
Merge branch '3.0.1' into developer
|
2017-09-19 17:19:36 +02:00 |
|
|
Dhanya Maliakal
|
90f899c936
|
replaced post incrementing by pre incrementing
|
2017-09-18 17:20:38 +02:00 |
|
|
Dhanya Maliakal
|
a95e2efdb0
|
parallelized settimer, setfileindex, setonline, setreceiveronline, getreceiverstatus, resetframescaught, setFrameIndex, setFileName, getFramesCaughtByReceiver; added getFramesCaughtbyAnyreceiver to avoid threadpool and to use in post processing
|
2017-09-18 16:47:22 +02:00 |
|
|
Dhanya Maliakal
|
49378e6d09
|
added streamsrcip command to be able to change the interface from which receiver streams data from
|
2017-09-12 14:33:11 +02:00 |
|
|
Dhanya Maliakal
|
5e11e0a7db
|
added adc reader standalone
|
2017-08-24 18:40:52 +02:00 |
|
|
Dhanya Maliakal
|
e5c84fd11c
|
external gui unused variables
|
2017-08-24 16:03:31 +02:00 |
|
|
Dhanya Maliakal
|
0bea688a83
|
changes for external gui
|
2017-08-23 19:06:40 +02:00 |
|
|
Dhanya Maliakal
|
a236a7a9aa
|
Merge branch '3.0' into externalgui
|
2017-08-23 18:01:58 +02:00 |
|
|
Dhanya Maliakal
|
7ffd9b87b8
|
bug fix:removed 0x prefix for dr
|
2017-08-23 18:01:34 +02:00 |
|
|
Dhanya Maliakal
|
f4e2b819d2
|
changes for external gui
|
2017-08-23 16:31:32 +02:00 |
|
|
Dhanya Maliakal
|
4f28df03ab
|
trials
|
2017-08-22 19:43:26 +02:00 |
|
|
Dhanya Maliakal
|
cda7814c21
|
timing put for delay and period
|
2017-08-17 17:23:13 +02:00 |
|
|
bergamaschi
|
ff7b6c5abe
|
Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detector_software into 3.0-rc
|
2017-08-17 17:04:57 +02:00 |
|
|
Dhanya Maliakal
|
355c0a8c11
|
command line docu. more coming up
|
2017-08-17 17:04:29 +02:00 |
|
|
bergamaschi
|
be95de0963
|
Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detector_software into 3.0-rc
|
2017-08-17 17:04:27 +02:00 |
|
|
bergamaschi
|
0dd6567ce4
|
changed some sections in the documentation
|
2017-08-17 17:04:07 +02:00 |
|
|
Dhanya Maliakal
|
7115ac19b6
|
command line docu. more coming up
|
2017-08-17 17:02:42 +02:00 |
|
|
Dhanya Maliakal
|
4adf3e9385
|
command line docu. more coming up
|
2017-08-17 16:59:07 +02:00 |
|
|
bergamaschi
|
ae13fbce72
|
changed some sections in the documentation
|
2017-08-17 16:57:06 +02:00 |
|
|
Dhanya Maliakal
|
3189bd5359
|
command line docu. more coming up
|
2017-08-17 16:46:48 +02:00 |
|
|
Dhanya Maliakal
|
827ce17fac
|
command line docu. more coming up
|
2017-08-17 16:25:01 +02:00 |
|