Erik Frojdh
|
c284b24397
|
operator<< test
|
2019-04-03 20:05:29 +02:00 |
|
Erik Frojdh
|
7256a1e422
|
added test
|
2019-04-03 19:59:37 +02:00 |
|
Erik Frojdh
|
69a11f8950
|
cleaning up
|
2019-04-03 18:41:21 +02:00 |
|
Erik Frojdh
|
0270e18882
|
new tests
|
2019-04-03 18:11:48 +02:00 |
|
Erik Frojdh
|
697c020a49
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-04-03 16:17:16 +02:00 |
|
Erik Frojdh
|
90b257a74d
|
warnings
|
2019-04-03 16:17:09 +02:00 |
|
|
|
bb025adc09
|
cmake3 in cmk.sh and removed warnings
|
2019-04-03 16:03:19 +02:00 |
|
Erik Frojdh
|
1558ca2bb5
|
version check of compiler
|
2019-04-03 15:21:11 +02:00 |
|
Erik Frojdh
|
a7ab8aa9e6
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-04-03 14:48:04 +02:00 |
|
Erik Frojdh
|
3b4d36c3d4
|
bumped cmake to 3.5
|
2019-04-03 14:47:58 +02:00 |
|
|
|
59a0f5fac9
|
Merge branch 'address' into refactor, including minor change in formal argument name
|
2019-04-03 14:22:10 +02:00 |
|
|
|
bbfb5df30d
|
conflict resolved, changed to using hex() instead of str() in configuremac
|
2019-04-03 14:11:01 +02:00 |
|
|
|
09f1a8956e
|
ignore .vscode
|
2019-04-03 10:22:00 +02:00 |
|
Erik Frojdh
|
d6c0f7be05
|
constexpr
|
2019-04-02 17:59:59 +02:00 |
|
|
|
11d7ebd298
|
Merge branch 'program2' into refactor
|
2019-04-02 17:29:56 +02:00 |
|
|
|
d9ea8e6747
|
Merge branch 'refactor' into program2
|
2019-04-02 17:29:00 +02:00 |
|
|
|
5131245f0a
|
all servers except eiger: easier to update firmware and software using update or copydetectorserver, rebootcontroller, and programfpga
|
2019-04-02 17:27:01 +02:00 |
|
Erik Frojdh
|
6fc388bf78
|
reset to info
|
2019-04-02 17:15:21 +02:00 |
|
Erik Frojdh
|
24f28f14f4
|
clean up
|
2019-04-02 17:00:00 +02:00 |
|
Erik Frojdh
|
45fd35b243
|
Merge branch 'refactor' into address
|
2019-04-02 15:44:57 +02:00 |
|
Erik Frojdh
|
11a452545c
|
added parallel call for void return
|
2019-04-02 15:44:19 +02:00 |
|
Erik Frojdh
|
b198b50377
|
class for Ip and Mac
|
2019-04-02 15:24:25 +02:00 |
|
Erik Frojdh
|
df2d67d90d
|
classes for ip and mac addr
|
2019-04-02 11:56:33 +02:00 |
|
Erik Frojdh
|
73ad238028
|
removed missed cout
|
2019-04-01 13:15:38 +02:00 |
|
Erik Frojdh
|
959d9aa5d1
|
cleaning and new functions
|
2019-04-01 10:36:47 +02:00 |
|
|
|
45b837b42a
|
program fpga printouts for errors
|
2019-04-01 10:22:50 +02:00 |
|
|
|
969551ae37
|
program fpga made parallel
|
2019-03-29 17:59:06 +01:00 |
|
Erik Frojdh
|
05709e2f47
|
finished
|
2019-03-29 16:29:00 +01:00 |
|
Erik Frojdh
|
1fce125d47
|
Merge branch 'refactor' into address
|
2019-03-29 10:18:15 +01:00 |
|
Erik Frojdh
|
d134e54810
|
ip
|
2019-03-29 10:18:10 +01:00 |
|
Erik Frojdh
|
ed9dc3b386
|
fixed bug not clearing socket descriptor
|
2019-03-29 10:14:07 +01:00 |
|
Erik Frojdh
|
990848554c
|
midpoint
|
2019-03-28 16:16:41 +01:00 |
|
Erik Frojdh
|
78fcb7eb98
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-03-28 15:48:34 +01:00 |
|
Erik Frojdh
|
94c4e4c352
|
new constuctor
|
2019-03-28 15:48:26 +01:00 |
|
|
|
3e23a38fc8
|
moench server: sync increases when other clocks do
|
2019-03-28 15:24:47 +01:00 |
|
|
|
37b80bcc0d
|
ctb server: pll reset to keep the phase after setting clock
|
2019-03-28 15:22:13 +01:00 |
|
|
|
fc0306564c
|
ctb server: sync is min clock and must go higher when the others do
|
2019-03-28 14:22:40 +01:00 |
|
|
|
c38bebd615
|
jungfrau server: added deg and maxadcphaseshift, ctb & moench server: set adc phase like jungfrau that positive shift is positive, moved conversion between shift to degrees to the common function. receiver: removed unused variables
|
2019-03-28 09:35:53 +01:00 |
|
|
|
5a4122ae7c
|
ctb & moench server: reset phase when changing clock
|
2019-03-27 15:48:55 +01:00 |
|
|
|
2ccd03a3b0
|
added eiger binary
|
2019-03-27 12:26:10 +01:00 |
|
|
|
c7c52c63cd
|
ctb & moench: phase fix for absolute within limits, option to set as degrees and get max phase shift, bug fix for eiger with implementation of 2 udp interface
|
2019-03-27 12:25:38 +01:00 |
|
|
|
c7ad548e4c
|
conflict git fix
|
2019-03-26 15:01:58 +01:00 |
|
|
|
7cd5bc8b2d
|
jungfrau: switching between 2 and 1 interface, implementation for server required when firmware done
|
2019-03-26 15:00:19 +01:00 |
|
|
|
8c2ee57591
|
ctb/moench server: clock fix, max shifts per clock is calculated everytime
|
2019-03-25 14:41:15 +01:00 |
|
Gemma Tinti
|
c15e72510c
|
new commands
|
2019-03-22 17:41:14 +01:00 |
|
Gemma Tinti
|
ac1511c3b0
|
rmem max
|
2019-03-22 16:35:42 +01:00 |
|
|
|
cd5aea895b
|
jungfrau server: changes for new firmware, aligning adc deserializer. ctb serveR: removed unnecessary pll reset and polling mode for pll
|
2019-03-22 15:09:29 +01:00 |
|
|
|
5bf37a4f0d
|
changes to jungfrau server
|
2019-03-22 11:27:15 +01:00 |
|
|
|
6cb043b2d9
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-03-21 16:30:25 +01:00 |
|
|
|
fa34ad435b
|
server: pll fix
|
2019-03-21 16:30:18 +01:00 |
|
