merged conflicts. assembler with external sync.

This commit is contained in:
lhdamiani
2021-07-06 14:37:41 +02:00
13 changed files with 141 additions and 139 deletions
+2
View File
@@ -1,6 +1,8 @@
#ifndef SF_DAQ_BUFFER_FORMATS_HPP
#define SF_DAQ_BUFFER_FORMATS_HPP
#define INVALID_FRAME_INDEX UINT64_C(-1)
#pragma pack(push)
#pragma pack(1)
struct ModuleFrame {