Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge remote-tracking branch 'origin/master' into development #11886

Merged
merged 6 commits into from
Jun 7, 2023
Merged

Merge remote-tracking branch 'origin/master' into development #11886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4e65028
bump to v2.54.1
maloel Apr 3, 2023
8115d60
PR #11699 from Nir-Az: Allow change AE type while not streaming (even…
Nir-Az Apr 19, 2023
503f497
PR #11703 from Nir: AE type option hot fix
maloel Apr 19, 2023
93aec54
bump bundled FW to 5.15.0.2
maloel Jun 6, 2023
8ffb17b
PR #11876 from Eran: bump bundled FW to 5.15.0.2
maloel Jun 6, 2023
3c6fa76
Merge remote-tracking branch 'origin/master' into development
maloel Jun 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/fw/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 8dc3b8a0b9fdf03410c15b30e04f57701985064a)
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})
Expand Down
2 changes: 1 addition & 1 deletion common/fw/firmware-version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#pragma once

#define D4XX_RECOMMENDED_FIRMWARE_VERSION "5.14.0.0"
#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"
Expand Down