Skip to content

GitLab

Commit 65ff7639 authored by Trishna Saeharaseelan's avatar Trishna Saeharaseelan
Browse files

refactor(mission plan): add timeout per action

parent 627c99cd
dev 41-add-optional-operating_area-as-a-wider-zone-outside-region_of_interest 42-add-event-details-and-status-to-acknowledgement-schema 66-tag-current-dev-as-version-1 76-should-depth-and-altitude-be-coordinates 80-add-informational-type-primitive 87-remove-comment-for-platform-status-state 87-remove-todo-comment-from-platform-state action-refactor-test ci-js-test master missionmonitor v2.0.0 v2.0.0-beta.11 v2.0.0-beta.10 v2.0.0-beta.9 v2.0.0-beta.8 v2.0.0-beta.7 v2.0.0-beta.6 v2.0.0-beta.5 v2.0.0-beta.4 v2.0.0-beta.3 v2.0.0-beta.2 v2.0.0-beta.1 v1.0.0 v0.2.0 v0.1.0
2 merge requests!18Resolve "Remove unused and irrelevant fields from mission plan message + add timeout",!16Resolve "Release v0.1"
Pipeline #111734 passed with stages
in 1 minute and 7 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 12 deletions
examples/autonomy_engine_adapter/mission_plan_AH1.json
View file @ 65ff7639
......@@ -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
}
]
}
......
examples/autonomy_engine_adapter/mission_plan_ECOSUB.json
View file @ 65ff7639
......@@ -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
}
]
}
......
examples/ecosub_adapter/mission_plan.json
View file @ 65ff7639
......@@ -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
}
]
}
......
formats/mission_plan.py
View file @ 65ff7639
......@@ -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",
......
project/soar/swagger.json
View file @ 65ff7639
......@@ -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,
......
tests/fixtures/schemas.py
View file @ 65ff7639
......@@ -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",
......
tests/fixtures/swagger.json
View file @ 65ff7639
......@@ -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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment