|
|
0954bdd2d3
|
Merge branch 'developer' into gui
|
2019-07-02 17:29:50 +02:00 |
|
|
|
f4fa19b559
|
bugfix rxr: checkonline prints error msg, call receiverversion instead
|
2019-07-02 17:29:38 +02:00 |
|
|
|
864db79a13
|
WIP
|
2019-07-02 17:11:03 +02:00 |
|
|
|
455252f2f3
|
WIP
|
2019-07-02 13:51:31 +02:00 |
|
|
|
5e6eb45f56
|
Merge branch 'gui' of github.com:slsdetectorgroup/slsDetectorPackage into gui
|
2019-07-02 13:51:03 +02:00 |
|
|
|
975076043f
|
WIP
|
2019-07-02 13:50:20 +02:00 |
|
Erik Frojdh
|
00eaad3416
|
cmake
|
2019-07-02 12:42:58 +02:00 |
|
Erik Frojdh
|
cbe979b4b9
|
fixed merge
|
2019-07-02 12:16:05 +02:00 |
|
Erik Frojdh
|
44aa3f655b
|
cmath + cleaning
|
2019-07-02 12:11:45 +02:00 |
|
|
|
fc2cc7e00c
|
WIP
|
2019-07-02 12:09:37 +02:00 |
|
Erik Frojdh
|
547ab8a749
|
Merge branch 'developer' into gui
|
2019-07-02 10:54:29 +02:00 |
|
|
|
e16b857ba2
|
ctb server: hv select is actually internal hv select
|
2019-07-02 10:15:25 +02:00 |
|
|
|
e22d03a744
|
WIP
|
2019-07-02 09:13:47 +02:00 |
|
|
|
a373609b08
|
WIP
|
2019-06-28 18:16:32 +02:00 |
|
|
|
039a725c5c
|
WIP. removed qServer
|
2019-06-28 11:57:37 +02:00 |
|
|
|
9f61104f0d
|
WIP
|
2019-06-27 16:39:53 +02:00 |
|
|
|
06834617de
|
WIP
|
2019-06-27 11:54:17 +02:00 |
|
|
|
61b937e2e0
|
WIP. catching exceptions using macros to ignore socket and shm error
|
2019-06-25 17:27:30 +02:00 |
|
Erik Fröjdh
|
3bb0daeefb
|
moved libs (#36)
|
2019-06-25 11:20:31 +02:00 |
|
Erik Fröjdh
|
d3101baacb
|
receiver create path (#35)
|
2019-06-25 11:14:04 +02:00 |
|
|
|
bd3e439d87
|
Merge branch 'developer' into gui
|
2019-06-25 10:51:17 +02:00 |
|
|
|
136e00d15e
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-06-25 10:51:00 +02:00 |
|
|
|
7c18ad3c53
|
removed Critical and Noncritical exceptions
|
2019-06-25 10:50:52 +02:00 |
|
|
|
3db09bc0cd
|
Merge branch 'developer' into gui
|
2019-06-25 09:08:29 +02:00 |
|
|
|
33f5253831
|
QIP
|
2019-06-21 18:19:39 +02:00 |
|
Erik Frojdh
|
c466623e86
|
fix
|
2019-06-21 17:38:49 +02:00 |
|
Erik Frojdh
|
e80ce1b4c4
|
added -h --help option to display help
|
2019-06-21 17:27:47 +02:00 |
|
Erik Frojdh
|
2d3f5a03ca
|
syncclk for python
|
2019-06-19 17:31:49 +02:00 |
|
|
|
4b69c01357
|
ctb server: sync clk get added
|
2019-06-19 16:55:24 +02:00 |
|
|
|
f4bc255f2c
|
WIP
|
2019-06-19 15:01:57 +02:00 |
|
|
|
d2280b4414
|
WIP
|
2019-06-19 15:01:18 +02:00 |
|
Erik Fröjdh
|
6c33f7de7b
|
adding list command (#34)
|
2019-06-19 09:26:11 +02:00 |
|
|
|
332e83d43c
|
WIP, except qdrawplot
|
2019-06-18 18:06:27 +02:00 |
|
|
|
3f4dda9d33
|
WIP
|
2019-06-18 17:53:07 +02:00 |
|
|
|
e4190285be
|
WIP
|
2019-06-18 17:51:28 +02:00 |
|
Erik Frojdh
|
71f26b2831
|
removed mystring typedef
|
2019-06-18 17:41:26 +02:00 |
|
|
|
7b456cb9c6
|
WIP
|
2019-06-18 16:27:44 +02:00 |
|
|
|
0acf97cc9a
|
WIP
|
2019-06-18 16:24:59 +02:00 |
|
Erik Frojdh
|
17b08b6e53
|
removed MySocketTCP and old ServerInterface
|
2019-06-18 15:54:22 +02:00 |
|
|
|
976b460e70
|
WIP
|
2019-06-17 17:54:12 +02:00 |
|
|
|
b6bba0b7bc
|
Merge branch 'developer' into gui
|
2019-06-17 17:41:17 +02:00 |
|
|
|
5b8e4f6c72
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-06-17 17:29:05 +02:00 |
|
|
|
6e14a2efe2
|
ctb fix: reset pll reset also adc and dbit phase (fixed), also required adcs to be configured again(due to adc clock being stopped temporarily
|
2019-06-17 17:24:59 +02:00 |
|
|
|
f5b419c6d8
|
moench04 zmq data structure added
|
2019-06-17 17:24:20 +02:00 |
|
|
|
8c332e8ffd
|
Separated plot for digital and analog values; deserializer still to be tested
|
2019-06-17 17:08:23 +02:00 |
|
|
|
326b14737f
|
WIP
|
2019-06-17 15:51:17 +02:00 |
|
|
|
c96939cf94
|
neglible change
|
2019-06-17 11:45:56 +02:00 |
|
|
|
8dff4f4b03
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-06-14 16:44:06 +02:00 |
|
|
|
39be0770e3
|
ctb server fixed to have 180 adc output phase
|
2019-06-14 16:43:56 +02:00 |
|
|
|
4213a161fe
|
WIP
|
2019-06-14 16:38:42 +02:00 |
|
