Browse Source

Rover: adjust for proximity status namespace change

c415-sdk
Peter Barker 5 years ago committed by Randy Mackay
parent
commit
6f6b143929
  1. 4
      APMrover2/GCS_Rover.cpp

4
APMrover2/GCS_Rover.cpp

@ -34,7 +34,7 @@ void GCS_Rover::update_vehicle_sensor_status_flags(void) @@ -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) @@ -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;
}
}

Loading…
Cancel
Save