Commit Graph

138 Commits

Author SHA1 Message Date
maliakal_d bdcccb7732 jungfrau server, changed api, fixed regdefs 2018-04-13 11:43:30 +02:00
maliakal_d 5ff2e86060 jungfrau server configuring ASIC timer at server startup 2018-04-13 11:07:22 +02:00
maliakal_d d28f293485 jungfrau and eiger server bug fix: module_firmware_version gets stuck as it expects an int, but should have been for module_serial_number 2018-04-06 12:15:57 +02:00
maliakal_d a36b715eab resolved conflicts from merging 3.1.1 in here 2018-03-21 09:03:31 +01:00
maliakal_d 688dd15fe9 Jungfrau bug fix: cannot give same adcphase value to pll, updated recommended default of adcphase for half speed and quarter speed, updated client manuals for both adcphase and clkdivider 2018-03-20 12:12:38 +01:00
maliakal_d 40210ae26f jungfrauserver adcphase fix: bug was if adcphase was same as previous value, it still shifted 2018-03-14 17:20:26 +01:00
maliakal_d b58c3e8951 solving merging conflicts from 3.1.0 to developer 2018-03-14 15:45:35 +01:00
maliakal_d fee6465213 eiger and jungfrau servers int to uint32_t for read and write registers 2018-03-08 16:46:15 +01:00
maliakal_d 3878212ffd jungfrau server adcphase not responding to a get properly 2018-03-08 15:17:14 +01:00
maliakal_d 61e7c0148f updating versions to 3.1.0 2018-02-27 12:40:53 +01:00
maliakal_d d14234ee38 jungfrau server bianries 2018-02-26 14:43:53 +01:00
maliakal_d a4aa862ee4 bugfix jungfrau server : tdma bit also needs to be set to enable 2018-02-26 14:43:11 +01:00
maliakal_d 0b017b886c added release documentation 2018-02-26 13:28:31 +01:00
maliakal_d ebe1ff4563 jungfrau virtual server needed the stop server as well 2018-02-23 15:32:05 +01:00
maliakal_d 9322c176f2 jungfrau server virtual 2018-02-23 12:48:11 +01:00
maliakal_d 639fdac232 created jungfrau virtual server(in next commit), edited install manual to give out html pages without subsection toc, links, navigaion, spilit into as many sections etc for wiki page 2018-02-23 12:45:31 +01:00
lopez_c 7364f674ed [JUNGFRAU] - Modified memory map address shift for the interface between FPGA and Blackfin SOM. Shift has to be set to 1 since the basic AMC data transfers is 8-bit and not 16-bit. 2018-02-22 11:15:24 +01:00
maliakal_d 897cbac27d merge from 3.0.1 for server binaries (adcphase,server dates, temp control, settings file 2018-02-07 11:02:36 +01:00
maliakal_d 618f6291cf server binaries for all, jungfgrauserver with adcphase returning something, serverclient interface fixed for others not using tempcontrol, detectornumber not used for settings file for non eiger/mythen, server dates removing rev number 2018-02-07 09:23:52 +01:00
maliakal_d 3da6a6df65 merge conflict removed, jungfrau server and eiger server re compiled 2018-02-05 12:33:05 +01:00
maliakal_d e6bd874a88 modified jungfrau server and client to make auto_comp_disable a not yet implemented feature as it requires a firmware upgrade 2018-02-05 11:50:22 +01:00
maliakal_d 5d04067973 added auto comp disable feature 2018-02-02 18:01:01 +01:00
maliakal_d c520f10409 jungfrau server binaries 2018-02-02 15:19:10 +01:00
maliakal_d 1872deb1dd fix for temperature workaround for fpga 2018-02-02 15:17:40 +01:00
maliakal_d e6f475d7c4 jungfrau server changes in temperature control for fpga bug: default temp threshold and temp event cleared at start and power reg only reads enable and not status 2018-02-02 12:37:52 +01:00
Dhanya Maliakal 061abf7be0 jungfrau server: changes to ensure no update of detector during this, included power chip to read the status bit and give error if temp event is up 2018-01-11 16:52:08 +01:00
Dhanya Maliakal 2d6e4c95a2 temp_threshold, temp_control, temp_event done 2018-01-11 15:37:24 +01:00
Dhanya Maliakal a87687199f jungfrau server: minor typo in previous ocmmit 2018-01-11 11:36:40 +01:00
Dhanya Maliakal d879379aa4 jungfrau server: incorporated transmission delay 2018-01-11 11:33:26 +01:00
Dhanya Maliakal 8fc3d97e78 jungfrau server: changed delay to trigger delay to have better trigger being caught 2018-01-11 09:26:50 +01:00
Dhanya Maliakal beabd03be2 jungfrau server: (also previous commit) date changed to have only 6 nibbles in format yymmdd 2018-01-11 09:24:49 +01:00
Dhanya Maliakal 348a426242 updating to have developer's debug mode, resetfpga, programfpga and added api versioning, changed software date to only have date 2018-01-11 09:14:45 +01:00
Dhanya Maliakal 68d6c514a9 jungfrau server has same resetfpga, programfpga and debug mode as developer branch, eiger server has effects from debug flag, but not compiled 2018-01-10 15:49:40 +01:00
Dhanya Maliakal 24c305ec59 solved conflicts from merge of version being used to binary 2017-12-06 19:07:06 +01:00
Dhanya Maliakal c4a242e10a changed all variables from svn to git, included --version for receiver binary 2017-12-06 10:29:57 +01:00
Dhanya Maliakal d9fcac0236 updated merge from 3.0 hotfix setdac 2017-11-16 12:32:38 +01:00
Dhanya Maliakal f192164e32 fixed setdac bug that comes rarely, moved serialize spi to 32bit 2017-11-16 12:27:58 +01:00
Dhanya Maliakal 7c9958db04 updated binary merge from 3.0 regarding settings 2017-11-15 10:36:55 +01:00
Dhanya Maliakal 956625bb50 Merge branch '3.0' into developer 2017-11-15 10:35:20 +01:00
Dhanya Maliakal dd1cf42a73 proper fix for settings, including dacs 2017-11-14 17:51:13 +01:00
Dhanya Maliakal b75dde4613 merge bug fix of set module 2017-10-27 16:17:12 +02:00
Dhanya Maliakal f6989d5539 merge bug fix of set module 2017-10-27 16:16:38 +02:00
Dhanya Maliakal 7ff23b25b3 merge bug fix of set module 2017-10-27 16:16:29 +02:00
Dhanya Maliakal 045a7cfcb1 removed settings bug, highvoltage returning 60 when switched off 2017-10-27 15:38:07 +02:00
Dhanya Maliakal 92f988ddc1 somewhere 2017-10-27 14:00:57 +02:00
Dhanya Maliakal 663fd557ff client gives now 3d positions of detector to be configured in udp header, only in jungfrau firmware till now 2017-09-22 15:28:57 +02:00
Dhanya Maliakal 862169e178 jungfrau with the option to start in debug mode to bypass the checks and tests 2017-09-20 16:20:39 +02:00
Dhanya Maliakal c635b19941 fixed jungfrau image after programfpga, fixed resetfpga 2017-09-14 15:55:55 +02:00
Dhanya Maliakal ec4be4f2c0 bugfix: framesl was not conected, exptime default time is 10 us 2017-08-18 16:11:49 +02:00
Dhanya Maliakal a583f3d6e2 some more changes to make file for automatic versioning 2017-07-10 11:18:41 +02:00