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
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
923a7e8936
eiger and jungfrau server compiles, gotthard and receiver left to do
2018-10-08 14:38:35 +02:00
1c78400369
client compiles, more changes required
2018-10-08 09:34:08 +02:00
b5c35ddeac
slsdetector and users updated to reflect new signatures, not yet compiled
2018-10-05 15:28:25 +02:00
cf37725e04
updated command.cpp to have all the indices including default ones
2018-10-03 15:28:08 +02:00
c6d2902539
updating indices in slsdetectorcommand
2018-10-03 14:31:43 +02:00
fdcd633769
client: multi added indices for detpos in function signature for required
2018-10-03 11:41:50 +02:00
70ea4b48c3
client: removed slsDetectorutils and postprocessing. yet to compile, yet to add detpos index for every multi sls detector command and call from command interface, removed multiple threading, yet to interface with eriks single template for multiple threading
2018-10-03 11:15:39 +02:00
c248b12455
refactored ONLY THE CLIENT first stage, compiles
2018-10-02 15:15:35 +02:00
961489edb1
bugfix gotthard server and client to set roi and disable it, problem still exists with frame numbering between roi modes but can only be fixed in firmware
2018-09-18 18:02:01 +02:00
14c899e7cf
removed some manual warnings
2018-08-24 12:34:06 +02:00
63c130a380
client:updated users class and release.txt
2018-08-22 18:08:35 +02:00
7945d15beb
client: updating release.txt, updating command line help, catching slsDetectorUsers exception from multislsdetector constructor
2018-08-21 18:49:29 +02:00
4e446f1f39
eiger server: changed subperiod to subdeadtime, changing subexptime or subdeadtime sets subperiod in eiger server
2018-08-17 13:45:09 +02:00
f0ac49190a
slsReceiver:trying to get deactivate to work
2018-08-14 15:06:06 +02:00
