Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-10 01:48:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rover: removed SONAR_TYPE option

Browse Source 
now set the values in the object
This commit is contained in:
Andrew Tridgell 2013-03-01 12:59:31 +11:00
parent d0f27f8830
commit 6dd549dea8
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
APMrover2/Parameters.h
View File

@ -99,7 +99,6 @@ public:
// obstacle control // obstacle control
k_param_sonar_enabled = 190, k_param_sonar_enabled = 190,
k_param_sonar, // sonar object k_param_sonar, // sonar object
k_param_sonar_type,
k_param_sonar_trigger_cm, k_param_sonar_trigger_cm,
k_param_sonar_turn_angle, k_param_sonar_turn_angle,
k_param_sonar_turn_time, k_param_sonar_turn_time,
@ -204,8 +203,6 @@ public:
// obstacle control // obstacle control
AP_Int8 sonar_enabled; 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_Int16 sonar_trigger_cm;
AP_Float sonar_turn_angle; AP_Float sonar_turn_angle;
AP_Float sonar_turn_time; AP_Float sonar_turn_time;

5
APMrover2/Parameters.pde
View File

@ -282,11 +282,6 @@ const AP_Param::Info var_info[] PROGMEM = {
// @User: Standard // @User: Standard
GSCALAR(sonar_turn_time, "SONAR_TURN_TIME", 2.0f), 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 // @Param: MODE_CH
// @DisplayName: Mode channel // @DisplayName: Mode channel
// @Description: RC Channel to use for driving mode control // @Description: RC Channel to use for driving mode control