|
|
09f1a8956e
|
ignore .vscode
|
2019-04-03 10:22:00 +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
|
11a452545c
|
added parallel call for void return
|
2019-04-02 15:44:19 +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
|
ed9dc3b386
|
fixed bug not clearing socket descriptor
|
2019-03-29 10:14:07 +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 |
|
Gemma Tinti
|
c5178bc4de
|
manual
|
2019-03-21 16:29:36 +01:00 |
|
Gemma Tinti
|
c89fad45a9
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-03-21 15:09:19 +01:00 |
|
Gemma Tinti
|
6c4fad01d4
|
manual
|
2019-03-21 15:09:10 +01:00 |
|
|
|
eb3dff3a6c
|
eiger server
|
2019-03-21 14:15:52 +01:00 |
|
|
|
d9503bebf9
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-03-21 14:13:15 +01:00 |
|
|
|
b99606211b
|
ctb server: altera pll odd division fix
|
2019-03-21 14:13:07 +01:00 |
|
Gemma Tinti
|
039e658773
|
manual
|
2019-03-21 11:46:38 +01:00 |
|
Gemma Tinti
|
92ca22fc09
|
manual
|
2019-03-20 18:34:44 +01:00 |
|
Erik Frojdh
|
d4ac6fe160
|
gitinfo as public
|
2019-03-20 17:48:01 +01:00 |
|
Erik Frojdh
|
8cb0f3a29c
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-03-20 17:41:57 +01:00 |
|
Erik Frojdh
|
c16f9b8c30
|
specify detector or receiver in error
|
2019-03-20 17:41:46 +01:00 |
|
|
|
050854de36
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-03-20 17:34:37 +01:00 |
|
|
|
cb80cf5f09
|
receiver missing packets made to have signed for getting more packets than expected
|
2019-03-20 17:34:29 +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 |
|
|
|
3ff01bf609
|
removed minor warnings for unused ret
|
2019-03-20 17:07:02 +01:00 |
|
Erik Frojdh
|
4b2c6af4f5
|
reorganizing of slsDetectorSoftware
|
2019-03-20 17:07:02 +01:00 |
|
Erik Fröjdh
|
03402d0e9e
|
Error handling with exceptions in slsDetector and multiSlsDetector (#14)
* less error mask
* removing error mask from slsDetector
* removed ErrorMask
* setonline, setreceiveornline bug fix
|
2019-03-20 16:23:41 +01:00 |
|
|
|
9d489dc962
|
servers, gitinfo script updated; ctb/moench server: delay uses sync clock,
|
2019-03-20 14:39:24 +01:00 |
|
|
|
44f0dfc3c0
|
ctbserver: updated firmware version and api
|
2019-03-19 18:58:42 +01:00 |
|
|
|
685fcc31b6
|
setonline, setreceiveronline was never really setting offline flag, so was never really updating detector first time
|
2019-03-19 18:42:45 +01:00 |
|
Dhanya Thattil
|
ce6289afda
|
Merge pull request #13 from slsdetectorgroup/except
new socket overload
|
2019-03-19 18:01:09 +01:00 |
|
Erik Frojdh
|
4e56107015
|
new socket overload
|
2019-03-19 17:49:20 +01:00 |
|
|
|
430e0e3fb5
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-03-19 17:32:17 +01:00 |
|
