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

Added compatability_fix workaround #84

Open
wants to merge 1 commit into
base: kinetic-devel
Choose a base branch
from
Open

Added compatability_fix workaround #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions spinnaker_camera_driver/cfg/Spinnaker.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ class SensorLevels:
RECONFIGURE_STOP = 1

gen = ParameterGenerator()


gen.add("set_new_config", bool_t, SensorLevels.RECONFIGURE_RUNNING, "Enables the new config", False)
# Name Type Reconfiguration level Description Default Min Max
gen.add("acquisition_frame_rate", double_t, SensorLevels.RECONFIGURE_RUNNING, "User controlled acquisition frame rate in Hertz (frames per second).", 10, 0, 120)
gen.add("acquisition_frame_rate_enable", bool_t, SensorLevels.RECONFIGURE_RUNNING, "Enables manual (True) and automatic (False) control of the aquisition frame rate", False)
Expand Down Expand Up @@ -292,6 +291,8 @@ line_modes = gen.enum([gen.const("Input", str_t, "Input", ""),

gen.add("line_mode", str_t, SensorLevels.RECONFIGURE_RUNNING, "Line Mode", "Input", edit_method = line_modes)

# Camera 3.3V output parameters
gen.add("enable_3V_output", bool_t, SensorLevels.RECONFIGURE_RUNNING, "Enable camera 3.3V output.",False)

# Auto algorithm parameters
gen.add("auto_exposure_roi_offset_x", int_t, SensorLevels.RECONFIGURE_RUNNING, "Auto exposure ROI X offset.", 0, 0, 65535)
Expand Down
5 changes: 5 additions & 0 deletions spinnaker_camera_driver/src/camera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ void Camera::setFrameRate(const float frame_rate)

void Camera::setNewConfiguration(const SpinnakerConfig& config, const uint32_t& level)
{
if(!config.set_new_config) return;
try
{
if (level >= LEVEL_RECONFIGURE_STOP)
Expand All @@ -76,6 +77,10 @@ void Camera::setNewConfiguration(const SpinnakerConfig& config, const uint32_t&
// Set enable after frame rate encase its false
setProperty(node_map_, "AcquisitionFrameRateEnable", config.acquisition_frame_rate_enable);

// Set 3.3V out put to support external circuitry
setProperty(node_map_, "V3_3Enable", config.enable_3V_output);


// Set Trigger and Strobe Settings
// NOTE: The trigger must be disabled (i.e. TriggerMode = "Off") in order to configure whether the source is
// software or hardware.
Expand Down