Skip to content

Commit

Permalink
chore: Updated the copyright from Franka Emika to Franka Robotics
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreasKuhner authored and BarisYazici committed Mar 28, 2024
1 parent 86f2254 commit c11f000
Show file tree
Hide file tree
Showing 82 changed files with 109 additions and 109 deletions.
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
franka_ros

Copyright 2017 Franka Emika GmbH
Copyright 2023 Franka Robotics GmbH

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ROS integration for Franka Emika research robots
# ROS integration for Franka Robotics research robots

[![CI](https://github.com/frankaemika/franka_ros/actions/workflows/ci.yml/badge.svg)](https://github.com/frankaemika/franka_ros/actions/workflows/ci.yml)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#pragma once

Expand Down
2 changes: 1 addition & 1 deletion franka_control/mainpage.dox
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
* @mainpage
* @htmlinclude "manifest.html"
*
* Overview page for Franka Emika research robots: https://frankaemika.github.io
* Overview page for Franka Robotics research robots: https://frankaemika.github.io
*/
6 changes: 3 additions & 3 deletions franka_control/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<package format="2">
<name>franka_control</name>
<version>0.10.1</version>
<description>franka_control provides a hardware node to control a Franka Emika research robot</description>
<maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
<description>franka_control provides a hardware node to control a Franka Robotics research robot</description>
<maintainer email="support@franka.de">Franka Robotics GmbH</maintainer>
<license>Apache 2.0</license>

<url type="website">http://wiki.ros.org/franka_control</url>
<url type="repository">https://github.com/frankaemika/franka_ros</url>
<url type="bugtracker">https://github.com/frankaemika/franka_ros/issues</url>
<author>Franka Emika GmbH</author>
<author>Franka Robotics GmbH</author>

<buildtool_depend>catkin</buildtool_depend>

Expand Down
2 changes: 1 addition & 1 deletion franka_control/src/franka_combined_control_node.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2019 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE

#include <controller_manager/controller_manager.h>
Expand Down
2 changes: 1 addition & 1 deletion franka_control/src/franka_control_node.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#include <algorithm>
#include <atomic>
Expand Down
2 changes: 1 addition & 1 deletion franka_control/src/franka_state_controller.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#include <franka_control/franka_state_controller.h>

Expand Down
2 changes: 1 addition & 1 deletion franka_description/mainpage.dox
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
* @mainpage
* @htmlinclude "manifest.html"
*
* Overview page for Franka Emika research robots: https://frankaemika.github.io
* Overview page for Franka Robotics research robots: https://frankaemika.github.io
*/
6 changes: 3 additions & 3 deletions franka_description/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<package format="2">
<name>franka_description</name>
<version>0.10.1</version>
<description>franka_description contains URDF files and meshes of Franka Emika robots</description>
<maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
<description>franka_description contains URDF files and meshes of Franka Robotics robots</description>
<maintainer email="support@franka.de">Franka Robotics GmbH</maintainer>
<license>Apache 2.0</license>

<url type="website">http://wiki.ros.org/franka_description</url>
<url type="repository">https://github.com/frankaemika/franka_ros</url>
<url type="bugtracker">https://github.com/frankaemika/franka_ros/issues</url>
<author>Franka Emika GmbH</author>
<author>Franka Robotics GmbH</author>

<buildtool_depend>catkin</buildtool_depend>

Expand Down
2 changes: 1 addition & 1 deletion franka_description/robots/common/inertial.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file does not contain official inertial properties
# of panda robot. The values are from the identification
# results published in: Identification of the Franka Emika
# results published in: Identification of the Franka Robotics
# PandaRobot With Retrieval of Feasible Parameters Using
# Penalty-Based Optimization
# by: Claudio Gaz, Marco Cognetti, Alexander Oliva,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2019 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2022 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
#pragma once

#include <array>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#pragma once

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2020 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#pragma once

Expand Down
2 changes: 1 addition & 1 deletion franka_example_controllers/mainpage.dox
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
* @mainpage
* @htmlinclude "manifest.html"
*
* Overview page for Franka Emika research robots: https://frankaemika.github.io
* Overview page for Franka Robotics research robots: https://frankaemika.github.io
*/
6 changes: 3 additions & 3 deletions franka_example_controllers/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<package format="2">
<name>franka_example_controllers</name>
<version>0.10.1</version>
<description>franka_example_controllers provides example code for controlling Franka Emika research robots with ros_control</description>
<maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
<description>franka_example_controllers provides example code for controlling Franka Robotics research robots with ros_control</description>
<maintainer email="support@franka.de">Franka Robotics GmbH</maintainer>
<license>Apache 2.0</license>

<url type="website">http://wiki.ros.org/franka_example_controllers</url>
<url type="repository">https://github.com/frankaemika/franka_ros</url>
<url type="bugtracker">https://github.com/frankaemika/franka_ros/issues</url>
<author>Franka Emika GmbH</author>
<author>Franka Robotics GmbH</author>

<buildtool_depend>catkin</buildtool_depend>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#include <franka_example_controllers/cartesian_impedance_example_controller.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#include <franka_example_controllers/cartesian_pose_example_controller.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#include <franka_example_controllers/cartesian_velocity_example_controller.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2019 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#include <franka_example_controllers/dual_arm_cartesian_impedance_example_controller.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#include <franka_example_controllers/elbow_example_controller.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#include <franka_example_controllers/force_example_controller.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#include <franka_example_controllers/joint_impedance_example_controller.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#include <franka_example_controllers/joint_position_example_controller.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#include <franka_example_controllers/joint_velocity_example_controller.h>

Expand Down
2 changes: 1 addition & 1 deletion franka_example_controllers/src/joint_wall.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2022 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
#include <franka_example_controllers/joint_wall.h>

#include <ros/ros.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE

#include <franka_example_controllers/model_example_controller.h>
Expand Down
2 changes: 1 addition & 1 deletion franka_example_controllers/src/teleop_gripper_node.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2020 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#include <franka/gripper.h>
#include <franka_example_controllers/teleop_gripper_paramConfig.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2020 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#include <franka_example_controllers/joint_wall.h>
#include <franka_example_controllers/teleop_joint_pd_example_controller.h>
Expand Down
2 changes: 1 addition & 1 deletion franka_gazebo/mainpage.dox
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
* @mainpage
* @htmlinclude "manifest.html"
*
* Overview page for Franka Emika research robots: https://frankaemika.github.io
* Overview page for Franka Robotics research robots: https://frankaemika.github.io
*/
2 changes: 1 addition & 1 deletion franka_gazebo/models/pick_tray/model.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<version>1.0</version>
<sdf version="1.6">model.sdf</sdf>
<author>
<name>Franka Emika</name>
<name>Franka Robotics</name>
<email>support@franka.de</email>
</author>
<description>Simple blue coloured tray.</description>
Expand Down
2 changes: 1 addition & 1 deletion franka_gazebo/models/place_tray/model.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<version>1.0</version>
<sdf version="1.6">model.sdf</sdf>
<author>
<name>Franka Emika</name>
<name>Franka Robotics</name>
<email>support@franka.de</email>
</author>
<description>A simple red coloured tray.</description>
Expand Down
2 changes: 1 addition & 1 deletion franka_gazebo/models/stone/model.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<version>1.0</version>
<sdf version="1.6">model.sdf</sdf>
<author>
<name>Franka Emika</name>
<name>Franka Robotics</name>
<email>support@franka.de</email>
</author>
<description>A simple stone.</description>
Expand Down
2 changes: 1 addition & 1 deletion franka_gazebo/models/table/model.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<version>1.0</version>
<sdf version="1.6">model.sdf</sdf>
<author>
<name>Franka Emika</name>
<name>Franka Robotics</name>
<email>support@franka.de</email>
</author>
<description>A simple table.</description>
Expand Down
4 changes: 2 additions & 2 deletions franka_gazebo/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<version>0.10.1</version>
<description>This package offers the FrankaHWSim Class to simulate a Franka Robot in Gazebo</description>

<maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
<maintainer email="support@franka.de">Franka Robotics GmbH</maintainer>

<license>Apache 2.0</license>

<url type="website">http://wiki.ros.org/franka_gazebo</url>
<url type="repository">https://github.com/frankaemika/franka_ros</url>
<url type="bugtracker">https://github.com/frankaemika/franka_ros/issues</url>
<author>Franka Emika GmbH</author>
<author>Franka Robotics GmbH</author>

<buildtool_depend>catkin</buildtool_depend>

Expand Down
18 changes: 9 additions & 9 deletions franka_gazebo/test/launch/panda-gazebo.urdf
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<robot name="panda">
<!-- =============================================================== -->
<!-- || This file does not contain official inertial properties || -->
<!-- || of panda robot. The values are from the identification || -->
<!-- || results published in: Identification of the Franka Emika || -->
<!-- || PandaRobot With Retrieval of Feasible Parameters Using || -->
<!-- || Penalty-Based Optimization || -->
<!-- || by: Claudio Gaz, Marco Cognetti, Alexander Oliva, || -->
<!-- || Paolo Robuffo Giordano, Alessandro de Luca third-party || -->
<!-- =============================================================== -->
<!-- ================================================================== -->
<!-- || This file does not contain official inertial properties || -->
<!-- || of panda robot. The values are from the identification || -->
<!-- || results published in: Identification of the Franka Robotics || -->
<!-- || PandaRobot With Retrieval of Feasible Parameters Using || -->
<!-- || Penalty-Based Optimization || -->
<!-- || by: Claudio Gaz, Marco Cognetti, Alexander Oliva, || -->
<!-- || Paolo Robuffo Giordano, Alessandro de Luca third-party || -->
<!-- ================================================================== -->
<link name="world"/>
<joint name="panda_joint_panda_mount" type="fixed">
<parent link="panda_mount"/>
Expand Down
2 changes: 1 addition & 1 deletion franka_gazebo/test/main.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#include <gtest/gtest.h>
#include <ros/ros.h>
Expand Down
2 changes: 1 addition & 1 deletion franka_gripper/include/franka_gripper/franka_gripper.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#pragma once

Expand Down
2 changes: 1 addition & 1 deletion franka_gripper/mainpage.dox
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
* @mainpage
* @htmlinclude "manifest.html"
*
* Overview page for Franka Emika research robots: https://frankaemika.github.io
* Overview page for Franka Robotics research robots: https://frankaemika.github.io
*/
4 changes: 2 additions & 2 deletions franka_gripper/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<name>franka_gripper</name>
<version>0.10.1</version>
<description>This package implements the franka gripper of type Franka Hand for the use in ros</description>
<maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
<maintainer email="support@franka.de">Franka Robotics GmbH</maintainer>
<license>Apache 2.0</license>

<url type="website">http://wiki.ros.org/franka_gripper</url>
<url type="repository">https://github.com/frankaemika/franka_ros</url>
<url type="bugtracker">https://github.com/frankaemika/franka_ros/issues</url>
<author>Franka Emika GmbH</author>
<author>Franka Robotics GmbH</author>

<buildtool_depend>catkin</buildtool_depend>

Expand Down
2 changes: 1 addition & 1 deletion franka_gripper/src/franka_gripper.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017 Franka Emika GmbH
// Copyright (c) 2023 Franka Robotics GmbH
// Use of this source code is governed by the Apache-2.0 license, see LICENSE
#include <franka_gripper/franka_gripper.h>

Expand Down
Loading

0 comments on commit c11f000

Please sign in to comment.