5422 Commits

Author SHA1 Message Date
1d6be74ee5 rxr: removed return ok or fail and replaced with exceptions 2019-11-29 10:29:36 +01:00
796890d1c8 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-11-27 18:25:14 +01:00
3486137de3 bfin warnings fixed 2019-11-27 18:22:33 +01:00
Erik Frojdh
d53082c615 clang-tidy empty() 2019-11-27 18:15:55 +01:00
Erik Frojdh
c94f6a2bf2 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-11-27 17:56:02 +01:00
Erik Frojdh
2364364697 minor 2019-11-27 17:55:50 +01:00
ad0fb44573 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-11-27 17:29:26 +01:00
9455a5fba1 ctb: adcenable10g included, 10g readout enables included 2019-11-27 17:28:57 +01:00
Erik Frojdh
a28fa66e54 renamed CmdLineParser to CmdParser 2019-11-27 13:56:14 +01:00
Erik Frojdh
e996068328 more tests 2019-11-27 13:39:06 +01:00
Erik Frojdh
1bbd77536c Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-11-27 11:35:16 +01:00
Erik Frojdh
ace105a268 more tests 2019-11-27 11:35:00 +01:00
f299a34e59 ctb server binary update ctb1.0 2019-11-27 11:31:30 +01:00
b1c93bb3df Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-11-27 11:12:43 +01:00
9e8a874e39 rxr bug fix: update shm when updating rxr 2019-11-27 11:12:31 +01:00
Erik Frojdh
2c7b730987 more tests 2019-11-27 11:12:18 +01:00
Erik Frojdh
4fe1a2c6df eiger dacs 2019-11-27 08:41:23 +01:00
Erik Frojdh
1322cff405 some eiger dacs 2019-11-26 21:37:57 +01:00
Erik Frojdh
7f3d5e8a7e WIP 2019-11-26 20:34:17 +01:00
Erik Frojdh
bf199767dc more rx tests 2019-11-25 16:32:12 +01:00
Erik Frojdh
eaae54ebf5 fixed script for py36 2019-11-25 15:13:48 +01:00
Erik Frojdh
6889741480 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-11-25 14:56:24 +01:00
Erik Frojdh
3030c262f1 rx tests 2019-11-25 14:56:15 +01:00
6b391a34dc gotthard2: bug fix adconfiguration initialization 2019-11-25 14:14:05 +01:00
Erik Frojdh
a2dd35ae38 minor 2019-11-25 13:01:07 +01:00
Erik Frojdh
e00c5068af added list of tests 2019-11-25 12:53:45 +01:00
Erik Frojdh
c951b10b0f fixed public header list 2019-11-25 12:11:23 +01:00
Erik Frojdh
c5012a2d5a moving some tests 2019-11-25 12:08:27 +01:00
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