|
|
4323a837ef
|
Merge branch 'developer' into zmqhandler
|
2018-04-09 09:19:46 +02:00 |
|
|
|
649cb0aed9
|
added reset frames caught in to users class
|
2018-04-09 09:18:56 +02:00 |
|
|
|
8cf6e0cbd6
|
in between
|
2018-04-06 17:48:10 +02:00 |
|
|
|
753290b228
|
Merge branch 'developer' into zmqhandler
|
2018-04-06 12:19:16 +02:00 |
|
|
|
d28f293485
|
jungfrau and eiger server bug fix: module_firmware_version gets stuck as it expects an int, but should have been for module_serial_number
|
2018-04-06 12:15:57 +02:00 |
|
Erik Frojdh
|
da010a03d7
|
added -std=c++98 to CXX flags
|
2018-04-04 18:07:33 +02:00 |
|
|
|
72b71f3fcd
|
Merge branch 'developer' into zmqhandler
|
2018-04-04 14:57:24 +02:00 |
|
|
|
e4868671ae
|
bugfix: users api version numbering always gives a -1.
|
2018-04-04 14:56:55 +02:00 |
|
|
|
61897cbd41
|
in between
|
2018-04-04 14:27:53 +02:00 |
|
|
|
9e8d3e598f
|
added enablegappixels to users class
|
2018-03-28 10:41:52 +02:00 |
|
|
|
252e924f92
|
separated start gui button into start and stop to prevent multiple click syndrome
|
2018-03-27 17:49:01 +02:00 |
|
|
|
fe2ba8621b
|
updating versioning to only have date
|
2018-03-27 11:00:15 +02:00 |
|
|
|
b8bdbf4da6
|
updaterev
|
2018-03-26 18:10:14 +02:00 |
|
|
|
5340b8ef24
|
added error mask for loading/writing config file to be caught by python
|
2018-03-26 18:07:10 +02:00 |
|
|
|
14546247e4
|
adding a receiver callback to be able to give modified size from the callback
|
2018-03-22 14:34:03 +01:00 |
|
|
|
a74e8f68f7
|
size change in receiver call back API now streamed, gui allows smaller packet size than expected to be caught and replaced the rest with 0xFF
|
2018-03-21 17:08:38 +01:00 |
|
|
|
a1936cb884
|
updated docu
|
2018-03-21 09:10:11 +01:00 |
|
|
|
a36b715eab
|
resolved conflicts from merging 3.1.1 in here
|
2018-03-21 09:03:31 +01:00 |
|
|
|
17c20748bc
|
updated links in serverbin
|
2018-03-21 08:28:49 +01:00 |
|
|
|
d5f8a1b4e7
|
updated doc
|
2018-03-20 17:37:48 +01:00 |
|
|
|
70ce8c1653
|
updated doc
|
2018-03-20 17:35:39 +01:00 |
|
|
|
5203a0d621
|
updated doc
|
2018-03-20 16:40:56 +01:00 |
|
|
|
59ad15b54e
|
eiger server bug fix: in 10giga mode always used the 1g ip (dhcp ip) if detectorip is before tengiga in config file
|
2018-03-20 16:36:45 +01:00 |
|
|
|
afac5be3c3
|
updated release notes
|
2018-03-20 12:20:15 +01:00 |
|
|
|
688dd15fe9
|
Jungfrau bug fix: cannot give same adcphase value to pll, updated recommended default of adcphase for half speed and quarter speed, updated client manuals for both adcphase and clkdivider
|
2018-03-20 12:12:38 +01:00 |
|
Gemma Tinti
|
98752e1cdb
|
manual
|
2018-03-20 11:40:37 +01:00 |
|
Gemma Tinti
|
d59f419370
|
manual
|
2018-03-20 11:32:09 +01:00 |
|
Erik Frojdh
|
9ba3fb9279
|
removed using namespace std from multiSlsDetector
|
2018-03-16 10:51:27 +01:00 |
|
Erik Frojdh
|
50111bcea7
|
removed unused variable in slsDetector
|
2018-03-16 10:41:30 +01:00 |
|
|
|
40210ae26f
|
jungfrauserver adcphase fix: bug was if adcphase was same as previous value, it still shifted
gotthardDoubleModule
|
2018-03-14 17:20:26 +01:00 |
|
|
|
dd6301d66d
|
updated for compilation
|
2018-03-14 16:19:30 +01:00 |
|
|
|
b58c3e8951
|
solving merging conflicts from 3.1.0 to developer
|
2018-03-14 15:45:35 +01:00 |
|
|
|
85aa47b835
|
updated link in documentation
|
2018-03-12 16:38:01 +01:00 |
|
|
|
da9b0bdc0b
|
updated link in documentation
|
2018-03-12 16:27:45 +01:00 |
|
|
|
258de4947a
|
updated doc
|
2018-03-12 15:46:20 +01:00 |
|
|
|
9197ab6e4b
|
sls detector install omitted, added
|
2018-03-12 15:36:36 +01:00 |
|
|
|
6c1c203782
|
documentation updated
|
2018-03-12 15:01:23 +01:00 |
|
|
|
721d2a30f2
|
read me updated
|
2018-03-12 14:25:39 +01:00 |
|
|
|
72970c9669
|
updated binaries, updated manuals, updated git versioning
|
2018-03-12 14:21:02 +01:00 |
|
Erik Frojdh
|
b389402d64
|
Merge branch '3.1.0-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 3.1.0-rc
|
2018-03-08 17:13:20 +01:00 |
|
Erik Frojdh
|
0d2dd93498
|
changed setBit and getBit to uint32_t
|
2018-03-08 17:13:13 +01:00 |
|
|
|
fee6465213
|
eiger and jungfrau servers int to uint32_t for read and write registers
|
2018-03-08 16:46:15 +01:00 |
|
Erik Frojdh
|
8b02aa9e91
|
Merge branch '3.1.0-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 3.1.0-rc
|
2018-03-08 16:08:45 +01:00 |
|
Erik Frojdh
|
339956e5de
|
changed from int to uint32_t in read and writeRegister
|
2018-03-08 16:08:31 +01:00 |
|
|
|
deb59530ab
|
eiger gui fix: delay after trigger and number of gates upon measurements tab refresh doesnt exist for eiger/jungfrau
|
2018-03-08 15:49:01 +01:00 |
|
|
|
ec5e779225
|
added binary
|
2018-03-08 15:19:11 +01:00 |
|
|
|
3878212ffd
|
jungfrau server adcphase not responding to a get properly
|
2018-03-08 15:17:14 +01:00 |
|
|
|
7649865a8f
|
jungfrau bug fix: adc phase corrected to correctly return value in -1
|
2018-03-08 14:02:02 +01:00 |
|
Erik Frojdh
|
06cdf8ad92
|
overloading access operator
|
2018-02-28 17:34:55 +01:00 |
|
|
|
28101bed22
|
updated binaries
|
2018-02-27 14:37:46 +01:00 |
|
