diff --git a/include/librealsense2/h/rs_option.h b/include/librealsense2/h/rs_option.h
index 99d3600cfb..a3584a551b 100644
--- a/include/librealsense2/h/rs_option.h
+++ b/include/librealsense2/h/rs_option.h
@@ -85,7 +85,6 @@ extern "C" {
RS2_OPTION_ZERO_ORDER_ENABLED, /**< Toggle Zero-Order mode */
RS2_OPTION_ENABLE_MAP_PRESERVATION, /**< Preserve previous map when starting */
RS2_OPTION_FREEFALL_DETECTION_ENABLED, /**< Enable/disable sensor shutdown when a free-fall is detected (on by default) */
- RS2_OPTION_EMITTER_ALWAYS_ON, /**< Enable Laser On constantly (GS SKU Only) */
RS2_OPTION_AVALANCHE_PHOTO_DIODE, /**< Changes the exposure time of Avalanche Photo Diode in the receiver */
RS2_OPTION_POST_PROCESSING_SHARPENING, /**< Changes the amount of sharpening in the post-processed image */
RS2_OPTION_PRE_PROCESSING_SHARPENING, /**< Changes the amount of sharpening in the pre-processed image */
@@ -93,6 +92,7 @@ extern "C" {
RS2_OPTION_INVALIDATION_BYPASS, /**< Enable\disable pixel invalidation */
RS2_OPTION_AMBIENT_LIGHT, /**< Change the depth ambient light see rs2_ambient_light for values */
RS2_OPTION_SENSOR_MODE, /**< The resolution mode: see rs2_sensor_mode for values */
+ RS2_OPTION_EMITTER_ALWAYS_ON, /**< Enable Laser On constantly (GS SKU Only) */
RS2_OPTION_COUNT /**< Number of enumeration values. Not a valid input: intended to be used in for-loops. */
} rs2_option;
diff --git a/src/types.cpp b/src/types.cpp
index f80dac6aa8..bb1efba043 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -320,7 +320,6 @@ namespace librealsense
CASE(ZERO_ORDER_ENABLED)
CASE(ENABLE_MAP_PRESERVATION)
CASE(FREEFALL_DETECTION_ENABLED)
- CASE(EMITTER_ALWAYS_ON)
CASE(AVALANCHE_PHOTO_DIODE)
CASE(POST_PROCESSING_SHARPENING)
CASE(PRE_PROCESSING_SHARPENING)
@@ -328,6 +327,7 @@ namespace librealsense
CASE(INVALIDATION_BYPASS)
CASE(AMBIENT_LIGHT)
CASE(SENSOR_MODE)
+ CASE(EMITTER_ALWAYS_ON)
default: assert(!is_valid(value)); return UNKNOWN_VALUE;
}
#undef CASE
diff --git a/wrappers/android/librealsense/src/main/java/com/intel/realsense/librealsense/Option.java b/wrappers/android/librealsense/src/main/java/com/intel/realsense/librealsense/Option.java
index 4837651bc9..9b0868bd5a 100644
--- a/wrappers/android/librealsense/src/main/java/com/intel/realsense/librealsense/Option.java
+++ b/wrappers/android/librealsense/src/main/java/com/intel/realsense/librealsense/Option.java
@@ -64,8 +64,15 @@ public enum Option {
LED_POWER(60),
ZERO_ORDER_ENABLED(61),
ENABLE_MAP_PRESERVATION(62),
- FREEFALL_DETECTION_ENABLED(63);
- EMITTER_ALWAYS_ON(64);
+ FREEFALL_DETECTION_ENABLED(63),
+ AVALANCHE_PHOTO_DIODE(64),
+ POST_PROCESSING_SHARPENING(65),
+ PRE_PROCESSING_SHARPENING(66),
+ NOISE_FILTERING(67),
+ INVALIDATION_BYPASS(68),
+ AMBIENT_LIGHT(69),
+ SENSOR_MODE(70),
+ EMITTER_ALWAYS_ON(71);
private final int mValue;
diff --git a/wrappers/csharp/Intel.RealSense/Types/Enums/Option.cs b/wrappers/csharp/Intel.RealSense/Types/Enums/Option.cs
index eee215a8c8..44962f04b2 100644
--- a/wrappers/csharp/Intel.RealSense/Types/Enums/Option.cs
+++ b/wrappers/csharp/Intel.RealSense/Types/Enums/Option.cs
@@ -203,7 +203,28 @@ public enum Option
/// Enable/disable sensor shutdown when a free-fall is detected (on by default)
FreeFallDetectionEnabled = 63,
+ /// Changes the exposure time of Avalanche Photo Diode in the receiver
+ APDExposureTime = 64,
+
+ /// Changes the amount of sharpening in the post-processed image
+ PostProcessingSharpening = 65,
+
+ /// Changes the amount of sharpening in the pre-processed image
+ PreProcessingSharpening = 66,
+
+ /// Control edges and background noise
+ NoiseFilterLevel = 67,
+
+ /// Enable\disable pixel invalidation
+ InvalidationBypass = 68,
+
+ /// Change the depth ambient light see rs2_ambient_light for values
+ AmbientLightEnvLevel = 69,
+
+ /// The resolution mode: see rs2_sensor_mode for values
+ SensorMode = 70,
+
/// Enable Laser On constantly (GS SKU Only)
- EmitterAlwaysOn = 64,
+ EmitterAlwaysOn = 71
}
}
diff --git a/wrappers/matlab/option.m b/wrappers/matlab/option.m
index 4349458406..c657035315 100644
--- a/wrappers/matlab/option.m
+++ b/wrappers/matlab/option.m
@@ -64,7 +64,14 @@
zero_order_enabled (61)
enable_map_preservation (62)
freefall_detection_enabled (63)
- emitter_always_on (64)
- count (65)
+ apd_exposure_time (64)
+ post_processing_sharpening (65)
+ pre_processing_sharpening (66)
+ noise_filter_level (67)
+ invalidation_bypass (68)
+ ambient_light_env_level (69)
+ sensor_mode (70)
+ emitter_always_on (71)
+ count (72)
end
end
diff --git a/wrappers/python/pybackend.cpp b/wrappers/python/pybackend.cpp
index b3ad4da060..96a03354ba 100644
--- a/wrappers/python/pybackend.cpp
+++ b/wrappers/python/pybackend.cpp
@@ -163,7 +163,14 @@ PYBIND11_MODULE(NAME, m) {
.value("zero_order_enabled", RS2_OPTION_ZERO_ORDER_ENABLED)
.value("enable_map_preservation", RS2_OPTION_ENABLE_MAP_PRESERVATION)
.value("enable_freefall_detection", RS2_OPTION_FREEFALL_DETECTION_ENABLED)
- .value("emiiter_always_on", RS2_OPTION_EMITTER_ALWAYS_ON)
+ .value("exposure_time_receiver_APD", RS2_OPTION_AVALANCHE_PHOTO_DIODE)
+ .value("post_processing_sharpening_level", RS2_OPTION_POST_PROCESSING_SHARPENING)
+ .value("pre_processing_sharpening_level", RS2_OPTION_PRE_PROCESSING_SHARPENING)
+ .value("edge_background_noise_level", RS2_OPTION_NOISE_FILTERING)
+ .value("activate_pixel_invalidation", RS2_OPTION_INVALIDATION_BYPASS)
+ .value("ambient_light_environment_level", RS2_OPTION_AMBIENT_LIGHT)
+ .value("sensor_resolution_mode", RS2_OPTION_SENSOR_MODE)
+ .value("emitter_always_on", RS2_OPTION_EMITTER_ALWAYS_ON)
.value("count", RS2_OPTION_COUNT);
py::enum_ power_state(m, "power_state");
diff --git a/wrappers/unrealengine4/Plugins/RealSense/Source/RealSense/Public/RealSenseTypes.h b/wrappers/unrealengine4/Plugins/RealSense/Source/RealSense/Public/RealSenseTypes.h
index f51f91160b..56276491ba 100755
--- a/wrappers/unrealengine4/Plugins/RealSense/Source/RealSense/Public/RealSenseTypes.h
+++ b/wrappers/unrealengine4/Plugins/RealSense/Source/RealSense/Public/RealSenseTypes.h
@@ -117,6 +117,13 @@ enum class ERealSenseOptionType : uint8
ZERO_ORDER_ENABLED , /**< Zero-order mode */
ENABLE_MAP_PRESERVATION , /**< Preserve map from the previous run */
FREEFALL_DETECTION_ENABLED , /**< Enable/disable sensor shutdown when a free-fall is detected (on by default) */
+ AVALANCHE_PHOTO_DIODE , /**< Changes the exposure time of Avalanche Photo Diode in the receiver */
+ POST_PROCESSING_SHARPENING , /**< Changes the amount of sharpening in the post-processed image */
+ PRE_PROCESSING_SHARPENING , /**< Changes the amount of sharpening in the pre-processed image */
+ NOISE_FILTERING , /**< Control edges and background noise */
+ INVALIDATION_BYPASS , /**< Enable\disable pixel invalidation */
+ AMBIENT_LIGHT , /**< Change the depth ambient light see rs2_ambient_light for values */
+ SENSOR_MODE , /**< The resolution mode: see rs2_sensor_mode for values */
EMITTER_ALWAYS_ON , /**< Enable Laser On constantly (GS SKU Only) */
};