Erik Frojdh
4036e6af8d
const qualified multi calls, python fixes
2019-03-18 12:06:39 +01:00
5fe7a86361
switching udpsocketbuffersize from uitn64_t to int64_t, printing socket exception into tcp error mess, changing an exception message
2019-03-15 10:00:22 +01:00
d3c1193a71
ctb/moench server, fixed frequency configuring bug, readpattern sleep, detectormode command, jsonheader set even if rxr offline, set speed returnvalue is value not ok/fail, rxr printout missingpackets 64 bit
2019-03-06 10:25:16 +01:00
08bd2378f4
slsReceiver bug fix affecting Jungfrau receivers as root (optlen size as int), but setting buffer size is uint32_t size. setting it to uint64_t
2019-03-04 09:41:20 +01:00
8939e23622
jungfrau feature:storagecell_delay added
2019-03-01 15:26:38 +01:00
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
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
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
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
69f361468e
ctb: power regulators (set dac, get dac, get adc of voltage and current) works
2019-02-20 08:45:34 +01:00
4a8a72c447
ctb server: vlimit not impl, adc in degrees
2019-02-14 18:28:32 +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
46aa7769cc
client: added command line and for APIfor framemode and detectormode. Refactorinng required in the future
2019-02-13 20:19:08 +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
a64b34610a
merge from developer (without the additional json header implementations)
2019-02-12 09:35:24 +01:00
140996fae6
ctb adc fix, update detector fix, acq error fix
2019-02-06 18:50:50 +01:00
a76cc90972
adc command line bug, ctb api added to client
2019-02-06 17:25:36 +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
10539f8533
new getDetectorType functions
2019-01-18 10:53:49 +01:00
Erik Frojdh
49f71ffca7
project wide nullptr fix
2019-01-16 15:15:29 +01:00
Erik Frojdh
fe09f6d062
cleaning up slsDetectorCommand
2019-01-16 10:29:10 +01:00
29c09ab381
bugfix udpport mixup for udpport2 in commands
2019-01-15 12:12:14 +01:00
c1c302f740
removing networkPArameter function complete
2019-01-14 20:42:15 +01:00
Erik Frojdh
1bd0b33806
functions not overriding base and unitialized use
2019-01-11 11:27:48 +01:00
f161d68efc
fix in ltc, added moench, separated servers, left to do max1932, client side for moench and more detailed in ctb server side
2018-12-19 16:38:18 +01:00
Erik Frojdh
88b9a93b3e
fixed
2018-12-19 11:51:42 +01:00
Erik Frojdh
1af2d95462
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
2018-12-19 11:45:24 +01:00
Erik Frojdh
d07f53cd6f
removed using namespace std in slsDetectorCommand.cpp
2018-12-19 11:31:49 +01:00
79693a38f5
in between
2018-12-12 11:20:27 +01:00
8f3f9caf2b
almost done with ctb update, need to do slow adcs, split to moench and ctb
2018-11-30 10:39:26 +01:00
c19c787904
adcreg command line print
2018-11-12 15:14:37 +01:00
70a1b87603
merge conflict resolved
2018-10-30 14:31:20 +01:00
dfa8cf7381
runs, prints right in reciever
2018-10-30 13:35:20 +01:00
92fc837eb4
compiles, but doesnt run
2018-10-29 15:23:52 +01:00
33ac63d14a
still updating slsdetector.cpp
2018-10-26 17:40:18 +02:00
dfad145e14
still in the process of interfacing det and client
2018-10-18 18:08:34 +02:00
Erik Frojdh
0070a79838
removed command threaded
2018-10-17 17:35:55 +02:00
b981fe78ef
connected command to execute command in receiver pc
2018-10-10 12:23:55 +02:00
7d5b24fe33
solved errors with client compile, rxr yet to do
2018-10-09 13:43:50 +02:00
4bcc24a59f
some more changes, yet to do receiver
2018-10-09 12:31:12 +02:00
