Skip to content

Commit 94b291e

Browse files
authored
Merge pull request #3342 from JdeRobot/Harmonic-vacuums
Harmonic vacuums
2 parents 4d57545 + 65de3a3 commit 94b291e

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

RoboticsInfrastructure

database/exercises/db.sql

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ COPY public.exercises (id, exercise_id, name, description, tags, status, url) FR
148148

149149

150150
COPY public.exercises_universes (id, exercise_id, universe_id, is_default) FROM stdin;
151-
1 2 1 False
152-
2 5 1 False
151+
1 2 1 True
152+
2 5 1 True
153153
3 6 2 True
154154
4 7 31 False
155155
5 10 4 False
@@ -158,7 +158,7 @@ COPY public.exercises_universes (id, exercise_id, universe_id, is_default) FROM
158158
8 4 7 False
159159
9 4 8 False
160160
10 3 9 False
161-
11 11 1 False
161+
11 11 1 True
162162
12 8 10 False
163163
13 9 12 False
164164
14 3 13 False
@@ -195,6 +195,9 @@ COPY public.exercises_universes (id, exercise_id, universe_id, is_default) FROM
195195
45 3 43 True
196196
46 27 44 True
197197
47 6 11 False
198+
48 2 45 False
199+
49 5 45 False
200+
50 11 45 False
198201
\.
199202
-- 30 16 3
200203

exercises/static/exercises/montecarlo_laser_loc/python_template/ros2_humble/WebGUI.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import math
33
import matplotlib.pyplot as plt
44

5-
from gui_interfaces.general.measuring_threading_gui import MeasuringThreadingGUI
5+
from gui_interfaces.general.measuring_threading_gui_harmonic import MeasuringThreadingGUI
66
from console_interfaces.general.console import start_console
77
from map import Map
88
from HAL import getPose3d

exercises/static/exercises/vacuum_cleaner/python_template/ros2_humble/WebGUI.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from rclpy.node import Node
55
from rclpy.executors import SingleThreadedExecutor
66
from nav_msgs.msg import Odometry
7-
from gui_interfaces.general.measuring_threading_gui import MeasuringThreadingGUI
7+
from gui_interfaces.general.measuring_threading_gui_harmonic import MeasuringThreadingGUI
88
from console_interfaces.general.console import start_console
99
from map import Map
1010

exercises/static/exercises/vacuum_cleaner_loc/python_template/ros2_humble/WebGUI.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import threading
66
from PIL import Image
77

8-
from gui_interfaces.general.measuring_threading_gui import MeasuringThreadingGUI
8+
from gui_interfaces.general.measuring_threading_gui_harmonic import MeasuringThreadingGUI
99
from console_interfaces.general.console import start_console
1010
from map import Map
1111
from HAL import getPose3d

0 commit comments

Comments
 (0)