Skip to content
This repository was archived by the owner on Dec 1, 2020. It is now read-only.

Commit d17b615

Browse files
authored
Merge pull request #194 from project-march/fix/remove-roslint
Removed roslint
2 parents d7c417a + 4b268ed commit d17b615

File tree

15 files changed

+2
-76
lines changed

15 files changed

+2
-76
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ env:
3030
- CATKIN_LINT=pedantic
3131
- CATKIN_LINT_ARGS='--ignore literal_project_name --ignore target_name_collision'
3232
- UPSTREAM_WORKSPACE='.rosinstall -march/march_data_collector -march/march_gait_scheduler -march/march_gain_scheduling -march/march_gait_selection -march/march_launch -march/march_safety -march/march_sound_scheduler -march/march_state_machine'
33-
- AFTER_BUILD_TARGET_WORKSPACE='builder_run_build "$target_ws/install" "$target_ws" --cmake-target-skip-unavailable --cmake-target roslint'
3433

3534
jobs:
3635
include:

march_hardware/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ add_compile_options(-std=c++11 -Wall -Wextra)
55

66
find_package(catkin REQUIRED COMPONENTS
77
roscpp
8-
roslint
98
soem
109
)
1110

@@ -15,16 +14,6 @@ catkin_package(
1514
LIBRARIES ${PROJECT_NAME}
1615
)
1716

18-
set(ROSLINT_CPP_OPTS "--linelength=120")
19-
20-
file(GLOB_RECURSE lintfiles
21-
"include/*.h"
22-
"src/*.cpp"
23-
)
24-
25-
roslint_cpp(${lintfiles})
26-
27-
2817
include_directories(
2918
include
3019
SYSTEM

march_hardware/include/march_hardware/EtherCAT/EthercatMaster.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#define MARCH_HARDWARE_ETHERCAT_ETHERCATMASTER_H
44
#include <vector>
55
#include <string>
6-
#include <thread> // NOLINT(build/c++11)
6+
#include <thread>
77

88
#include <march_hardware/Joint.h>
99

march_hardware/package.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
<depend>roscpp</depend>
1616
<depend>soem</depend>
1717

18-
<build_depend>roslint</build_depend>
19-
2018
<test_depend>rostest</test_depend>
2119
<test_depend>code_coverage</test_depend>
2220
</package>

march_hardware/src/EtherCAT/EthercatMaster.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void EthercatMaster::ethercatSlaveInitiation()
107107
ec_send_processdata();
108108
ec_receive_processdata(EC_TIMEOUTRET);
109109
ec_statecheck(0, EC_STATE_OPERATIONAL, 50000);
110-
} while (chk-- && (ec_slave[0].state != EC_STATE_OPERATIONAL)); // NOLINT(whitespace/braces)
110+
} while (chk-- && (ec_slave[0].state != EC_STATE_OPERATIONAL));
111111

112112
if (ec_slave[0].state == EC_STATE_OPERATIONAL)
113113
{

march_hardware_builder/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ find_package(catkin REQUIRED COMPONENTS
77
march_hardware
88
roscpp
99
roslib
10-
roslint
1110
)
1211

1312
catkin_package(
@@ -16,16 +15,6 @@ catkin_package(
1615
LIBRARIES ${PROJECT_NAME}
1716
)
1817

19-
set(ROSLINT_CPP_OPTS "--linelength=120")
20-
21-
file(GLOB_RECURSE lintfiles
22-
"*.cpp"
23-
"*.h"
24-
)
25-
26-
roslint_cpp(${lintfiles})
27-
28-
2918
include_directories(include SYSTEM ${catkin_INCLUDE_DIRS})
3019

3120
add_library(${PROJECT_NAME}

march_hardware_builder/package.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
<depend>march_hardware</depend>
1616
<depend>yaml-cpp</depend>
1717

18-
<build_depend>roslint</build_depend>
19-
2018
<test_depend>code_coverage</test_depend>
2119
<test_depend>rosunit</test_depend>
2220
</package>

march_hardware_interface/CMakeLists.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ find_package(catkin REQUIRED COMPONENTS
1515
march_shared_resources
1616
realtime_tools
1717
roscpp
18-
roslint
1918
std_msgs
2019
urdf
2120
)
@@ -93,12 +92,3 @@ if(CATKIN_ENABLE_TESTING)
9392
)
9493
endif()
9594
endif()
96-
97-
set(ROSLINT_CPP_OPTS "--linelength=120")
98-
99-
file(GLOB_RECURSE lintfiles
100-
"include/*.h"
101-
"src/*.cpp"
102-
)
103-
104-
roslint_cpp(${lintfiles})

march_hardware_interface/package.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
<depend>march_hardware</depend>
2525
<depend>march_hardware_builder</depend>
2626

27-
<build_depend>roslint</build_depend>
28-
2927
<exec_depend>robot_state_publisher</exec_depend>
3028
<exec_depend>xacro</exec_depend>
3129
<exec_depend>ethercat_grant</exec_depend>

march_imu_manager/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ add_compile_options(-std=c++11 -Wall -Wextra)
55

66
find_package(catkin REQUIRED COMPONENTS
77
roscpp
8-
roslint
98
sensor_msgs
109
)
1110

@@ -23,14 +22,6 @@ include_directories(
2322
${catkin_INCLUDE_DIRS}
2423
)
2524

26-
file(GLOB_RECURSE lintfiles
27-
"src/*.cpp"
28-
"src/*.h"
29-
"test/*.cpp"
30-
)
31-
32-
roslint_cpp(${lintfiles})
33-
3425
set(xsensdeviceapi_LOCATION ${PROJECT_SOURCE_DIR}/lib/libxsensdeviceapi.so)
3526
set(xstypes_LOCATION ${PROJECT_SOURCE_DIR}/lib/libxstypes.so)
3627

0 commit comments

Comments
 (0)