Skip to content

Commit f461c38

Browse files
xxEoD2242xxEoD2242
committed
Update settings for multi-agent example
1 parent ec288ea commit f461c38

File tree

6 files changed

+305
-374
lines changed

6 files changed

+305
-374
lines changed

‎settings/DefaultSimulationSettings.json‎

Lines changed: 197 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,36 @@
11
{
22
"ID": 0,
33
"SimulationName": "example",
4-
"RunLength": 120.0,
4+
"RunLength": 140.0,
55
"Scenario": {
6-
"Name": "DataCollection",
6+
"Name": "Navigation",
77
"Options": {
8-
"MultiLevel": true,
8+
"MultiLevel": false,
99
"LevelNames": [
10-
"Home1"
11-
]
10+
"Level1"
11+
],
12+
"GoalPoint": {
13+
"Drone1": {
14+
"X": 40.0,
15+
"Y": 30.0,
16+
"Z": -3.0
17+
},
18+
"Drone2": {
19+
"X": -25.0,
20+
"Y": 0.0,
21+
"Z": -3.0
22+
}
23+
}
1224
}
1325
},
1426
"Environment": {
15-
"Name": "SWARMHome",
16-
"StartingLevelName": "Home1",
27+
"Name": "Blocks",
28+
"StartingLevelName": "Level1",
1729
"StreamVideo": true
1830
},
1931
"Data": {
2032
"VehicleState": {
2133
"Format": "SWARM"
22-
},
23-
"Video": {
24-
"Format": "MP4",
25-
"VideoName": "DemoVideo"
2634
}
2735
},
2836
"Agents": {
@@ -49,7 +57,7 @@
4957
"Controller": {
5058
"Name": "SWARMBase",
5159
"Gains": {
52-
"P": 0.45,
60+
"P": 0.6,
5361
"I": 0.0,
5462
"D": 0.05
5563
}
@@ -60,43 +68,210 @@
6068
"Z": 0.0
6169
},
6270
"SoftwareModules": {
63-
"HighLevelBehavior": {
71+
"Mapping": {
6472
"Algorithm": {
73+
"Parameters": {
74+
"Type": "OccupancyMap",
75+
"Center": {
76+
"X": 0.0,
77+
"Y": 0.0,
78+
"Z": 0.0
79+
},
80+
"Size": {
81+
"X": 100,
82+
"Y": 100,
83+
"Z": 20
84+
},
85+
"UpdateRate": 0.0,
86+
"ResolutionInMeters": 1.0
87+
},
88+
"ClassName": "SWARMOccupancyMap",
6589
"Level": 1,
90+
"InputArgs": [],
91+
"ReturnValues": [
92+
"OccupancyMap"
93+
]
94+
},
95+
"Publishes": [
96+
"OccupancyMap"
97+
],
98+
"Subscribes": []
99+
},
100+
"HighLevelPathPlanning": {
101+
"Algorithm": {
102+
"Level": 3,
66103
"States": [],
67104
"Parameters": {
68-
"completed_waypoint_distance": 2.0
105+
"goal_point": [
106+
40.0,
107+
30.0
108+
],
109+
"map_size": [
110+
100.0,
111+
100.0
112+
],
113+
"starting_point": [
114+
0.0,
115+
0.0
116+
],
117+
"resolution": 1.0,
118+
"agent_radius": 1.5,
119+
"flight_altitude": -3.0
69120
},
70-
"ClassName": "PathFollowing",
71-
"InputArgs": [],
121+
"InputArgs": [
122+
"OccupancyMap"
123+
],
124+
"ClassName": "AStar",
72125
"ReturnValues": [
73-
"Position",
74-
"Heading",
75-
"Speed"
126+
"Trajectory"
76127
]
77128
},
78129
"Publishes": [
79-
"MovementCommand"
130+
"Trajectory"
80131
],
81132
"Subscribes": [
133+
"OccupancyMap",
82134
"AgentState"
83135
]
84136
},
85-
"PathPlanning": {
137+
"LowLevelPathPlanning": {
86138
"Algorithm": {
87139
"Level": 1,
88140
"States": [],
89141
"Parameters": {},
142+
"InputArgs": [
143+
"MovementCommand"
144+
],
90145
"ClassName": "PassThroughPlanner",
146+
"ReturnValues": [
147+
"MovementCommand"
148+
]
149+
},
150+
"Publishes": [],
151+
"Subscribes": [
152+
"AgentState",
153+
"Trajectory"
154+
]
155+
}
156+
}
157+
},
158+
"Drone2": {
159+
"Vehicle": "Multirotor",
160+
"AutoPilot": "SWARM",
161+
"Sensors": {
162+
"Cameras": {
163+
"Camera1": {
164+
"X": 0.35,
165+
"Y": 0.0,
166+
"Z": 0.0,
167+
"Roll": 0.0,
168+
"Pitch": 0.0,
169+
"Yaw": 0.0,
170+
"Settings": {
171+
"Width": 640,
172+
"Height": 480,
173+
"FOV_Degrees": 90
174+
}
175+
}
176+
}
177+
},
178+
"Controller": {
179+
"Name": "SWARMBase",
180+
"Gains": {
181+
"P": 0.6,
182+
"I": 0.0,
183+
"D": 0.05
184+
}
185+
},
186+
"StartingPosition": {
187+
"X": -2.0,
188+
"Y": 2.0,
189+
"Z": 0.0
190+
},
191+
"SoftwareModules": {
192+
"Mapping": {
193+
"Algorithm": {
194+
"Parameters": {
195+
"Type": "OccupancyMap",
196+
"Center": {
197+
"X": 0.0,
198+
"Y": 0.0,
199+
"Z": 0.0
200+
},
201+
"Size": {
202+
"X": 100,
203+
"Y": 100,
204+
"Z": 20
205+
},
206+
"UpdateRate": 0.0,
207+
"ResolutionInMeters": 1.0
208+
},
209+
"ClassName": "SWARMOccupancyMap",
210+
"Level": 1,
91211
"InputArgs": [],
212+
"ReturnValues": [
213+
"OccupancyMap"
214+
]
215+
},
216+
"Publishes": [
217+
"OccupancyMap"
218+
],
219+
"Subscribes": []
220+
},
221+
"HighLevelPathPlanning": {
222+
"Algorithm": {
223+
"Level": 3,
224+
"States": [],
225+
"Parameters": {
226+
"goal_point": [
227+
-25.0,
228+
0.0
229+
],
230+
"map_size": [
231+
100.0,
232+
100.0
233+
],
234+
"starting_point": [
235+
0.0,
236+
0.0
237+
],
238+
"resolution": 1.0,
239+
"agent_radius": 1.5,
240+
"flight_altitude": -4.0
241+
},
242+
"InputArgs": [
243+
"OccupancyMap"
244+
],
245+
"ClassName": "AStar",
246+
"ReturnValues": [
247+
"Trajectory"
248+
]
249+
},
250+
"Publishes": [
251+
"Trajectory"
252+
],
253+
"Subscribes": [
254+
"OccupancyMap",
255+
"AgentState"
256+
]
257+
},
258+
"LowLevelPathPlanning": {
259+
"Algorithm": {
260+
"Level": 1,
261+
"States": [],
262+
"Parameters": {},
263+
"InputArgs": [
264+
"MovementCommand"
265+
],
266+
"ClassName": "PassThroughPlanner",
92267
"ReturnValues": [
93268
"MovementCommand"
94269
]
95270
},
96271
"Publishes": [],
97272
"Subscribes": [
98273
"AgentState",
99-
"MovementCommand"
274+
"Trajectory"
100275
]
101276
}
102277
}

‎settings/DefaultTrajectory.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Trajectory": {
3-
"Home1": [
3+
"Level1": [
44
{
55
"X": 0.0,
66
"Y": 0.0,

‎settings/SWARMHomeSimulationSettings.json‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
{
2+
"ID": 0,
3+
"SimulationName": "example",
4+
"RunLength": 120.0,
5+
"Scenario": {
6+
"Name": "DataCollection",
7+
"Options": {
8+
"MultiLevel": false,
9+
"LevelNames": [
10+
"Level1"
11+
]
12+
}
13+
},
14+
"Environment": {
15+
"Name": "Blocks",
16+
"StartingLevelName": "Level1",
17+
"StreamVideo": true
18+
},
19+
"Data": {
20+
"VehicleState": {
21+
"Format": "SWARM"
22+
},
23+
"Video": {
24+
"Format": "MP4",
25+
"VideoName": "DemoVideo"
26+
}
27+
},
28+
"Agents": {
29+
"Drone1": {
30+
"Vehicle": "Multirotor",
31+
"AutoPilot": "SWARM",
32+
"Sensors": {
33+
"Cameras": {
34+
"Camera1": {
35+
"X": 0.35,
36+
"Y": 0.0,
37+
"Z": 0.0,
38+
"Roll": 0.0,
39+
"Pitch": 0.0,
40+
"Yaw": 0.0,
41+
"Settings": {
42+
"Width": 640,
43+
"Height": 480,
44+
"FOV_Degrees": 90
45+
}
46+
}
47+
}
48+
},
49+
"Controller": {
50+
"Name": "SWARMBase",
51+
"Gains": {
52+
"P": 0.45,
53+
"I": 0.0,
54+
"D": 0.05
55+
}
56+
},
57+
"StartingPosition": {
58+
"X": 0.0,
59+
"Y": 0.0,
60+
"Z": 0.0
61+
},
62+
"SoftwareModules": {
63+
"HighLevelBehavior": {
64+
"Algorithm": {
65+
"Level": 1,
66+
"States": [],
67+
"Parameters": {
68+
"completed_waypoint_distance": 2.0
69+
},
70+
"ClassName": "PathFollowing",
71+
"InputArgs": [],
72+
"ReturnValues": [
73+
"Position",
74+
"Heading",
75+
"Speed"
76+
]
77+
},
78+
"Publishes": [
79+
"MovementCommand"
80+
],
81+
"Subscribes": [
82+
"AgentState"
83+
]
84+
},
85+
"LowLevelPathPlanning": {
86+
"Algorithm": {
87+
"Level": 1,
88+
"States": [],
89+
"Parameters": {},
90+
"ClassName": "PassThroughPlanner",
91+
"InputArgs": [],
92+
"ReturnValues": [
93+
"MovementCommand"
94+
]
95+
},
96+
"Publishes": [],
97+
"Subscribes": [
98+
"AgentState",
99+
"MovementCommand"
100+
]
101+
}
102+
}
103+
}
104+
}
105+
}

0 commit comments

Comments
 (0)