436i to 436 in code

IntelRealSense · Jan 8, 2025 · afea409 · afea409
1 parent 304badf
commit afea409
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/src/ds/advanced_mode/advanced_mode.cpp b/src/ds/advanced_mode/advanced_mode.cpp
@@ -116,7 +116,7 @@ namespace librealsense
             case ds::RS435I_PID:
                 default_430(p);
                 break;
-            case ds::RS436I_PID:
+            case ds::RS436_PID:
                 default_436(p);
                 break;
             case ds::RS455_PID:

diff --git a/src/ds/advanced_mode/presets.cpp b/src/ds/advanced_mode/presets.cpp
@@ -555,7 +555,7 @@ namespace librealsense
         default_450_mid_low_res_color_only(p);
     }
 
-    // D436i has same depth as D435 and same color as D455
+    // D436 has same depth as D435 and same color as D455
     void default_436(preset& p)
     {
         default_430_except_color(p);

diff --git a/src/ds/d400/d400-factory.cpp b/src/ds/d400/d400-factory.cpp
@@ -779,14 +779,14 @@ namespace librealsense
         bool compress_while_record() const override { return false; }
     };
 
-    class rs436i_device : public d400_active,
+    class rs436_device : public d400_active,
         public d400_color,
         public d400_motion,
         public ds_advanced_mode_base,
         public firmware_logger_device
     {
     public:
-        rs436i_device(std::shared_ptr< const d400_info > const& dev_info, bool register_device_notifications)
+        rs436_device(std::shared_ptr< const d400_info > const& dev_info, bool register_device_notifications)
             : device(dev_info, register_device_notifications)
             , backend_device(dev_info, register_device_notifications)
             , d400_device(dev_info)
@@ -1036,8 +1036,8 @@ namespace librealsense
             return std::make_shared< rs435_device >( dev_info, register_device_notifications );
         case RS435I_PID:
             return std::make_shared< rs435i_device >( dev_info, register_device_notifications );
-        case RS436I_PID:
-            return std::make_shared< rs436i_device >(dev_info, register_device_notifications);
+        case RS436_PID:
+            return std::make_shared< rs436_device >(dev_info, register_device_notifications);
         case RS_USB2_PID:
             return std::make_shared< rs410_device >( dev_info, register_device_notifications );
         case RS400_IMU_PID:
@@ -1233,7 +1233,7 @@ namespace librealsense
         return matcher_factory::create(RS2_MATCHER_DEFAULT, streams);
     }
 
-    std::shared_ptr<matcher> rs436i_device::create_matcher(const frame_holder& frame) const
+    std::shared_ptr<matcher> rs436_device::create_matcher(const frame_holder& frame) const
     {
         std::vector<stream_interface*> streams = { _depth_stream.get() , _left_ir_stream.get() , _right_ir_stream.get(), _color_stream.get() };
         // TODO - A proper matcher for High-FPS sensor is required

diff --git a/src/ds/d400/d400-private.cpp b/src/ds/d400/d400-private.cpp
@@ -40,7 +40,7 @@ namespace librealsense
                     case RS430_MM_PID:
                     case RS420_MM_PID:
                     case RS435I_PID:
-                    case RS436I_PID:
+                    case RS436_PID:
                     case RS455_PID:
                         found = (result.mi == 6);
                         break;

diff --git a/src/ds/d400/d400-private.h b/src/ds/d400/d400-private.h
@@ -30,7 +30,7 @@ namespace librealsense
         const uint16_t RS430_MM_RGB_PID = 0x0b01; // AWGCT
         const uint16_t RS460_PID = 0x0b03; // DS5U
         const uint16_t RS435_RGB_PID = 0x0b07; // AWGC
-        const uint16_t RS436I_PID = 0x1156; // D436i
+        const uint16_t RS436_PID = 0x1156; // D436
         const uint16_t RS405U_PID = 0x0b0c; // DS5U
         const uint16_t RS435I_PID = 0x0b3a; // D435i
         const uint16_t RS416_PID = 0x0b49; // F416
@@ -58,7 +58,7 @@ namespace librealsense
             ds::RS430_MM_RGB_PID,
             ds::RS460_PID,
             ds::RS435_RGB_PID,
-            ds::RS436I_PID,
+            ds::RS436_PID,
             ds::RS405U_PID,
             ds::RS435I_PID,
             ds::RS416_RGB_PID,
@@ -77,7 +77,7 @@ namespace librealsense
             ds::RS430_MM_PID,
             ds::RS430_MM_RGB_PID,
             ds::RS435_RGB_PID,
-            ds::RS436I_PID,
+            ds::RS436_PID,
             ds::RS435I_PID,
             ds::RS455_PID,
             ds::RS457_PID
@@ -89,14 +89,14 @@ namespace librealsense
 
         static const std::set<std::uint16_t> d400_hid_sensors_pid = {
             ds::RS435I_PID,
-            ds::RS436I_PID,
+            ds::RS436_PID,
             ds::RS430I_PID,
             ds::RS455_PID
         };
 
         static const std::set<std::uint16_t> d400_hid_bmi_055_pid = {
             ds::RS435I_PID,
-            ds::RS436I_PID,
+            ds::RS436_PID,
             ds::RS430I_PID,
             ds::RS455_PID
         };
@@ -129,7 +129,7 @@ namespace librealsense
             { RS430_MM_RGB_PID,     "Intel RealSense D430 with Tracking and RGB Modules"},
             { RS460_PID,            "Intel RealSense D460" },
             { RS435_RGB_PID,        "Intel RealSense D435"},
-            { RS436I_PID,            "Intel RealSense D436I"},
+            { RS436_PID,            "Intel RealSense D436"},
             { RS405U_PID,           "Intel RealSense DS5U" },
             { RS435I_PID,           "Intel RealSense D435I" },
             { RS416_PID,            "Intel RealSense F416"},
@@ -161,7 +161,7 @@ namespace librealsense
             {RS435_RGB_PID, "5.8.15.0" },
             {RS405U_PID, "5.8.15.0" },
             {RS435I_PID, "5.12.7.100" },
-            {RS436I_PID, "5.16.3.100" },  // TODO - update final required FW version
+            {RS436_PID, "5.16.3.100" },  // TODO - update final required FW version
             {RS416_PID, "5.8.15.0" },
             {RS430I_PID, "5.8.15.0" },
             {RS416_RGB_PID, "5.8.15.0" },

diff --git a/src/ds/ds-calib-parsers.cpp b/src/ds/ds-calib-parsers.cpp
@@ -152,7 +152,7 @@ namespace librealsense
         // predefined platform specific extrinsic, IMU assembly transformation based on mechanical drawing (meters)
         rs2_extrinsics _def_extr;
 
-        if (_pid == ds::RS435I_PID || _pid == ds::RS436I_PID)
+        if (_pid == ds::RS435I_PID || _pid == ds::RS436_PID)
         {
             // D435i specific - Bosch BMI055
             _def_extr = { { 1, 0, 0, 0, 1, 0, 0, 0, 1 }, { -0.00552f, 0.0051f, 0.01174f} };