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.

Sign up for GitHub

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

change how to get ros2 version #14063

Closed
wants to merge 9 commits into from
Closed

change how to get ros2 version #14063

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
444653d
change how to get ros2 version (rosverion -> ROS_DISTRO)
stmoon Jan 30, 2020
8b78fe9
Merge branch 'master' into rtps_ros
stmoon Jan 30, 2020
7f0c061
check ROS_DISTRO environment variable before using rosversion
stmoon Jan 30, 2020
db2dbac
Merge branch 'master' into rtps_ros
stmoon Jan 31, 2020
3215065
ros2_distro = "", if ros2_distro is not found finally
stmoon Feb 1, 2020
dbf061c
fix the bug about format error
stmoon Feb 1, 2020
79a0b0c
use ROS_VERSION and ROS_DISTRO to check ros2 version
stmoon Mar 15, 2020
d5712f0
merge master version
stmoon Mar 15, 2020
41e57bf
Merge branch 'master' into rtps_ros
TSC21 Mar 15, 2020
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
27 changes: 15 additions & 12 deletions msg/tools/generate_microRTPS_bridge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,18 +250,21 @@ def check_rtps_id_uniqueness(classifier):
"FastRTPSGen not found. Specify the location of fastrtpsgen with the -f flag")

# get ROS 2 version, if exists
ros2_distro = ""
try:
rosversion_out = subprocess.check_output(["rosversion", "-d"])
rosversion_out = rosversion_out.rstrip()
if rosversion_out not in ["<unknown>", "kinetic", "lunar", "melodic"]:
ros2_distro = rosversion_out
except OSError as e:
if e.errno == errno.ENOENT:
if args.ros2_distro != None:
ros2_distro = args.ros2_distro
else:
raise
ros2_distro = os.environ.get('ROS_DISTRO')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please add a check that makes sure that makes sure that the ROS_DISTRO that is set is not a ROS 1 distro? Can be done on the next line. Otherwise, the rest of the process will fail. Thanks.

if ros2_distro is None :
try:
rosversion_out = subprocess.check_output(["rosversion", "-d"])
rosversion_out = rosversion_out.rstrip()
if rosversion_out not in ["<unknown>", "kinetic", "lunar", "melodic"]:
ros2_distro = rosversion_out
else :
ros2_distro = ""
except OSError as e:
if e.errno == errno.ENOENT:
if args.ros2_distro != None:
ros2_distro = args.ros2_distro
else:
raise

# If nothing specified it's generated both
if agent == False and client == False:
Expand Down
2 changes: 1 addition & 1 deletion src/modules/commander/commander_params.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ PARAM_DEFINE_INT32(COM_ARM_MAG_STR, 1);
/**
* Enable RC stick override of auto and/or offboard modes
*
* When RC stick override is enabled, moving the RC sticks immediately gives control back
* When RC stick override is enabled, moving the RC sticks immediately gives control back
* to the pilot (switches to manual position mode):
* bit 0: Enable for auto modes (except for in critical battery reaction),
* bit 1: Enable for offboard mode.
Expand Down