8c067437e6
ctb moench: added feature set pattern mask and set pattern bit mask, removed CTB prefix for all the patern functions
2019-03-01 12:28:11 +01:00
35b1ad39f7
ctb moench: feature to set digital io pin delay, changed print from unsuccessful to failed, maxpatternlength in server is inclusive
2019-03-01 10:45:01 +01:00
bb81613900
ctb, moench: implemented led enable feature
2019-03-01 09:00:04 +01:00
debf3a1b01
ctb readout works with receiver for digital readout, allocate ram in server only if 1g udp, free addr info only when setting new udp detals upon configuring ,brough readout flags to receiver
2019-02-28 16:07:47 +01:00
7f2197fc4f
slsReceiver & client: 10genable allowed for moench and ctb, ctb server: better way to divide to packets to send via udp
2019-02-28 10:09:54 +01:00
f80483de6e
ctb server: (bug fixes, udp sending feature instead of tcp, better debugging prints,
...
digital readout mode (fifoempty flag in status register is always up, so it is idle for this readout mode),
pattern loop bugs, max_pattern_length redefined in server side, do not update period for ctb and moench in setreceiver
2019-02-28 08:46:26 +01:00
1fe473e830
client: for set port functions, moved forceupdate outside to automatically close previous function call
2019-02-25 14:45:14 +01:00
966896b942
moench: get zmq goes to the receiver instead of shm, setand get threshold energey updates zmq and shm value, setand get roi anyways goes to the ddetector, so only updates zmq or gets it from rxr
2019-02-25 12:57:44 +01:00
4c7a9cd838
moench: set threshold energy and set roi sets jsonheader
2019-02-25 12:34:35 +01:00
c218e391bb
client: rx_tcpport fixed
2019-02-25 11:43:10 +01:00
43ad8b69b3
client: stop and control port get fixed
2019-02-25 09:35:07 +01:00
15fc55f914
client: must print detector or receiver returning error
2019-02-25 09:16:20 +01:00
20edf61e30
ctb server: removed unnecessary prints, resulting in a bug fix for slow adc temp
2019-02-22 13:53:59 +01:00
a1a6a5dbaa
ctb server: slow adc temp fixed
2019-02-22 13:22:40 +01:00
40d15264c5
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
2019-02-21 16:25:07 +01:00
f5244faa02
moench: adding enums for zmq parameters, needs modification in naming
2019-02-21 16:01:24 +01:00
421dbdb9b5
ctb server: including moench as well for programfpga and other client ctb implementations
2019-02-21 16:00:40 +01:00
a4f1b7670f
ctb server bug fixes:update client, get period left, getid(api and serial number), restrict setting vchip, allow write adc
2019-02-21 09:37:49 +01:00
09546a8632
ctb server:
...
- allowed flags resetfpga and programfpga for moench and ctb
- set a minimum voltage for vio as it powers the fpga (1200mV)
- changed the min and max for vchip and power regulators due to tolerance
- fixed pattern read function
- fixed minor bugs with input of ctb patterns(waittime) and mode other than 1
- fixed calibration current register for i2c for tolerance (/1.2268)
- fixed current readout of i2c
- added digital, analog and normal readouts for flags
2019-02-20 15:36:34 +01:00
Erik Frojdh
29d4eb8b41
catch by ref
2019-02-20 10:29:15 +01:00
775bde76c9
ctb server: power regulator adjusted for precision
2019-02-20 09:34:55 +01:00
d876cb6da6
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
2019-02-20 08:47:13 +01:00
69f361468e
ctb: power regulators (set dac, get dac, get adc of voltage and current) works
2019-02-20 08:45:34 +01:00
Erik Frojdh
b52c6b05b8
link and format
2019-02-16 16:46:09 +01:00
4a8a72c447
ctb server: vlimit not impl, adc in degrees
2019-02-14 18:28:32 +01:00
501c579f6b
users: added json parameter for moench api
2019-02-14 18:03:49 +01:00
722883531d
reverted json_emin, emax, framemode and detectormode. All json parameters for moench will go through rx_jsonpara using strings
2019-02-14 17:43:28 +01:00
6be47d936f
conflicts resolved
2019-02-14 17:32:33 +01:00
9aaca14b01
CMakeLists.txt: reordering and removing those we dont use anymore, removed all the Makefiles (except the ones for the detector servers)
2019-02-14 16:15:43 +01:00
c91c2c224a
Merge branch 'add-cmake-packages' of https://github.com/esrf-bliss/slsDetectorPackage into esrf-bliss-add-cmake-packages
2019-02-14 10:36:41 +01:00
230b26a680
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
2019-02-13 20:19:16 +01:00
46aa7769cc
client: added command line and for APIfor framemode and detectormode. Refactorinng required in the future
2019-02-13 20:19:08 +01:00
Erik Frojdh
59f3f0c764
cleaner cmake
2019-02-13 15:59:42 +01:00
Erik Frojdh
d46d96ecca
fixed linking zmq
2019-02-13 15:35:40 +01:00
fd95550724
client: fix for json header values being integer
2019-02-13 12:43:56 +01:00
Samuel Debionne
c064dc84ae
Add generation and install of CMake packages
2019-02-13 10:45:01 +01:00
f9be8b89ac
added functionality to set additional json header key value pairs for prototype ctb, server fixed for eiger compile from ctb integration
2019-02-13 09:37:31 +01:00
031a11c4f7
removed all the warnings and errors from the merge, also removed added -wextra compiler flag, (yet to add additional commands for moench)
2019-02-12 11:09:19 +01:00
a64b34610a
merge from developer (without the additional json header implementations)
2019-02-12 09:35:24 +01:00
a5ee9fbdba
ctb bug fixes: pattern generator, vchip, dacs
2019-02-07 16:51:18 +01:00
140996fae6
ctb adc fix, update detector fix, acq error fix
2019-02-06 18:50:50 +01:00
3f43767d38
ctb client updated
2019-02-06 17:45:19 +01:00
a76cc90972
adc command line bug, ctb api added to client
2019-02-06 17:25:36 +01:00
0c1a3b7756
eiger bug fix: multi hv and eiger should not return -1 if different, ctb : dacs are 24 not 16
2019-02-06 17:07:13 +01:00
Erik Frojdh
536c853d79
hack for receiver port
2019-01-25 19:41:33 +01:00
Erik Frojdh
f1d055138c
moved updateDetector/Receiver
2019-01-25 19:12:28 +01:00
Erik Frojdh
82ce6b639c
more cout
2019-01-25 16:53:19 +01:00
Erik Frojdh
7d9417dffe
fixed debug couts
2019-01-25 16:48:04 +01:00
Erik Frojdh
89ee1d5bcf
new socket for slsDetector
2019-01-25 16:44:29 +01:00
Erik Frojdh
a1c0d28ddb
changed constructor
2019-01-24 11:12:24 +01:00
