Skip to content

Commit

Permalink
AP_SerialManager:Add ROS2 serial protocol
Browse files Browse the repository at this point in the history
Whitespaces fix
  • Loading branch information
arshPratap committed Aug 10, 2021
1 parent 34bb324 commit bfce51a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Tools/autotest/sim_vehicle.py
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ def do_build(opts, frame_options):

if opts.enable_xrce_dds:
cmd_configure.append("--enable-xrce-dds")

pieces = [shlex.split(x) for x in opts.waf_configure_args]
for piece in pieces:
cmd_configure.extend(piece)
Expand Down Expand Up @@ -1125,7 +1125,7 @@ def generate_frame_help():
help="Set the number of JSON slave")
group_sim.add_option("--enable-xrce-dds", action='store_true',
help="Enable the xrce client to connect with ROS2/DDS")

parser.add_option_group(group_sim)


Expand Down
5 changes: 1 addition & 4 deletions libraries/AP_SerialManager/AP_SerialManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,8 @@ class AP_SerialManager {
SerialProtocol_AHRS = 36,
SerialProtocol_SmartAudio = 37,
SerialProtocol_Torqeedo = 39,
<<<<<<< HEAD
SerialProtocol_AIS = 40,
=======
SerialProtocol_ROS2 = 40,
>>>>>>> AP_SerialManager: added ROS2 serial type
SerialProtocol_ROS2 = 41,
SerialProtocol_NumProtocols // must be the last value
};

Expand Down

0 comments on commit bfce51a

Please sign in to comment.