From 63c684730105691bb1796e3e9a976487cfdaae33 Mon Sep 17 00:00:00 2001
From: Trishna Saeharaseelan <trishna.saeharaseelan@noc.ac.uk>
Date: Wed, 15 Feb 2023 13:00:24 +0000
Subject: [PATCH] refactor: better field names in status and remove pitch field
---
.../mission_plan_AH1.json | 2 +-
.../mission_plan_ECOSUB.json | 2 +-
.../planning_configuration.json | 2 +-
.../platform_status-from_usbl_example.json | 4 +-
.../platform_status.json | 8 ++--
examples/ecosub_adapter/mission_plan.json | 2 +-
.../platform_status-from_usbl_example.json | 4 +-
examples/ecosub_adapter/platform_status.json | 10 ++---
.../gui_adapter/planning_configuration.json | 2 +-
.../hydrosurv_adapter/platform_status.json | 4 +-
formats/planning_configuration.py | 2 +-
formats/platform_status.py | 44 +++++++++----------
project/soar/swagger.json | 32 +++++++-------
tests/fixtures/schemas.py | 37 ++++++++--------
tests/fixtures/swagger.json | 30 +++++--------
.../mission_plan_AH1.json | 2 +-
.../mission_plan_ECOSUB.json | 2 +-
.../planning_configuration.json | 2 +-
.../platform_status-from_usbl_example.json | 4 +-
.../platform_status.json | 12 ++---
.../ecosub_adapter/mission_plan.json | 2 +-
.../platform_status-from_usbl_example.json | 2 +-
.../ecosub_adapter/platform_status.json | 10 ++---
.../gui_adapter/planning_configuration.json | 2 +-
.../hydrosurv_adapter/platform_status.json | 4 +-
25 files changed, 109 insertions(+), 118 deletions(-)
diff --git a/examples/autonomy_engine_adapter/mission_plan_AH1.json b/examples/autonomy_engine_adapter/mission_plan_AH1.json
index 57666f6..99d42e1 100644
--- a/examples/autonomy_engine_adapter/mission_plan_AH1.json
+++ b/examples/autonomy_engine_adapter/mission_plan_AH1.json
@@ -53,7 +53,7 @@
"start_point_longitude": 60.00000000000000,
"target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 52.37072283932642,
- "depth": 0,
+ "depth": 0.0,
"activate_payload": false,
"send_environmental_data": true
}
diff --git a/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json b/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json
index 47becbc..3ba5aac 100644
--- a/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json
+++ b/examples/autonomy_engine_adapter/mission_plan_ECOSUB.json
@@ -53,7 +53,7 @@
"start_point_longitude": 60.00000000000000,
"target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 52.37072283932642,
- "depth": 0,
+ "depth": 0.0,
"activate_payload": false,
"send_environmental_data": true
}
diff --git a/examples/autonomy_engine_adapter/planning_configuration.json b/examples/autonomy_engine_adapter/planning_configuration.json
index e3f18a3..1c76fcd 100644
--- a/examples/autonomy_engine_adapter/planning_configuration.json
+++ b/examples/autonomy_engine_adapter/planning_configuration.json
@@ -51,7 +51,7 @@
"target_waypoint_latitude": -7.432,
"target_waypoint_longitude": 50.365,
"safe_command": "go_home",
- "target_depth": 10
+ "target_depth": 10.0
},
"max_velocity": 0.9,
"min_altitude": 15.2,
diff --git a/examples/autonomy_engine_adapter/platform_status-from_usbl_example.json b/examples/autonomy_engine_adapter/platform_status-from_usbl_example.json
index 6721a35..6a506d9 100644
--- a/examples/autonomy_engine_adapter/platform_status-from_usbl_example.json
+++ b/examples/autonomy_engine_adapter/platform_status-from_usbl_example.json
@@ -15,7 +15,7 @@
"status_source": "usbl",
"latitude": 178.2,
"longitude": -10.122,
- "depth": 50,
- "altitude": 20
+ "depth": 50.0,
+ "altitude": 20.0
}
}
diff --git a/examples/autonomy_engine_adapter/platform_status.json b/examples/autonomy_engine_adapter/platform_status.json
index 26cd4fa..6fb29e0 100644
--- a/examples/autonomy_engine_adapter/platform_status.json
+++ b/examples/autonomy_engine_adapter/platform_status.json
@@ -21,11 +21,12 @@
"mission_track_ID": 4,
"latitude": 178.2,
"longitude": -10.122,
- "depth": 50,
+ "depth": 50.0,
"altitude": 20,
"heading": 90.0,
- "health_status": "Warning",
- "localisation_error": 0,
+ "health_status": false,
+ "localisation_north_error": 0,
+ "localisation_east_error": 0,
"usbl_fix_seconds_ago": 0,
"range_to_go": 124.3,
"sensor_config": {
@@ -36,7 +37,6 @@
"whiskers_on": true
}
},
- "current_pitch": -4,
"speed_over_ground": 4.3,
"thrust_applied": 124.3,
"water_current_velocity": 124.3
diff --git a/examples/ecosub_adapter/mission_plan.json b/examples/ecosub_adapter/mission_plan.json
index 47becbc..3ba5aac 100644
--- a/examples/ecosub_adapter/mission_plan.json
+++ b/examples/ecosub_adapter/mission_plan.json
@@ -53,7 +53,7 @@
"start_point_longitude": 60.00000000000000,
"target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 52.37072283932642,
- "depth": 0,
+ "depth": 0.0,
"activate_payload": false,
"send_environmental_data": true
}
diff --git a/examples/ecosub_adapter/platform_status-from_usbl_example.json b/examples/ecosub_adapter/platform_status-from_usbl_example.json
index 6721a35..6a506d9 100644
--- a/examples/ecosub_adapter/platform_status-from_usbl_example.json
+++ b/examples/ecosub_adapter/platform_status-from_usbl_example.json
@@ -15,7 +15,7 @@
"status_source": "usbl",
"latitude": 178.2,
"longitude": -10.122,
- "depth": 50,
- "altitude": 20
+ "depth": 50.0,
+ "altitude": 20.0
}
}
diff --git a/examples/ecosub_adapter/platform_status.json b/examples/ecosub_adapter/platform_status.json
index b82beba..6fb29e0 100644
--- a/examples/ecosub_adapter/platform_status.json
+++ b/examples/ecosub_adapter/platform_status.json
@@ -17,15 +17,16 @@
"battery_remaining_capacity": 80.2,
"active": true,
"platform_state": "ABORT",
- "mission_action_ID": 1,
+ "mission_plan_ID": 1,
"mission_track_ID": 4,
"latitude": 178.2,
"longitude": -10.122,
- "depth": 50,
+ "depth": 50.0,
"altitude": 20,
"heading": 90.0,
- "health_status": "Warning",
- "localisation_error": 0,
+ "health_status": false,
+ "localisation_north_error": 0,
+ "localisation_east_error": 0,
"usbl_fix_seconds_ago": 0,
"range_to_go": 124.3,
"sensor_config": {
@@ -36,7 +37,6 @@
"whiskers_on": true
}
},
- "current_pitch": -4,
"speed_over_ground": 4.3,
"thrust_applied": 124.3,
"water_current_velocity": 124.3
diff --git a/examples/gui_adapter/planning_configuration.json b/examples/gui_adapter/planning_configuration.json
index f1d83ea..106bac9 100644
--- a/examples/gui_adapter/planning_configuration.json
+++ b/examples/gui_adapter/planning_configuration.json
@@ -51,7 +51,7 @@
"target_waypoint_latitude": -7.432,
"target_waypoint_longitude": 50.365,
"safe_command": "go_home",
- "target_depth": 10
+ "target_depth": 10.0
},
"max_velocity": 0.9,
"min_altitude": 15.2,
diff --git a/examples/hydrosurv_adapter/platform_status.json b/examples/hydrosurv_adapter/platform_status.json
index 43bac1f..4873199 100644
--- a/examples/hydrosurv_adapter/platform_status.json
+++ b/examples/hydrosurv_adapter/platform_status.json
@@ -15,10 +15,10 @@
"status_source": "onboard_platform",
"battery_remaining_capacity": 80.2,
"heading": 310.0,
- "health_status": "Lost Connection",
+ "health_status": false,
"latitude": 178.2,
"longitude": -10.122,
- "mission_action_ID": 1,
+ "mission_plan_ID": 1,
"mission_track_ID": 4,
"platform_ID": "reav-60-1",
"platform_state": "ABORT",
diff --git a/formats/planning_configuration.py b/formats/planning_configuration.py
index e7ed4e9..8682d80 100644
--- a/formats/planning_configuration.py
+++ b/formats/planning_configuration.py
@@ -30,7 +30,7 @@ emergency_schema = {
"format": "float",
"description": "Z-coordinate safe place for respective platform"
+ " . If platform to NOT stay at depth, key in `0.0`",
- "example": 10,
+ "example": 10.0,
},
"additional_data": {
"description": "Any addition fields/data to be added here",
diff --git a/formats/platform_status.py b/formats/platform_status.py
index 2ef5560..b9a6ccf 100644
--- a/formats/platform_status.py
+++ b/formats/platform_status.py
@@ -86,14 +86,14 @@ platform_status_schema = {
"type": "number",
"format": "float",
"description": "Target depth in metres",
- "example": 50,
- "default": 0,
+ "example": 50.0,
+ "default": 0.0,
},
"altitude": {
"type": "number",
"format": "float",
"description": "Target altitude in metres",
- "example": 20,
+ "example": 20.0,
},
"mission_track_ID": {
"type": "integer",
@@ -101,9 +101,9 @@ platform_status_schema = {
+ "4 --> Waypoint 3 to Waypoint 4)",
"example": 4,
},
- "mission_action_ID": {
+ "mission_plan_ID": {
"type": "integer",
- "description": "", # TODO: Add description
+ "description": "Mission plan ID according to local platform-C2 system",
"example": 1,
},
"range_to_go": {
@@ -115,19 +115,18 @@ platform_status_schema = {
"speed_over_ground": {
"type": "number",
"format": "float",
- "description": "", # TODO: Add description
+ "description": "Speed over ground",
"example": 124.3,
},
"water_current_velocity": {
- "type": "number",
- "format": "float",
- "description": "", # TODO: Add description
- "example": 124.3,
+ "type": "string",
+ "description": "Water current magnitude and direction",
+ "example": "124.3NE",
},
"thrust_applied": {
"type": "number",
"format": "float",
- "description": "", # TODO: Add description
+ "description": "Thrust applied",
"example": 124.3,
},
"heading": {
@@ -138,15 +137,20 @@ platform_status_schema = {
"example": 124.3,
},
"health_status": {
- "type": "string",
- "description": "Health status extracted by respective platform "
- + "if any diagnosis is available to check sensors",
- "example": "Warning",
+ "type": "boolean",
+ "description": "Health status where 0 is OK, 1 is platform has an ERROR",
+ "example": False,
},
- "localisation_error": {
+ "localisation_north_error": {
"type": "number",
"format": "float",
- "description": "Localisation error at last USBL update.",
+ "description": "Difference in NORTH between deadreckoning and USBL update.",
+ "example": 0.000129,
+ },
+ "localisation_east_error": {
+ "type": "number",
+ "format": "float",
+ "description": "Difference in EAST between deadreckoning and USBL update.",
"example": 0.000129,
},
"usbl_fix_seconds_ago": {
@@ -161,12 +165,6 @@ platform_status_schema = {
"description": "Battery remaining % provided by respective C2",
"example": 80.2,
},
- "current_pitch": {
- "type": "number",
- "format": "float",
- "description": "Current pitch of platform",
- "example": -4.0,
- },
"sensor_config": sensor_schema,
},
"required": [
diff --git a/project/soar/swagger.json b/project/soar/swagger.json
index b409369..c805daf 100644
--- a/project/soar/swagger.json
+++ b/project/soar/swagger.json
@@ -375,7 +375,7 @@
},
"target_depth": {
"description": "Z-coordinate safe place for respective platform . If platform to NOT stay at depth, key in `0.0`",
- "example": 10,
+ "example": 10.0,
"format": "float",
"type": "number"
}
@@ -522,12 +522,6 @@
"format": "float",
"type": "number"
},
- "current_pitch": {
- "description": "Current pitch of platform",
- "example": -4.0,
- "format": "float",
- "type": "number"
- },
"depth": {
"default": 0,
"description": "Target depth in metres",
@@ -542,9 +536,9 @@
"type": "number"
},
"health_status": {
- "description": "Health status extracted by respective platform if any diagnosis is available to check sensors",
- "example": "Warning",
- "type": "string"
+ "description": "Health status where 0 is OK, 1 is platform has an ERROR",
+ "example": false,
+ "type": "boolean"
},
"latitude": {
"description": "Latitude in decimal degrees.",
@@ -552,12 +546,18 @@
"format": "float",
"type": "number"
},
- "localisation_error": {
+ "localisation_north_error": {
"description": "Localisation error at last USBL update.",
"example": 0.000129,
"format": "float",
"type": "number"
},
+ "localisation_east_error": {
+ "type": "number",
+ "format": "float",
+ "description": "Difference in EAST between deadreckoning and USBL update.",
+ "example": 0.000129
+ },
"longitude": {
"description": "Longitude in decimal degrees.",
"example": -10.122,
@@ -569,8 +569,8 @@
"example": "platform_status",
"type": "string"
},
- "mission_action_ID": {
- "description": "",
+ "mission_plan_ID": {
+ "description": "Mission plan ID according to local platform-C2 system",
"example": 1,
"type": "integer"
},
@@ -627,7 +627,7 @@
"type": "object"
},
"speed_over_ground": {
- "description": "",
+ "description": "Speed over ground",
"example": 124.3,
"format": "float",
"type": "number"
@@ -642,7 +642,7 @@
"type": "string"
},
"thrust_applied": {
- "description": "",
+ "description": "Thrust applied",
"example": 124.3,
"format": "float",
"type": "number"
@@ -665,7 +665,7 @@
"type": "number"
},
"water_current_velocity": {
- "description": "",
+ "description": "Water current magnitude and direction",
"example": 124.3,
"format": "float",
"type": "number"
diff --git a/tests/fixtures/schemas.py b/tests/fixtures/schemas.py
index 33a1320..60bba4a 100644
--- a/tests/fixtures/schemas.py
+++ b/tests/fixtures/schemas.py
@@ -265,7 +265,7 @@ emergency_schema = {
"format": "float",
"description": "Z-coordinate safe place for respective platform"
+ " . If platform to NOT stay at depth, key in `0.0`",
- "example": 10,
+ "example": 10.0,
},
"additional_data": {
"description": "Any addition fields/data to be added here",
@@ -504,7 +504,7 @@ platform_status_schema = {
"type": "number",
"format": "float",
"description": "Target depth in metres",
- "example": 50,
+ "example": 50.0,
"default": 0,
},
"altitude": {
@@ -519,9 +519,9 @@ platform_status_schema = {
+ "4 --> Waypoint 3 to Waypoint 4)",
"example": 4,
},
- "mission_action_ID": {
+ "mission_plan_ID": {
"type": "integer",
- "description": "", # TODO: Add description
+ "description": "Mission plan ID according to local platform-C2 system",
"example": 1,
},
"range_to_go": {
@@ -533,19 +533,19 @@ platform_status_schema = {
"speed_over_ground": {
"type": "number",
"format": "float",
- "description": "", # TODO: Add description
+ "description": "Speed over ground",
"example": 124.3,
},
"water_current_velocity": {
"type": "number",
"format": "float",
- "description": "", # TODO: Add description
+ "description": "Water current magnitude and direction",
"example": 124.3,
},
"thrust_applied": {
"type": "number",
"format": "float",
- "description": "", # TODO: Add description
+ "description": "Thrust applied",
"example": 124.3,
},
"heading": {
@@ -556,15 +556,20 @@ platform_status_schema = {
"example": 124.3,
},
"health_status": {
- "type": "string",
- "description": "Health status extracted by respective platform "
- + "if any diagnosis is available to check sensors",
- "example": "Warning",
+ "type": "boolean",
+ "description": "Health status where 0 is OK, 1 is platform has an ERROR",
+ "example": False,
},
- "localisation_error": {
+ "localisation_north_error": {
"type": "number",
"format": "float",
- "description": "Localisation error at last USBL update.",
+ "description": "Difference in NORTH between deadreckoning and USBL update.",
+ "example": 0.000129,
+ },
+ "localisation_east_error": {
+ "type": "number",
+ "format": "float",
+ "description": "Difference in EAST between deadreckoning and USBL update.",
"example": 0.000129,
},
"usbl_fix_seconds_ago": {
@@ -579,12 +584,6 @@ platform_status_schema = {
"description": "Battery remaining % provided by respective C2",
"example": 80.2,
},
- "current_pitch": {
- "type": "number",
- "format": "float",
- "description": "Current pitch of platform",
- "example": -4.0,
- },
"sensor_config": sensor_schema,
},
"required": [
diff --git a/tests/fixtures/swagger.json b/tests/fixtures/swagger.json
index 4d5bf1d..88e5f71 100644
--- a/tests/fixtures/swagger.json
+++ b/tests/fixtures/swagger.json
@@ -362,7 +362,7 @@
},
"target_depth": {
"description": "Z-coordinate safe place for respective platform . If platform to NOT stay at depth, key in `0.0`",
- "example": 10,
+ "example": 10.0,
"format": "float",
"type": "number"
}
@@ -509,16 +509,10 @@
"format": "float",
"type": "number"
},
- "current_pitch": {
- "description": "Current pitch of platform",
- "example": -4.0,
- "format": "float",
- "type": "number"
- },
"depth": {
- "default": 0,
+ "default": 0.0,
"description": "Target depth in metres",
- "example": 50,
+ "example": 50.0,
"format": "float",
"type": "number"
},
@@ -529,9 +523,9 @@
"type": "number"
},
"health_status": {
- "description": "Health status extracted by respective platform if any diagnosis is available to check sensors",
- "example": "Warning",
- "type": "string"
+ "description": "Health status where 0 is OK, 1 is platform has an ERROR",
+ "example": false,
+ "type": "boolean"
},
"latitude": {
"description": "Latitude in decimal degrees.",
@@ -540,7 +534,7 @@
"type": "number"
},
"localisation_error": {
- "description": "Localisation error at last USBL update.",
+ "description": "Difference in NORTH between deadreckoning and USBL update.",
"example": 0.000129,
"format": "float",
"type": "number"
@@ -556,8 +550,8 @@
"example": "platform_status",
"type": "string"
},
- "mission_action_ID": {
- "description": "",
+ "mission_plan_ID": {
+ "description": "Mission plan ID according to local platform-C2 system",
"example": 1,
"type": "integer"
},
@@ -614,7 +608,7 @@
"type": "object"
},
"speed_over_ground": {
- "description": "",
+ "description": "Speed over ground",
"example": 124.3,
"format": "float",
"type": "number"
@@ -629,7 +623,7 @@
"type": "string"
},
"thrust_applied": {
- "description": "",
+ "description": "Thrust applied",
"example": 124.3,
"format": "float",
"type": "number"
@@ -652,7 +646,7 @@
"type": "number"
},
"water_current_velocity": {
- "description": "",
+ "description": "Water current magnitude and direction",
"example": 124.3,
"format": "float",
"type": "number"
diff --git a/tests/mock_data/autonomy_engine_adapter/mission_plan_AH1.json b/tests/mock_data/autonomy_engine_adapter/mission_plan_AH1.json
index 57666f6..99d42e1 100644
--- a/tests/mock_data/autonomy_engine_adapter/mission_plan_AH1.json
+++ b/tests/mock_data/autonomy_engine_adapter/mission_plan_AH1.json
@@ -53,7 +53,7 @@
"start_point_longitude": 60.00000000000000,
"target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 52.37072283932642,
- "depth": 0,
+ "depth": 0.0,
"activate_payload": false,
"send_environmental_data": true
}
diff --git a/tests/mock_data/autonomy_engine_adapter/mission_plan_ECOSUB.json b/tests/mock_data/autonomy_engine_adapter/mission_plan_ECOSUB.json
index fb2a83d..2cfdaad 100644
--- a/tests/mock_data/autonomy_engine_adapter/mission_plan_ECOSUB.json
+++ b/tests/mock_data/autonomy_engine_adapter/mission_plan_ECOSUB.json
@@ -53,7 +53,7 @@
"start_point_longitude": 60.00000000000000,
"target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 52.37072283932642,
- "depth": 0,
+ "depth": 0.0,
"activate_payload": false,
"send_environmental_data": true
}
diff --git a/tests/mock_data/autonomy_engine_adapter/planning_configuration.json b/tests/mock_data/autonomy_engine_adapter/planning_configuration.json
index e3f18a3..1c76fcd 100644
--- a/tests/mock_data/autonomy_engine_adapter/planning_configuration.json
+++ b/tests/mock_data/autonomy_engine_adapter/planning_configuration.json
@@ -51,7 +51,7 @@
"target_waypoint_latitude": -7.432,
"target_waypoint_longitude": 50.365,
"safe_command": "go_home",
- "target_depth": 10
+ "target_depth": 10.0
},
"max_velocity": 0.9,
"min_altitude": 15.2,
diff --git a/tests/mock_data/autonomy_engine_adapter/platform_status-from_usbl_example.json b/tests/mock_data/autonomy_engine_adapter/platform_status-from_usbl_example.json
index 6721a35..6a506d9 100644
--- a/tests/mock_data/autonomy_engine_adapter/platform_status-from_usbl_example.json
+++ b/tests/mock_data/autonomy_engine_adapter/platform_status-from_usbl_example.json
@@ -15,7 +15,7 @@
"status_source": "usbl",
"latitude": 178.2,
"longitude": -10.122,
- "depth": 50,
- "altitude": 20
+ "depth": 50.0,
+ "altitude": 20.0
}
}
diff --git a/tests/mock_data/autonomy_engine_adapter/platform_status.json b/tests/mock_data/autonomy_engine_adapter/platform_status.json
index b82beba..306c0ed 100644
--- a/tests/mock_data/autonomy_engine_adapter/platform_status.json
+++ b/tests/mock_data/autonomy_engine_adapter/platform_status.json
@@ -17,15 +17,16 @@
"battery_remaining_capacity": 80.2,
"active": true,
"platform_state": "ABORT",
- "mission_action_ID": 1,
+ "mission_plan_ID": 1,
"mission_track_ID": 4,
"latitude": 178.2,
"longitude": -10.122,
- "depth": 50,
- "altitude": 20,
+ "depth": 50.0,
+ "altitude": 20.0,
"heading": 90.0,
- "health_status": "Warning",
- "localisation_error": 0,
+ "health_status": false,
+ "localisation_north_error": 0,
+ "localisation_east_error": 0,
"usbl_fix_seconds_ago": 0,
"range_to_go": 124.3,
"sensor_config": {
@@ -36,7 +37,6 @@
"whiskers_on": true
}
},
- "current_pitch": -4,
"speed_over_ground": 4.3,
"thrust_applied": 124.3,
"water_current_velocity": 124.3
diff --git a/tests/mock_data/ecosub_adapter/mission_plan.json b/tests/mock_data/ecosub_adapter/mission_plan.json
index 47becbc..3ba5aac 100644
--- a/tests/mock_data/ecosub_adapter/mission_plan.json
+++ b/tests/mock_data/ecosub_adapter/mission_plan.json
@@ -53,7 +53,7 @@
"start_point_longitude": 60.00000000000000,
"target_waypoint_latitude": -0.237143188645706,
"target_waypoint_longitude": 52.37072283932642,
- "depth": 0,
+ "depth": 0.0,
"activate_payload": false,
"send_environmental_data": true
}
diff --git a/tests/mock_data/ecosub_adapter/platform_status-from_usbl_example.json b/tests/mock_data/ecosub_adapter/platform_status-from_usbl_example.json
index 6721a35..4b30009 100644
--- a/tests/mock_data/ecosub_adapter/platform_status-from_usbl_example.json
+++ b/tests/mock_data/ecosub_adapter/platform_status-from_usbl_example.json
@@ -15,7 +15,7 @@
"status_source": "usbl",
"latitude": 178.2,
"longitude": -10.122,
- "depth": 50,
+ "depth": 50.0,
"altitude": 20
}
}
diff --git a/tests/mock_data/ecosub_adapter/platform_status.json b/tests/mock_data/ecosub_adapter/platform_status.json
index b82beba..6fb29e0 100644
--- a/tests/mock_data/ecosub_adapter/platform_status.json
+++ b/tests/mock_data/ecosub_adapter/platform_status.json
@@ -17,15 +17,16 @@
"battery_remaining_capacity": 80.2,
"active": true,
"platform_state": "ABORT",
- "mission_action_ID": 1,
+ "mission_plan_ID": 1,
"mission_track_ID": 4,
"latitude": 178.2,
"longitude": -10.122,
- "depth": 50,
+ "depth": 50.0,
"altitude": 20,
"heading": 90.0,
- "health_status": "Warning",
- "localisation_error": 0,
+ "health_status": false,
+ "localisation_north_error": 0,
+ "localisation_east_error": 0,
"usbl_fix_seconds_ago": 0,
"range_to_go": 124.3,
"sensor_config": {
@@ -36,7 +37,6 @@
"whiskers_on": true
}
},
- "current_pitch": -4,
"speed_over_ground": 4.3,
"thrust_applied": 124.3,
"water_current_velocity": 124.3
diff --git a/tests/mock_data/gui_adapter/planning_configuration.json b/tests/mock_data/gui_adapter/planning_configuration.json
index a04cded..40d1e86 100644
--- a/tests/mock_data/gui_adapter/planning_configuration.json
+++ b/tests/mock_data/gui_adapter/planning_configuration.json
@@ -51,7 +51,7 @@
"target_waypoint_latitude": -7.432,
"target_waypoint_longitude": 50.365,
"safe_command": "go_home",
- "target_depth": 10
+ "target_depth": 10.0
},
"max_velocity": 0.9,
"min_altitude": 15.2,
diff --git a/tests/mock_data/hydrosurv_adapter/platform_status.json b/tests/mock_data/hydrosurv_adapter/platform_status.json
index 43bac1f..4873199 100644
--- a/tests/mock_data/hydrosurv_adapter/platform_status.json
+++ b/tests/mock_data/hydrosurv_adapter/platform_status.json
@@ -15,10 +15,10 @@
"status_source": "onboard_platform",
"battery_remaining_capacity": 80.2,
"heading": 310.0,
- "health_status": "Lost Connection",
+ "health_status": false,
"latitude": 178.2,
"longitude": -10.122,
- "mission_action_ID": 1,
+ "mission_plan_ID": 1,
"mission_track_ID": 4,
"platform_ID": "reav-60-1",
"platform_state": "ABORT",
--
GitLab