Merge pull request #3343 from JdeRobot/harmonic-3d

Harmonic 3d

Author: javizqh

RoboticsInfrastructure

@@ -160,7 +160,7 @@ COPY public.exercises_universes (id, exercise_id, universe_id, is_default) FROM
 10	3	9	False
 11	11	1	True
 12	8	10	False
-13	9	12	False
+13	9	12	True
 14	3	13	False
 15	3	14	False
 16	3	15	False
@@ -198,6 +198,7 @@ COPY public.exercises_universes (id, exercise_id, universe_id, is_default) FROM
 48	2	45	False
 49	5	45	False
 50	11	45	False
+51	9	46	False
 \.
 -- 30  16  3
 

database/exercises/db.sql

@@ -4,24 +4,24 @@
 
 | Exercise ID | Python simpleAPI | Python ROS2 | C++ simpleAPI | C++ ROS2 | Simulator | Notes |
 | --- | --- | --- | --- | --- | --- | --- |
-| Basic Vacuum Cleaner | ok | ok | ok | ok | Gazebo Harmonic | FSM | 
+| Basic Vacuum Cleaner | ok | ok | ok | ok | Gazebo Harmonic + Classic | FSM | 
 | Follow Line | ok | ok | ok | ok | Gazebo11 | PID control |
-| Obstacle Avoidance | ok | | | | Gazebo Harmonic | VFF |
-| Global navigation | ok | | | | Gazebo 11 | GPP |
+| Obstacle Avoidance | ok | | | | Gazebo Harmonic + Classic  | VFF |
+| Global navigation | ok | | | | Gazebo Harmonic + Classic | GPP |
 | Laser Gridmap mapping | ok | | | | Gazebo Harmonic | |
-| MonteCarlo Laser Loc | ok | | | | Gazebo Harmonic | AMCL |
+| MonteCarlo Laser Loc | ok | | | | Gazebo Harmonic + Classic  | AMCL |
 | MonteCarlo Visual Loc | ok | | | | Gazebo 11 | AMCL |
 | Marker-based visual Loc | ok | | | | Gazebo Harmonic | PnP | 
-| Localized Vacuum Cleaner | ok | | | | Gazebo Harmonic | BSA | 
-| Autoparking | ok | | | | Gazebo Harmonic | | 
-| Autoparking Lidar | ok | | | | Gazebo Harmonic | | 
+| Localized Vacuum Cleaner | ok | | | | Gazebo Harmonic + Classic  | BSA | 
+| Autoparking | ok | | | | Gazebo Harmonic + Classic  | | 
+| Autoparking Lidar | ok | | | | Gazebo Harmonic + Classic  | | 
 | Amazon Warehouse | ok | | | | Gazebo 11 | | 
 | Follow Person | ok | | | | Gazebo 11 | | 
 | Drone Follow Road | ok | | | | Gazebo Harmonic | |
 | Drone Rescue people | ok | | | | Gazebo Harmonic | |
 | Drone Gymkhana | ok | | | | Gazebo Harmonic | |
 | Drone Power tower Inspection | ok | | | | Gazebo Harmonic | |
-| Visual 3D reconstruction | ok | | | | Gazebo 11 | |
+| Visual 3D reconstruction | ok | | | | Gazebo Harmonic + Classic | |
 | DL e2e Visual control | ok | | | | Gazebo 11 | | 
 | DL digit classification | ok | | | | none | |
 | DL human detection | ok | | | | none | |

docs/exercise-status.md

@@ -4,7 +4,7 @@
 import threading
 import numpy as np
 
-from gui_interfaces.general.measuring_threading_gui import MeasuringThreadingGUI
+from gui_interfaces.general.measuring_threading_gui_harmonic import MeasuringThreadingGUI
 from console_interfaces.general.console import start_console