Cleaned macros and defaulted to using floating point compensation

diff --git a/README.md b/README.md
index ce5eb3643847a5b8d41db957d8ad9ec968b779bf..312aeff761f93a477bd8b3edcd9a26d5cae409d8 100644 (file)
--- a/README.md
+++ b/README.md
@@ -4,12 +4,6 @@ This package contains the Bosch Sensortec's BME280 pressure sensor driver (senso
 \r
 The sensor driver package includes bme280.c, bme280.h and bme280_defs.h files.\r
 \r
 \r
 The sensor driver package includes bme280.c, bme280.h and bme280_defs.h files.\r
 \r

-## Version\r
-File          | Version | Date\r
---------------|---------|------------\r
-bme280.c      |  3.4.2  | 21 Jan 2020\r
-bme280.h      |  3.4.2  | 21 Jan 2020\r
-bme280_defs.h |  3.4.2  | 21 Jan 2020\r

 \r
 ## Integration details\r
 * Integrate bme280.h, bme280_defs.h and bme280.c file in to the project.\r
 \r
 ## Integration details\r
 * Integrate bme280.h, bme280_defs.h and bme280.c file in to the project.\r


@@ -300,6 +294,4 @@ int8_t user_i2c_write(uint8_t dev_id, uint8_t reg_addr, uint8_t *reg_data, uint1
     return rslt;\r
 }\r
 \r
     return rslt;\r
 }\r
 \r

-```\r
-\r
-## Copyright (C) 2016 - 2017 Bosch Sensortec GmbH
\ No newline at end of file
+```
\ No newline at end of file

diff --git a/bme280.c b/bme280.c
index 0fcc1d758141346162a00aabcbf54b9c73f20a29..c3eabb58f7ce7412b924144775c9550e44b131d6 100644 (file)
--- a/bme280.c
+++ b/bme280.c
@@ -30,9 +30,9 @@
 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\r
 * POSSIBILITY OF SUCH DAMAGE.\r
 *\r
 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\r
 * POSSIBILITY OF SUCH DAMAGE.\r
 *\r

-* @file bme280.c\r
-* @date 21/01/2020\r
-* @version  3.4.2\r
+* @file        bme280.c\r
+* @date        2020-01-24\r
+* @version     v3.4.3\r

 *\r
 */\r
 \r
 *\r
 */\r
 \r


@@ -1203,7 +1203,7 @@ static int32_t compensate_temperature(const struct bme280_uncomp_data *uncomp_da
 \r
     return temperature;\r
 }\r
 \r
     return temperature;\r
 }\r

-#ifdef BME280_64BIT_ENABLE\r
+#ifndef BME280_32BIT_ENABLE /* 64 bit compensation for pressure data */\r

 \r
 /*!\r
  * @brief This internal API is used to compensate the raw pressure data and\r
 \r
 /*!\r
  * @brief This internal API is used to compensate the raw pressure data and\r


@@ -1254,7 +1254,7 @@ static uint32_t compensate_pressure(const struct bme280_uncomp_data *uncomp_data
 \r
     return pressure;\r
 }\r
 \r
     return pressure;\r
 }\r

-#else\r
+#else /* 32 bit compensation for pressure data */\r

 \r
 /*!\r
  * @brief This internal API is used to compensate the raw pressure data and\r
 \r
 /*!\r
  * @brief This internal API is used to compensate the raw pressure data and\r

diff --git a/bme280.h b/bme280.h
index cfb96e733470bf057ba4ec7e35539c1cea41ee80..9f9f5afcdb9054fa020fb9a13907dac2ced4a563 100644 (file)
--- a/bme280.h
+++ b/bme280.h
@@ -30,9 +30,9 @@
 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\r
 * POSSIBILITY OF SUCH DAMAGE.\r
 *\r
 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\r
 * POSSIBILITY OF SUCH DAMAGE.\r
 *\r

-* @file bme280.h\r
-* @date 21/01/2020\r
-* @version  3.4.2\r
+* @file        bme280.h\r
+* @date        2020-01-24\r
+* @version     v3.4.3\r

 *\r
 */\r
 \r
 *\r
 */\r
 \r

diff --git a/bme280_defs.h b/bme280_defs.h
index 900115df12cf232ad4d3c4feea76e8f2b4c4bd10..cf141cd083d2a7d0dc09b7707488b2d7d519b3e0 100644 (file)
--- a/bme280_defs.h
+++ b/bme280_defs.h
@@ -30,9 +30,9 @@
 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\r
 * POSSIBILITY OF SUCH DAMAGE.\r
 *\r
 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\r
 * POSSIBILITY OF SUCH DAMAGE.\r
 *\r

-* @file bme280_defs.h\r
-* @date 21/01/2020\r
-* @version  3.4.2\r
+* @file        bme280_defs.h\r
+* @date        2020-01-24\r
+* @version     v3.4.3\r

 *\r
 */\r
 \r
 *\r
 */\r
 \r


@@ -93,14 +93,11 @@
 \r
 /********************************************************/\r
 \r
 \r
 /********************************************************/\r
 \r

-#ifndef BME280_FLOAT_ENABLE\r
-\r
-/* #define BME280_FLOAT_ENABLE */\r
+#ifndef BME280_64BIT_ENABLE /* Check if 64-bit integer (using BME280_64BIT_ENABLE) is enabled */\r
+#ifndef BME280_32BIT_ENABLE /* Check if 32-bit integer (using BME280_32BIT_ENABLE) is enabled */\r
+#ifndef BME280_FLOAT_ENABLE /* If any of the integer data types not enabled then enable BME280_FLOAT_ENABLE */\r
+#define BME280_FLOAT_ENABLE\r

 #endif\r
 #endif\r

-\r
-#ifndef BME280_FLOAT_ENABLE\r
-#ifndef BME280_64BIT_ENABLE\r
-#define BME280_64BIT_ENABLE\r

 #endif\r
 #endif\r
 \r
 #endif\r
 #endif\r
 \r

diff --git a/examples/linux_userspace.c b/examples/linux_userspace.c
index c360eb07f2ad9350812e5f99ac6abb49a24da810..62c8eb5cce8ac05ed257852fe7ef0ba36a8a426a 100644 (file)
--- a/examples/linux_userspace.c
+++ b/examples/linux_userspace.c
@@ -1,40 +1,9 @@
-/**\r
-* Copyright (c) 2020 Bosch Sensortec GmbH. All rights reserved.\r
-*\r
-* BSD-3-Clause\r
-*\r
-* Redistribution and use in source and binary forms, with or without\r
-* modification, are permitted provided that the following conditions are met:\r
-*\r
-* 1. Redistributions of source code must retain the above copyright\r
-*    notice, this list of conditions and the following disclaimer.\r
-*\r
-* 2. Redistributions in binary form must reproduce the above copyright\r
-*    notice, this list of conditions and the following disclaimer in the\r
-*    documentation and/or other materials provided with the distribution.\r
-*\r
-* 3. Neither the name of the copyright holder nor the names of its\r
-*    contributors may be used to endorse or promote products derived from\r
-*    this software without specific prior written permission.\r
-*\r
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\r
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\r
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS\r
-* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE\r
-* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\r
-* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\r
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\r
-* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\r
-* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\r
-* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING\r
-* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\r
-* POSSIBILITY OF SUCH DAMAGE.\r
-*\r
-* @file linux_userspace.c\r
-* @date 10/01/2020\r
-* @version\r
-*\r
-*/\r
+/*\r
+ * Copyright (C) 2020 Bosch Sensortec GmbH\r
+ *\r
+ * The license is available at root folder\r
+ *\r
+ */\r

 \r
 /*!\r
  * @ingroup bme280GroupExample\r
 \r
 /*!\r
  * @ingroup bme280GroupExample\r

diff --git a/selftest/bme280_selftest.c b/selftest/bme280_selftest.c
index 9afbc5593b3005f3be044de233763ec1a4278c63..4bce46c256450eef97e7f096be545fa419db1a04 100644 (file)
--- a/selftest/bme280_selftest.c
+++ b/selftest/bme280_selftest.c
@@ -30,9 +30,9 @@
 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\r
 * POSSIBILITY OF SUCH DAMAGE.\r
 *\r
 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\r
 * POSSIBILITY OF SUCH DAMAGE.\r
 *\r

-* @file bme280_selftest.c\r
-* @date 21/01/2020\r
-* @version  3.4.2\r
+* @file        bme280_selftest.c\r
+* @date        2020-01-24\r
+* @version     v3.4.3\r

 *\r
 */\r
 \r
 *\r
 */\r
 \r

diff --git a/selftest/bme280_selftest.h b/selftest/bme280_selftest.h
index adb6d1ce3a9824ba6e927de5f61c17190fe22c5a..e1908db36d7f476506c7a8bf6163657d24759562 100644 (file)
--- a/selftest/bme280_selftest.h
+++ b/selftest/bme280_selftest.h
@@ -30,9 +30,9 @@
 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\r
 * POSSIBILITY OF SUCH DAMAGE.\r
 *\r
 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\r
 * POSSIBILITY OF SUCH DAMAGE.\r
 *\r

-* @file bme280_selftest.h\r
-* @date 21/01/2020\r
-* @version  3.4.2\r
+* @file        bme280_selftest.h\r
+* @date        2020-01-24\r
+* @version     v3.4.3\r

 *\r
 */\r
 \r
 *\r
 */\r
 \r