Skip to content

Commit 04a004e

Browse files
author
Felix Exner
committed
Merge changes from boost branch
Changes * Added changelog from boost branch * fixed build warnings
2 parents 8e29c4b + 816f593 commit 04a004e

File tree

10 files changed

+23
-22
lines changed

10 files changed

+23
-22
lines changed

CHANGELOG.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2+
Changelog for package ur_client_library
3+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
5+
0.1.1 (2020-09-15)
6+
------------------
7+
* readme: missing whitespace
8+
* Further elaborated license statements in README
9+
* Install package.xml when built with catkin support
10+
* Contributors: Felix Exner, G.A. vd. Hoorn
11+
12+
0.1.0 (2020-09-11)
13+
------------------
14+
* initial standalone release

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8.12)
1+
cmake_minimum_required(VERSION 3.0.2)
22
project(ur_client_library)
33

44
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/" ${CMAKE_MODULE_PATH})

CMakeModules/FindGTest.CMakeLists.txt.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8.2)
1+
cmake_minimum_required(VERSION 3.0.2)
22

33
project(gtest-download NONE)
44

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ int main(int argc, char* argv[])
8888
```cmake
8989
# CMakeLists.txt
9090
91-
cmake_minimum_required(VERSION 2.8.12)
91+
cmake_minimum_required(VERSION 3.0.2)
9292
project(minimal_example)
9393
9494
find_package(ur_client_library REQUIRED)

examples/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8.12)
1+
cmake_minimum_required(VERSION 3.0.2)
22
project(ur_driver_examples)
33

44
#find_package(ur_client_library REQUIRED)

examples/full_driver.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,6 @@ void handleRobotProgramState(bool program_running)
5454
std::cout << "\033[1;32mProgram running: " << std::boolalpha << program_running << "\033[0m\n" << std::endl;
5555
}
5656

57-
void jogging()
58-
{
59-
vector6d_t joint_position_command;
60-
61-
char c;
62-
63-
std::cout << "Press a key" << std::endl;
64-
while (true)
65-
{
66-
c = getchar();
67-
std::cout << "pressed " << c << std::endl;
68-
}
69-
}
70-
7157
int main(int argc, char* argv[])
7258
{
7359
std::unique_ptr<ToolCommSetup> tool_comm_setup;

include/ur_client_library/comm/reverse_interface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class ReverseInterface
128128
*/
129129
std::string readKeepalive()
130130
{
131-
size_t buf_len = 16;
131+
const size_t buf_len = 16;
132132
char buffer[buf_len];
133133

134134
bool read_successful = server_.readLine(buffer, buf_len);

include/ur_client_library/comm/script_sender.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class ScriptSender
9292

9393
bool requestRead()
9494
{
95-
size_t buf_len = 1024;
95+
const size_t buf_len = 1024;
9696
char buffer[buf_len];
9797

9898
bool read_successful = server_.readLine(buffer, buf_len);

package.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="2">
44
<name>ur_client_library</name>
5-
<version>0.0.3</version>
5+
<version>0.1.1</version>
66
<description>Standalone C++ library for accessing Universal Robots interfaces. This has been forked off the ur_robot_driver.</description>
77
<author>Thomas Timm Andersen</author>
88
<author>Simon Rasmussen</author>
@@ -22,6 +22,7 @@
2222
<buildtool_depend>cmake</buildtool_depend>
2323

2424
<depend>libconsole-bridge-dev</depend>
25+
<exec_depend>catkin</exec_depend>
2526

2627
<export>
2728
<build_type>cmake</build_type>

tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8.12)
1+
cmake_minimum_required(VERSION 3.0.2)
22

33
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../CMakeModules/" ${CMAKE_MODULE_PATH})
44

0 commit comments

Comments
 (0)