From 9ac10c3af9c71ec1a061c8ff65a96730ecc9d8f3 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Mon, 13 Jan 2020 14:48:07 +0900 Subject: [PATCH] AP_RangeFinder: remove virtual from _get_mav_distance_sensor_type --- libraries/AP_RangeFinder/AP_RangeFinder_BLPing.h | 2 +- libraries/AP_RangeFinder/AP_RangeFinder_Lanbao.h | 2 +- libraries/AP_RangeFinder/AP_RangeFinder_LeddarOne.h | 2 +- libraries/AP_RangeFinder/AP_RangeFinder_LightWareSerial.h | 2 +- libraries/AP_RangeFinder/AP_RangeFinder_NMEA.h | 2 +- libraries/AP_RangeFinder/AP_RangeFinder_Wasp.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/AP_RangeFinder/AP_RangeFinder_BLPing.h b/libraries/AP_RangeFinder/AP_RangeFinder_BLPing.h index 999ab496f2..aaaa6c512c 100644 --- a/libraries/AP_RangeFinder/AP_RangeFinder_BLPing.h +++ b/libraries/AP_RangeFinder/AP_RangeFinder_BLPing.h @@ -15,7 +15,7 @@ public: protected: - virtual MAV_DISTANCE_SENSOR _get_mav_distance_sensor_type() const override { + MAV_DISTANCE_SENSOR _get_mav_distance_sensor_type() const override { return MAV_DISTANCE_SENSOR_ULTRASOUND; } diff --git a/libraries/AP_RangeFinder/AP_RangeFinder_Lanbao.h b/libraries/AP_RangeFinder/AP_RangeFinder_Lanbao.h index f5009cd0fa..593ca2b030 100644 --- a/libraries/AP_RangeFinder/AP_RangeFinder_Lanbao.h +++ b/libraries/AP_RangeFinder/AP_RangeFinder_Lanbao.h @@ -17,7 +17,7 @@ public: protected: - virtual MAV_DISTANCE_SENSOR _get_mav_distance_sensor_type() const override { + MAV_DISTANCE_SENSOR _get_mav_distance_sensor_type() const override { return MAV_DISTANCE_SENSOR_LASER; } diff --git a/libraries/AP_RangeFinder/AP_RangeFinder_LeddarOne.h b/libraries/AP_RangeFinder/AP_RangeFinder_LeddarOne.h index cf51ba1246..b2b8dddee3 100644 --- a/libraries/AP_RangeFinder/AP_RangeFinder_LeddarOne.h +++ b/libraries/AP_RangeFinder/AP_RangeFinder_LeddarOne.h @@ -46,7 +46,7 @@ public: protected: - virtual MAV_DISTANCE_SENSOR _get_mav_distance_sensor_type() const override { + MAV_DISTANCE_SENSOR _get_mav_distance_sensor_type() const override { return MAV_DISTANCE_SENSOR_LASER; } diff --git a/libraries/AP_RangeFinder/AP_RangeFinder_LightWareSerial.h b/libraries/AP_RangeFinder/AP_RangeFinder_LightWareSerial.h index 32ed7e8c72..dd59ca6507 100644 --- a/libraries/AP_RangeFinder/AP_RangeFinder_LightWareSerial.h +++ b/libraries/AP_RangeFinder/AP_RangeFinder_LightWareSerial.h @@ -12,7 +12,7 @@ public: protected: - virtual MAV_DISTANCE_SENSOR _get_mav_distance_sensor_type() const override { + MAV_DISTANCE_SENSOR _get_mav_distance_sensor_type() const override { return MAV_DISTANCE_SENSOR_LASER; } diff --git a/libraries/AP_RangeFinder/AP_RangeFinder_NMEA.h b/libraries/AP_RangeFinder/AP_RangeFinder_NMEA.h index 4bb53c9338..74b95eaa4e 100644 --- a/libraries/AP_RangeFinder/AP_RangeFinder_NMEA.h +++ b/libraries/AP_RangeFinder/AP_RangeFinder_NMEA.h @@ -27,7 +27,7 @@ public: protected: - virtual MAV_DISTANCE_SENSOR _get_mav_distance_sensor_type() const override { + MAV_DISTANCE_SENSOR _get_mav_distance_sensor_type() const override { return MAV_DISTANCE_SENSOR_ULTRASOUND; } diff --git a/libraries/AP_RangeFinder/AP_RangeFinder_Wasp.h b/libraries/AP_RangeFinder/AP_RangeFinder_Wasp.h index b9d3bbc12f..2c8e5d9674 100644 --- a/libraries/AP_RangeFinder/AP_RangeFinder_Wasp.h +++ b/libraries/AP_RangeFinder/AP_RangeFinder_Wasp.h @@ -24,7 +24,7 @@ protected: return 115200; } - virtual MAV_DISTANCE_SENSOR _get_mav_distance_sensor_type() const override { + MAV_DISTANCE_SENSOR _get_mav_distance_sensor_type() const override { return MAV_DISTANCE_SENSOR_LASER; }