[incubator-nuttx] branch master updated: bmp280: minor fixes

[acassis]

This is an automated email from the ASF dual-hosted git repository.

acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 1b8e931  bmp280: minor fixes
1b8e931 is described below

commit 1b8e9312dc98983a1c082f69f8ad79fc71e9260b
Author: Matias N <mat...@protobits.dev>
AuthorDate: Mon Jan 18 13:30:29 2021 -0300

    bmp280: minor fixes
    
    Fixed a minor typo, a missing break in switch (gave error while
    actually did the right thing) and added settable I2C frequency
---
 drivers/sensors/Kconfig  | 8 ++++++++
 drivers/sensors/bmp280.c | 9 +++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/sensors/Kconfig b/drivers/sensors/Kconfig
index 0ac30e2..4cdc96c 100644
--- a/drivers/sensors/Kconfig
+++ b/drivers/sensors/Kconfig
@@ -141,6 +141,14 @@ config SENSORS_BMP280
        ---help---
                Enable driver for the Bosch BMP280 barometic pressure sensor.
 
+if SENSORS_BMP280
+
+config BMP280_I2C_FREQUENCY
+       int "BMP280 I2C frequency"
+       default 400000
+
+endif # SENSORS_BMP280
+
 config SENSORS_DHTXX
        bool "DHTxx humidity/temperature Sensor support"
        default n
diff --git a/drivers/sensors/bmp280.c b/drivers/sensors/bmp280.c
index beca4f6..b646153 100644
--- a/drivers/sensors/bmp280.c
+++ b/drivers/sensors/bmp280.c
@@ -56,7 +56,7 @@
  ****************************************************************************/
 
 #define BMP280_ADDR         0x76
-#define BMP280_FREQ         400000
+#define BMP280_FREQ         CONFIG_BMP280_I2C_FREQUENCY
 #define DEVID               0x58
 
 #define BMP280_DIG_T1_LSB   0x88
@@ -539,7 +539,7 @@ static uint32_t bmp280_getpressure(FAR struct bmp280_dev_s 
*priv)
   press = (uint32_t)COMBINE(buf);
   temp = COMBINE(&buf[3]);
 
-  sninfo("press = %d, temp = %d\n", press, temp);
+  sninfo("press = %"PRIu32", temp = %"PRIi32"\n", press, temp);
 
   if (priv->compensated == ENABLE_COMPENSATED)
     {
@@ -566,7 +566,7 @@ static uint32_t bmp280_gettemp(FAR struct bmp280_dev_s 
*priv)
 
   temp = COMBINE(buf);
 
-  sninfo("temp = %d\n", temp);
+  sninfo("temp = %"PRIi32"\n", temp);
 
   if (priv->compensated == ENABLE_COMPENSATED)
     {
@@ -589,7 +589,7 @@ static int bmp280_open(FAR struct file *filep)
   FAR struct inode        *inode = filep->f_inode;
   FAR struct bmp280_dev_s *priv  = inode->i_private;
 
-  /* Set power mode to normal and standard sampling resolusion. */
+  /* Set power mode to normal and standard sampling resolution. */
 
   bmp280_putreg8(priv, BMP280_CTRL_MEAS, BMP280_NORMAL_MODE |
                  BMP280_OS_STANDARD_RES);
@@ -671,6 +671,7 @@ static int bmp280_ioctl(FAR struct file *filep, int cmd, 
unsigned long arg)
 
       case SNIOC_GET_TEMP:
         *(uint32_t *)arg = bmp280_gettemp(priv);
+        break;
 
       default:
         snerr("Unrecognized cmd: %d\n", cmd);