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 development (utilities) to dds #11145

Merged
merged 677 commits into from
Jan 24, 2023
Merged

merge development (utilities) to dds #11145

merged 677 commits into from
Jan 24, 2023

Conversation

maloel
Copy link
Collaborator

@maloel maloel commented Nov 24, 2022 •
edited
Loading

@maloel maloel requested a review from Nir-Az November 24, 2022 12:13
@maloel maloel marked this pull request as ready for review November 24, 2022 12:36
Nir-Az
Nir-Az reviewed Nov 24, 2022
View reviewed changes
third-party/realdds/src/dds-device-server.cpp
DDS_THROW( runtime_error, "stream '" + stream_name + "' does not exist" );
auto & stream = it->second;
stream->start_streaming( header );
for ( auto & p : streams_to_open )
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a notice, I see here and on the dds-device-server.h lots of spaces changes.
FYI

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There were some CRLF changes, so maybe just ignore whitespace?

Nir-Az
Nir-Az reviewed Nov 24, 2022
View reviewed changes
third-party/realdds/src/dds-stream-profile.cpp
@@ -129,7 +129,7 @@ dds_stream_format dds_stream_format::from_rs2( int rs2_format )
case RS2_FORMAT_MJPEG: fourcc = "MJPG"; break;
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;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same weird diffs..

Nir-Az
Nir-Az approved these changes Nov 24, 2022
View reviewed changes
Copy link
Collaborator

@Nir-Az Nir-Az left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@maloel
Copy link
Collaborator Author

maloel commented Dec 4, 2022 •
edited
Loading

I still want to do this, but I think we should do it in this order:

@maloel
Copy link
Collaborator Author

maloel commented Dec 4, 2022

P.S. Ohad's #11164 will also have to wait until after #11165

OhadMeir and others added 22 commits December 5, 2022 13:18
@OhadMeir
break long line
45fe929
@OhadMeir
fix ignore flags
2253aa4
@OhadMeir
set correct number of expected errors
ea65a4a
@OhadMeir
use information level checks
35649c1
@OhadMeir
use warning level checks
83cf779
@Tamir91
global variable removed
63256df
@Tamir91
queue capacity changed to one
cc266b8
@maloel
PR IntelRealSense#11169 from Eran: Merge MIPI branch into development
46440f4
@Nir-Az
PR IntelRealSense#11161 from OhadMeir: CppCheck run in GitHub Actions
5f3a36f
@maloel
update install for realdds CMakeLists
1c2336e
@maloel
added LIBREALSENSE_ELPP_ID, configure_elpp_logger
1a3cc91
@maloel
utilities files now in tree; shared-init -> elpp-init auto use in dep…
13fc819 
…endents
@maloel
librs uses NO_ELPP_INIT; dependents, too, in static
082cb07
@maloel
update all dependent projects
97294a6
@maloel
fixed some warnings
2bd2543
@maloel
revert NO_ELPP_INIT -> using_easylogging() instead
103b7b4
@maloel
PR IntelRealSense#11160 from Eran: ELPP and utilities changes
a98d805
@maloel
Merge remote-tracking branch 'origin/dds' into dds
3816c48 
# Conflicts:
#	.github/workflows/buildsCI.yaml
@maloel
Merge remote-tracking branch 'origin/development' into dds
6a571e4 
# 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
@maloel
fix merge issue in buildsCI
0968f7b
@OhadMeir
check current directory before running
c7122da
@maloel
post-merge fixes
cbc616a
maloel and others added 21 commits January 12, 2023 09:53
@maloel
remove tools/rs-server
0c4aae7
@maloel
remove src/ethernet and src/compression
dcadf32
@maloel
remove BUILD_NETWORK_DEVICE
5a21a95
@maloel
leftovers
45016ca
@maloel
update static_analysis
e5cee5c
@maloel
improve pyrs.libci.ExeTest.debug_dump
77dbcc7
@maloel
run-unit-tests.py: add --tag negation; default exe using manifest file
44b2ae0
@dmipx
scripts: L4T: Add missing package, libssl-dev, required to build L4T …
586fb86 
…kernel

Signed-off-by: Dmitry Perchanov <dmitry.perchanov@intel.com>
@maloel
PR IntelRealSense#11318 from Eran: Remove network device
b5e85c7
@maloel
utilities -> rsutils
b1aaf51
@dmipx
scripts: L4T: add support for JP 4.6.1, bsp 32.7.1
8c1d1cb 
Signed-off-by: Dmitry Perchanov <dmitry.perchanov@intel.com>
@Nir-Az
add JP5.0.2 to docs
15df5cc
@Nir-Az
PR IntelRealSense#11242 from dmipx: scripts: L4T 5.0.2 RLS UVC support
8aa1b43
@Nir-Az
Update JP5 version in docs
efee7ab
@maloel
upgrade FastDDS to v2.9.1, with fixes for static destruction
f907e74
@maloel
update rsutils::shared_ptr_singleton
08428ba
@maloel
use dds_domain_context for participant/watcher
f0e2b3b
@maloel
add dds librs test with multiple participants of same name
0d2bd9b
@maloel
Merge remote-tracking branch 'origin/development' into dds
2cbec0f 
# 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
@maloel
Merge remote-tracking branch 'origin/dds' into dds
9726e8d 
# 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
post-merge fixes
1082e1b
@Nir-Az Nir-Az requested a review from OhadMeir January 23, 2023 18:52
@Nir-Az
Copy link
Collaborator

Nir-Az commented Jan 23, 2023 •
edited
Loading

Hey @maloel / @OhadMeir ,

Of course this PR is special and cannot be CR by files (> 1300 changed)
Ohad I added you to note this big change and especially the commits Eran mentioned in the description.
I retriggered the libCI to verify the tests failed randomly and not due to this PR changes.
Once you both are aligned (And we verify libCI pass) we can merge it.

Thanks Eran for this effort :)

UPDATE: CI passed on retrigger

OhadMeir
OhadMeir approved these changes Jan 24, 2023
View reviewed changes
Copy link
Contributor

@OhadMeir OhadMeir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Impressive work merging so many changes back, and handling the eProsima problem

@maloel maloel merged commit 45b32f4 into IntelRealSense:dds Jan 24, 2023
@maloel maloel deleted the dds branch January 24, 2023 10:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Nir-Az Nir-Az Nir-Az approved these changes

@OhadMeir OhadMeir OhadMeir approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@maloel @Nir-Az @dtrealm @remibettan @OhadMeir @Tamir91 @hsuys @martinseilerameria @noacoohen @dmipx