2e2e91b219
ctb adc: get in uV and print in client in mV to get decimals
2020-02-27 15:43:42 +01:00
10ba16a9dc
updating versions
2020-02-27 14:26:18 +01:00
8c8032dc69
ctb bug fix: slow adcs incorrect mv read out, needed clk down and usleep before reading
2020-02-27 09:16:22 +01:00
90acd51389
server api changes: for mythen3, jungfrau, eiger as well
2020-02-26 17:52:35 +01:00
fe3a7b0faf
gotthard2: removed unnecessary casting
2020-02-26 11:02:28 +01:00
5e6a3b7e3d
merge resolved
2020-02-25 15:48:41 +01:00
6a0a931e3e
gotthard2: bursts and burst period, written to same register as triggers and delay (kept in server as variables) and set if conditions meet. bursts and burst period only in auto timing and burst mode. Also updating theses registers when switching between timing modes or burst modes
2020-02-25 15:45:40 +01:00
Erik Frojdh
2bec476b4f
fixed failed tests
2020-02-25 09:26:57 +01:00
02b367ffe8
mythen3 and gotthard2: updated clocks
2020-02-24 16:50:47 +01:00
21a1b872bf
bugfix:mythen3 date change
2020-02-24 11:00:16 +01:00
3a74ca8fc2
bugfix: mythen3 git date incorrect
2020-02-24 10:53:06 +01:00
8953235268
reverted to UdpRxSocket.h version of revision fc27cfd (with gcc problem fixed)
2020-02-21 11:07:24 +01:00
Erik Frojdh
52a89cbcc5
fix for older gcc
2020-02-18 17:54:28 +01:00
Erik Frojdh
f42e87e37f
format
2020-02-18 15:03:02 +01:00
Erik Frojdh
53a3656d5e
removed copy, fixed receive to external buffer
2020-02-18 15:02:40 +01:00
Erik Frojdh
f1bce15a57
replaced udp socket
2020-02-17 17:43:14 +01:00
Erik Frojdh
3ea9b86bf5
date fix
2020-02-13 14:50:23 +01:00
64214f22f9
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2020-02-04 10:50:14 +01:00
36bd91daa3
gotthard2: sleep before configuring on chip dacs, default exptime 0 and default period to 1ms
2020-02-04 10:50:01 +01:00
Erik Frojdh
ec66079f65
renamed ServerInterface
2020-02-04 08:57:35 +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
2314fdabd1
merge from mythen3, and jungfrau fix
2020-01-23 16:44:01 +01:00
abe63acc79
jungfrau fix: wait for acquisition to be done before sending stop receiver
2020-01-23 16:41:09 +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
Dhanya Thattil
d8fccdcefa
Merge branch 'developer' into gotthard2
2020-01-21 18:18:57 +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
7131f77a3a
eiger: vcal set to 0
2020-01-21 16:10:15 +01:00
9c89f6a63d
Merge branch 'developer' into gotthard2
2020-01-21 16:05:04 +01:00
2e78484b61
gotthard2 virtual server sends data
2020-01-21 14:50:31 +01:00
Erik Frojdh
5c35a33e02
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2020-01-20 14:27:30 +01:00
Erik Frojdh
a0c222b3c6
constructor
2020-01-20 14:23:28 +01:00
6cfd0f8962
gotthard2: first edit
2020-01-20 12:13:23 +01:00
6e47f0b7f7
merge resolved
2020-01-20 11:36:35 +01:00
3c891495db
mythen3: bug fix detector type
2020-01-20 11:32:02 +01:00
Erik Frojdh
6170c42618
explicit also in MacAddr
2020-01-16 16:57:04 +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
bcb4942793
cleaning
2020-01-16 12:26:22 +01:00
Erik Frojdh
4b69ac5cfc
const string& in exceptions constructor
2020-01-16 11:44:01 +01:00
Erik Frojdh
7a00732fa8
various minor things from clang-tidy
2020-01-16 11:39:35 +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
28f8a76dcc
updated binaries
2020-01-10 09:05:26 +01:00
