feat(src): removed ir conctrol feature for S2100

This commit is contained in:
Osenberg 2019-07-30 18:27:08 +08:00
parent 95f79d406a
commit 220b1e352e
5 changed files with 1 additions and 15 deletions

View File

@ -42,8 +42,7 @@ const std::map<Model, OptionSupports> option_supports_map = {
{Model::STANDARD2, { {Model::STANDARD2, {
Option::BRIGHTNESS, Option::BRIGHTNESS,
Option::EXPOSURE_MODE, Option::MAX_GAIN, Option::MAX_EXPOSURE_TIME, Option::EXPOSURE_MODE, Option::MAX_GAIN, Option::MAX_EXPOSURE_TIME,
Option::IR_CONTROL, Option::MIN_EXPOSURE_TIME, Option::MIN_EXPOSURE_TIME, Option::DESIRED_BRIGHTNESS, Option::ACCELEROMETER_RANGE,
Option::DESIRED_BRIGHTNESS, Option::ACCELEROMETER_RANGE,
Option::GYROSCOPE_RANGE, Option::ACCELEROMETER_LOW_PASS_FILTER, Option::GYROSCOPE_RANGE, Option::ACCELEROMETER_LOW_PASS_FILTER,
Option::GYROSCOPE_LOW_PASS_FILTER, Option::IIC_ADDRESS_SETTING, Option::GYROSCOPE_LOW_PASS_FILTER, Option::IIC_ADDRESS_SETTING,
Option::ERASE_CHIP} Option::ERASE_CHIP}

View File

@ -49,10 +49,6 @@ standard2/desired_brightness: -1
standard2/min_exposure_time: -1 standard2/min_exposure_time: -1
# standard2/min_exposure_time: 0 # standard2/min_exposure_time: 0
# standard2/ir_control range: [0,160]
standard2/ir_control: 80
# standard2/ir_control: 0
# standard2/accel_range range: [6,48] # standard2/accel_range range: [6,48]
standard2/accel_range: -1 standard2/accel_range: -1
# standard2/accel_range: 6 # standard2/accel_range: 6

View File

@ -49,10 +49,6 @@ standard2/desired_brightness: -1
standard2/min_exposure_time: -1 standard2/min_exposure_time: -1
# standard2/min_exposure_time: 0 # standard2/min_exposure_time: 0
# standard2/ir_control range: [0,160]
standard2/ir_control: 80
# standard2/ir_control: 0
# standard2/accel_range range: [6,48] # standard2/accel_range range: [6,48]
standard2/accel_range: -1 standard2/accel_range: -1
# standard2/accel_range: 6 # standard2/accel_range: 6

View File

@ -49,10 +49,6 @@ standard2/desired_brightness: -1
standard2/min_exposure_time: -1 standard2/min_exposure_time: -1
# standard2/min_exposure_time: 0 # standard2/min_exposure_time: 0
# standard2/ir_control range: [0,160]
standard2/ir_control: 80
# standard2/ir_control: 0
# standard2/accel_range range: [6,48] # standard2/accel_range range: [6,48]
standard2/accel_range: -1 standard2/accel_range: -1
# standard2/accel_range: 6 # standard2/accel_range: 6

View File

@ -280,7 +280,6 @@ class ROSWrapperNodelet : public nodelet::Nodelet {
{Option::MAX_EXPOSURE_TIME, "standard2/max_exposure_time"}, {Option::MAX_EXPOSURE_TIME, "standard2/max_exposure_time"},
{Option::DESIRED_BRIGHTNESS, "standard2/desired_brightness"}, {Option::DESIRED_BRIGHTNESS, "standard2/desired_brightness"},
{Option::MIN_EXPOSURE_TIME, "standard2/min_exposure_time"}, {Option::MIN_EXPOSURE_TIME, "standard2/min_exposure_time"},
{Option::IR_CONTROL, "STANDARD/ir_control"},
{Option::ACCELEROMETER_RANGE, "standard2/accel_range"}, {Option::ACCELEROMETER_RANGE, "standard2/accel_range"},
{Option::GYROSCOPE_RANGE, "standard2/gyro_range"}, {Option::GYROSCOPE_RANGE, "standard2/gyro_range"},
{Option::ACCELEROMETER_LOW_PASS_FILTER, "standard2/accel_low_filter"}, {Option::ACCELEROMETER_LOW_PASS_FILTER, "standard2/accel_low_filter"},