Skip to content

Commit 08631c4

Browse files
committed
Merge remote-tracking branch 'origin/teamb_planning' into teamB_control_planning
2 parents d5ef999 + 3c126f4 commit 08631c4

18 files changed

Lines changed: 1030 additions & 113 deletions

.gitignore

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,14 @@ cython_debug/
166166
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
167167
#.idea/
168168

169+
# ZED run files
170+
**/*.run
169171
.vscode/
170172
setup/zed_sdk.run
171-
cuda/
173+
cuda/
174+
homework/yolov8n.pt
175+
homework/yolo11n.pt
176+
GEMstack/knowledge/detection/yolov8n.pt
177+
GEMstack/knowledge/detection/yolo11n.pt
178+
yolov8n.pt
179+
yolo11n.pt

GEMstack/knowledge/routes/forward_15m.csv

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
0.0,0,0
2-
1.0,0,0
3-
2.0,0,0
4-
3.0,0,0
1+
0,0,0
2+
1,0,0
3+
2,0,0
4+
3,0,0
55
4,0,0
66
5,0,0
77
6,0,0
@@ -14,3 +14,48 @@
1414
13,0,0
1515
14,0,0
1616
15,0,0
17+
16,0,0
18+
17,0,0
19+
18,0,0
20+
19,0,0
21+
20,0,0
22+
21,0,0
23+
22,0,0
24+
23,0,0
25+
24,0,0
26+
25,0,0
27+
26,0,0
28+
27,0,0
29+
28,0,0
30+
29,0,0
31+
30,0,0
32+
31,0,0
33+
32,0,0
34+
33,0,0
35+
34,0,0
36+
35,0,0
37+
36,0,0
38+
37,0,0
39+
38,0,0
40+
39,0,0
41+
40,0,0
42+
41,0,0
43+
42,0,0
44+
43,0,0
45+
44,0,0
46+
45,0,0
47+
46,0,0
48+
47,0,0
49+
48,0,0
50+
49,0,0
51+
50,0,0
52+
51,0,0
53+
52,0,0
54+
53,0,0
55+
54,0,0
56+
55,0,0
57+
56,0,0
58+
57,0,0
59+
58,0,0
60+
59,0,0
61+
60,0,0

homework/pedestrian_detection.py renamed to GEMstack/onboard/perception/pedestrian_detection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,4 @@ def update(self, vehicle : VehicleState) -> Dict[str,AgentState]:
8181
if t >= times[0] and t <= times[1]:
8282
res['pedestrian0'] = box_to_fake_agent((0,0,0,0))
8383
print("Detected a pedestrian")
84-
return res
84+
return res

0 commit comments

Comments
 (0)