Commit Graph

1552 Commits

Author SHA1 Message Date
67cdfe8b41 in between 2017-09-14 16:58:39 +02:00
91f3db6691 separated virtual master and slave executables 2017-08-30 15:38:43 +02:00
56aa4be358 added eiger virtual class. eiger server minor bug fix. 1. copying local trimbits over from module (in effect same thing)2.rate correction table calculated each time and now only when period is different 2017-08-30 15:29:58 +02:00
91fece87b2 updaterev 2017-08-28 12:05:42 +02:00
a8b41ca813 updating user documentation 2017-08-25 15:46:16 +02:00
a78bc86bca adc reader standalone for blackfin as well 2017-08-24 18:41:30 +02:00
5e11e0a7db added adc reader standalone 2017-08-24 18:40:52 +02:00
e5c84fd11c external gui unused variables 2017-08-24 16:03:31 +02:00
fbb04f5ebe Merge branch 'externalgui' into developer 2017-08-23 19:06:59 +02:00
0bea688a83 changes for external gui 2017-08-23 19:06:40 +02:00
19d973f5d6 Merge branch '3.0' into externalgui 2017-08-23 18:26:46 +02:00
92d5143f81 Merge branch '3.0' into developer 2017-08-23 18:26:36 +02:00
6332025bbc frames caught in 9m was only looking at 1st receiver, now made to average 2017-08-23 18:26:25 +02:00
bdccddfe97 in between 2017-08-23 18:24:48 +02:00
a236a7a9aa Merge branch '3.0' into externalgui 2017-08-23 18:01:58 +02:00
72c4cbe871 Merge branch '3.0' into developer 2017-08-23 18:01:48 +02:00
7ffd9b87b8 bug fix:removed 0x prefix for dr 2017-08-23 18:01:34 +02:00
a657bac1b1 removed a print 2017-08-23 18:01:02 +02:00
f4e2b819d2 changes for external gui 2017-08-23 16:31:32 +02:00
2116070f02 Merge branch '3.0' into externalgui 2017-08-23 10:11:57 +02:00
02c193118b Merge branch '3.0' into developer 2017-08-23 09:41:27 +02:00
b208acf4a0 moved doxy.config to here 2017-08-23 09:41:10 +02:00
b2513cad23 Merge branch '3.0' into developer 2017-08-22 19:43:49 +02:00
4f28df03ab trials 2017-08-22 19:43:26 +02:00
a7dab9a257 updating user documentation. another update required 2017-08-22 19:42:52 +02:00
25886044ab Merge branch '3.0' into developer 2017-08-21 09:21:41 +02:00
4e374eb2cd updaterev 2017-08-18 18:35:30 +02:00
9868ca3eca Merge branch '3.0-rc' into developer 2017-08-18 16:13:51 +02:00
ec4be4f2c0 bugfix: framesl was not conected, exptime default time is 10 us 2017-08-18 16:11:49 +02:00
181616fb67 Merge branch '3.0-rc' into developer 2017-08-17 17:24:30 +02:00
cda7814c21 timing put for delay and period 2017-08-17 17:23:13 +02:00
de5986e5dd Merge branch '3.0-rc' into developer 2017-08-17 17:09:05 +02:00
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
269227b093 Merge branch '3.0-rc' into developer 2017-08-17 17:04:30 +02:00
355c0a8c11 command line docu. more coming up 2017-08-17 17:04:29 +02:00
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
0dd6567ce4 changed some sections in the documentation 2017-08-17 17:04:07 +02:00
638a69ad23 Merge branch '3.0-rc' into developer 2017-08-17 17:02:43 +02:00
7115ac19b6 command line docu. more coming up 2017-08-17 17:02:42 +02:00
b20f994ac4 Merge branch '3.0-rc' into developer 2017-08-17 16:59:08 +02:00
4adf3e9385 command line docu. more coming up 2017-08-17 16:59:07 +02:00
ae13fbce72 changed some sections in the documentation 2017-08-17 16:57:06 +02:00
e2d451a400 Merge branch '3.0-rc' into developer 2017-08-17 16:46:49 +02:00
3189bd5359 command line docu. more coming up 2017-08-17 16:46:48 +02:00
52223e61d4 Merge branch '3.0-rc' into developer 2017-08-17 16:25:02 +02:00
827ce17fac command line docu. more coming up 2017-08-17 16:25:01 +02:00
6ef4aa9715 Merge branch '3.0-rc' into developer 2017-08-17 14:32:44 +02:00
e333eb15cd command line docu. more coming up 2017-08-17 14:32:43 +02:00
3a887eb604 Merge branch '3.0-rc' into developer 2017-08-17 14:17:05 +02:00
c6549694a8 command line docu. more coming up 2017-08-17 14:16:54 +02:00