|
c01ce3d514
|
Merge branch 'developer' into g2cont
|
2020-09-24 17:18:04 +02:00 |
|
|
99642dad69
|
g2 fix: cont trigger frames in rxr should be 1
|
2020-09-24 17:16:46 +02:00 |
|
Dhanya Thattil
|
2c1fddee84
|
Cmddacs (#189)
Moved dacs to it's own command for command line.
Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
|
2020-09-24 17:16:34 +02:00 |
|
|
8483e05f4c
|
binary in
|
2020-09-24 15:44:07 +02:00 |
|
|
d96352f2ae
|
g2:fix for period in trigger cont
|
2020-09-24 15:43:14 +02:00 |
|
Dhanya Thattil
|
3f19f29c9e
|
G2ContTrigger (#188)
* g2: setting #frames to 1 and period to 0 for cont trigger, extra frame reg is set to #frames for cont auto and #trigger for cont trigger
|
2020-09-24 11:59:11 +02:00 |
|
|
4ad486fda0
|
Merge branch 'developer' into eigerserverlock
|
2020-09-21 17:28:38 +02:00 |
|
|
54ca9f7ebb
|
wip, doc
|
2020-09-21 17:09:39 +02:00 |
|
|
608b71d5ea
|
Merge branch 'eigerserverlock' of github.com:slsdetectorgroup/slsDetectorPackage into eigerserverlock
|
2020-09-18 18:16:09 +02:00 |
|
|
c83daab56d
|
merge solved
|
2020-09-18 18:15:54 +02:00 |
|
|
c3366a6748
|
g2 binary in
|
2020-09-18 17:59:48 +02:00 |
|
|
7c21aa96a9
|
g2: setting continuous mode frames in naother reg, and when changing from burst to continous
|
2020-09-18 17:58:39 +02:00 |
|
|
d028a120bb
|
binaries in
|
2020-09-18 14:20:05 +02:00 |
|
|
f6dd02acc2
|
minor print in temp_Fpgafl in eiger
|
2020-09-18 14:18:19 +02:00 |
|
|
8ef79ce173
|
binaries in
|
2020-09-18 11:37:25 +02:00 |
|
|
539c0c295b
|
replaced pthread_mutex_t with sem_t
|
2020-09-18 11:30:04 +02:00 |
|
|
e91420bd16
|
locking in list
|
2020-09-18 11:23:57 +02:00 |
|
|
515a0c05b9
|
removed locking in locallink
|
2020-09-18 11:23:46 +02:00 |
|
|
46b75c1429
|
minor
|
2020-09-18 11:23:33 +02:00 |
|
|
092b3fa8b9
|
eiger: locking for local link access in shared memory
|
2020-09-18 11:23:21 +02:00 |
|
|
e18f10051e
|
jungfrau and gotthard binaries in
|
2020-09-17 17:11:57 +02:00 |
|
|
d9bb028da2
|
added dacnames in server defs for g1 and jungfrau
|
2020-09-17 17:11:09 +02:00 |
|
Erik Frojdh
|
aa10c4665f
|
added ctb
|
2020-09-11 15:25:23 +02:00 |
|
Erik Frojdh
|
8ae0659478
|
docs
|
2020-09-11 15:09:44 +02:00 |
|
|
1515b79c97
|
Merge branch 'kernelcheck' of github.com:slsdetectorgroup/slsDetectorPackage into kernelcheck
|
2020-09-11 08:50:01 +02:00 |
|
|
2ab4bb1c04
|
minor
|
2020-09-11 08:49:52 +02:00 |
|
|
5214c0f1a4
|
binaries in
|
2020-09-10 18:43:26 +02:00 |
|
|
60bc3a8fa7
|
Merge branch 'kernelcheck' of github.com:slsdetectorgroup/slsDetectorPackage into kernelcheck
|
2020-09-10 18:41:49 +02:00 |
|
|
00f780665f
|
using common.c to extract date and using nios.c to check kernel version(a bit specific to nios) and using c api instead of system command to get uname
|
2020-09-10 18:41:31 +02:00 |
|
|
88fe306902
|
binaries in
|
2020-09-10 16:23:29 +02:00 |
|
|
d931416def
|
g2 and m3: kernel checks only when its too old
|
2020-09-10 16:22:08 +02:00 |
|
|
22c2bb0258
|
eiger: fw 27 fix for delays
|
2020-09-10 10:26:16 +02:00 |
|
|
80b053eb10
|
binaries resolved, merge conflict from developer
|
2020-09-10 10:19:34 +02:00 |
|
Dhanya Thattil
|
3cd4f3897b
|
M3: software trigger (#175)
|
2020-09-10 10:15:45 +02:00 |
|
|
52303daffd
|
binaries in
|
2020-09-09 16:44:23 +02:00 |
|
|
a9d1a78662
|
m3:smp_clk (timing rxr) changed back to clk div 5
|
2020-09-09 15:55:13 +02:00 |
|
|
3cf2160a2d
|
binaries in
|
2020-09-09 15:25:48 +02:00 |
|
|
b33fdf4462
|
merge conflict fixed and merged with developer
|
2020-09-09 12:31:36 +02:00 |
|
|
6c8443f09e
|
binaries in
|
2020-09-09 12:14:38 +02:00 |
|
Erik Frojdh
|
bf52ec10da
|
help printed neutral
|
2020-09-09 11:06:47 +02:00 |
|
|
bdac4d133e
|
conflict solved and merged with developer
|
2020-09-09 10:27:14 +02:00 |
|
Dhanya Thattil
|
e8156d412e
|
G2: continuous internal mode (#167)
|
2020-09-09 10:13:15 +02:00 |
|
|
97687f0f6d
|
binary in
|
2020-09-08 17:33:06 +02:00 |
|
|
bfbfe204f4
|
m3: default clocks changed
|
2020-09-08 17:31:44 +02:00 |
|
|
87bad38f80
|
binary in
|
2020-09-08 15:46:32 +02:00 |
|
|
67f1f9924a
|
m3:software trigger
|
2020-09-08 15:45:35 +02:00 |
|
|
e1e04ee755
|
binaries in
|
2020-09-08 15:18:07 +02:00 |
|
|
6e06d4307d
|
WIP
|
2020-09-08 15:10:57 +02:00 |
|
|
20a959bf61
|
update mode to skip firmware checks and setupDetector, kernel check added to m3and g2
|
2020-09-08 15:08:45 +02:00 |
|
|
aecde086a0
|
binaries in
|
2020-09-08 12:16:41 +02:00 |
|