b74ce95b24
removed colon in commands. affects dac, adc and extsig
2019-06-04 12:10:26 +02:00
1a2e252665
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2019-06-04 08:48:58 +02:00
7a9745e2da
fixed typo in command, bsamples to dsamples
2019-06-03 18:14:23 +02:00
e8296da064
enableall ADC fixed
2019-06-03 18:01:57 +02:00
b7d81b1e87
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2019-06-03 17:42:57 +02:00
3baa4b8ab1
trying to fix ctbGui bugs
2019-06-03 17:42:43 +02:00
17f745b45d
ctb server: simulator effects, increased fpga reset time from 1 to 2 seconds
2019-06-03 17:22:59 +02:00
Dhanya Thattil
29141ac1a6
set starting frame number of next acquisition for both jungfrau and e… ( #27 )
...
* set starting frame number of next acquisition for both jungfrau and eiger. firmware has not implemented a get, so workaround. tests included. frame number 0 not allowed due to Eiger. Eiger max frame is 48 bit, while jungfrau is 64 bit
* made argument of setstartingframenumber const
2019-06-03 11:07:53 +02:00
Dhanya Thattil
894cc1c9e0
Simulator ( #28 )
...
* WIP
* wip
* wip
* removed loop
* sending 1 frame
* send multiple frames
* c11 for server
* WIP
* WIP
* Add CMake for the simulators. Requires some refactoring to make slsDetectorServer a proper library.
* Working cmake for jungfrau
* Working cmake for eiger
* WIP
* WIP
* Add preliminary working eiger simulator and breaks the jungfrau simulator
* virtual servers connected
* changes to make it work for rhel7 and install binaries in bin
* removed some unnecessary prints
* removed binaries and virtual makefiles
2019-06-03 10:16:54 +02:00
073d06f143
removed unnecessary print that might have been used for debugging
2019-06-03 08:59:54 +02:00
Erik Fröjdh
4b1a9bea32
Integration tests for the command line ( #26 )
...
* WIP
* first test
* format
* test frames
* also 0:
2019-05-31 14:40:45 +02:00
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
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
