diff --git a/_pages/exercises.md b/_pages/exercises.md index d6a5c61dc..b754f13d9 100644 --- a/_pages/exercises.md +++ b/_pages/exercises.md @@ -261,6 +261,29 @@ feature_row: order: 2; version: "v3.2" + - image_path: /assets/images/exercises/amazon_warehouse/amazon_warehouse1_teaser.png + alt: "Amazon Warehouse" + title: "Amazon Warehouse (ROS2)" + excerpt: "Follow a Person using a real TurtleBot2 robot with Deep Learning" + url: "/exercises/MobileRobots/amazon_warehouse/" + btn_class: "btn--danger" + btn_label: "Go!" + version_label: "btn--success" + status: "running" + order: 2; + version: "v1.0" + + - image_path: /assets/images/exercises/follow_person/follow_person_teaser.png + alt: "Simulated Follow Person" + title: "Follow Person (ROS2)" + excerpt: "Follow a Person in a hospital gazebo world using Deep Learning" + url: "/exercises/MobileRobots/follow_person" + btn_class: "btn--danger" + btn_label: "Go!" + version_label: "btn--success" + status: "running" + order: 2; + - image_path: /assets/images/exercises/single_robot_amazon_warehouse/single_robot_amazon_warehouse_teaser.png alt: "Single Robot Amazon Warehouse (ROS2)" title: "Single Robot Amazon Warehouse (ROS2)" @@ -433,29 +456,6 @@ feature_row: order: 0; version: "v1.0" - - image_path: /assets/images/exercises/follow_person/follow_person_teaser.png - alt: "Simulated Follow Person" - title: "Follow Person (ROS2)" - excerpt: "Follow a Person in a hospital gazebo world using Deep Learning" - url: "/exercises/MobileRobots/follow_person" - btn_class: "btn--danger" - btn_label: "Go!" - version_label: "btn--success" - status: "prototype" - order: 2; - - - image_path: /assets/images/exercises/amazon_warehouse/amazon_warehouse1_teaser.png - alt: "Amazon Warehouse" - title: "Amazon Warehouse (ROS2)" - excerpt: "Follow a Person using a real TurtleBot2 robot with Deep Learning" - url: "/exercises/MobileRobots/amazon_warehouse/" - btn_class: "btn--danger" - btn_label: "Go!" - version_label: "btn--success" - status: "running" - order: 2; - version: "v1.0" - --- diff --git a/_pages/exercises/MobileRobots/follow_person.md b/_pages/exercises/MobileRobots/follow_person.md index 6f40c0f51..2d8383498 100644 --- a/_pages/exercises/MobileRobots/follow_person.md +++ b/_pages/exercises/MobileRobots/follow_person.md @@ -153,6 +153,14 @@ The robot that we will use is a Turtlebot2 (a circular mobile robot) implemented * `HAL.getBoundingBoxes()` - this method calls a detect() neural network's method to obtain a list of detected objets from an image passed as argument. * `GUI.showImage()` - to show an opencv image in the web template +## Laser attributes +`HAL.getLaserData()` returns an instance of a Class with the following attributes: +* `minAngle` - Start angle of the scan [rad] +* `maxAngle` - End angle of the scan [rad] +* `minRange` - minimum range value [m] +* `maxRange` - maximum range value [m] +* `values` - A list of 180 measurements [m] (Note: values < minRange or > maxRange should be discarded) + ### Bounding Box attributes `HAL.getBoundingBoxes()` returns an instance a list of Bounding Box Classes with the following attributes: * `id` - identifier of the type of object (1, 2, 3) diff --git a/_pages/exercises/MobileRobots/mobile_robots_section.md b/_pages/exercises/MobileRobots/mobile_robots_section.md index 11399ffeb..1f3f840c3 100644 --- a/_pages/exercises/MobileRobots/mobile_robots_section.md +++ b/_pages/exercises/MobileRobots/mobile_robots_section.md @@ -44,7 +44,18 @@ feature_row: status: "running" order: 2; version: "v1.0" - + + - image_path: /assets/images/exercises/follow_person/follow_person_teaser.png + alt: "Simulated Follow Person" + title: "Follow Person (ROS2)" + excerpt: "Follow a Person in a hospital gazebo world using Deep Learning" + url: "/exercises/MobileRobots/follow_person" + btn_class: "btn--danger" + btn_label: "Go!" + version_label: "btn--success" + status: "running" + order: 2; + - image_path: /assets/images/exercises/single_robot_amazon_warehouse/single_robot_amazon_warehouse_teaser.png alt: "Single Robot Amazon Warehouse (ROS2)" title: "Single Robot Amazon Warehouse (ROS2)" @@ -112,17 +123,6 @@ feature_row: status: "running" order: 0; version: "v3.2" - - - image_path: /assets/images/exercises/follow_person/follow_person_teaser.png - alt: "Simulated Follow Person" - title: "Follow Person (ROS2)" - excerpt: "Follow a Person in a hospital gazebo world using Deep Learning" - url: "/exercises/MobileRobots/follow_person" - btn_class: "btn--danger" - btn_label: "Go!" - version_label: "btn--success" - status: "prototype" - order: 2; - image_path: /assets/images/exercises/real_follow_person/real_follow_person_teaser.png alt: "Real Follow Person"