Skip to content

Commit 3193e12

Browse files
authored
Merge pull request #3313 from JdeRobot/fix-obs-avoid-targets
Update db
2 parents c608c64 + 25118f5 commit 3193e12

File tree

2 files changed

+4
-3
lines changed
  • database/exercises
  • exercises/static/exercises/obstacle_avoidance/python_template/ros2_humble

2 files changed

+4
-3
lines changed

database/exercises/db.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ ADD GENERATED BY DEFAULT AS IDENTITY (
113113

114114
COPY public.exercises (id, exercise_id, name, description, tags, status, url) FROM stdin;
115115
1 follow_line Follow Line The goal of this exercise is to perform a PID reactive control capable of following the line painted on the racing circuit. ["ROS2","AUTONOMOUS DRIVING", "MULTILANGUAGE"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/AutonomousCars/follow_line/
116-
2 vacuum_cleaner Vacum Cleaner Vacuum Cleaner exercise using React and RAM ["ROS2", "MULTILANGUAGE"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/MobileRobots/vacuum_cleaner
116+
2 vacuum_cleaner Vacuum Cleaner Vacuum Cleaner exercise using React and RAM ["ROS2", "MULTILANGUAGE"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/MobileRobots/vacuum_cleaner
117117
3 autoparking Autoparking Autoparking exercise testing ["AUTONOMOUS DRIVING","SERVICE ROBOTS","ROS2"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/AutonomousCars/autoparking
118118
4 follow_person Follow Person Follow a person with kobuki robot ["ROS2"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/MobileRobots/follow_person
119119
5 vacuum_cleaner_loc Localized Vacuum Cleaner Localiized vauum clenaer ["ROS2", "MOBILE ROBOTS", "SERVICE ROBOTS"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/MobileRobots/vacuum_cleaner_loc
120120
6 global_navigation Global Navigation Global navigation exercise using REACT and RAM ["ROS2"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/AutonomousCars/global_navigation
121-
7 rescue_people Rescue People Rescue People exercise ["ROS2"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/Drones/rescue_people
121+
7 rescue_people Drone Rescue People Drone Rescue People exercise ["ROS2"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/Drones/rescue_people
122122
8 obstacle_avoidance Obstacle Avoidance Obstacle Avoidance exercise using React and RAM ["ROS2","AUTONOMOUS DRIVING"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/AutonomousCars/obstacle_avoidance
123123
9 3d_reconstruction 3D Reconstruction 3D Reconstruction exercise using React and RAM ["ROS2","COMPUTER VISION"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/ComputerVision/3d_reconstruction
124124
10 amazon_warehouse Amazon Warehouse Control an amazon-like robot to organize a warehouse ["ROS2"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/MobileRobots/amazon_warehouse
@@ -127,7 +127,7 @@ COPY public.exercises (id, exercise_id, name, description, tags, status, url) FR
127127
13 marker_visual_loc Marker Visual Loc Calculate the position of the robot based on the ["ROS2"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/ComputerVision/marker_visual_loc
128128
14 laser_mapping Laser Mapping Build a map based on sensor readings ["ROS2"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/MobileRobots/laser_mapping
129129
15 basic_computer_vision Basic Computer Vision Basic Computer Vision exercise using React and RAM ["ROS2"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/ComputerVision/basic_computer_vision
130-
16 follow_road Follow Road Follow Road exercise ["ROS2"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/Drones/follow_road
130+
16 follow_road Drone Follow Road Drone Follow Road exercise ["ROS2"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/Drones/follow_road
131131
17 pick_place Pick and Place Pick and Place exercise ["ROS2"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/IndustrialRobots/pick_place
132132
18 digit_classification Digit Classification Deep learning-based Digit Classification. ["Computer Vision","Deep Learning","Classification"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/ComputerVision/digit_classification
133133
19 human_detection Human Detection Deep learning-based human detection. ["Computer Vision","Deep Learning"] ACTIVE https://jderobot.github.io/RoboticsAcademy/exercises/ComputerVision/human_detection

exercises/static/exercises/obstacle_avoidance/python_template/ros2_humble/HAL.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
# Hardware Abstraction Layer
1010
IMG_WIDTH = 320
1111
IMG_HEIGHT = 240
12+
# {"name": "target10", "x": -47, "y": 45},
1213

1314

1415
# Mutes exceptions

0 commit comments

Comments
 (0)