Skip to content
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

Unify ROSbots links with rosbot_description #6250

Closed
wants to merge 47 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
e1492d3
fixed lidar | changed names according to rosbot_ros
delihus Nov 21, 2022
389adb0
more accurate pi
delihus Nov 23, 2022
28d16e1
Merge remote-tracking branch 'webots/develop' into husarion
delihus Nov 24, 2022
f97fce4
Merge remote-tracking branch 'webots/released' into husarion
delihus Dec 8, 2022
e58db66
changed wheels names in Rosbot.proto
delihus Dec 9, 2022
b84e8aa
added husarion world
delihus Dec 9, 2022
d16c7f9
Added first rosbot xl proto
delihus Dec 12, 2022
fc83dcb
rotated imu | changed robot name
delihus Dec 13, 2022
6b7606f
rotated wheel
delihus Dec 13, 2022
ddb229a
Added .dae model | added collision
delihus Dec 16, 2022
0a17031
Merge remote-tracking branch 'webots/master' into husarion
delihus Feb 22, 2023
3044ccd
renamed
delihus Feb 28, 2023
dac191e
Merge remote-tracking branch 'webots/develop' into husarion
delihus Mar 7, 2023
843d435
Merge remote-tracking branch 'webots/develop' into husarion
delihus Mar 8, 2023
ac9a812
added icon
delihus Mar 9, 2023
ee46a36
changed to 2023b | added husarion world icon
delihus Mar 9, 2023
2548baa
update license
delihus Mar 9, 2023
620f8c6
Merge remote-tracking branch 'webots/develop' into husarion
delihus Mar 9, 2023
4a21a1c
Update projects/devices/slamtec/protos/RpLidarA2.proto
delihus Mar 9, 2023
29e8c58
Update projects/objects/husarion_world/protos/HusarionWorld.proto
delihus Mar 9, 2023
0545e43
Update projects/robots/husarion/rosbot/protos/Rosbot.proto
delihus Mar 9, 2023
9dd0132
Update projects/robots/husarion/rosbot_xl/protos/RosbotXl.proto
delihus Mar 9, 2023
ad43963
Update projects/robots/husarion/rosbot_xl/protos/RosbotXl.proto
delihus Mar 9, 2023
87b9360
changed collision typo | fixed distance sensors
delihus Mar 9, 2023
b879015
Merge remote-tracking branch 'origin/husarion' into husarion
delihus Mar 9, 2023
36bf9eb
moved world to robots folder
delihus Mar 13, 2023
4c86c1d
Mpu-9250 fuse meansurements flag
delihus Mar 13, 2023
f3fe2d9
Add Husarion world to ROSbot XL folder
delihus Mar 13, 2023
6793b28
added .wbproj | fixed header | remove include
delihus Mar 13, 2023
b7d28db
Update projects/robots/husarion/rosbot_xl/worlds/rosbot_xl.wbt
delihus Mar 13, 2023
e1fae3d
Update projects/robots/husarion/rosbot_xl/protos/RosbotXl.proto
delihus Mar 13, 2023
9ffea7f
Update projects/robots/husarion/rosbot_xl/worlds/.rosbot_xl.wbproj
delihus Mar 13, 2023
231bacf
changed in lidar name in controller
delihus Mar 14, 2023
473003e
Merge remote-tracking branch 'origin/husarion' into husarion
delihus Mar 14, 2023
f413fde
Added changelog for ROSbot XL
delihus Mar 14, 2023
82c197d
Merge remote-tracking branch 'webots/develop' into husarion
delihus Mar 14, 2023
ba248e9
Update docs/reference/changelog-r2023.md
delihus Mar 14, 2023
e946fd8
changed resolution for RPLidar | added freq for RPLidar | fixed ROSbo…
delihus Mar 14, 2023
6ed910b
Merge remote-tracking branch 'origin/husarion' into husarion
delihus Mar 14, 2023
a93215f
number typo update
delihus Mar 21, 2023
4d9164e
Merge remote-tracking branch 'webots/develop' into husarion
delihus Mar 21, 2023
798eabe
Update projects/robots/husarion/rosbot_xl/protos/RosbotXl.proto
delihus Mar 21, 2023
1826b7f
Merge remote-tracking branch 'webots/develop' into husarion
delihus Mar 22, 2023
5b10083
Merge remote-tracking branch 'upstream/develop' into husarion
delihus Jun 7, 2023
914d6b6
names of links same as in urdf
delihus Jun 20, 2023
fed7a8f
unify links names
delihus Jun 22, 2023
3bec22f
Merge remote-tracking branch 'upstream/develop' into 2023b-dev
delihus Jun 22, 2023
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
14 changes: 7 additions & 7 deletions projects/robots/husarion/rosbot/protos/Rosbot.proto
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ PROTO Rosbot [
field SFBool supervisor FALSE # Is `Robot.supervisor`.
field SFBool synchronization TRUE # Is `Robot.synchronization`.
field SFBool selfCollision FALSE # Is `Robot.selfCollision`.
field MFNode cameraSlot [ Astra { name "camera" } ] # Extends the robot with an Astra RGBD camera.
field MFNode cameraSlot [ Astra { name "camera_link" } ] # Extends the robot with an Astra RGBD camera.
field MFNode lidarSlot [ RpLidarA2 { name "laser" } ] # Extends the robot with a RpLidar A2 lidar.
]
{
Expand Down Expand Up @@ -369,7 +369,7 @@ PROTO Rosbot [
]
}
]
name "cover"
name "cover_link"
}
DEF FL_WHEEL_AXIS Pose {
translation 0.053 0.092 0.041
Expand Down Expand Up @@ -481,7 +481,7 @@ PROTO Rosbot [
]
}
]
name "front left wheel"
name "fl_wheel_link"
boundingObject DEF LEFT_WHEEL_CYLINDER Pose {
translation 0.000000 -0.011500 0.000000
rotation 1.000000 0.000000 0.000000 -1.570800
Expand Down Expand Up @@ -527,7 +527,7 @@ PROTO Rosbot [
]
}
]
name "front right wheel"
name "fr_wheel_link"
boundingObject DEF RIGHT_WHEEL_CYLINDER Pose {
translation 0.000000 0.011500 0.000000
rotation 1.000000 0.000000 0.000000 -1.570800
Expand Down Expand Up @@ -567,7 +567,7 @@ PROTO Rosbot [
]
}
]
name "rear left wheel"
name "rl_wheel_link"
boundingObject USE LEFT_WHEEL_CYLINDER
physics USE WHEEL_PHYSICS
}
Expand Down Expand Up @@ -601,15 +601,15 @@ PROTO Rosbot [
]
}
]
name "rear right wheel"
name "rr_wheel_link"
boundingObject USE RIGHT_WHEEL_CYLINDER
physics USE WHEEL_PHYSICS
}
}
Mpu-9250 {
translation 0.000000 0.000000 0.043000
rotation 0.000000 0.000000 1.000000 0.000000
name "imu"
name "imu_link"
includeInertialUnit TRUE
}
DEF DISTANCE_SENSORS Pose {
Expand Down
10 changes: 5 additions & 5 deletions projects/robots/husarion/rosbot_xl/protos/RosbotXl.proto
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ PROTO RosbotXl [
url "meshes/mecanum_b.dae"
}
]
name "front left wheel"
name "fl_wheel_link"
boundingObject DEF LEFT_WHEEL_CYLINDER Pose {
rotation 1 0 0 -1.5708
children [
Expand Down Expand Up @@ -136,7 +136,7 @@ PROTO RosbotXl [
]
}
]
name "front right wheel"
name "fr_wheel_link"
boundingObject DEF RIGHT_WHEEL_CYLINDER Pose {
rotation 1 0 0 -1.5708
children [
Expand Down Expand Up @@ -173,7 +173,7 @@ PROTO RosbotXl [
]
}
]
name "rear left wheel"
name "rl_wheel_link"
boundingObject DEF LEFT_WHEEL_CYLINDER Pose {
rotation 1 0 0 -1.5708
children [
Expand Down Expand Up @@ -211,7 +211,7 @@ PROTO RosbotXl [
]
}
]
name "rear right wheel"
name "rr_wheel_link"
boundingObject DEF RIGHT_WHEEL_CYLINDER Pose {
rotation 1 0 0 -1.5708
children [
Expand All @@ -228,7 +228,7 @@ PROTO RosbotXl [
Mpu-9250 {
translation -0.1369 -0.0419 0.037
rotation 1 0 0 3.14159
name "imu"
name "imu_link"
includeInertialUnit TRUE
}
]
Expand Down