1165 Commits

Author SHA1 Message Date
Dhanya Maliakal
c16f251442 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into zmqdata 2016-09-16 15:41:05 +02:00
Dhanya Maliakal
1263e80d21 done 2016-09-16 12:49:27 +02:00
Dhanya Maliakal
1da4b07e73 works, need to do json header and send dataready 2016-09-15 17:15:55 +02:00
Dhanya Maliakal
a821442b1a almosst 2016-09-15 12:16:01 +02:00
Dhanya Maliakal
0f9a841c4a almost done 2016-09-15 10:17:16 +02:00
Dhanya Maliakal
a80da4f677 Merge branch 'developer' into cmake 2016-09-14 14:38:54 +02:00
721249231f add missing preprocessor macro 2016-09-14 12:03:39 +02:00
Dhanya Maliakal
33807b7fac Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into zmqdata 2016-09-14 10:43:33 +02:00
Dhanya Maliakal
557eccb74d almost there 2016-09-14 10:42:51 +02:00
Dhanya Maliakal
652d29f2d9 almost done 2016-09-09 17:51:36 +02:00
988426dc96 Added adc command for chiptestboard 2016-09-05 10:49:47 +02:00
f8b62bba64 add cmake configuration 2016-08-31 20:54:06 +02:00
Dhanya Maliakal
6adc373e18 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer 2016-08-30 16:14:13 +02:00
Dhanya Maliakal
aad1885bf5 updaterev 2016-08-30 16:13:18 +02:00
13aa48e3ec Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer 2016-08-30 09:30:53 +02:00
d5f80831dd Changes to jctb server to correctly change the power supplies 2016-08-30 09:30:31 +02:00
Dhanya Maliakal
cf34103d1f Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer 2016-08-24 16:47:14 +02:00
Dhanya Maliakal
079c7dc169 removed setup_beb.txt not required 2016-08-24 16:47:05 +02:00
511d3e3970 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer 2016-08-22 14:33:09 +02:00
c6c11f6740 Added v_a command for chiptestboard 2016-08-22 14:32:42 +02:00
Dhanya Maliakal
08fd848504 updatereveiger 2016-08-18 10:31:10 +02:00
Dhanya Maliakal
d13a76af25 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer 2016-08-17 10:30:15 +02:00
Dhanya Maliakal
e0c45f4afd solved paralel start bug. due to handshaking deficit in thread start 2016-08-17 10:29:47 +02:00
b90ca7b864 Added DACs for ne chiptestboard; fixed problem on dac14/highvoltage for moench 2016-08-16 15:15:24 +02:00
Dhanya Maliakal
fb8f49985b changes to test 2016-08-15 15:14:15 +02:00
Dhanya Maliakal
597f5e5d2a got rid of unnecesaary handshaking for -1 in dynamic range in receiver 2016-08-15 11:15:52 +02:00
Dhanya Maliakal
1f9dc775f6 ensure receiver is updated when detector timer values are updated (force_update) 2016-08-12 17:44:28 +02:00
Dhanya Maliakal
332b0d221b removed unnecessary logs 2016-08-12 12:13:43 +02:00
Dhanya Maliakal
7239ce083b updaterev 2016-08-12 11:17:39 +02:00
Dhanya Maliakal
6f5e15f60a changed executable name 2016-08-12 11:08:03 +02:00
Dhanya Maliakal
04f2a5c5ed temporarily removed parallel start to debug bug, fixed flat channel bug, fixed bad channel bug 2016-08-12 10:53:26 +02:00
Dhanya Maliakal
56a559090d ratecorrection error def fixed 2016-08-11 13:59:05 +02:00
Dhanya Maliakal
509c4845c2 got rid of annoying get status message 2016-08-08 17:11:30 +02:00
Dhanya Maliakal
56aaaaf182 fixed rate correction to not include 16 bit dr 2016-08-08 15:52:09 +02:00
Dhanya Maliakal
6a87d9e40a forgot to add server executable 2016-08-04 17:28:55 +02:00
Dhanya Maliakal
ef9d64de64 got rid of <0.00015 rate correction error check 2016-08-04 17:27:45 +02:00
Dhanya Maliakal
29ba1f4042 changed transmission delay commands to go through network parameters and included 10g flow control 2016-08-04 17:21:16 +02:00
Gemma Tinti
1e30a6a16a add server to previous change 2016-08-04 09:31:11 +02:00
Gemma Tinti
dd2a0c50e0 rate corr atble changes 2016-08-03 18:07:21 +02:00
Dhanya Maliakal
d28d737fb9 transmission delay added 2016-08-03 17:03:37 +02:00
Dhanya Maliakal
1db5ef4fd4 added 2 gain settings to eigeR 2016-08-03 10:35:11 +02:00
Dhanya Maliakal
e1d54b72f8 created the function to set transmission delay 2016-08-03 09:26:52 +02:00
Dhanya Maliakal
a4e5db038d updaterev 2016-08-02 10:35:08 +02:00
Dhanya Maliakal
89966ae4fe forgot deactivate server for prev commit, added 2016-08-02 10:34:34 +02:00
Dhanya Maliakal
c0db1a89a8 deactivate for eiger 2016-08-02 10:32:37 +02:00
Dhanya Maliakal
ffaf62176f updaterev 2016-07-22 15:30:34 +02:00
Dhanya Maliakal
183563ca0c check firmware version and api version upon server startup 2016-07-22 15:27:46 +02:00
Dhanya Maliakal
ac7063a1a5 check firmware version and api version upon server startup 2016-07-22 15:26:26 +02:00
Dhanya Maliakal
f4a7a5a032 updaterev 2016-07-22 10:42:34 +02:00
Dhanya Maliakal
ee26339fd7 added more accurate temperature sensors for eiger, and to gui 2016-07-22 10:40:58 +02:00