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.

Sign up for GitHub

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

white balance for blackfly and fix name of camera #166

Merged
merged 2 commits into from
Apr 2, 2024
Merged

white balance for blackfly and fix name of camera #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
544a272
use proper name for camerainfo when using sync driver
berndpfrommer Apr 2, 2024
e92db67
added blacklevel and whitebalance support for blackfly
berndpfrommer Apr 2, 2024
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
16 changes: 13 additions & 3 deletions spinnaker_camera_driver/config/blackfly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,16 @@ parameters:
- name: gain
type: float
node: AnalogControl/Gain
- name: black_level
type: float
node: AnalogControl/BlackLevel
- name: balance_white_auto
type: enum # valid values: Off, Once, Continuous
node: AnalogControl/BalanceWhiteAuto
- name: balance_ratio_selector
type: enum # valid values: Red, Blue
node: AnalogControl/BalanceRatioSelector

#
# -------- device link throughput limiting
#
Expand All @@ -66,10 +76,10 @@ parameters:
# -------- digital IO control
#
- name: line0_selector
type: enum # valid value: Line0
type: enum # valid value: Line0
node: DigitalIOControl/LineSelector
- name: line1_selector # white wire: opto-isolated output
type: enum # valid value: Line1
type: enum # valid value: Line1
node: DigitalIOControl/LineSelector
- name: line1_source # valid values: "ExposureActive", "ExternalTriggerActive", "UserOutput1"
type: enum
Expand Down Expand Up @@ -108,7 +118,7 @@ parameters:
type: enum
# valid values: "LevelLow", "LevelHigh", "FallingEdge", "RisingEdge", "AnyEdge",
node: AcquisitionControl/TriggerActivation
- name: frame_rate_enable # must come after trigger_mode
- name: frame_rate_enable # must come after trigger_mode
type: bool
node: AcquisitionControl/AcquisitionFrameRateEnable
- name: frame_rate
Expand Down
2 changes: 1 addition & 1 deletion spinnaker_camera_driver/src/camera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ bool Camera::start()
}

infoManager_ = std::make_shared<camera_info_manager::CameraInfoManager>(
node_, node_->get_name(), cameraInfoURL_);
node_, name_.empty() ? node_->get_name() : name_, cameraInfoURL_);
controlSub_ = node_->create_subscription<flir_camera_msgs::msg::CameraControl>(
"~/" + topicPrefix_ + "control", 10,
std::bind(&Camera::controlCallback, this, std::placeholders::_1));
Expand Down
Loading