5120 Commits

Author SHA1 Message Date
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
Erik Fröjdh
c1435ea94f
Renamed receiver commands to rx_ (#32)
* renamed receiver commands to rx_

* WIP

* more commands

* check

* overwrite

* foverwrite
2019-06-13 15:29:05 +02:00
ca9fca88c4 Merge branch 'developer' into gui 2019-06-13 09:37:54 +02:00
359970dfc2 bug fix from 4.0.2: powerchip multi should have delays, burst trigger added to users 2019-06-13 09:37:44 +02:00
5d2567005d WIP 2019-06-12 14:40:04 +02:00
e6361c73fc WIP 2019-06-12 11:24:05 +02:00
Erik Frojdh
55229f77a3 python 2019-06-12 10:41:50 +02:00
afb6d6bf3a WIP 2019-06-12 10:40:56 +02:00
b922b79232 WIP 2019-06-11 16:36:02 +02:00
3c1df02414 merge resolved 2019-06-11 15:56:13 +02:00
d3467432a9 WIP 2019-06-11 15:43:24 +02:00
cb2c39c62f WIP 2019-06-11 15:38:04 +02:00
111c48e3fa WIP 2019-06-11 11:29:45 +02:00
d2d25cdd69 WIP 2019-06-11 11:19:07 +02:00
1bab010d0b WIP 2019-06-11 10:15:40 +02:00
f0872174cf WIP 2019-06-07 18:53:57 +02:00
Erik Frojdh
1fed3553b9 cleaning up tcp 2019-06-07 16:13:34 +02:00
ca5a0b4cc8 WIP Settings 2019-06-07 10:58:47 +02:00
48dd0fb084 WIP 2019-06-06 18:41:31 +02:00
Erik Frojdh
893805e6fd Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-06-06 18:17:12 +02:00
Erik Frojdh
170aca0e1f zmqip now uint 2019-06-06 18:17:04 +02:00
Gemma Tinti
0c6304bdf8 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-06-06 17:53:52 +02:00
Gemma Tinti
2eaf7edd46 manual 2019-06-06 17:53:45 +02:00
Erik Frojdh
c86a1e7d48 WIP 2019-06-06 17:00:05 +02:00
bb760f3210 WIP datatoutput 2019-06-06 15:04:05 +02:00
Erik Frojdh
fc5306f7cc Merge branch 'sockettest' into developer 2019-06-06 10:37:11 +02:00
Erik Frojdh
3cfeb74529 minor 2019-06-06 10:36:40 +02:00
Erik Frojdh
5944957977 cleaning up socket 2019-06-06 10:34:57 +02:00
Erik Frojdh
7a11c6c986 hash 2019-06-06 08:51:46 +02:00
Erik Frojdh
2c7d78ff56 include 2019-06-06 08:46:11 +02:00
Erik Frojdh
c4ea181811 test 2019-06-06 08:41:50 +02:00
Erik Frojdh
45dc48721e server 2019-06-06 08:41:19 +02:00
Erik Frojdh
72e0d7e168 clang format on receiver TCP and Implementation 2019-06-06 08:07:40 +02:00
e4546c6121 WIP 2019-06-05 17:54:56 +02:00
Erik Frojdh
e46f3f9a2c WIP 2019-06-05 17:45:02 +02:00
Erik Frojdh
6c64bdb04a fixing tests for gcc 4.8 2019-06-05 17:40:48 +02:00