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

Reorganize portmonitors #2552

Merged
merged 1 commit into from
Apr 22, 2021
Merged

Reorganize portmonitors #2552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions .ci/initial-cache.gh.linux.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ set(ENABLE_yarpcar_mjpeg ON CACHE BOOL "")
set(ENABLE_yarpcar_bayer ON CACHE BOOL "")
set(ENABLE_yarpcar_priority ON CACHE BOOL "")
set(ENABLE_yarpcar_portmonitor ON CACHE BOOL "")
set(ENABLE_yarpcar_depthimage ON CACHE BOOL "")
set(ENABLE_yarpcar_depthimage2 ON CACHE BOOL "")
set(ENABLE_yarpcar_segmentationimage ON CACHE BOOL "")
set(ENABLE_yarppm_depthimage_to_mono ON CACHE BOOL "")
set(ENABLE_yarppm_depthimage_to_rgb ON CACHE BOOL "")
set(ENABLE_yarppm_segmentationimage_to_rgb ON CACHE BOOL "")
set(ENABLE_yarpcar_h264 ON CACHE BOOL "" ON CACHE BOOL "")
set(ENABLE_yarpcar_unix_stream ON CACHE BOOL "")
set(ENABLE_yarpcar_libffmpeg ON CACHE BOOL "")
set(ENABLE_yarpcar_mp3Sound ON CACHE BOOL "")
set(ENABLE_yarppm_image_compression_ffmpeg ON CACHE BOOL "")
set(ENABLE_yarppm_sound_compression_mp3 ON CACHE BOOL "")

set(ENABLE_yarpmod_AudioPlayerWrapper ON CACHE BOOL "")
set(ENABLE_yarpmod_AudioRecorderWrapper ON CACHE BOOL "")
Expand Down
6 changes: 3 additions & 3 deletions .ci/initial-cache.gh.macos.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ set(YARP_DISABLE_MACOS_BUNDLES ON CACHE BOOL "")
set(YARP_USE_SYSTEM_SQLite OFF CACHE BOOL "")

set(ENABLE_yarpcar_human ON CACHE BOOL "")
set(ENABLE_yarpcar_depthimage ON CACHE BOOL "")
set(ENABLE_yarpcar_depthimage2 ON CACHE BOOL "")
set(ENABLE_yarpcar_segmentationimage ON CACHE BOOL "")
set(ENABLE_yarppm_depthimage_to_mono ON CACHE BOOL "")
set(ENABLE_yarppm_depthimage_to_rgb ON CACHE BOOL "")
set(ENABLE_yarppm_segmentationimage_to_rgb ON CACHE BOOL "")
# set(ENABLE_yarpcar_mjpeg ON CACHE BOOL "")

set(ENABLE_yarpmod_fakebot ON CACHE BOOL "")
Expand Down
6 changes: 3 additions & 3 deletions .ci/initial-cache.gh.windows.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ set(YARP_COMPILE_GUIS ON CACHE BOOL "")
set(YARP_COMPILE_libYARP_math ON CACHE BOOL "")

set(ENABLE_yarpcar_human ON CACHE BOOL "")
set(ENABLE_yarpcar_depthimage ON CACHE BOOL "")
set(ENABLE_yarpcar_depthimage2 ON CACHE BOOL "")
set(ENABLE_yarpcar_segmentationimage ON CACHE BOOL "")
set(ENABLE_yarppm_depthimage_to_mono ON CACHE BOOL "")
set(ENABLE_yarppm_depthimage_to_rgb ON CACHE BOOL "")
set(ENABLE_yarppm_segmentationimage_to_rgb ON CACHE BOOL "")
# set(ENABLE_yarpcar_mjpeg ON CACHE BOOL "")

set(ENABLE_yarpmod_fakebot ON CACHE BOOL "")
Expand Down
152 changes: 78 additions & 74 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,77 +4,81 @@
/src/** @drdanz
/src/carriers/** @drdanz
/src/carriers/mjpeg_carrier/** @drdanz
/src/carriers/tcpros_carrier/** @drdanz
/src/carriers/zfp_portmonitor/** @Nicogene
/src/devices/** @randaz81 @traversaro @Nicogene
/src/devices/Rangefinder2DClient/** @randaz81
/src/devices/Rangefinder2DWrapper/** @randaz81
/src/devices/audioPlayerWrapper/** @randaz81
/src/devices/audioRecorderWrapper/** @randaz81
/src/devices/batteryClient/** @randaz81
/src/devices/batteryWrapper/** @randaz81
/src/devices/fakeBattery/** @randaz81
/src/devices/fakeLaser/** @randaz81
/src/devices/fakeMicrophone/** @randaz81
/src/devices/fakeSpeaker/** @randaz81
/src/devices/imuBosch_BNO055/** @Nicogene
/src/devices/laserFromDepth/** @randaz81
/src/devices/laserHokuyo/** @randaz81
/src/devices/localization2DClient/** @randaz81
/src/devices/localization2DServer/** @randaz81
/src/devices/map2DClient/** @randaz81
/src/devices/map2DServer/** @randaz81
/src/devices/multipleAnalogSensorsMsgs/** @traversaro
/src/devices/multipleanalogsensorsclient/** @traversaro
/src/devices/multipleanalogsensorsremapper/** @traversaro
/src/devices/multipleanalogsensorsserver/** @traversaro
/src/devices/navigation2DClient/** @randaz81
/src/devices/navigation2DServer/** @randaz81
/src/devices/portaudio/** @randaz81
/src/devices/portaudioPlayer/** @randaz81
/src/devices/portaudioRecorder/** @randaz81
/src/devices/rpLidar/** @randaz81
/src/devices/rpLidar2/** @randaz81
/src/devices/transformClient/** @randaz81
/src/devices/transformServer/** @randaz81
/src/devices/usbCamera/** @Nicogene
/src/idls/rosmsg/** @drdanz
/src/idls/thrift/** @drdanz
/src/libYARP_companion/** @drdanz
/src/libYARP_conf/** @drdanz
/src/libYARP_cv/** @Nicogene
/src/libYARP_dev/** @randaz81
/src/libYARP_eigen/** @traversaro
/src/libYARP_gsl/** @traversaro
/src/libYARP_init/** @drdanz
/src/libYARP_logger/** @randaz81
/src/libYARP_manager/** @Nicogene
/src/libYARP_math/** @traversaro
/src/libYARP_name/** @drdanz
/src/libYARP_os/** @drdanz
/src/libYARP_pcl/** @Nicogene
/src/libYARP_profiler/** @Nicogene
/src/libYARP_robottestingframework/** @Nicogene
/src/libYARP_rosmsg/** @drdanz
/src/libYARP_run/** @drdanz
/src/libYARP_serversql/** @drdanz
/src/libYARP_sig/** @drdanz
/src/libYARP_wire_rep_utils/** @drdanz
/src/robottestingframework-plugins/** @Nicogene
/src/yarp/** @drdanz
/src/yarpbatterygui/** @randaz81
/src/yarpdatadumper/** @pattacini
/src/yarpdataplayer/** @vtikha
/src/yarpdev/** @drdanz
/src/yarplaserscannergui/** @randaz81
/src/yarplogger/** @randaz81
/src/yarplogger-console/** @randaz81
/src/yarpmanager/** @Nicogene
/src/yarpmanager-console/** @Nicogene
/src/yarpmotorgui/** @randaz81
/src/yarprobotinterface/** @drdanz
/src/yarprun/** @drdanz
/src/yarpserver/** @drdanz
/src/yarpviz/** @Nicogene
CMakeLists.txt @drdanz
*.cmake @drdanz
/src/carriers/tcpros_carrier/** @drdanz
/src/devices/** @randaz81 @traversaro @Nicogene
/src/devices/Rangefinder2DClient/** @randaz81
/src/devices/Rangefinder2DWrapper/** @randaz81
/src/devices/audioPlayerWrapper/** @randaz81
/src/devices/audioRecorderWrapper/** @randaz81
/src/devices/batteryClient/** @randaz81
/src/devices/batteryWrapper/** @randaz81
/src/devices/fakeBattery/** @randaz81
/src/devices/fakeLaser/** @randaz81
/src/devices/fakeMicrophone/** @randaz81
/src/devices/fakeSpeaker/** @randaz81
/src/devices/imuBosch_BNO055/** @Nicogene
/src/devices/laserFromDepth/** @randaz81
/src/devices/laserHokuyo/** @randaz81
/src/devices/localization2DClient/** @randaz81
/src/devices/localization2DServer/** @randaz81
/src/devices/map2DClient/** @randaz81
/src/devices/map2DServer/** @randaz81
/src/devices/multipleAnalogSensorsMsgs/** @traversaro
/src/devices/multipleanalogsensorsclient/** @traversaro
/src/devices/multipleanalogsensorsremapper/** @traversaro
/src/devices/multipleanalogsensorsserver/** @traversaro
/src/devices/navigation2DClient/** @randaz81
/src/devices/navigation2DServer/** @randaz81
/src/devices/portaudio/** @randaz81
/src/devices/portaudioPlayer/** @randaz81
/src/devices/portaudioRecorder/** @randaz81
/src/devices/rpLidar/** @randaz81
/src/devices/rpLidar2/** @randaz81
/src/devices/transformClient/** @randaz81
/src/devices/transformServer/** @randaz81
/src/devices/usbCamera/** @Nicogene
/src/idls/rosmsg/** @drdanz
/src/idls/thrift/** @drdanz
/src/libYARP_companion/** @drdanz
/src/libYARP_conf/** @drdanz
/src/libYARP_cv/** @Nicogene
/src/libYARP_dev/** @randaz81
/src/libYARP_eigen/** @traversaro
/src/libYARP_gsl/** @traversaro
/src/libYARP_init/** @drdanz
/src/libYARP_logger/** @randaz81
/src/libYARP_manager/** @Nicogene
/src/libYARP_math/** @traversaro
/src/libYARP_name/** @drdanz
/src/libYARP_os/** @drdanz
/src/libYARP_pcl/** @Nicogene
/src/libYARP_profiler/** @Nicogene
/src/libYARP_robottestingframework/** @Nicogene
/src/libYARP_rosmsg/** @drdanz
/src/libYARP_run/** @drdanz
/src/libYARP_serversql/** @drdanz
/src/libYARP_sig/** @drdanz
/src/libYARP_wire_rep_utils/** @drdanz
/src/portmonitors/depthimage_compression_zfp/** @Nicogene
/src/portmonitors/depthimage_to_mono/** @randaz81
/src/portmonitors/depthimage_to_rgb/** @randaz81
/src/portmonitors/segmentationimage_to_rgb/** @randaz81
/src/portmonitors/sound_compression_mp3/** @randaz81
/src/robottestingframework-plugins/** @Nicogene
/src/yarp/** @drdanz
/src/yarpbatterygui/** @randaz81
/src/yarpdatadumper/** @pattacini
/src/yarpdataplayer/** @vtikha
/src/yarpdev/** @drdanz
/src/yarplaserscannergui/** @randaz81
/src/yarplogger/** @randaz81
/src/yarplogger-console/** @randaz81
/src/yarpmanager/** @Nicogene
/src/yarpmanager-console/** @Nicogene
/src/yarpmotorgui/** @randaz81
/src/yarprobotinterface/** @drdanz
/src/yarprun/** @drdanz
/src/yarpserver/** @drdanz
/src/yarpviz/** @Nicogene
CMakeLists.txt @drdanz
*.cmake @drdanz
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ jobs:
-DCMAKE_DISABLE_FIND_PACKAGE_FFMPEG=ON
-DENABLE_yarpcar_h264:BOOL=OFF
-DENABLE_yarpcar_mjpeg:BOOL=OFF
-DENABLE_yarpcar_libffmpeg:BOOL=OFF
-DENABLE_yarppm_image_compression_ffmpeg:BOOL=OFF
-DENABLE_yarpmod_usbCamera:BOOL=OFF
-DENABLE_yarpmod_usbCameraRaw:BOOL=OFF
-DENABLE_yarpmod_ffmpeg_grabber:BOOL=OFF
Expand Down Expand Up @@ -505,7 +505,7 @@ jobs:
-DCMAKE_DISABLE_FIND_PACKAGE_FFMPEG=ON
-DENABLE_yarpcar_h264:BOOL=OFF
-DENABLE_yarpcar_mjpeg:BOOL=OFF
-DENABLE_yarpcar_libffmpeg:BOOL=OFF
-DENABLE_yarppm_image_compression_ffmpeg:BOOL=OFF
-DENABLE_yarpmod_usbCamera:BOOL=OFF
-DENABLE_yarpmod_usbCameraRaw:BOOL=OFF
-DENABLE_yarpmod_ffmpeg_grabber:BOOL=OFF
Expand Down
17 changes: 17 additions & 0 deletions doc/release/master/portmonitor_rename.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
portmonitor_rename {#master}
------------------

### PortMonitors

* Portmonitors were reorganized and renamed without keeping the back
compatibility with the old name.
The new names are:
* `depthimage_compression_zfp` (`zfp`)
* `depthimage_to_mono` (`depthimage`)
* `depthimage_to_rgb` (`depthimage2`)
* `segmentationimage_to_rgb` (`segmentationimage`)
The new names for portmonitors not released yet are:
* `image_compression_ffmpeg` (`libffmpeg`)
* `sound_compression_mp3` (`mp3Sound`)
* There is now a new `yarppm` library (similar to `yarpcar` and `yarpmod`) that
links all the portmonitors in static builds.
4 changes: 2 additions & 2 deletions example/dev/RGBD/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ A user can interact with a YARP device driver directly inside the local applicat
A quick test can be performed by running the YARP devices with few simple commands. First we need to compile YARP repository, setting the following CMake flags to `true` in order to compile all required modules:

```
cmake .. -DYARP_COMPILE_GUIS=true -DENABLE_yarpcar_depthimage=true -DENABLE_yarpmod_fakeDepthCamera=true
cmake .. -DYARP_COMPILE_GUIS=true -DENABLE_yarppm_depthimage_to_rgb=true -DENABLE_yarpmod_fakeDepthCamera=true
```

To fully run the test, we need to open 5 terminals for command line input.
Expand Down Expand Up @@ -36,7 +36,7 @@ Terminal 4: yarpview --name /view/depth
Finally we connect the producer to the viewer
```
Terminal 5: yarp connect /server/rgbImage:o /view/rgb udp
Terminal 5: yarp connect /server/depthImage:o /view/depth udp+recv.portmonitor+type.dll+file.depthimage
Terminal 5: yarp connect /server/depthImage:o /view/depth udp+recv.portmonitor+type.dll+file.depthimage_to_rgb
```

Expected result:
Expand Down
1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ add_subdirectory(libYARP_robottestingframework)

# plugins
add_subdirectory(carriers)
add_subdirectory(portmonitors)
add_subdirectory(devices)
add_subdirectory(libYARP_init)

Expand Down
6 changes: 0 additions & 6 deletions src/carriers/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,8 @@ yarp_begin_plugin_library(yarpcar OPTION YARP_COMPILE_CARRIER_PLUGINS
add_subdirectory(bayer_carrier)
add_subdirectory(priority_carrier)
add_subdirectory(portmonitor_carrier)
add_subdirectory(depthimage_portmonitor)
add_subdirectory(depthimage2_portmonitor)
add_subdirectory(segmentationimage_portmonitor)
add_subdirectory(zfp_portmonitor)
add_subdirectory(h264_carrier)
add_subdirectory(unix)
add_subdirectory(libffmpeg_portmonitor)
add_subdirectory(mp3Sound_portmonitor)
yarp_end_plugin_library(yarpcar QUIET)
add_library(YARP::yarpcar ALIAS yarpcar)

Expand Down
32 changes: 0 additions & 32 deletions src/carriers/depthimage2_portmonitor/CMakeLists.txt
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions src/carriers/depthimage_portmonitor/CMakeLists.txt
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions src/carriers/libffmpeg_portmonitor/CMakeLists.txt
View file
Open in desktop

This file was deleted.

Binary file removed src/carriers/libffmpeg_portmonitor/Img/testgrabber.png
View file
Open in desktop
Binary file not shown.
Loading