diff --git a/common/fw-update-helper.cpp b/common/fw-update-helper.cpp index 0a5575da91..644dcf8c5d 100644 --- a/common/fw-update-helper.cpp +++ b/common/fw-update-helper.cpp @@ -16,15 +16,11 @@ #ifdef INTERNAL_FW #include "common/fw/D4XX_FW_Image.h" #include "common/fw/SR3XX_FW_Image.h" -#include "common/fw/L5XX_FW_Image.h" #else #define FW_D4XX_FW_IMAGE_VERSION "" #define FW_SR3XX_FW_IMAGE_VERSION "" -#define FW_L5XX_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_L5XX_FW_Image(int) { return NULL; } - #endif // INTERNAL_FW constexpr const char* recommended_fw_url = "https://dev.intelrealsense.com/docs/firmware-releases"; @@ -50,7 +46,6 @@ namespace rs2 { if (id == "D400") return RS2_PRODUCT_LINE_D400; else if (id == "SR300") return RS2_PRODUCT_LINE_SR300; - else if (id == "L500") return RS2_PRODUCT_LINE_L500; else return -1; } @@ -60,7 +55,6 @@ namespace rs2 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_L5XX_FW_IMAGE_VERSION; else return ""; } @@ -86,14 +80,6 @@ namespace rs2 rv[RS2_PRODUCT_LINE_SR300] = vec; } - if (strlen(FW_L5XX_FW_IMAGE_VERSION)) - { - int size = 0; - auto hex = fw_get_L5XX_FW_Image(size); - auto vec = std::vector(hex, hex + size); - rv[RS2_PRODUCT_LINE_L500] = vec; - } - return rv; } diff --git a/common/fw/CMakeLists.txt b/common/fw/CMakeLists.txt index a361e38f43..4acc2d66e0 100644 --- a/common/fw/CMakeLists.txt +++ b/common/fw/CMakeLists.txt @@ -30,12 +30,6 @@ message(STATUS "T26X_FW_VERSION: ${T26X_FW_VERSION}") set(T26X_FW_SHA1 c3940ccbb0e3045603e4aceaa2d73427f96e24bc) set(T26X_FW_URL "${REALSENSE_FIRMWARE_URL}/Releases/TM2/FW/target/${T26X_FW_VERSION}") -string(REGEX MATCH "L5XX_RECOMMENDED_FIRMWARE_VERSION \"([0-9]+.[0-9]+.[0-9]+.[0-9]+)\"" _ ${ver}) -set(L5XX_FW_VERSION ${CMAKE_MATCH_1}) -message(STATUS "L5XX_FW_VERSION: ${L5XX_FW_VERSION}") -set(L5XX_FW_SHA1 e04daebd9b6f48cc1fdbcbbbc38f26d9c83bcae4) -set(L5XX_FW_URL "${REALSENSE_FIRMWARE_URL}/Releases/L5xx/FW") - add_library(${PROJECT_NAME} STATIC empty.c) if (MSVC) @@ -80,8 +74,6 @@ 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( "${T26X_FW_URL}" "${T26X_FW_VERSION}" "${T26X_FW_SHA1}" target .mvcmd) -target_binary( "${L5XX_FW_URL}" "${L5XX_FW_VERSION}" "${L5XX_FW_SHA1}" L5XX_FW_Image .bin) - install(TARGETS ${PROJECT_NAME} EXPORT realsense2Targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} diff --git a/common/fw/firmware-version.h b/common/fw/firmware-version.h index 03ad46691e..f1e9523335 100644 --- a/common/fw/firmware-version.h +++ b/common/fw/firmware-version.h @@ -6,4 +6,3 @@ #define D4XX_RECOMMENDED_FIRMWARE_VERSION "5.12.5.0" #define SR3XX_RECOMMENDED_FIRMWARE_VERSION "3.26.1.0" #define T26X_FIRMWARE_VERSION "0.2.0.951" -#define L5XX_RECOMMENDED_FIRMWARE_VERSION "1.4.0.10" diff --git a/common/fw/fw.rc b/common/fw/fw.rc index 5a69fe5710..966e995400 100644 --- a/common/fw/fw.rc +++ b/common/fw/fw.rc @@ -1,4 +1,3 @@ #include "D4XX_FW_Image.rc" #include "SR3XX_FW_Image.rc" -#include "L5XX_FW_Image.rc" #include "target.rc" diff --git a/src/l500/l500-device.cpp b/src/l500/l500-device.cpp index 9a1187f712..3dd1d3933d 100644 --- a/src/l500/l500-device.cpp +++ b/src/l500/l500-device.cpp @@ -21,8 +21,6 @@ #include "proc/syncer-processing-block.h" #include "proc/rotation-transform.h" #include "fw-update/fw-update-unsigned.h" -#include "../common/fw/firmware-version.h" - namespace librealsense { @@ -91,7 +89,6 @@ namespace librealsense auto asic_serial = _hw_monitor->get_module_serial_string(gvd_buff, module_asic_serial_offset, module_serial_size); auto fwv = _hw_monitor->get_firmware_version_string(gvd_buff, fw_version_offset); _fw_version = firmware_version(fwv); - firmware_version recommended_fw_version(L5XX_RECOMMENDED_FIRMWARE_VERSION); _is_locked = _hw_monitor->get_gvd_field(gvd_buff, is_camera_locked_offset); @@ -116,7 +113,6 @@ namespace librealsense register_info(RS2_CAMERA_INFO_ASIC_SERIAL_NUMBER, asic_serial); register_info(RS2_CAMERA_INFO_FIRMWARE_UPDATE_ID, asic_serial); register_info(RS2_CAMERA_INFO_FIRMWARE_VERSION, _fw_version); - register_info(RS2_CAMERA_INFO_RECOMMENDED_FIRMWARE_VERSION, recommended_fw_version); register_info(RS2_CAMERA_INFO_DEBUG_OP_CODE, std::to_string(static_cast(fw_cmd::GLD))); register_info(RS2_CAMERA_INFO_PHYSICAL_PORT, group.uvc_devices.front().device_path); register_info(RS2_CAMERA_INFO_PRODUCT_ID, pid_hex_str); diff --git a/src/l500/l500-device.h b/src/l500/l500-device.h index 73a62a1ab7..cce7590a98 100644 --- a/src/l500/l500-device.h +++ b/src/l500/l500-device.h @@ -71,6 +71,7 @@ namespace librealsense lazy> _calib_table_raw; firmware_version _fw_version; + std::shared_ptr _depth_stream; std::shared_ptr _ir_stream; std::shared_ptr _confidence_stream; diff --git a/tools/realsense-viewer/realsense-viewer.cpp b/tools/realsense-viewer/realsense-viewer.cpp index 24f84f3971..46b0066c22 100644 --- a/tools/realsense-viewer/realsense-viewer.cpp +++ b/tools/realsense-viewer/realsense-viewer.cpp @@ -28,11 +28,9 @@ #ifdef INTERNAL_FW #include "common/fw/D4XX_FW_Image.h" #include "common/fw/SR3XX_FW_Image.h" -#include "common/fw/L5XX_FW_Image.h" #else #define FW_D4XX_FW_IMAGE_VERSION "" #define FW_SR3XX_FW_IMAGE_VERSION "" -#define FW_L5XX_FW_IMAGE_VERSION "" #endif // INTERNAL_FW #include