82 Commits

Author SHA1 Message Date
Marie Andrä
9b4fc02b0e start/stop statemachine for my3 (#68)
* start/stop statemachine for my3

* runStatus, readFrame, runBusy (use CONTROL_REG) for mythen3

* registers for Pavel

* change dac names Mythen3
2019-10-09 13:52:07 +02:00
b109ea8d7d jungfrau vref_prech, dac enum similar to mainenum 2019-10-08 18:00:22 +02:00
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
b3ff825ce8 updated gotthard2 api etc 2019-10-01 16:26:42 +02:00
2a40c7f48e recompiled all servers 2019-09-30 14:54:31 +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
8a4a6c7004 hvdac location change 2019-09-27 16:17:01 +02:00
288b59d292 gotthard2 changes for first firmware version 2019-09-26 14:10:11 +02:00
21ce0055b2 gotthard2: soft limit to list 2019-09-03 09:41:54 +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
40b62ef5a4 recompiled binaries 2019-09-02 19:31:36 +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
bd95126da2 gotthard2:hv 2019-09-02 12:57:24 +02:00
9e7a133422 gotthard2: nios server 2019-08-30 16:44:11 +02:00
cb8c7eea54 updated binaries 2019-08-30 11:26:23 +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
Dhanya Thattil
aafe049a9b
Guidetector (#54)
* WIP

* dacWidget

* main WIP

* advanced WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* works

* updated gui to chrono

* review fixes

* unitque ptrs in gui
2019-08-26 19:14:22 +02:00
298e1dd1fe udp virtual of gotthard2 2019-08-26 10:54:01 +02:00
386b6601a8 initial version of gotthard2 2019-08-26 09:59:27 +02:00
170db19f48 initial functions for mythen3 2019-08-22 15:58:32 +02:00
72362b0334 first version of mythen3 2019-08-22 12:34:06 +02:00
3d78b7b6a7 updated al the binaries 2019-08-21 17:10:20 +02:00
a98271f0c2 merge resolved 2019-08-21 14:25:21 +02:00
0daada9266 version 2019-08-21 11:15:10 +02:00
422a928be4 ctb rxr: changing to old header (like moench) 2019-08-21 11:13:17 +02:00
156ce0df00 ctb fix:fifo print between frames, pattern length change 2019-08-21 11:09:41 +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
29c788b9f7 WIP 2019-08-19 21:28:53 +02:00
0f37481972 WIP 2019-08-19 21:17:52 +02:00
0d787788ea WIP ctb 2019-08-19 21:14:45 +02:00
498a8bda9f WIP 2019-08-19 21:09:44 +02:00
Erik Fröjdh
3e874a3650 removed symlinks in jf server (#49) 2019-08-19 20:40:50 +02:00
c6dddaba97 allowed virtual servers 2019-08-16 18:49:08 +02:00
a0bdfcdae3 WIP 2019-08-16 17:38:41 +02:00
10ce82fc5f WIP 2019-08-16 17:07:30 +02:00
b59d69325e updated minor 10g ctb 2019-08-16 15:35:23 +02:00
d4d8cbe9bc gotthard fixed roi only xmin and xmax.remove updateoffsets 2019-08-14 09:20:50 +02:00
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
61b40d89c7 updated client api versioning 2019-07-23 11:56:02 +02:00