ca5a0b4cc8
WIP Settings
2019-06-07 10:58:47 +02:00
e4546c6121
WIP
2019-06-05 17:54:56 +02:00
862dc824ba
WIP
2019-06-05 11:27:19 +02:00
a6144f658e
ctb client and server bug fix: dac didnt compute indices correctly and set dac was not printing in server
2019-06-04 18:11:31 +02:00
3aea917175
updated binaries for the extsig api change
2019-06-04 12:18:06 +02:00
b74ce95b24
removed colon in commands. affects dac, adc and extsig
2019-06-04 12:10:26 +02:00
17f745b45d
ctb server: simulator effects, increased fpga reset time from 1 to 2 seconds
2019-06-03 17:22:59 +02:00
Dhanya Thattil
29141ac1a6
set starting frame number of next acquisition for both jungfrau and e… ( #27 )
...
* set starting frame number of next acquisition for both jungfrau and eiger. firmware has not implemented a get, so workaround. tests included. frame number 0 not allowed due to Eiger. Eiger max frame is 48 bit, while jungfrau is 64 bit
* made argument of setstartingframenumber const
2019-06-03 11:07:53 +02:00
Dhanya Thattil
894cc1c9e0
Simulator ( #28 )
...
* WIP
* wip
* wip
* removed loop
* sending 1 frame
* send multiple frames
* c11 for server
* WIP
* WIP
* Add CMake for the simulators. Requires some refactoring to make slsDetectorServer a proper library.
* Working cmake for jungfrau
* Working cmake for eiger
* WIP
* WIP
* Add preliminary working eiger simulator and breaks the jungfrau simulator
* virtual servers connected
* changes to make it work for rhel7 and install binaries in bin
* removed some unnecessary prints
* removed binaries and virtual makefiles
2019-06-03 10:16:54 +02:00
Erik Fröjdh
788ad8d3b6
Command proxy ( #25 )
...
* added cmd proxy
* minor
* minor
* WIP
* clean up
* added comment
2019-05-28 18:01:26 +02:00
Erik Frojdh
aa2bcfa308
fixed setup udp
2019-05-28 17:07:34 +02:00
Erik Frojdh
7a9dbd8b76
WIP
2019-05-28 15:43:20 +02:00
8c112efdb3
jungfrau bug fix: setting clkdivider also set adcphase: break inswitch
2019-05-28 14:14:08 +02:00
Erik Frojdh
8f4009bfb6
WIP
2019-05-28 13:27:43 +02:00
938e1e87ff
bugfix: vref adc voltage
2019-05-28 12:31:19 +02:00
a0f697ce71
jungfrau feature change: outer is default and connects to bottom, inner is secondary but connects to top
2019-05-28 10:31:36 +02:00
659e204b35
solved conflicts
2019-05-27 15:05:40 +02:00
2c2fb7358c
jungfrau board 2 adc defines, full speed limitation for old boards
2019-05-27 15:04:13 +02:00
Dhanya Thattil
54a396065d
ctb versioning bug fix
2019-05-27 14:08:41 +02:00
Erik Frojdh
0972b803dd
Merge branch 'developer' into mysocket
2019-05-27 09:12:10 +02:00
7b817fa194
Merge branch 'developer' into jungfrauv0.8
2019-05-17 19:21:01 +02:00
1a1c6b9b42
jungfrau server: feature finish: switching between 2 interfaces
2019-05-17 19:19:03 +02:00
Erik Frojdh
3e5d34647e
updated test for argument parser
2019-05-17 10:00:49 +02:00
Erik Frojdh
fff79fbbb6
const char* for command
2019-05-16 16:58:03 +02:00
Erik Frojdh
a11fc31c49
merge
2019-05-16 15:18:14 +02:00
1943e77b24
server interface: ip made to use inet_ntop, mac address and ip to string made common
2019-05-16 15:12:42 +02:00
Erik Frojdh
615d1b1f33
refactor
2019-05-16 14:27:16 +02:00
Erik Frojdh
54983c5fd0
removing constexpr
2019-05-16 11:36:25 +02:00
Erik Frojdh
c6651df1b2
remove mySock
2019-05-16 11:14:03 +02:00
Erik Frojdh
e252b8e0e9
receiver socket
2019-05-15 17:51:48 +02:00
Erik Frojdh
40c2d9f760
try for accept
2019-05-15 12:17:32 +02:00
Erik Fröjdh
877bdb8979
Using FixedCapacityContainer for rxDbitList ( #22 )
...
* fixed capacity container
* changed shm date
2019-05-15 09:16:18 +02:00
Erik Frojdh
bf0847e967
removed ClientInterface
2019-05-15 08:38:49 +02:00
6847175743
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2019-05-14 18:38:42 +02:00
f90d8c6aff
ctb server: added adcvpp option to get and in mv
2019-05-14 18:38:30 +02:00
45ae8a41ab
updating eiger server
2019-05-14 17:43:34 +02:00
Erik Frojdh
7314c52c63
removed unneccecary includes
2019-05-14 17:32:21 +02:00
Erik Frojdh
bc4d0452af
removed unused error_defs.h
2019-05-14 17:25:43 +02:00
741ee3b44c
ctb server bug fix: udp ip not reset before overwriting (smaller size creates problems)
2019-05-14 17:08:07 +02:00
Erik Fröjdh
0224dccd2e
Added noexcept and constexpr ( #21 )
...
* noexcept and constexpr
* check size
2019-05-14 11:08:25 +02:00
Erik Fröjdh
2a1c89f712
Fixed container ( #19 )
...
* added FixedCapacityContainer
* added empty to FixedCapacityContainer
* removed commented out section
* added FixedCapacityContainer to public headers
2019-05-08 12:34:45 +02:00
e14519c236
slsReceiver: removed special receiver config, added rx_dbitlist, rx_dbitoffset to put bits together in file, connected adcinvert, extsamplingsrc and extsampling properly to the detector, added tests
2019-05-03 20:37:40 +02:00
2f3b0e0b06
ctb:separated analog and digital samples in server and send analog and digital data packed separately per frame to reciever
2019-04-30 18:55:32 +02:00
b0cffcd570
master file option, adcdisable changed to adcenable
2019-04-30 12:13:28 +02:00
61a939ef53
ctb: removed setroi, instead using adcenablemask
2019-04-26 16:53:23 +02:00
Erik Frojdh
b853bd92c8
template for sending to detector
2019-04-25 17:01:04 +02:00
Erik Frojdh
4da85b15a0
cleaning
2019-04-25 13:55:45 +02:00
eac992ee03
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2019-04-23 14:35:20 +02:00
4e3baf41cb
ctb server: introducing 1 us delay between rd strobe and fifo read due to different clocks
2019-04-23 14:35:07 +02:00
Erik Frojdh
72091f47d9
format and mod constructor
2019-04-23 10:48:31 +02:00
