Browse Source

AP_Module: fixed AP_MODULE_SUPPORTED defines

master
Andrew Tridgell 7 years ago
parent
commit
61892036f8
  1. 6
      libraries/AP_Module/AP_Module.cpp
  2. 11
      libraries/AP_Module/AP_Module.h

6
libraries/AP_Module/AP_Module.cpp

@ -13,6 +13,10 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <AP_HAL/AP_HAL.h>
#if AP_MODULE_SUPPORTED
/* /*
support for external modules support for external modules
*/ */
@ -280,3 +284,5 @@ void AP_Module::call_hook_accel_sample(uint8_t instance, float dt, const Vector3
} }
#endif #endif
} }
#endif // AP_MODULE_SUPPORTED

11
libraries/AP_Module/AP_Module.h

@ -28,13 +28,10 @@
#pragma once #pragma once
#include <AP_HAL/AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <AP_AHRS/AP_AHRS.h>
#ifdef HAVE_LIBDL #if AP_MODULE_SUPPORTED
#define AP_MODULE_SUPPORTED 1
#else #include <AP_AHRS/AP_AHRS.h>
#define AP_MODULE_SUPPORTED 0
#endif
#ifndef AP_MODULE_DEFAULT_DIRECTORY #ifndef AP_MODULE_DEFAULT_DIRECTORY
#define AP_MODULE_DEFAULT_DIRECTORY "/usr/lib/ardupilot/modules" #define AP_MODULE_DEFAULT_DIRECTORY "/usr/lib/ardupilot/modules"
@ -90,3 +87,5 @@ private:
// scan a module for hooks // scan a module for hooks
static void module_scan(const char *path); static void module_scan(const char *path);
}; };
#endif // AP_MODULE_SUPPORTED

Loading…
Cancel
Save