2503 Commits

Author SHA1 Message Date
Erik Frojdh
3523de8ba9 WIP 2020-02-11 16:01:32 +01:00
Dhanya Thattil
94fcf52e64
Merge pull request #76 from slsdetectorgroup/exec
Buffern in exec
2020-02-04 10:59:48 +01:00
Erik Frojdh
b9446f40d1 fmt and minor 2020-02-04 10:11:27 +01:00
Erik Frojdh
e6340456f6 minor 2020-02-04 08:47:22 +01:00
Erik Frojdh
f42d591845 sizeof 2020-02-03 16:51:57 +01:00
Erik Frojdh
e9029ba8f2 removed unused functions 2020-02-03 16:44:14 +01:00
Erik Frojdh
121747352d buffer 2020-02-03 16:35:30 +01:00
Erik Frojdh
a829e69313 minor 2020-02-03 16:00:24 +01:00
Erik Frojdh
972f21258a renamed multiSlsDetector 2020-02-03 14:57:37 +01:00
93ab8d05d7 eiger: change speed to full speed for dr of 4, 8, 16 2020-02-03 11:37:43 +01:00
e432e6f90d 4.1.1 changes: software trigger via stop server, disentangling rxr streamin from register call back 2020-02-03 11:25:19 +01:00
f0cccf9de8 initialchecks can be bypassed (version compatibility and oher tests at server start up) 2020-01-31 16:46:33 +01:00
89c774dbf7 nios programming: check file size first 2020-01-31 11:24:48 +01:00
Dhanya Thattil
5ca3a1b685
gotthard2 and mythen3: programming fpga, reboot; jungfrau, ctb: modified programming (#74) 2020-01-30 19:52:35 -08:00
7d7302a90c mnior 2020-01-29 14:38:19 +01:00
ac3230c656 gotthard2 testing 2020-01-29 14:34:23 +01:00
69897d4c78 WIP testing 2020-01-27 13:56:44 +01:00
41035808e9 merge from mythen3 and gotthard2 2020-01-24 15:08:58 +01:00
a9e375ed34 gotthard2: bursttype to burstmode 2020-01-23 11:03:14 +01:00
f881133795 get/set timing, generate data for gotthard2, vref_rstore instead of restore for gotthard2 2020-01-22 18:18:56 +01:00
8cbf3c62a9 merge from developer 2020-01-22 17:30:13 +01:00
3ea2520615 PR minor changes 2020-01-22 13:55:10 +01:00
1dea112742 adding gotthard2 tests 2020-01-22 11:35:29 +01:00
981b13494c mythen3: virtual server, connected timing mode, row and col in header, included pattern bit and mask 2020-01-21 18:16:27 +01:00
9c89f6a63d Merge branch 'developer' into gotthard2 2020-01-21 16:05:04 +01:00
e746256653 gotthard2: gain updated 2020-01-21 16:01:38 +01:00
bdf3a010c3 updated client doc for gotthard2: the timers that are used in continuous mode only 2020-01-21 10:26:11 +01:00
65d95480bd mythen3 bug fix: rxr needs to update dr 2020-01-20 13:50:50 +01:00
6cfd0f8962 gotthard2: first edit 2020-01-20 12:13:23 +01:00
95030bc55f Merge branch 'developer' into gotthard2 2020-01-16 16:52:08 +01:00
Erik Frojdh
c1fac7cdb7 fixed conversion for IpAddr 2020-01-16 16:31:11 +01:00
e8bdf5a505 gotthard2: updated register map; powerchip checking detector type; internal and external period, frames, exptime; set/get delay, get actualtime, measurement, framesfromstart enabled; which detector comment updated in cmdproxy, detector and slsdetector 2020-01-16 15:33:35 +01:00
Erik Frojdh
f3598c1f39 nullptr 2020-01-16 14:17:57 +01:00
Erik Frojdh
9ac08ad5c9 clang-tidy header include order 2020-01-16 14:00:43 +01:00
Erik Frojdh
7a00732fa8 various minor things from clang-tidy 2020-01-16 11:39:35 +01:00
b6d9015ed0 rearranging 2020-01-15 15:08:01 +01:00
Dhanya Thattil
de53747ddd Counters (#71)
* mythen3: adding counters mask, firmware still takes only number of counters for now

* mythen3: checking if module attached before powering on chip

* bug fix: loop inital declaration not allowed in c

* fix scope eiger test

* mythen3: renamed setCounters to setCounterMask and getCounterMask in API

* mythen3 replacing counting bits with popcount

Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
2020-01-14 17:40:46 +01:00
Erik Frojdh
a1abd7587c Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-01-13 16:13:52 +01:00
Erik Frojdh
8c8d213b56 python funcs 2020-01-13 16:13:47 +01:00
db9aa7589a tests fix 2020-01-13 12:07:30 +01:00
Erik Fröjdh
ed2a69744b
Auto generating Python bindings (#70)
Auto generating python bindings
2020-01-07 15:47:38 +01:00
504fc2d095 ctb: validate asampes and dsamples > 0 for romode; client: exception caught in acquire to stop receiver and clear busy flag 2019-12-10 10:25:14 +01:00
8881542156 ctb bug fix: clkioctrl not taken in hex 2019-12-05 17:15:31 +01:00
Erik Frojdh
d9ae9a8cc6 eiger test 2019-12-05 11:00:55 +01:00
Erik Frojdh
be3d82b7b4 format 2019-12-04 10:25:17 +01:00
Erik Frojdh
619106e05f eiger tests 2019-12-03 11:47:49 +01:00
1a8337540a rxr: switched to threads for threadObject (from pthread), moved priorities to threadObject, mutex 2019-11-29 16:19:02 +01:00
Erik Frojdh
f4cdd759b0 clang-tidy 2019-11-27 18:42:16 +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