From eeda6f6c8c893f33a7eb81b1315252e69ce1fa47 Mon Sep 17 00:00:00 2001
From: Josar <Josar@users.noreply.github.com>
Date: Wed, 28 Feb 2018 12:38:48 +0100
Subject: [PATCH] driver/adxl345: rename enums to avoid conflicts
---
drivers/include/adxl345.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/include/adxl345.h b/drivers/include/adxl345.h
index 26bc70d60c..5b177989f8 100644
--- a/drivers/include/adxl345.h
+++ b/drivers/include/adxl345.h
@@ -82,18 +82,18 @@ enum {
* @brief List fifo mode
*/
enum {
- BYPASS = 0, /**< FIFO bypass mode */
- FIFO = 1, /**< FIFO mode */
- STREAM = 2, /**< FIFO stream mode */
- TRIGGER = 3 /**< FIFO trigger mode */
+ ADXL345_BYPASS = 0, /**< FIFO bypass mode */
+ ADXL345_FIFO = 1, /**< FIFO mode */
+ ADXL345_STREAM = 2, /**< FIFO stream mode */
+ ADXL345_TRIGGER = 3 /**< FIFO trigger mode */
};
/**
* @brief Output Interrupt selection
*/
enum {
- INT1, /**< Output interrupt on INT1 pin */
- INT2 /**< Output interrupt on INT2 pin */
+ ADXL345_INT1, /**< Output interrupt on INT1 pin */
+ ADXL345_INT2 /**< Output interrupt on INT2 pin */
};
/**
--
GitLab