PR IntelRealSense#12231: R/2542 -> master -> development

maloel · Sep 28, 2023 · 5befb1d · 5befb1d
2 parents 07c198c + 9c6dbf8
commit 5befb1d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/common/fw/CMakeLists.txt b/common/fw/CMakeLists.txt
@@ -14,7 +14,7 @@ set(REALSENSE_FIRMWARE_URL "https://librealsense.intel.com" CACHE STRING
 string(REGEX MATCH "D4XX_RECOMMENDED_FIRMWARE_VERSION \"([0-9]+.[0-9]+.[0-9]+.[0-9]+)\"" _ ${ver})
 set(D4XX_FW_VERSION ${CMAKE_MATCH_1})
 #message(STATUS "D4XX_FW_VERSION: ${D4XX_FW_VERSION}")
-set(D4XX_FW_SHA1 b4dfa2ceb46e9b79c2d64480b149f188f7538e65)
+set(D4XX_FW_SHA1 20d1cf628957941689a948f2e17ecc6a11e8ab01)
 set(D4XX_FW_URL "${REALSENSE_FIRMWARE_URL}/Releases/RS4xx/FW")
 
 add_library(${PROJECT_NAME} STATIC empty.c)

diff --git a/common/fw/firmware-version.h b/common/fw/firmware-version.h
@@ -3,5 +3,5 @@
 
 #pragma once
 
-#define D4XX_RECOMMENDED_FIRMWARE_VERSION "5.15.0.2"
+#define D4XX_RECOMMENDED_FIRMWARE_VERSION "5.15.1.0"
 
diff --git a/tools/fw-update/rs-fw-update.cpp b/tools/fw-update/rs-fw-update.cpp
@@ -6,6 +6,7 @@
 #include <vector>
 #include <map>
 #include <string>
+#include <cstring>
 #include <iostream>
 #include <fstream>
 #include <thread>

diff --git a/unit-tests/live/options/test-drops-on-set.py b/unit-tests/live/options/test-drops-on-set.py
@@ -101,6 +101,7 @@ def check_color_frame_drops(frame):
 # visual_preset       --> frame drops are expected during visual_preset change
 # inter_cam_sync_mode --> frame drops are expected during inter_cam_sync_mode change
 # emitter_frequency   --> Not allowed to be set during streaming
+# auto_exposure_mode  --> Not allowed to be set during streaming
 if product_line == "D400":
     options_to_ignore = [rs.option.visual_preset, rs.option.inter_cam_sync_mode, rs.option.emitter_frequency, rs.option.auto_exposure_mode]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,5 +3,5 @@

		#pragma once

		#define D4XX_RECOMMENDED_FIRMWARE_VERSION "5.15.0.2"
		#define D4XX_RECOMMENDED_FIRMWARE_VERSION "5.15.1.0"