Skip to content

Commit

Permalink
Merge pull request #9 from gavanderhoorn/get_active_alarm_info_srv
Browse files Browse the repository at this point in the history
Add definitions for `GetActiveAlarmInfo` service
  • Loading branch information
ted-miller authored Oct 19, 2023
2 parents 867f77e + 6b4a1ae commit 1bee805
Show file tree
Hide file tree
Showing 6 changed files with 110 additions and 1 deletion.
7 changes: 6 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,22 @@ cmake_minimum_required(VERSION 3.5)
project(motoros2_interfaces)

find_package(ament_cmake REQUIRED)
find_package(builtin_interfaces REQUIRED)
find_package(rosidl_default_generators REQUIRED)
find_package(trajectory_msgs REQUIRED)

set(msg_files
msg/AlarmInfo.msg
msg/AlarmCauseRemedy.msg
msg/ErrorInfo.msg
msg/IoResultCodes.msg
msg/MotionReadyEnum.msg
msg/QueueResultEnum.msg
msg/SelectionResultCodes.msg
)

set(srv_files
srv/GetActiveAlarmInfo.srv
srv/QueueTrajPoint.srv
srv/ReadMRegister.srv
srv/ReadSingleIO.srv
Expand All @@ -39,7 +44,7 @@ endif()
rosidl_generate_interfaces(${PROJECT_NAME}
${msg_files}
${srv_files}
DEPENDENCIES trajectory_msgs
DEPENDENCIES builtin_interfaces trajectory_msgs
ADD_LINTER_TESTS
)

Expand Down
10 changes: 10 additions & 0 deletions msg/AlarmCauseRemedy.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# SPDX-FileCopyrightText: 2023, Yaskawa America, Inc.
# SPDX-FileCopyrightText: 2023, Delft University of Technology
#
# SPDX-License-Identifier: Apache-2.0

# Cause
string cause

# Remedy
string remedy
36 changes: 36 additions & 0 deletions msg/AlarmInfo.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# SPDX-FileCopyrightText: 2023, Yaskawa America, Inc.
# SPDX-FileCopyrightText: 2023, Delft University of Technology
#
# SPDX-License-Identifier: Apache-2.0

# Alarm Number
uint32 number

# Alarm Name/Message
string message

# Sub Code
int32 sub_code

# reserved for future use
#
# Date & time at which this alarm was raised on the controller
#
# NOTE: in accordance with the "Clock and Time" ROS 2 design article, this
# stamp is in ROSTime == (local) SystemTime on Yaskawa Motoman robot
# controllers, as the latter is the only clock source supported on those
# platforms.
#
# This stamp will not be corrected for Host PC <-> Yaskawa controller clock
# drift, as it is intended purely for informational purposes (ie: for humans)
# at this time.
builtin_interfaces/Time datetime

# reserved for future use: contents (from CSV)
string contents

# reserved for future use: meaning (from CSV)
string description

# reserved for future use: potential causes and their potential remedies (from CSV)
motoros2_interfaces/AlarmCauseRemedy[] help
27 changes: 27 additions & 0 deletions msg/ErrorInfo.msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# SPDX-FileCopyrightText: 2023, Yaskawa America, Inc.
# SPDX-FileCopyrightText: 2023, Delft University of Technology
#
# SPDX-License-Identifier: Apache-2.0

# Error Number
uint32 number

# Error Name/Message
string message

# Sub Code
int32 sub_code

# reserved for future use
#
# Date & time at which this error was raised on the controller
#
# NOTE: in accordance with the "Clock and Time" ROS 2 design article, this
# stamp is in ROSTime == (local) SystemTime on Yaskawa Motoman robot
# controllers, as the latter is the only clock source supported on those
# platforms.
#
# This stamp will not be corrected for Host PC <-> Yaskawa controller clock
# drift, as it is intended purely for informational purposes (ie: for humans)
# at this time.
builtin_interfaces/Time datetime
1 change: 1 addition & 0 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>rosidl_default_generators</buildtool_depend>

<depend>builtin_interfaces</depend>
<depend>trajectory_msgs</depend>

<exec_depend>rosidl_default_runtime</exec_depend>
Expand Down
30 changes: 30 additions & 0 deletions srv/GetActiveAlarmInfo.srv
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# SPDX-FileCopyrightText: 2023, Yaskawa America, Inc.
# SPDX-FileCopyrightText: 2023, Delft University of Technology
#
# SPDX-License-Identifier: Apache-2.0

# empty request (service returns information about all active alarms & errors).

---

# Result of the service invocation. Values other than one (1) signal failure.
#
# NOTE: future versions of this service may use a different set of result codes
uint32 result_code

# string representation of the value in 'result_code', for humans
string result_message

# Each entry in this list provides detailed information about all currently
# active alarms. If this list is empty, there are no active alarms.
#
# Note: order of entries in this list does not encode for any specific severity
# or priority of active alarms.
motoros2_interfaces/AlarmInfo[] alarms

# Each entry in this list provides detailed information about all currently
# active errors. If this list is empty, there are no active errors.
#
# Note: order of entries in this list does not encode for any specific severity
# or priority of active errors.
motoros2_interfaces/ErrorInfo[] errors

0 comments on commit 1bee805

Please sign in to comment.