f982a59a7c
minor
2019-08-09 18:02:12 +02:00
5a483eaf29
WIP, new eiger serveR
2019-08-09 11:11:29 +02:00
Dhanya Thattil
98ddf154b2
Partialreadout ( #47 )
...
* eiger server, rxr: partial readout, also gui messages: up last command, down clear command
* added binaries and resolved conflict
* bugfix eiger server: interrupt subframe is bit 2 and not bit number 3
* brackets in defs
2019-08-07 09:08:58 +02:00
Dhanya Thattil
d72b6c3659
eiger server: quad, interrupt subframe, reg left and right ( #45 )
...
* eiger server: quad, interrupt subframe, reg left and right
* eiger server: beb can fail in setting up quad, quad and gap pixels
2019-08-06 10:12:34 +02:00
facbc60907
jungfrau server: changes for old and new boards
2019-07-30 09:32:10 +02:00
c8d9503d5f
jungfrau server: flow control 10g fixed
2019-07-24 15:19:01 +02:00
b63ec9d84a
jungfrau server: updated get starting fnum and frames from start addresses
2019-07-23 15:47:00 +02:00
Dhanya Thattil
6e4e2c4524
Startingfnum ( #40 )
...
* starting fnum
* by default starting fnum disabled in gui
* insignificant change
* adding binary
* virtual eiger server working now
* test:: namespace
2019-07-23 14:15:08 +02:00
e3f151851c
bug fix: internal hv used ofst instead of msk, insignificant bug though, would have worked
2019-07-23 14:13:41 +02:00
Dhanya Thattil
e7a76ccea1
Quad ( #39 )
...
* making quad work in developer branch
* binary added
* minor changes
* bug fix to set quad to 0 when more than 1 detector
2019-07-22 16:41:03 +02:00
078a2e9e6a
jungfrau server: firmware version update for v2.0
2019-07-18 11:32:50 +02:00
8cdfe4194f
gui works, including clone plots
2019-07-17 16:58:04 +02:00
d3879bb834
WIP
2019-07-15 15:47:05 +02:00
4f5b8c17b2
WIP
2019-07-15 15:46:38 +02:00
0f2641f9fa
WIP
2019-07-12 18:24:23 +02:00
8ac7d96ef3
WIP
2019-07-05 08:54:50 +02:00
659e19a856
WIP
2019-07-02 17:59:21 +02:00
4c23c0290d
Merge branch 'developer' into gui
2019-07-02 17:50:51 +02:00
d2e4adf483
eiger server bug fix: get dacs conversion wrong
2019-07-02 17:50:39 +02:00
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
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
3db09bc0cd
Merge branch 'developer' into gui
2019-06-25 09:08:29 +02:00
4b69c01357
ctb server: sync clk get added
2019-06-19 16:55:24 +02:00
b6bba0b7bc
Merge branch 'developer' into gui
2019-06-17 17:41:17 +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
c96939cf94
neglible change
2019-06-17 11:45:56 +02:00
39be0770e3
ctb server fixed to have 180 adc output phase
2019-06-14 16:43:56 +02:00
862dc824ba
WIP
2019-06-05 11:27:19 +02:00
a6144f658e
ctb client and server bug fix: dac didnt compute indices correctly and set dac was not printing in server
2019-06-04 18:11:31 +02:00
3aea917175
updated binaries for the extsig api change
2019-06-04 12:18:06 +02:00
b74ce95b24
removed colon in commands. affects dac, adc and extsig
2019-06-04 12:10:26 +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
8c112efdb3
jungfrau bug fix: setting clkdivider also set adcphase: break inswitch
2019-05-28 14:14:08 +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
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
2c2fb7358c
jungfrau board 2 adc defines, full speed limitation for old boards
2019-05-27 15:04:13 +02:00
1a1c6b9b42
jungfrau server: feature finish: switching between 2 interfaces
2019-05-17 19:19:03 +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
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
741ee3b44c
ctb server bug fix: udp ip not reset before overwriting (smaller size creates problems)
2019-05-14 17:08:07 +02:00
0904d1db29
updated ctb binary
2019-05-03 20:46:08 +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
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