From fca32da8ffacf69b3027355828af5ee323c6e76c Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 27 Sep 2019 18:59:08 +1000 Subject: [PATCH] Rover: adjust for proximity status namespace change --- APMrover2/GCS_Rover.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/APMrover2/GCS_Rover.cpp b/APMrover2/GCS_Rover.cpp index c009a820fc..bbd4980d1a 100644 --- a/APMrover2/GCS_Rover.cpp +++ b/APMrover2/GCS_Rover.cpp @@ -34,7 +34,7 @@ void GCS_Rover::update_vehicle_sensor_status_flags(void) control_sensors_enabled |= MAV_SYS_STATUS_SENSOR_VISION_POSITION; } const AP_Proximity *proximity = AP_Proximity::get_singleton(); - if (proximity && proximity->get_status() > AP_Proximity::Proximity_NotConnected) { + if (proximity && proximity->get_status() > AP_Proximity::Status::NotConnected) { control_sensors_present |= MAV_SYS_STATUS_SENSOR_LASER_POSITION; control_sensors_enabled |= MAV_SYS_STATUS_SENSOR_LASER_POSITION; } @@ -73,7 +73,7 @@ void GCS_Rover::update_vehicle_sensor_status_flags(void) control_sensors_health |= MAV_SYS_STATUS_SENSOR_LASER_POSITION; } } - if (proximity && proximity->get_status() != AP_Proximity::Proximity_NoData) { + if (proximity && proximity->get_status() != AP_Proximity::Status::NoData) { control_sensors_health |= MAV_SYS_STATUS_SENSOR_LASER_POSITION; } }