Merge pull request #2 from bdaiinstitute/jlb/fix_enum_handling

Messages with enum handling and a few other small things fixed

Author: jbarry-bdai

CMakeLists.txt

@@ -510,7 +510,7 @@ rosidl_generate_interfaces(${PROJECT_NAME}
   "msg/HipRangeOfMotionResult.msg"
   "msg/HipRangeOfMotionResultError.msg"
   "msg/ICEServer.msg"
-  "msg/ICEServerservertype.msg"
+  "msg/ICEServerServertype.msg"
   "msg/IREnableDisableRequest.msg"
   "msg/IREnableDisableRequestRequest.msg"
   "msg/IREnableDisableResponse.msg"
@@ -946,6 +946,7 @@ rosidl_generate_interfaces(${PROJECT_NAME}
   "msg/SelfRightCommandRequest.msg"
   "msg/SensorCompatibilityStatus.msg"
   "msg/Sequence.msg"
+  "msg/SerializedMessage.msg"
   "msg/SeriesBlockIndex.msg"
   "msg/SeriesBlockIndexBlockEntry.msg"
   "msg/SeriesDescriptor.msg"

msg/ConstantValueOneOfValue.msg

@@ -12,6 +12,7 @@ int8 VALUE_FLOAT_VALUE_SET=1
 int8 VALUE_STRING_VALUE_SET=2
 int8 VALUE_INT_VALUE_SET=3
 int8 VALUE_BOOL_VALUE_SET=4
+int8 VALUE_MSG_VALUE_SET=5
 
 # Only one of the above can be filled in.  Use the enum to choose which.
 int8 value_choice

msg/DoorCommandAutoGraspCommand.msg

@@ -13,8 +13,6 @@ bool search_ray_end_in_frame_is_set
 
 # The side of the hinge with respect to the robot when facing the door.
 bosdyn_msgs/DoorCommandHingeSide hinge_side
-bool hinge_side_is_set
 
 # The direction the door moves with respect to the robot.
 bosdyn_msgs/DoorCommandSwingDirection swing_direction
-bool swing_direction_is_set

msg/DoorCommandAutoPushCommand.msg

@@ -9,4 +9,3 @@ bool push_point_in_frame_is_set
 
 # The side of the hinge with respect to the robot when facing the door.
 bosdyn_msgs/DoorCommandHingeSide hinge_side
-bool hinge_side_is_set

msg/DoorCommandWarmstartCommand.msg

@@ -2,12 +2,9 @@
 
 # The side of the hinge with respect to the robot when facing the door.
 bosdyn_msgs/DoorCommandHingeSide hinge_side
-bool hinge_side_is_set
 
 # The direction the door moves with respect to the robot.
 bosdyn_msgs/DoorCommandSwingDirection swing_direction
-bool swing_direction_is_set
 
 # The type of handle on the door.
 bosdyn_msgs/DoorCommandHandleType handle_type
-bool handle_type_is_set

msg/EdgeAnnotations.msg

@@ -49,7 +49,6 @@ bool cost_is_set
 
 # How this edge was made.
 bosdyn_msgs/EdgeEdgeSource edge_source
-bool edge_source_is_set
 
 # If true, disables alternate-route-finding for this edge.
 bool disable_alternate_route_finding

msg/Element.msg

@@ -37,10 +37,3 @@ bool is_skipped
 # Considering using various thresholds depending on the target's distance from the dock
 bosdyn_msgs/BatteryMonitor battery_monitor
 bool battery_monitor_is_set
-
-# Maximum duration of action execution time, including all wrappers.
-# If they take longer than this duration, the action will be considered a failure.
-# Not including, or including a zero duration will set the action to NOT have a
-# timeout.
-builtin_interfaces/Duration action_duration
-bool action_duration_is_set

msg/GlobalParameters.msg

@@ -24,9 +24,3 @@ int32 self_right_attempts
 # is often found in post-mission callbacks includes uploading data to the cloud or
 # sending an email. The callbacks will be executed serially (first in, first executed).
 bosdyn_msgs/ActionRemoteGrpc[] post_mission_callbacks
-
-# It can be useful to have the robot run a walk without collecting data.
-# If this boolean is set to true, the compiled mission will still navigate to the
-# target of each element, however it will not actually perform the associated
-# action & action wrappers.
-bool skip_actions

msg/ICEServer.msg

@@ -4,7 +4,7 @@
 
 # Possible types of servers
 # STUN or TURN server.
-bosdyn_msgs/ICEServerservertype type
+bosdyn_msgs/ICEServerServertype type
 # Network address of the server.
 string address
 # Only the least significant 16 bits are used.

msg/ICEServerservertype.msg renamed to msg/ICEServerServertype.msg

@@ -2,7 +2,6 @@
 
 # The action (add, change, or delete) to be applied to a world object.
 bosdyn_msgs/MutateWorldObjectRequestAction action
-bool action_is_set
 
 # World object to be mutated.
 # If an object is being changed/deleted, then the world object id must match a world

msg/MutateWorldObjectRequestMutation.msg

@@ -1,4 +1,3 @@
 # AUTOMATICALLY GENERATED BY PROTO CONVERSION
 
 bosdyn_msgs/NamedArmPositionsCommandPositions position
-bool position_is_set

msg/NamedArmPositionsCommandRequest.msg

@@ -12,4 +12,4 @@ string name
 bosdyn_msgs/UserData user_data
 bool user_data_is_set
 # Info on all children of this node, if any are present.
-# bosdyn_msgs/NodeInfo[] children
+bosdyn_msgs/SerializedMessage[] children  # Serialized bosdyn_msgs/NodeInfo to break recursion

msg/NodeInfo.msg

@@ -8,7 +8,8 @@
 string node_reference
 
 int8 TYPE_NOT_SET=0
-int8 TYPE_NODE_REFERENCE_SET=1
+int8 TYPE_IMPL_SET=1
+int8 TYPE_NODE_REFERENCE_SET=2
 
 # Only one of the above can be filled in.  Use the enum to choose which.
 int8 type_choice

msg/NodeOneOfType.msg

@@ -7,4 +7,4 @@
 string resource
 
 # Sub-resources that make up this resource.
-# bosdyn_msgs/ResourceTree[] sub_resources
+bosdyn_msgs/SerializedMessage[] sub_resources  # Serialized bosdyn_msgs/ResourceTree to break recursion

msg/ResourceTree.msg

@@ -0,0 +1,4 @@
+# AUTOMATICALLY GENERATED BY PROTO CONVERSION
+
+# Message to hold serialized data for recursive messages
+int8[] serialized_msg

msg/SerializedMessage.msg

@@ -1,4 +1,3 @@
 # AUTOMATICALLY GENERATED BY PROTO CONVERSION
 
 bosdyn_msgs/StreamParamsAwbModeEnum awb
-bool awb_is_set

msg/StreamParamsAwbMode.msg

@@ -17,7 +17,6 @@ bool scan_match_region_is_set
 
 # How this waypoint was made.
 bosdyn_msgs/WaypointWaypointSource waypoint_source
-bool waypoint_source_is_set
 
 # Information about the state of the client when this waypoint was created.
 bosdyn_msgs/ClientMetadata client_metadata