132 Commits

Author SHA1 Message Date
bc70cc3a26 jungfrau server: added storage start, connected auto_comp_disable, changed adcphase, added ADC_PORT_INVERT_VAL, ADC_OFST_HALF_SPEED_VAL, minimum exposure time 2018-04-13 17:33:46 +02:00
e024774323 added storage cells 2018-04-13 15:05:43 +02:00
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
a36b715eab resolved conflicts from merging 3.1.1 in here 2018-03-21 09:03:31 +01:00
59ad15b54e eiger server bug fix: in 10giga mode always used the 1g ip (dhcp ip) if detectorip is before tengiga in config file 2018-03-20 16:36:45 +01:00
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
40210ae26f jungfrauserver adcphase fix: bug was if adcphase was same as previous value, it still shifted 2018-03-14 17:20:26 +01:00
b58c3e8951 solving merging conflicts from 3.1.0 to developer 2018-03-14 15:45:35 +01:00
fee6465213 eiger and jungfrau servers int to uint32_t for read and write registers 2018-03-08 16:46:15 +01:00
3878212ffd jungfrau server adcphase not responding to a get properly 2018-03-08 15:17:14 +01:00
aa190fda7a merge from 3.0.1: eiger server detip and mac client updated back 2018-02-07 15:24:44 +01:00
5198e67dbd made the detector ip and detector mac update client in configuremac 2018-02-07 15:16:16 +01:00
897cbac27d merge from 3.0.1 for server binaries (adcphase,server dates, temp control, settings file 2018-02-07 11:02:36 +01:00
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
3da6a6df65 merge conflict removed, jungfrau server and eiger server re compiled 2018-02-05 12:33:05 +01:00
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
5d04067973 added auto comp disable feature 2018-02-02 18:01:01 +01:00
Dhanya Maliakal
08fda2b662 in between in terms of mythen3 server, done with setdac and set power 2018-02-01 17:48:43 +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
d879379aa4 jungfrau server: incorporated transmission delay 2018-01-11 11:33:26 +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
7ff23b25b3 merge bug fix of set module 2017-10-27 16:16:29 +02:00
Dhanya Maliakal
1420921291 Merge branch '3.0' into 3.0.1 2017-10-27 15:47:15 +02:00
Dhanya Maliakal
92f988ddc1 somewhere 2017-10-27 14:00:57 +02:00
Dhanya Maliakal
986826cbe9 x y z and id are written to the udp header for eiger 2017-09-26 16:39:02 +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
56aa4be358 added eiger virtual class. eiger server minor bug fix. 1. copying local trimbits over from module (in effect same thing)2.rate correction table calculated each time and now only when period is different 2017-08-30 15:29:58 +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
af079f3168 posisibility to read adnd write registers in the front end board for eiger 2017-08-10 14:49:02 +02:00
Dhanya Maliakal
389f356a3a high voltage reflects the master only, if 2 masters reflects -1 2017-08-10 11:09:44 +02:00
Dhanya Maliakal
a583f3d6e2 some more changes to make file for automatic versioning 2017-07-10 11:18:41 +02:00
Dhanya Maliakal
a95dbd2215 made some functions common 2017-06-14 10:43:15 +02:00
Dhanya Maliakal
74ca3fcc9a jungfrau server works 2017-06-12 18:27:59 +02:00
Dhanya Maliakal
132a9bbfe9 solved many bugs, but cannot get data in eiger 2017-06-09 16:02:58 +02:00
Dhanya Maliakal
c755a8974c done, but need to compile 2017-06-09 11:42:25 +02:00
Dhanya Maliakal
0254ff0281 cleaning up of servers 2017-06-02 19:29:34 +02:00
Dhanya Maliakal
2465eafff0 somewhere in between 2017-05-30 19:00:11 +02:00
Dhanya Maliakal
f74710998d mannnnyyyy changes to jungfrau serverin structure, also to eiger structure a bit 2017-05-26 18:14:44 +02:00
Dhanya Maliakal
62de278f24 bug fix: loading trimbit file should not care about settings 2017-02-27 16:05:27 +01:00
Dhanya Maliakal
3d2264fa56 updaterev 2017-02-10 11:50:13 +01:00
Dhanya Maliakal
87ce1ed736 moved tau to settings file, removed gain and offset, setting threshold loads settings file, setting threshold only sets client variable 2017-02-03 12:29:44 +01:00
Dhanya Maliakal
111856ed7b hv should work now 2017-01-06 15:16:05 +01:00
Dhanya Maliakal
b1a3a224ff implemented high voltage for normal modules 2016-11-11 14:43:18 +01:00
Dhanya Maliakal
391ad67e8c changing the mess return from acq finished eiger server:trial for 9m lag bug 2016-10-27 09:20:21 +02:00
Dhanya Maliakal
81d96a047d slsDetector/slsDetectorCommand.cpp 2016-10-20 07:31:53 +02:00
Dhanya Maliakal
28f96f4b51 included a febl and febr temp read 2016-10-07 15:44:13 +02:00
Dhanya Maliakal
d904f7b32e adding 16 bit rate correction in eiger 2016-09-23 14:28:20 +02:00