detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-06-03 16:48:28 +02:00
Code Issues Actions Packages Releases Activity
954 Commits 43 Branches 103 Tags
a8fc34c92bdc8794e9c5cc6cd01ac92d226ab987
Commit Graph

950 Commits

Author SHA1 Message Date
Dhanya Maliakal a8fc34c92b included propix for client 2015-07-21 16:26:50 +02:00
Dhanya Maliakal 74fc443db5 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-07-17 13:56:04 +02:00
Dhanya Maliakal 29c62b1721 offsets corrected for 1.5m 2015-07-17 13:55:02 +02:00
Dhanya Maliakal 2ef27b718c updated gotthardserver to reflect v1.0 2015-07-09 16:59:13 +02:00
Dhanya Maliakal 5f0741d882 trimbits flipped and works correctly for top and bottom 2015-07-01 15:00:17 +02:00
Dhanya Maliakal a3a2db1f73 fixed 32 progress problem, and increased debugging 2015-06-30 17:20:23 +02:00
Dhanya Maliakal f29f9b701d check detector mac matches hardware mac only for 1Gbe 2015-06-30 12:28:44 +02:00
Dhanya Maliakal c4e0f2967f solved detector organisation in client side 2015-06-30 11:54:13 +02:00
Dhanya Maliakal 8202e4aa0a git rev in 2015-06-29 16:56:34 +02:00
Dhanya Maliakal f3d5de70bf firmware version for eiger added 2015-06-22 17:09:47 +02:00
Dhanya Maliakal 861753a5d1 formatted changes made by Martin, which inclded resolving fifo full problem, first frame problem; 32 bit mode sub frame and 16 byte ignore 2015-06-16 11:59:07 +02:00
Dhanya Maliakal 8323f81e8a beb includes read, write functions, so that it doesnt have to go to locallink interface 2015-06-15 17:41:48 +02:00
Dhanya Maliakal b11b7c1c09 beb stop acquisiion return, some minor changes, increased the check time for receiver frame after detector read out done using acquisiingDone variable 2015-06-12 17:45:43 +02:00
brueckner_m b193237df3 Making eigerDetectorServer running with the new firmware (request frames/packets is now done in HW) 2015-06-11 11:19:51 +02:00
Dhanya Maliakal c0dac6fd27 receiver can return fail for a get and a message 2015-05-26 17:00:07 +02:00
Dhanya Maliakal ee4fa791be interleaving request messages to different ports of eiger detector 2015-05-26 12:07:43 +02:00
Dhanya Maliakal 9c66e96770 receiver stop command line should not have receiver readout, acquire doesnt hacve it anymore 2015-05-21 11:11:17 +02:00
Dhanya Maliakal 302d9ca0ed added the code for toggle bit to know when acquisition started in febcontrol and list, indentation as well 2015-05-20 12:01:49 +02:00
Dhanya Maliakal 1f1581a1fa no_serial was merged to master 2015-05-13 14:41:25 +02:00
bergamaschi bd3466b04f Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-05-04 13:49:10 +02:00
bergamaschi ba377ec273 Command adcreg added to write to adc registers 2015-05-04 13:48:46 +02:00
brueckner_m 9f8ed3a4b5 Added more debug messages for DMARTIN flag 2015-04-28 17:19:04 +02:00
brueckner_m 7f7e7ca727 Fixed serial assignment. If top=1, serial=0 and vice versa. 2015-04-21 11:57:31 +02:00
brueckner_m 8a8e1b7130 Remove -DMARTIN as default flag 2015-04-21 11:11:32 +02:00
l_brueckner_m 399ae4e669 Added colors for MARTIN debug prints 2015-04-20 18:22:29 +02:00
l_brueckner_m 39cd82f0b8 Added Backend board FPGA temperature support 2015-04-20 18:20:02 +02:00
Dhanya Maliakal e483141a15 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-04-15 14:49:32 +02:00
Dhanya Maliakal 8f4c2001ae warning fixed 2015-04-15 14:49:06 +02:00
bergamaschi 31f06fb567 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-04-10 10:08:34 +02:00
bergamaschi 0c7f2bdceb Changes to pattern generator and jungfrau server 2015-04-10 10:08:12 +02:00
Dhanya Maliakal ee0c6c4a05 1 sec usleep to stop receiver for eiger 2015-03-31 15:00:57 +02:00
Dhanya Maliakal b4f995084c Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-03-31 14:59:49 +02:00
Dhanya Maliakal 9d3a171a28 1 sec usleep to stop receiver for eiger 2015-03-31 14:59:26 +02:00
bergamaschi 714e1a7f72 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-03-31 13:55:21 +02:00
bergamaschi 1edcdff936 Updates for JCTB: adcvpp, save parameters. jungfrauDetectorServer works with JMCBv0.1 2015-03-31 13:54:59 +02:00
Dhanya Maliakal 031ccdf070 change to server for no serial to work 2015-03-30 15:36:55 +02:00
Dhanya Maliakal ea4f596077 removed conflicts 2015-03-26 11:29:29 +01:00
Dhanya Maliakal 1ad0bc56e7 included slsDetectorUsers 2015-03-25 15:26:38 +01:00
bergamaschi f461ddf2b7 slsDetectorUSers re-added to Makefile - don't remove it again 2015-03-23 15:42:12 +01:00
Dhanya Maliakal 477b2fb467 acquire works properly now 2015-03-12 16:47:20 +01:00
Dhanya Maliakal 7e44648da9 different between acquisition index and frame index 2015-03-12 12:22:19 +01:00
Dhanya Maliakal 6232c6584a put executables into git 2015-03-10 16:06:19 +01:00
Dhanya Maliakal 7a2e42d59a changed the way gui polls receiver for data for nth frame and otherwise 2015-03-10 15:03:08 +01:00
Dhanya Maliakal cdd18182a8 resolved client side memory leak caused from gui 2015-03-04 16:24:03 +01:00
Dhanya Maliakal 24b9402e52 eiger ensures the mac address is the same as the software mac address 2015-03-03 16:35:52 +01:00
Dhanya Maliakal 7cca11637a include gemmas 1 module testing as well as multi module testing for serial 2015-03-03 14:23:05 +01:00
Dhanya Maliakal 2c69e45348 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-03-02 13:56:52 +01:00
Dhanya Maliakal 85ccf64175 print receiver configurations for all detectors added 2015-03-02 13:56:23 +01:00
brueckner_m ed50f83fe6 Added extra debug messages (-DMARTIN) 2015-03-02 12:12:23 +01:00
Dhanya Maliakal 875ee02038 got ridf of warnings for eiger server 2015-02-25 10:34:18 +01:00