Skip to content

Commit 9069622

Browse files
authored
Merge pull request #3 from carologistics/sam/add-laser-lines
Sam/add laser lines
2 parents db45eb7 + 0ae3286 commit 9069622

25 files changed

+2268
-696
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
devel/
22
logs/
3+
install/
34
build/
45
bin/
56
lib/
@@ -49,3 +50,4 @@ qtcreator-*
4950

5051
# Catkin custom files
5152
CATKIN_IGNORE
53+
.vscode/

LaserIntegration.png

-84.8 KB
Binary file not shown.

debug_laser_mapper.rviz

Lines changed: 179 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,179 @@
1+
Panels:
2+
- Class: rviz_common/Displays
3+
Help Height: 78
4+
Name: Displays
5+
Property Tree Widget:
6+
Expanded:
7+
- /Global Options1
8+
- /Status1
9+
- /TF1/Frames1
10+
- /Marker1/Topic1
11+
- /Marker2
12+
- /Marker2/Topic1
13+
Splitter Ratio: 0.7823529243469238
14+
Tree Height: 707
15+
- Class: rviz_common/Selection
16+
Name: Selection
17+
- Class: rviz_common/Tool Properties
18+
Expanded:
19+
- /2D Goal Pose1
20+
- /Publish Point1
21+
Name: Tool Properties
22+
Splitter Ratio: 0.5886790156364441
23+
- Class: rviz_common/Views
24+
Expanded:
25+
- /Current View1
26+
Name: Views
27+
Splitter Ratio: 0.5
28+
- Class: rviz_common/Time
29+
Experimental: false
30+
Name: Time
31+
SyncMode: 0
32+
SyncSource: ""
33+
Visualization Manager:
34+
Class: ""
35+
Displays:
36+
- Alpha: 0.5
37+
Cell Size: 1
38+
Class: rviz_default_plugins/Grid
39+
Color: 160; 160; 164
40+
Enabled: true
41+
Line Style:
42+
Line Width: 0.029999999329447746
43+
Value: Lines
44+
Name: Grid
45+
Normal Cell Count: 0
46+
Offset:
47+
X: 0
48+
Y: 0
49+
Z: 0
50+
Plane: XY
51+
Plane Cell Count: 10
52+
Reference Frame: <Fixed Frame>
53+
Value: true
54+
- Class: rviz_default_plugins/TF
55+
Enabled: true
56+
Filter (blacklist): ""
57+
Filter (whitelist): ""
58+
Frame Timeout: 15
59+
Frames:
60+
All Enabled: false
61+
Marker Scale: 1
62+
Name: TF
63+
Show Arrows: true
64+
Show Axes: true
65+
Show Names: true
66+
Tree:
67+
{}
68+
Update Interval: 0
69+
Value: true
70+
- Class: rviz_default_plugins/Marker
71+
Enabled: false
72+
Name: Marker
73+
Namespaces:
74+
{}
75+
Topic:
76+
Depth: 20
77+
Durability Policy: Volatile
78+
Filter size: 23
79+
History Policy: Keep All
80+
Reliability Policy: Best Effort
81+
Value: /machine_markers
82+
Value: false
83+
- Class: rviz_default_plugins/Marker
84+
Enabled: true
85+
Name: Marker
86+
Namespaces:
87+
{}
88+
Topic:
89+
Depth: 20
90+
Durability Policy: Volatile
91+
Filter size: 20
92+
History Policy: Keep Last
93+
Reliability Policy: Reliable
94+
Value: /robotinobase4/line_markers
95+
Value: true
96+
Enabled: true
97+
Global Options:
98+
Background Color: 48; 48; 48
99+
Fixed Frame: map
100+
Frame Rate: 30
101+
Name: root
102+
Tools:
103+
- Class: rviz_default_plugins/Interact
104+
Hide Inactive Objects: true
105+
- Class: rviz_default_plugins/MoveCamera
106+
- Class: rviz_default_plugins/Select
107+
- Class: rviz_default_plugins/FocusCamera
108+
- Class: rviz_default_plugins/Measure
109+
Line color: 128; 128; 0
110+
- Class: rviz_default_plugins/SetInitialPose
111+
Covariance x: 0.25
112+
Covariance y: 0.25
113+
Covariance yaw: 0.06853891909122467
114+
Topic:
115+
Depth: 5
116+
Durability Policy: Volatile
117+
History Policy: Keep Last
118+
Reliability Policy: Reliable
119+
Value: /initialpose
120+
- Class: rviz_default_plugins/SetGoal
121+
Topic:
122+
Depth: 5
123+
Durability Policy: Volatile
124+
History Policy: Keep Last
125+
Reliability Policy: Reliable
126+
Value: /goal_pose
127+
- Class: rviz_default_plugins/PublishPoint
128+
Single click: true
129+
Topic:
130+
Depth: 5
131+
Durability Policy: Volatile
132+
History Policy: Keep Last
133+
Reliability Policy: Reliable
134+
Value: /clicked_point
135+
Transformation:
136+
Current:
137+
Class: rviz_default_plugins/TF
138+
Value: true
139+
Views:
140+
Current:
141+
Class: rviz_default_plugins/Orbit
142+
Distance: 15.017695426940918
143+
Enable Stereo Rendering:
144+
Stereo Eye Separation: 0.05999999865889549
145+
Stereo Focal Distance: 1
146+
Swap Stereo Eyes: false
147+
Value: false
148+
Focal Point:
149+
X: 0
150+
Y: 0
151+
Z: 0
152+
Focal Shape Fixed Size: true
153+
Focal Shape Size: 0.05000000074505806
154+
Invert Z Axis: false
155+
Name: Current View
156+
Near Clip Distance: 0.009999999776482582
157+
Pitch: 0.37539929151535034
158+
Target Frame: <Fixed Frame>
159+
Value: Orbit (rviz)
160+
Yaw: 3.1053965091705322
161+
Saved: ~
162+
Window Geometry:
163+
Displays:
164+
collapsed: false
165+
Height: 1011
166+
Hide Left Dock: false
167+
Hide Right Dock: false
168+
QMainWindow State: 000000ff00000000fd00000004000000000000015600000351fc0200000008fb0000001200530065006c0065006300740069006f006e00000001e10000009b0000005d00fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c006100790073010000003f00000351000000cc00fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261000000010000010f00000351fc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a00560069006500770073000000003f00000351000000a900fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e100000197000000030000073e0000003efc0100000002fb0000000800540069006d006501000000000000073e0000026f00fffffffb0000000800540069006d00650100000000000004500000000000000000000005e20000035100000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000
169+
Selection:
170+
collapsed: false
171+
Time:
172+
collapsed: false
173+
Tool Properties:
174+
collapsed: false
175+
Views:
176+
collapsed: false
177+
Width: 1854
178+
X: 66
179+
Y: 32
Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
1515
add_compile_options(-Wall -Wextra -Wpedantic)
1616
endif()
1717

18-
# find dependencies
18+
# Find dependencies
1919
find_package(ament_cmake REQUIRED)
2020
find_package(rclcpp REQUIRED)
2121
find_package(sensor_msgs REQUIRED)
@@ -29,15 +29,22 @@ find_package(tf2_sensor_msgs REQUIRED)
2929
find_package(geometry_msgs REQUIRED)
3030
find_package(Boost REQUIRED COMPONENTS system)
3131
find_package(PCL REQUIRED)
32+
find_package(pcl_conversions REQUIRED)
33+
find_package(laser_scan_integrator_msg REQUIRED)
34+
find_package(visualization_msgs REQUIRED)
3235

36+
37+
# Include directories
3338
include_directories(
3439
include
3540
${PCL_INCLUDE_DIRS}
3641
)
42+
43+
# Executable
3744
add_executable(laser_scan_integrator src/main.cpp)
38-
ament_target_dependencies(laser_scan_integrator
39-
rclcpp
40-
std_msgs
45+
ament_target_dependencies(laser_scan_integrator
46+
rclcpp
47+
std_msgs
4148
sensor_msgs
4249
tf2_sensor_msgs
4350
rcl_interfaces
@@ -48,8 +55,19 @@ ament_target_dependencies(laser_scan_integrator
4855
geometry_msgs
4956
Boost
5057
PCL
51-
58+
pcl_conversions
59+
laser_scan_integrator_msg
60+
visualization_msgs
5261
)
62+
63+
# Link PCL librariesrosidl_generate_interfaces
64+
target_link_libraries(laser_scan_integrator ${PCL_LIBRARIES})
65+
66+
67+
# Export dependencies
68+
ament_export_dependencies(laser_scan_integrator_msg)
69+
70+
# Install launch files
5371
install(DIRECTORY
5472
launch
5573
DESTINATION share/${PROJECT_NAME}
@@ -59,18 +77,14 @@ install(DIRECTORY
5977
DESTINATION share/${PROJECT_NAME}
6078
)
6179

62-
80+
# Install executable
6381
install(TARGETS
64-
laser_scan_integrator
65-
DESTINATION lib/${PROJECT_NAME})
82+
laser_scan_integrator
83+
DESTINATION lib/${PROJECT_NAME})
84+
85+
# Testing
6686
if(BUILD_TESTING)
6787
find_package(ament_lint_auto REQUIRED)
68-
# the following line skips the linter which checks for copyrights
69-
# uncomment the line when a copyright and license is not present in all source files
70-
#set(ament_cmake_copyright_FOUND TRUE)
71-
# the following line skips cpplint (only works in a git repo)
72-
# uncomment the line when this package is not in a git repo
73-
#set(ament_cmake_cpplint_FOUND TRUE)
7488
ament_lint_auto_find_test_dependencies()
7589
endif()
7690

File renamed without changes.

README.md renamed to laser_scan_integrator/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The features of this package are below:
1616
3. RVIZ2
1717
4. RQT
1818

19-
## How to use
19+
## How to use
2020
1. Clone the repo to your ros2 workspace
2121
```bash
2222
git clone https://github.com/hijimasa/laser_scan_integrator.git

0 commit comments

Comments
 (0)