|
|
def79807f6
|
merge conflict resolved from 4.0.0
|
2018-09-28 16:28:21 +02:00 |
|
|
|
ed0b22b500
|
updated binaries
|
2018-08-24 13:18:51 +02:00 |
|
|
|
1b55fdad86
|
merged selected patches from 4.0.0 branch
|
2018-08-24 13:10:16 +02:00 |
|
|
|
0781344117
|
updating binaries
|
2018-08-22 19:00:21 +02:00 |
|
|
|
4e446f1f39
|
eiger server: changed subperiod to subdeadtime, changing subexptime or subdeadtime sets subperiod in eiger server
|
2018-08-17 13:45:09 +02:00 |
|
|
|
87e8333dfd
|
slsDetectorSoftware & eiger server: fixed coordinates in 2 d, but switch to row (x), col(y); numdetx and numdety sent to all receivers now, likely bug fix virtual file linked in master for 1 mod jungfrau; xccoord and y coord calculated at setdetector pos and given to listener
|
2018-08-15 19:02:16 +02:00 |
|
|
|
fa175ac934
|
eiger server: updated binaries
|
2018-08-10 19:14:52 +02:00 |
|
|
|
0018fa46f8
|
slsDetectorSoftware: Eiger server, added 3 commands, measuredperiod,measuredsubperiod, status trigger. measured period is in 10ns in det server, status trigger reads reg,sets bit and unsets bit
|
2018-08-10 19:14:05 +02:00 |
|
|
|
2fc98c7a54
|
updated binaries, eiger jungfrau
|
2018-07-18 15:04:47 +02:00 |
|
|
|
53423a42ac
|
slsDetectorSoftware eiger and jungfrau server version API updated
|
2018-07-10 15:04:59 +02:00 |
|
|
|
cf8b0de433
|
slsReceiver, slsDetector, eiger and jungfrau server: client checks firmware and software an dreceiver compatibility for each time shared memory is cleaned up
|
2018-05-28 19:11:34 +02:00 |
|
|
|
4d4e4a4ce7
|
first draft of versioning of client
|
2018-05-24 16:58:07 +02:00 |
|
|
|
c5262458d5
|
eiger and jungfrau server, updated virtual versions with start and stop acquisition
|
2018-05-23 15:28:39 +02:00 |
|
|
|
cb635d800a
|
eiger server: added overflow, noverflow to the flags to show/not show saturation when there is overflow in any of the single subframes in 32 bit mode
|
2018-05-22 18:43:13 +02:00 |
|
|
|
bdf9373e0d
|
gotthard and jungfrau servers do not need to send whole module for sending settings anymore
|
2018-05-22 14:52:53 +02:00 |
|
|
|
e19a27bf62
|
eiger server: bug fix for saving trimbits to file, was copying from destination to source in server
|
2018-05-22 10:59:04 +02:00 |
|
|
|
b4d9a6a09d
|
slsReceiver, slsDetector(eiger server), client: added sub period to receiver, fixed eiger subperiod updates to client, added subperiod and subexptime to users, fixed hdf5 warnings
|
2018-05-17 12:34:18 +02:00 |
|
|
|
51fd9ed423
|
added subperiod in command line
|
2018-05-16 09:13:43 +02:00 |
|
|
|
23d73ae5ae
|
jungfrau server: programming allowed only in -update or -dev mode, -dev strictly for Carlos, in update mode one can only do programming
|
2018-05-11 13:42:46 +02:00 |
|
|
|
30f1e6ad3f
|
eiger and jungfrau server, updated binaries
|
2018-05-09 15:28:34 +02:00 |
|
|
|
a37bbc50fe
|
updated server binaries
|
2018-05-02 17:48:46 +02:00 |
|
|
|
11475316fd
|
eiger binary updated
|
2018-04-25 17:11:52 +02:00 |
|
|
|
8cf6e0cbd6
|
in between
|
2018-04-06 17:48:10 +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 |
|
|
|
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 |
|
|
|
61e7c0148f
|
updating versions to 3.1.0
|
2018-02-27 12:40:53 +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 |
|
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
|
d2fd0cbee9
|
x y and z coordinates are pushed into eiger server and its fixed in appropriate client side as well
|
2017-10-23 12:20:18 +02:00 |
|
Dhanya Maliakal
|
d2767afa7c
|
added the eiger server binary with merges from 3.0.1
|
2017-10-12 14:57:12 +02:00 |
|
|
|
311059d748
|
merge fix from 3.0.1 which includes server without crash, multi settimer -1 bug, need to recompile eiger server for this branch
|
2017-10-12 14:42:57 +02:00 |
|
Dhanya Maliakal
|
fe6e1c8868
|
new eiger server binary with status fixed
|
2017-10-12 11:48:43 +02:00 |
|
Dhanya Maliakal
|
eb78ae0fe1
|
new eiger server binary with status fixed
|
2017-10-12 11:44:46 +02:00 |
|
|
|
8585a536ec
|
fixed eiger server status problem, updating binary in next commit
|
2017-10-12 11:42:37 +02:00 |
|
|
|
338fb2af35
|
in betwee, fixed eiger server error
|
2017-10-12 11:38:26 +02:00 |
|
|
|
a6e520d969
|
in between stage: error in compiling eiger server with error status: include file
|
2017-10-12 11:35:31 +02:00 |
|
|
|
eb32335194
|
trying changes to server for error
|
2017-10-12 10:51:47 +02:00 |
|
Dhanya Maliakal
|
44bf4c52ed
|
changes for eiger server to return error if error
|
2017-10-06 13:48:06 +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
|
c2f6e5b20c
|
modifying to adjust to common basic tests debug mode for jungfrau
|
2017-09-21 17:58:10 +02:00 |
|
Dhanya Maliakal
|
91f3db6691
|
separated virtual master and slave executables
|
2017-08-30 15:38:43 +02:00 |
|
