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 |
|
Dhanya Maliakal
|
be6925c504
|
fixed temperature for jungfrau in server, also for negative values
|
2017-07-06 16:07:01 +02:00 |
|
Dhanya Maliakal
|
b4309a9f60
|
changed jungfrau temperature conversion but binary to follow
|
2017-07-03 14:45:44 +02:00 |
|
Dhanya Maliakal
|
b05e9c194a
|
makefiles and versioning update complete
|
2017-06-29 17:10:10 +02:00 |
|
Dhanya Maliakal
|
8992d51787
|
correct binary jungfrau
|
2017-06-28 11:26:35 +02:00 |
|
Dhanya Maliakal
|
a7d3006cda
|
added updateversion into makefile while compiling
|
2017-06-28 10:48:03 +02:00 |
|
Dhanya Maliakal
|
ca358e4d17
|
changes to the eiger and jungfrau server regarding getnumberofchans etc a typo bug resulting in could not allocate
|
2017-06-27 17:46:32 +02:00 |
|
Dhanya Maliakal
|
c2af014dad
|
new server
|
2017-06-14 12:07:58 +02:00 |
|
Dhanya Maliakal
|
a46a8cc686
|
updaterev
|
2017-06-14 11:41:11 +02:00 |
|
Dhanya Maliakal
|
9ab2c1eb1f
|
new server
|
2017-06-14 11:40:35 +02:00 |
|
Dhanya Maliakal
|
84d07a3e0c
|
updaterev
|
2017-06-14 11:39:07 +02:00 |
|
Dhanya Maliakal
|
00e742e0e0
|
took out also the ADC and serialspi
|
2017-06-14 11:28:16 +02:00 |
|
Dhanya Maliakal
|
a95dbd2215
|
made some functions common
|
2017-06-14 10:43:15 +02:00 |
|
Dhanya Maliakal
|
3d8903b2da
|
updaterev
|
2017-06-12 18:54:58 +02:00 |
|
Dhanya Maliakal
|
e1eba8dec3
|
new servers
|
2017-06-12 18:53:18 +02:00 |
|
Dhanya Maliakal
|
3fbbeea434
|
update rev
|
2017-06-12 18:51:52 +02:00 |
|
Dhanya Maliakal
|
d41abc2b1c
|
added new jungfraustructure, wiht common detector tcp interface
|
2017-06-12 18:50:18 +02:00 |
|
Dhanya Maliakal
|
c755a8974c
|
done, but need to compile
|
2017-06-09 11:42:25 +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
|
046ac97a9b
|
now need to move it to a new server
|
2017-05-24 17:42:33 +02:00 |
|
Dhanya Maliakal
|
b8f0dd5f38
|
cleaned most of it, just need confirmation from carlos
|
2017-05-24 17:33:03 +02:00 |
|
Dhanya Maliakal
|
0ea61a1e3f
|
somewhere
|
2017-05-24 11:05:37 +02:00 |
|
Dhanya Maliakal
|
978af1009e
|
somewhere in between cleaning up
|
2017-05-22 14:53:15 +02:00 |
|
Dhanya Maliakal
|
39a985cbba
|
modifying registers_m.h wrt Carlos firmware document, modified detector initialization in firmware_funcs.c and related files
|
2017-05-19 18:27:11 +02:00 |
|
|
|
0e9cf558b4
|
Modified JUNGFRAU_MODULE_ID to match the detector type definition that is tx. with the new header.
|
2017-05-10 16:47:10 +02:00 |
|
l_lopez
|
7901b6f463
|
Modified "calcChecksum" function in jungfrauDetectorServer/firmware_funcs.c to compute properly the new IP header checksum for a new application header of 48 bytes.
|
2017-05-01 12:14:06 +02:00 |
|
Dhanya Maliakal
|
bc57ea5725
|
added the binary
|
2017-04-28 11:31:12 +02:00 |
|
Dhanya Maliakal
|
27f752ff9e
|
removed wrong edits in merging (not reflected in git browser, weird); changing server names anyway
|
2017-04-28 11:30:09 +02:00 |
|
