Skip to content

Commit ae8713e

Browse files
authored
Merge pull request #474 from gazebosim/merge_9_main_20241004
Merge 9 -> main
2 parents 624e503 + 2f22722 commit ae8713e

File tree

8 files changed

+43
-15
lines changed

8 files changed

+43
-15
lines changed

Changelog.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
## Gazebo Sensors 9
22

3-
### Gazebo Sensors 9.0.0 (2024-09-XX)
3+
### Gazebo Sensors 9.0.0 (2024-09-25)
4+
5+
1. **Baseline:** this includes all changes from 8.2.0 and earlier.
6+
7+
1. Miscellaneous documentation fixes
8+
* [Pull request #471](https://github.com/gazebosim/gz-sensors/pull/471)
9+
* [Pull request #470](https://github.com/gazebosim/gz-sensors/pull/470)
10+
* [Pull request #469](https://github.com/gazebosim/gz-sensors/pull/469)
11+
* [Pull request #468](https://github.com/gazebosim/gz-sensors/pull/468)
12+
13+
1. Add boundingbox_camera tutorial to the tutorials list
14+
* [Pull request #466](https://github.com/gazebosim/gz-sensors/pull/466)
15+
16+
1. Update badges to point to gz-sensors9
17+
* [Pull request #463](https://github.com/gazebosim/gz-sensors/pull/463)
18+
19+
1. Update changelog
20+
* [Pull request #459](https://github.com/gazebosim/gz-sensors/pull/459)
421

522
1. Fix SphericalCoordinate deprecation warning in DVL sensor
623
* [Pull request #460](https://github.com/gazebosim/gz-sensors/pull/460)

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
Build | Status
1111
-- | --
12-
Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-sensors/branch/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-sensors/branch/main)
13-
Ubuntu Noble | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_sensors-ci-main-noble-amd64)](https://build.osrfoundation.org/job/gz_sensors-ci-main-noble-amd64)
14-
Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_sensors-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/gz_sensors-ci-main-homebrew-amd64)
15-
Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_sensors-main-win)](https://build.osrfoundation.org/job/gz_sensors-main-win/)
12+
Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-sensors/tree/gz-sensors9/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-sensors/tree/gz-sensors9)
13+
Ubuntu Noble | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_sensors-ci-gz-sensors9-noble-amd64)](https://build.osrfoundation.org/job/gz_sensors-ci-gz-sensors9-noble-amd64)
14+
Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_sensors-ci-gz-sensors9-homebrew-amd64)](https://build.osrfoundation.org/job/gz_sensors-ci-gz-sensors9-homebrew-amd64)
15+
Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_sensors-9-win)](https://build.osrfoundation.org/job/gz_sensors-9-win/)
1616

1717
Gazebo Sensors, a component of [Gazebo](https://gazebosim.org),
1818
provides numerous sensor models
@@ -30,7 +30,7 @@ designed to generate realistic data from simulation environments. Gazebo Sensors
3030

3131
[Code of Conduct](#code-of-conduct)
3232

33-
[Contributing](#code-of-contributing)
33+
[Contributing](#contributing)
3434

3535
[Versioning](#versioning)
3636

tutorials.md.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Gazebo @GZ_DESIGNATION_CAP@ library and how to use the library effectively.
1111
3. \subpage custom_sensors "Custom sensors": Creating your own sensors
1212
4. \subpage thermalcameraigngazebo "Thermal Camera in Gazebo": Using a thermal camera in Gazebo to detect objects of specific temperatures in camera images.
1313
5. \subpage segmentationcamera_igngazebo "Segmentation Camera in Gazebo"
14+
6. \subpage boundingbox_camera "Bounding Box Camera in Gazebo"
1415

1516
## License
1617

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Bounding Box Camera in Gazebo Sim
1+
\page boundingbox_camera Bounding Box Camera in Gazebo
22
In this tutorial, we will discuss how to use a bounding box camera sensor in Gazebo Sim.
33

44
## Requirements

tutorials/custom_sensors.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
\page custom_sensors Custom sensors
22

3+
Next Tutorial: \ref thermalcameraigngazebo
4+
35
Gazebo Sensors comes with various built-in sensor types ready to be used.
46
Users aren't limited to those sensor types though. This tutorial will go over
57
the process of implementing a custom sensor that leverages Gazebo Sensors

tutorials/install.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
\page installation Installation
22

3+
Next Tutorial: \ref custom_sensors
4+
35
We recommend following the binary install instructions to get up and running as quickly and painlessly as possible.
46

57
The source install instructions should be used if you need the very latest software improvements, you need to modify the code, or you plan to make a contribution.
@@ -42,7 +44,7 @@ which version you need.
4244

4345
#### Install Prerequisites
4446

45-
First, follow the [gz-cmake](https://github.com/gazebosim/gz-cmake) tutorial for installing Conda, Visual Studio, CMake, etc., prerequisites, and creating a Conda environment.
47+
First, follow the [source installation](https://gazebosim.org/docs/ionic/install_windows_src/) tutorial until step 5 included for installing Conda, Visual Studio, CMake, etc., prerequisites, and creating a Conda environment.
4648

4749
Navigate to `condabin` if necessary to use the `conda` command (i.e., if Conda is not in your `PATH` environment variable. You can find the location of `condabin` in Anaconda Prompt, `where conda`).
4850

@@ -159,6 +161,8 @@ This assumes you have created and activated a Conda environment while [installin
159161
cd gz-sensors
160162
mkdir build
161163
cd build
164+
cmake .. -DBUILD_TESTING=OFF # Optionally, -DCMAKE_INSTALL_PREFIX=path\to\install
165+
cmake --build . --config Release
162166
```
163167

164168
4. Optionally, install. You will likely need to run a terminal with admin privileges for this call to succeed.

tutorials/segmentation_camera.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
\page segmentationcamera_igngazebo Segmentation Camera in Gazebo
22

3+
Next Tutorial: \ref boundingbox_camera
4+
35
In this tutorial, we will discuss how to use a segmentation camera sensor in Gazebo.
46

57
## Requirements
@@ -376,14 +378,14 @@ For panoptic/instance segmentation, to parse the `labels_map`, click on any pixe
376378

377379
## Processing the segmentation sensor via gz-transport
378380
It's possible to process the segmentation data in real time via `gz-transport`.
379-
You will need to which topics to subscribe to in order to receive this information.
381+
You will need to know which topics to subscribe to in order to receive this information.
380382

381383
Consider the following SDF snippet from the segmentation camera:
382384
```xml
383-
<topic>segmentation</topic>
385+
<topic>semantic</topic>
384386
```
385387

386-
In this scenario, the sensor data will publish the label map data to `segmentation/labels_map`, and the colored map data to `segmentation/colored_map`.
388+
In this scenario, the sensor data will publish the label map data to `semantic/labels_map`, and the colored map data to `semantic/colored_map`.
387389
We can write some c++ code that subscribes to these topics:
388390

389391
```cpp
@@ -443,10 +445,10 @@ int main(int argc, char **argv)
443445
{
444446
gz::transport::Node node;
445447

446-
if (!node.Subscribe("/segmentation/colored_map", &OnNewColoredMap) ||
447-
!node.Subscribe("/segmentation/labels_map", &OnNewLabelMap))
448+
if (!node.Subscribe("/semantic/colored_map", &OnNewColoredMap) ||
449+
!node.Subscribe("/semantic/labels_map", &OnNewLabelMap))
448450
{
449-
std::cerr << "Error subscribing to the boundingbox camera topic"
451+
std::cerr << "Error subscribing to the semantic camera topic"
450452
<< std::endl;
451453
return -1;
452454
}
@@ -457,4 +459,4 @@ int main(int argc, char **argv)
457459
```
458460
459461
If you'd like to gain a better understanding of how the subscriber code works,
460-
you can go through the [gz-transport tutorials](https://gazebosim.org/api/transport/11.0/tutorials.html).
462+
you can go through the [gz-transport tutorials](https://gazebosim.org/api/transport/14.0/tutorials.html).

tutorials/thermal_camera.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
\page thermalcameraigngazebo Thermal Camera in Gazebo
22

3+
Next Tutorial: \ref segmentationcamera_igngazebo
4+
35
In this tutorial, we will discuss how to use a thermal camera sensor in [Gazebo](https://gazebosim.org/libs/sim).
46

57
There are currently a few limitations with the thermal camera, which will be mentioned at the end of the tutorial.

0 commit comments

Comments
 (0)