Commit Graph

9462 Commits

Author SHA1 Message Date
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
maliakal_d 45b837b42a program fpga printouts for errors 2019-04-01 10:22:50 +02:00
maliakal_d 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
maliakal_d 3e23a38fc8 moench server: sync increases when other clocks do 2019-03-28 15:24:47 +01:00
maliakal_d 37b80bcc0d ctb server: pll reset to keep the phase after setting clock 2019-03-28 15:22:13 +01:00
maliakal_d fc0306564c ctb server: sync is min clock and must go higher when the others do 2019-03-28 14:22:40 +01:00
maliakal_d 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
maliakal_d 5a4122ae7c ctb & moench server: reset phase when changing clock 2019-03-27 15:48:55 +01:00
maliakal_d 2ccd03a3b0 added eiger binary 2019-03-27 12:26:10 +01:00
maliakal_d 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
maliakal_d c7ad548e4c conflict git fix 2019-03-26 15:01:58 +01:00
maliakal_d 7cd5bc8b2d jungfrau: switching between 2 and 1 interface, implementation for server required when firmware done 2019-03-26 15:00:19 +01:00
maliakal_d 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
maliakal_d 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
maliakal_d 5bf37a4f0d changes to jungfrau server 2019-03-22 11:27:15 +01:00
maliakal_d 6cb043b2d9 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-03-21 16:30:25 +01:00
maliakal_d 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
maliakal_d eb3dff3a6c eiger server 2019-03-21 14:15:52 +01:00
maliakal_d d9503bebf9 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-03-21 14:13:15 +01:00
maliakal_d 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
maliakal_d 050854de36 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-03-20 17:34:37 +01:00
maliakal_d 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
maliakal_d 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
maliakal_d 9d489dc962 servers, gitinfo script updated; ctb/moench server: delay uses sync clock, 2019-03-20 14:39:24 +01:00
maliakal_d 44f0dfc3c0 ctbserver: updated firmware version and api 2019-03-19 18:58:42 +01:00