Skip to content

Commit 916adb6

Browse files
committed
Merge branch 'master' into AM-433/point_types_fix
2 parents 6329a2c + f23cd6d commit 916adb6

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@ See [Package Action](https://github.com/AutoModality/action-package-debian-ros).
1515
## Releases
1616

1717
See [releases](https://github.com/AutoModality/am-utils/releases) for the latest. Follows the standard [Development Lifecycle](https://automodality.atlassian.net/wiki/spaces/AUTOMOD/pages/668664251/Development+Lifecycle).
18-

include/vb_util_lib/topics.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ class am_topics
8383
static constexpr char SENSOR_SC3_VISIBLE_IMAGE[] = "/sensor/sc3/visible/image";
8484
static constexpr char SENSOR_SC3_VISIBLE_CAMERA_INFO[] = "/sensor/sc3/visible/camera_info";
8585

86+
static constexpr char SENSOR_COLLISION[] = "/sensor/collision";
87+
static constexpr char SENSOR_COLLISION_VIEWS[] = "/sensor/collision_views";
88+
8689
static constexpr char SENSOR_DISTANCE_AGL[] = "/sensor/distance/agl";
8790
static constexpr char SENSOR_DISTANCE_AGL_LW[] = "/sensor/distance/agl_lw";
8891
static constexpr char SENSOR_DISTANCE_DISTANCES_LW20[] = "/sensor/distance/distances_lw20";

src/vb_util_lib/topics.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ constexpr char am_topics::SENSOR_SC3_POINTCLOUD[];
7777
constexpr char am_topics::SENSOR_SC3_VISIBLE_IMAGE[];
7878
constexpr char am_topics::SENSOR_SC3_VISIBLE_CAMERA_INFO[];
7979

80+
constexpr char am_topics::SENSOR_COLLISION[];
81+
constexpr char am_topics::SENSOR_COLLISION_VIEWS[];
82+
8083
constexpr char am_topics::SENSOR_DISTANCE_AGL[];
8184
constexpr char am_topics::SENSOR_DISTANCE_AGL_LW[];
8285
constexpr char am_topics::SENSOR_DISTANCE_DISTANCES_LW20[];

0 commit comments

Comments
 (0)