Skip to content

Commit f0967d6

Browse files
Merging with s2025
2 parents 6cab339 + 103ea9f commit f0967d6

137 files changed

Lines changed: 14376 additions & 1057 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ cython_debug/
167167
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
168168
# and can be added to the global gitignore or merged into this file. For a more nuclear
169169
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
170-
#.idea/
170+
.idea/
171171

172172
# ZED run files
173173
**/*.run
@@ -178,8 +178,6 @@ setup/zed_sdk.run
178178
*.bag
179179

180180
cuda/
181-
homework/yolov8n.pt
182-
homework/yolo11n.pt
183181
GEMstack/knowledge/detection/yolov8n.pt
184182
GEMstack/knowledge/detection/yolo11n.pt
185183
yolov8n.pt

GEMstack/knowledge/calibration/gem_e2_gazebo.yaml

Lines changed: 0 additions & 59 deletions
This file was deleted.

GEMstack/knowledge/calibration/gem_e4_gazebo.yaml

Lines changed: 0 additions & 64 deletions
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# vehicle info
2+
vehicle:
3+
vehicle_dim: [1.7, 3.2] # in meter
4+
vehicle_turning_radius: 3.657
5+
# algorithm parameters
6+
reeds_shepp_parking:
7+
shift_from_center_to_rear_axis: 1.25 # in meter
8+
search_step_size: 0.1 # in meter
9+
closest: False # If True, the closest parking spot will be selected, otherwise the farthest one will be selected
10+
parking_lot_axis_shift_margin: 2.44 # in meter
11+
search_bound_threshold: 0.5
12+
clearance_step: 0.5
13+
clearance: 0
14+
add_static_vertical_curb_as_obstacle: True
15+
add_static_horizontal_curb_as_obstacle: True
16+
static_horizontal_curb_size: [2.44, 0.5]
17+
static_vertical_curb_size: [2.44, 24.9]
18+
compact_parking_spot_size: [2.44, 4.88] # US Compact Space for parking (2.44, 4.88)
19+
Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,7 @@
11
from ...utils.config import load_config_recursive
2-
import os,sys
3-
4-
5-
# Identify the vehicle used and load settings else default to vehicle config at current.yaml'
6-
# default currently uses GEM e4
7-
vehicle = "default"
8-
9-
for arg in sys.argv:
10-
if arg.startswith('--'):
11-
k,v = arg.split('=',1)
12-
k = k[2:]
13-
v = v.strip('"')
14-
if k == "vehicle":
15-
vehicle = v
16-
sys.argv.remove(arg)
17-
break
18-
19-
if(vehicle == 'e2'):
20-
vehicle_config = 'e2.yaml'
21-
elif(vehicle == 'e4'):
22-
vehicle_config = 'current.yaml'
23-
elif(vehicle == 'e2_gazebo'):
24-
vehicle_config = 'e2_gazebo.yaml'
25-
elif(vehicle == 'e4_gazebo'):
26-
vehicle_config = 'e4_gazebo.yaml'
27-
else:
28-
print("Unknown vehicle argument passed")
29-
vehicle = "default"
30-
vehicle_config = 'current.yaml'
31-
32-
SETTINGS_FILE = os.path.join(os.path.split(__file__)[0],vehicle_config)
2+
import os
3+
SETTINGS_FILE = os.path.join(os.path.split(__file__)[0],'current.yaml')
334
print("**************************************************************")
34-
print(f"Loading {vehicle} settings from",SETTINGS_FILE)
5+
print("Loading default settings from",SETTINGS_FILE)
356
print("**************************************************************")
367
SETTINGS = load_config_recursive(SETTINGS_FILE)

GEMstack/knowledge/defaults/computation_graph.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@ components:
4040
inputs: all
4141
- mission_execution:
4242
outputs: mission
43+
- mission_planning:
44+
inputs: all
45+
outputs: mission
4346
- route_planning:
44-
inputs: [vehicle, roadgraph, mission]
47+
inputs: all
4548
outputs: route
4649
- driving_logic:
4750
inputs:

GEMstack/knowledge/defaults/e2_gazebo.yaml

Lines changed: 0 additions & 34 deletions
This file was deleted.

GEMstack/knowledge/defaults/e4_gazebo.yaml

Lines changed: 0 additions & 34 deletions
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# arguments for BiRRT* algorithm
2+
# map parameters
3+
map:
4+
lower_x: -15
5+
upper_x: 40
6+
lower_y: -10
7+
upper_y: 30
8+
grid_resolution: 10 # grids per meter for occupency grid
9+
lane_boundary_radius: 0.2 # radius in meter for determining the size of the lane boundary in occupency grid
10+
obstacle_radius: 0.2 # radius in meter for determining the size of the obstacle in occupency grid
11+
# vehicle info
12+
vehicle:
13+
heading_limit: 0.5235987756 # vehicle heading difference limit per rrt step_size (pi/6 in radians)
14+
half_width: 0.8 # vehicle half width in meter
15+
# algorithm parameters
16+
rrt:
17+
time_limit: 10 # in sec
18+
step_size: 0.5 # length in meter for local planner to explore
19+
search_r: 1.4 # radius in meter for rewiring
-6.25 MB
Binary file not shown.

0 commit comments

Comments
 (0)