merge development (utilities) to dds - #11145
Merged
Merged
Conversation
maloel
marked this pull request as ready for review
November 24, 2022 12:36
Nir-Az
reviewed
Nov 24, 2022
| DDS_THROW( runtime_error, "stream '" + stream_name + "' does not exist" ); | ||
| auto & stream = it->second; | ||
| stream->start_streaming( header ); | ||
| for ( auto & p : streams_to_open ) |
Collaborator
There was a problem hiding this comment.
Just a notice, I see here and on the dds-device-server.h lots of spaces changes.
FYI
Contributor
Author
There was a problem hiding this comment.
There were some CRLF changes, so maybe just ignore whitespace?
Nir-Az
reviewed
Nov 24, 2022
| case RS2_FORMAT_RAW8: fourcc = "CNF4"; break; | ||
| case RS2_FORMAT_RAW16: fourcc = "BYR2"; break; | ||
| case RS2_FORMAT_UYVY: fourcc = "UYVY"; break; | ||
| case RS2_FORMAT_UYVY: fourcc = "UYVY"; break; |
Contributor
Author
|
I still want to do this, but I think we should do it in this order:
|
Contributor
Author
# Conflicts: # .github/workflows/buildsCI.yaml
# Conflicts: # .github/workflows/buildsCI.yaml # src/ds5/ds5-device.cpp # src/hw-monitor.h # third-party/utilities/include/utilities/easylogging/shared-init.cpp # unit-tests/unit-test-config.py
…kernel Signed-off-by: Dmitry Perchanov <dmitry.perchanov@intel.com>
Signed-off-by: Dmitry Perchanov <dmitry.perchanov@intel.com>
# Conflicts: # CMake/cuda_config.cmake # src/context.cpp # src/ds/ds5/ds5-device.cpp # third-party/CMakeLists.txt # tools/CMakeLists.txt # tools/realsense-viewer/CMakeLists.txt # unit-tests/live/options/test-timestamp-domain.py # unit-tests/py/rspy/test.py # unit-tests/unit-tests-live.cpp
# Conflicts: # src/context.cpp # src/context.h # third-party/realdds/include/realdds/dds-device-broadcaster.h # third-party/realdds/include/realdds/dds-device-server.h # third-party/realdds/py/pyrealdds.cpp # third-party/realdds/src/dds-device-broadcaster.cpp # third-party/realdds/src/dds-device-impl.cpp # third-party/realdds/src/dds-device-server.cpp # unit-tests/dds/test-librs.py
maloel
force-pushed
the
dds
branch
2 times, most recently
from
January 22, 2023 11:40
fffcd0a to
b77a646
Compare
Collaborator
|
Of course this PR is special and cannot be CR by files (> 1300 changed) Thanks Eran for this effort :) UPDATE: CI passed on retrigger |
OhadMeir
approved these changes
Jan 24, 2023
OhadMeir
left a comment
Contributor
There was a problem hiding this comment.
Impressive work merging so many changes back, and handling the eProsima problem
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In addition: