From e79ceec907e7e4dfdd331a4ce105482c4c1d49aa Mon Sep 17 00:00:00 2001 From: aangerma Date: Sun, 20 Jun 2021 13:33:21 +0300 Subject: [PATCH 1/3] Added RS2_OPTION_VERTICAL_BINNING to L535. --- include/librealsense2/h/rs_option.h | 1 + src/l500/l535-amc-option.h | 3 ++- src/l500/l535-device-options.cpp | 5 ++++- src/types.cpp | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/librealsense2/h/rs_option.h b/include/librealsense2/h/rs_option.h index b176f0d944..fa5cc2af91 100644 --- a/include/librealsense2/h/rs_option.h +++ b/include/librealsense2/h/rs_option.h @@ -111,6 +111,7 @@ extern "C" { RS2_OPTION_AUTO_GAIN_LIMIT, /**< Set and get auto gain limits ranging from 16 to 248. Default is 0 which means full gain. If the requested gain limit is less than 16, it will be set to 16. If the requested gain limit is greater than 248, it will be set to 248. Setting will not take effect until next streaming session. */ RS2_OPTION_AUTO_RX_SENSITIVITY, /**< Enable receiver sensitivity according to ambient light, bounded by the Receiver Gain control. */ RS2_OPTION_TRANSMITTER_FREQUENCY, /** ctx, { RS2_OPTION_AUTO_RX_SENSITIVITY, { auto_rx_sensitivity, "Enable receiver sensitivity according to ambient light, bounded by the Receiver Gain control" } }, { RS2_OPTION_TRANSMITTER_FREQUENCY, - { transmitter_frequency, "Change transmitter frequency, increasing effective range over sharpness" } } + { transmitter_frequency, "Change transmitter frequency, increasing effective range over sharpness" } }, + { RS2_OPTION_VERTICAL_BINNING, + { vertical_binning, "Enables vertical binning which increases the maximal sensed distance" } } + }; for( auto i : options ) diff --git a/src/types.cpp b/src/types.cpp index bb1672769e..d1ded6d752 100644 --- a/src/types.cpp +++ b/src/types.cpp @@ -444,6 +444,7 @@ namespace librealsense CASE(AUTO_GAIN_LIMIT) CASE(AUTO_RX_SENSITIVITY) CASE(TRANSMITTER_FREQUENCY) + CASE(VERTICAL_BINNING) default: assert(!is_valid(value)); return UNKNOWN_VALUE; } #undef CASE From be1080fd8f1e4a807d689352bac3b8596c45d3cd Mon Sep 17 00:00:00 2001 From: aangerma Date: Sun, 20 Jun 2021 13:43:32 +0300 Subject: [PATCH 2/3] Added RS2_OPTION_VERTICAL_BINNING to wrappers. --- .../main/java/com/intel/realsense/librealsense/Option.java | 1 + wrappers/csharp/Intel.RealSense/Types/Enums/Option.cs | 5 ++++- wrappers/matlab/option.m | 3 ++- wrappers/nodejs/src/addon.cpp | 1 + wrappers/python/pybackend.cpp | 1 + .../RealSense/Source/RealSense/Public/RealSenseTypes.h | 1 + 6 files changed, 10 insertions(+), 2 deletions(-) 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 390dfeec89..d2fccf1f18 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 @@ -91,6 +91,7 @@ public enum Option { AUTO_GAIN_LIMIT(86), AUTO_RX_SENSITIVITY(87), OPTION_TRANSMITTER_FREQUENCY(88); + RS2_OPTION_VERTICAL_BINNING(88); 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 b1511a8931..120251e7fa 100644 --- a/wrappers/csharp/Intel.RealSense/Types/Enums/Option.cs +++ b/wrappers/csharp/Intel.RealSense/Types/Enums/Option.cs @@ -279,6 +279,9 @@ public enum Option auto_rx_sensitivity = 87, /// Change transmitter frequency, increasing effective range over sharpness - transmitter_frequency = 88 + transmitter_frequency = 88, + + /// Change transmitter frequency, increasing effective range over sharpness + vertical_binning = 89 } } diff --git a/wrappers/matlab/option.m b/wrappers/matlab/option.m index 0a7bfc37cc..b27f363f5b 100644 --- a/wrappers/matlab/option.m +++ b/wrappers/matlab/option.m @@ -90,6 +90,7 @@ auto_gain_limit (86) auto_rx_sensitivity (87) transmitter_frequency (88) - count (89) + vertical_binning (89) + count (90) end end diff --git a/wrappers/nodejs/src/addon.cpp b/wrappers/nodejs/src/addon.cpp index cb2a809883..fcbd23e9c2 100644 --- a/wrappers/nodejs/src/addon.cpp +++ b/wrappers/nodejs/src/addon.cpp @@ -4783,6 +4783,7 @@ void InitModule(v8::Local exports) { _FORCE_SET_ENUM(RS2_OPTION_AUTO_GAIN_LIMIT); _FORCE_SET_ENUM(RS2_OPTION_AUTO_RX_SENSITIVITY); _FORCE_SET_ENUM(RS2_OPTION_TRANSMITTER_FREQUENCY); + _FORCE_SET_ENUM(RS2_OPTION_VERTICAL_BINNING); _FORCE_SET_ENUM(RS2_OPTION_COUNT); // rs2_camera_info diff --git a/wrappers/python/pybackend.cpp b/wrappers/python/pybackend.cpp index 1f47d1b8cd..194c1646e7 100644 --- a/wrappers/python/pybackend.cpp +++ b/wrappers/python/pybackend.cpp @@ -187,6 +187,7 @@ PYBIND11_MODULE(NAME, m) { .value("auto_gain_limit", RS2_OPTION_AUTO_GAIN_LIMIT) .value("auto_rx_sensitivity", RS2_OPTION_AUTO_RX_SENSITIVITY) .value("transmitter_frequency", RS2_OPTION_TRANSMITTER_FREQUENCY) + .value("vertical_binning", RS2_OPTION_VERTICAL_BINNING) .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 50327bc93e..2af7bc6344 100755 --- a/wrappers/unrealengine4/Plugins/RealSense/Source/RealSense/Public/RealSenseTypes.h +++ b/wrappers/unrealengine4/Plugins/RealSense/Source/RealSense/Public/RealSenseTypes.h @@ -143,6 +143,7 @@ enum class ERealSenseOptionType : uint8 AUTO_GAIN_LIMIT , /**< Set and get auto gain limits ranging from 16 to 248. Default is 0 which means full gain. If the requested gain limit is less than 16, it will be set to 16. If the requested gain limit is greater than 248, it will be set to 248. Setting will not take effect until next streaming session. */ AUTO_RX_SENSITIVITY , /**< Set and get auto receiver sensitivity.*/ TRANSMITTER_FREQUENCY , /**< Change transmitter frequency, increasing effective range over sharpness. */ + VERTICAL_BINNING , /**< Enables vertical binning which increases the maximal sensed distance. */ }; UENUM(Blueprintable) From 6e903d2b5d75b5f9181397d2f8d162cd627243ce Mon Sep 17 00:00:00 2001 From: aangerma Date: Wed, 23 Jun 2021 21:36:49 +0300 Subject: [PATCH 3/3] CR fixes --- .../main/java/com/intel/realsense/librealsense/Option.java | 4 ++-- wrappers/csharp/Intel.RealSense/Types/Enums/Option.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 d2fccf1f18..7826c72864 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 @@ -90,8 +90,8 @@ public enum Option { AUTO_EXPOSURE_LIMIT(85), AUTO_GAIN_LIMIT(86), AUTO_RX_SENSITIVITY(87), - OPTION_TRANSMITTER_FREQUENCY(88); - RS2_OPTION_VERTICAL_BINNING(88); + OPTION_TRANSMITTER_FREQUENCY(88), + RS2_OPTION_VERTICAL_BINNING(89); 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 120251e7fa..9fcd0aebf7 100644 --- a/wrappers/csharp/Intel.RealSense/Types/Enums/Option.cs +++ b/wrappers/csharp/Intel.RealSense/Types/Enums/Option.cs @@ -281,7 +281,7 @@ public enum Option /// Change transmitter frequency, increasing effective range over sharpness transmitter_frequency = 88, - /// Change transmitter frequency, increasing effective range over sharpness + /// Enables vertical binning which increases the maximal sensed distance vertical_binning = 89 } }