|
|
b58c3e8951
|
solving merging conflicts from 3.1.0 to developer
|
2018-03-14 15:45:35 +01:00 |
|
|
|
258de4947a
|
updated doc
|
2018-03-12 15:46:20 +01:00 |
|
|
|
72970c9669
|
updated binaries, updated manuals, updated git versioning
|
2018-03-12 14:21:02 +01:00 |
|
Erik Frojdh
|
b389402d64
|
Merge branch '3.1.0-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 3.1.0-rc
|
2018-03-08 17:13:20 +01:00 |
|
Erik Frojdh
|
0d2dd93498
|
changed setBit and getBit to uint32_t
|
2018-03-08 17:13:13 +01:00 |
|
|
|
fee6465213
|
eiger and jungfrau servers int to uint32_t for read and write registers
|
2018-03-08 16:46:15 +01:00 |
|
Erik Frojdh
|
339956e5de
|
changed from int to uint32_t in read and writeRegister
|
2018-03-08 16:08:31 +01:00 |
|
|
|
3878212ffd
|
jungfrau server adcphase not responding to a get properly
|
2018-03-08 15:17:14 +01:00 |
|
|
|
7649865a8f
|
jungfrau bug fix: adc phase corrected to correctly return value in -1
|
2018-03-08 14:02:02 +01:00 |
|
Erik Frojdh
|
06cdf8ad92
|
overloading access operator
|
2018-02-28 17:34:55 +01:00 |
|
|
|
28101bed22
|
updated binaries
|
2018-02-27 14:37:46 +01:00 |
|
|
|
1f6c289fd4
|
gotthard server : bugfix for getting id
|
2018-02-27 14:33:58 +01:00 |
|
|
|
61e7c0148f
|
updating versions to 3.1.0
|
2018-02-27 12:40:53 +01:00 |
|
|
|
5849725b97
|
posisibility to overwrite rx_udpmac even with receiver
|
2018-02-26 18:22:07 +01:00 |
|
|
|
74f327a959
|
gotthard server: red in stopping server for debugging
|
2018-02-26 17:34:35 +01:00 |
|
|
|
de3bfd85a1
|
fixed gothard not taking initial images after configuring MAC of detector.
|
2018-02-26 17:07:12 +01:00 |
|
|
|
d14234ee38
|
jungfrau server bianries
|
2018-02-26 14:43:53 +01:00 |
|
|
|
a4aa862ee4
|
bugfix jungfrau server : tdma bit also needs to be set to enable
|
2018-02-26 14:43:11 +01:00 |
|
|
|
0b017b886c
|
added release documentation
|
2018-02-26 13:28:31 +01:00 |
|
|
|
7859df6aa3
|
bug fix: 1000+ errors on gui startup(setreceiveronline not done), removed gui mesage popup for different output paths, fixed jungfrau to have multiple detectors in x dir in gui
|
2018-02-26 12:44:32 +01:00 |
|
|
|
ebe1ff4563
|
jungfrau virtual server needed the stop server as well
|
2018-02-23 15:32:05 +01:00 |
|
|
|
c3d6852f97
|
fixed threshold returning 1 if a trimbit file missing for eiger, it now returns -1, as both values are different
|
2018-02-23 14:49:18 +01:00 |
|
|
|
1e479a5c77
|
Merge branch '3.0.1' of github.com:slsdetectorgroup/slsDetectorPackage into 3.0.1
|
2018-02-23 12:48:25 +01:00 |
|
|
|
9322c176f2
|
jungfrau server virtual
|
2018-02-23 12:48:11 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
Erik Frojdh
|
76bd2c69bc
|
added vrs to Eiger dacs to interpolate
|
2018-02-19 12:04:05 +01:00 |
|
Erik Frojdh
|
77aa3fa215
|
added overloading of call operator for access detector
|
2018-02-16 15:25:35 +01:00 |
|
|
|
459b588b9f
|
merge from 3.0.1 for gotthard 25um server start acq delay
|
2018-02-08 15:17:52 +01:00 |
|
|
|
8bf03a7712
|
Merge branch '3.0.1' into developer
|
2018-02-08 15:16:49 +01:00 |
|
|
|
4338217bda
|
jungfrau 25um server, added start acq delay to server config file
|
2018-02-08 15:16:23 +01:00 |
|
|
|
895f8ccf81
|
Merge branch '3.0.1' into developer
|
2018-02-08 14:51:20 +01:00 |
|
Erik Frojdh
|
0cb5941fc4
|
Merge branch '3.0.1' into condatest
|
2018-02-08 13:52:51 +01:00 |
|
|
|
f7bf1ae2f1
|
gotthard server simplified trigger, remove synchronization and master for 50um, changed measurement time, fixed compiler bugs
|
2018-02-08 11:40:35 +01:00 |
|
Erik Frojdh
|
dde032acc8
|
reverting locations
|
2018-02-08 10:54:07 +01:00 |
|
Erik Frojdh
|
23c5a73285
|
Merge branch '3.0.1' into condatest
|
2018-02-08 10:36:06 +01:00 |
|
|
|
a654febb7e
|
merge from 3.0.1 parallalize dr
|
2018-02-07 15:48:39 +01:00 |
|
|
|
94b61ea2c4
|
parallelized setting dynamic range
|
2018-02-07 15:45:59 +01:00 |
|
|
|
aa190fda7a
|
merge from 3.0.1: eiger server detip and mac client updated back
|
2018-02-07 15:24:44 +01:00 |
|
|
|
a6b917851c
|
finetuning printout
|
2018-02-07 15:22:19 +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 |
|
|
|
ecf1e9fac1
|
bugfix: returning pointer to local variable, char* to string in function definition
|
2018-02-07 10:14:52 +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 |
|
|
|
c520f10409
|
jungfrau server binaries
|
2018-02-02 15:19:10 +01:00 |
|
|
|
1872deb1dd
|
fix for temperature workaround for fpga
|
2018-02-02 15:17:40 +01:00 |
|
|
|
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 |
|
