1203 Commits

Author SHA1 Message Date
5b7918f50e Merge branch 'g2speed' into fixtests 2021-10-08 11:57:49 +02:00
29b9f71361 merge fix 2021-10-08 11:57:19 +02:00
bbae956619 updated eiger versioning 2021-10-08 11:55:05 +02:00
8d309fe051 Merge branch 'g2speed' into fixtests 2021-10-08 11:31:00 +02:00
635789ef85 Merge branch 'developer' into fixtests 2021-10-08 11:30:36 +02:00
684fb81733 binaries in 2021-10-08 11:06:31 +02:00
417bfbaf38 changing g_108MHz enum to g2_108MHZ (similarly 144), adding readoutspeedlist command 2021-10-08 11:05:25 +02:00
b4a5a5cd5e binaries in 2021-10-08 10:36:45 +02:00
e107842863 Merge branch 'g2speed' of github.com:slsdetectorgroup/slsDetectorPackage into g2speed 2021-10-08 10:35:19 +02:00
ad9eb7fc19 another bug fix typo 2021-10-08 10:35:09 +02:00
b98ac198e7 binaries in 2021-10-08 09:45:46 +02:00
90968e1870 bugfix jungfrau readoutspeed from prev change 2021-10-08 09:45:10 +02:00
e3e3639829 binaries in and updated api versioning 2021-10-07 19:11:37 +02:00
6b0e6a72df changed speed to readoutspeed, added g2 speeds (108, 144) 2021-10-07 18:39:18 +02:00
961ecba34e binaries in 2021-10-07 16:40:20 +02:00
8aa7ced83e Merge branch 'developer' into j1.1fix 2021-10-07 16:14:50 +02:00
c996300806 minor 2021-10-07 16:05:30 +02:00
91f8a07a9c jungfrau server fix around for unexplained high current in powerchip (temp sol: start readout to dstip of 0 and auto, then set back 2021-10-07 15:18:59 +02:00
2c6793633e jungfrau server: fixes for current source and configuring chipv1.1 2021-10-07 11:27:02 +02:00
e2d7d12b3e wip 2021-10-06 17:51:25 +02:00
34fb823675 changing ports only in shared memory and not going to detector/receiver server to change current tcp port 2021-10-06 14:24:57 +02:00
fcfbb7040a binaries in 2021-10-06 14:07:36 +02:00
1cf0a05247 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2021-10-06 14:06:34 +02:00
cdae61c7ff binaries in 2021-10-06 13:46:18 +02:00
5c3a408a89 jungfrau server: setting defaults for current source col registers when disabling current source, and 0.5 ms usleep between power chip and config chip to test 2021-10-06 13:41:50 +02:00
2fc2c34fad jungfrau server bug fix: always reading chipversion as 1.1 2021-10-06 13:38:22 +02:00
f51529bb3b binaries in 2021-10-05 13:24:31 +02:00
7d927a794e moduleid made into dec not hex 2021-10-05 13:23:09 +02:00
b4c115fc69 minor 2021-10-01 14:22:47 +02:00
221763b109 binaries in 2021-10-01 14:06:25 +02:00
594553434d bugfix moduleid 2021-10-01 14:05:38 +02:00
e0249685e1 binaries in 2021-09-27 15:31:45 +02:00
ec2a03132a g2: asic defaults refactored instead of hard coded 2021-09-27 15:31:24 +02:00
dc4e5bb561 binaries in 2021-09-27 14:54:42 +02:00
caf7df886c binaries in 2021-09-27 14:46:29 +02:00
61aa266436 jungfrau: current source defaults at configuring chip 2021-09-27 14:43:14 +02:00
a3f579b4cc jungfrau: removed chip version variable in server adn instead set it in fpga 2021-09-27 13:55:43 +02:00
14c4c989a5 binaries in 2021-09-27 12:24:33 +02:00
920a8a6e9e speed settings fixed in jungfrau 2021-09-27 12:24:14 +02:00
4c0323dd0a updating jungfrau chipv1.1 speed settings 2021-09-27 12:14:03 +02:00
3e5b6c07e3 binaries in 2021-09-17 17:41:16 +02:00
fd59c20975 g2 calibrated settings 2021-09-17 17:37:54 +02:00
6abf61e6f9 default value of special dacs of jungfrau 2021-09-17 17:04:00 +02:00
90b408d7a8 binaries in 2021-09-17 16:11:17 +02:00
dc671e6fcf udp_numdst readonly, udp_cleardst added 2021-09-17 16:09:57 +02:00
e223859d18 merge fix 2021-09-17 12:08:38 +02:00
5a08b9be86 binaries in 2021-09-17 10:40:18 +02:00
afa4e7ea7b bug fix in server 2021-09-17 10:39:06 +02:00
b7e8343ca4 binaries in 2021-09-17 08:42:48 +02:00
bebf1b0a13 jungfrau 2.0 calibrated settings 2021-09-17 08:41:30 +02:00