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.

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

Remove network device #11318

Merged
merged 14 commits into from
Jan 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions .github/workflows/static_analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
# Expected error count should decrease as we handle the errors. Update accordingly.
CPPCHECK_EXPECTED_ERROR_COUNT: 63
CPPCHECK_EXPECTED_ERROR_COUNT: 57

jobs:
cppcheck:
Expand Down Expand Up @@ -56,11 +56,16 @@ jobs:
shell: bash
run: |
ERROR_COUNT=$(grep cppcheck_run.log -e "severity=\"error\"" -c);
if [ $ERROR_COUNT == ${{env.CPPCHECK_EXPECTED_ERROR_COUNT}} ];
if [ $ERROR_COUNT -eq ${{env.CPPCHECK_EXPECTED_ERROR_COUNT}} ];
then
echo "cppcheck_run succeeded, found" $ERROR_COUNT "errors, as expected";
exit 0;
elif [ $ERROR_COUNT -lt ${{env.CPPCHECK_EXPECTED_ERROR_COUNT}} ];
then
echo "cppcheck_run ---> SUCCEEDED <--- but found" $ERROR_COUNT "errors when expecting" ${{env.CPPCHECK_EXPECTED_ERROR_COUNT}};
echo "see log for details, or update .github/workflows/static_analysis.yaml";
exit 1;
else
echo "cppcheck_run failed, found" $ERROR_COUNT "errors, expected " ${{env.CPPCHECK_EXPECTED_ERROR_COUNT}} " see log for details";
echo "cppcheck_run ---> FAILED <--- with" $ERROR_COUNT "errors; expecting" ${{env.CPPCHECK_EXPECTED_ERROR_COUNT}} "- see log for details";
exit 1;
fi
5 changes: 0 additions & 5 deletions CMake/global_config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,6 @@ macro(global_set_flags)
include(CMake/external_pybind11.cmake)
endif()

if(BUILD_NETWORK_DEVICE)
add_definitions(-DNET_DEVICE)
set(LRS_NET_TARGET realsense2-net)
endif()

if(CHECK_FOR_UPDATES)
if (ANDROID_NDK_TOOLCHAIN_INCLUDED)
message(STATUS "Android build do not support CHECK_FOR_UPDATES flag, turning it off..")
Expand Down
1 change: 0 additions & 1 deletion CMake/lrs_options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ option(BUILD_OPENNI2_BINDINGS "Build OpenNI bindings" OFF)
option(IMPORT_DEPTH_CAM_FW "Download the latest firmware for the depth cameras" ON)
option(BUILD_CV_KINFU_EXAMPLE "Build OpenCV KinectFusion example" OFF)
option(FORCE_RSUSB_BACKEND "Use RS USB backend, mandatory for Win7/MacOS/Android, optional for Linux" OFF)
option(BUILD_NETWORK_DEVICE "Build Network Device support" OFF)
option(FORCE_LIBUVC "Explicitly turn-on libuvc backend - deprecated, use FORCE_RSUSB_BACKEND instead" OFF)
option(FORCE_WINUSB_UVC "Explicitly turn-on winusb_uvc (for win7) backend - deprecated, use FORCE_RSUSB_BACKEND instead" OFF)
option(ANDROID_USB_HOST_UVC "Build UVC backend for Android - deprecated, use FORCE_RSUSB_BACKEND instead" OFF)
Expand Down
10 changes: 0 additions & 10 deletions CMake/pyrealsense2-netConfig.cmake.in

This file was deleted.

5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,6 @@ if(BUILD_UNIT_TESTS OR BUILD_LEGACY_LIVE_TEST)
add_subdirectory(unit-tests)
endif()

if(BUILD_NETWORK_DEVICE)
add_subdirectory(src/ethernet)
add_subdirectory(src/compression)
endif()

if(IMPORT_DEPTH_CAM_FW)
add_subdirectory(common/fw)
endif()
Expand Down
17 changes: 0 additions & 17 deletions config/librealsense-net.pc.in

This file was deleted.

3 changes: 0 additions & 3 deletions doc/distribution_linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ librealsense2-dbg | Debug symbols for developers | librealsense2
librealsense2-gl | GLSL extension module runtime and configuration file | librealsense2
librealsense2-gl-dev | GLSL development header files and symbolic link | librealsense2
librealsense2-gl-dbg | GLSL debug symbols required for debugging purposes | librealsense2
librealsense2-net | Data over Ethernet extension module, runtime and configuration file | librealsense2
librealsense2-net-dev | Network module developer's files | librealsense2
librealsense2-net-dbg | Network module debug symbols | librealsense2

**Note** The packages include binaries and configuration files only.
Use the github repository to obtain the source code.
3 changes: 0 additions & 3 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ add_subdirectory(post-processing)
add_subdirectory(record-playback)
add_subdirectory(motion)
add_subdirectory(gl)
if(BUILD_NETWORK_DEVICE)
add_subdirectory(gl-net)
endif()
add_subdirectory(pose)
add_subdirectory(pose-predict)
add_subdirectory(pose-and-image)
Expand Down
27 changes: 0 additions & 27 deletions examples/gl-net/CMakeLists.txt

This file was deleted.

Binary file removed examples/gl-net/output.PNG
Binary file not shown.
7 changes: 0 additions & 7 deletions examples/gl-net/readme.md

This file was deleted.

Loading