Commit Graph

209 Commits

Author SHA1 Message Date
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
Dhanya Maliakal e333eb15cd command line docu. more coming up 2017-08-17 14:32:43 +02:00
Dhanya Maliakal c6549694a8 command line docu. more coming up 2017-08-17 14:16:54 +02:00
Dhanya Maliakal 5ef0012518 command line docu update. more coming 2017-08-17 13:55:44 +02:00
Dhanya Maliakal 16fc44b3ab update client command doc 2017-08-16 19:05:17 +02:00
Dhanya Maliakal ac6720e27d appears double in the intro list 2017-08-16 18:46:10 +02:00
Dhanya Maliakal ae7255953d compile error bug fix 2017-08-16 18:37:10 +02:00
bergamaschi 6b28201f72 comments merged 2017-08-16 17:50:46 +02:00
bergamaschi ae49c04dcd added documentation to slsDetectorCommand.cpp 2017-08-16 17:29:04 +02:00
Dhanya Maliakal 57537a350f updating cmd line help; other detectors other than eiger will complain cannot set timer 14 (subexptime) when setting receiver 2017-08-16 17:12:23 +02:00
Dhanya Maliakal 2935722b98 updated command line doc 2017-08-16 11:49:55 +02:00
Dhanya Maliakal af5f61bd95 updated command line doc 2017-08-16 11:13:40 +02:00
Dhanya Maliakal 5de120f7e7 more changes to client docu. more coming up. removed slsDetectorClientDocs from here 2017-08-16 11:03:22 +02:00
Dhanya Maliakal c21f7f371a more changes to client docu. more coming up 2017-08-16 10:42:27 +02:00
Dhanya Maliakal 03cc80dc3c more changes to client docu. more coming up 2017-08-16 10:36:25 +02:00
Dhanya Maliakal 413a944e70 fixed problem with datastream help 2017-08-16 10:11:39 +02:00
Dhanya Maliakal 25ece55d7f more changes to client docu. more coming up 2017-08-16 10:09:27 +02:00
Dhanya Maliakal bb917b70f3 more changes to client docu. more coming up 2017-08-15 18:42:41 +02:00
Dhanya Maliakal f8060ef757 more changes to client docu. more coming up 2017-08-15 18:29:07 +02:00
Dhanya Maliakal 8e1a841b42 in between command line documentation 2017-08-15 18:06:45 +02:00
Dhanya Maliakal 0c6fcc1186 cannot put for get busy 2017-08-10 19:09:46 +02:00
Dhanya Maliakal f084efd263 sending and writing subexptime in the receiver files, adding 0x in front of all numbers printed in command line which is hexa 2017-08-10 17:25:18 +02:00
Dhanya Maliakal af079f3168 posisibility to read adnd write registers in the front end board for eiger 2017-08-10 14:49:02 +02:00
Dhanya Maliakal 558e5e2e9a added busy command, converted get frames etc to an integer output 2017-08-08 19:15:20 +02:00
Dhanya Maliakal 96ce9ed7c1 if timer gives -1 in multi, it should not multiply answer with 1e-9 to get in seconds in slsdetectorocmmand 2017-08-04 14:09:56 +02:00
Dhanya Maliakal e3667f6827 can set zmqport from receiver 2017-07-13 12:18:07 +02:00
Dhanya Maliakal 374b07a126 merge developer 2017-07-03 17:42:06 +02:00
Dhanya Maliakal f944d7cae4 made updatereceiver to actually update client in parameters that it can 2017-07-03 17:37:24 +02:00
Dhanya Maliakal b4309a9f60 changed jungfrau temperature conversion but binary to follow 2017-07-03 14:45:44 +02:00
Dhanya Maliakal c2980b3c44 changes for setting threshold without trimbits for eiger 2017-06-28 10:24:07 +02:00
Dhanya Maliakal bbbd4731d7 ensuring acquire, p receiver start and the gui enables and disables data streaming accordingly. those with api will have to know what they want before acquiring 2017-06-22 16:44:29 +02:00
Dhanya Maliakal e2e25f6e62 changed API for setting network parameter to remove memory leak, fixed lock issues in streaming print outs to gui, deleted return from threadpool in the right place 2017-06-19 14:29:45 +02:00
bergamaschi cbbdd8eeab Merged to developer 2017-06-13 15:30:33 +02:00
bergamaschi 8caab4e562 Modicfications for chiptestboard and moench03 module 2017-06-13 15:28:45 +02:00