Remove SR300

common/device-model.cpp

@@ -2187,7 +2187,6 @@ namespace rs2
                         auto itr = sub->options_metadata.find(RS2_OPTION_VISUAL_PRESET);
                         if (itr != sub->options_metadata.end())
                         {
-                            //TODO: Update to work with SR300 when the load json will update viewer configurations
                             itr->second.endpoint->set_option(RS2_OPTION_VISUAL_PRESET, RS2_RS400_VISUAL_PRESET_CUSTOM);
                         }
                     }

common/fw-update-helper.cpp

@@ -16,14 +16,11 @@
 
 #ifdef INTERNAL_FW
 #include "common/fw/D4XX_FW_Image.h"
-#include "common/fw/SR3XX_FW_Image.h"
 #include "common/fw/L51X_FW_Image.h"
 #else
 #define FW_D4XX_FW_IMAGE_VERSION ""
-#define FW_SR3XX_FW_IMAGE_VERSION ""
 #define FW_L51X_FW_IMAGE_VERSION ""
 const char* fw_get_D4XX_FW_Image(int) { return NULL; }
-const char* fw_get_SR3XX_FW_Image(int) { return NULL; }
 const char* fw_get_L51X_FW_Image(int) { return NULL; }
 
 
@@ -51,15 +48,13 @@ namespace rs2
     int parse_product_line(const std::string& product_line)
     {
         if (product_line == "D400") return RS2_PRODUCT_LINE_D400;
-        else if (product_line == "SR300") return RS2_PRODUCT_LINE_SR300;
         else if (product_line == "L500") return RS2_PRODUCT_LINE_L500;
         else return -1;
     }
 
     std::string get_available_firmware_version(int product_line, const std::string& pid)
     {
         if (product_line == RS2_PRODUCT_LINE_D400) return FW_D4XX_FW_IMAGE_VERSION;
-        //else if (product_line == RS2_PRODUCT_LINE_SR300) return FW_SR3XX_FW_IMAGE_VERSION;
         else if (product_line == RS2_PRODUCT_LINE_L500) return FW_L51X_FW_IMAGE_VERSION;
         else return "";
     }
@@ -81,14 +76,6 @@ namespace rs2
             }
         }
         break;
-        case RS2_PRODUCT_LINE_SR300:
-            if( strlen( FW_SR3XX_FW_IMAGE_VERSION ) )
-            {
-                int size = 0;
-                auto hex = fw_get_SR3XX_FW_Image( size );
-                image = std::vector< uint8_t >( hex, hex + size );
-            }
-            break;
         case RS2_PRODUCT_LINE_L500:
             {  // default for all L515 use cases (include recovery usb2 old pid)
                 if( strlen( FW_L51X_FW_IMAGE_VERSION ) )

common/fw/CMakeLists.txt

@@ -17,12 +17,6 @@ set(D4XX_FW_VERSION ${CMAKE_MATCH_1})
 set(D4XX_FW_SHA1 b4dfa2ceb46e9b79c2d64480b149f188f7538e65)
 set(D4XX_FW_URL "${REALSENSE_FIRMWARE_URL}/Releases/RS4xx/FW")
 
-string(REGEX MATCH "SR3XX_RECOMMENDED_FIRMWARE_VERSION \"([0-9]+.[0-9]+.[0-9]+.[0-9]+)\"" _ ${ver})
-set(SR3XX_FW_VERSION ${CMAKE_MATCH_1})
-#message(STATUS "SR3XX_FW_VERSION: ${SR3XX_FW_VERSION}")
-set(SR3XX_FW_SHA1 55237dba5d7db20e7c218975375d05b4210e9460)
-set(SR3XX_FW_URL "${REALSENSE_FIRMWARE_URL}/Releases/SR300/FW")
-
 string(REGEX MATCH "L51X_RECOMMENDED_FIRMWARE_VERSION \"([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\"" _ ${ver})
 set(L51X_FW_VERSION ${CMAKE_MATCH_1})
 #message(STATUS "L51X_FW_VERSION: ${L51X_FW_VERSION}")
@@ -78,7 +72,6 @@ function(target_binary url version sha1 symbol ext)
 endfunction()
 
 target_binary( "${D4XX_FW_URL}"  "${D4XX_FW_VERSION}"  "${D4XX_FW_SHA1}" D4XX_FW_Image .bin)
-target_binary( "${SR3XX_FW_URL}"  "${SR3XX_FW_VERSION}"  "${SR3XX_FW_SHA1}" SR3XX_FW_Image .bin)
 target_binary( "${L51X_FW_URL}"  "${L51X_FW_VERSION}"  "${L51X_FW_SHA1}" L51X_FW_Image .bin)
 
 

common/fw/firmware-version.h

@@ -4,7 +4,5 @@
 #pragma once
 
 #define D4XX_RECOMMENDED_FIRMWARE_VERSION "5.15.0.2"
-#define SR3XX_RECOMMENDED_FIRMWARE_VERSION "3.26.1.0"
-#define T26X_FIRMWARE_VERSION "0.2.0.951"
 #define L51X_RECOMMENDED_FIRMWARE_VERSION "1.5.8.1"
 

common/fw/fw.rc

@@ -1,4 +1,3 @@
 #include "D4XX_FW_Image.rc"
-#include "SR3XX_FW_Image.rc"
 #include "L51X_FW_Image.rc"
 

common/metadata-helper.h

@@ -25,10 +25,10 @@ namespace rs2
 
         static bool can_support_metadata(const std::string& product)
         {
-            return product == "D400" || product == "SR300" || product == "L500";
+            return product == "D400" || product == "L500";
         }
 
         // This is the command-line parameter that gets passed to another process (running as admin) in order to enable metadata -- see WinMain
         static std::string get_command_line_param() { return "--enable_metadata"; }
     };
-}
+}