Dependencies should be released (#11)

* Update .travis.rosinstall * Update .travis.yml * Prepare Changelog for a new release * 1.1.0 * Adapted namespace for sensor parameters * Added static_application parameter to example configs. * Updated README with melodic description * Add changelog
KITrobotics · Feb 25, 2020 · 1ab6e84 · 1ab6e84
1 parent a615b69
commit 1ab6e84
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 41 deletions.
diff --git a/.travis.rosinstall b/.travis.rosinstall
@@ -1,32 +1 @@
-- git:
-    uri: 'https://github.com/iirob/iirob_filters.git'
-    local-name: iirob_filters
-    version: kinetic-devel
-- git:
-    uri: 'https://github.com/iirob/rosparam_handler.git'
-    local-name: rosparam_handler
-    version: master
-- git:
-    uri: 'https://github.com/KITrobotics/force_torque_sensor.git'
-    local-name: force_torque_sensor
-    version: kinetic-devel
-- git:
-    uri: 'https://github.com/KITrobotics/ipr_extern.git'
-    local-name: ipr_extern
-    version: kinetic-devel
-- git:
-    uri: 'https://github.com/ipa320/cob_driver.git'
-    local-name: cob_driver
-    version: indigo_dev
-- git:
-    uri: 'https://github.com/ipa320/cob_common.git'
-    local-name: cob_common
-    version: indigo_dev
-- git:
-    uri: 'https://github.com/ipa320/cob_extern.git'
-    local-name: cob_extern
-    version: indigo_dev
-- git:
-    uri: 'https://github.com/ipa320/cob_perception_common.git'
-    local-name: cob_perception_common
-    version: indigo_dev
+
diff --git a/.travis.yml b/.travis.yml
@@ -10,9 +10,9 @@ notifications:
 env:
   global:
     - UPSTREAM_WORKSPACE=file
-    # - VERBOSE_OUTPUT=true
   matrix:
-    - ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
+    - ROS_DISTRO="kinetic"
+    - ROS_DISTRO="melodic"
 install:
   - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
 script:

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,19 @@ Changelog for package ati_force_torque
 
 Forthcoming
 -----------
+* Updated README with melodic description
+* Added static_application parameter to example configs.
+* Adapted namespace for sensor parameters
+* Contributors: Denis Stogl
+
+1.1.0 (2020-02-22)
+------------------
+* Addapted to changes in iirob_filters
+* Merge pull request `#9 <https://github.com/KITrobotics/ati_force_torque/issues/9>`_ from KITrobotics/updated_params
+  Updated param names for can yaml and config node
+* Added config files for config node
+* Updated param names for can yaml and config node
+* Contributors: Denis Štogl
 
 1.0.1 (2018-12-11)
 ------------------

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ Note: Current version of the package depends on iirob/iirob_filters package for
 
 |         | Kinetic | Melodic |
 |:-------:|:------:|:--------:|
-| Branch  | [`kinetic_devel`](https://github.com/iirob/ati_force_torque/tree/kinetic-devel) |
-| Status  | [![Build Status](https://travis-ci.org/KITrobotics/ati_force_torque.svg?branch=kinetic-devel)](https://travis-ci.org/KITrobotics/ati_force_torque) |
-| Version | [version](http://repositories.ros.org/status_page/ros_kinetic_default.html?q=ati_force_torque) |
+| Branch  | [`melodic`](https://github.com/KITrobotics/ati_force_torque/tree/melodic) | [`melodic`](https://github.com/KITrobotics/ati_force_torque/tree/melodic) |
+| Status  | [![Build Status](https://travis-ci.org/KITrobotics/ati_force_torque.svg?branch=melodic)](https://travis-ci.org/KITrobotics/ati_force_torque) | [![Build Status](https://travis-ci.org/KITrobotics/ati_force_torque.svg?branch=melodic)](https://travis-ci.org/KITrobotics/ati_force_torque) |
+| Version | [version](http://repositories.ros.org/status_page/ros_kinetic_default.html?q=ati_force_torque) | [version](http://repositories.ros.org/status_page/ros_melodic_default.html?q=ati_force_torque)
 
diff --git a/config/sensor_configuration_can.yaml b/config/sensor_configuration_can.yaml
@@ -5,6 +5,7 @@ Node:
     ft_pull_freq: 800
     sensor_frame: "fts_reference_link"
     transform_frame: "fts_base_link"
+    static_application: false
 
 Calibration:
     Offset:

diff --git a/config/sensor_configuration_rs485.yaml b/config/sensor_configuration_rs485.yaml
@@ -5,6 +5,7 @@ Node:
     ft_pull_freq: 7000
     sensor_frame: "fts_reference_link"
     transform_frame: "fts_base_link"
+    static_application: false
 
 Calibration:
     Offset:

diff --git a/config/sensor_configuration_sim.yaml b/config/sensor_configuration_sim.yaml
@@ -4,6 +4,7 @@ Node:
     ft_pull_freq: 800
     sensor_frame: ""
     transform_frame: ""
+    static_application: false
     sim_forceX_param: 40
     sim_forceY_param: 55
     sim_torqueZ_param: 10

diff --git a/launch/driver.launch b/launch/driver.launch
@@ -7,7 +7,7 @@
     <param name="sensor_description" command="$(find xacro)/xacro --inorder '$(find ati_force_torque)/description/urdf/sensor_mini58.urdf.xacro' $(arg scenario_parameters)"/>  
 
     <!-- sensor state publisher -->
-    <node ns="fts" pkg="robot_state_publisher" type="robot_state_publisher" name="sensor_state_publisher">
+    <node pkg="robot_state_publisher" type="robot_state_publisher" name="sensor_state_publisher">
         <param name="publish_frequency" type="double" value="200.0" />
         <param name="tf_prefix" type="string" value="" />
         <remap from="robot_description" to="sensor_description" />

diff --git a/launch/driver_pluginlib.launch b/launch/driver_pluginlib.launch
@@ -5,7 +5,7 @@
     <param name="sensor_description" command="$(find xacro)/xacro --inorder '$(find ati_force_torque)/description/urdf/sensor_mini58.urdf.xacro' $(arg scenario_parameters)"/>  
 
     <!-- sensor state publisher -->
-    <node ns="fts" pkg="robot_state_publisher" type="robot_state_publisher" name="sensor_state_publisher">
+    <node pkg="robot_state_publisher" type="robot_state_publisher" name="sensor_state_publisher">
         <param name="publish_frequency" type="double" value="200.0" />
         <param name="tf_prefix" type="string" value="" />
         <remap from="robot_description" to="sensor_description" />
@@ -14,7 +14,7 @@
     <include ns="fts" file="$(find ati_force_torque)/launch/sensor_parameters_can_socket.launch"/>
 
     <!-- start FTS Driver Node -->
-    <node pkg="force_torque_sensor" type="force_torque_sensor_node" name="fts" ns="fts" cwd="node" respawn="false" output="screen">
+    <node pkg="force_torque_sensor" type="force_torque_sensor_node" name="fts" cwd="node" respawn="false" output="screen">
     </node>
 
 </launch>
diff --git a/package.xml b/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>ati_force_torque</name>
-  <version>1.0.1</version>
+  <version>1.1.0</version>
   <description>This package implements driver for ATI force torque sensors up to firmware 3.x. Char and Net CAN devices are supported through cob_generic_can package. The code if based on cob_forcetorque package.</description>
 
   <maintainer email="[email protected]">Denis Štogl (KIT, IAR-IPR)</maintainer>