Skip to content

GitLab

Merged
Created by Trishna Saeharaseelan@trishnaOwner

Resolve "Remove unused and irrelevant fields from mission plan message + add timeout"

All threads resolved
Compare
and
10 files
+ 34
- 98
exam‎ples‎
autonomy_en‎gine_adapter‎
mission_pl‎an_AH1.json‎ +4 -8
mission_plan‎_ECOSUB.json‎ +4 -8
planning_conf‎iguration.json‎ +0 -4
ecosub_‎adapter‎
mission_‎plan.json‎ +4 -8
gui_a‎dapter‎
planning_conf‎iguration.json‎ +0 -4
for‎mats‎
mission‎_plan.py‎ +5 -11
planning_con‎figuration.py‎ +0 -6
projec‎t/soar‎
swagge‎r.json‎ +6 -16
tests/f‎ixtures‎
schem‎as.py‎ +5 -17
swagge‎r.json‎ +6 -16
examples/autonomy_engine_adapter/mission_plan_AH1.json
+ 4
- 8
Show all unchanged lines Show 20 lines
"plan": [
{
"action": "move",
"flight_style": "go to waypoint",
"start_point_latitude": -3.007143188645706,
"start_point_longitude": 50.37072283932642,
"target_waypoint_latitude": -3.237143188645706,
"target_waypoint_longitude": 52.37072283932642,
"depth": 0.0,
"activate_payload": false,
"send_environmental_data": false
"timeout": 200
},
{
"action": "dive",
"flight_style": "dive to depth",
"start_point_latitude": -3.237143188645706,
"start_point_longitude": 52.37072283932642,
"target_waypoint_latitude": -3.337143188645706,
"target_waypoint_longitude": 56.37072283932642,
"altitude": 10,
"activate_payload": false,
"send_environmental_data": false
"timeout": 200
},
{
"action": "scanline",
"flight_style": "go to waypoint",
"start_point_latitude": -3.337143188645706,
"start_point_longitude": 56.37072283932642,
"target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 60.00000000000000,
"altitude": 10,
"activate_payload": true,
"send_environmental_data": false
"timeout": 200
},
{
"action": "climb",
"flight_style": "go to surface",
"start_point_latitude": -0.237143188645706,
"start_point_longitude": 60.00000000000000,
"target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 52.37072283932642,
"depth": 0.0,
"activate_payload": false,
"send_environmental_data": true
"timeout": 200
}
]
}
Show 20 lines Show all unchanged lines
examples/autonomy_engine_adapter/mission_plan_ECOSUB.json
+ 4
- 8
Show all unchanged lines Show 20 lines
"plan": [
{
"action": "move",
"flight_style": "go to waypoint",
"start_point_latitude": -3.007143188645706,
"start_point_longitude": 50.37072283932642,
"target_waypoint_latitude": -3.237143188645706,
"target_waypoint_longitude": 52.37072283932642,
"depth": 0.0,
"activate_payload": false,
"send_environmental_data": false
"timeout": 300
},
{
"action": "dive",
"flight_style": "dive to depth",
"start_point_latitude": -3.237143188645706,
"start_point_longitude": 52.37072283932642,
"target_waypoint_latitude": -3.337143188645706,
"target_waypoint_longitude": 56.37072283932642,
"altitude": 10,
"activate_payload": false,
"send_environmental_data": false
"timeout": 300
},
{
"action": "scanline",
"flight_style": "go to waypoint",
"start_point_latitude": -3.337143188645706,
"start_point_longitude": 56.37072283932642,
"target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 60.00000000000000,
"altitude": 10,
"activate_payload": true,
"send_environmental_data": false
"timeout": 300
},
{
"action": "climb",
"flight_style": "go to surface",
"start_point_latitude": -0.237143188645706,
"start_point_longitude": 60.00000000000000,
"target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 52.37072283932642,
"depth": 0.0,
"activate_payload": false,
"send_environmental_data": true
"timeout": 300
}
]
}
Show 20 lines Show all unchanged lines
examples/autonomy_engine_adapter/planning_configuration.json
+ 0
- 4
Show all unchanged lines Show 20 lines
{
"model": "reav",
"platform_ID": "reav-60-1",
"serial": "reav-60",
"emergency": {
"additional_data": {},
"target_waypoint_latitude": -7.432,
Show 20 lines Show all unchanged lines Show 20 lines
"platforms": [
{
"platform_ID": "ecosub-1",
"serial": "ecosub-2",
"model": "ecosub",
"emergency": {
"additional_data": {},
Show 20 lines Show all unchanged lines Show 20 lines
},
{
"platform_ID": "ecosub-2",
"serial": "ecosubxyz-5",
"model": "ecosub",
"emergency": {
"additional_data": {},
Show 20 lines Show all unchanged lines Show 20 lines
"platforms": [
{
"platform_ID": "ah-1",
"serial": "autosubhover-1",
"model": "autosub",
"emergency": {
"additional_data": {},
Show 20 lines Show all unchanged lines
examples/ecosub_adapter/mission_plan.json
+ 4
- 8
Show all unchanged lines Show 20 lines
"plan": [
{
"action": "move",
"flight_style": "go to waypoint",
"start_point_latitude": -3.007143188645706,
"start_point_longitude": 50.37072283932642,
"target_waypoint_latitude": -3.237143188645706,
"target_waypoint_longitude": 52.37072283932642,
"depth": 0.0,
"activate_payload": false,
"send_environmental_data": false
"timeout": 300
},
{
"action": "dive",
"flight_style": "dive to depth",
"start_point_latitude": -3.237143188645706,
"start_point_longitude": 52.37072283932642,
"target_waypoint_latitude": -3.337143188645706,
"target_waypoint_longitude": 56.37072283932642,
"altitude": 10,
"activate_payload": false,
"send_environmental_data": false
"timeout": 300
},
{
"action": "scanline",
"flight_style": "go to waypoint",
"start_point_latitude": -3.337143188645706,
"start_point_longitude": 56.37072283932642,
"target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 60.00000000000000,
"altitude": 10,
"activate_payload": true,
"send_environmental_data": false
"timeout": 300
},
{
"action": "climb",
"flight_style": "go to surface",
"start_point_latitude": -0.237143188645706,
"start_point_longitude": 60.00000000000000,
"target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 52.37072283932642,
"depth": 0.0,
"activate_payload": false,
"send_environmental_data": true
"timeout": 300
}
]
}
Show 20 lines Show all unchanged lines
examples/gui_adapter/planning_configuration.json
+ 0
- 4