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
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
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
fd95550724
client: fix for json header values being integer
2019-02-13 12:43:56 +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
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
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
Erik Frojdh
99a1c609f1
starting to add new Socket interface
2019-01-23 11:47:13 +01:00
Erik Frojdh
b200138730
data types and format
2019-01-21 14:43:24 +01:00
Erik Frojdh
a4fec1e750
format and no check before delete
2019-01-21 12:10:00 +01:00
Erik Frojdh
603b217b54
clang-tidy modernize
2019-01-18 15:15:39 +01:00
Erik Frojdh
449e4da892
removed potential memory leak in readSettingsFile
2019-01-18 15:13:17 +01:00
Erik Frojdh
1ec9d950d5
malloc to new
2019-01-18 15:00:52 +01:00
Erik Frojdh
1b28cc88ff
step one project reorganization
2019-01-18 14:41:04 +01:00
Erik Frojdh
10539f8533
new getDetectorType functions
2019-01-18 10:53:49 +01:00
Erik Frojdh
dd93117b06
strcpy to sls::strcpy_safe
2019-01-15 17:36:21 +01:00
8bc9fa54fc
insignificant print
2019-01-15 13:18:40 +01:00
a9fb476543
changing signature from std::string to const std::string& for client receiver ip functions
2019-01-15 13:14:43 +01:00
f2669adda7
Merge branch 'refactor' into networkParameterFix
2019-01-15 12:12:53 +01:00
8738700e8a
insignificant
2019-01-15 11:58:59 +01:00
c1c302f740
removing networkPArameter function complete
2019-01-14 20:42:15 +01:00
Erik Frojdh
991567ba1c
strcpy and cleanup of configuremac
2019-01-14 15:33:35 +01:00
f0b29cfecc
signatures fixed for setnetworkparameter
2019-01-14 15:26:58 +01:00
Erik Frojdh
b7582e93d3
working on removing undefined beaviour in configureMAC
2019-01-11 16:56:31 +01:00
Erik Frojdh
5ea5e83236
removing local variable in slsDetector::setTCPSocket and adding some const string&
2019-01-11 14:38:56 +01:00
Erik Frojdh
b46fb5e9c4
deduce parallel call only on function signature and some const&
2019-01-11 12:33:11 +01:00
Erik Frojdh
c6a597c3ec
minor changes and removed W flag not found
2019-01-11 11:07:50 +01:00
b38a41493b
bug fix, clock divider hangs due to incorrect number of arguments
2019-01-10 16:27:23 +01:00
Erik Frojdh
37c22dfeb2
range based loops and bool literals
2019-01-10 16:07:47 +01:00
Erik Frojdh
15235ab4fc
default initializer for slsDetector
2019-01-10 16:02:29 +01:00
Erik Frojdh
0f50b9f161
clang-tidy nullptr
2019-01-10 15:28:43 +01:00
Erik Frojdh
58f97d4f46
clang-tidy push_back -> emplace_back
2019-01-10 15:24:58 +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
89d9204e1c
changed fd and some unused store
2018-12-19 12:24:02 +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
8942098a90
gotthard works, data to be authenticated when personnel available
2018-11-09 15:25:26 +01:00
