|
|
be50344b45
|
set clock divider, phase and get clock freq for gotthard2, priliminary
|
2019-10-17 16:39:41 +02:00 |
|
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 |
|
|
|
29a7e227a3
|
merge
|
2019-10-08 17:17:44 +02:00 |
|
|
|
cfd3680176
|
gotthard2 dacs
|
2019-10-08 17:10:36 +02:00 |
|
Erik Frojdh
|
87aa5099f2
|
eiger python
|
2019-10-08 12:15:57 +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 |
|
Erik Frojdh
|
1b06edac9b
|
FixedCapacityContainer fix for clang
|
2019-10-04 16:54:53 +02:00 |
|
Erik Frojdh
|
da630a8e05
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-10-01 17:29:47 +02:00 |
|
Erik Frojdh
|
cfb017f66a
|
fixed order
|
2019-10-01 17:29:36 +02:00 |
|
|
|
b3ff825ce8
|
updated gotthard2 api etc
|
2019-10-01 16:26:42 +02:00 |
|
Erik Frojdh
|
c6fd13e49c
|
removed default case
|
2019-10-01 14:54:57 +02:00 |
|
Erik Frojdh
|
5de5884341
|
pass by reference
|
2019-10-01 14:31:00 +02:00 |
|
Erik Frojdh
|
b4f3c0586f
|
string to detector type
|
2019-10-01 13:56:35 +02:00 |
|
Erik Frojdh
|
aaade64e0b
|
ToString of runStatus
|
2019-10-01 12:34:03 +02:00 |
|
Erik Frojdh
|
ffa9bbe8d2
|
fix for string to string conversion
|
2019-10-01 12:18:06 +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 |
|
Erik Frojdh
|
032b4117dd
|
auto generate py enums
|
2019-09-20 15:28:14 +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 |
|
|
|
3b2feba3b2
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-08-26 09:59:52 +02:00 |
|
|
|
386b6601a8
|
initial version of gotthard2
|
2019-08-26 09:59:27 +02:00 |
|
Erik Frojdh
|
e89b65002a
|
minor
|
2019-08-23 15:11:57 +02:00 |
|
Erik Frojdh
|
5866e330c1
|
fixed test
|
2019-08-23 14:43:58 +02:00 |
|
Erik Fröjdh
|
5c06549982
|
Cleanup of the CmdProxy and migrated some commands (#52)
* migrated rx_fifodepth
* Moved and cleand CmdProxy
* rx_slient
* new commands
* examples
* fixed result string print
|
2019-08-23 14:32:44 +02:00 |
|
Erik Frojdh
|
57ac5c0dab
|
moved CmdLineParser to sls::
|
2019-08-23 10:42:35 +02:00 |
|
|
|
170db19f48
|
initial functions for mythen3
|
2019-08-22 15:58:32 +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 |
|
|
|
794b6f8090
|
added detector type
|
2019-08-22 10:58:03 +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 |
|
|
|
5c393e6204
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-08-21 13:23:38 +02:00 |
|
Erik Fröjdh
|
b4c207fc4e
|
Less data race in slsReceiver (#50)
* removed some data races
* non needed mutex
* removed extra include
|
2019-08-21 12:02:06 +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 |
|
