Commit Graph

2070 Commits

Author SHA1 Message Date
maliakal_d 441c3dc5db Merge branch 'add-targets-export-name' of https://github.com/esrf-bliss/slsDetectorPackage into esrf-bliss-add-targets-export-name
Pull request from Samuel ESRF
2019-02-08 13:07:08 +01:00
Erik Frojdh cd738106ec printf and uninitialized variables 2019-02-08 11:14:16 +01:00
Erik Frojdh 0e120330f4 fixed comparisons to build with clang 2019-02-08 10:16:32 +01:00
maliakal_d bf0e0ac601 updated binaries in serverbin 2019-02-07 17:06:07 +01:00
maliakal_d 143682cfb1 updaterev 2019-02-07 16:55:01 +01:00
maliakal_d 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
maliakal_d 61e769773b got rid of insignificant printouts from debugging 2019-02-04 16:43:37 +01:00
maliakal_d 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
maliakal_d 2f11681d3f gotthard server: configmac should also set cycles for sending dummy frame 2019-01-30 18:24:25 +01:00
Erik Frojdh 73ae8c6151 removing static libs 2019-01-15 17:24:20 +01:00
maliakal_d 615dd2a84f jungfrau server: minor change 2019-01-07 12:06:04 +01:00
maliakal_d dc80dccb8a jungfrau server: updated binaries 2019-01-07 11:52:36 +01:00
maliakal_d de34d85761 jungfrau server for firmware 0.7, updated required FW version to run current code 2019-01-07 11:51:25 +01:00
maliakal_d f810a9e9fb updated rev 2019-01-04 09:13:00 +01:00
maliakal_d 152186ee59 updated gotthard server binaries 2019-01-03 14:14:17 +01:00
maliakal_d d9551fa07f gotthard server: updated gotthard api version 2019-01-03 11:45:39 +01:00
maliakal_d 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
maliakal_d f701c731fb few changes to jungfrau server registers, mainly temp 2018-12-18 18:06:52 +01:00
maliakal_d 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
maliakal_d 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
maliakal_d 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
maliakal_d 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
maliakal_d a774c62cd4 binaries udpated 2018-12-03 10:56:24 +01:00
maliakal_d 550ed4b1c2 eiger server bug fix: read and write reg only wrote to the right fpga, fixed 2018-12-03 10:55:32 +01:00
maliakal_d 2c08c1e7ce updated binary 2018-12-03 10:49:26 +01:00
maliakal_d 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
maliakal_d f120f9c3dd users bug fix:getting id(version) for single/multi detector 2018-11-30 16:00:27 +01:00
maliakal_d 262bf1b307 users class: added stopped to getrunstatus list 2018-11-30 15:42:13 +01:00
maliakal_d e631414526 updated version 2018-09-27 18:23:08 +02:00
maliakal_d f9b95b63eb gotthard server: made gotthard server readout only via udp, readframe just waits for acquisition to be done, does not allocate ram, receiver: removed positions hardcoded in 1d, should be 2d for all 2018-09-27 18:20:03 +02:00
maliakal_d c2db073d5e receiver and client: changed xcoord to row and ycoord to column, zcoord to reserved 2018-09-26 15:03:04 +02:00
maliakal_d 970d448e73 receiver: using namespace std removed from all the headers and the bug fixes for that for hdf5 2018-09-26 10:53:45 +02:00
maliakal_d 5a139d70b5 gotthard and jungfrau server binary updated for API 2018-09-25 14:08:34 +02:00
maliakal_d 33d1b11279 jungfrau server updated for API version change 2018-09-25 14:04:54 +02:00
maliakal_d b163180d6f updating API versions 2018-09-25 14:02:22 +02:00
maliakal_d cab9dff225 Merge branch '4.0.0' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.0 2018-09-25 13:55:42 +02:00
maliakal_d 7d8188fc11 gotthard server binary updated: config file not read a second time after detector start up 2018-09-25 13:55:26 +02:00
Erik Frojdh 64229ca32b changed operator() to const 2018-09-25 11:20:44 +02:00
maliakal_d 4aa0d26f26 gotthard server: trying to resolve roi problem that is only affected by latest firmware 2018-09-21 17:29:43 +02:00
maliakal_d c784f0f539 client: moved shortenable to roi in reciever, roi not yet written in master file 2018-09-19 17:35:26 +02:00
maliakal_d 961489edb1 bugfix gotthard server and client to set roi and disable it, problem still exists with frame numbering between roi modes but can only be fixed in firmware 2018-09-18 18:02:01 +02:00
maliakal_d 781152a772 slsDetectorSoftware bug fix: gappixels for x initialized wrong 2018-09-17 18:13:26 +02:00
maliakal_d 59cb9c84c2 bug fix slsdetectorgui: xcoord and y coord are actually col and row indices 2018-09-17 14:35:31 +02:00
maliakal_d 14c899e7cf removed some manual warnings 2018-08-24 12:34:06 +02:00
maliakal_d 588037fd18 updated release version 2018-08-23 16:23:24 +02:00
maliakal_d e0b8fb3609 updated manuals, jungfrau server (reqd firmware vversion) 2018-08-23 15:52:12 +02:00
maliakal_d cea6c30ded updating release.txt, version API 2018-08-23 12:48:08 +02:00
maliakal_d 0781344117 updating binaries 2018-08-22 19:00:21 +02:00
maliakal_d 63c130a380 client:updated users class and release.txt 2018-08-22 18:08:35 +02:00