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

Merge in OutdoorNav messages into ROS2 Jazzy development branch #59

Draft
wants to merge 100 commits into
base: jazzy-2.0RC
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
f3f2167
Add the OutdoorNav messages and update the metapackage dependencies
civerachb-cpr Mar 28, 2023
bb317d0
Copy the onav_mission_manager_msgs, but add the additional cpr_ prefi…
civerachb-cpr Mar 28, 2023
7955dac
Use the 0.7.0 message definitions
civerachb-cpr Mar 31, 2023
803988a
Rename cpr_* packages to clearpath_*
civerachb-cpr Apr 3, 2023
c511fef
Merge the two clearpath_platform_msgs packages
civerachb-cpr Apr 3, 2023
f200763
Add the new message to the cmake file
civerachb-cpr Apr 3, 2023
01e90cd
Rename service_call to action_server_name
civerachb-cpr May 9, 2023
2154a95
Add the mission scheduler messages
civerachb-cpr Jun 21, 2023
baefb54
Update so everything builds with the current master/0.9 development b…
civerachb-cpr Jun 21, 2023
6bb76b6
Add new messages for the scheduler
civerachb-cpr Jun 22, 2023
a03d65a
Rename EnableDisableSchedule -> EnableSchedule
civerachb-cpr Jun 23, 2023
9e6cb71
Add the new RunNow.action
civerachb-cpr Jun 30, 2023
6b3ec46
Rename the RunNow action to be more descriptive
civerachb-cpr Jun 30, 2023
78722ac
id -> uuid
civerachb-cpr Jun 30, 2023
5d90316
Add the new CloneSchedule service
civerachb-cpr Jul 4, 2023
35cc077
Add the ability to reverse the order of the waypoints in a mission wh…
civerachb-cpr Jul 5, 2023
b30ad09
Change the package versions to 0 so we can catkin_prepare_release to …
civerachb-cpr Jul 5, 2023
ee32000
Add changelog files
civerachb-cpr Jul 5, 2023
d14245f
Sync versions to 0.9.0
civerachb-cpr Jul 5, 2023
9c2d89a
Remove misleading comment
civerachb-cpr Jul 6, 2023
79b6b9f
Add import & export messages to the scheduler
civerachb-cpr Jul 10, 2023
a299f47
Remove the uuid field from the Undock.action goal
civerachb-cpr Jul 12, 2023
3dcddd0
updated all msgs/srvs/actions and confirm building properly
jmastrangelo-cpr Jul 12, 2023
b48feaa
fix name of package
jmastrangelo-cpr Jul 12, 2023
c82d0f5
rename mission scheduler msgs
jmastrangelo-cpr Jul 12, 2023
a79d5bc
0.9.0
civerachb-cpr Jul 12, 2023
0de6871
added Metrics.msg
jmastrangelo-cpr Jul 18, 2023
c9bcf7d
added error mesage to service response
jmastrangelo-cpr Jul 18, 2023
b268636
Add the stack light messages to the platform messages
civerachb-cpr Jul 21, 2023
446ccbb
add message field to service response
jmastrangelo-cpr Jul 26, 2023
45e8a35
set certain states as unset for now
jmastrangelo-cpr Aug 14, 2023
dc59ac0
add comments to Waypoint message to match documentation
jmastrangelo-cpr Aug 22, 2023
a6a1b19
Changes
civerachb-cpr Aug 22, 2023
a7ce4e2
0.9.1
civerachb-cpr Aug 22, 2023
cad1598
Add: .srv definition for ConvertCartesianToLatLon service
stephen-cpr Aug 29, 2023
5985ed7
[ONAV-1546] Add autonomy API option to start mission from current pos…
stephen-cpr Oct 4, 2023
10ad788
[ONAV-1771] Add support for on_start / on_stop Mission Tasks
stephen-cpr Oct 16, 2023
2bde65c
Add import/export services for docking
civerachb-cpr Oct 12, 2023
228a30e
Use raw JSON strings for import & export; don't bother gzipping & bas…
civerachb-cpr Oct 12, 2023
97cd38c
Changes
civerachb-cpr Oct 17, 2023
abd5042
0.9.2
civerachb-cpr Oct 17, 2023
90375ac
added trigger_type field and include in message generation
jmastrangelo-cpr Oct 17, 2023
0faabee
Changes
civerachb-cpr Oct 19, 2023
66266f1
0.9.3
civerachb-cpr Oct 19, 2023
8d41766
Remove dependencies on packages not released to OSRF
civerachb-cpr Oct 20, 2023
deb4611
Changes
civerachb-cpr Oct 20, 2023
59b88c4
0.9.4
civerachb-cpr Oct 20, 2023
516bb9c
[ONAV-1772] Add 'allow_failure' boolean to Task message type
stephen-cpr Oct 25, 2023
e6e94b8
Changes
civerachb-cpr Nov 3, 2023
c214994
0.9.5
civerachb-cpr Nov 3, 2023
8452aa7
Add a new service to import entire mission objects, including their a…
civerachb-cpr Dec 5, 2023
0c399ef
Add a new service for deleting multiple IDs at once
civerachb-cpr Dec 8, 2023
fcf29df
Changes
civerachb-cpr Dec 21, 2023
3d6d0a4
0.9.6
civerachb-cpr Dec 21, 2023
7e95089
updated autonomy config msg
jmastrangelo-cpr Feb 5, 2024
5ae2f4c
fix
jmastrangelo-cpr Feb 5, 2024
4102b79
Changes
civerachb-cpr Feb 5, 2024
4993817
0.9.7
civerachb-cpr Feb 5, 2024
afbfcb8
added assisted teleop messages
jmastrangelo-cpr Feb 6, 2024
c9f3788
add newline
jmastrangelo-cpr Feb 7, 2024
6a64e6e
added bypass triger type to state message
jmastrangelo-cpr Feb 21, 2024
bd46c63
change bypass triger to uint8
jmastrangelo-cpr Feb 23, 2024
5860c74
add new endline
jmastrangelo-cpr Feb 29, 2024
4769f34
change stop field
jmastrangelo-cpr Mar 5, 2024
30b5776
finalized assisted teleop state message
jmastrangelo-cpr Mar 6, 2024
3db9774
remove old commented message
jmastrangelo-cpr Mar 6, 2024
3423ff9
WIP: Network of paths (#29)
civerachb-cpr Mar 11, 2024
66af37c
Changes
civerachb-cpr Mar 11, 2024
aa90936
0.9.8
civerachb-cpr Mar 11, 2024
9a49357
Message updates for onav-0.12 (#34)
stephen-cpr Mar 14, 2024
17aee09
Changes
civerachb-cpr Mar 14, 2024
0ea31bc
0.9.9
civerachb-cpr Mar 14, 2024
d2d1602
Add the size_exceeded field to NetworkMapState (#33)
civerachb-cpr Mar 14, 2024
c9991c5
Mod: Add result message + rename feedback.state to feedback.message f…
stephen-cpr Mar 18, 2024
150f1d7
Add: Boolean '.paused' field to AutonomyStatus
stephen-cpr Mar 18, 2024
951e668
Add: Publish the robot's current high-level plan as part of NetworkGo…
stephen-cpr Mar 19, 2024
ab32131
added error state to assisted teleop (#37)
jmastrangelo-cpr Mar 19, 2024
f846613
remove bypass service. no longer needed as we will be using std_srvs/…
jmastrangelo-cpr Mar 19, 2024
fef267e
refactor (#39)
jmastrangelo-cpr Mar 26, 2024
8da9765
Revert changes to support scheduling network of paths missions. This …
civerachb-cpr Apr 1, 2024
c73e98c
Add: XvnStatus.msg for when XVN is used as localization sensor
stephen-cpr May 6, 2024
48f3a38
Add main changelog
mhosmar-cpr May 23, 2024
55fe5bb
Ament Packages
mhosmar-cpr May 23, 2024
7f72b31
Fix std_msgs issues
mhosmar-cpr May 28, 2024
5c4946b
duration -> builtin_nterfaces/Duration
mhosmar-cpr May 28, 2024
07676d5
Add point of interest messages
civerachb-cpr Jun 11, 2024
6371e58
Add the POI -> Waypoint service
civerachb-cpr Jun 11, 2024
9830308
Add the Add/Remove Tag service
civerachb-cpr Jun 11, 2024
0c7925e
Add the clone POI service
civerachb-cpr Jun 11, 2024
2c50fe4
added Watchdog messages to ROS2
jmastrangelo-cpr Sep 25, 2024
f44f3f4
Merge pull request #53 from clearpathrobotics/ONAV-2706
jmastrangelo-cpr Sep 25, 2024
f048e51
added emergency stop watchdog messages
jmastrangelo-cpr Sep 27, 2024
368be62
Merge pull request #54 from clearpathrobotics/ONAV-2707
jmastrangelo-cpr Sep 27, 2024
a2c759d
added logger msgs in ROS2 Jazzy
jmastrangelo-cpr Oct 4, 2024
a35f7f0
Merge pull request #56 from clearpathrobotics/ONAV-2587
jmastrangelo-cpr Oct 7, 2024
0bc2f36
added camera_msgs in ROS2 Jazzy
jmastrangelo-cpr Oct 10, 2024
1a0fef3
add newline
jmastrangelo-cpr Oct 10, 2024
8c7f7f6
Merge pull request #58 from clearpathrobotics/ONAV-2584
jmastrangelo-cpr Oct 10, 2024
4f67903
Merge branch 'jazzy-2.0RC' into onav-ros2
jmastrangelo-cpr Oct 15, 2024
6a9d554
Add: Add error_code fields to autonomy actions
stephen-cpr Oct 16, 2024
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
21 changes: 21 additions & 0 deletions clearpath_msgs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,27 @@

<exec_depend>clearpath_platform_msgs</exec_depend>

<!-- OutdoorNav dependencies -->
<exec_depend>clearpath_configuration_msgs</exec_depend>
<exec_depend>clearpath_control_msgs</exec_depend>
<exec_depend>clearpath_dock_msgs</exec_depend>
<exec_depend>clearpath_localization_msgs</exec_depend>
<exec_depend>clearpath_mission_manager_msgs</exec_depend>
<exec_depend>clearpath_mission_scheduler_msgs</exec_depend>
<exec_depend>clearpath_navigation_msgs</exec_depend>
<exec_depend>clearpath_platform_msgs</exec_depend>
<exec_depend>clearpath_safety_msgs</exec_depend>

<!-- Autonomy task action dependencies -->
<!--
DISABLED
Eventually these packages will be bloomed to OSRF's build farm, but for now
they're not explicitly necessary
<exec_depend>audio_recorder_msgs</exec_depend>
<exec_depend>ptz_action_server_msgs</exec_depend>
<exec_depend>video_recorder_msgs</exec_depend>
-->

<export>
<build_type>ament_cmake</build_type>
</export>
Expand Down
3 changes: 3 additions & 0 deletions clearpath_outdoornav_msgs/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# CPR OutdoorNav Messages

Clearpath OutdoorNav message definitions for ROS API
49 changes: 49 additions & 0 deletions clearpath_outdoornav_msgs/clearpath_camera_msgs/CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Changelog for package clearpath_camera_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.10.0 (2024-07-04)
-------------------
* Changes
* Merge pull request `#46 <https://github.com/clearpathrobotics/clearpath_msgs/issues/46>`_ from clearpathrobotics/0.13/features
0.13/features
* fix endline
* Merge remote-tracking branch 'refs/remotes/origin/poi' into 0.13/features
* added zoom to inspect poi action
* create new camera msg package with InspectPOI action
* Contributors: Chris Iverach-Brereton, José Mastrangelo, Stephen Phillips, jmastrangelo-cpr

* Initial release of clearpath_camera_msgs
* Added zoom to inspect POI action
* Create new camera msg package with InspectPOI action
* Contributors: José Mastrangelo, Stephen Phillips

0.9.9 (2024-03-14)
------------------

0.9.8 (2024-03-11)
------------------

0.9.7 (2024-02-05 15:27:37 -0500)
---------------------------------

0.9.6 (2023-12-21)
------------------

0.9.5 (2023-11-03)
------------------

0.9.4 (2023-10-20)
------------------

0.9.3 (2023-10-19)
------------------

0.9.2 (2023-10-17)
------------------

0.9.1 (2023-08-22)
------------------

0.9.0 (2023-07-12)
------------------
22 changes: 22 additions & 0 deletions clearpath_outdoornav_msgs/clearpath_camera_msgs/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
cmake_minimum_required(VERSION 3.8)
project(clearpath_camera_msgs)

## Find catkin macros and libraries
find_package(rosidl_default_generators REQUIRED)
find_package(ament_cmake REQUIRED)
find_package(std_msgs REQUIRED)
set(CMAKE_CXX_STANDARD 17)

rosidl_generate_interfaces(
${PROJECT_NAME}
action/InspectPoi.action
srv/Q62AreaZoom.srv
DEPENDENCIES
std_msgs
)

ament_package()

install(FILES
DESTINATION include/${PROJECT_NAME}
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Action definition for inspecting a Point of Interest (POI) with a PTZ mounted on the Clearpth UGV

# goal
string poi_uuid
float32 zoom

---
# result
bool success
string message

---
# feedback
string message
19 changes: 19 additions & 0 deletions clearpath_outdoornav_msgs/clearpath_camera_msgs/package.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0"?>
<package format="3">
<name>clearpath_camera_msgs</name>
<version>0.10.0</version>
<description>ROS package containing the message definitions for camera related calls.</description>
<maintainer email="[email protected]">José Mastrangelo</maintainer>
<license>Proprietary</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>rosidl_default_generators</buildtool_depend>

<depend>std_msgs</depend>
<exec_depend>rosidl_default_runtime</exec_depend>
<export>
<build_type>ament_cmake</build_type>
</export>
<member_of_group>rosidl_interface_packages</member_of_group>

</package>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Service definition to re-position a pan-tilt-zoom camera to a specific location with a specified zoom
# Used primarily for box-zoom like functionality

float32 x # X location to move camera to, expressed as a fraction of image dimension (0 to 1, where 0.5 is current center)
float32 y # Y location to move camera to, expressed as a fraction of image dimension (0 to 1, where 0.5 is current center)
float32 zoom_factor
---
bool success
string message
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Changelog for package clearpath_configuration_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.9.9 (2024-03-14)
------------------

0.9.8 (2024-03-11)
------------------

0.9.7 (2024-02-05)
------------------
* Merge pull request `#30 <https://github.com/clearpathrobotics/clearpath_msgs/issues/30>`_ from clearpathrobotics/ONAV-166
updated autonomy config msg
* Contributors: José Mastrangelo

0.9.6 (2023-12-21)
------------------

0.9.5 (2023-11-03)
------------------
* Merge remote-tracking branch 'origin/noetic-devel' into ONAV-1771/on_start_stop_tasks
* Contributors: Stephen Phillips

0.9.4 (2023-10-20)
------------------

0.9.3 (2023-10-19)
------------------

0.9.2 (2023-10-17)
------------------
* Fix over & underline length in changelogs
* Contributors: Chris Iverach-Brereton

0.9.1 (2023-08-22)
------------------

0.9.0 (2023-07-05)
------------------
* Initial release
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
cmake_minimum_required(VERSION 3.8)
project(clearpath_configuration_msgs)

## Find catkin macros and libraries

find_package(rosidl_default_generators REQUIRED)
find_package(ament_cmake REQUIRED)
set(CMAKE_CXX_STANDARD 17)

rosidl_generate_interfaces(
${PROJECT_NAME}
msg/AutonomyConfig.msg
msg/PlatformConfig.msg
)

ament_package()

install(FILES
DESTINATION include/${PROJECT_NAME}
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Autonomy configuration message

string version
float64 uptime
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Platform configuration message containing ...
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>clearpath_configuration_msgs</name>
<version>0.9.9</version>
<description>ROS package containing the message definitions for the Clearpath Robotics OutdoorNav configuration module.</description>
<maintainer email="[email protected]">José Mastrangelo</maintainer>
<license>Proprietary</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>rosidl_default_generators</buildtool_depend>

<exec_depend>rosidl_default_runtime</exec_depend>
<export>
<build_type>ament_cmake</build_type>
</export>
<member_of_group>rosidl_interface_packages</member_of_group>

</package>
38 changes: 38 additions & 0 deletions clearpath_outdoornav_msgs/clearpath_control_msgs/CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Changelog for package clearpath_control_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.9.9 (2024-03-14)
------------------

0.9.8 (2024-03-11)
------------------

0.9.7 (2024-02-05)
------------------

0.9.6 (2023-12-21)
------------------

0.9.5 (2023-11-03)
------------------
* Merge remote-tracking branch 'origin/noetic-devel' into ONAV-1771/on_start_stop_tasks
* Contributors: Stephen Phillips

0.9.4 (2023-10-20)
------------------

0.9.3 (2023-10-19)
------------------

0.9.2 (2023-10-17)
------------------
* Fix over & underline length in changelogs
* Contributors: Chris Iverach-Brereton

0.9.1 (2023-08-22)
------------------

0.9.0 (2023-07-05)
------------------
* Initial release
23 changes: 23 additions & 0 deletions clearpath_outdoornav_msgs/clearpath_control_msgs/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
cmake_minimum_required(VERSION 3.8)
project(clearpath_control_msgs)

## Find catkin macros and libraries

find_package(rosidl_default_generators REQUIRED)
find_package(ament_cmake REQUIRED)
set(CMAKE_CXX_STANDARD 17)

rosidl_generate_interfaces(
${PROJECT_NAME}
msg/AutonomySync.msg
msg/ControlMode.msg
msg/ControlSelectionState.msg
msg/ControlState.msg
srv/SetControlMode.srv
)

ament_package()

install(FILES
DESTINATION include/${PROJECT_NAME}
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
uint8 EMPTY = 0
uint8 PROCESSING = 1
uint8 PENDING_PAUSE = 2
uint8 PAUSED = 3

uint8 IDLE = 4
uint8 TEACH = 5
uint8 REPEAT = 6

uint8 MANNED = 7
uint8 UNMANNED = 8


# Is the server currently active
uint8 status
uint8[] mission_type
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Control mode message

int8 NEUTRAL=0
int8 MANUAL=1
int8 AUTONOMY=2

int8 mode
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# The complete state of the control selection module. This message includes the autonomy state as well as the navigation mode.

ControlState autonomy
ControlMode mode
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# The autonomy state message, The autonomy can be either enabled/disabled and active/paused.

bool enabled
bool paused
21 changes: 21 additions & 0 deletions clearpath_outdoornav_msgs/clearpath_control_msgs/package.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>clearpath_control_msgs</name>
<version>0.9.9</version>
<description>ROS package containing the message definitions for the Clearpath Robotics OutdoorNav control selection module.</description>
<maintainer email="[email protected]">José Mastrangelo</maintainer>
<license>Proprietary</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>rosidl_default_generators</buildtool_depend>

<exec_depend>rosidl_default_runtime</exec_depend>
<export>
<build_type>ament_cmake</build_type>
</export>
<member_of_group>rosidl_interface_packages</member_of_group>

</package>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Service definition to set the control mode

clearpath_control_msgs/ControlMode mode
---
Loading
Loading