From 6dd549dea8bc67453b6327c3cd632e9408e5cf21 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 1 Mar 2013 12:59:31 +1100
Subject: [PATCH] Rover: removed SONAR_TYPE option

now set the values in the object
---
 APMrover2/Parameters.h   | 3 ---
 APMrover2/Parameters.pde | 5 -----
 2 files changed, 8 deletions(-)

diff --git a/APMrover2/Parameters.h b/APMrover2/Parameters.h
index 18f76fd3e4..2b06eaae56 100644
--- a/APMrover2/Parameters.h
+++ b/APMrover2/Parameters.h
@@ -99,7 +99,6 @@ public:
         // obstacle control
         k_param_sonar_enabled = 190,
         k_param_sonar, // sonar object
-        k_param_sonar_type,
         k_param_sonar_trigger_cm,
         k_param_sonar_turn_angle,
         k_param_sonar_turn_time,
@@ -204,8 +203,6 @@ public:
 
     // obstacle control
     AP_Int8	    sonar_enabled;
-	AP_Int8	    sonar_type;   // 0 = XL, 1 = LV, 2 = XLL (XL with 10m
-                              // range), // 3 = HRLV 
     AP_Int16    sonar_trigger_cm;
     AP_Float    sonar_turn_angle;
     AP_Float    sonar_turn_time;
diff --git a/APMrover2/Parameters.pde b/APMrover2/Parameters.pde
index ecb752e591..59d1b11c78 100644
--- a/APMrover2/Parameters.pde
+++ b/APMrover2/Parameters.pde
@@ -282,11 +282,6 @@ const AP_Param::Info var_info[] PROGMEM = {
 	// @User: Standard
 	GSCALAR(sonar_turn_time,    "SONAR_TURN_TIME",     2.0f),
 
-
-	// add sonar scaling, min, max params
-	GSCALAR(sonar_type,	        "SONAR_TYPE",       AP_RANGEFINDER_MAXSONARXL),
-
-
     // @Param: MODE_CH
     // @DisplayName: Mode channel
     // @Description: RC Channel to use for driving mode control