4112 Commits

Author SHA1 Message Date
32d951e28a Merge branch '4.0.2' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.2 2019-06-13 09:01:47 +02:00
5c63c8fc8f gui bug fix: switching to tab plot while acquiring produced error messages 2019-06-13 09:01:39 +02:00
7b70274d4f checking online when refreshing (during acquire) is removed 2019-06-13 08:56:29 +02:00
Erik Frojdh
1cd905c08b disable gui 2019-06-12 16:02:43 +02:00
13e809acd4 updated versions 2019-06-12 15:40:19 +02:00
46533b0411 updated server binaries 2019-06-12 15:37:17 +02:00
Erik Frojdh
4f4de15d3a 1s sleep for large JF during powerchip 2019-06-12 14:53:52 +02:00
4f99aeabd2 bug fix: hdf5 printError still called once. replcaed with printErrorStack 2019-05-22 19:09:45 +02:00
5e246c0754 Merge branch '4.0.2-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.2-rc 2019-04-11 16:13:42 +02:00
518c6783cc Client (data call back API) and Gui (Eiger 4 bit mode with multiple images) bug fix: npixelsx and npixelsy was not updated to complete detector level when calling call back function to give complete image 2019-04-11 16:13:31 +02:00
Erik Frojdh
0706564694 deploy only on specific branch 2019-04-11 09:31:27 +02:00
2108bbda66 Merge branch '4.0.2-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.2-rc 2019-04-08 18:06:19 +02:00
82feed1ab8 updated server binaries 2019-04-08 18:06:06 +02:00
4be0b5d436 jungfrau server bug fix: setting detector position gave error when switching between different sized detector configurations 2019-04-08 18:05:05 +02:00
Erik Frojdh
f7eb256eb6 version 2019-03-15 14:45:44 +01:00
Erik Frojdh
250fc26308 fixed deloyment 2019-03-15 14:40:12 +01:00
06a50520c1 gotthard server: bug fix get settings should not set default dacs 2019-03-11 14:54:53 +01:00
fc766055d4 receiver bug fix release text updated 2019-03-04 11:42:54 +01:00
828b1479c7 receiver bug fix jungfrau as root 2019-03-04 11:28:56 +01:00
22ed52605c receiverbug fixe affecting jungfrau receivers as root 2019-03-04 11:15:53 +01:00
a1a95ebb20 receiver bug fixaffecting Jungfrau receivers as root (optlen size as int), but setting buffer size is uint32_t size. setting it to uint64_t 2019-03-04 11:02:10 +01:00
Erik Frojdh
d7ce5fedfd path 2019-02-12 15:06:15 +01:00
Erik Frojdh
3a2682ffe7 missing headers updated build number 2019-02-12 14:46:56 +01:00
Erik Frojdh
bf74a4135e travis 2019-02-11 10:25:58 +01:00
Erik Frojdh
252ecf2769 travis 2019-02-11 10:15:57 +01:00
Erik Frojdh
de01ab75e9 travis 2019-02-11 09:24:39 +01:00
a7ba5eb0d8 updated release.txt 2019-02-08 17:46:13 +01:00
6bf1a944da updaterev 2019-02-08 17:28:44 +01:00
3c77447868 removed minor warnings 2019-02-08 16:32:23 +01:00
046fb11e5e Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc 2019-02-08 16:02:15 +01:00
b89d56001e CMake: prefixing the options with SLS_ 2019-02-08 16:02:05 +01:00
Erik Frojdh
de204dee38 Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc 2019-02-08 14:03:56 +01:00
Erik Frojdh
0ef030354f warning 2019-02-08 14:03:49 +01:00
dccce9bf55 Merge branch 'esrf-bliss-add-targets-export-name' into 4.0.1-rc 2019-02-08 13:09:06 +01:00
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
afd9e29424 updated release.txt to have eriks bug fix for receiver gap pixels enable in reciever 2019-02-08 12:53:58 +01:00
ce939b3cd6 Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc 2019-02-08 12:45:45 +01:00
0984654fd0 updated release.txt 2019-02-08 12:33:04 +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
bf0e0ac601 updated binaries in serverbin 2019-02-07 17:06:07 +01:00
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