Skip to content

rwc2024 #120

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 69 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
3ac3876
feat(rwc2024): Add walls
ar13pit Jul 15, 2024
3542d66
feat(rwc2024): Update walls
ar13pit Jul 15, 2024
fe5c5d2
[rwc2024/walls] fix naming
MatthijsBurgh Jul 15, 2024
96a3bfe
[rwc2024] add model
MatthijsBurgh Jul 15, 2024
4c150c9
feat(rwc2024): Update walls
ar13pit Jul 15, 2024
b580c38
[rwc2024] correct model name
MatthijsBurgh Jul 15, 2024
8bbe1c9
[rwc2024] rips waypoints
MatthijsBurgh Jul 15, 2024
2233352
[rwc2024/shelf] new model
MatthijsBurgh Jul 15, 2024
c51ab92
[rwc2024] add shelf
MatthijsBurgh Jul 15, 2024
c71ccdc
(rwc_2024) object models (lamp + trashbin)
lottemessing Jul 15, 2024
d336c00
created dishwasher
IasonTheodorou Jul 15, 2024
c76d278
created kitchen_counter for word model
IasonTheodorou Jul 15, 2024
960da5a
(rwc_2024) furniture models (coffee_table, desk, trashbin)
lottemessing Jul 15, 2024
e9e84bd
Merge branch 'rwc2024' of roboticssrv.local:tue-robotics/ed_object_mo…
lottemessing Jul 15, 2024
d45a785
[rwc2024/tv_table] new model
MatthijsBurgh Jul 15, 2024
f86bacf
[rwc2024/kitchen_cabinet] new model
MatthijsBurgh Jul 15, 2024
0ae453a
created dinner_table for word model
IasonTheodorou Jul 15, 2024
479814f
removed cm objects and created dishwasher for word model
IasonTheodorou Jul 15, 2024
88e20e4
Add coat_hanger to world_model
GustavoDCC Jul 15, 2024
d70a1bd
created dinner_table for word model
IasonTheodorou Jul 15, 2024
5fafacd
created kitchen_counter for word model
IasonTheodorou Jul 15, 2024
5652a58
[rwc2024/couch] new model
MatthijsBurgh Jul 15, 2024
04f683b
[rwc2024/hallway_cabinet] new model
MatthijsBurgh Jul 15, 2024
0687fb2
(rwc_2024) added furniture models in world model
lottemessing Jul 15, 2024
aec2986
[rwc2024/chair] new model
MatthijsBurgh Jul 15, 2024
12f843b
cretaed word model for the kitchen room
IasonTheodorou Jul 15, 2024
dfa7e3a
[rwc2024] cleanup
MatthijsBurgh Jul 15, 2024
4e3ad4b
[rwc2024] add kitchen_cabinet
MatthijsBurgh Jul 15, 2024
5c39fd9
[rwc2024] add hallway_cabinet; first guess
MatthijsBurgh Jul 15, 2024
1c39b39
[rwc2024] move hallway_cabinet
MatthijsBurgh Jul 16, 2024
ae3ae21
[rwc2024] rotate dinner_table, better for storing groceries
MatthijsBurgh Jul 16, 2024
2c5beed
(rwc2024) Add couch and tv_table to world_model
GustavoDCC Jul 16, 2024
f442725
(rwc2024) Add lounge_chair to world_model
GustavoDCC Jul 16, 2024
d5acd52
(rwc2024) Rename file according to github
GustavoDCC Jul 16, 2024
1ce2daa
[rwc2024] Add initial_point_receptionist
GustavoDCC Jul 16, 2024
37c9bdb
[4rwc2024/dishwasher] remove stupid shit
MatthijsBurgh Jul 16, 2024
925d9ef
[rwc2024] add rooms
MatthijsBurgh Jul 16, 2024
b759cc0
[rwc2024] Add entrance and living_room waypoint
GustavoDCC Jul 16, 2024
02dba30
[rwc2024] update kitchen_cabinet pose
MatthijsBurgh Jul 16, 2024
8f0e087
[rwc2024/kitchen_cabinet] bigger col for shelves
MatthijsBurgh Jul 16, 2024
8e7c6d2
feat(rwc2024): Add light in simulation
ar13pit Jul 16, 2024
cd7593e
feat(rwc2024): Add gpsr instruction pose
ar13pit Jul 16, 2024
54ed09e
[rwc2024/couch] update volumes
MatthijsBurgh Jul 16, 2024
de2645d
[rwc2024/kitchen_cabinet] smaller in_front_of
MatthijsBurgh Jul 16, 2024
228f779
[rwc2024] move kitchen_table
MatthijsBurgh Jul 16, 2024
1fb4484
[rwc2024] move kitchen_cabinet 1cm
MatthijsBurgh Jul 16, 2024
7389dd1
(receptionist) Fix on_top_of couch
GustavoDCC Jul 17, 2024
24e78e1
[rwc2024/dinner_table] increase size
MatthijsBurgh Jul 17, 2024
0732a34
(rwc2024_challenge_serve_breakfast) added waypoints for challenge
lottemessing Jul 18, 2024
a286461
[rwc2024 stickler for the rules] Add initial pose and forbidden room
GustavoDCC Jul 18, 2024
9c904db
floor -> ground plane
MatthijsBurgh Jul 18, 2024
c20d9cb
dishwasher added new markings for the robot
IasonTheodorou Jul 18, 2024
5e256fa
adad
MatthijsBurgh Jul 19, 2024
e20a92e
[rwc2024 stickler for the rules] Fix forbidden room waypoint
GustavoDCC Jul 19, 2024
5f26cf6
[rwc2024 stickler for the rules] Add 15cm floor to rooms in world_model
GustavoDCC Jul 19, 2024
579eda8
[rwc2024 stickler for the rules] Add part to floor living_room in wor…
GustavoDCC Jul 19, 2024
a0b961c
[rwc2024] update on_top_of of rooms
MatthijsBurgh Jul 19, 2024
06a83d8
[rwc2024] increase height of room on_top_of
MatthijsBurgh Jul 19, 2024
e4d3749
[rwc2024] add on_top_of_nav livingroom
MatthijsBurgh Jul 20, 2024
abef475
[rwc2024 stickler for the rules]Add living_room navigation
GustavoDCC Jul 20, 2024
e6c8f47
[rwc2024] fix volume names
MatthijsBurgh Jul 20, 2024
dd96ef8
[rwc2024 Stickler for the rules] Add 3 navigation volumens in living_…
GustavoDCC Jul 20, 2024
95adb77
[rwc2024 Stickler for the rules]Add kitchen 2 nav
GustavoDCC Jul 20, 2024
8a927c3
[rwc2024] better room inspection
MatthijsBurgh Jul 20, 2024
c3d6c54
[rwc2024] better room inspection hallway
MatthijsBurgh Jul 20, 2024
4b5ba9d
[rwc2024] raise volumes 1cm
MatthijsBurgh Jul 20, 2024
511448c
[rwc2024] hack hallway
MatthijsBurgh Jul 20, 2024
e8c5aeb
[rwc2024] hack hallway
MatthijsBurgh Jul 20, 2024
08748a4
[rwc2024] move forbidden
MatthijsBurgh Jul 20, 2024
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
2 changes: 1 addition & 1 deletion models/cover/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>0.0 0.0 0 0 0 0</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/ddw/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>-0.4 -1.3 0 0 0 0</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/empty/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<physics type="ode">
<real_time_update_rate>333.0</real_time_update_rate>
Expand Down
2 changes: 1 addition & 1 deletion models/impuls/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>1.882 -0.24 0 0 0 1.57079632679</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/learn_objects/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>0 -1 0 0 0 1.57</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/perception_learning/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<include>
<pose>0 0 0.74 0 0 0</pose>
<name>infinite_table</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<physics type="ode">
<real_time_update_rate>333.0</real_time_update_rate>
Expand Down
2 changes: 1 addition & 1 deletion models/rein_experiment/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<physics type="ode">
<real_time_update_rate>333.0</real_time_update_rate>
Expand Down
2 changes: 1 addition & 1 deletion models/rgo2015/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>1.555 1.775 0 0 0 0</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/rgo2015_final/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>1.555 1.775 0 0 0 0</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/rgo2017/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>0 0 0 0 0 0</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/rgo2018/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>0 0 0 0 0 0</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/rgo2019/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>0 0 0 0 0 0</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/robotics_testlab_B/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>4.05 2 0 0 0 0</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/robotics_testlabs/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>1.32 5.3 0 0 0 0</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/robotics_testlabs/r5cop/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<physics type="ode">
<real_time_update_rate>333.0</real_time_update_rate>
Expand Down
2 changes: 1 addition & 1 deletion models/robotics_testlabs_empty/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<physics type="ode">
<real_time_update_rate>333.0</real_time_update_rate>
Expand Down
2 changes: 1 addition & 1 deletion models/rosebv/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>3 0 0 0 0 0</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/rpo2023/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<name>bed</name>
Expand Down
2 changes: 1 addition & 1 deletion models/rwc2013/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>3.105 -6.331 0 0 0 0</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/rwc2015/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>0.925 -4.74 0 0 0 0</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/rwc2015_empty/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<physics type="ode">
<real_time_update_rate>333.0</real_time_update_rate>
Expand Down
2 changes: 1 addition & 1 deletion models/rwc2016a/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>0 0 0 0 0 0</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/rwc2016b/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>0 0 0 0 0 0</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/rwc2017/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>5.075 -4.93 0.0 0 0 0.0</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/rwc2018/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>0 0 0 0 0 0</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/rwc2019/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>0 0 0 0 0 0</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/rwc2022/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>
<include>
<pose>5.61 6.12 0 0 0 0</pose>
Expand Down
2 changes: 1 addition & 1 deletion models/rwc2023/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<include>
<pose>0 0 0 0 0 0</pose>
<name>floor</name>
<uri>model://floor</uri>
<uri>model://ground_plane</uri>
</include>

<!-- bedroom -->
Expand Down
11 changes: 11 additions & 0 deletions models/rwc2024/coat_hanger/model.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" ?>
<model>
<name>rwc2024/coat_hanger</name>
<version>1.0</version>
<sdf version="1.6">model.sdf</sdf>
<author>
<name>AMIGO</name>
<email>[email protected]</email>
</author>
<description>rwc2024/coat_hanger</description>
</model>
41 changes: 41 additions & 0 deletions models/rwc2024/coat_hanger/model.sdf
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0"?>
<sdf version="1.6">
<model name="rwc2024/coat_hanger">
<link name="1_link">
<collision name="1_col">
<geometry>
<box>
<size>0.47 0.47 0.52</size>
</box>
</geometry>
</collision>
<visual name="1_vis">
<geometry>
<box>
<size>0.47 0.47 0.52</size>
</box>
</geometry>
</visual>
<pose>0.0 0.0 0.26 0 0 0</pose>
</link>
<link name="2_link">
<collision name="2_col">
<geometry>
<cylinder>
<radius>0.045</radius>
<length>1.86</length>
</cylinder>
</geometry>
</collision>
<visual name="2_vis">
<geometry>
<cylinder>
<radius>0.045</radius>
<length>1.86</length>
</cylinder>
</geometry>
</visual>
<pose>0.0 0.0 0.93 0 0 0</pose>
</link>
</model>
</sdf>
11 changes: 11 additions & 0 deletions models/rwc2024/coffee_table/model.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" ?>
<model>
<name>rwc2024/coffee_table</name>
<version>1.0</version>
<sdf version="1.6">model.sdf</sdf>
<author>
<name>AMIGO</name>
<email>[email protected]</email>
</author>
<description>rwc2024/coffee_table</description>
</model>
50 changes: 50 additions & 0 deletions models/rwc2024/coffee_table/model.sdf
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?xml version="1.0" ?>
<sdf version="1.6">
<model name="rwc2024/coffee_table">
<static>true</static>
<link name="1_link">
<collision name="1_col">
<geometry>
<cylinder>
<radius>0.45</radius>
<length>0.08</length>
</cylinder>
</geometry>
</collision>
<visual name="1_vis">
<geometry>
<cylinder>
<radius>0.45</radius>
<length>0.08</length>
</cylinder>
</geometry>
</visual>
<pose>0.0 0.0 0.45 0 0 0</pose>
</link>
<link name="on_top_of">
<virtual_volume name="on_top_of_vv">
<geometry>
<cylinder>
<length>0.25</length>
<radius>0.44</radius>
</cylinder>
</geometry>
</virtual_volume>
<pose>0 0 0.575 0 0 0</pose>
</link>
<link name="in_front_of">
<virtual_volume name="in_front_of_vv">
<geometry>
<box>
<size>0.2 0.35 0.01</size>
</box>
</geometry>
</virtual_volume>
<pose>-0.9 0. 0.005 0 0 0</pose>
</link>
<static>true</static>



</model>
</sdf>
11 changes: 11 additions & 0 deletions models/rwc2024/couch/model.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" ?>
<model>
<name>rwc2024/couch</name>
<version>1.0</version>
<sdf version="1.6">model.sdf</sdf>
<author>
<name>AMIGO</name>
<email>[email protected]</email>
</author>
<description>rwc2024/couch</description>
</model>
Loading