Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ADApp/ADSrc/Codec.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ static std::string codecName[] = {
"jpeg",
"blosc",
"lz4",
"lz4hdf5",
"bslz4"
};

Expand All @@ -14,6 +15,7 @@ typedef enum {
NDCODEC_JPEG,
NDCODEC_BLOSC,
NDCODEC_LZ4,
NDCODEC_LZ4HDF5,
NDCODEC_BSLZ4
} NDCodecCompressor_t;

Expand Down
25 changes: 23 additions & 2 deletions ADApp/Db/NDCodec.template
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@ record(mbbo, "$(P)$(R)Compressor")
field(TWVL, "2")
field(THST, "LZ4")
field(THVL, "3")
field(FRST, "BSLZ4")
field(FRST, "LZ4HDF5")
field(FRVL, "4")
field(FVST, "BSLZ4")
field(FVVL, "5")
Comment on lines -45 to +48
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this change in order would be nice to at least document in release notes, since I believe it could break someone's autosave.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have added this to RELEASE.md

info(autosaveFields, "VAL")
}

Expand All @@ -59,8 +61,10 @@ record(mbbi, "$(P)$(R)Compressor_RBV")
field(TWVL, "2")
field(THST, "LZ4")
field(THVL, "3")
field(FRST, "BSLZ4")
field(FRST, "LZ4HDF5")
field(FRVL, "4")
field(FVST, "BSLZ4")
field(FVVL, "5")
field(SCAN, "I/O Intr")
}

Expand Down Expand Up @@ -193,6 +197,23 @@ record(longin, "$(P)$(R)BloscNumThreads_RBV")
field(SCAN, "I/O Intr")
}

record(longout, "$(P)$(R)LZ4HDF5BlockSize")
{
field(PINI, "YES")
field(DTYP, "asynInt32")
field(OUT, "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))LZ4HDF5_BLOCKSIZE")
field(VAL, "0")
field(DRVL, "0")
info(autosaveFields, "VAL")
}

record(longin, "$(P)$(R)LZ4HDF5BlockSize_RBV")
{
field(DTYP, "asynInt32")
field(INP, "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))LZ4HDF5_BLOCKSIZE")
field(SCAN, "I/O Intr")
}

record(mbbi, "$(P)$(R)CodecStatus")
{
field(DTYP, "asynInt32")
Expand Down
1 change: 1 addition & 0 deletions ADApp/Db/NDCodec_settings.req
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ $(P)$(R)BloscCompressor
$(P)$(R)BloscCLevel
$(P)$(R)BloscShuffle
$(P)$(R)BloscNumThreads
$(P)$(R)LZ4HDF5BlockSize
file "NDPluginBase_settings.req", P=$(P), R=$(R)
1 change: 1 addition & 0 deletions ADApp/commonDriverMakefile
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ ifeq ($(WITH_BITSHUFFLE),YES)
PROD_SYS_LIBS += bitshuffle
endif
endif
PROD_LIBS += lz4hdf5
endif

ifeq ($(WITH_BLOSC),YES)
Expand Down
1 change: 1 addition & 0 deletions ADApp/commonLibraryMakefile
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ ifeq ($(WITH_BITSHUFFLE),YES)
LIB_SYS_LIBS += bitshuffle
endif
endif
LIB_LIBS += lz4hdf5
endif

ifeq ($(WITH_BLOSC),YES)
Expand Down
Loading
Loading