Skip to content

GitLab

Commit fc7b4cf3 authored by Trishna Saeharaseelan's avatar Trishna Saeharaseelan
Browse files

Merge branch '27-update-platform-status-fields' into 'dev' 

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

Closes #27

See merge request !18
parents 1980868f 1bd3ec56
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 #111992 passed with stages
in 53 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 98 deletions
examples/autonomy_engine_adapter/mission_plan_AH1.json
View file @ fc7b4cf3
...@@ -15,47 +15,43 @@ ...@@ -15,47 +15,43 @@
"plan": [ "plan": [
{ {
"action": "move", "action": "move",
"flight_style": "go to waypoint",
"start_point_latitude": -3.007143188645706, "start_point_latitude": -3.007143188645706,
"start_point_longitude": 50.37072283932642, "start_point_longitude": 50.37072283932642,
"target_waypoint_latitude": -3.237143188645706, "target_waypoint_latitude": -3.237143188645706,
"target_waypoint_longitude": 52.37072283932642, "target_waypoint_longitude": 52.37072283932642,
"depth": 0.0, "depth": 0.0,
"activate_payload": false, "activate_payload": false,
"send_environmental_data": false "timeout": 200
}, },
{ {
"action": "dive", "action": "dive",
"flight_style": "dive to depth",
"start_point_latitude": -3.237143188645706, "start_point_latitude": -3.237143188645706,
"start_point_longitude": 52.37072283932642, "start_point_longitude": 52.37072283932642,
"target_waypoint_latitude": -3.337143188645706, "target_waypoint_latitude": -3.337143188645706,
"target_waypoint_longitude": 56.37072283932642, "target_waypoint_longitude": 56.37072283932642,
"altitude": 10, "altitude": 10,
"activate_payload": false, "activate_payload": false,
"send_environmental_data": false "timeout": 200
}, },
{ {
"action": "scanline", "action": "scanline",
"flight_style": "go to waypoint",
"start_point_latitude": -3.337143188645706, "start_point_latitude": -3.337143188645706,
"start_point_longitude": 56.37072283932642, "start_point_longitude": 56.37072283932642,
"target_waypoint_latitude": -0.237143188645706, "target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 60.00000000000000, "target_waypoint_longitude": 60.00000000000000,
"altitude": 10, "altitude": 10,
"activate_payload": true, "activate_payload": true,
"send_environmental_data": false "timeout": 200
}, },
{ {
"action": "climb", "action": "climb",
"flight_style": "go to surface",
"start_point_latitude": -0.237143188645706, "start_point_latitude": -0.237143188645706,
"start_point_longitude": 60.00000000000000, "start_point_longitude": 60.00000000000000,
"target_waypoint_latitude": -0.237143188645706, "target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 52.37072283932642, "target_waypoint_longitude": 52.37072283932642,
"depth": 0.0, "depth": 0.0,
"activate_payload": false, "activate_payload": false,
"send_environmental_data": true "timeout": 200
} }
] ]
} }
......
examples/autonomy_engine_adapter/mission_plan_ECOSUB.json
View file @ fc7b4cf3
...@@ -15,47 +15,43 @@ ...@@ -15,47 +15,43 @@
"plan": [ "plan": [
{ {
"action": "move", "action": "move",
"flight_style": "go to waypoint",
"start_point_latitude": -3.007143188645706, "start_point_latitude": -3.007143188645706,
"start_point_longitude": 50.37072283932642, "start_point_longitude": 50.37072283932642,
"target_waypoint_latitude": -3.237143188645706, "target_waypoint_latitude": -3.237143188645706,
"target_waypoint_longitude": 52.37072283932642, "target_waypoint_longitude": 52.37072283932642,
"depth": 0.0, "depth": 0.0,
"activate_payload": false, "activate_payload": false,
"send_environmental_data": false "timeout": 300
}, },
{ {
"action": "dive", "action": "dive",
"flight_style": "dive to depth",
"start_point_latitude": -3.237143188645706, "start_point_latitude": -3.237143188645706,
"start_point_longitude": 52.37072283932642, "start_point_longitude": 52.37072283932642,
"target_waypoint_latitude": -3.337143188645706, "target_waypoint_latitude": -3.337143188645706,
"target_waypoint_longitude": 56.37072283932642, "target_waypoint_longitude": 56.37072283932642,
"altitude": 10, "altitude": 10,
"activate_payload": false, "activate_payload": false,
"send_environmental_data": false "timeout": 300
}, },
{ {
"action": "scanline", "action": "scanline",
"flight_style": "go to waypoint",
"start_point_latitude": -3.337143188645706, "start_point_latitude": -3.337143188645706,
"start_point_longitude": 56.37072283932642, "start_point_longitude": 56.37072283932642,
"target_waypoint_latitude": -0.237143188645706, "target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 60.00000000000000, "target_waypoint_longitude": 60.00000000000000,
"altitude": 10, "altitude": 10,
"activate_payload": true, "activate_payload": true,
"send_environmental_data": false "timeout": 300
}, },
{ {
"action": "climb", "action": "climb",
"flight_style": "go to surface",
"start_point_latitude": -0.237143188645706, "start_point_latitude": -0.237143188645706,
"start_point_longitude": 60.00000000000000, "start_point_longitude": 60.00000000000000,
"target_waypoint_latitude": -0.237143188645706, "target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 52.37072283932642, "target_waypoint_longitude": 52.37072283932642,
"depth": 0.0, "depth": 0.0,
"activate_payload": false, "activate_payload": false,
"send_environmental_data": true "timeout": 300
} }
] ]
} }
......
examples/autonomy_engine_adapter/planning_configuration.json
View file @ fc7b4cf3
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
{ {
"model": "reav", "model": "reav",
"platform_ID": "reav-60-1", "platform_ID": "reav-60-1",
"serial": "reav-60",
"emergency": { "emergency": {
"additional_data": {}, "additional_data": {},
"target_waypoint_latitude": -7.432, "target_waypoint_latitude": -7.432,
...@@ -90,7 +89,6 @@ ...@@ -90,7 +89,6 @@
"platforms": [ "platforms": [
{ {
"platform_ID": "ecosub-1", "platform_ID": "ecosub-1",
"serial": "ecosub-2",
"model": "ecosub", "model": "ecosub",
"emergency": { "emergency": {
"additional_data": {}, "additional_data": {},
...@@ -109,7 +107,6 @@ ...@@ -109,7 +107,6 @@
}, },
{ {
"platform_ID": "ecosub-2", "platform_ID": "ecosub-2",
"serial": "ecosubxyz-5",
"model": "ecosub", "model": "ecosub",
"emergency": { "emergency": {
"additional_data": {}, "additional_data": {},
...@@ -136,7 +133,6 @@ ...@@ -136,7 +133,6 @@
"platforms": [ "platforms": [
{ {
"platform_ID": "ah-1", "platform_ID": "ah-1",
"serial": "autosubhover-1",
"model": "autosub", "model": "autosub",
"emergency": { "emergency": {
"additional_data": {}, "additional_data": {},
......
examples/ecosub_adapter/mission_plan.json
View file @ fc7b4cf3
...@@ -15,47 +15,43 @@ ...@@ -15,47 +15,43 @@
"plan": [ "plan": [
{ {
"action": "move", "action": "move",
"flight_style": "go to waypoint",
"start_point_latitude": -3.007143188645706, "start_point_latitude": -3.007143188645706,
"start_point_longitude": 50.37072283932642, "start_point_longitude": 50.37072283932642,
"target_waypoint_latitude": -3.237143188645706, "target_waypoint_latitude": -3.237143188645706,
"target_waypoint_longitude": 52.37072283932642, "target_waypoint_longitude": 52.37072283932642,
"depth": 0.0, "depth": 0.0,
"activate_payload": false, "activate_payload": false,
"send_environmental_data": false "timeout": 300
}, },
{ {
"action": "dive", "action": "dive",
"flight_style": "dive to depth",
"start_point_latitude": -3.237143188645706, "start_point_latitude": -3.237143188645706,
"start_point_longitude": 52.37072283932642, "start_point_longitude": 52.37072283932642,
"target_waypoint_latitude": -3.337143188645706, "target_waypoint_latitude": -3.337143188645706,
"target_waypoint_longitude": 56.37072283932642, "target_waypoint_longitude": 56.37072283932642,
"altitude": 10, "altitude": 10,
"activate_payload": false, "activate_payload": false,
"send_environmental_data": false "timeout": 300
}, },
{ {
"action": "scanline", "action": "scanline",
"flight_style": "go to waypoint",
"start_point_latitude": -3.337143188645706, "start_point_latitude": -3.337143188645706,
"start_point_longitude": 56.37072283932642, "start_point_longitude": 56.37072283932642,
"target_waypoint_latitude": -0.237143188645706, "target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 60.00000000000000, "target_waypoint_longitude": 60.00000000000000,
"altitude": 10, "altitude": 10,
"activate_payload": true, "activate_payload": true,
"send_environmental_data": false "timeout": 300
}, },
{ {
"action": "climb", "action": "climb",
"flight_style": "go to surface",
"start_point_latitude": -0.237143188645706, "start_point_latitude": -0.237143188645706,
"start_point_longitude": 60.00000000000000, "start_point_longitude": 60.00000000000000,
"target_waypoint_latitude": -0.237143188645706, "target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 52.37072283932642, "target_waypoint_longitude": 52.37072283932642,
"depth": 0.0, "depth": 0.0,
"activate_payload": false, "activate_payload": false,
"send_environmental_data": true "timeout": 300
} }
] ]
} }
......
examples/gui_adapter/planning_configuration.json
View file @ fc7b4cf3
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
{ {
"model": "reav", "model": "reav",
"platform_ID": "reav-60-1", "platform_ID": "reav-60-1",
"serial": "reav-60",
"emergency": { "emergency": {
"target_waypoint_latitude": -7.432, "target_waypoint_latitude": -7.432,
"target_waypoint_longitude": 50.365, "target_waypoint_longitude": 50.365,
...@@ -88,7 +87,6 @@ ...@@ -88,7 +87,6 @@
"platforms": [ "platforms": [
{ {
"platform_ID": "ecosub-2", "platform_ID": "ecosub-2",
"serial": "ecosub-2",
"model": "ecosub", "model": "ecosub",
"emergency": { "emergency": {
"target_waypoint_latitude": -7.432, "target_waypoint_latitude": -7.432,
...@@ -106,7 +104,6 @@ ...@@ -106,7 +104,6 @@
}, },
{ {
"platform_ID": "ecosub-5", "platform_ID": "ecosub-5",
"serial": "ecosub-5",
"model": "ecosub", "model": "ecosub",
"emergency": { "emergency": {
"additional_data": {}, "additional_data": {},
...@@ -133,7 +130,6 @@ ...@@ -133,7 +130,6 @@
"platforms": [ "platforms": [
{ {
"platform_ID": "139-ah-1", "platform_ID": "139-ah-1",
"serial": "ah-1",
"model": "autosub", "model": "autosub",
"emergency": { "emergency": {
"additional_data": {}, "additional_data": {},
......
formats/mission_plan.py
View file @ fc7b4cf3
...@@ -13,12 +13,6 @@ action_schema = { ...@@ -13,12 +13,6 @@ action_schema = {
+ " `dive`, `send_hits`, `scanline`, `scanpoint`.", + " `dive`, `send_hits`, `scanline`, `scanpoint`.",
"example": "move", "example": "move",
}, },
"flight_style": {
"type": "string",
"description": "Platform-specific modes/flight styles to perform"
+ " next action",
"example": "orbit",
},
"start_point_latitude": { "start_point_latitude": {
"type": "number", "type": "number",
"format": "float", "format": "float",
...@@ -61,11 +55,11 @@ action_schema = { ...@@ -61,11 +55,11 @@ action_schema = {
+ "Hover-1 --> `MBES` sensor and for EcoSUB --> `Sidescan`", + "Hover-1 --> `MBES` sensor and for EcoSUB --> `Sidescan`",
"example": True, "example": True,
}, },
"send_environmental_data": { "timeout": {
"type": "boolean", "type": "number",
"description": "To trigger the platform to send list of" "format": "float",
+ " observations if any found", "description": "Timeout set to perform action",
"example": False, "example": 1800.0,
}, },
}, },
"required": [ "required": [
......
formats/planning_configuration.py
View file @ fc7b4cf3
...@@ -53,11 +53,6 @@ platform_schema = { ...@@ -53,11 +53,6 @@ platform_schema = {
"description": "Unique identifier for this platform", "description": "Unique identifier for this platform",
"example": "reav-x-1", "example": "reav-x-1",
}, },
"serial": {
"type": "string",
"description": "platform serial number",
"example": "reav-60",
},
"model": { "model": {
"type": "string", "type": "string",
"example": "reav", "example": "reav",
...@@ -89,7 +84,6 @@ platform_schema = { ...@@ -89,7 +84,6 @@ platform_schema = {
}, },
"required": [ "required": [
"platform_ID", "platform_ID",
"serial",
"model", "model",
"emergency", "emergency",
"min_altitude", "min_altitude",
......
project/soar/swagger.json
View file @ fc7b4cf3
...@@ -124,6 +124,12 @@ ...@@ -124,6 +124,12 @@
"example":true, "example":true,
"type":"boolean" "type":"boolean"
}, },
"timeout": {
"description": "Timeout set to perform action",
"example": 1800.0,
"format": "float",
"type": "number"
},
"altitude":{ "altitude":{
"description":"Altitude of next action", "description":"Altitude of next action",
"example":15.0, "example":15.0,
...@@ -136,16 +142,6 @@ ...@@ -136,16 +142,6 @@
"format":"float", "format":"float",
"type":"number" "type":"number"
}, },
"flight_style":{
"description":"Platform-specific modes/flight styles to perform next action",
"example":"orbit",
"type":"string"
},
"send_environmental_data":{
"description":"To trigger the platform to send list of observations if any found",
"example":false,
"type":"boolean"
},
"start_point_latitude":{ "start_point_latitude":{
"description":"Start point, x-coordinate", "description":"Start point, x-coordinate",
"example":-4.187143188645706, "example":-4.187143188645706,
...@@ -420,16 +416,10 @@ ...@@ -420,16 +416,10 @@
"description":"Unique identifier for this platform", "description":"Unique identifier for this platform",
"example":"reav-x-1", "example":"reav-x-1",
"type":"string" "type":"string"
},
"serial":{
"description":"platform serial number",
"example":"reav-60",
"type":"string"
} }
}, },
"required":[ "required":[
"platform_ID", "platform_ID",
"serial",
"model", "model",
"emergency", "emergency",
"min_altitude", "min_altitude",
......
tests/fixtures/schemas.py
View file @ fc7b4cf3
...@@ -91,12 +91,6 @@ action_schema = { ...@@ -91,12 +91,6 @@ action_schema = {
+ " `dive`, `send_hits`, `scanline`, `scanpoint`.", + " `dive`, `send_hits`, `scanline`, `scanpoint`.",
"example": "move", "example": "move",
}, },
"flight_style": {
"type": "string",
"description": "Platform-specific modes/flight styles to perform"
+ " next action",
"example": "orbit",
},
"start_point_latitude": { "start_point_latitude": {
"type": "number", "type": "number",
"format": "float", "format": "float",
...@@ -139,11 +133,11 @@ action_schema = { ...@@ -139,11 +133,11 @@ action_schema = {
+ "Hover-1 --> `MBES` sensor and for EcoSUB --> `Sidescan`", + "Hover-1 --> `MBES` sensor and for EcoSUB --> `Sidescan`",
"example": True, "example": True,
}, },
"send_environmental_data": { "timeout": {
"type": "boolean", "type": "number",
"description": "To trigger the platform to send list of" "format": "float",
+ " observations if any found", "description": "Timeout set to perform action",
"example": False, "example": 1800.0,
}, },
}, },
"required": [ "required": [
...@@ -294,11 +288,6 @@ platform_schema = { ...@@ -294,11 +288,6 @@ platform_schema = {
"description": "Unique identifier for this platform", "description": "Unique identifier for this platform",
"example": "reav-x-1", "example": "reav-x-1",
}, },
"serial": {
"type": "string",
"description": "platform serial number",
"example": "reav-60",
},
"model": { "model": {
"type": "string", "type": "string",
"example": "reav", "example": "reav",
...@@ -329,7 +318,6 @@ platform_schema = { ...@@ -329,7 +318,6 @@ platform_schema = {
}, },
"required": [ "required": [
"platform_ID", "platform_ID",
"serial",
"model", "model",
"emergency", "emergency",
"min_altitude", "min_altitude",
......
tests/fixtures/swagger.json
View file @ fc7b4cf3
...@@ -123,6 +123,12 @@ ...@@ -123,6 +123,12 @@
"example": true, "example": true,
"type": "boolean" "type": "boolean"
}, },
"timeout": {
"description": "Timeout set to perform action",
"example": 1800.0,
"format": "float",
"type": "number"
},
"altitude": { "altitude": {
"description": "Altitude of next action", "description": "Altitude of next action",
"example": 15.0, "example": 15.0,
...@@ -135,11 +141,6 @@ ...@@ -135,11 +141,6 @@
"format": "float", "format": "float",
"type": "number" "type": "number"
}, },
"flight_style": {
"description": "Platform-specific modes/flight styles to perform next action",
"example": "orbit",
"type": "string"
},
"target_waypoint_latitude": { "target_waypoint_latitude": {
"description": "Next waypoint, x-coordinate", "description": "Next waypoint, x-coordinate",
"example": -4.187143188645706, "example": -4.187143188645706,
...@@ -151,11 +152,6 @@ ...@@ -151,11 +152,6 @@
"example": 50.37072283932642, "example": 50.37072283932642,
"format": "float", "format": "float",
"type": "number" "type": "number"
},
"send_environmental_data": {
"description": "To trigger the platform to send list of observations if any found",
"example": false,
"type": "boolean"
} }
}, },
"required": [ "required": [
...@@ -401,16 +397,10 @@ ...@@ -401,16 +397,10 @@
"description": "Unique identifier for this platform", "description": "Unique identifier for this platform",
"example": "reav-x-1", "example": "reav-x-1",
"type": "string" "type": "string"
},
"serial": {
"description": "platform serial number",
"example": "reav-60",
"type": "string"
} }
}, },
"required": [ "required": [
"platform_ID", "platform_ID",
"serial",
"model", "model",
"emergency", "emergency",
"min_altitude", "min_altitude",
......
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