From db37cd8c7168d00a1ce47312d995eac006defdc1 Mon Sep 17 00:00:00 2001
From: liubaoxu <623619755@qq.com>
Date: Sat, 20 Apr 2019 11:49:04 +0800
Subject: [PATCH] BMP280:fix definition misspelling
from BPM280 to BMP280
---
src/drivers/barometer/bmp280/bmp280.cpp | 20 +++---
src/drivers/barometer/bmp280/bmp280.h | 84 ++++++++++++-------------
2 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/src/drivers/barometer/bmp280/bmp280.cpp b/src/drivers/barometer/bmp280/bmp280.cpp
index ba98fdd46c..f90bfbc430 100644
--- a/src/drivers/barometer/bmp280/bmp280.cpp
+++ b/src/drivers/barometer/bmp280/bmp280.cpp
@@ -214,23 +214,23 @@ BMP280::init()
_class_instance = register_class_devname(BARO_BASE_DEVICE_PATH);
/* reset sensor */
- _interface->set_reg(BPM280_VALUE_RESET, BPM280_ADDR_RESET);
+ _interface->set_reg(BMP280_VALUE_RESET, BMP280_ADDR_RESET);
usleep(10000);
/* check id*/
- if (_interface->get_reg(BPM280_ADDR_ID) != BPM280_VALUE_ID) {
- PX4_WARN("id of your baro is not: 0x%02x", BPM280_VALUE_ID);
+ if (_interface->get_reg(BMP280_ADDR_ID) != BMP280_VALUE_ID) {
+ PX4_WARN("id of your baro is not: 0x%02x", BMP280_VALUE_ID);
return -EIO;
}
/* set config, recommended settings */
- _curr_ctrl = BPM280_CTRL_P16 | BPM280_CTRL_T2;
- _interface->set_reg(_curr_ctrl, BPM280_ADDR_CTRL);
- _max_mesure_ticks = USEC2TICK(BPM280_MT_INIT + BPM280_MT * (16 - 1 + 2 - 1));
- _interface->set_reg(BPM280_CONFIG_F16, BPM280_ADDR_CONFIG);
+ _curr_ctrl = BMP280_CTRL_P16 | BMP280_CTRL_T2;
+ _interface->set_reg(_curr_ctrl, BMP280_ADDR_CTRL);
+ _max_mesure_ticks = USEC2TICK(BMP280_MT_INIT + BMP280_MT * (16 - 1 + 2 - 1));
+ _interface->set_reg(BMP280_CONFIG_F16, BMP280_ADDR_CONFIG);
/* get calibration and pre process them*/
- _cal = _interface->get_calibration(BPM280_ADDR_CAL);
+ _cal = _interface->get_calibration(BMP280_ADDR_CAL);
_fcal.t1 = _cal->t1 * powf(2, 4);
_fcal.t2 = _cal->t2 * powf(2, -14);
@@ -445,7 +445,7 @@ BMP280::measure()
perf_begin(_measure_perf);
/* start measure */
- int ret = _interface->set_reg(_curr_ctrl | BPM280_CTRL_MODE_FORCE, BPM280_ADDR_CTRL);
+ int ret = _interface->set_reg(_curr_ctrl | BMP280_CTRL_MODE_FORCE, BMP280_ADDR_CTRL);
if (ret != OK) {
perf_count(_comms_errors);
@@ -470,7 +470,7 @@ BMP280::collect()
report.timestamp = hrt_absolute_time();
report.error_count = perf_event_count(_comms_errors);
- bmp280::data_s *data = _interface->get_data(BPM280_ADDR_DATA);
+ bmp280::data_s *data = _interface->get_data(BMP280_ADDR_DATA);
if (data == nullptr) {
perf_count(_comms_errors);
diff --git a/src/drivers/barometer/bmp280/bmp280.h b/src/drivers/barometer/bmp280/bmp280.h
index eec07a2bea..b26096a414 100644
--- a/src/drivers/barometer/bmp280/bmp280.h
+++ b/src/drivers/barometer/bmp280/bmp280.h
@@ -38,48 +38,48 @@
*/
#pragma once
-#define BPM280_ADDR_CAL 0x88 /* address of 12x 2 bytes calibration data */
-#define BPM280_ADDR_DATA 0xF7 /* address of 2x 3 bytes p-t data */
-
-#define BPM280_ADDR_CONFIG 0xF5 /* configuration */
-#define BPM280_ADDR_CTRL 0xF4 /* controll */
-#define BPM280_ADDR_STATUS 0xF3 /* state */
-#define BPM280_ADDR_RESET 0xE0 /* reset */
-#define BPM280_ADDR_ID 0xD0 /* id */
-
-#define BPM280_VALUE_ID 0x58 /* chip id */
-#define BPM280_VALUE_RESET 0xB6 /* reset */
-
-#define BPM280_STATUS_MEASURING (1<<3) /* if in process of measure */
-#define BPM280_STATUS_COPING (1<<0) /* if in process of data copy */
-
-#define BPM280_CTRL_P0 (0x0<<2) /* no p measure */
-#define BPM280_CTRL_P1 (0x1<<2)
-#define BPM280_CTRL_P2 (0x2<<2)
-#define BPM280_CTRL_P4 (0x3<<2)
-#define BPM280_CTRL_P8 (0x4<<2)
-#define BPM280_CTRL_P16 (0x5<<2)
-
-#define BPM280_CTRL_T0 (0x0<<5) /* no t measure */
-#define BPM280_CTRL_T1 (0x1<<5)
-#define BPM280_CTRL_T2 (0x2<<5)
-#define BPM280_CTRL_T4 (0x3<<5)
-#define BPM280_CTRL_T8 (0x4<<5)
-#define BPM280_CTRL_T16 (0x5<<5)
-
-#define BPM280_CONFIG_F0 (0x0<<2) /* no filter */
-#define BPM280_CONFIG_F2 (0x1<<2)
-#define BPM280_CONFIG_F4 (0x2<<2)
-#define BPM280_CONFIG_F8 (0x3<<2)
-#define BPM280_CONFIG_F16 (0x4<<2)
-
-
-#define BPM280_CTRL_MODE_SLEEP 0x0
-#define BPM280_CTRL_MODE_FORCE 0x1 /* on demand, goes to sleep after */
-#define BPM280_CTRL_MODE_NORMAL 0x3
-
-#define BPM280_MT_INIT 6400 /* max measure time of initial p + t in us */
-#define BPM280_MT 2300 /* max measure time of p or t in us */
+#define BMP280_ADDR_CAL 0x88 /* address of 12x 2 bytes calibration data */
+#define BMP280_ADDR_DATA 0xF7 /* address of 2x 3 bytes p-t data */
+
+#define BMP280_ADDR_CONFIG 0xF5 /* configuration */
+#define BMP280_ADDR_CTRL 0xF4 /* controll */
+#define BMP280_ADDR_STATUS 0xF3 /* state */
+#define BMP280_ADDR_RESET 0xE0 /* reset */
+#define BMP280_ADDR_ID 0xD0 /* id */
+
+#define BMP280_VALUE_ID 0x58 /* chip id */
+#define BMP280_VALUE_RESET 0xB6 /* reset */
+
+#define BMP280_STATUS_MEASURING (1<<3) /* if in process of measure */
+#define BMP280_STATUS_COPING (1<<0) /* if in process of data copy */
+
+#define BMP280_CTRL_P0 (0x0<<2) /* no p measure */
+#define BMP280_CTRL_P1 (0x1<<2)
+#define BMP280_CTRL_P2 (0x2<<2)
+#define BMP280_CTRL_P4 (0x3<<2)
+#define BMP280_CTRL_P8 (0x4<<2)
+#define BMP280_CTRL_P16 (0x5<<2)
+
+#define BMP280_CTRL_T0 (0x0<<5) /* no t measure */
+#define BMP280_CTRL_T1 (0x1<<5)
+#define BMP280_CTRL_T2 (0x2<<5)
+#define BMP280_CTRL_T4 (0x3<<5)
+#define BMP280_CTRL_T8 (0x4<<5)
+#define BMP280_CTRL_T16 (0x5<<5)
+
+#define BMP280_CONFIG_F0 (0x0<<2) /* no filter */
+#define BMP280_CONFIG_F2 (0x1<<2)
+#define BMP280_CONFIG_F4 (0x2<<2)
+#define BMP280_CONFIG_F8 (0x3<<2)
+#define BMP280_CONFIG_F16 (0x4<<2)
+
+
+#define BMP280_CTRL_MODE_SLEEP 0x0
+#define BMP280_CTRL_MODE_FORCE 0x1 /* on demand, goes to sleep after */
+#define BMP280_CTRL_MODE_NORMAL 0x3
+
+#define BMP280_MT_INIT 6400 /* max measure time of initial p + t in us */
+#define BMP280_MT 2300 /* max measure time of p or t in us */
namespace bmp280
{
--
GitLab