Erik Frojdh
|
58050f72da
|
moved headers
|
2019-11-25 11:58:45 +01:00 |
|
Erik Frojdh
|
eae1fb6609
|
WIP
|
2019-11-25 11:42:21 +01:00 |
|
Erik Frojdh
|
5b5e0f109b
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-11-25 11:20:33 +01:00 |
|
Erik Frojdh
|
f2e69fb5a3
|
WIP
|
2019-11-25 11:20:24 +01:00 |
|
|
|
adf6a4c471
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-11-25 10:54:39 +01:00 |
|
|
|
94382c1ece
|
m3 and g2: while setting clock freq, change phase only if there is a change in phase (removing more printouts, will still only set if needed )
|
2019-11-25 10:54:30 +01:00 |
|
Erik Frojdh
|
28f1f6c1cd
|
more tests
|
2019-11-24 17:48:08 +01:00 |
|
|
|
a95ab1e13e
|
servers: default compile not update versionign
|
2019-11-22 17:23:07 +01:00 |
|
|
|
5e9d70948b
|
Merge branch 'userid' into developer
|
2019-11-22 17:03:17 +01:00 |
|
|
|
b0073597f7
|
rxr: effective userid option in rxr
|
2019-11-22 17:03:08 +01:00 |
|
|
|
c4675da0c3
|
m3: reset fixed
|
2019-11-22 16:40:43 +01:00 |
|
|
|
ba008db29a
|
m3 ang g2: reset not yet imple
|
2019-11-22 11:54:45 +01:00 |
|
|
|
950096daf9
|
m3 ang g2: reset not yet imple
|
2019-11-22 11:54:30 +01:00 |
|
|
|
d07873ee39
|
mythen3 and gotthard2: wait request not needed, reset to be implemented
|
2019-11-22 11:29:24 +01:00 |
|
|
|
f8df11886a
|
ctb: change in phase done in degrees (phase reset due to change in frequency)
|
2019-11-21 15:08:38 +01:00 |
|
|
|
d976c9fcf9
|
gotthard2: phase direction like mythen3
|
2019-11-21 14:41:54 +01:00 |
|
|
|
c4ae32b216
|
mythen3: setting clk frequecy and phase shifts work
|
2019-11-21 14:36:37 +01:00 |
|
|
|
c689b8b954
|
Merge branch 'developer' into rxr
|
2019-11-21 13:51:19 +01:00 |
|
|
|
fea94b15d5
|
mythen3:forgot binary
|
2019-11-21 13:48:39 +01:00 |
|
|
|
955bc74a91
|
mythen3: change vco freq to 1.25GHz
|
2019-11-21 13:38:54 +01:00 |
|
|
|
8727a93e3e
|
WIP
|
2019-11-21 12:35:07 +01:00 |
|
|
|
83221ee955
|
Rxr: rearrangng in implementation
|
2019-11-21 12:23:32 +01:00 |
|
|
|
398f3734ec
|
rxr: missing packets, stopacquistion lets rxr know to calculate missing packets from last frame caught
|
2019-11-20 16:16:14 +01:00 |
|
|
|
f96f716f39
|
rxr: stop printing forever about weird carry flag frame
|
2019-11-20 12:13:35 +01:00 |
|
|
|
781e8fc67f
|
mythen3: workaround for busy signal
|
2019-11-20 11:57:14 +01:00 |
|
|
|
66e9b80995
|
gui: discard bits loop only when discard bits enabled
|
2019-11-20 10:58:32 +01:00 |
|
|
|
7bde337d58
|
minor: changed interrupted acq help (clearbusy), gui look in mythen3 developer tab
|
2019-11-19 18:19:54 +01:00 |
|
|
|
1cea6af590
|
mythen3, gotthard2: change phase, change freq bugfix
|
2019-11-19 17:57:28 +01:00 |
|
|
|
1539326fda
|
mythen3 gui: discard bits option for debugging
|
2019-11-18 18:33:16 +01:00 |
|
|
|
dfc886a65b
|
mythen3 gui
|
2019-11-18 17:57:19 +01:00 |
|
|
|
c4e7086d99
|
rxr: renamed files, removed unnecessary comments
|
2019-11-18 16:19:46 +01:00 |
|
|
|
5ce79ec9fa
|
WIP
|
2019-11-18 15:20:58 +01:00 |
|
|
|
dc78e23449
|
rxr: removed slsReceiverUsers, start() and stop()
|
2019-11-18 15:16:20 +01:00 |
|
|
|
f2c0ff7f98
|
rxr: removed char array memebers in rxrimplementation
|
2019-11-18 14:29:01 +01:00 |
|
|
|
32cf46a8a3
|
moved cmdlineparser.h to includes, Paralel calls edited to throw exception if no detector added
|
2019-11-18 11:00:25 +01:00 |
|
Erik Fröjdh
|
fa2c842745
|
New command line app and removing slsDetectorCommand (#69)
* WIP
* WIP
* WIP
* WIP
* config2 working
* removed slsDetectorCommand
* WIP
* added test file
* more tests
|
2019-11-18 09:29:17 +01:00 |
|
|
|
6a27207875
|
gotthard2: vetoref, burstmode
|
2019-11-15 18:59:27 +01:00 |
|
|
|
a62d6a2fb8
|
gotthard2: veto reference, better code for byte aligment in server
|
2019-11-15 11:58:23 +01:00 |
|
|
|
5518531620
|
gotthard2: veto reference
|
2019-11-14 19:01:10 +01:00 |
|
|
|
fd631ebb71
|
tests fixed for inj_ch
|
2019-11-13 16:54:20 +01:00 |
|
|
|
21d23be522
|
gotthard2: inejct channel done
|
2019-11-13 16:49:35 +01:00 |
|
|
|
28a5aa8342
|
injectchannel WIP
|
2019-11-13 15:11:11 +01:00 |
|
|
|
5ee3f5cf4c
|
rxr bug fix: if no rxr, shm variables should remember so that there is no order to rxr commands in config file
|
2019-11-13 13:56:09 +01:00 |
|
|
|
72ac2745ea
|
gotthard2: server fix enum for onchip dac
|
2019-11-12 12:11:52 +01:00 |
|
|
|
206041989f
|
mythen3, reading dr back fix
|
2019-11-11 18:33:59 +01:00 |
|
|
|
2fff9f5bfe
|
merge
|
2019-11-11 18:03:13 +01:00 |
|
|
|
90c34e4942
|
gotthard2, dacs and onchip dacs from config file
|
2019-11-11 18:02:08 +01:00 |
|
|
|
bb26b993ea
|
servers, firmware check message to init message, minor
|
2019-11-11 12:00:04 +01:00 |
|
Marie Andrae
|
d7ad995dd1
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2019-11-11 11:40:27 +01:00 |
|
Marie Andrae
|
f53d260202
|
mythen3: change vph and vpl
|
2019-11-11 11:40:06 +01:00 |
|
