Dhanya Maliakal
|
c5e7d44b15
|
looks done
|
2016-10-06 13:49:40 +02:00 |
|
Dhanya Maliakal
|
de2de6315c
|
somewhere
|
2016-10-06 08:44:00 +02:00 |
|
Dhanya Maliakal
|
6da59ca382
|
somewhere, but weird threads
|
2016-10-05 15:26:58 +02:00 |
|
Dhanya Maliakal
|
39baeade37
|
Merge branch 'developer' into zmqdata
|
2016-10-04 14:43:31 +02:00 |
|
Dhanya Maliakal
|
13cff71faf
|
got rid of activate function definition redeclaration in receiver funcs
|
2016-10-04 14:43:02 +02:00 |
|
Dhanya Maliakal
|
7ead69a761
|
merged with developer after it merged with 2.1.1-rc(deactivate)
|
2016-10-04 14:10:52 +02:00 |
|
Dhanya Maliakal
|
a4bb3fe4dd
|
merged with 2.1.1-rc inclding deactivate detectr and receiver
|
2016-10-04 14:06:47 +02:00 |
|
Dhanya Maliakal
|
984698efad
|
merged with developer a lot of bug fixes from 14 sep to 30 sep
|
2016-10-04 13:36:04 +02:00 |
|
Dhanya Maliakal
|
0979d04693
|
works for deactivated server and receiver
|
2016-10-04 07:35:52 +02:00 |
|
Dhanya Maliakal
|
f513fb06fb
|
switching the gpio definitions into function implementation
|
2016-09-30 07:56:54 +02:00 |
|
Dhanya Maliakal
|
d3c4d52118
|
updaterev
|
2016-09-29 10:29:48 +02:00 |
|
Dhanya Maliakal
|
5ae3522028
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2016-09-29 10:28:37 +02:00 |
|
Dhanya Maliakal
|
813b7ba6e7
|
added prgoramfpga functionality, currently gpio definitions required in /etc/rc file, will rectify in later commits
|
2016-09-29 10:28:27 +02:00 |
|
Gemma Tinti
|
8a80cb489d
|
change server with new boundary for counts above teh max
|
2016-09-27 20:47:59 +02:00 |
|
Dhanya Maliakal
|
5c81abdce0
|
jungfrau programming change
|
2016-09-26 12:00:23 +02:00 |
|
Dhanya Maliakal
|
5f4a4b0d90
|
maybe fixed 16 bit rate corr eiger
|
2016-09-23 17:15:16 +02:00 |
|
Dhanya Maliakal
|
1b61e10e36
|
forgot to add eiger binary
|
2016-09-23 14:32:21 +02:00 |
|
Dhanya Maliakal
|
d904f7b32e
|
adding 16 bit rate correction in eiger
|
2016-09-23 14:28:20 +02:00 |
|
Dhanya Maliakal
|
c678199802
|
Merge branch '2.1-rc' into developer
|
2016-09-22 17:19:10 +02:00 |
|
Dhanya Maliakal
|
953e513a2d
|
updatereveiger
|
2016-09-22 17:18:35 +02:00 |
|
Dhanya Maliakal
|
a7c180eb1c
|
settings initially at UNINITIALIZED in eiger server
|
2016-09-22 17:16:49 +02:00 |
|
Dhanya Maliakal
|
d0501c3139
|
creating and destroying sockets for each receiver start and stop in a single acquisition (to deal with scans etc)
|
2016-09-21 16:37:29 +02:00 |
|
Dhanya Maliakal
|
a1df8bdc15
|
done for eiger, some checks for frameindex=-1,socket closing earlier than last socket etc
|
2016-09-20 15:11:39 +02:00 |
|
Dhanya Maliakal
|
d751c626b3
|
done with eiger
|
2016-09-20 10:42:43 +02:00 |
|
Dhanya Maliakal
|
904d21d0be
|
only missing data left to be handled in zmqthread in receiver
|
2016-09-19 17:21:23 +02:00 |
|
Dhanya Maliakal
|
38d477a1ad
|
bug fixed, rapidjson parse error
|
2016-09-19 12:34:31 +02:00 |
|
Dhanya Maliakal
|
f517eb7a41
|
included json example with dummy values
|
2016-09-16 17:19:37 +02:00 |
|
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 |
|
