diff --git a/spinnaker_camera_driver/config/blackfly.yaml b/spinnaker_camera_driver/config/blackfly.yaml index e3b8fa5a..8894fea3 100644 --- a/spinnaker_camera_driver/config/blackfly.yaml +++ b/spinnaker_camera_driver/config/blackfly.yaml @@ -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 # @@ -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 @@ -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 diff --git a/spinnaker_camera_driver/src/camera.cpp b/spinnaker_camera_driver/src/camera.cpp index 1b108d93..b371d9c4 100644 --- a/spinnaker_camera_driver/src/camera.cpp +++ b/spinnaker_camera_driver/src/camera.cpp @@ -666,7 +666,7 @@ bool Camera::start() } infoManager_ = std::make_shared( - node_, node_->get_name(), cameraInfoURL_); + node_, name_.empty() ? node_->get_name() : name_, cameraInfoURL_); controlSub_ = node_->create_subscription( "~/" + topicPrefix_ + "control", 10, std::bind(&Camera::controlCallback, this, std::placeholders::_1));