|
|
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 |
|
|
|
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
|
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
|
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
|
d134e54810
|
ip
|
2019-03-29 10:18:10 +01:00 |
|
Erik Frojdh
|
990848554c
|
midpoint
|
2019-03-28 16:16:41 +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 |
|
|
|
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 |
|
|
|
7cd5bc8b2d
|
jungfrau: switching between 2 and 1 interface, implementation for server required when firmware done
|
2019-03-26 15:00:19 +01:00 |
|
Erik Frojdh
|
83e43b1bcf
|
format ColumnLimit changed to 100
|
2019-03-20 17:31:19 +01:00 |
|
Erik Frojdh
|
2a01688683
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-03-20 17:07:29 +01:00 |
|
Erik Frojdh
|
4b2c6af4f5
|
reorganizing of slsDetectorSoftware
|
2019-03-20 17:07:02 +01:00 |
|
