From d05454ec369325a14cbda4186151831ac3e03191 Mon Sep 17 00:00:00 2001 From: Jacob Walser Date: Thu, 6 Apr 2017 17:28:58 -0400 Subject: [PATCH] Sub: Remove ambiguous #define MAGNETOMETER --- ArduSub/Parameters.cpp | 2 +- ArduSub/config.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ArduSub/Parameters.cpp b/ArduSub/Parameters.cpp index ed57455313..9e6a719b0f 100644 --- a/ArduSub/Parameters.cpp +++ b/ArduSub/Parameters.cpp @@ -177,7 +177,7 @@ const AP_Param::Info Sub::var_info[] = { // @Description: Setting this to Enabled(1) will enable the compass. Setting this to Disabled(0) will disable the compass // @Values: 0:Disabled,1:Enabled // @User: Standard - GSCALAR(compass_enabled, "MAG_ENABLE", MAGNETOMETER), + GSCALAR(compass_enabled, "MAG_ENABLE", ENABLED), // @Param: WP_YAW_BEHAVIOR // @DisplayName: Yaw behaviour during missions diff --git a/ArduSub/config.h b/ArduSub/config.h index 983c5da8be..9a3feec41a 100644 --- a/ArduSub/config.h +++ b/ArduSub/config.h @@ -38,8 +38,6 @@ #error CONFIG_HAL_BOARD must be defined to build ArduSub #endif -#define MAGNETOMETER ENABLED - // run at 400Hz on all systems # define MAIN_LOOP_RATE 400 # define MAIN_LOOP_SECONDS 0.0025f