4121 Commits

Author SHA1 Message Date
143682cfb1 updaterev 2019-02-07 16:55:01 +01:00
22686e1e25 eiger server bug fix: getmeasured period and exptime gets 32 bit from Febinterface and needs to be casted to int64_t before multiplying by 10 2019-02-06 14:52:52 +01:00
Samuel Debionne
e13ecc8625 Add slsReceiver and slsDetector targets to the export set (used by donwstream project)
set TARGETS_EXPORT_NAME if the project is built directly.
2019-02-05 11:51:03 +01:00
ef3e01b9bd Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc 2019-02-05 10:49:46 +01:00
Gemma Tinti
dffa4d9de5 eiger manual 2019-02-05 10:46:37 +01:00
dfca81208b manual acq: uncomment insignificant 2019-02-05 10:36:33 +01:00
37be7d0e2b manual acq config added 2019-02-04 17:54:58 +01:00
49812a34ae manual acq changes for debugging 2019-02-04 17:31:58 +01:00
133b82ad61 Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc 2019-02-04 16:43:44 +01:00
61e769773b got rid of insignificant printouts from debugging 2019-02-04 16:43:37 +01:00
Erik Frojdh
23dce681b2 added clang format and clang tidy from refactor 2019-02-04 14:11:06 +01:00
7481c7f0e6 Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc 2019-02-01 18:50:08 +01:00
3c2bbf6ad4 gotthard server: possible fix for master and slave sync problem when configuring mac for different frames and sending dummy image, still problem of missing or extra 2 packets inslave or master not sending any frames sometimes, multi: possible fix of image reconstruction in x direction in gui 2019-02-01 18:48:51 +01:00
b8fec6c050 gotthard server: possible fix for master and slave sync problem when configuring mac for different frames and sending dummy image, still problem of missing or extra 2 packets inslave or master not sending any frames sometimes 2019-02-01 18:48:25 +01:00
2f11681d3f gotthard server: configmac should also set cycles for sending dummy frame 2019-01-30 18:24:25 +01:00
12f8166d25 manual acq changed config file, added some changes for jungfrau that aren;t tested, but soleil acq test passed 2019-01-29 15:49:41 +01:00
fd68a41918 udp socket creation error, udpsocket assigned only after. unique ptr later 2019-01-16 19:46:08 +01:00
Erik Frojdh
d45375947f only destroy sem if it was initialized 2019-01-16 11:53:16 +01:00
Erik Frojdh
73ae8c6151 removing static libs 2019-01-15 17:24:20 +01:00
615dd2a84f jungfrau server: minor change 2019-01-07 12:06:04 +01:00
dc80dccb8a jungfrau server: updated binaries 2019-01-07 11:52:36 +01:00
de34d85761 jungfrau server for firmware 0.7, updated required FW version to run current code 2019-01-07 11:51:25 +01:00
f747c908dc soleils test plus some modifications 2019-01-04 11:09:53 +01:00
64d94b978b for temporary testing 2019-01-04 09:13:33 +01:00
f810a9e9fb updated rev 2019-01-04 09:13:00 +01:00
152186ee59 updated gotthard server binaries 2019-01-03 14:14:17 +01:00
d9551fa07f gotthard server: updated gotthard api version 2019-01-03 11:45:39 +01:00
8738c6b9a2 jungfrau server: updated severdefs to correspond to registerdefs update, need to update firmware version required for jungffrau server exe 2019-01-03 11:43:21 +01:00
f701c731fb few changes to jungfrau server registers, mainly temp 2018-12-18 18:06:52 +01:00
Erik Frojdh
e2306bd41c conda recipe 2018-12-12 16:46:01 +01:00
5e71aeb85f binaries modified 2018-12-04 13:39:27 +01:00
3a51d107bd gotthard server bug fix: switching between roi and no roi has complex fnum reengineering as fnum and pnum doesnt exist for gotthard, sol at the moment: send an image when configuremac, identify first packet if first two channels is 0xcacacaca, ifthe fnum is odd, then increment. Looking at this only at first image in an acquisition, also reduces roi time by configuring mac only when setting roi, not when getting 2018-12-04 12:09:46 +01:00
6b4a9be870 in between 2018-12-04 10:45:55 +01:00
b4b38cb607 bugfix for gotthard roi and noroi frame number, temporary fix to look at CACACACA to know if its a second packet, and first time look at last bit to know wheter to increment or not for consecutive frames fr no roi 2018-12-03 16:25:24 +01:00
03e7a83e74 incorrect mac address in config file should set error flag and give fail upon calling readconfig file 2018-12-03 12:10:37 +01:00
0869a975e4 updated makefile in manual-api to point to binaries in bin and not build/bin. cmake points to build/bin anyway 2018-12-03 12:05:38 +01:00
2cebec90ee users: added setroi and getroi, modified multi to allow imod for setroi on sls level, modified detectorsize to set a single roi or give roi if only one roi 2018-12-03 11:50:56 +01:00
c611523352 updated users class: get/set detector size sets one roi /get roi if roi enabled. mythen is not supported anymore, hence 2018-12-03 11:17:30 +01:00
a774c62cd4 binaries udpated 2018-12-03 10:56:24 +01:00
550ed4b1c2 eiger server bug fix: read and write reg only wrote to the right fpga, fixed 2018-12-03 10:55:32 +01:00
2c08c1e7ce updated binary 2018-12-03 10:49:26 +01:00
2b0208bd98 gotthard server bug fix: adc channel shifted by one fixed changin token timing rev for board 2 2018-12-03 10:48:52 +01:00
05d8ef6277 bug fix for starting and stopping receiver, without listening 2018-12-03 10:45:46 +01:00
228cfa35c0 receiver bug fix: padding was set only if deactivated, frame padding enabled and deactivated padding enabled. Fixed that frame padding and deactivated padding is independent. Padding is done if frame padding enabled or if deactivated and deactivated padding enabled 2018-11-30 16:10:13 +01:00
f120f9c3dd users bug fix:getting id(version) for single/multi detector 2018-11-30 16:00:27 +01:00
262bf1b307 users class: added stopped to getrunstatus list 2018-11-30 15:42:13 +01:00
eb89d12f41 updated readme and eiger_short 2018-09-28 15:09:31 +02:00
c477970cf0 manual updated 2018-09-28 11:47:25 +02:00
03ae32dcf3 updated manuals 2018-09-27 18:32:20 +02:00
5a394c080f updated release 2018-09-27 18:29:33 +02:00