Skip to content

"TP: Robot_Servicio, Alumnos: Bonn y Castellaro" #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: kinetic-devel
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 109 additions & 13 deletions ca_tools/rviz/localization.rviz
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Panels:
Expanded:
- /Odometry1/Shape1
Splitter Ratio: 0.5
Tree Height: 732
Tree Height: 344
- Class: rviz/Selection
Name: Selection
- Class: rviz/Tool Properties
Expand All @@ -25,7 +25,7 @@ Panels:
Experimental: false
Name: Time
SyncMode: 0
SyncSource: ""
SyncSource: LaserScan
Preferences:
PromptSaveOnExit: true
Toolbars:
Expand Down Expand Up @@ -84,6 +84,16 @@ Visualization Manager:
Show Axes: false
Show Trail: false
Value: true
battery_link:
Alpha: 1
Show Axes: false
Show Trail: false
Value: true
bumper_link:
Alpha: 1
Show Axes: false
Show Trail: false
Value: true
caster_wheel_link:
Alpha: 1
Show Axes: false
Expand Down Expand Up @@ -279,6 +289,92 @@ Visualization Manager:
Unreliable: false
Use Timestamp: false
Value: true
- Alpha: 1
Buffer Length: 1
Class: rviz/Path
Color: 25; 255; 0
Enabled: true
Head Diameter: 0.30000001192092896
Head Length: 0.20000000298023224
Length: 0.30000001192092896
Line Style: Lines
Line Width: 0.029999999329447746
Name: Path
Offset:
X: 0
Y: 0
Z: 0
Pose Color: 255; 85; 255
Pose Style: None
Radius: 0.029999999329447746
Shaft Diameter: 0.10000000149011612
Shaft Length: 0.10000000149011612
Topic: /create1/move_base/NavfnROS/plan
Unreliable: false
Value: true
- Class: rviz/Axes
Enabled: true
Length: 1
Name: Axes
Radius: 0.10000000149011612
Reference Frame: map
Value: true
- Alpha: 1
Autocompute Intensity Bounds: true
Autocompute Value Bounds:
Max Value: 10
Min Value: -10
Value: true
Axis: Z
Channel Name: intensity
Class: rviz/LaserScan
Color: 255; 255; 255
Color Transformer: Intensity
Decay Time: 0
Enabled: true
Invert Rainbow: false
Max Color: 255; 255; 255
Max Intensity: 0
Min Color: 0; 0; 0
Min Intensity: 0
Name: LaserScan
Position Transformer: XYZ
Queue Size: 10
Selectable: true
Size (Pixels): 3
Size (m): 0.009999999776482582
Style: Flat Squares
Topic: /create1/rplidar/scan
Unreliable: false
Use Fixed Frame: true
Use rainbow: true
Value: true
- Alpha: 0.699999988079071
Class: rviz/Map
Color Scheme: map
Draw Behind: false
Enabled: true
Name: Map
Topic: /create1/move_base/local_costmap/costmap
Unreliable: false
Use Timestamp: false
Value: true
- Alpha: 1
Arrow Length: 0.30000001192092896
Axes Length: 0.30000001192092896
Axes Radius: 0.009999999776482582
Class: rviz/PoseArray
Color: 255; 25; 0
Enabled: true
Head Length: 0.07000000029802322
Head Radius: 0.029999999329447746
Name: WayPoints
Shaft Length: 0.23000000417232513
Shaft Radius: 0.009999999776482582
Shape: Arrow (Flat)
Topic: /waypoints
Unreliable: false
Value: true
Enabled: true
Global Options:
Background Color: 48; 48; 48
Expand Down Expand Up @@ -307,33 +403,33 @@ Visualization Manager:
Views:
Current:
Class: rviz/Orbit
Distance: 17.197004318237305
Distance: 18.516984939575195
Enable Stereo Rendering:
Stereo Eye Separation: 0.05999999865889549
Stereo Focal Distance: 1
Swap Stereo Eyes: false
Value: false
Focal Point:
X: -0.4858136773109436
Y: 1.2641547918319702
Z: -1.868991494178772
X: 2.5765209197998047
Y: 0.002938445657491684
Z: -4.218800067901611
Focal Shape Fixed Size: true
Focal Shape Size: 0.05000000074505806
Invert Z Axis: false
Name: Current View
Near Clip Distance: 0.009999999776482582
Pitch: 1.5697963237762451
Pitch: 1.4497963190078735
Target Frame: <Fixed Frame>
Value: Orbit (rviz)
Yaw: 1.675397276878357
Yaw: 4.6854143142700195
Saved: ~
Window Geometry:
Displays:
collapsed: false
Height: 1208
Height: 713
Hide Left Dock: false
Hide Right Dock: true
QMainWindow State: 000000ff00000000fd0000000400000000000001dc000003cafc0200000008fb0000001200530065006c0065006300740069006f006e00000001e10000009b000000ab00fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c0061007900730100000069000003ca0000017800fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261000000010000010f000004e2fc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a005600690065007700730000000028000004e20000012300fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e100000197000000030000076100000050fc0100000002fb0000000800540069006d00650100000000000007610000045300fffffffb0000000800540069006d0065010000000000000450000000000000000000000579000003ca00000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000
QMainWindow State: 000000ff00000000fd0000000400000000000001dc0000021dfc0200000008fb0000001200530065006c0065006300740069006f006e00000001e10000009b0000005c00fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c006100790073010000003b0000021d000000c700fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261000000010000010f000004e2fc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a005600690065007700730000000028000004e2000000a000fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e100000197000000030000055600000050fc0100000002fb0000000800540069006d00650100000000000005560000024400fffffffb0000000800540069006d00650100000000000004500000000000000000000003740000021d00000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000
Selection:
collapsed: false
Time:
Expand All @@ -342,6 +438,6 @@ Window Geometry:
collapsed: false
Views:
collapsed: true
Width: 1889
X: 966
Y: 279
Width: 1366
X: 0
Y: 27
39 changes: 23 additions & 16 deletions ca_tools/rviz/navigation.rviz
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Panels:
Property Tree Widget:
Expanded: ~
Splitter Ratio: 0.5
Tree Height: 726
Tree Height: 344
- Class: rviz/Selection
Name: Selection
- Class: rviz/Tool Properties
Expand All @@ -24,7 +24,7 @@ Panels:
Experimental: false
Name: Time
SyncMode: 0
SyncSource: ""
SyncSource: LaserScan
Preferences:
PromptSaveOnExit: true
Toolbars:
Expand Down Expand Up @@ -126,7 +126,7 @@ Visualization Manager:
Draw Behind: false
Enabled: true
Name: Local Costmap
Topic: /create1/move_base/local_costmap/costmap
Topic: /create1/move_base/global_costmap/costmap
Unreliable: false
Use Timestamp: false
Value: true
Expand Down Expand Up @@ -316,7 +316,7 @@ Visualization Manager:
Size (Pixels): 3
Size (m): 0.009999999776482582
Style: Flat Squares
Topic: /create1/laser/scan
Topic: /create1/rplidar/scan
Unreliable: false
Use Fixed Frame: true
Use rainbow: true
Expand Down Expand Up @@ -378,6 +378,13 @@ Visualization Manager:
Unreliable: false
Use Timestamp: false
Value: false
- Class: rviz/Axes
Enabled: true
Length: 1
Name: Axes
Radius: 0.10000000149011612
Reference Frame: map
Value: true
Enabled: true
Global Options:
Background Color: 48; 48; 48
Expand Down Expand Up @@ -405,7 +412,7 @@ Visualization Manager:
Value: true
Views:
Current:
Angle: 3.221593141555786
Angle: 6.306574821472168
Class: rviz/TopDownOrtho
Enable Stereo Rendering:
Stereo Eye Separation: 0.05999999865889549
Expand All @@ -415,27 +422,27 @@ Visualization Manager:
Invert Z Axis: false
Name: Current View
Near Clip Distance: 0.009999999776482582
Scale: 161.00779724121094
Scale: 145.27012634277344
Target Frame: create1_tf/base_footprint
Value: TopDownOrtho (rviz)
X: -0.3720692992210388
Y: -1.142160415649414
X: 0.13183219730854034
Y: -0.41832664608955383
Saved: ~
Window Geometry:
Displays:
collapsed: true
Height: 1095
Hide Left Dock: true
Hide Right Dock: true
QMainWindow State: 000000ff00000000fd0000000400000000000002b20000039bfc0200000008fb0000001200530065006c0065006300740069006f006e00000001e10000009b0000005c00fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c006100790073000000003b0000039b000000c700fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c0000026100000001000001d20000039bfc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a00560069006500770073000000003b0000039b000000a000fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e100000197000000030000050600000050fc0100000002fb0000000800540069006d00650100000000000005060000024400fffffffb0000000800540069006d00650100000000000004500000000000000000000005060000039b00000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000
collapsed: false
Height: 713
Hide Left Dock: false
Hide Right Dock: false
QMainWindow State: 000000ff00000000fd0000000400000000000001560000021dfc0200000008fb0000001200530065006c0065006300740069006f006e00000001e10000009b0000005c00fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c006100790073010000003b0000021d000000c700fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c0000026100000001000001d20000021dfc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a00560069006500770073000000003b0000021d000000a000fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e100000197000000030000055600000050fc0100000002fb0000000800540069006d00650100000000000005560000024400fffffffb0000000800540069006d00650100000000000004500000000000000000000003fa0000021d00000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000
Selection:
collapsed: false
Time:
collapsed: false
Tool Properties:
collapsed: false
Views:
collapsed: true
Width: 1286
X: 717
collapsed: false
Width: 1366
X: 0
Y: 27
26 changes: 15 additions & 11 deletions ca_tools/rviz/octomap.rviz
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Panels:
Property Tree Widget:
Expanded: ~
Splitter Ratio: 0.5
Tree Height: 728
Tree Height: 305
- Class: rviz/Selection
Name: Selection
- Class: rviz/Tool Properties
Expand Down Expand Up @@ -172,6 +172,10 @@ Visualization Manager:
Alpha: 1
Show Axes: false
Show Trail: false
astra_rgb_optical_frame:
Alpha: 1
Show Axes: false
Show Trail: false
base_footprint:
Alpha: 1
Show Axes: false
Expand Down Expand Up @@ -422,33 +426,33 @@ Visualization Manager:
Views:
Current:
Class: rviz/Orbit
Distance: 7.163344860076904
Distance: 3.9328553676605225
Enable Stereo Rendering:
Stereo Eye Separation: 0.05999999865889549
Stereo Focal Distance: 1
Swap Stereo Eyes: false
Value: false
Focal Point:
X: -1.9060441255569458
Y: -0.086894191801548
Z: 2.4001128673553467
X: -1.7005481719970703
Y: -0.7406764030456543
Z: 7.302811145782471
Focal Shape Fixed Size: false
Focal Shape Size: 0.05000000074505806
Invert Z Axis: false
Name: Current View
Near Clip Distance: 0.009999999776482582
Pitch: 0.969796895980835
Pitch: 1.4847962856292725
Target Frame: create1_tf/base_footprint
Value: Orbit (rviz)
Yaw: 0.3354071378707886
Yaw: 3.002260446548462
Saved: ~
Window Geometry:
Displays:
collapsed: true
Height: 1097
Height: 713
Hide Left Dock: true
Hide Right Dock: true
QMainWindow State: 000000ff00000000fd0000000400000000000001d80000039dfc0200000008fb0000001200530065006c0065006300740069006f006e00000001e10000009b0000005c00fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c006100790073000000003b0000039d000000c700fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c0000026100000001000001d20000039dfc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a00560069006500770073000000003b0000039d000000a000fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e10000019700000003000007bd00000050fc0100000002fb0000000800540069006d00650100000000000007bd0000024400fffffffb0000000800540069006d00650100000000000004500000000000000000000007bd0000039d00000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000
QMainWindow State: 000000ff00000000fd0000000400000000000001d80000039dfc0200000008fb0000001200530065006c0065006300740069006f006e00000001e10000009b0000005c00fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c006100790073000000003b0000039d000000c700fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c0000026100000001000001d20000039dfc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a00560069006500770073000000003b0000039d000000a000fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e100000197000000030000055600000050fc0100000002fb0000000800540069006d00650000000000000005560000024400fffffffb0000000800540069006d00650100000000000004500000000000000000000005560000027300000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000
Selection:
collapsed: false
Time:
Expand All @@ -457,6 +461,6 @@ Window Geometry:
collapsed: false
Views:
collapsed: true
Width: 1981
X: 67
Width: 1366
X: 0
Y: 27
3 changes: 3 additions & 0 deletions follow_waypoints-master/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.pyc
*.swp
*.swo
18 changes: 18 additions & 0 deletions follow_waypoints-master/CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Changelog for package follow_waypoints
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ojo que si usan código hecho por otra persona, deberían agregar la licencia correspondiente.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No hay problema con la licencia, pero este archivo no creo que sea necesario.

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.3.0 (2017-07-14)
------------------
* Added support for emptying the waypoint queue
* Update package.xml
* Update README.md

0.2.0 (2017-07-09)
------------------
* Update README.md
* Major update

0.1.0 (2017-07-09)
------------------
* first release
Loading