8733 Commits

Author SHA1 Message Date
Erik Frojdh
b112cf81c4 fixed daclist setter 2022-03-24 17:46:20 +01:00
Erik Frojdh
589124845a working implementation 2022-03-24 17:40:44 +01:00
90d1d0f8b8 wip, json master 2022-03-24 17:15:23 +01:00
1e564a1b33 binaries in. fixed 2022-03-24 12:33:19 +01:00
5fe10c19a1 binarie sin 2022-03-24 09:26:29 +01:00
Dhanya Thattil
de5c298d99
Merge pull request #373 from slsdetectorgroup/ghdf5
Gotthard25um: virtual hdf5 image
2022-03-23 12:08:40 +01:00
Dhanya Thattil
2a1f6dc544
Merge pull request #371 from slsdetectorgroup/g225gui
Gotthard25um: gui image
2022-03-23 12:06:27 +01:00
fc21a6763d fix and minor removing comments 2022-03-23 12:03:51 +01:00
fd8e1b2ef7 merge fix 2022-03-23 11:42:16 +01:00
0803f1bc1f help in cmdline, fixed get for daclist in python 2022-03-23 11:27:52 +01:00
9995b74217 added setdaclist in cmd line 2022-03-23 10:53:29 +01:00
Erik Frojdh
2823451c9d Hacky implementation 2022-03-22 16:45:02 +01:00
0f4bcf3a9d test if special file when updating kernel(solution: reboot only), --force-delete-normal-file used to force delete bfin fpga drive if normal file and create proper device tree 2022-03-22 16:44:12 +01:00
Dhanya Thattil
74d55db3f0
Merge pull request #398 from slsdetectorgroup/rxacqIndices
Receiver frame indices and progress
2022-03-22 11:23:07 +01:00
2b35101b17 moved shm numUdpInterfaces initialization up front, moved updating this value in DetectorImpl::setHostname to DetectorImpl::addModule for more readability, renamed getNumberofUdpInterfaces to an updateNumberofUdpInterfaces as the shm was being updated and is used only in setHostname, everywhere else getNumberofUdpInterfaces is replaced by getNumberofUdpInterfacesFromShm 2022-03-22 10:23:22 +01:00
f538b8b10b binaries in 2022-03-21 15:52:19 +01:00
fb012aa9e9 Merge branch 'specialfile' of github.com:slsdetectorgroup/slsDetectorPackage into specialfile 2022-03-21 15:51:39 +01:00
82bad7fec6 special file check fix 2022-03-21 15:46:34 +01:00
717922f380 Merge branch 'developer' into specialfile 2022-03-21 14:27:28 +01:00
3250dda7eb fix warning 2022-03-21 10:56:10 +01:00
dffac3014e Merge branch 'developer' into g225gui 2022-03-18 12:12:44 +01:00
586149f3e7 Merge branch 'developer' into ghdf5 2022-03-18 12:12:25 +01:00
088dd2c9f8 merge fix 2022-03-18 12:12:08 +01:00
89395bd990 merge fix 2022-03-18 12:11:40 +01:00
3144f40068 bianries in after merge 2022-03-18 12:10:59 +01:00
Dhanya Thattil
2fe24c108b
Merge pull request #409 from slsdetectorgroup/serverhelpsize
Serverhelpsize
2022-03-18 12:09:08 +01:00
bbfe3b278f binaries in 2022-03-18 12:07:47 +01:00
c9fd8ba569 qip 2022-03-18 12:07:15 +01:00
faa4f09a82 qip 2022-03-18 12:03:34 +01:00
1ca2e61a85 qip 2022-03-18 12:02:53 +01:00
7fa51e2a8e check if size exceeds capacity in server command line help 2022-03-18 12:01:16 +01:00
adbd2b853d binaries in 2022-03-17 17:00:28 +01:00
0e6d92118f compile fix 2022-03-17 16:57:08 +01:00
3796182eb1 check if drive is a normal file or special block file 2022-03-17 13:43:55 +01:00
570651a9f8 minor 2022-03-17 13:09:54 +01:00
afbc414afe works for both g25 and normal 2022-03-17 13:08:40 +01:00
ca0aa7144c hdf5 for g25um 2022-03-17 12:53:32 +01:00
3e5b8840b4 wip 2022-03-17 12:21:29 +01:00
f1da831e10 Merge branch 'developer' into ghdf5 2022-03-17 12:18:20 +01:00
06281ccae9 firmware reverses slave channels 2022-03-17 12:11:51 +01:00
509946d964 Merge branch 'developer' into g225gui 2022-03-17 11:52:30 +01:00
Dhanya Thattil
95f9da9d70
Merge branch 'developer' into rxacqIndices 2022-03-17 11:30:01 +01:00
Dhanya Thattil
4a663e9e50
Merge pull request #408 from slsdetectorgroup/metadataGeometry
Metadata geometry
2022-03-17 11:29:23 +01:00
Dhanya Thattil
b02dec8157
Merge branch 'developer' into metadataGeometry 2022-03-17 11:29:15 +01:00
Dhanya Thattil
c361b9517c
Merge pull request #407 from slsdetectorgroup/stopfnum
Stopfnum
2022-03-17 11:28:32 +01:00
Erik Frojdh
78823760b3 more checks in generate functions 2022-03-17 09:52:39 +01:00
d80006a024 Merge branch 'developer' into rxacqIndices 2022-03-17 09:03:32 +01:00
Erik Frojdh
561777dad6 fixed clang--format version 2022-03-17 09:02:40 +01:00
c1895c4bc8 Merge branch 'developer' into rxacqIndices 2022-03-17 08:48:15 +01:00
7b66466186 Merge branch 'developer' into metadataGeometry 2022-03-17 08:47:34 +01:00