c7ad548e4c
conflict git fix
2019-03-26 15:01:58 +01:00
7cd5bc8b2d
jungfrau: switching between 2 and 1 interface, implementation for server required when firmware done
2019-03-26 15:00:19 +01:00
8c2ee57591
ctb/moench server: clock fix, max shifts per clock is calculated everytime
2019-03-25 14:41:15 +01:00
cd5aea895b
jungfrau server: changes for new firmware, aligning adc deserializer. ctb serveR: removed unnecessary pll reset and polling mode for pll
2019-03-22 15:09:29 +01:00
5bf37a4f0d
changes to jungfrau server
2019-03-22 11:27:15 +01:00
fa34ad435b
server: pll fix
2019-03-21 16:30:18 +01:00
eb3dff3a6c
eiger server
2019-03-21 14:15:52 +01:00
b99606211b
ctb server: altera pll odd division fix
2019-03-21 14:13:07 +01:00
9d489dc962
servers, gitinfo script updated; ctb/moench server: delay uses sync clock,
2019-03-20 14:39:24 +01:00
44f0dfc3c0
ctbserver: updated firmware version and api
2019-03-19 18:58:42 +01:00
d8c0fb522a
ctb/ moench server fix: usleep of 10 for reading from fifo removed
2019-03-19 17:32:07 +01:00
8520492e4b
lock server bug: sending lockstatus converts to littleendian for eiger, lastclient should have other as datatype for eiger
2019-03-14 14:14:14 +01:00
7d3d2a8b31
ctb and moench server: pll vco clock changed from 400 to 800,ctb server: max adc clock from 40 to 65MHz
2019-03-13 16:03:11 +01:00
ec18db868f
ctb, moench, jungfrau server: changing phase only changes one clock in one direction. ctb and moench phase shift connected to adc clk, instead of run clk
2019-03-13 08:37:45 +01:00
6765fd0dc8
ctb moench: bugfix for fifofull, should not read pattern, same as executing it
2019-03-08 16:59:44 +01:00
658438df3b
ctb moench server update: (fw update): det id changed, status reg looks at anyfifofull instead of somefifofull, datapresent looks at corresponding analog/digital fifo empty, usleep after read strobe to sync different clock
2019-03-07 17:36:35 +01:00
ca817c6ae9
client: update roi on updatedetector, (ctb, moench)moved nchans and databyte calculated to updatenumberofchannels and called for any update in roi, readoutflag or #samples changed (get should not update). ctb,moench server: roi fixed, . gotthard server: bug fix waiting to finish, ad9252 spi call fix. receiver: updated for moench and 10g
2019-03-06 17:25:18 +01:00
0765b330f1
ctb and moench, exptime connects to set pattern wait time with level 0
2019-03-06 15:17:54 +01:00
abc7a9bd2f
moench has only analog readout
2019-03-06 14:52:21 +01:00
d3c1193a71
ctb/moench server, fixed frequency configuring bug, readpattern sleep, detectormode command, jsonheader set even if rxr offline, set speed returnvalue is value not ok/fail, rxr printout missingpackets 64 bit
2019-03-06 10:25:16 +01:00
c56561bc9f
updated ctb and moench, moench not tested
2019-03-05 09:38:10 +01:00
8939e23622
jungfrau feature:storagecell_delay added
2019-03-01 15:26:38 +01:00
d2d50a56df
eiger server/client bug fix: readout flag of -1
2019-03-01 14:08:28 +01:00
8c067437e6
ctb moench: added feature set pattern mask and set pattern bit mask, removed CTB prefix for all the patern functions
2019-03-01 12:28:11 +01:00
35b1ad39f7
ctb moench: feature to set digital io pin delay, changed print from unsuccessful to failed, maxpatternlength in server is inclusive
2019-03-01 10:45:01 +01:00
bb81613900
ctb, moench: implemented led enable feature
2019-03-01 09:00:04 +01:00
ebee9e308e
ctb server: reserved not required, as the additional space in last packet can be calcualted
2019-02-28 16:14:45 +01:00
debf3a1b01
ctb readout works with receiver for digital readout, allocate ram in server only if 1g udp, free addr info only when setting new udp detals upon configuring ,brough readout flags to receiver
2019-02-28 16:07:47 +01:00
96584ce397
ctb: enable tengiga in server and moved everything to list implementation
2019-02-28 11:32:10 +01:00
7f2197fc4f
slsReceiver & client: 10genable allowed for moench and ctb, ctb server: better way to divide to packets to send via udp
2019-02-28 10:09:54 +01:00
302d9f0633
ctb server: back to 10g def
2019-02-28 08:51:07 +01:00
f80483de6e
ctb server: (bug fixes, udp sending feature instead of tcp, better debugging prints,
...
digital readout mode (fifoempty flag in status register is always up, so it is idle for this readout mode),
pattern loop bugs, max_pattern_length redefined in server side, do not update period for ctb and moench in setreceiver
2019-02-28 08:46:26 +01:00
eecfcae312
ctbserver: dac -1 check limit error
2019-02-25 08:58:35 +01:00
20edf61e30
ctb server: removed unnecessary prints, resulting in a bug fix for slow adc temp
2019-02-22 13:53:59 +01:00
a1a6a5dbaa
ctb server: slow adc temp fixed
2019-02-22 13:22:40 +01:00
a8121ae108
ctb server: vio should be off at start up
2019-02-22 09:03:30 +01:00
617f3d2600
ctb server: modified program fpag in case of errors
2019-02-21 15:56:51 +01:00
a4f1b7670f
ctb server bug fixes:update client, get period left, getid(api and serial number), restrict setting vchip, allow write adc
2019-02-21 09:37:49 +01:00
09546a8632
ctb server:
...
- allowed flags resetfpga and programfpga for moench and ctb
- set a minimum voltage for vio as it powers the fpga (1200mV)
- changed the min and max for vchip and power regulators due to tolerance
- fixed pattern read function
- fixed minor bugs with input of ctb patterns(waittime) and mode other than 1
- fixed calibration current register for i2c for tolerance (/1.2268)
- fixed current readout of i2c
- added digital, analog and normal readouts for flags
2019-02-20 15:36:34 +01:00
775bde76c9
ctb server: power regulator adjusted for precision
2019-02-20 09:34:55 +01:00
69f361468e
ctb: power regulators (set dac, get dac, get adc of voltage and current) works
2019-02-20 08:45:34 +01:00
c93f88b7e5
ctb server: fixed dacs, power regulators and vchip
2019-02-15 17:08:49 +01:00
4a8a72c447
ctb server: vlimit not impl, adc in degrees
2019-02-14 18:28:32 +01:00
Erik Frojdh
59f3f0c764
cleaner cmake
2019-02-13 15:59:42 +01:00
f9be8b89ac
added functionality to set additional json header key value pairs for prototype ctb, server fixed for eiger compile from ctb integration
2019-02-13 09:37:31 +01:00
a64b34610a
merge from developer (without the additional json header implementations)
2019-02-12 09:35:24 +01:00
985b2eba4d
ctb registers updated
2019-02-07 18:05:15 +01:00
a5ee9fbdba
ctb bug fixes: pattern generator, vchip, dacs
2019-02-07 16:51:18 +01:00
166541bd15
ctb adc phase get fix
2019-02-06 19:05:11 +01:00
140996fae6
ctb adc fix, update detector fix, acq error fix
2019-02-06 18:50:50 +01:00
