Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add More Pixel Formats #3

Merged
merged 1 commit into from
Mar 6, 2020
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
42 changes: 33 additions & 9 deletions cfg/AvtVimbaCamera.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,39 @@ acquisition_mode_enum = gen.enum( [ gen.const("Continuous", str_t, "Continuous"
gen.const("SingleFrame", str_t, "SingleFrame", "The camera will only deliver a single frame trigger event"),
gen.const("MultiFrame", str_t, "MultiFrame", "The camera will acquire the number of images specified by `~AcquisitionFrameCount`. Further trigger events will be ignored"),
gen.const("Recorder", str_t, "Recorder", "The camera will continuously record images into the camera on-board memory")], "Set Trigger Mode")
# Monochrome cameras have mono8,12 and 12Packed. Color cameras have only mono8.
pixelformat_enum = gen.enum([ gen.const("Mono8", str_t, "Mono8", ""),
gen.const("Mono12", str_t, "Mono12", ""),
gen.const("Mono12Packed", str_t, "Mono12Packed", ""),
gen.const("BayerRG8", str_t, "BayerRG8", ""),
gen.const("BayerRG12Packed", str_t, "BayerRG12Packed", ""),
gen.const("BayerGR12", str_t, "BayerGR12", ""),
gen.const("RGB8Packed", str_t, "RGB8Packed", ""),
gen.const("BGR8Packed", str_t, "BGR8Packed", "")], "Set Pixel Format")

# NOTE: Your AVT camera model likely doesn't support all these formats,
# check the datasheet to confirm which formats are supported.
pixelformat_enum = gen.enum([
gen.const("Mono8", str_t, "Mono8", ""),
gen.const("Mono10", str_t, "Mono10", ""),
gen.const("Mono10Packed", str_t, "Mono10Packed", ""),
gen.const("Mono12", str_t, "Mono12", ""),
gen.const("Mono12Packed", str_t, "Mono12Packed", ""),
gen.const("BayerGR8", str_t, "BayerGR8", ""),
gen.const("BayerRG8", str_t, "BayerRG8", ""),
gen.const("BayerGB8", str_t, "BayerGB8", ""),
gen.const("BayerBG8", str_t, "BayerBG8", ""),
gen.const("BayerGR10", str_t, "BayerGR10", ""),
gen.const("BayerRG10", str_t, "BayerRG10", ""),
gen.const("BayerGB10", str_t, "BayerGB10", ""),
gen.const("BayerBG10", str_t, "BayerBG10", ""),
gen.const("BayerGR12", str_t, "BayerGR12", ""),
gen.const("BayerRG12", str_t, "BayerRG12", ""),
gen.const("BayerGB12", str_t, "BayerGB12", ""),
gen.const("BayerBG12", str_t, "BayerBG12", ""),
gen.const("BayerGR10Packed", str_t, "BayerGR10Packed", ""),
gen.const("BayerRG10Packed", str_t, "BayerRG10Packed", ""),
gen.const("BayerGB10Packed", str_t, "BayerGB10Packed", ""),
gen.const("BayerBG10Packed", str_t, "BayerBG10Packed", ""),
gen.const("BayerGR12Packed", str_t, "BayerGR12Packed", ""),
gen.const("BayerRG12Packed", str_t, "BayerRG12Packed", ""),
gen.const("BayerGB12Packed", str_t, "BayerGB12Packed", ""),
gen.const("BayerBG12Packed", str_t, "BayerBG12Packed", ""),
gen.const("RGB8Packed", str_t, "RGB8Packed", ""),
gen.const("BGR8Packed", str_t, "BGR8Packed", "")
], "Set Pixel Format")

auto_enum = gen.enum([ gen.const("Off", str_t, "Off", ""),
gen.const("Once", str_t, "Once", ""),
gen.const("Auto", str_t, "Continuous", "")], "Set Automatic Control")
Expand Down
21 changes: 20 additions & 1 deletion src/avt_vimba_camera.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,30 @@ static const char* AcquisitionMode[] = {
"Recorder"};
static const char* PixelFormatMode[] = {
"Mono8",
"Mono10",
"Mono10Packed",
"Mono12",
"Mono12Packed",
"BayerGR8",
"BayerRG8",
"BayerRG12Packed",
"BayerGB8",
"BayerBG8",
"BayerGR10",
"BayerRG10",
"BayerGB10",
"BayerBG10",
"BayerGR12",
"BayerRG12",
"BayerGB12",
"BayerBG12",
"BayerGR10Packed",
"BayerRG10Packed",
"BayerGB10Packed",
"BayerBG10Packed",
"BayerGR12Packed",
"BayerRG12Packed",
"BayerGB12Packed",
"BayerBG12Packed",
"RGB8Packed",
"BGR8Packed"};
static const char* BalanceRatioMode[] = {
Expand Down