From d8aa8359df6dbb5425a412c1ae83a429c33e4d7e Mon Sep 17 00:00:00 2001
From: Noha Yassin <37175819+nohayassin@users.noreply.github.com>
Date: Sun, 7 Mar 2021 14:17:13 +0200
Subject: [PATCH 01/12] Auto Exposure : range value setting limitation

---
 src/ds5/ds5-options.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/ds5/ds5-options.cpp b/src/ds5/ds5-options.cpp
index 73b5869352..ed25a28f1e 100644
--- a/src/ds5/ds5-options.cpp
+++ b/src/ds5/ds5-options.cpp
@@ -669,6 +669,12 @@ namespace librealsense
 
     void auto_exposure_limit_option::set(float value)
     {
+        if (value < get_range().min || value > get_range().max)
+        {
+            LOG_ERROR("Auto Exposure new value - " << value << " - is outside the limit : min = "
+                << get_range().min << ", max = " << get_range().max << ".\n");
+            return;
+        }
         command cmd_get(ds::AUTO_CALIB);
         cmd_get.param1 = 5;
         std::vector<uint8_t> ret = _hwm.send(cmd_get);

From 0c3e72442129ac42b1f85122821628e2056b75d8 Mon Sep 17 00:00:00 2001
From: Noha Yassin <37175819+nohayassin@users.noreply.github.com>
Date: Sun, 7 Mar 2021 14:55:16 +0200
Subject: [PATCH 02/12] Auto Exposure : range value setting limitation

---
 src/ds5/ds5-options.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ds5/ds5-options.cpp b/src/ds5/ds5-options.cpp
index ed25a28f1e..6d4074bd52 100644
--- a/src/ds5/ds5-options.cpp
+++ b/src/ds5/ds5-options.cpp
@@ -671,8 +671,8 @@ namespace librealsense
     {
         if (value < get_range().min || value > get_range().max)
         {
-            LOG_ERROR("Auto Exposure new value - " << value << " - is outside the limit : min = "
-                << get_range().min << ", max = " << get_range().max << ".\n");
+            LOG_ERROR("Auto Exposure new value " << value << " is outside the range ["
+                << get_range().min << ", " << get_range().max << "].\n");
             return;
         }
         command cmd_get(ds::AUTO_CALIB);

From 3ccd14c220e0c321e921fab79b95a2e5507212c2 Mon Sep 17 00:00:00 2001
From: Noha Yassin <37175819+nohayassin@users.noreply.github.com>
Date: Mon, 8 Mar 2021 10:28:21 +0200
Subject: [PATCH 03/12] used built-in functions

---
 src/ds5/ds5-options.cpp | 11 ++++-------
 src/ds5/ds5-options.h   |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/ds5/ds5-options.cpp b/src/ds5/ds5-options.cpp
index 6d4074bd52..8e20c4f80f 100644
--- a/src/ds5/ds5-options.cpp
+++ b/src/ds5/ds5-options.cpp
@@ -659,7 +659,7 @@ namespace librealsense
     }
 
     auto_exposure_limit_option::auto_exposure_limit_option(hw_monitor& hwm, sensor_base* ep)
-        : _hwm(hwm), _sensor(ep)
+        : option_base(option_range{ 0, 165000, 1, 0 }), _hwm(hwm), _sensor(ep)
     {
         _range = [this]()
         {
@@ -669,12 +669,9 @@ namespace librealsense
 
     void auto_exposure_limit_option::set(float value)
     {
-        if (value < get_range().min || value > get_range().max)
-        {
-            LOG_ERROR("Auto Exposure new value " << value << " is outside the range ["
-                << get_range().min << ", " << get_range().max << "].\n");
-            return;
-        }
+        if (!is_valid(value))
+            throw invalid_value_exception("set(enable_auto_exposure) failed! Invalid Auto-Exposure mode request " + std::to_string(value));
+
         command cmd_get(ds::AUTO_CALIB);
         cmd_get.param1 = 5;
         std::vector<uint8_t> ret = _hwm.send(cmd_get);
diff --git a/src/ds5/ds5-options.h b/src/ds5/ds5-options.h
index 4532f0f160..1007fc8666 100644
--- a/src/ds5/ds5-options.h
+++ b/src/ds5/ds5-options.h
@@ -354,7 +354,7 @@ namespace librealsense
         std::shared_ptr<option> _hdr_option;
     };
 
-    class auto_exposure_limit_option : public option
+    class auto_exposure_limit_option : public option_base
     {
     public:
         auto_exposure_limit_option(hw_monitor& hwm, sensor_base* depth_ep);

From 53f761a4798552547a85f99f8eb27375ac203c25 Mon Sep 17 00:00:00 2001
From: Noha Yassin <37175819+nohayassin@users.noreply.github.com>
Date: Tue, 9 Mar 2021 09:54:23 +0200
Subject: [PATCH 04/12] added changes to auto_gain_limit_option

---
 src/ds5/ds5-options.cpp | 5 ++++-
 src/ds5/ds5-options.h   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/ds5/ds5-options.cpp b/src/ds5/ds5-options.cpp
index 8e20c4f80f..4c9ed772a2 100644
--- a/src/ds5/ds5-options.cpp
+++ b/src/ds5/ds5-options.cpp
@@ -704,7 +704,7 @@ namespace librealsense
     }
 
     auto_gain_limit_option::auto_gain_limit_option(hw_monitor& hwm, sensor_base* ep)
-        : _hwm(hwm), _sensor(ep)
+        : option_base(option_range{ 0, 248, 1, 0 }), _hwm(hwm), _sensor(ep)
     {
         _range = [this]()
         {
@@ -714,6 +714,9 @@ namespace librealsense
 
     void auto_gain_limit_option::set(float value)
     {
+        if (!is_valid(value))
+            throw invalid_value_exception("set(enable_auto_exposure) failed! Invalid Auto-Exposure mode request " + std::to_string(value));
+
         command cmd_get(ds::AUTO_CALIB);
         cmd_get.param1 = 5;
         std::vector<uint8_t> ret = _hwm.send(cmd_get);
diff --git a/src/ds5/ds5-options.h b/src/ds5/ds5-options.h
index 1007fc8666..0fd8ed6b77 100644
--- a/src/ds5/ds5-options.h
+++ b/src/ds5/ds5-options.h
@@ -376,7 +376,7 @@ namespace librealsense
         sensor_base* _sensor;
     };
 
-    class auto_gain_limit_option : public option
+    class auto_gain_limit_option : public option_base
     {
     public:
         auto_gain_limit_option(hw_monitor& hwm, sensor_base* depth_ep);

From 9028475e40515cf9d897d70fac3af87d8f166b43 Mon Sep 17 00:00:00 2001
From: Noha Yassin <37175819+nohayassin@users.noreply.github.com>
Date: Tue, 9 Mar 2021 10:13:42 +0200
Subject: [PATCH 05/12] added changes to auto_gain_limit_option

---
 src/ds5/ds5-options.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ds5/ds5-options.cpp b/src/ds5/ds5-options.cpp
index 4c9ed772a2..a7ee9dd98f 100644
--- a/src/ds5/ds5-options.cpp
+++ b/src/ds5/ds5-options.cpp
@@ -715,7 +715,7 @@ namespace librealsense
     void auto_gain_limit_option::set(float value)
     {
         if (!is_valid(value))
-            throw invalid_value_exception("set(enable_auto_exposure) failed! Invalid Auto-Exposure mode request " + std::to_string(value));
+            throw invalid_value_exception("set(enable_auto_gain) failed! Invalid Auto-Gain mode request " + std::to_string(value));
 
         command cmd_get(ds::AUTO_CALIB);
         cmd_get.param1 = 5;

From 2eedb16cac4f1f784483af9682edef7b7e4bfe3a Mon Sep 17 00:00:00 2001
From: Noha Yassin <37175819+nohayassin@users.noreply.github.com>
Date: Tue, 9 Mar 2021 14:09:56 +0200
Subject: [PATCH 06/12] fixed range of auto exposure & gain

---
 src/ds5/ds5-device.cpp  |  6 ++++--
 src/ds5/ds5-options.cpp | 16 ++++++++--------
 src/ds5/ds5-options.h   |  4 ++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/ds5/ds5-device.cpp b/src/ds5/ds5-device.cpp
index d66f17f531..7fd4995b54 100644
--- a/src/ds5/ds5-device.cpp
+++ b/src/ds5/ds5-device.cpp
@@ -977,8 +977,10 @@ namespace librealsense
         // Auto exposure and gain limit
         if (_fw_version >= firmware_version("5.12.10.11"))
         {
-            depth_sensor.register_option(RS2_OPTION_AUTO_EXPOSURE_LIMIT, std::make_shared<auto_exposure_limit_option>(*_hw_monitor, &depth_sensor));
-            depth_sensor.register_option(RS2_OPTION_AUTO_GAIN_LIMIT, std::make_shared<auto_gain_limit_option>(*_hw_monitor, &depth_sensor));
+            auto exposure_range = depth_sensor.get_option(RS2_OPTION_EXPOSURE).get_range();
+            auto gain_range = depth_sensor.get_option(RS2_OPTION_GAIN).get_range();
+            depth_sensor.register_option(RS2_OPTION_AUTO_EXPOSURE_LIMIT, std::make_shared<auto_exposure_limit_option>(*_hw_monitor, &depth_sensor, exposure_range));
+            depth_sensor.register_option(RS2_OPTION_AUTO_GAIN_LIMIT, std::make_shared<auto_gain_limit_option>(*_hw_monitor, &depth_sensor, gain_range));
         }
 
         // attributes of md_capture_timing
diff --git a/src/ds5/ds5-options.cpp b/src/ds5/ds5-options.cpp
index a7ee9dd98f..4ed19ed509 100644
--- a/src/ds5/ds5-options.cpp
+++ b/src/ds5/ds5-options.cpp
@@ -658,12 +658,12 @@ namespace librealsense
             return _uvc_option->is_enabled();
     }
 
-    auto_exposure_limit_option::auto_exposure_limit_option(hw_monitor& hwm, sensor_base* ep)
-        : option_base(option_range{ 0, 165000, 1, 0 }), _hwm(hwm), _sensor(ep)
+    auto_exposure_limit_option::auto_exposure_limit_option(hw_monitor& hwm, sensor_base* ep, option_range range)
+        : option_base(range), _hwm(hwm), _sensor(ep)
     {
-        _range = [this]()
+        _range = [this, range]()
         {
-            return option_range{ 0, 165000, 1, 0 };
+            return range;
         };
     }
 
@@ -703,12 +703,12 @@ namespace librealsense
         return *_range;
     }
 
-    auto_gain_limit_option::auto_gain_limit_option(hw_monitor& hwm, sensor_base* ep)
-        : option_base(option_range{ 0, 248, 1, 0 }), _hwm(hwm), _sensor(ep)
+    auto_gain_limit_option::auto_gain_limit_option(hw_monitor& hwm, sensor_base* ep, option_range range)
+        : option_base(range), _hwm(hwm), _sensor(ep)
     {
-        _range = [this]()
+        _range = [this, range]()
         {
-            return option_range{ 0, 248, 1, 0 };
+            return range;
         };
     }
 
diff --git a/src/ds5/ds5-options.h b/src/ds5/ds5-options.h
index 0fd8ed6b77..46b3b2c754 100644
--- a/src/ds5/ds5-options.h
+++ b/src/ds5/ds5-options.h
@@ -357,7 +357,7 @@ namespace librealsense
     class auto_exposure_limit_option : public option_base
     {
     public:
-        auto_exposure_limit_option(hw_monitor& hwm, sensor_base* depth_ep);
+        auto_exposure_limit_option(hw_monitor& hwm, sensor_base* depth_ep, option_range range);
         virtual ~auto_exposure_limit_option() = default;
         virtual void set(float value) override;
         virtual float query() const override;
@@ -379,7 +379,7 @@ namespace librealsense
     class auto_gain_limit_option : public option_base
     {
     public:
-        auto_gain_limit_option(hw_monitor& hwm, sensor_base* depth_ep);
+        auto_gain_limit_option(hw_monitor& hwm, sensor_base* depth_ep, option_range range);
         virtual ~auto_gain_limit_option() = default;
         virtual void set(float value) override;
         virtual float query() const override;

From c1926fe0e88899c0984d7d4a5f3183efa51cfc80 Mon Sep 17 00:00:00 2001
From: Noha Yassin <37175819+nohayassin@users.noreply.github.com>
Date: Mon, 22 Mar 2021 13:38:13 +0200
Subject: [PATCH 07/12] dso_16596_fix_unit_test

---
 .../internal/internal-tests-extrinsic.cpp     | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/unit-tests/internal/internal-tests-extrinsic.cpp b/unit-tests/internal/internal-tests-extrinsic.cpp
index 07951569bf..bdebed9c56 100644
--- a/unit-tests/internal/internal-tests-extrinsic.cpp
+++ b/unit-tests/internal/internal-tests-extrinsic.cpp
@@ -637,3 +637,44 @@ TEST_CASE("Enable disable all streams", "[live]")
         }
     }
 }
+TEST_CASE("Controls limits validation", "[live]")
+{
+    rs2::context ctx;
+    if (make_context(SECTION_FROM_TEST_NAME, &ctx))
+    {
+        auto&& device = ctx.query_devices()[0];
+        auto sensors = device.query_sensors();
+        rs2::sensor depth_sensor;
+        float current_set_value;
+        float ae_limit;
+        float prev_ae_limit;
+        //rs2::option_range range;
+
+        for (auto& s : sensors)
+        {
+            std::string val = s.get_info(RS2_CAMERA_INFO_NAME);
+            if (!val.compare("Stereo Module")) {
+                depth_sensor = s;
+                auto range = s.get_option_range(RS2_OPTION_AUTO_EXPOSURE_LIMIT);
+                float set_value[3] = { range.min - 10, range.max + 10, (range.max - range.min) / 2 };
+                for (auto& val : set_value)
+                {
+                    try
+                    {
+                        current_set_value = val;
+                        CAPTURE(val);
+                        CAPTURE(range);
+                        s.set_option(RS2_OPTION_AUTO_EXPOSURE_LIMIT, val);
+                        prev_ae_limit = ae_limit;
+                        ae_limit = s.get_option(RS2_OPTION_AUTO_EXPOSURE_LIMIT);
+                        REQUIRE_THROWS(ae_limit == val);
+                    }
+                    catch (const rs2::error& e)
+                    {
+                        REQUIRE_THROWS(ae_limit == prev_ae_limit);
+                    }
+                }
+            }
+        }
+    }
+}

From 051ffa69e841caa23d5635f37c5a11f13ecfc6ee Mon Sep 17 00:00:00 2001
From: Noha Yassin <37175819+nohayassin@users.noreply.github.com>
Date: Mon, 22 Mar 2021 15:20:09 +0200
Subject: [PATCH 08/12] AE range unit test

---
 .../internal/internal-tests-extrinsic.cpp     | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/unit-tests/internal/internal-tests-extrinsic.cpp b/unit-tests/internal/internal-tests-extrinsic.cpp
index bdebed9c56..c2c0e3f5b8 100644
--- a/unit-tests/internal/internal-tests-extrinsic.cpp
+++ b/unit-tests/internal/internal-tests-extrinsic.cpp
@@ -645,10 +645,7 @@ TEST_CASE("Controls limits validation", "[live]")
         auto&& device = ctx.query_devices()[0];
         auto sensors = device.query_sensors();
         rs2::sensor depth_sensor;
-        float current_set_value;
         float ae_limit;
-        float prev_ae_limit;
-        //rs2::option_range range;
 
         for (auto& s : sensors)
         {
@@ -656,22 +653,18 @@ TEST_CASE("Controls limits validation", "[live]")
             if (!val.compare("Stereo Module")) {
                 depth_sensor = s;
                 auto range = s.get_option_range(RS2_OPTION_AUTO_EXPOSURE_LIMIT);
-                float set_value[3] = { range.min - 10, range.max + 10, (range.max - range.min) / 2 };
+                float set_value[3] = { range.min - 10, range.max + 10, (range.max + range.min) / 2 };
                 for (auto& val : set_value)
                 {
-                    try
+                    CAPTURE(val);
+                    CAPTURE(range);
+                    if (val < range.min || val > range.max)
+                        REQUIRE_THROWS(s.set_option(RS2_OPTION_AUTO_EXPOSURE_LIMIT, val));
+                    else
                     {
-                        current_set_value = val;
-                        CAPTURE(val);
-                        CAPTURE(range);
                         s.set_option(RS2_OPTION_AUTO_EXPOSURE_LIMIT, val);
-                        prev_ae_limit = ae_limit;
                         ae_limit = s.get_option(RS2_OPTION_AUTO_EXPOSURE_LIMIT);
-                        REQUIRE_THROWS(ae_limit == val);
-                    }
-                    catch (const rs2::error& e)
-                    {
-                        REQUIRE_THROWS(ae_limit == prev_ae_limit);
+                        REQUIRE(ae_limit == val);
                     }
                 }
             }

From 55f9acd85bd67ababd1f178f3927221cdcc18b82 Mon Sep 17 00:00:00 2001
From: Noha Yassin <37175819+nohayassin@users.noreply.github.com>
Date: Mon, 22 Mar 2021 15:39:02 +0200
Subject: [PATCH 09/12] Conrols limits fixes + unit test

---
 .../internal/internal-tests-extrinsic.cpp     | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/unit-tests/internal/internal-tests-extrinsic.cpp b/unit-tests/internal/internal-tests-extrinsic.cpp
index c2c0e3f5b8..d9a3d57e3d 100644
--- a/unit-tests/internal/internal-tests-extrinsic.cpp
+++ b/unit-tests/internal/internal-tests-extrinsic.cpp
@@ -646,25 +646,28 @@ TEST_CASE("Controls limits validation", "[live]")
         auto sensors = device.query_sensors();
         rs2::sensor depth_sensor;
         float ae_limit;
-
-        for (auto& s : sensors)
+        rs2_option controls[2] = { RS2_OPTION_AUTO_GAIN_LIMIT, RS2_OPTION_AUTO_EXPOSURE_LIMIT };
+        for (auto& control : controls)
         {
-            std::string val = s.get_info(RS2_CAMERA_INFO_NAME);
-            if (!val.compare("Stereo Module")) {
-                depth_sensor = s;
-                auto range = s.get_option_range(RS2_OPTION_AUTO_EXPOSURE_LIMIT);
-                float set_value[3] = { range.min - 10, range.max + 10, (range.max + range.min) / 2 };
-                for (auto& val : set_value)
-                {
-                    CAPTURE(val);
-                    CAPTURE(range);
-                    if (val < range.min || val > range.max)
-                        REQUIRE_THROWS(s.set_option(RS2_OPTION_AUTO_EXPOSURE_LIMIT, val));
-                    else
+            for (auto& s : sensors)
+            {
+                std::string val = s.get_info(RS2_CAMERA_INFO_NAME);
+                if (!val.compare("Stereo Module")) {
+                    depth_sensor = s;
+                    auto range = s.get_option_range(control);
+                    float set_value[3] = { range.min - 10, range.max + 10, std::floor((range.max + range.min) / 2) };
+                    for (auto& val : set_value)
                     {
-                        s.set_option(RS2_OPTION_AUTO_EXPOSURE_LIMIT, val);
-                        ae_limit = s.get_option(RS2_OPTION_AUTO_EXPOSURE_LIMIT);
-                        REQUIRE(ae_limit == val);
+                        CAPTURE(val);
+                        CAPTURE(range);
+                        if (val < range.min || val > range.max)
+                            REQUIRE_THROWS(s.set_option(control, val));
+                        else
+                        {
+                            s.set_option(control, val);
+                            ae_limit = s.get_option(control);
+                            REQUIRE(ae_limit == val);
+                        }
                     }
                 }
             }

From 5f34f34a4877c48f8248402c96bdd78f961ea1eb Mon Sep 17 00:00:00 2001
From: Noha Yassin <37175819+nohayassin@users.noreply.github.com>
Date: Mon, 22 Mar 2021 17:15:43 +0200
Subject: [PATCH 10/12] Conrols limits fixes + unit test

---
 src/ds5/ds5-options.cpp                       |  4 +-
 .../internal/internal-tests-extrinsic.cpp     | 51 +++++++++++--------
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/ds5/ds5-options.cpp b/src/ds5/ds5-options.cpp
index 4ed19ed509..18c9256e63 100644
--- a/src/ds5/ds5-options.cpp
+++ b/src/ds5/ds5-options.cpp
@@ -661,7 +661,7 @@ namespace librealsense
     auto_exposure_limit_option::auto_exposure_limit_option(hw_monitor& hwm, sensor_base* ep, option_range range)
         : option_base(range), _hwm(hwm), _sensor(ep)
     {
-        _range = [this, range]()
+        _range = [range]()
         {
             return range;
         };
@@ -706,7 +706,7 @@ namespace librealsense
     auto_gain_limit_option::auto_gain_limit_option(hw_monitor& hwm, sensor_base* ep, option_range range)
         : option_base(range), _hwm(hwm), _sensor(ep)
     {
-        _range = [this, range]()
+        _range = [range]()
         {
             return range;
         };
diff --git a/unit-tests/internal/internal-tests-extrinsic.cpp b/unit-tests/internal/internal-tests-extrinsic.cpp
index d9a3d57e3d..34a7a8087d 100644
--- a/unit-tests/internal/internal-tests-extrinsic.cpp
+++ b/unit-tests/internal/internal-tests-extrinsic.cpp
@@ -642,31 +642,38 @@ TEST_CASE("Controls limits validation", "[live]")
     rs2::context ctx;
     if (make_context(SECTION_FROM_TEST_NAME, &ctx))
     {
-        auto&& device = ctx.query_devices()[0];
-        auto sensors = device.query_sensors();
-        rs2::sensor depth_sensor;
-        float ae_limit;
-        rs2_option controls[2] = { RS2_OPTION_AUTO_GAIN_LIMIT, RS2_OPTION_AUTO_EXPOSURE_LIMIT };
-        for (auto& control : controls)
+        auto list = ctx.query_devices();
+        REQUIRE(list.size());
+
+        for (auto&& device : list)
         {
-            for (auto& s : sensors)
+            if (std::string(device.get_info(RS2_CAMERA_INFO_PRODUCT_LINE))  != "D400")
+                continue;
+            auto sensors = device.query_sensors();
+            float ae_limit;
+            rs2_option controls[2] = { RS2_OPTION_AUTO_GAIN_LIMIT, RS2_OPTION_AUTO_EXPOSURE_LIMIT };
+            for (auto& control : controls)
             {
-                std::string val = s.get_info(RS2_CAMERA_INFO_NAME);
-                if (!val.compare("Stereo Module")) {
-                    depth_sensor = s;
-                    auto range = s.get_option_range(control);
-                    float set_value[3] = { range.min - 10, range.max + 10, std::floor((range.max + range.min) / 2) };
-                    for (auto& val : set_value)
-                    {
-                        CAPTURE(val);
-                        CAPTURE(range);
-                        if (val < range.min || val > range.max)
-                            REQUIRE_THROWS(s.set_option(control, val));
-                        else
+                for (auto& s : sensors)
+                {
+                    std::string val = s.get_info(RS2_CAMERA_INFO_NAME);
+                    if (!val.compare("Stereo Module")) {
+                    if (!s.supports(control))
+                        return;
+                        auto range = s.get_option_range(control);
+                        float set_value[3] = { range.min - 10, range.max + 10, std::floor((range.max + range.min) / 2) };
+                        for (auto& val : set_value)
                         {
-                            s.set_option(control, val);
-                            ae_limit = s.get_option(control);
-                            REQUIRE(ae_limit == val);
+                            CAPTURE(val);
+                            CAPTURE(range);
+                            if (val < range.min || val > range.max)
+                                REQUIRE_THROWS(s.set_option(control, val));
+                            else
+                            {
+                                s.set_option(control, val);
+                                ae_limit = s.get_option(control);
+                                REQUIRE(ae_limit == val);
+                            }
                         }
                     }
                 }

From 67970d5d97b2ae4de9b7268e76af94de19acf76d Mon Sep 17 00:00:00 2001
From: Noha Yassin <37175819+nohayassin@users.noreply.github.com>
Date: Mon, 22 Mar 2021 17:30:40 +0200
Subject: [PATCH 11/12] Conrols limits fixes + unit test

---
 .../internal/internal-tests-extrinsic.cpp     | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/unit-tests/internal/internal-tests-extrinsic.cpp b/unit-tests/internal/internal-tests-extrinsic.cpp
index 34a7a8087d..55001bbdfe 100644
--- a/unit-tests/internal/internal-tests-extrinsic.cpp
+++ b/unit-tests/internal/internal-tests-extrinsic.cpp
@@ -647,7 +647,7 @@ TEST_CASE("Controls limits validation", "[live]")
 
         for (auto&& device : list)
         {
-            if (std::string(device.get_info(RS2_CAMERA_INFO_PRODUCT_LINE))  != "D400")
+            if (std::string(device.get_info(RS2_CAMERA_INFO_PRODUCT_LINE)) != "D400")
                 continue;
             auto sensors = device.query_sensors();
             float ae_limit;
@@ -657,23 +657,21 @@ TEST_CASE("Controls limits validation", "[live]")
                 for (auto& s : sensors)
                 {
                     std::string val = s.get_info(RS2_CAMERA_INFO_NAME);
-                    if (!val.compare("Stereo Module")) {
                     if (!s.supports(control))
                         return;
-                        auto range = s.get_option_range(control);
-                        float set_value[3] = { range.min - 10, range.max + 10, std::floor((range.max + range.min) / 2) };
-                        for (auto& val : set_value)
+                    auto range = s.get_option_range(control);
+                    float set_value[3] = { range.min - 10, range.max + 10, std::floor((range.max + range.min) / 2) };
+                    for (auto& val : set_value)
+                    {
+                        CAPTURE(val);
+                        CAPTURE(range);
+                        if (val < range.min || val > range.max)
+                            REQUIRE_THROWS(s.set_option(control, val));
+                        else
                         {
-                            CAPTURE(val);
-                            CAPTURE(range);
-                            if (val < range.min || val > range.max)
-                                REQUIRE_THROWS(s.set_option(control, val));
-                            else
-                            {
-                                s.set_option(control, val);
-                                ae_limit = s.get_option(control);
-                                REQUIRE(ae_limit == val);
-                            }
+                            s.set_option(control, val);
+                            ae_limit = s.get_option(control);
+                            REQUIRE(ae_limit == val);
                         }
                     }
                 }

From 65943214728518f6c1964a634de4e1e98f912778 Mon Sep 17 00:00:00 2001
From: Noha Yassin <37175819+nohayassin@users.noreply.github.com>
Date: Wed, 24 Mar 2021 09:49:35 +0200
Subject: [PATCH 12/12] fixes

---
 unit-tests/internal/internal-tests-extrinsic.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/unit-tests/internal/internal-tests-extrinsic.cpp b/unit-tests/internal/internal-tests-extrinsic.cpp
index 55001bbdfe..05def85166 100644
--- a/unit-tests/internal/internal-tests-extrinsic.cpp
+++ b/unit-tests/internal/internal-tests-extrinsic.cpp
@@ -650,7 +650,7 @@ TEST_CASE("Controls limits validation", "[live]")
             if (std::string(device.get_info(RS2_CAMERA_INFO_PRODUCT_LINE)) != "D400")
                 continue;
             auto sensors = device.query_sensors();
-            float ae_limit;
+            float limit;
             rs2_option controls[2] = { RS2_OPTION_AUTO_GAIN_LIMIT, RS2_OPTION_AUTO_EXPOSURE_LIMIT };
             for (auto& control : controls)
             {
@@ -658,7 +658,7 @@ TEST_CASE("Controls limits validation", "[live]")
                 {
                     std::string val = s.get_info(RS2_CAMERA_INFO_NAME);
                     if (!s.supports(control))
-                        return;
+                        break;
                     auto range = s.get_option_range(control);
                     float set_value[3] = { range.min - 10, range.max + 10, std::floor((range.max + range.min) / 2) };
                     for (auto& val : set_value)
@@ -670,8 +670,8 @@ TEST_CASE("Controls limits validation", "[live]")
                         else
                         {
                             s.set_option(control, val);
-                            ae_limit = s.get_option(control);
-                            REQUIRE(ae_limit == val);
+                            limit = s.get_option(control);
+                            REQUIRE(limit == val);
                         }
                     }
                 }