|
|
0eec57f8a2
|
Corrected ctb Makefiles to work with bad bashrc
|
2019-05-29 16:44:02 +02:00 |
|
|
|
4a112d7889
|
Added deserializer and moench04 map to ctbGui
|
2019-05-29 15:48:22 +02:00 |
|
|
|
c90a7b0e8a
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-05-29 11:39:14 +02:00 |
|
|
|
25541b37f6
|
added patternGenerator and slsDteectorCalibration directory in order to compile the ctbGui
|
2019-05-29 11:38:43 +02:00 |
|
Erik Frojdh
|
d935e78763
|
clang-format
|
2019-05-28 18:15:43 +02:00 |
|
Erik Frojdh
|
0f869e1215
|
fixed acquire not working
|
2019-05-28 18:15:15 +02:00 |
|
Erik Fröjdh
|
788ad8d3b6
|
Command proxy (#25)
* added cmd proxy
* minor
* minor
* WIP
* clean up
* added comment
|
2019-05-28 18:01:26 +02:00 |
|
|
|
a008c2b2c8
|
added ctbGui
|
2019-05-28 17:15:59 +02:00 |
|
Erik Frojdh
|
85d4dfc7c8
|
Merge branch 'socket' into developer
|
2019-05-28 17:11:29 +02:00 |
|
Erik Frojdh
|
aa2bcfa308
|
fixed setup udp
|
2019-05-28 17:07:34 +02:00 |
|
|
|
f7aedf7711
|
client bug fix: typo in command line, get returned rx_udpip instead of rx_udpip2, same with mac
jungfrau_draft_2.0
|
2019-05-28 16:56:15 +02:00 |
|
Erik Frojdh
|
7a9dbd8b76
|
WIP
|
2019-05-28 15:43:20 +02:00 |
|
Erik Frojdh
|
daa82b91a9
|
removed comment
|
2019-05-28 14:44:46 +02:00 |
|
|
|
8c112efdb3
|
jungfrau bug fix: setting clkdivider also set adcphase: break inswitch
|
2019-05-28 14:14:08 +02:00 |
|
Erik Frojdh
|
8f4009bfb6
|
WIP
|
2019-05-28 13:27:43 +02:00 |
|
Erik Frojdh
|
e64f57ecac
|
receiver
|
2019-05-28 13:12:43 +02:00 |
|
|
|
938e1e87ff
|
bugfix: vref adc voltage
|
2019-05-28 12:31:19 +02:00 |
|
|
|
82308daf7b
|
jungfrau server bug fix: vref adc voltage overwritten by default for ctb
|
2019-05-28 12:28:44 +02:00 |
|
Erik Frojdh
|
57170b1c80
|
pinned conda build
|
2019-05-28 12:12:05 +02:00 |
|
Erik Frojdh
|
6a81e779c1
|
replaced server with receiver bug
|
2019-05-28 11:35:41 +02:00 |
|
|
|
aa99309caf
|
Merge branch 'jungfrau2.0' into developer
|
2019-05-28 10:32:01 +02:00 |
|
|
|
a0f697ce71
|
jungfrau feature change: outer is default and connects to bottom, inner is secondary but connects to top
|
2019-05-28 10:31:36 +02:00 |
|
Erik Frojdh
|
14dd753397
|
updated build nr
|
2019-05-27 16:59:42 +02:00 |
|
|
|
7e43472b7b
|
minor help editing
|
2019-05-27 16:29:56 +02:00 |
|
Erik Frojdh
|
ac7c85029c
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-05-27 16:22:04 +02:00 |
|
Erik Frojdh
|
639ea0eb56
|
Merge branch 'condabuild' into developer
|
2019-05-27 16:11:57 +02:00 |
|
|
|
659e204b35
|
solved conflicts
|
2019-05-27 15:05:40 +02:00 |
|
|
|
2c2fb7358c
|
jungfrau board 2 adc defines, full speed limitation for old boards
|
2019-05-27 15:04:13 +02:00 |
|
Erik Frojdh
|
d3646f0ac5
|
pinned conda-build version
|
2019-05-27 14:33:17 +02:00 |
|
Erik Frojdh
|
e4367c9ab1
|
checking for nullptr
|
2019-05-27 14:20:40 +02:00 |
|
Dhanya Thattil
|
54a396065d
|
ctb versioning bug fix
|
2019-05-27 14:08:41 +02:00 |
|
|
|
7fdab08256
|
ctb receiver fix: extract in 8 bit batches instead of 32 for less padding
|
2019-05-27 11:30:54 +02:00 |
|
Erik Frojdh
|
8ebc0f2644
|
uniqe ptr for receiver
|
2019-05-27 11:28:59 +02:00 |
|
Erik Frojdh
|
0972b803dd
|
Merge branch 'developer' into mysocket
|
2019-05-27 09:12:10 +02:00 |
|
Erik Frojdh
|
e2ef043e04
|
removed old configure file
|
2019-05-24 16:31:25 +02:00 |
|
Erik Frojdh
|
43dc9df6db
|
removed unused scripts
|
2019-05-24 10:25:34 +02:00 |
|
|
|
10f89599e0
|
bug fix: hdf5 printError still called once. replcaed with printErrorStack
|
2019-05-22 19:11:35 +02:00 |
|
Erik Frojdh
|
452fd1e457
|
new defaults for CMake
|
2019-05-22 09:45:08 +02:00 |
|
|
|
7b817fa194
|
Merge branch 'developer' into jungfrauv0.8
|
2019-05-17 19:21:01 +02:00 |
|
|
|
1a1c6b9b42
|
jungfrau server: feature finish: switching between 2 interfaces
|
2019-05-17 19:19:03 +02:00 |
|
Erik Frojdh
|
3e5d34647e
|
updated test for argument parser
|
2019-05-17 10:00:49 +02:00 |
|
Erik Frojdh
|
591ff53b84
|
fixed MacAddr 0 output
|
2019-05-17 09:08:13 +02:00 |
|
Erik Frojdh
|
fff79fbbb6
|
const char* for command
|
2019-05-16 16:58:03 +02:00 |
|
Erik Frojdh
|
a11fc31c49
|
merge
|
2019-05-16 15:18:14 +02:00 |
|
Erik Frojdh
|
415567006f
|
non used header
|
2019-05-16 15:16:11 +02:00 |
|
|
|
1943e77b24
|
server interface: ip made to use inet_ntop, mac address and ip to string made common
|
2019-05-16 15:12:42 +02:00 |
|
Erik Frojdh
|
e6ad80e187
|
removed cout
|
2019-05-16 15:10:24 +02:00 |
|
Erik Frojdh
|
c30c6bb883
|
fixed uninitialized pointer
|
2019-05-16 15:00:15 +02:00 |
|
Erik Frojdh
|
615d1b1f33
|
refactor
|
2019-05-16 14:27:16 +02:00 |
|
|
|
9315768159
|
client bug fix: smaller ips convert to hex
|
2019-05-16 14:07:58 +02:00 |
|
