[fix]

start-jsk · Jun 22, 2021 · 2e66313 · 2e66313
1 parent 906ae0d
commit 2e66313
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,25 +22,25 @@ env:
     - ADDITIONAL_ENV_TO_DOCKER='IS_EUSLISP_TRAVIS_TEST'
     - secure: "QxLoOR83QHxGdMJ3BJ0TwRJdezWZaiWfoe4O88XMSG8LFMZLRbqNmOsrLn9b/VgMQpz44CP7tXXQvNz0FDRSTpgSdyNT+p1UA7iEhFYI4G3OEsYf0r6/4rjvtM7FCoIsBiPYBwofVAUP+U9d8Scjn+2+xjjKwOpEbaE/yc+zwrc="
   matrix:
-    - USE_JENKINS=true ROS_DISTRO=hydro  USE_DEB=true
+    - USE_TRAVIS=true USE_DOCKER=true ROS_DISTRO=hydro  USE_DEB=true
     - USE_JENKINS=true ROS_DISTRO=hydro  USE_DEB=false   NOT_TEST_INSTALL=true
     - USE_JENKINS=true ROS_DISTRO=hydro  USE_DEB=source  NOT_TEST_INSTALL=true EXTRA_DEB="ros-hydro-roseus ros-hydro-euscollada ros-hydro-pr2eus" ROS_PARALLEL_JOBS="-j1 -l1" IS_EUSLISP_TRAVIS_TEST="true"
     - USE_JENKINS=true ROS_DISTRO=hydro  USE_DEB=source  NOT_TEST_INSTALL=true
-    - USE_JENKINS=true ROS_DISTRO=hydro  USE_DEB=true    EXTRA_DEB="ros-hydro-hrpsys-ros-bridge ros-hydro-pr2eus" ROS_PARALLEL_JOBS="-j1 -l1" NOT_TEST_INSTALL=true IS_EUSLISP_TRAVIS_TEST="true"
+    - USE_TRAVIS=true USE_DOCKER=true ROS_DISTRO=hydro  USE_DEB=true    EXTRA_DEB="ros-hydro-hrpsys-ros-bridge ros-hydro-pr2eus" ROS_PARALLEL_JOBS="-j1 -l1" NOT_TEST_INSTALL=true IS_EUSLISP_TRAVIS_TEST="true"
     - USE_JENKINS=true ROS_DISTRO=hydro  USE_DEB=false   EXTRA_DEB="ros-hydro-hrpsys-ros-bridge ros-hydro-pr2eus" ROS_PARALLEL_JOBS="-j1 -l1" NOT_TEST_INSTALL=true IS_EUSLISP_TRAVIS_TEST="true"
-    - USE_TRAVIS=true ROS_DISTRO=indigo USE_DEB=true
-    - USE_TRAVIS=true ROS_DISTRO=indigo USE_DEB=false  NOT_TEST_INSTALL=true
-    - USE_TRAVIS=true ROS_DISTRO=indigo USE_DEB=true   EXTRA_DEB="ros-indigo-hrpsys-ros-bridge ros-indigo-pr2eus" NOT_TEST_INSTALL=true TEST_PKGS="hrpsys_ros_bridge" IS_EUSLISP_TRAVIS_TEST=true
+    - USE_TRAVIS=true USE_DOCKER=true ROS_DISTRO=indigo USE_DEB=true
+    - USE_JENKINS=true ROS_DISTRO=indigo USE_DEB=false  NOT_TEST_INSTALL=true
+    - USE_TRAVIS=true USE_DOCKER=true ROS_DISTRO=indigo USE_DEB=true   EXTRA_DEB="ros-indigo-hrpsys-ros-bridge ros-indigo-pr2eus" NOT_TEST_INSTALL=true TEST_PKGS="hrpsys_ros_bridge" IS_EUSLISP_TRAVIS_TEST=true
     - USE_JENKINS=true ROS_DISTRO=indigo USE_DEB=false EXTRA_DEB="ros-indigo-hrpsys-ros-bridge ros-indigo-pr2eus" NOT_TEST_INSTALL=true TEST_PKGS="hrpsys_ros_bridge" IS_EUSLISP_TRAVIS_TEST=true
-    - USE_TRAVIS=true TEST_TYPE=work_with_downstream  TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=indigo EXTRA_DEB="ros-indigo-roslint"
-    - USE_TRAVIS=true TEST_TYPE=work_with_315_1_10    TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=indigo EXTRA_DEB="ros-indigo-roslint"
-    - USE_TRAVIS=true ROS_DISTRO=indigo USE_DEB=true EXTRA_DEB="ros-indigo-pr2eus" NOT_TEST_INSTALL=true IS_EUSLISP_TRAVIS_TEST=false  # For updating euslisp-docs (Must be USE_TRAVIS=true and IS_EUSLISP_TRAVIS_TEST=false. See after_success)
-    - USE_JENKINS=true ROS_DISTRO=kinetic USE_DEB=true
+    - USE_JENKINS=true TEST_TYPE=work_with_downstream  TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=indigo EXTRA_DEB="ros-indigo-roslint"
+    - USE_JENKINS=true TEST_TYPE=work_with_315_1_10    TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=indigo EXTRA_DEB="ros-indigo-roslint"
+    - USE_TRAVIS=true USE_DOCKER=true ROS_DISTRO=indigo USE_DEB=true EXTRA_DEB="ros-indigo-pr2eus" NOT_TEST_INSTALL=true IS_EUSLISP_TRAVIS_TEST=false  # For updating euslisp-docs (Must be USE_TRAVIS=true and IS_EUSLISP_TRAVIS_TEST=false. See after_success)
+    - USE_TRAVIS=true USE_DOCKER=true ROS_DISTRO=kinetic USE_DEB=true
     - USE_JENKINS=true ROS_DISTRO=kinetic USE_DEB=false NOT_TEST_INSTALL=true
     - USE_JENKINS=true ROS_DISTRO=kinetic USE_DEB=false EXTRA_DEB="libopenni2-dev libpcl-dev" NOT_TEST_INSTALL=true  # To catch https://github.com/start-jsk/rtmros_common/pull/1090#issuecomment-610860446
-    - USE_JENKINS=true ROS_DISTRO=kinetic USE_DEB=true EXTRA_DEB="ros-kinetic-hrpsys-ros-bridge ros-kinetic-pr2eus" NOT_TEST_INSTALL=true TEST_PKGS="hrpsys_ros_bridge" IS_EUSLISP_TRAVIS_TEST=true
+    - USE_TRAVIS=true USE_DOCKER=true ROS_DISTRO=kinetic USE_DEB=true EXTRA_DEB="ros-kinetic-hrpsys-ros-bridge ros-kinetic-pr2eus" NOT_TEST_INSTALL=true TEST_PKGS="hrpsys_ros_bridge" IS_EUSLISP_TRAVIS_TEST=true
     - USE_JENKINS=true ROS_DISTRO=kinetic USE_DEB=false EXTRA_DEB="ros-kinetic-hrpsys-ros-bridge ros-kinetic-pr2eus" NOT_TEST_INSTALL=true TEST_PKGS="hrpsys_ros_bridge" IS_EUSLISP_TRAVIS_TEST=true
-    - USE_JENKINS=true ROS_DISTRO=melodic USE_DEB=true
+    - USE_TRAVIS=true USE_DOCKER=true ROS_DISTRO=melodic USE_DEB=true
     - USE_JENKINS=true ROS_DISTRO=melodic USE_DEB=false NOT_TEST_INSTALL=true BEFORE_SCRIPT="pwd; sed -i \"35iadd_definitions(-Wno-deprecated)\" hrpsys/CMakeLists.txt openhrp3/CMakeLists.txt; (cd hrpsys; git diff)"
 matrix:
   fast_finish: true

diff --git a/hrpsys_ros_bridge/scripts/default_robot_ros_bridge.launch.in b/hrpsys_ros_bridge/scripts/default_robot_ros_bridge.launch.in
@@ -17,6 +17,7 @@
   <!-- available in Kinetic -->
   <!-- <arg name="managerport" default="$(eval arg('corbaport') + 1)"/> -->
   <arg name="nameserver" default="localhost" />
+  <arg name="periodic_rate" default="500" />
   <include file="$(find hrpsys_ros_bridge)/launch/hrpsys_ros_bridge.launch">
     <arg name="SIMULATOR_NAME" value="$(arg SIMULATOR_NAME)" />
     <arg name="MODEL_FILE" value="@MODEL_FILE@" />
@@ -25,6 +26,7 @@
     <arg name="corbaport" default="$(arg corbaport)" />
     <arg name="managerport" default="$(arg managerport)" />
     <arg name="nameserver" default="$(arg nameserver)" />
+    <arg name="periodic_rate" default="$(arg periodic_rate)" />
     <!-- BEGIN: unstable : maintained-->
     <arg name="USE_WALKING" default="true" if="$(arg USE_UNSTABLE_RTC)"/>
     <arg name="USE_IMPEDANCECONTROLLER" default="true" if="$(arg USE_UNSTABLE_RTC)" />