Skip to content

Commit

Permalink
Prepare release 1.5 (#333)
Browse files Browse the repository at this point in the history
Prepare release 1.5
  • Loading branch information
MatthijsBurgh authored Jun 6, 2021
2 parents a2bbe91 + 8e6bca0 commit eef1f3a
Show file tree
Hide file tree
Showing 18 changed files with 30 additions and 11 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ jobs:
ABICHECK_URL: github:orocos/orocos_kinematics_dynamics#release-1.4
ABICHECK_MERGE: false
branch: release-1.4
- env:
ROS_DISTRO: noetic
ROS_REPO: ros
ABICHECK_URL: github:orocos/orocos_kinematics_dynamics#release-1.5
ABICHECK_MERGE: false
branch: release-1.5
env: ${{ matrix.env }}
steps:
- uses: actions/checkout@v1
Expand Down
2 changes: 1 addition & 1 deletion orocos_kdl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ENDIF()

PROJECT(orocos_kdl)

SET( KDL_VERSION 1.4.1)
SET( KDL_VERSION 1.5.0)
STRING( REGEX MATCHALL "[0-9]+" KDL_VERSIONS ${KDL_VERSION} )
LIST( GET KDL_VERSIONS 0 KDL_VERSION_MAJOR)
LIST( GET KDL_VERSIONS 1 KDL_VERSION_MINOR)
Expand Down
2 changes: 1 addition & 1 deletion orocos_kdl/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>orocos_kdl</name>
<version>1.4.1</version>
<version>1.5.0</version>
<description>
This package contains a recent version of the Kinematics and Dynamics
Library (KDL), distributed by the Orocos Project.
Expand Down
2 changes: 1 addition & 1 deletion python_orocos_kdl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if(POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
endif()

project(python_orocos_kdl VERSION 1.4.1)
project(python_orocos_kdl VERSION 1.5.0)

# find a matching version of orocos_kdl
find_package(orocos_kdl ${PROJECT_VERSION} EXACT REQUIRED)
Expand Down
1 change: 1 addition & 0 deletions python_orocos_kdl/PyKDL/PyKDL.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
//Author: Zihan Chen <zihan dot chen dot jhu at gmail dot com>
//Author: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
//Maintainer: Ruben Smits Ruben Smits <ruben dot smits at intermodalics dot eu>
//Maintainer: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
//URL: http://www.orocos.org/kdl
//
//This library is free software; you can redistribute it and/or
Expand Down
1 change: 1 addition & 0 deletions python_orocos_kdl/PyKDL/PyKDL.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
//Author: Zihan Chen <zihan dot chen dot jhu at gmail dot com>
//Author: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
//Maintainer: Ruben Smits Ruben Smits <ruben dot smits at intermodalics dot eu>
//Maintainer: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
//URL: http://www.orocos.org/kdl
//
//This library is free software; you can redistribute it and/or
Expand Down
1 change: 1 addition & 0 deletions python_orocos_kdl/PyKDL/dynamics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
//Author: Zihan Chen <zihan dot chen dot jhu at gmail dot com>
//Author: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
//Maintainer: Ruben Smits Ruben Smits <ruben dot smits at intermodalics dot eu>
//Maintainer: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
//URL: http://www.orocos.org/kdl
//
//This library is free software; you can redistribute it and/or
Expand Down
1 change: 1 addition & 0 deletions python_orocos_kdl/PyKDL/frames.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
//Author: Zihan Chen <zihan dot chen dot jhu at gmail dot com>
//Author: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
//Maintainer: Ruben Smits Ruben Smits <ruben dot smits at intermodalics dot eu>
//Maintainer: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
//URL: http://www.orocos.org/kdl
//
//This library is free software; you can redistribute it and/or
Expand Down
1 change: 1 addition & 0 deletions python_orocos_kdl/PyKDL/framevel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
//Author: Zihan Chen <zihan dot chen dot jhu at gmail dot com>
//Author: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
//Maintainer: Ruben Smits Ruben Smits <ruben dot smits at intermodalics dot eu>
//Maintainer: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
//URL: http://www.orocos.org/kdl
//
//This library is free software; you can redistribute it and/or
Expand Down
1 change: 1 addition & 0 deletions python_orocos_kdl/PyKDL/kinfam.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
//Author: Zihan Chen <zihan dot chen dot jhu at gmail dot com>
//Author: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
//Maintainer: Ruben Smits Ruben Smits <ruben dot smits at intermodalics dot eu>
//Maintainer: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
//URL: http://www.orocos.org/kdl
//
//This library is free software; you can redistribute it and/or
Expand Down
2 changes: 1 addition & 1 deletion python_orocos_kdl/doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,5 +211,5 @@
# (source start file, name, description, authors, manual section).
man_pages = [
('index', 'orocoskdlpythonbindings', u'Orocos KDL python bindings Documentation',
[u'Ruben Smits'], 1)
[u'Ruben Smits', u"Matthijs van der Burgh"], 1)
]
5 changes: 3 additions & 2 deletions python_orocos_kdl/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,20 @@
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>python_orocos_kdl</name>
<version>1.4.1</version>
<version>1.5.0</version>
<description>
This package contains the python bindings PyKDL for the Kinematics and Dynamics
Library (KDL), distributed by the Orocos Project.
</description>
<maintainer email="ruben.smits@intermodalics.eu">Ruben Smits</maintainer>
<maintainer email="MatthijsBurgh@outlook.com">Matthijs van der Burgh</maintainer>
<url>http://wiki.ros.org/python_orocos_kdl</url>
<license>LGPL</license>

<buildtool_depend>catkin</buildtool_depend>

<build_depend>orocos_kdl</build_depend>

<depend condition="$ROS_PYTHON_VERSION == 2">python</depend>
<depend condition="$ROS_PYTHON_VERSION == 3">python3</depend>

Expand Down
1 change: 1 addition & 0 deletions python_orocos_kdl/tests/PyKDLtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# Version: 1.0
# Author: Ruben Smits <ruben dot smits at intermodalics dot eu>
# Maintainer: Ruben Smits <ruben dot smits at intermodalics dot eu>
# Maintainer: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
# URL: http://www.orocos.org/kdl

# This library is free software; you can redistribute it and/or
Expand Down
3 changes: 2 additions & 1 deletion python_orocos_kdl/tests/dynamicstest.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Copyright (C) 2007 Ruben Smits <ruben dot smits at intermodalics dot eu>
# Copyright (C) 2020 Matthijs van der Burgh <MatthijsBurgh at outlook dot com>

# Version: 1.0
# Author: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
# Maintainer: Ruben Smits <ruben dot smits at intermodalics dot eu>
# Maintainer: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
# URL: http://www.orocos.org/kdl

# This library is free software; you can redistribute it and/or
Expand Down
1 change: 1 addition & 0 deletions python_orocos_kdl/tests/framestest.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# Author: Ruben Smits <ruben dot smits at intermodalics dot eu>
# Author: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
# Maintainer: Ruben Smits <ruben dot smits at intermodalics dot eu>
# Maintainer: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
# URL: http://www.orocos.org/kdl

# This library is free software; you can redistribute it and/or
Expand Down
1 change: 1 addition & 0 deletions python_orocos_kdl/tests/frameveltest.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# Author: Ruben Smits <ruben dot smits at intermodalics dot eu>
# Author: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
# Maintainer: Ruben Smits <ruben dot smits at intermodalics dot eu>
# Maintainer: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
# URL: http://www.orocos.org/kdl

# This library is free software; you can redistribute it and/or
Expand Down
1 change: 1 addition & 0 deletions python_orocos_kdl/tests/jointtypetest.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# Version: 1.0
# Author: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
# Maintainer: Ruben Smits <ruben dot smits at intermodalics dot eu>
# Maintainer: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
# URL: http://www.orocos.org/kdl

# This library is free software; you can redistribute it and/or
Expand Down
9 changes: 5 additions & 4 deletions python_orocos_kdl/tests/kinfamtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# Author: Ruben Smits <ruben dot smits at intermodalics dot eu>
# Author: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
# Maintainer: Ruben Smits <ruben dot smits at intermodalics dot eu>
# Maintainer: Matthijs van der Burgh <MatthijsBurgh at outlook dot com>
# URL: http://www.orocos.org/kdl

# This library is free software; you can redistribute it and/or
Expand Down Expand Up @@ -268,7 +269,7 @@ def compare_Jdot_Diff_vs_Solver(self, dt, representation):
q_dqdt = JntArray(q)
for i in range(q.rows()):
q_dqdt[i] += dt * qdot[i]

F_bs_ee_q = Frame.Identity()
F_bs_ee_q_dqdt = Frame.Identity()

Expand All @@ -284,13 +285,13 @@ def compare_Jdot_Diff_vs_Solver(self, dt, representation):

changeJacRepresentation(jac_q, F_bs_ee_q, representation)
changeJacRepresentation(jac_q_dqdt, F_bs_ee_q_dqdt, representation)

Jdot_diff(jac_q, jac_q_dqdt, dt, jdot_by_diff)

jdot_by_solver = Jacobian(NrOfJoints)
self.jacdotsolver.setRepresentation(representation)
self.jacdotsolver.JntToJacDot(JntArrayVel(q_dqdt, qdot), jdot_by_solver)

jdot_qdot_by_solver = Twist()
MultiplyJacobian(jdot_by_solver, qdot, jdot_qdot_by_solver)

Expand Down Expand Up @@ -320,7 +321,7 @@ def testJacDot(self):
"err: {}".format(jdot_qdot_solver, jdot_qdot_diff, representation, dt,
eps_diff_vs_solver, err))
dt *= 10


class KinfamTestTree(unittest.TestCase):

Expand Down

0 comments on commit eef1f3a

Please sign in to comment.