diff --git a/examples/autonomy_engine_adapter/mission_plan_AH1.json b/examples/autonomy_engine_adapter/mission_plan_AH1.json index 7a62cda6c3b8e3247841fd943dfd7bc29ea9d275..ee9f69eaff389bb8712a6ef2c14f5dc4f42a879d 100644 --- a/examples/autonomy_engine_adapter/mission_plan_AH1.json +++ b/examples/autonomy_engine_adapter/mission_plan_AH1.json @@ -21,7 +21,8 @@ "target_waypoint_latitude": -3.237143188645706, "target_waypoint_longitude": 52.37072283932642, "depth": 0.0, - "activate_payload": false + "activate_payload": false, + "timeout": 200 }, { "action": "dive", @@ -31,7 +32,8 @@ "target_waypoint_latitude": -3.337143188645706, "target_waypoint_longitude": 56.37072283932642, "altitude": 10, - "activate_payload": false + "activate_payload": false, + "timeout": 200 }, { "action": "scanline", @@ -41,7 +43,8 @@ "target_waypoint_latitude": -0.237143188645706, "target_waypoint_longitude": 60.00000000000000, "altitude": 10, - "activate_payload": true + "activate_payload": true, + "timeout": 200 }, { "action": "climb", @@ -51,7 +54,8 @@ "target_waypoint_latitude": -0.237143188645706, "target_waypoint_longitude": 52.37072283932642, "depth": 0.0, - "activate_payload": false + "activate_payload": false, + "timeout": 200 } ] } diff --git a/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json b/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json index 1e48c9cb9f67db22781bf12066c5adc4944badae..baca610303aeb5d035c2171b77cef7bc99789a62 100644 --- a/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json +++ b/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json @@ -20,7 +20,8 @@ "target_waypoint_latitude": -3.237143188645706, "target_waypoint_longitude": 52.37072283932642, "depth": 0.0, - "activate_payload": false + "activate_payload": false, + "timeout": 300 }, { "action": "dive", @@ -29,7 +30,8 @@ "target_waypoint_latitude": -3.337143188645706, "target_waypoint_longitude": 56.37072283932642, "altitude": 10, - "activate_payload": false + "activate_payload": false, + "timeout": 300 }, { "action": "scanline", @@ -38,7 +40,8 @@ "target_waypoint_latitude": -0.237143188645706, "target_waypoint_longitude": 60.00000000000000, "altitude": 10, - "activate_payload": true + "activate_payload": true, + "timeout": 300 }, { "action": "climb", @@ -47,7 +50,8 @@ "target_waypoint_latitude": -0.237143188645706, "target_waypoint_longitude": 52.37072283932642, "depth": 0.0, - "activate_payload": false + "activate_payload": false, + "timeout": 300 } ] } diff --git a/examples/ecosub_adapter/mission_plan.json b/examples/ecosub_adapter/mission_plan.json index 1e48c9cb9f67db22781bf12066c5adc4944badae..baca610303aeb5d035c2171b77cef7bc99789a62 100644 --- a/examples/ecosub_adapter/mission_plan.json +++ b/examples/ecosub_adapter/mission_plan.json @@ -20,7 +20,8 @@ "target_waypoint_latitude": -3.237143188645706, "target_waypoint_longitude": 52.37072283932642, "depth": 0.0, - "activate_payload": false + "activate_payload": false, + "timeout": 300 }, { "action": "dive", @@ -29,7 +30,8 @@ "target_waypoint_latitude": -3.337143188645706, "target_waypoint_longitude": 56.37072283932642, "altitude": 10, - "activate_payload": false + "activate_payload": false, + "timeout": 300 }, { "action": "scanline", @@ -38,7 +40,8 @@ "target_waypoint_latitude": -0.237143188645706, "target_waypoint_longitude": 60.00000000000000, "altitude": 10, - "activate_payload": true + "activate_payload": true, + "timeout": 300 }, { "action": "climb", @@ -47,7 +50,8 @@ "target_waypoint_latitude": -0.237143188645706, "target_waypoint_longitude": 52.37072283932642, "depth": 0.0, - "activate_payload": false + "activate_payload": false, + "timeout": 300 } ] } diff --git a/formats/mission_plan.py b/formats/mission_plan.py index 1b8290d107d2eea78ac0019823d0a93a15074bdf..4a97375a42b304a73a026bc9de8a4add7b5e0fcd 100644 --- a/formats/mission_plan.py +++ b/formats/mission_plan.py @@ -55,6 +55,12 @@ action_schema = { + "Hover-1 --> `MBES` sensor and for EcoSUB --> `Sidescan`", "example": True, }, + "timeout": { + "type": "number", + "format": "float", + "description": "Timeout set to perform action", + "example": 1800.0, + }, }, "required": [ "target_waypoint_latitude", diff --git a/project/soar/swagger.json b/project/soar/swagger.json index 0de8b7ddfb867b813134ccb3762bdc2ef8fff8b5..e9fc054658bbb32cdca339a3a6c79eedf69aa1f9 100644 --- a/project/soar/swagger.json +++ b/project/soar/swagger.json @@ -124,6 +124,12 @@ "example":true, "type":"boolean" }, + "timeout": { + "description": "Timeout set to perform action", + "example": 1800.0, + "format": "float", + "type": "number" + }, "altitude":{ "description":"Altitude of next action", "example":15.0, diff --git a/tests/fixtures/schemas.py b/tests/fixtures/schemas.py index 53406b83eb01f79e8bbd5fae56abc14b6e85a79c..7ddf3c1f519af52df78499519ee447a52531ef55 100644 --- a/tests/fixtures/schemas.py +++ b/tests/fixtures/schemas.py @@ -133,6 +133,12 @@ action_schema = { + "Hover-1 --> `MBES` sensor and for EcoSUB --> `Sidescan`", "example": True, }, + "timeout": { + "type": "number", + "format": "float", + "description": "Timeout set to perform action", + "example": 1800.0, + }, }, "required": [ "target_waypoint_latitude", diff --git a/tests/fixtures/swagger.json b/tests/fixtures/swagger.json index 9029ada68999f91b888b753a98e511ef7ecb72cf..6372a06f7d02cd9bd62f58e63d6857084873ca03 100644 --- a/tests/fixtures/swagger.json +++ b/tests/fixtures/swagger.json @@ -123,6 +123,12 @@ "example": true, "type": "boolean" }, + "timeout": { + "description": "Timeout set to perform action", + "example": 1800.0, + "format": "float", + "type": "number" + }, "altitude": { "description": "Altitude of next action", "example": 15.0,