From 88c2f566179e264a21ee556e2a1c925d5a08c9e1 Mon Sep 17 00:00:00 2001 From: "rmackay9@yahoo.com" Date: Sun, 4 Sep 2011 06:53:40 +0000 Subject: [PATCH] ACM - removed references to MaxSonar LV sonar git-svn-id: https://arducopter.googlecode.com/svn/trunk@3236 f9c3cf11-9bcb-44bc-f272-b75c42450872 --- ArduCopterMega/ArduCopterMega.pde | 6 ++---- ArduCopterMega/defines.h | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ArduCopterMega/ArduCopterMega.pde b/ArduCopterMega/ArduCopterMega.pde index e319cbad4e..2f3b0d1de8 100644 --- a/ArduCopterMega/ArduCopterMega.pde +++ b/ArduCopterMega/ArduCopterMega.pde @@ -225,10 +225,8 @@ ModeFilter sonar_mode_filter; #if SONAR_TYPE == MAX_SONAR_XL AP_RangeFinder_MaxsonarXL sonar(&adc, &sonar_mode_filter);//(SONAR_PORT, &adc); -#elif SONAR_TYPE == MAX_SONAR_LV - // XXX honestly I think these output the same values - // If someone knows, can they confirm it? - AP_RangeFinder_MaxsonarXL sonar(&adc, &sonar_mode_filter);//(SONAR_PORT, &adc); +#else + #error Unrecognised SONAR_TYPE setting. #endif //////////////////////////////////////////////////////////////////////////////// diff --git a/ArduCopterMega/defines.h b/ArduCopterMega/defines.h index ca0e2cc068..6855fda4d3 100644 --- a/ArduCopterMega/defines.h +++ b/ArduCopterMega/defines.h @@ -62,9 +62,8 @@ #define GPS_PROTOCOL_AUTO 7 // SONAR types: - -#define MAX_SONAR_XL 0 -#define MAX_SONAR_LV 1 +#define MAX_SONAR_UNKNOWN 0 +#define MAX_SONAR_XL 1 // Radio channels // Note channels are from 0!