From 721f55e93cfe93683a3769909332f1e543ecc20f Mon Sep 17 00:00:00 2001 From: LukeMike Date: Sat, 3 Feb 2018 14:59:45 +0100 Subject: [PATCH] VRBRAIN / AP_RangeFinder: removed AP_RangeFinder_PX4_PWM for VR Brain boards --- libraries/AP_RangeFinder/AP_RangeFinder_PX4_PWM.cpp | 2 +- libraries/AP_RangeFinder/RangeFinder.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/AP_RangeFinder/AP_RangeFinder_PX4_PWM.cpp b/libraries/AP_RangeFinder/AP_RangeFinder_PX4_PWM.cpp index d68a761edc..5c61fbe6d8 100644 --- a/libraries/AP_RangeFinder/AP_RangeFinder_PX4_PWM.cpp +++ b/libraries/AP_RangeFinder/AP_RangeFinder_PX4_PWM.cpp @@ -15,7 +15,7 @@ #include -#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 || CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN +#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 #include #include "AP_RangeFinder_PX4_PWM.h" diff --git a/libraries/AP_RangeFinder/RangeFinder.cpp b/libraries/AP_RangeFinder/RangeFinder.cpp index f9c059af76..292e4843fc 100644 --- a/libraries/AP_RangeFinder/RangeFinder.cpp +++ b/libraries/AP_RangeFinder/RangeFinder.cpp @@ -654,7 +654,7 @@ void RangeFinder::detect_instance(uint8_t instance) hal.i2c_mgr->get_device(0, 0x29))); } break; -#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 || CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN +#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 case RangeFinder_TYPE_PX4_PWM: if (AP_RangeFinder_PX4_PWM::detect()) { state[instance].instance = instance;