Merge pull request #691 from ROBOTIS-GIT/develop

Develop
ROBOTIS-GIT · Dec 30, 2020 · bc309c0 · bc309c0
2 parents ba10294 + fa62756
commit bc309c0
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,13 +20,15 @@ env:
   matrix:
     - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=xenial
     - ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=bionic
-    - ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch
+    - ROS_DISTRO=noetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=focal
 branches:
   only:
     - master
     - develop
     - kinetic-devel
     - melodic-devel
+    - noetic-devel
+
 install:
   - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
 script:

diff --git a/turtlebot3_description/urdf/turtlebot3_burger.gazebo.xacro b/turtlebot3_description/urdf/turtlebot3_burger.gazebo.xacro
@@ -78,7 +78,7 @@
       <topicName>imu</topicName>
       <serviceName>imu_service</serviceName>
       <gaussianNoise>0.0</gaussianNoise>
-      <updateRate>200</updateRate>
+      <updateRate>0</updateRate>
       <imu>
         <noise>
           <type>gaussian</type>

diff --git a/turtlebot3_description/urdf/turtlebot3_burger_for_autorace.gazebo.xacro b/turtlebot3_description/urdf/turtlebot3_burger_for_autorace.gazebo.xacro
@@ -78,7 +78,7 @@
       <topicName>imu</topicName>
       <serviceName>imu_service</serviceName>
       <gaussianNoise>0.0</gaussianNoise>
-      <updateRate>200</updateRate>
+      <updateRate>0</updateRate>
       <imu>
         <noise>
           <type>gaussian</type>

diff --git a/turtlebot3_description/urdf/turtlebot3_burger_for_autorace_2020.gazebo.xacro b/turtlebot3_description/urdf/turtlebot3_burger_for_autorace_2020.gazebo.xacro
@@ -78,7 +78,7 @@
       <topicName>imu</topicName>
       <serviceName>imu_service</serviceName>
       <gaussianNoise>0.0</gaussianNoise>
-      <updateRate>200</updateRate>
+      <updateRate>0</updateRate>
       <imu>
         <noise>
           <type>gaussian</type>

diff --git a/turtlebot3_description/urdf/turtlebot3_waffle.gazebo.xacro b/turtlebot3_description/urdf/turtlebot3_waffle.gazebo.xacro
@@ -89,7 +89,7 @@
       <topicName>imu</topicName>
       <serviceName>imu_service</serviceName>
       <gaussianNoise>0.0</gaussianNoise>
-      <updateRate>200</updateRate>
+      <updateRate>0</updateRate>
       <imu>
         <noise>
           <type>gaussian</type>

diff --git a/turtlebot3_description/urdf/turtlebot3_waffle_pi.gazebo.xacro b/turtlebot3_description/urdf/turtlebot3_waffle_pi.gazebo.xacro
@@ -89,7 +89,7 @@
       <topicName>imu</topicName>
       <serviceName>imu_service</serviceName>
       <gaussianNoise>0.0</gaussianNoise>
-      <updateRate>200</updateRate>
+      <updateRate>0</updateRate>
       <imu>
         <noise>
           <type>gaussian</type>

diff --git a/turtlebot3_description/urdf/turtlebot3_waffle_pi_for_open_manipulator.gazebo.xacro b/turtlebot3_description/urdf/turtlebot3_waffle_pi_for_open_manipulator.gazebo.xacro
@@ -89,7 +89,7 @@
       <topicName>imu</topicName>
       <serviceName>imu_service</serviceName>
       <gaussianNoise>0.0</gaussianNoise>
-      <updateRate>200</updateRate>
+      <updateRate>0</updateRate>
       <imu>
         <noise>
           <type>gaussian</type>

diff --git a/turtlebot3_teleop/nodes/turtlebot3_teleop_key b/turtlebot3_teleop/nodes/turtlebot3_teleop_key
@@ -66,7 +66,10 @@ Communications Failed
 
 def getKey():
     if os.name == 'nt':
-      return msvcrt.getch()
+      if sys.version_info[0] >= 3:
+        return msvcrt.getch().decode()
+      else:
+        return msvcrt.getch()
 
     tty.setraw(sys.stdin.fileno())
     rlist, _, _ = select.select([sys.stdin], [], [], 0.1)