63 Commits

Author SHA1 Message Date
cfd3680176 gotthard2 dacs 2019-10-08 17:10:36 +02:00
030cfacc9b WIP 2019-10-08 10:57:07 +02:00
Marie Andrä
5f94b5c246 Dac (#67)
* dac WIP

* dacs WIP

* DACs are working with names

* namechanges of vrfsh->vshaper, vrfshnpol->vshaperneg

* pattern for MY3, configure MAC for MY3
2019-10-07 12:13:25 +02:00
0f99dd141e gotthard 2 server test bus 2019-10-01 17:34:52 +02:00
Dhanya Thattil
ca054626e6
Removeudpcache (#65)
* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* solved eiger 1-10g issue

* some fixes for remove udp cache to work

* bug fix virtual

* removed special handling of rx_udpip
2019-09-30 14:46:25 +02:00
Marie Andrä
6e6fcec698 MY3.0:read and write Registers, frames, cycles, delay (#64)
* MY3.0:read and write Registers, frames, cycles, delay

* write pattern seems to work

* done all corrections. added default clks: run_clk=125MHz, tick_clk=20MHz (fix), sampling_clk=80MHz (from Carlos)

* clk check for aquistition time

* clk check for aquistition time

* Update slsDetectorServer_defs.h

* Update slsDetectorFunctionList.c
2019-09-30 14:36:33 +02:00
288b59d292 gotthard2 changes for first firmware version 2019-09-26 14:10:11 +02:00
Marie Andrä
4b987abf41 Niosmarie (#63)
* HV for Mythen3 server

* HV for mythen3 server

* corrected upstreams

* missing endif
2019-09-03 09:36:02 +02:00
Dhanya Thattil
5bcde789ac
Readoutflags (#61)
* WIP

* eiger binary back wih versioning

* fixed readout flag in ctbgui, added speedLevel enum

* ctbgui: fixed a print out error

* ctb readout bug fix

* WIP

* WIP

* WIP
2019-09-02 19:27:27 +02:00
02634abbbc gotthard2:virtual server fix, server recompile 2019-09-02 13:05:28 +02:00
bd95126da2 gotthard2:hv 2019-09-02 12:57:24 +02:00
4a112104ad gotthard2, removed .gdb, removed warnings 2019-08-30 18:08:16 +02:00
9bc6c44e51 hv for strip 2019-08-30 17:53:04 +02:00
8c15b52b87 nios 2019-08-30 17:28:18 +02:00
Dhanya Thattil
0d35b966ff
Separate headers (#57)
* WIP, ctb

* WIP, eiger

* WIP, gotthard

* WIP, jungfrau

* WIP, gotthard2

* WIP, mythen3

* WIP, moench

* fixed gotthard apiversioning mismatch with gotthard2
2019-08-30 11:17:37 +02:00
94013a7fad delay not implemented for mythen3 and gotthad2 2019-08-26 11:58:34 +02:00
aecf3bb7db gotthard udp fix 2019-08-26 11:47:28 +02:00
3497175b15 merge resovled 2019-08-26 10:55:44 +02:00
298e1dd1fe udp virtual of gotthard2 2019-08-26 10:54:01 +02:00
Marie Andrä
f981825172 virtual UDP for mythen3 (#55) 2019-08-26 10:53:17 +02:00
386b6601a8 initial version of gotthard2 2019-08-26 09:59:27 +02:00
4b7ab98135 initial functions for mythen3 2019-08-22 15:55:27 +02:00
72362b0334 first version of mythen3 2019-08-22 12:34:06 +02:00
28963e313b removed gotthard functions not used 2019-08-20 18:18:34 +02:00
51a3f3fd4d changed logger.h to clogger.h for c files 2019-08-20 08:48:12 +02:00
c6dddaba97 allowed virtual servers 2019-08-16 18:49:08 +02:00
a0bdfcdae3 WIP 2019-08-16 17:38:41 +02:00
947252c852 WIP 2019-08-16 09:45:49 +02:00
d4d8cbe9bc gotthard fixed roi only xmin and xmax.remove updateoffsets 2019-08-14 09:20:50 +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
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
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
0f2641f9fa WIP 2019-07-12 18:24:23 +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
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
b74ce95b24 removed colon in commands. affects dac, adc and extsig 2019-06-04 12:10:26 +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