4784 Commits

Author SHA1 Message Date
Erik Fröjdh
f1a1391866 Factored out time conversion (#23)
* time conversion

* with comment

* lround in slsDetectorCommand
2019-05-15 10:22:38 +02:00
Erik Fröjdh
877bdb8979 Using FixedCapacityContainer for rxDbitList (#22)
* fixed capacity container

* changed shm date
2019-05-15 09:16:18 +02:00
Erik Frojdh
bf0847e967 removed ClientInterface 2019-05-15 08:38:49 +02:00
97dd329a7b client: zmqip bug fix (typo with strlen) 2019-05-14 18:57:39 +02:00
6847175743 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-05-14 18:38:42 +02:00
f90d8c6aff ctb server: added adcvpp option to get and in mv 2019-05-14 18:38:30 +02:00
45ae8a41ab updating eiger server 2019-05-14 17:43:34 +02:00
Erik Frojdh
24fc5de58d clang-tidy header include order 2019-05-14 17:34:51 +02:00
Erik Frojdh
7314c52c63 removed unneccecary includes 2019-05-14 17:32:21 +02:00
Erik Frojdh
bc4d0452af removed unused error_defs.h 2019-05-14 17:25:43 +02:00
Erik Frojdh
97692ae3ab moved from c headers 2019-05-14 17:17:21 +02:00
Erik Frojdh
55f482f915 clang-tidy nullptr 2019-05-14 17:11:27 +02:00
Erik Frojdh
74d67261a9 no check for null when deleting 2019-05-14 17:09:24 +02:00
741ee3b44c ctb server bug fix: udp ip not reset before overwriting (smaller size creates problems) 2019-05-14 17:08:07 +02:00
Erik Frojdh
29be6f3b34 no check for null when deleting 2019-05-14 17:07:56 +02:00
Erik Frojdh
81e858ea4d clang-tidy implicit bool 2019-05-14 17:05:27 +02:00
Erik Frojdh
0f8d099196 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-05-14 16:53:59 +02:00
Erik Frojdh
ab5aa78b8a clang-tidy modernize 2019-05-14 16:53:50 +02:00
3f6736ad23 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-05-14 16:44:09 +02:00
3e654977ca slsReceiver bug fix in ctb extracting digital bits 2019-05-14 16:41:25 +02:00
Erik Frojdh
1029ce9705 minor 2019-05-14 14:53:59 +02:00
d114f8db90 receiver bug fix: ctb extractng bits source pointer bug 2019-05-14 11:43:45 +02:00
Erik Frojdh
9fd2866fc0 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-05-14 11:41:50 +02:00
Erik Frojdh
aff6e30b65 short sleep in socket test 2019-05-14 11:41:39 +02:00
Erik Fröjdh
0224dccd2e Added noexcept and constexpr (#21)
* noexcept and constexpr

* check size
2019-05-14 11:08:25 +02:00
Erik Frojdh
fbada2e81a commented qwt for now 2019-05-14 10:13:24 +02:00
Erik Fröjdh
40d88002c0
Merge pull request #20 from slsdetectorgroup/fix-conda-install-instructions
Fix typo in conda install instructions
2019-05-13 15:31:24 +02:00
Samuel Debionne
3a8c7c6e2a Fix typo in conda install instructions 2019-05-13 10:58:54 +02:00
Erik Fröjdh
2a1c89f712 Fixed container (#19)
* added FixedCapacityContainer

* added empty to FixedCapacityContainer

* removed commented out section

* added FixedCapacityContainer to public headers
2019-05-08 12:34:45 +02:00
Erik Fröjdh
0e0e7ea81f
Merge pull request #18 from slsdetectorgroup/rxctb
Rxctb
2019-05-07 12:51:43 +02:00
df938c2535 review: removing size in sendtoDetector 2019-05-07 09:47:53 +02:00
932e377765 review fdback: using sendtoReceiver, not using size of for specifyng arguments to sendtodetector 2019-05-06 19:13:31 +02:00
0904d1db29 updated ctb binary 2019-05-03 20:46:08 +02:00
20720bc073 Merge branch 'developer' into rxctb 2019-05-03 20:38:32 +02:00
e14519c236 slsReceiver: removed special receiver config, added rx_dbitlist, rx_dbitoffset to put bits together in file, connected adcinvert, extsamplingsrc and extsampling properly to the detector, added tests 2019-05-03 20:37:40 +02:00
Erik Frojdh
e2f08da3e6 Merge branch 'tidywarning' into developer 2019-05-03 16:14:07 +02:00
Erik Frojdh
181ac4f509 small renaming 2019-05-03 16:13:32 +02:00
Gemma Tinti
a0f5224d09 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-05-03 15:27:20 +02:00
Gemma Tinti
6a0d44e358 rate capability plots 2019-05-03 15:27:11 +02:00
Erik Fröjdh
1094d5d30c Build doxygen documentation by cmake (#17)
* added cmake command to make doxygen docs

* added back doxyfile for users
2019-05-03 14:58:15 +02:00
Erik Frojdh
9231dff626 clang tidy implicit bool 2019-05-03 14:49:47 +02:00
Erik Frojdh
92b447c83a minor fixes 2019-05-03 14:39:22 +02:00
Erik Frojdh
aaa7576f7d clang-tidy 2019-05-03 14:15:13 +02:00
Gemma Tinti
96d7345124 delays in manual 2019-05-03 13:45:06 +02:00
Erik Frojdh
4f13b29c7f fixed copyserver bug 2019-05-02 18:18:49 +02:00
Erik Frojdh
a55ae38874 changed to matching names 2019-05-02 18:11:36 +02:00
7683b18fa3 ensuring only analog is not in callback 2019-05-01 20:18:46 +02:00
71dd43d252 connected analog databytes 2019-05-01 12:25:21 +02:00
fc7d3bcaea ctb callback used 2019-05-01 12:10:15 +02:00
2f3b0e0b06 ctb:separated analog and digital samples in server and send analog and digital data packed separately per frame to reciever 2019-04-30 18:55:32 +02:00