]> git.itanic.dy.fi Git - BME280_driver/blobdiff - bme280.c
Corrected the magic numbers with valid names
[BME280_driver] / bme280.c
index b55511046b7a262c250385244dc0e8a03c522096..7680242e8405914043c681464fb93098caeab258 100644 (file)
--- a/bme280.c
+++ b/bme280.c
@@ -1,10 +1,10 @@
 /*
 ****************************************************************************
-* Copyright (C) 2013 - 2014 Bosch Sensortec GmbH
+* Copyright (C) 2013 - 2015 Bosch Sensortec GmbH
 *
 * bme280.c
-* Date: 2014/12/12
-* Revision: 2.0.3(Pressure and Temperature compensation code revision is 1.1
+* Date: 2015/03/27
+* Revision: 2.0.4(Pressure and Temperature compensation code revision is 1.1
 *               and Humidity compensation code revision is 1.0)
 *
 * Usage: Sensor Driver file for BME280 sensor
@@ -83,15 +83,17 @@ BME280_RETURN_FUNCTION_TYPE bme280_init(struct bme280_t *bme280)
 {
        /* used to return the communication result*/
        BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
-       u8 v_data_u8 = BME280_ZERO_U8X;
+       u8 v_data_u8 = BME280_INIT_VALUE;
+
        p_bme280 = bme280;
        /* assign BME280 ptr */
        com_rslt = p_bme280->BME280_BUS_READ_FUNC(p_bme280->dev_addr,
-       BME280_CHIP_ID_REG, &v_data_u8, BME280_ONE_U8X);
+       BME280_CHIP_ID_REG, &v_data_u8,
+       BME280_GEN_READ_WRITE_DATA_LENGTH);
        /* read Chip Id */
        p_bme280->chip_id = v_data_u8;
 
-       bme280_get_calib_param();
+       com_rslt += bme280_get_calib_param();
        /* readout bme280 calibparam structure */
        return com_rslt;
 }
@@ -120,10 +122,10 @@ s32 *v_uncomp_temperature_s32)
        /* Array holding the MSB and LSb value
        a_data_u8r[0] - Temperature MSB
        a_data_u8r[1] - Temperature LSB
-       a_data_u8r[2] - Temperature LSB
+       a_data_u8r[2] - Temperature XLSB
        */
-       u8 a_data_u8r[ARRAY_SIZE_THREE] = {
-       BME280_ZERO_U8X, BME280_ZERO_U8X, BME280_ZERO_U8X};
+       u8 a_data_u8r[BME280_TEMPERATURE_DATA_SIZE] = {
+       BME280_INIT_VALUE, BME280_INIT_VALUE, BME280_INIT_VALUE};
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
@@ -131,14 +133,15 @@ s32 *v_uncomp_temperature_s32)
                        com_rslt = p_bme280->BME280_BUS_READ_FUNC(
                        p_bme280->dev_addr,
                        BME280_TEMPERATURE_MSB_REG,
-                       a_data_u8r, BME280_THREE_U8X);
+                       a_data_u8r,
+                       BME280_TEMPERATURE_DATA_LENGTH);
                        *v_uncomp_temperature_s32 = (s32)(((
-                       (u32) (a_data_u8r[INDEX_ZERO]))
-                       << SHIFT_LEFT_12_POSITION) |
-                       (((u32)(a_data_u8r[INDEX_ONE]))
-                       << SHIFT_LEFT_4_POSITION)
-                       | ((u32)a_data_u8r[INDEX_TWO] >>
-                       SHIFT_RIGHT_4_POSITION));
+                       (u32) (a_data_u8r[BME280_TEMPERATURE_MSB_DATA]))
+                       << BME280_SHIFT_BIT_POSITION_BY_12_BITS) |
+                       (((u32)(a_data_u8r[BME280_TEMPERATURE_LSB_DATA]))
+                       << BME280_SHIFT_BIT_POSITION_BY_04_BITS)
+                       | ((u32)a_data_u8r[BME280_TEMPERATURE_XLSB_DATA] >>
+                       BME280_SHIFT_BIT_POSITION_BY_04_BITS));
                }
        return com_rslt;
 }
@@ -155,29 +158,34 @@ s32 *v_uncomp_temperature_s32)
  *  @return Returns the actual temperature
  *
 */
-s32 bme280_compensate_T_int32(s32 v_uncomp_temperature_s32)
+s32 bme280_compensate_temperature_int32(s32 v_uncomp_temperature_s32)
 {
-       s32 v_x1_u32r = BME280_ZERO_U8X;
-       s32 v_x2_u32r = BME280_ZERO_U8X;
-       s32 temperature = BME280_ZERO_U8X;
+       s32 v_x1_u32r = BME280_INIT_VALUE;
+       s32 v_x2_u32r = BME280_INIT_VALUE;
+       s32 temperature = BME280_INIT_VALUE;
 
-       v_x1_u32r  = ((((v_uncomp_temperature_s32
-       >> SHIFT_RIGHT_3_POSITION) - ((s32)
-       p_bme280->cal_param.dig_T1 << SHIFT_LEFT_1_POSITION))) *
-       ((s32)p_bme280->cal_param.dig_T2))
-       >> SHIFT_RIGHT_11_POSITION;
+       /* calculate x1*/
+       v_x1_u32r  =
+       ((((v_uncomp_temperature_s32
+       >> BME280_SHIFT_BIT_POSITION_BY_03_BITS) -
+       ((s32)p_bme280->cal_param.dig_T1
+       << BME280_SHIFT_BIT_POSITION_BY_01_BIT))) *
+       ((s32)p_bme280->cal_param.dig_T2)) >>
+       BME280_SHIFT_BIT_POSITION_BY_11_BITS;
+       /* calculate x2*/
        v_x2_u32r  = (((((v_uncomp_temperature_s32
-       >> SHIFT_RIGHT_4_POSITION) -
+       >> BME280_SHIFT_BIT_POSITION_BY_04_BITS) -
        ((s32)p_bme280->cal_param.dig_T1))
-       * ((v_uncomp_temperature_s32 >> SHIFT_RIGHT_4_POSITION) -
+       * ((v_uncomp_temperature_s32 >> BME280_SHIFT_BIT_POSITION_BY_04_BITS) -
        ((s32)p_bme280->cal_param.dig_T1)))
-       >> SHIFT_RIGHT_12_POSITION) *
+       >> BME280_SHIFT_BIT_POSITION_BY_12_BITS) *
        ((s32)p_bme280->cal_param.dig_T3))
-       >> SHIFT_RIGHT_14_POSITION;
+       >> BME280_SHIFT_BIT_POSITION_BY_14_BITS;
+       /* calculate t_fine*/
        p_bme280->cal_param.t_fine = v_x1_u32r + v_x2_u32r;
-       temperature  = (p_bme280->cal_param.t_fine
-       * BME280_FIVE_U8X + BME280_ONE_TWENTY_EIGHT_U8X)
-       >> SHIFT_RIGHT_8_POSITION;
+       /* calculate temperature*/
+       temperature  = (p_bme280->cal_param.t_fine * 5 + 128)
+       >> BME280_SHIFT_BIT_POSITION_BY_08_BITS;
        return temperature;
 }
 /*!
@@ -193,17 +201,16 @@ s32 bme280_compensate_T_int32(s32 v_uncomp_temperature_s32)
  *  @return Return the actual temperature as s16 output
  *
 */
-s16 bme280_compensate_T_int32_sixteen_bit_output(
+s16 bme280_compensate_temperature_int32_sixteen_bit_output(
 s32 v_uncomp_temperature_s32)
 {
-       s16 temperature = BME280_ZERO_U8X;
-       bme280_compensate_T_int32(v_uncomp_temperature_s32);
+       s16 temperature = BME280_INIT_VALUE;
+
+       bme280_compensate_temperature_int32(
+       v_uncomp_temperature_s32);
        temperature  = (s16)((((
-       p_bme280->cal_param.t_fine
-       - BME280_TEMP_1_2_2_8_8_0_DATA)
-       * BME280_TWENTY_FIVE_U8X)
-       + BME280_ONE_TWENTY_EIGHT_U8X)
-       >> SHIFT_RIGHT_8_POSITION);
+       p_bme280->cal_param.t_fine - 122880) * 25) + 128)
+       >> BME280_SHIFT_BIT_POSITION_BY_08_BITS);
 
        return temperature;
 }
@@ -234,10 +241,10 @@ s32 *v_uncomp_pressure_s32)
        /* Array holding the MSB and LSb value
        a_data_u8[0] - Pressure MSB
        a_data_u8[1] - Pressure LSB
-       a_data_u8[2] - Pressure LSB
+       a_data_u8[2] - Pressure XLSB
        */
-       u8 a_data_u8[ARRAY_SIZE_THREE] = {
-       BME280_ZERO_U8X, BME280_ZERO_U8X, BME280_ZERO_U8X};
+       u8 a_data_u8[BME280_PRESSURE_DATA_SIZE] = {
+       BME280_INIT_VALUE, BME280_INIT_VALUE, BME280_INIT_VALUE};
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
@@ -245,14 +252,14 @@ s32 *v_uncomp_pressure_s32)
                        com_rslt = p_bme280->BME280_BUS_READ_FUNC(
                        p_bme280->dev_addr,
                        BME280_PRESSURE_MSB_REG,
-                       a_data_u8, BME280_THREE_U8X);
+                       a_data_u8, BME280_PRESSURE_DATA_LENGTH);
                        *v_uncomp_pressure_s32 = (s32)((
-                       ((u32)(a_data_u8[INDEX_ZERO]))
-                       << SHIFT_LEFT_12_POSITION) |
-                       (((u32)(a_data_u8[INDEX_ONE]))
-                       << SHIFT_LEFT_4_POSITION) |
-                       ((u32)a_data_u8[INDEX_TWO] >>
-                       SHIFT_RIGHT_4_POSITION));
+                       ((u32)(a_data_u8[BME280_PRESSURE_MSB_DATA]))
+                       << BME280_SHIFT_BIT_POSITION_BY_12_BITS) |
+                       (((u32)(a_data_u8[BME280_PRESSURE_LSB_DATA]))
+                       << BME280_SHIFT_BIT_POSITION_BY_04_BITS) |
+                       ((u32)a_data_u8[BME280_PRESSURE_XLSB_DATA] >>
+                       BME280_SHIFT_BIT_POSITION_BY_04_BITS));
                }
        return com_rslt;
 }
@@ -271,69 +278,75 @@ s32 *v_uncomp_pressure_s32)
  *  @return Return the actual pressure output as u32
  *
 */
-u32 bme280_compensate_P_int32(s32 v_uncomp_pressure_s32)
+u32 bme280_compensate_pressure_int32(s32 v_uncomp_pressure_s32)
 {
-       s32 v_x1_u32 = BME280_ZERO_U8X;
-       s32 v_x2_u32 = BME280_ZERO_U8X;
-       u32 v_pressure_u32 = BME280_ZERO_U8X;
+       s32 v_x1_u32 = BME280_INIT_VALUE;
+       s32 v_x2_u32 = BME280_INIT_VALUE;
+       u32 v_pressure_u32 = BME280_INIT_VALUE;
 
+       /* calculate x1*/
        v_x1_u32 = (((s32)p_bme280->cal_param.t_fine)
-       >> SHIFT_RIGHT_1_POSITION) -
-       (s32)BME280_PRESSURE_6_4_0_0_0_DATA;
-       v_x2_u32 = (((v_x1_u32 >> SHIFT_RIGHT_2_POSITION)
-       * (v_x1_u32 >> SHIFT_RIGHT_2_POSITION))
-       >> SHIFT_RIGHT_11_POSITION) *
-       ((s32)p_bme280->cal_param.dig_P6);
+       >> BME280_SHIFT_BIT_POSITION_BY_01_BIT) - (s32)64000;
+       /* calculate x2*/
+       v_x2_u32 = (((v_x1_u32 >> BME280_SHIFT_BIT_POSITION_BY_02_BITS)
+       * (v_x1_u32 >> BME280_SHIFT_BIT_POSITION_BY_02_BITS)
+       ) >> BME280_SHIFT_BIT_POSITION_BY_11_BITS)
+       * ((s32)p_bme280->cal_param.dig_P6);
+       /* calculate x2*/
        v_x2_u32 = v_x2_u32 + ((v_x1_u32 *
        ((s32)p_bme280->cal_param.dig_P5))
-       << SHIFT_LEFT_1_POSITION);
-       v_x2_u32 = (v_x2_u32 >> SHIFT_RIGHT_2_POSITION) +
+       << BME280_SHIFT_BIT_POSITION_BY_01_BIT);
+       /* calculate x2*/
+       v_x2_u32 = (v_x2_u32 >> BME280_SHIFT_BIT_POSITION_BY_02_BITS) +
        (((s32)p_bme280->cal_param.dig_P4)
-       << SHIFT_LEFT_16_POSITION);
-       v_x1_u32 = (((p_bme280->cal_param.dig_P3
-       * (((v_x1_u32 >> SHIFT_RIGHT_2_POSITION) *
-       (v_x1_u32 >> SHIFT_RIGHT_2_POSITION))
-       >> SHIFT_RIGHT_13_POSITION)) >> SHIFT_RIGHT_3_POSITION) +
+       << BME280_SHIFT_BIT_POSITION_BY_16_BITS);
+       /* calculate x1*/
+       v_x1_u32 = (((p_bme280->cal_param.dig_P3 *
+       (((v_x1_u32 >> BME280_SHIFT_BIT_POSITION_BY_02_BITS) *
+       (v_x1_u32 >> BME280_SHIFT_BIT_POSITION_BY_02_BITS))
+       >> BME280_SHIFT_BIT_POSITION_BY_13_BITS))
+       >> BME280_SHIFT_BIT_POSITION_BY_03_BITS) +
        ((((s32)p_bme280->cal_param.dig_P2) *
-       v_x1_u32) >> SHIFT_RIGHT_1_POSITION))
-       >> SHIFT_RIGHT_18_POSITION;
-       v_x1_u32 = ((((BME280_PRESSURE_3_2_7_6_8_DATA + v_x1_u32)) *
+       v_x1_u32) >> BME280_SHIFT_BIT_POSITION_BY_01_BIT))
+       >> BME280_SHIFT_BIT_POSITION_BY_18_BITS;
+       /* calculate x1*/
+       v_x1_u32 = ((((32768 + v_x1_u32)) *
        ((s32)p_bme280->cal_param.dig_P1))
-       >> SHIFT_RIGHT_15_POSITION);
+       >> BME280_SHIFT_BIT_POSITION_BY_15_BITS);
+       /* calculate pressure*/
        v_pressure_u32 =
-       (((u32)(((s32)BME280_PRESSURE_1_0_4_8_5_7_6_DATA)
-       - v_uncomp_pressure_s32) -
-       (v_x2_u32 >> SHIFT_RIGHT_12_POSITION)))
-       * BME280_PRESSURE_3_1_2_5_DATA;
+       (((u32)(((s32)1048576) - v_uncomp_pressure_s32)
+       - (v_x2_u32 >> BME280_SHIFT_BIT_POSITION_BY_12_BITS))) * 3125;
        if (v_pressure_u32
-       < BME280_HEX_PRESSURE_8_0_0_0_0_0_0_0_DATA)
+       < 0x80000000)
                /* Avoid exception caused by division by zero */
-               if (v_x1_u32 != BME280_ZERO_U8X)
+               if (v_x1_u32 != BME280_INIT_VALUE)
                        v_pressure_u32 =
-                       (v_pressure_u32 << SHIFT_LEFT_1_POSITION) /
+                       (v_pressure_u32
+                       << BME280_SHIFT_BIT_POSITION_BY_01_BIT) /
                        ((u32)v_x1_u32);
                else
-                       return BME280_ZERO_U8X;
+                       return BME280_INVALID_DATA;
        else
                /* Avoid exception caused by division by zero */
-               if (v_x1_u32 != BME280_ZERO_U8X)
+               if (v_x1_u32 != BME280_INIT_VALUE)
                        v_pressure_u32 = (v_pressure_u32
-                       / (u32)v_x1_u32) * BME280_TWO_U8X;
+                       / (u32)v_x1_u32) * 2;
                else
-                       return BME280_ZERO_U8X;
+                       return BME280_INVALID_DATA;
 
                v_x1_u32 = (((s32)p_bme280->cal_param.dig_P9) *
-               ((s32)(((v_pressure_u32 >> SHIFT_RIGHT_3_POSITION)
-               * (v_pressure_u32 >> SHIFT_RIGHT_3_POSITION))
-               >> SHIFT_RIGHT_13_POSITION)))
-               >> SHIFT_RIGHT_12_POSITION;
+               ((s32)(((v_pressure_u32 >> BME280_SHIFT_BIT_POSITION_BY_03_BITS)
+               * (v_pressure_u32 >> BME280_SHIFT_BIT_POSITION_BY_03_BITS))
+               >> BME280_SHIFT_BIT_POSITION_BY_13_BITS)))
+               >> BME280_SHIFT_BIT_POSITION_BY_12_BITS;
                v_x2_u32 = (((s32)(v_pressure_u32
-               >> SHIFT_RIGHT_2_POSITION)) *
+               >> BME280_SHIFT_BIT_POSITION_BY_02_BITS)) *
                ((s32)p_bme280->cal_param.dig_P8))
-               >> SHIFT_RIGHT_13_POSITION;
+               >> BME280_SHIFT_BIT_POSITION_BY_13_BITS;
                v_pressure_u32 = (u32)((s32)v_pressure_u32 +
                ((v_x1_u32 + v_x2_u32 + p_bme280->cal_param.dig_P7)
-               >> SHIFT_RIGHT_4_POSITION));
+               >> BME280_SHIFT_BIT_POSITION_BY_04_BITS));
 
        return v_pressure_u32;
 }
@@ -364,19 +377,20 @@ s32 *v_uncomp_humidity_s32)
        a_data_u8[0] - Humidity MSB
        a_data_u8[1] - Humidity LSB
        */
-       u8 a_data_u8[ARRAY_SIZE_TWO] = {
-       BME280_ZERO_U8X, BME280_ZERO_U8X};
+       u8 a_data_u8[BME280_HUMIDITY_DATA_SIZE] = {
+       BME280_INIT_VALUE, BME280_INIT_VALUE};
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
                } else {
                        com_rslt = p_bme280->BME280_BUS_READ_FUNC(
                        p_bme280->dev_addr,
-                       BME280_HUMIDITY_MSB_REG, a_data_u8, BME280_TWO_U8X);
+                       BME280_HUMIDITY_MSB_REG, a_data_u8,
+                       BME280_HUMIDITY_DATA_LENGTH);
                        *v_uncomp_humidity_s32 = (s32)(
-                       (((u32)(a_data_u8[INDEX_ZERO]))
-                       << SHIFT_LEFT_8_POSITION)|
-                       ((u32)(a_data_u8[INDEX_ONE])));
+                       (((u32)(a_data_u8[BME280_HUMIDITY_MSB_DATA]))
+                       << BME280_SHIFT_BIT_POSITION_BY_08_BITS)|
+                       ((u32)(a_data_u8[BME280_HUMIDITY_LSB_DATA])));
                }
        return com_rslt;
 }
@@ -394,41 +408,36 @@ s32 *v_uncomp_humidity_s32)
  *  @return Return the actual relative humidity output as u32
  *
 */
-u32 bme280_compensate_H_int32(s32 v_uncomp_humidity_s32)
+u32 bme280_compensate_humidity_int32(s32 v_uncomp_humidity_s32)
 {
-       s32 v_x1_u32;
-       v_x1_u32 = (p_bme280->cal_param.t_fine
-       - ((s32)BME280_HUMIDITY_7_6_8_0_0_DATA));
+       s32 v_x1_u32 = BME280_INIT_VALUE;
+
+       /* calculate x1*/
+       v_x1_u32 = (p_bme280->cal_param.t_fine - ((s32)76800));
+       /* calculate x1*/
        v_x1_u32 = (((((v_uncomp_humidity_s32
-       << SHIFT_LEFT_14_POSITION) -
+       << BME280_SHIFT_BIT_POSITION_BY_14_BITS) -
        (((s32)p_bme280->cal_param.dig_H4)
-       << SHIFT_LEFT_20_POSITION) -
+       << BME280_SHIFT_BIT_POSITION_BY_20_BITS) -
        (((s32)p_bme280->cal_param.dig_H5) * v_x1_u32)) +
-       ((s32)BME280_HUMIDITY_1_6_3_8_4_DATA))
-       >> SHIFT_RIGHT_15_POSITION) *
-       (((((((v_x1_u32 *
+       ((s32)16384)) >> BME280_SHIFT_BIT_POSITION_BY_15_BITS)
+       * (((((((v_x1_u32 *
        ((s32)p_bme280->cal_param.dig_H6))
-       >> SHIFT_RIGHT_10_POSITION) *
+       >> BME280_SHIFT_BIT_POSITION_BY_10_BITS) *
        (((v_x1_u32 * ((s32)p_bme280->cal_param.dig_H3))
-       >> SHIFT_RIGHT_11_POSITION) +
-       ((s32)BME280_HUMIDITY_3_2_7_6_8_DATA)))
-       >> SHIFT_RIGHT_10_POSITION) +
-       ((s32)BME280_HUMIDITY_2_0_9_7_1_5_2_DATA)) *
-       ((s32)p_bme280->cal_param.dig_H2)
-       + BME280_HUMIDITY_8_1_9_2_DATA)
-       >> SHIFT_RIGHT_14_POSITION));
+       >> BME280_SHIFT_BIT_POSITION_BY_11_BITS) + ((s32)32768)))
+       >> BME280_SHIFT_BIT_POSITION_BY_10_BITS) + ((s32)2097152)) *
+       ((s32)p_bme280->cal_param.dig_H2) + 8192) >> 14));
        v_x1_u32 = (v_x1_u32 - (((((v_x1_u32
-       >> SHIFT_RIGHT_15_POSITION) *
-       (v_x1_u32 >> SHIFT_RIGHT_15_POSITION))
-       >> SHIFT_RIGHT_7_POSITION) *
+       >> BME280_SHIFT_BIT_POSITION_BY_15_BITS) *
+       (v_x1_u32 >> BME280_SHIFT_BIT_POSITION_BY_15_BITS))
+       >> BME280_SHIFT_BIT_POSITION_BY_07_BITS) *
        ((s32)p_bme280->cal_param.dig_H1))
-       >> SHIFT_RIGHT_4_POSITION));
-       v_x1_u32 = (v_x1_u32 < BME280_ZERO_U8X
-       ? BME280_ZERO_U8X : v_x1_u32);
-       v_x1_u32 =
-       (v_x1_u32 > BME280_HUMIDITY_4_1_9_4_3_0_4_0_0_DATA ?
-       BME280_HUMIDITY_4_1_9_4_3_0_4_0_0_DATA : v_x1_u32);
-       return (u32)(v_x1_u32 >> SHIFT_RIGHT_12_POSITION);
+       >> BME280_SHIFT_BIT_POSITION_BY_04_BITS));
+       v_x1_u32 = (v_x1_u32 < 0 ? 0 : v_x1_u32);
+       v_x1_u32 = (v_x1_u32 > 419430400 ?
+       419430400 : v_x1_u32);
+       return (u32)(v_x1_u32 >> BME280_SHIFT_BIT_POSITION_BY_12_BITS);
 }
 /*!
  * @brief Reads actual humidity from uncompensated humidity
@@ -444,12 +453,14 @@ u32 bme280_compensate_H_int32(s32 v_uncomp_humidity_s32)
  *  @return Return the actual relative humidity output as u16
  *
 */
-u16 bme280_compensate_H_int32_sixteen_bit_output(s32 v_uncomp_humidity_s32)
+u16 bme280_compensate_humidity_int32_sixteen_bit_output(
+s32 v_uncomp_humidity_s32)
 {
-       u32 v_x1_u32;
-       u16 v_x2_u32;
-       v_x1_u32 =  bme280_compensate_H_int32(v_uncomp_humidity_s32);
-       v_x2_u32 = (u16)(v_x1_u32 >> SHIFT_RIGHT_1_POSITION);
+       u32 v_x1_u32 = BME280_INIT_VALUE;
+       u16 v_x2_u32 = BME280_INIT_VALUE;
+
+       v_x1_u32 =  bme280_compensate_humidity_int32(v_uncomp_humidity_s32);
+       v_x2_u32 = (u16)(v_x1_u32 >> BME280_SHIFT_BIT_POSITION_BY_01_BIT);
        return v_x2_u32;
 }
 /*!
@@ -487,11 +498,11 @@ s32 *v_uncomp_temperature_s32, s32 *v_uncomp_humidity_s32)
        a_data_u8[1] - Humidity MSB
        a_data_u8[1] - Humidity LSB
        */
-       u8 a_data_u8[ARRAY_SIZE_EIGHT] = {
-       BME280_ZERO_U8X, BME280_ZERO_U8X,
-       BME280_ZERO_U8X, BME280_ZERO_U8X,
-       BME280_ZERO_U8X, BME280_ZERO_U8X,
-       BME280_ZERO_U8X, BME280_ZERO_U8X};
+       u8 a_data_u8[BME280_DATA_FRAME_SIZE] = {
+       BME280_INIT_VALUE, BME280_INIT_VALUE,
+       BME280_INIT_VALUE, BME280_INIT_VALUE,
+       BME280_INIT_VALUE, BME280_INIT_VALUE,
+       BME280_INIT_VALUE, BME280_INIT_VALUE};
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
@@ -499,30 +510,38 @@ s32 *v_uncomp_temperature_s32, s32 *v_uncomp_humidity_s32)
                        com_rslt = p_bme280->BME280_BUS_READ_FUNC(
                        p_bme280->dev_addr,
                        BME280_PRESSURE_MSB_REG,
-                       a_data_u8, BME280_EIGHT_U8X);
+                       a_data_u8, BME280_ALL_DATA_FRAME_LENGTH);
                        /*Pressure*/
                        *v_uncomp_pressure_s32 = (s32)((
-                       ((u32)(a_data_u8[INDEX_ZERO]))
-                       << SHIFT_LEFT_12_POSITION) |
-                       (((u32)(a_data_u8[INDEX_ONE]))
-                       << SHIFT_LEFT_4_POSITION) |
-                       ((u32)a_data_u8[INDEX_TWO] >>
-                       SHIFT_RIGHT_4_POSITION));
+                       ((u32)(a_data_u8[
+                       BME280_DATA_FRAME_PRESSURE_MSB_BYTE]))
+                       << BME280_SHIFT_BIT_POSITION_BY_12_BITS) |
+                       (((u32)(a_data_u8[
+                       BME280_DATA_FRAME_PRESSURE_LSB_BYTE]))
+                       << BME280_SHIFT_BIT_POSITION_BY_04_BITS) |
+                       ((u32)a_data_u8[
+                       BME280_DATA_FRAME_PRESSURE_XLSB_BYTE] >>
+                       BME280_SHIFT_BIT_POSITION_BY_04_BITS));
 
                        /* Temperature */
                        *v_uncomp_temperature_s32 = (s32)(((
-                       (u32) (a_data_u8[INDEX_THREE]))
-                       << SHIFT_LEFT_12_POSITION) |
-                       (((u32)(a_data_u8[INDEX_FOUR]))
-                       << SHIFT_LEFT_4_POSITION)
-                       | ((u32)a_data_u8[INDEX_FIVE]
-                       >> SHIFT_RIGHT_4_POSITION));
+                       (u32) (a_data_u8[
+                       BME280_DATA_FRAME_TEMPERATURE_MSB_BYTE]))
+                       << BME280_SHIFT_BIT_POSITION_BY_12_BITS) |
+                       (((u32)(a_data_u8[
+                       BME280_DATA_FRAME_TEMPERATURE_LSB_BYTE]))
+                       << BME280_SHIFT_BIT_POSITION_BY_04_BITS)
+                       | ((u32)a_data_u8[
+                       BME280_DATA_FRAME_TEMPERATURE_XLSB_BYTE]
+                       >> BME280_SHIFT_BIT_POSITION_BY_04_BITS));
 
                        /*Humidity*/
                        *v_uncomp_humidity_s32 = (s32)((
-                       ((u32)(a_data_u8[INDEX_SIX]))
-                       << SHIFT_LEFT_8_POSITION)|
-                       ((u32)(a_data_u8[INDEX_SEVEN])));
+                       ((u32)(a_data_u8[
+                       BME280_DATA_FRAME_HUMIDITY_MSB_BYTE]))
+                       << BME280_SHIFT_BIT_POSITION_BY_08_BITS)|
+                       ((u32)(a_data_u8[
+                       BME280_DATA_FRAME_HUMIDITY_LSB_BYTE])));
                }
        return com_rslt;
 }
@@ -548,9 +567,9 @@ u32 *v_pressure_u32, s32 *v_temperature_s32, u32 *v_humidity_u32)
 {
        /* used to return the communication result*/
        BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
-       s32 v_uncomp_pressure_s32 = BME280_ZERO_U8X;
-       s32 v_uncom_temperature_s32 = BME280_ZERO_U8X;
-       s32 v_uncom_humidity_s32 = BME280_ZERO_U8X;
+       s32 v_uncomp_pressure_s32 = BME280_INIT_VALUE;
+       s32 v_uncom_temperature_s32 = BME280_INIT_VALUE;
+       s32 v_uncom_humidity_s32 = BME280_INIT_VALUE;
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
@@ -562,11 +581,12 @@ u32 *v_pressure_u32, s32 *v_temperature_s32, u32 *v_humidity_u32)
                        &v_uncomp_pressure_s32, &v_uncom_temperature_s32,
                        &v_uncom_humidity_s32);
                        /* read the true pressure, temperature and humidity*/
-                       *v_temperature_s32 = bme280_compensate_T_int32(
+                       *v_temperature_s32 =
+                       bme280_compensate_temperature_int32(
                        v_uncom_temperature_s32);
-                       *v_pressure_u32 = bme280_compensate_P_int32(
+                       *v_pressure_u32 = bme280_compensate_pressure_int32(
                        v_uncomp_pressure_s32);
-                       *v_humidity_u32 = bme280_compensate_H_int32(
+                       *v_humidity_u32 = bme280_compensate_humidity_int32(
                        v_uncom_humidity_s32);
                }
        return com_rslt;
@@ -599,84 +619,118 @@ u32 *v_pressure_u32, s32 *v_temperature_s32, u32 *v_humidity_u32)
  *
  *
 */
-BME280_RETURN_FUNCTION_TYPE bme280_get_calib_param()
+BME280_RETURN_FUNCTION_TYPE bme280_get_calib_param(void)
 {
        /* used to return the communication result*/
        BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
-       u8 a_data_u8[ARRAY_SIZE_TWENTY_SIX] = {
-       BME280_ZERO_U8X, BME280_ZERO_U8X,
-       BME280_ZERO_U8X, BME280_ZERO_U8X, BME280_ZERO_U8X,
-       BME280_ZERO_U8X, BME280_ZERO_U8X, BME280_ZERO_U8X,
-       BME280_ZERO_U8X, BME280_ZERO_U8X, BME280_ZERO_U8X,
-       BME280_ZERO_U8X, BME280_ZERO_U8X, BME280_ZERO_U8X,
-       BME280_ZERO_U8X, BME280_ZERO_U8X, BME280_ZERO_U8X,
-       BME280_ZERO_U8X, BME280_ZERO_U8X, BME280_ZERO_U8X,
-       BME280_ZERO_U8X, BME280_ZERO_U8X, BME280_ZERO_U8X,
-       BME280_ZERO_U8X, BME280_ZERO_U8X, BME280_ZERO_U8X};
+       u8 a_data_u8[BME280_CALIB_DATA_SIZE] = {
+       BME280_INIT_VALUE, BME280_INIT_VALUE,
+       BME280_INIT_VALUE, BME280_INIT_VALUE, BME280_INIT_VALUE,
+       BME280_INIT_VALUE, BME280_INIT_VALUE, BME280_INIT_VALUE,
+       BME280_INIT_VALUE, BME280_INIT_VALUE, BME280_INIT_VALUE,
+       BME280_INIT_VALUE, BME280_INIT_VALUE, BME280_INIT_VALUE,
+       BME280_INIT_VALUE, BME280_INIT_VALUE, BME280_INIT_VALUE,
+       BME280_INIT_VALUE, BME280_INIT_VALUE, BME280_INIT_VALUE,
+       BME280_INIT_VALUE, BME280_INIT_VALUE, BME280_INIT_VALUE,
+       BME280_INIT_VALUE, BME280_INIT_VALUE, BME280_INIT_VALUE};
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
                } else {
                        com_rslt = p_bme280->BME280_BUS_READ_FUNC(
                        p_bme280->dev_addr,
-                       BME280_DIG_T1_LSB_REG,
-                       a_data_u8, BME280_TWENTY_SIX_U8X);
+                       BME280_TEMPERATURE_CALIB_DIG_T1_LSB_REG,
+                       a_data_u8,
+                       BME280_PRESSURE_TEMPERATURE_CALIB_DATA_LENGTH);
 
                        p_bme280->cal_param.dig_T1 = (u16)(((
-                       (u16)((u8)a_data_u8[INDEX_ONE])) <<
-                       SHIFT_LEFT_8_POSITION) | a_data_u8[INDEX_ZERO]);
+                       (u16)((u8)a_data_u8[
+                       BME280_TEMPERATURE_CALIB_DIG_T1_MSB])) <<
+                       BME280_SHIFT_BIT_POSITION_BY_08_BITS)
+                       | a_data_u8[BME280_TEMPERATURE_CALIB_DIG_T1_LSB]);
                        p_bme280->cal_param.dig_T2 = (s16)(((
-                       (s16)((s8)a_data_u8[INDEX_THREE])) <<
-                       SHIFT_LEFT_8_POSITION) | a_data_u8[INDEX_TWO]);
+                       (s16)((s8)a_data_u8[
+                       BME280_TEMPERATURE_CALIB_DIG_T2_MSB])) <<
+                       BME280_SHIFT_BIT_POSITION_BY_08_BITS)
+                       | a_data_u8[BME280_TEMPERATURE_CALIB_DIG_T2_LSB]);
                        p_bme280->cal_param.dig_T3 = (s16)(((
-                       (s16)((s8)a_data_u8[INDEX_FIVE])) <<
-                       SHIFT_LEFT_8_POSITION) | a_data_u8[INDEX_FOUR]);
+                       (s16)((s8)a_data_u8[
+                       BME280_TEMPERATURE_CALIB_DIG_T3_MSB])) <<
+                       BME280_SHIFT_BIT_POSITION_BY_08_BITS)
+                       | a_data_u8[BME280_TEMPERATURE_CALIB_DIG_T3_LSB]);
                        p_bme280->cal_param.dig_P1 = (u16)(((
-                       (u16)((u8)a_data_u8[INDEX_SEVEN])) <<
-                       SHIFT_LEFT_8_POSITION) | a_data_u8[INDEX_SIX]);
+                       (u16)((u8)a_data_u8[
+                       BME280_PRESSURE_CALIB_DIG_P1_MSB])) <<
+                       BME280_SHIFT_BIT_POSITION_BY_08_BITS)
+                       | a_data_u8[BME280_PRESSURE_CALIB_DIG_P1_LSB]);
                        p_bme280->cal_param.dig_P2 = (s16)(((
-                       (s16)((s8)a_data_u8[INDEX_NINE])) <<
-                       SHIFT_LEFT_8_POSITION) | a_data_u8[INDEX_EIGHT]);
+                       (s16)((s8)a_data_u8[
+                       BME280_PRESSURE_CALIB_DIG_P2_MSB])) <<
+                       BME280_SHIFT_BIT_POSITION_BY_08_BITS)
+                       | a_data_u8[BME280_PRESSURE_CALIB_DIG_P2_LSB]);
                        p_bme280->cal_param.dig_P3 = (s16)(((
-                       (s16)((s8)a_data_u8[INDEX_ELEVEN])) <<
-                       SHIFT_LEFT_8_POSITION) | a_data_u8[INDEX_TEN]);
+                       (s16)((s8)a_data_u8[
+                       BME280_PRESSURE_CALIB_DIG_P3_MSB])) <<
+                       BME280_SHIFT_BIT_POSITION_BY_08_BITS)
+                       | a_data_u8[
+                       BME280_PRESSURE_CALIB_DIG_P3_LSB]);
                        p_bme280->cal_param.dig_P4 = (s16)(((
-                       (s16)((s8)a_data_u8[INDEX_THIRTEEN])) <<
-                       SHIFT_LEFT_8_POSITION) | a_data_u8[INDEX_TWELVE]);
+                       (s16)((s8)a_data_u8[
+                       BME280_PRESSURE_CALIB_DIG_P4_MSB])) <<
+                       BME280_SHIFT_BIT_POSITION_BY_08_BITS)
+                       | a_data_u8[BME280_PRESSURE_CALIB_DIG_P4_LSB]);
                        p_bme280->cal_param.dig_P5 = (s16)(((
-                       (s16)((s8)a_data_u8[INDEX_FIVETEEN])) <<
-                       SHIFT_LEFT_8_POSITION) | a_data_u8[INDEX_FOURTEEN]);
+                       (s16)((s8)a_data_u8[
+                       BME280_PRESSURE_CALIB_DIG_P5_MSB])) <<
+                       BME280_SHIFT_BIT_POSITION_BY_08_BITS)
+                       | a_data_u8[BME280_PRESSURE_CALIB_DIG_P5_LSB]);
                        p_bme280->cal_param.dig_P6 = (s16)(((
-                       (s16)((s8)a_data_u8[INDEX_SEVENTEEN])) <<
-                       SHIFT_LEFT_8_POSITION) | a_data_u8[INDEX_SIXTEEN]);
+                       (s16)((s8)a_data_u8[
+                       BME280_PRESSURE_CALIB_DIG_P6_MSB])) <<
+                       BME280_SHIFT_BIT_POSITION_BY_08_BITS)
+                       | a_data_u8[BME280_PRESSURE_CALIB_DIG_P6_LSB]);
                        p_bme280->cal_param.dig_P7 = (s16)(((
-                       (s16)((s8)a_data_u8[INDEX_NINETEEN])) <<
-                       SHIFT_LEFT_8_POSITION) | a_data_u8[INDEX_EIGHTEEN]);
+                       (s16)((s8)a_data_u8[
+                       BME280_PRESSURE_CALIB_DIG_P7_MSB])) <<
+                       BME280_SHIFT_BIT_POSITION_BY_08_BITS)
+                       | a_data_u8[BME280_PRESSURE_CALIB_DIG_P7_LSB]);
                        p_bme280->cal_param.dig_P8 = (s16)(((
-                       (s16)((s8)a_data_u8[INDEX_TWENTY_ONE])) <<
-                       SHIFT_LEFT_8_POSITION) | a_data_u8[INDEX_TWENTY]);
+                       (s16)((s8)a_data_u8[
+                       BME280_PRESSURE_CALIB_DIG_P8_MSB])) <<
+                       BME280_SHIFT_BIT_POSITION_BY_08_BITS)
+                       | a_data_u8[BME280_PRESSURE_CALIB_DIG_P8_LSB]);
                        p_bme280->cal_param.dig_P9 = (s16)(((
-                       (s16)((s8)a_data_u8[INDEX_TWENTY_THREE])) <<
-                       SHIFT_LEFT_8_POSITION) | a_data_u8[INDEX_TWENTY_TWO]);
+                       (s16)((s8)a_data_u8[
+                       BME280_PRESSURE_CALIB_DIG_P9_MSB])) <<
+                       BME280_SHIFT_BIT_POSITION_BY_08_BITS)
+                       | a_data_u8[BME280_PRESSURE_CALIB_DIG_P9_LSB]);
                        p_bme280->cal_param.dig_H1 =
-                       a_data_u8[INDEX_TWENTY_FIVE];
+                       a_data_u8[BME280_HUMIDITY_CALIB_DIG_H1];
                        com_rslt += p_bme280->BME280_BUS_READ_FUNC(
                        p_bme280->dev_addr,
-                       BME280_DIG_H2_LSB_REG, a_data_u8, BME280_SEVEN_U8X);
+                       BME280_HUMIDITY_CALIB_DIG_H2_LSB_REG, a_data_u8,
+                       BME280_HUMIDITY_CALIB_DATA_LENGTH);
                        p_bme280->cal_param.dig_H2 = (s16)(((
-                       (s16)((s8)a_data_u8[INDEX_ONE])) <<
-                       SHIFT_LEFT_8_POSITION) | a_data_u8[INDEX_ZERO]);
-                       p_bme280->cal_param.dig_H3 = a_data_u8[INDEX_TWO];
+                       (s16)((s8)a_data_u8[
+                       BME280_HUMIDITY_CALIB_DIG_H2_MSB])) <<
+                       BME280_SHIFT_BIT_POSITION_BY_08_BITS)
+                       | a_data_u8[BME280_HUMIDITY_CALIB_DIG_H2_LSB]);
+                       p_bme280->cal_param.dig_H3 =
+                       a_data_u8[BME280_HUMIDITY_CALIB_DIG_H3];
                        p_bme280->cal_param.dig_H4 = (s16)(((
-                       (s16)((s8)a_data_u8[INDEX_THREE])) <<
-                       SHIFT_LEFT_4_POSITION) |
-                       (((u8)BME280_HEX_CALIB_0_F_DATA)
-                       & a_data_u8[INDEX_FOUR]));
+                       (s16)((s8)a_data_u8[
+                       BME280_HUMIDITY_CALIB_DIG_H4_MSB])) <<
+                       BME280_SHIFT_BIT_POSITION_BY_04_BITS) |
+                       (((u8)BME280_MASK_DIG_H4) &
+                       a_data_u8[BME280_HUMIDITY_CALIB_DIG_H4_LSB]));
                        p_bme280->cal_param.dig_H5 = (s16)(((
-                       (s16)((s8)a_data_u8[INDEX_FIVE])) <<
-                       SHIFT_LEFT_4_POSITION) | (a_data_u8[INDEX_FOUR] >>
-                       SHIFT_RIGHT_4_POSITION));
-                       p_bme280->cal_param.dig_H6 = (s8)a_data_u8[INDEX_SIX];
+                       (s16)((s8)a_data_u8[
+                       BME280_HUMIDITY_CALIB_DIG_H5_MSB])) <<
+                       BME280_SHIFT_BIT_POSITION_BY_04_BITS) |
+                       (a_data_u8[BME280_HUMIDITY_CALIB_DIG_H4_LSB] >>
+                       BME280_SHIFT_BIT_POSITION_BY_04_BITS));
+                       p_bme280->cal_param.dig_H6 =
+                       (s8)a_data_u8[BME280_HUMIDITY_CALIB_DIG_H6];
                }
        return com_rslt;
 }
@@ -710,7 +764,7 @@ u8 *v_value_u8)
 {
        /* used to return the communication result*/
        BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
-       u8 v_data_u8 = BME280_ZERO_U8X;
+       u8 v_data_u8 = BME280_INIT_VALUE;
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
@@ -718,7 +772,7 @@ u8 *v_value_u8)
                        com_rslt = p_bme280->BME280_BUS_READ_FUNC(
                        p_bme280->dev_addr,
                        BME280_CTRL_MEAS_REG_OVERSAMP_TEMPERATURE__REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        *v_value_u8 = BME280_GET_BITSLICE(v_data_u8,
                        BME280_CTRL_MEAS_REG_OVERSAMP_TEMPERATURE);
 
@@ -756,10 +810,10 @@ u8 v_value_u8)
 {
        /* used to return the communication result*/
        BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
-       u8 v_data_u8 = BME280_ZERO_U8X;
-       u8 v_prev_pow_mode_u8 = BME280_ZERO_U8X;
-       u8 v_pre_ctrl_hum_value_u8 = BME280_ZERO_U8X;
-       u8 v_pre_config_value_u8 = BME280_ZERO_U8X;
+       u8 v_data_u8 = BME280_INIT_VALUE;
+       u8 v_prev_pow_mode_u8 = BME280_INIT_VALUE;
+       u8 v_pre_ctrl_hum_value_u8 = BME280_INIT_VALUE;
+       u8 v_pre_config_value_u8 = BME280_INIT_VALUE;
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
@@ -777,41 +831,43 @@ u8 v_value_u8)
                                v_pre_config_value_u8 = p_bme280->config_reg;
                                com_rslt += bme280_write_register(
                                        BME280_CONFIG_REG,
-                               &v_pre_config_value_u8, BME280_ONE_U8X);
+                               &v_pre_config_value_u8,
+                               BME280_GEN_READ_WRITE_DATA_LENGTH);
                                /* write previous value
                                of humidity oversampling*/
                                v_pre_ctrl_hum_value_u8 =
                                p_bme280->ctrl_hum_reg;
                                com_rslt += bme280_write_register(
                                        BME280_CTRL_HUMIDITY_REG,
-                               &v_pre_ctrl_hum_value_u8, BME280_ONE_U8X);
+                               &v_pre_ctrl_hum_value_u8,
+                               BME280_GEN_READ_WRITE_DATA_LENGTH);
                                /* write previous and updated value
                                of configuration register*/
                                com_rslt += bme280_write_register(
                                        BME280_CTRL_MEAS_REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        } else {
                                com_rslt = p_bme280->BME280_BUS_WRITE_FUNC(
                                p_bme280->dev_addr,
                                BME280_CTRL_MEAS_REG_OVERSAMP_TEMPERATURE__REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        }
                                p_bme280->oversamp_temperature = v_value_u8;
                                /* read the control measurement register value*/
                                com_rslt = bme280_read_register(
                                        BME280_CTRL_MEAS_REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                                p_bme280->ctrl_meas_reg = v_data_u8;
                                /* read the control humidity register value*/
                                com_rslt += bme280_read_register(
                                        BME280_CTRL_HUMIDITY_REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                                p_bme280->ctrl_hum_reg = v_data_u8;
                                /* read the control
                                configuration register value*/
                                com_rslt += bme280_read_register(
                                        BME280_CONFIG_REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                                p_bme280->config_reg = v_data_u8;
                }
        return com_rslt;
@@ -846,7 +902,7 @@ u8 *v_value_u8)
 {
        /* used to return the communication result*/
        BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
-       u8 v_data_u8 = BME280_ZERO_U8X;
+       u8 v_data_u8 = BME280_INIT_VALUE;
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
@@ -854,7 +910,7 @@ u8 *v_value_u8)
                        com_rslt = p_bme280->BME280_BUS_READ_FUNC(
                        p_bme280->dev_addr,
                        BME280_CTRL_MEAS_REG_OVERSAMP_PRESSURE__REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        *v_value_u8 = BME280_GET_BITSLICE(
                        v_data_u8,
                        BME280_CTRL_MEAS_REG_OVERSAMP_PRESSURE);
@@ -893,10 +949,10 @@ u8 v_value_u8)
 {
        /* used to return the communication result*/
        BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
-       u8 v_data_u8 = BME280_ZERO_U8X;
-       u8 v_prev_pow_mode_u8 = BME280_ZERO_U8X;
-       u8 v_pre_ctrl_hum_value_u8 = BME280_ZERO_U8X;
-       u8 v_pre_config_value_u8 = BME280_ZERO_U8X;
+       u8 v_data_u8 = BME280_INIT_VALUE;
+       u8 v_prev_pow_mode_u8 = BME280_INIT_VALUE;
+       u8 v_pre_ctrl_hum_value_u8 = BME280_INIT_VALUE;
+       u8 v_pre_config_value_u8 = BME280_INIT_VALUE;
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
@@ -914,41 +970,43 @@ u8 v_value_u8)
                                v_pre_config_value_u8 = p_bme280->config_reg;
                                com_rslt = bme280_write_register(
                                        BME280_CONFIG_REG,
-                               &v_pre_config_value_u8, BME280_ONE_U8X);
+                               &v_pre_config_value_u8,
+                               BME280_GEN_READ_WRITE_DATA_LENGTH);
                                /* write previous value of
                                humidity oversampling*/
                                v_pre_ctrl_hum_value_u8 =
                                p_bme280->ctrl_hum_reg;
                                com_rslt += bme280_write_register(
                                        BME280_CTRL_HUMIDITY_REG,
-                               &v_pre_ctrl_hum_value_u8, BME280_ONE_U8X);
+                               &v_pre_ctrl_hum_value_u8,
+                               BME280_GEN_READ_WRITE_DATA_LENGTH);
                                /* write previous and updated value of
                                control measurement register*/
                                bme280_write_register(
                                        BME280_CTRL_MEAS_REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        } else {
                                com_rslt = p_bme280->BME280_BUS_WRITE_FUNC(
                                p_bme280->dev_addr,
                                BME280_CTRL_MEAS_REG_OVERSAMP_PRESSURE__REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        }
                                p_bme280->oversamp_pressure = v_value_u8;
                                /* read the control measurement register value*/
                                com_rslt = bme280_read_register(
                                        BME280_CTRL_MEAS_REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                                p_bme280->ctrl_meas_reg = v_data_u8;
                                /* read the control humidity register value*/
                                com_rslt += bme280_read_register(
                                        BME280_CTRL_HUMIDITY_REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                                p_bme280->ctrl_hum_reg = v_data_u8;
                                /* read the control
                                configuration register value*/
                                com_rslt += bme280_read_register(
                                        BME280_CONFIG_REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                                p_bme280->config_reg = v_data_u8;
                }
        return com_rslt;
@@ -983,18 +1041,18 @@ u8 *v_value_u8)
 {
        /* used to return the communication result*/
        BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
-       u8 v_data_u8 = BME280_ZERO_U8X;
+       u8 v_data_u8 = BME280_INIT_VALUE;
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
                } else {
                        com_rslt = p_bme280->BME280_BUS_READ_FUNC(
                        p_bme280->dev_addr,
-                       BME280_CTRL_HUMIDITY_REG_OVERSAM_HUMIDITY__REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       BME280_CTRL_HUMIDITY_REG_OVERSAMP_HUMIDITY__REG,
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        *v_value_u8 = BME280_GET_BITSLICE(
                        v_data_u8,
-                       BME280_CTRL_HUMIDITY_REG_OVERSAM_HUMIDITY);
+                       BME280_CTRL_HUMIDITY_REG_OVERSAMP_HUMIDITY);
 
                        p_bme280->oversamp_humidity = *v_value_u8;
                }
@@ -1019,16 +1077,16 @@ u8 *v_value_u8)
  *
  *
  *
- * @note The "BME280_CTRL_HUMIDITY_REG_OVERSAM_HUMIDITY"
+ * @note The "BME280_CTRL_HUMIDITY_REG_OVERSAMP_HUMIDITY"
  * register sets the humidity
  * data acquisition options of the device.
  * @note changes to this registers only become
  * effective after a write operation to
  * "BME280_CTRL_MEAS_REG" register.
  * @note In the code automated reading and writing of
- *     "BME280_CTRL_HUMIDITY_REG_OVERSAM_HUMIDITY"
+ *     "BME280_CTRL_HUMIDITY_REG_OVERSAMP_HUMIDITY"
  * @note register first set the
- * "BME280_CTRL_HUMIDITY_REG_OVERSAM_HUMIDITY"
+ * "BME280_CTRL_HUMIDITY_REG_OVERSAMP_HUMIDITY"
  *  and then read and write
  *  the "BME280_CTRL_MEAS_REG" register in the function.
  *
@@ -1044,10 +1102,10 @@ u8 v_value_u8)
 {
        /* used to return the communication result*/
        BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
-       u8 v_data_u8 = BME280_ZERO_U8X;
-       u8 pre_ctrl_meas_value = BME280_ZERO_U8X;
-       u8 v_pre_config_value_u8 = BME280_ZERO_U8X;
-       u8 v_prev_pow_mode_u8 = BME280_ZERO_U8X;
+       u8 v_data_u8 = BME280_INIT_VALUE;
+       u8 pre_ctrl_meas_value = BME280_INIT_VALUE;
+       u8 v_pre_config_value_u8 = BME280_INIT_VALUE;
+       u8 v_prev_pow_mode_u8 = BME280_INIT_VALUE;
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
@@ -1056,7 +1114,7 @@ u8 v_value_u8)
                        v_data_u8 = p_bme280->ctrl_hum_reg;
                        v_data_u8 =
                        BME280_SET_BITSLICE(v_data_u8,
-                       BME280_CTRL_HUMIDITY_REG_OVERSAM_HUMIDITY, v_value_u8);
+                       BME280_CTRL_HUMIDITY_REG_OVERSAMP_HUMIDITY, v_value_u8);
                        com_rslt = bme280_get_power_mode(&v_prev_pow_mode_u8);
                        if (v_prev_pow_mode_u8 != BME280_SLEEP_MODE) {
                                com_rslt += bme280_set_soft_rst();
@@ -1066,45 +1124,48 @@ u8 v_value_u8)
                                v_pre_config_value_u8 = p_bme280->config_reg;
                                com_rslt += bme280_write_register(
                                        BME280_CONFIG_REG,
-                               &v_pre_config_value_u8, BME280_ONE_U8X);
+                               &v_pre_config_value_u8,
+                               BME280_GEN_READ_WRITE_DATA_LENGTH);
                                /* write the value of control humidity*/
                                com_rslt += bme280_write_register(
                                        BME280_CTRL_HUMIDITY_REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                                /* write previous value of
                                control measurement register*/
                                pre_ctrl_meas_value =
                                p_bme280->ctrl_meas_reg;
                                com_rslt += bme280_write_register(
                                        BME280_CTRL_MEAS_REG,
-                               &pre_ctrl_meas_value, BME280_ONE_U8X);
+                               &pre_ctrl_meas_value,
+                               BME280_GEN_READ_WRITE_DATA_LENGTH);
                        } else {
                                com_rslt +=
                                p_bme280->BME280_BUS_WRITE_FUNC(
                                p_bme280->dev_addr,
-                               BME280_CTRL_HUMIDITY_REG_OVERSAM_HUMIDITY__REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               BME280_CTRL_HUMIDITY_REG_OVERSAMP_HUMIDITY__REG,
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                                /* Control humidity write will effective only
                                after the control measurement register*/
                                pre_ctrl_meas_value =
                                p_bme280->ctrl_meas_reg;
                                com_rslt += bme280_write_register(
                                        BME280_CTRL_MEAS_REG,
-                               &pre_ctrl_meas_value, BME280_ONE_U8X);
+                               &pre_ctrl_meas_value,
+                               BME280_GEN_READ_WRITE_DATA_LENGTH);
                        }
                        p_bme280->oversamp_humidity = v_value_u8;
                        /* read the control measurement register value*/
                        com_rslt += bme280_read_register(BME280_CTRL_MEAS_REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        p_bme280->ctrl_meas_reg = v_data_u8;
                        /* read the control humidity register value*/
                        com_rslt += bme280_read_register(
                        BME280_CTRL_HUMIDITY_REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        p_bme280->ctrl_hum_reg = v_data_u8;
                        /* read the control configuration register value*/
                        com_rslt += bme280_read_register(BME280_CONFIG_REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        p_bme280->config_reg = v_data_u8;
                }
        return com_rslt;
@@ -1132,7 +1193,7 @@ BME280_RETURN_FUNCTION_TYPE bme280_get_power_mode(u8 *v_power_mode_u8)
 {
        /* used to return the communication result*/
        BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
-       u8 v_mode_u8r = BME280_ZERO_U8X;
+       u8 v_mode_u8r = BME280_INIT_VALUE;
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
@@ -1140,7 +1201,7 @@ BME280_RETURN_FUNCTION_TYPE bme280_get_power_mode(u8 *v_power_mode_u8)
                        com_rslt = p_bme280->BME280_BUS_READ_FUNC(
                        p_bme280->dev_addr,
                        BME280_CTRL_MEAS_REG_POWER_MODE__REG,
-                       &v_mode_u8r, BME280_ONE_U8X);
+                       &v_mode_u8r, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        *v_power_mode_u8 = BME280_GET_BITSLICE(v_mode_u8r,
                        BME280_CTRL_MEAS_REG_POWER_MODE);
                }
@@ -1169,16 +1230,16 @@ BME280_RETURN_FUNCTION_TYPE bme280_set_power_mode(u8 v_power_mode_u8)
 {
        /* used to return the communication result*/
        BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
-       u8 v_mode_u8r = BME280_ZERO_U8X;
-       u8 v_prev_pow_mode_u8 = BME280_ZERO_U8X;
-       u8 v_pre_ctrl_hum_value_u8 = BME280_ZERO_U8X;
-       u8 v_pre_config_value_u8 = BME280_ZERO_U8X;
-       u8 v_data_u8 = BME280_ZERO_U8X;
+       u8 v_mode_u8r = BME280_INIT_VALUE;
+       u8 v_prev_pow_mode_u8 = BME280_INIT_VALUE;
+       u8 v_pre_ctrl_hum_value_u8 = BME280_INIT_VALUE;
+       u8 v_pre_config_value_u8 = BME280_INIT_VALUE;
+       u8 v_data_u8 = BME280_INIT_VALUE;
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
                } else {
-                       if (v_power_mode_u8 < BME280_FOUR_U8X) {
+                       if (v_power_mode_u8 <= BME280_NORMAL_MODE) {
                                v_mode_u8r = p_bme280->ctrl_meas_reg;
                                v_mode_u8r =
                                BME280_SET_BITSLICE(v_mode_u8r,
@@ -1195,7 +1256,8 @@ BME280_RETURN_FUNCTION_TYPE bme280_set_power_mode(u8 v_power_mode_u8)
                                        p_bme280->config_reg;
                                        com_rslt = bme280_write_register(
                                                BME280_CONFIG_REG,
-                                       &v_pre_config_value_u8, BME280_ONE_U8X);
+                                       &v_pre_config_value_u8,
+                                       BME280_GEN_READ_WRITE_DATA_LENGTH);
                                        /* write previous value of
                                        humidity oversampling*/
                                        v_pre_ctrl_hum_value_u8 =
@@ -1203,33 +1265,35 @@ BME280_RETURN_FUNCTION_TYPE bme280_set_power_mode(u8 v_power_mode_u8)
                                        com_rslt += bme280_write_register(
                                        BME280_CTRL_HUMIDITY_REG,
                                        &v_pre_ctrl_hum_value_u8,
-                                       BME280_ONE_U8X);
+                                       BME280_GEN_READ_WRITE_DATA_LENGTH);
                                        /* write previous and updated value of
                                        control measurement register*/
                                        com_rslt += bme280_write_register(
                                        BME280_CTRL_MEAS_REG,
-                                       &v_mode_u8r, BME280_ONE_U8X);
+                                       &v_mode_u8r,
+                                       BME280_GEN_READ_WRITE_DATA_LENGTH);
                                } else {
                                        com_rslt =
                                        p_bme280->BME280_BUS_WRITE_FUNC(
                                        p_bme280->dev_addr,
                                        BME280_CTRL_MEAS_REG_POWER_MODE__REG,
-                                       &v_mode_u8r, BME280_ONE_U8X);
+                                       &v_mode_u8r,
+                                       BME280_GEN_READ_WRITE_DATA_LENGTH);
                                }
                                /* read the control measurement register value*/
                                com_rslt = bme280_read_register(
                                        BME280_CTRL_MEAS_REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                                p_bme280->ctrl_meas_reg = v_data_u8;
                                /* read the control humidity register value*/
                                com_rslt += bme280_read_register(
                                        BME280_CTRL_HUMIDITY_REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                                p_bme280->ctrl_hum_reg = v_data_u8;
                                /* read the config register value*/
                                com_rslt += bme280_read_register(
                                        BME280_CONFIG_REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                                p_bme280->config_reg = v_data_u8;
                        } else {
                        com_rslt = E_BME280_OUT_OF_RANGE;
@@ -1252,7 +1316,7 @@ BME280_RETURN_FUNCTION_TYPE bme280_set_power_mode(u8 v_power_mode_u8)
  *
  *
 */
-BME280_RETURN_FUNCTION_TYPE bme280_set_soft_rst()
+BME280_RETURN_FUNCTION_TYPE bme280_set_soft_rst(void)
 {
        /* used to return the communication result*/
        BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
@@ -1263,7 +1327,8 @@ BME280_RETURN_FUNCTION_TYPE bme280_set_soft_rst()
                } else {
                        com_rslt = p_bme280->BME280_BUS_WRITE_FUNC(
                        p_bme280->dev_addr,
-                       BME280_RST_REG, &v_data_u8, BME280_ONE_U8X);
+                       BME280_RST_REG, &v_data_u8,
+                       BME280_GEN_READ_WRITE_DATA_LENGTH);
                }
        return com_rslt;
 }
@@ -1291,7 +1356,7 @@ BME280_RETURN_FUNCTION_TYPE bme280_get_spi3(u8 *v_enable_disable_u8)
 {
        /* used to return the communication result*/
        BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
-       u8 v_data_u8 = BME280_ZERO_U8X;
+       u8 v_data_u8 = BME280_INIT_VALUE;
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
@@ -1299,7 +1364,7 @@ BME280_RETURN_FUNCTION_TYPE bme280_get_spi3(u8 *v_enable_disable_u8)
                        com_rslt = p_bme280->BME280_BUS_READ_FUNC(
                        p_bme280->dev_addr,
                        BME280_CONFIG_REG_SPI3_ENABLE__REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        *v_enable_disable_u8 = BME280_GET_BITSLICE(
                        v_data_u8,
                        BME280_CONFIG_REG_SPI3_ENABLE);
@@ -1330,10 +1395,10 @@ BME280_RETURN_FUNCTION_TYPE bme280_set_spi3(u8 v_enable_disable_u8)
 {
        /* used to return the communication result*/
        BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
-       u8 v_data_u8 = BME280_ZERO_U8X;
-       u8 pre_ctrl_meas_value = BME280_ZERO_U8X;
-       u8 v_prev_pow_mode_u8 = BME280_ZERO_U8X;
-       u8 v_pre_ctrl_hum_value_u8 =  BME280_ZERO_U8X;
+       u8 v_data_u8 = BME280_INIT_VALUE;
+       u8 pre_ctrl_meas_value = BME280_INIT_VALUE;
+       u8 v_prev_pow_mode_u8 = BME280_INIT_VALUE;
+       u8 v_pre_ctrl_hum_value_u8 =  BME280_INIT_VALUE;
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
@@ -1350,42 +1415,44 @@ BME280_RETURN_FUNCTION_TYPE bme280_set_spi3(u8 v_enable_disable_u8)
                                configuration register*/
                                com_rslt += bme280_write_register(
                                        BME280_CONFIG_REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                                /* write previous value of
                                humidity oversampling*/
                                v_pre_ctrl_hum_value_u8 =
                                p_bme280->ctrl_hum_reg;
                                com_rslt +=  bme280_write_register(
                                        BME280_CTRL_HUMIDITY_REG,
-                               &v_pre_ctrl_hum_value_u8, BME280_ONE_U8X);
+                               &v_pre_ctrl_hum_value_u8,
+                               BME280_GEN_READ_WRITE_DATA_LENGTH);
                                /* write previous value of
                                control measurement register*/
                                pre_ctrl_meas_value =
                                p_bme280->ctrl_meas_reg;
                                com_rslt += bme280_write_register(
                                        BME280_CTRL_MEAS_REG,
-                               &pre_ctrl_meas_value, BME280_ONE_U8X);
+                               &pre_ctrl_meas_value,
+                               BME280_GEN_READ_WRITE_DATA_LENGTH);
                        } else {
                                com_rslt =
                                p_bme280->BME280_BUS_WRITE_FUNC(
                                p_bme280->dev_addr,
                                BME280_CONFIG_REG_SPI3_ENABLE__REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        }
                        /* read the control measurement register value*/
                        com_rslt += bme280_read_register(
                                BME280_CTRL_MEAS_REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        p_bme280->ctrl_meas_reg = v_data_u8;
                        /* read the control humidity register value*/
                        com_rslt += bme280_read_register(
                                BME280_CTRL_HUMIDITY_REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        p_bme280->ctrl_hum_reg = v_data_u8;
                        /* read the control configuration register value*/
                        com_rslt += bme280_read_register(
                                BME280_CONFIG_REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        p_bme280->config_reg = v_data_u8;
                }
        return com_rslt;
@@ -1416,7 +1483,7 @@ BME280_RETURN_FUNCTION_TYPE bme280_get_filter(u8 *v_value_u8)
 {
        /* used to return the communication result*/
        BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
-       u8 v_data_u8 = BME280_ZERO_U8X;
+       u8 v_data_u8 = BME280_INIT_VALUE;
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
@@ -1424,7 +1491,7 @@ BME280_RETURN_FUNCTION_TYPE bme280_get_filter(u8 *v_value_u8)
                        com_rslt = p_bme280->BME280_BUS_READ_FUNC(
                        p_bme280->dev_addr,
                        BME280_CONFIG_REG_FILTER__REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        *v_value_u8 = BME280_GET_BITSLICE(v_data_u8,
                        BME280_CONFIG_REG_FILTER);
                }
@@ -1456,10 +1523,10 @@ BME280_RETURN_FUNCTION_TYPE bme280_set_filter(u8 v_value_u8)
 {
        /* used to return the communication result*/
        BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
-       u8 v_data_u8 = BME280_ZERO_U8X;
-       u8 pre_ctrl_meas_value = BME280_ZERO_U8X;
-       u8 v_prev_pow_mode_u8 = BME280_ZERO_U8X;
-       u8 v_pre_ctrl_hum_value_u8 =  BME280_ZERO_U8X;
+       u8 v_data_u8 = BME280_INIT_VALUE;
+       u8 pre_ctrl_meas_value = BME280_INIT_VALUE;
+       u8 v_prev_pow_mode_u8 = BME280_INIT_VALUE;
+       u8 v_pre_ctrl_hum_value_u8 =  BME280_INIT_VALUE;
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
@@ -1476,40 +1543,42 @@ BME280_RETURN_FUNCTION_TYPE bme280_set_filter(u8 v_value_u8)
                                configuration register*/
                                com_rslt += bme280_write_register(
                                        BME280_CONFIG_REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                                /* write previous value of
                                humidity oversampling*/
                                v_pre_ctrl_hum_value_u8 =
                                p_bme280->ctrl_hum_reg;
                                com_rslt += bme280_write_register(
                                        BME280_CTRL_HUMIDITY_REG,
-                               &v_pre_ctrl_hum_value_u8, BME280_ONE_U8X);
+                               &v_pre_ctrl_hum_value_u8,
+                               BME280_GEN_READ_WRITE_DATA_LENGTH);
                                /* write previous value of
                                control measurement register*/
                                pre_ctrl_meas_value =
                                p_bme280->ctrl_meas_reg;
                                com_rslt += bme280_write_register(
                                        BME280_CTRL_MEAS_REG,
-                               &pre_ctrl_meas_value, BME280_ONE_U8X);
+                               &pre_ctrl_meas_value,
+                               BME280_GEN_READ_WRITE_DATA_LENGTH);
                        } else {
                                com_rslt =
                                p_bme280->BME280_BUS_WRITE_FUNC(
                                p_bme280->dev_addr,
                                BME280_CONFIG_REG_FILTER__REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        }
                        /* read the control measurement register value*/
                        com_rslt += bme280_read_register(BME280_CTRL_MEAS_REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        p_bme280->ctrl_meas_reg = v_data_u8;
                        /* read the control humidity register value*/
                        com_rslt += bme280_read_register(
                        BME280_CTRL_HUMIDITY_REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        p_bme280->ctrl_hum_reg = v_data_u8;
                        /* read the configuration register value*/
                        com_rslt += bme280_read_register(BME280_CONFIG_REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        p_bme280->config_reg = v_data_u8;
                }
        return com_rslt;
@@ -1541,7 +1610,7 @@ BME280_RETURN_FUNCTION_TYPE bme280_get_standby_durn(u8 *v_standby_durn_u8)
 {
        /* used to return the communication result*/
        BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
-       u8 v_data_u8 = BME280_ZERO_U8X;
+       u8 v_data_u8 = BME280_INIT_VALUE;
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
@@ -1549,7 +1618,7 @@ BME280_RETURN_FUNCTION_TYPE bme280_get_standby_durn(u8 *v_standby_durn_u8)
                        com_rslt = p_bme280->BME280_BUS_READ_FUNC(
                        p_bme280->dev_addr,
                        BME280_CONFIG_REG_TSB__REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        *v_standby_durn_u8 = BME280_GET_BITSLICE(
                        v_data_u8, BME280_CONFIG_REG_TSB);
                }
@@ -1592,10 +1661,10 @@ BME280_RETURN_FUNCTION_TYPE bme280_set_standby_durn(u8 v_standby_durn_u8)
 {
        /* used to return the communication result*/
        BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
-       u8 v_data_u8 = BME280_ZERO_U8X;
-       u8 pre_ctrl_meas_value = BME280_ZERO_U8X;
-       u8 v_prev_pow_mode_u8 = BME280_ZERO_U8X;
-       u8 v_pre_ctrl_hum_value_u8 =  BME280_ZERO_U8X;
+       u8 v_data_u8 = BME280_INIT_VALUE;
+       u8 pre_ctrl_meas_value = BME280_INIT_VALUE;
+       u8 v_prev_pow_mode_u8 = BME280_INIT_VALUE;
+       u8 v_pre_ctrl_hum_value_u8 = BME280_INIT_VALUE;
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
@@ -1612,40 +1681,42 @@ BME280_RETURN_FUNCTION_TYPE bme280_set_standby_durn(u8 v_standby_durn_u8)
                                configuration register*/
                                com_rslt += bme280_write_register(
                                        BME280_CONFIG_REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                                /* write previous value of
                                humidity oversampling*/
                                v_pre_ctrl_hum_value_u8 =
                                p_bme280->ctrl_hum_reg;
                                com_rslt += bme280_write_register(
                                        BME280_CTRL_HUMIDITY_REG,
-                               &v_pre_ctrl_hum_value_u8, BME280_ONE_U8X);
+                               &v_pre_ctrl_hum_value_u8,
+                               BME280_GEN_READ_WRITE_DATA_LENGTH);
                                /* write previous value of control
                                measurement register*/
                                pre_ctrl_meas_value =
                                p_bme280->ctrl_meas_reg;
                                com_rslt += bme280_write_register(
                                        BME280_CTRL_MEAS_REG,
-                               &pre_ctrl_meas_value, BME280_ONE_U8X);
+                               &pre_ctrl_meas_value,
+                               BME280_GEN_READ_WRITE_DATA_LENGTH);
                        } else {
                                com_rslt =
                                p_bme280->BME280_BUS_WRITE_FUNC(
                                p_bme280->dev_addr,
                                BME280_CONFIG_REG_TSB__REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        }
                        /* read the control measurement register value*/
                        com_rslt += bme280_read_register(BME280_CTRL_MEAS_REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        p_bme280->ctrl_meas_reg = v_data_u8;
                        /* read the control humidity register value*/
                        com_rslt += bme280_read_register(
                        BME280_CTRL_HUMIDITY_REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        p_bme280->ctrl_hum_reg = v_data_u8;
                        /* read the configuration register value*/
                        com_rslt += bme280_read_register(BME280_CONFIG_REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        p_bme280->config_reg = v_data_u8;
                }
        return com_rslt;
@@ -1674,14 +1745,14 @@ BME280_RETURN_FUNCTION_TYPE bme280_set_standby_durn(u8 v_standby_durn_u8)
 /*BME280_RETURN_FUNCTION_TYPE bme280_set_work_mode(u8 v_work_mode_u8)
 {
 BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
-u8 v_data_u8 = BME280_ZERO_U8X;
+u8 v_data_u8 = BME280_INIT_VALUE;
 if (p_bme280 == BME280_NULL) {
        return E_BME280_NULL_PTR;
 } else {
-       if (v_work_mode_u8 <= BME280_FOUR_U8X) {
+       if (v_work_mode_u8 <= BME280_ULTRAHIGHRESOLUTION_MODE) {
                com_rslt = p_bme280->BME280_BUS_READ_FUNC(
                        p_bme280->dev_addr,     BME280_CTRL_MEAS_REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                if (com_rslt == SUCCESS) {
                        switch (v_work_mode_u8) {
                        case BME280_ULTRALOWPOWER_MODE:
@@ -1721,7 +1792,7 @@ if (p_bme280 == BME280_NULL) {
                                p_bme280->osrs_p);
                        com_rslt += p_bme280->BME280_BUS_WRITE_FUNC(
                                p_bme280->dev_addr,     BME280_CTRL_MEAS_REG,
-                               &v_data_u8, BME280_ONE_U8X);
+                               &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                }
        } else {
                com_rslt = E_BME280_OUT_OF_RANGE;
@@ -1752,12 +1823,12 @@ s32 *v_uncom_temperature_s32, s32 *v_uncom_humidity_s32)
 {
        /* used to return the communication result*/
        BME280_RETURN_FUNCTION_TYPE com_rslt = ERROR;
-       u8 v_data_u8 = BME280_ZERO_U8X;
-       u8 v_waittime_u8r = BME280_ZERO_U8X;
-       u8 v_prev_pow_mode_u8 = BME280_ZERO_U8X;
-       u8 v_mode_u8r = BME280_ZERO_U8X;
-       u8 pre_ctrl_config_value = BME280_ZERO_U8X;
-       u8 v_pre_ctrl_hum_value_u8 = BME280_ZERO_U8X;
+       u8 v_data_u8 = BME280_INIT_VALUE;
+       u8 v_waittime_u8r = BME280_INIT_VALUE;
+       u8 v_prev_pow_mode_u8 = BME280_INIT_VALUE;
+       u8 v_mode_u8r = BME280_INIT_VALUE;
+       u8 pre_ctrl_config_value = BME280_INIT_VALUE;
+       u8 v_pre_ctrl_hum_value_u8 = BME280_INIT_VALUE;
        /* check the p_bme280 structure pointer as NULL*/
        if (p_bme280 == BME280_NULL) {
                return E_BME280_NULL_PTR;
@@ -1775,18 +1846,20 @@ s32 *v_uncom_temperature_s32, s32 *v_uncom_humidity_s32)
                                pre_ctrl_config_value = p_bme280->config_reg;
                                com_rslt += bme280_write_register(
                                        BME280_CONFIG_REG,
-                               &pre_ctrl_config_value, BME280_ONE_U8X);
+                               &pre_ctrl_config_value,
+                               BME280_GEN_READ_WRITE_DATA_LENGTH);
                                /* write previous value of
                                humidity oversampling*/
                                v_pre_ctrl_hum_value_u8 =
                                p_bme280->ctrl_hum_reg;
                                com_rslt += bme280_write_register(
                                        BME280_CTRL_HUMIDITY_REG,
-                               &v_pre_ctrl_hum_value_u8, BME280_ONE_U8X);
+                               &v_pre_ctrl_hum_value_u8,
+                               BME280_GEN_READ_WRITE_DATA_LENGTH);
                                /* write the force mode  */
                                com_rslt += bme280_write_register(
                                        BME280_CTRL_MEAS_REG,
-                               &v_mode_u8r, BME280_ONE_U8X);
+                               &v_mode_u8r, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        } else {
                                /* write previous value of
                                humidity oversampling*/
@@ -1794,11 +1867,12 @@ s32 *v_uncom_temperature_s32, s32 *v_uncom_humidity_s32)
                                p_bme280->ctrl_hum_reg;
                                com_rslt += bme280_write_register(
                                        BME280_CTRL_HUMIDITY_REG,
-                               &v_pre_ctrl_hum_value_u8, BME280_ONE_U8X);
+                               &v_pre_ctrl_hum_value_u8,
+                               BME280_GEN_READ_WRITE_DATA_LENGTH);
                                /* write the force mode  */
                                com_rslt += bme280_write_register(
                                        BME280_CTRL_MEAS_REG,
-                               &v_mode_u8r, BME280_ONE_U8X);
+                               &v_mode_u8r, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        }
                        bme280_compute_wait_time(&v_waittime_u8r);
                        p_bme280->delay_msec(v_waittime_u8r);
@@ -1812,16 +1886,16 @@ s32 *v_uncom_temperature_s32, s32 *v_uncom_humidity_s32)
                        /* read the control humidity register value*/
                        com_rslt += bme280_read_register(
                        BME280_CTRL_HUMIDITY_REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        p_bme280->ctrl_hum_reg = v_data_u8;
                        /* read the configuration register value*/
                        com_rslt += bme280_read_register(BME280_CONFIG_REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        p_bme280->config_reg = v_data_u8;
 
                        /* read the control measurement register value*/
                        com_rslt += bme280_read_register(BME280_CTRL_MEAS_REG,
-                       &v_data_u8, BME280_ONE_U8X);
+                       &v_data_u8, BME280_GEN_READ_WRITE_DATA_LENGTH);
                        p_bme280->ctrl_meas_reg = v_data_u8;
                }
        return com_rslt;
@@ -1905,29 +1979,22 @@ u8 *v_data_u8, u8 v_len_u8)
  *  @return  Return the actual temperature in floating point
  *
 */
-double bme280_compensate_T_double(s32 v_uncom_temperature_s32)
+double bme280_compensate_temperature_double(s32 v_uncom_temperature_s32)
 {
-       double v_x1_u32 = BME280_ZERO_U8X;
-       double v_x2_u32 = BME280_ZERO_U8X;
-       double temperature = BME280_ZERO_U8X;
+       double v_x1_u32 = BME280_INIT_VALUE;
+       double v_x2_u32 = BME280_INIT_VALUE;
+       double temperature = BME280_INIT_VALUE;
 
-       v_x1_u32  = (((double)v_uncom_temperature_s32)
-       / BME280_FLOAT_TRUE_TEMP_1_6_3_8_4_DATA -
-       ((double)p_bme280->cal_param.dig_T1)
-       / BME280_FLOAT_TRUE_TEMP_1_0_2_4_DATA) *
+       v_x1_u32  = (((double)v_uncom_temperature_s32) / 16384.0 -
+       ((double)p_bme280->cal_param.dig_T1) / 1024.0) *
        ((double)p_bme280->cal_param.dig_T2);
-       v_x2_u32  = ((((double)v_uncom_temperature_s32)
-       / BME280_FLOAT_TRUE_TEMP_1_3_1_0_7_2_DATA -
-       ((double)p_bme280->cal_param.dig_T1)
-       / BME280_FLOAT_TRUE_TEMP_8_1_9_2_DATA) *
-       (((double)v_uncom_temperature_s32) /
-       BME280_FLOAT_TRUE_TEMP_1_3_1_0_7_2_DATA -
-       ((double)p_bme280->cal_param.dig_T1) /
-       BME280_FLOAT_TRUE_TEMP_8_1_9_2_DATA)) *
+       v_x2_u32  = ((((double)v_uncom_temperature_s32) / 131072.0 -
+       ((double)p_bme280->cal_param.dig_T1) / 8192.0) *
+       (((double)v_uncom_temperature_s32) / 131072.0 -
+       ((double)p_bme280->cal_param.dig_T1) / 8192.0)) *
        ((double)p_bme280->cal_param.dig_T3);
        p_bme280->cal_param.t_fine = (s32)(v_x1_u32 + v_x2_u32);
-       temperature  = (v_x1_u32 + v_x2_u32) /
-       BME280_FLOAT_TRUE_TEMP_5_1_2_0_DATA;
+       temperature  = (v_x1_u32 + v_x2_u32) / 5120.0;
 
 
        return temperature;
@@ -1945,49 +2012,36 @@ double bme280_compensate_T_double(s32 v_uncom_temperature_s32)
  *  @return  Return the actual pressure in floating point
  *
 */
-double bme280_compensate_P_double(s32 v_uncom_pressure_s32)
+double bme280_compensate_pressure_double(s32 v_uncom_pressure_s32)
 {
-       double v_x1_u32 = BME280_ZERO_U8X;
-       double v_x2_u32 = BME280_ZERO_U8X;
-       double pressure = BME280_ZERO_U8X;
+       double v_x1_u32 = BME280_INIT_VALUE;
+       double v_x2_u32 = BME280_INIT_VALUE;
+       double pressure = BME280_INIT_VALUE;
 
        v_x1_u32 = ((double)p_bme280->cal_param.t_fine /
-       BME280_FLAOT_TRUE_PRESSURE_2_DATA) -
-       BME280_FLAOT_TRUE_PRESSURE_6_4_0_0_0_DATA;
+       2.0) - 64000.0;
        v_x2_u32 = v_x1_u32 * v_x1_u32 *
-       ((double)p_bme280->cal_param.dig_P6) /
-       BME280_FLAOT_TRUE_PRESSURE_3_2_7_6_8_DATA;
+       ((double)p_bme280->cal_param.dig_P6) / 32768.0;
        v_x2_u32 = v_x2_u32 + v_x1_u32 *
-       ((double)p_bme280->cal_param.dig_P5) *
-       BME280_FLAOT_TRUE_PRESSURE_2_DATA;
-       v_x2_u32 = (v_x2_u32 / BME280_FLAOT_TRUE_PRESSURE_4_DATA) +
-       (((double)p_bme280->cal_param.dig_P4) *
-       BME280_FLAOT_TRUE_PRESSURE_6_5_5_3_6_DATA);
+       ((double)p_bme280->cal_param.dig_P5) * 2.0;
+       v_x2_u32 = (v_x2_u32 / 4.0) +
+       (((double)p_bme280->cal_param.dig_P4) * 65536.0);
        v_x1_u32 = (((double)p_bme280->cal_param.dig_P3) *
-       v_x1_u32 * v_x1_u32
-       / BME280_FLAOT_TRUE_PRESSURE_5_2_4_2_8_8_DATA +
-       ((double)p_bme280->cal_param.dig_P2) * v_x1_u32) /
-       BME280_FLAOT_TRUE_PRESSURE_5_2_4_2_8_8_DATA;
-       v_x1_u32 = (BME280_FLAOT_TRUE_PRESSURE_1_DATA + v_x1_u32
-       / BME280_FLAOT_TRUE_PRESSURE_3_2_7_6_8_DATA) *
+       v_x1_u32 * v_x1_u32 / 524288.0 +
+       ((double)p_bme280->cal_param.dig_P2) * v_x1_u32) / 524288.0;
+       v_x1_u32 = (1.0 + v_x1_u32 / 32768.0) *
        ((double)p_bme280->cal_param.dig_P1);
-       pressure = BME280_FLAOT_TRUE_PRESSURE_1_0_4_8_5_7_6_DATA
-       - (double)v_uncom_pressure_s32;
+       pressure = 1048576.0 - (double)v_uncom_pressure_s32;
        /* Avoid exception caused by division by zero */
-       if (v_x1_u32 != BME280_ZERO_U8X)
-               pressure = (pressure - (v_x2_u32
-               / BME280_FLAOT_TRUE_PRESSURE_4_0_9_6_DATA))
-               * BME280_FLAOT_TRUE_PRESSURE_6_2_5_0_DATA / v_x1_u32;
+       if (v_x1_u32 != BME280_INIT_VALUE)
+               pressure = (pressure - (v_x2_u32 / 4096.0)) * 6250.0 / v_x1_u32;
        else
-               return BME280_ZERO_U8X;
+               return BME280_INVALID_DATA;
        v_x1_u32 = ((double)p_bme280->cal_param.dig_P9) *
-       pressure * pressure /
-       BME280_FLAOT_TRUE_PRESSURE_2_1_4_7_4_8_3_6_4_8_DATA;
-       v_x2_u32 = pressure * ((double)p_bme280->cal_param.dig_P8)
-       / BME280_FLAOT_TRUE_PRESSURE_3_2_7_6_8_DATA;
+       pressure * pressure / 2147483648.0;
+       v_x2_u32 = pressure * ((double)p_bme280->cal_param.dig_P8) / 32768.0;
        pressure = pressure + (v_x1_u32 + v_x2_u32 +
-       ((double)p_bme280->cal_param.dig_P7))
-       / BME280_FLAOT_TRUE_PRESSURE_1_6_DATA;
+       ((double)p_bme280->cal_param.dig_P7)) / 16.0;
 
        return pressure;
 }
@@ -2003,34 +2057,27 @@ double bme280_compensate_P_double(s32 v_uncom_pressure_s32)
  *  @return Return the actual humidity in floating point
  *
 */
-double bme280_compensate_H_double(s32 v_uncom_humidity_s32)
+double bme280_compensate_humidity_double(s32 v_uncom_humidity_s32)
 {
-       double var_h = BME280_ZERO_U8X;
-       var_h = (((double)p_bme280->cal_param.t_fine)
-       - BME280_TRUE_HUMIDITY_7_6_8_0_0_DATA);
-       if (var_h != BME280_ZERO_U8X)
+       double var_h = BME280_INIT_VALUE;
+
+       var_h = (((double)p_bme280->cal_param.t_fine) - 76800.0);
+       if (var_h != BME280_INIT_VALUE)
                var_h = (v_uncom_humidity_s32 -
-               (((double)p_bme280->cal_param.dig_H4)
-               * BME280_TRUE_HUMIDITY_6_4_DATA +
-               ((double)p_bme280->cal_param.dig_H5)
-               / BME280_TRUE_HUMIDITY_1_6_3_8_4_DATA * var_h))*
-               (((double)p_bme280->cal_param.dig_H2)
-               /BME280_TRUE_HUMIDITY_6_5_5_3_6_DATA *
-               (BME280_TRUE_HUMIDITY_1_DATA + ((double)
-               p_bme280->cal_param.dig_H6)
-               / BME280_TRUE_HUMIDITY_6_7_1_0_8_8_6_4_DATA
-               * var_h * (BME280_TRUE_HUMIDITY_1_DATA + ((double)
-               p_bme280->cal_param.dig_H3)
-               / BME280_TRUE_HUMIDITY_6_7_1_0_8_8_6_4_DATA * var_h)));
+               (((double)p_bme280->cal_param.dig_H4) * 64.0 +
+               ((double)p_bme280->cal_param.dig_H5) / 16384.0 * var_h))*
+               (((double)p_bme280->cal_param.dig_H2) / 65536.0 *
+               (1.0 + ((double) p_bme280->cal_param.dig_H6)
+               / 67108864.0 * var_h * (1.0 + ((double)
+               p_bme280->cal_param.dig_H3) / 67108864.0 * var_h)));
        else
-               return BME280_ZERO_U8X;
-       var_h = var_h * (BME280_TRUE_HUMIDITY_1_DATA - ((double)
-       p_bme280->cal_param.dig_H1)*var_h
-       / BME280_TRUE_HUMIDITY_5_2_4_2_8_8_DATA);
-       if (var_h > BME280_TRUE_HUMIDITY_1_0_0_DATA)
-               var_h = BME280_TRUE_HUMIDITY_1_0_0_DATA;
-       else if (var_h < BME280_TRUE_HUMIDITY_0_DATA)
-               var_h = BME280_TRUE_HUMIDITY_0_DATA;
+               return BME280_INVALID_DATA;
+       var_h = var_h * (1.0 - ((double)
+       p_bme280->cal_param.dig_H1)*var_h / 524288.0);
+       if (var_h > 100.0)
+               var_h = 100.0;
+       else if (var_h < 0.0)
+               var_h = 0.0;
        return var_h;
 
 }
@@ -2052,56 +2099,55 @@ double bme280_compensate_H_double(s32 v_uncom_humidity_s32)
  *  @return Return the actual pressure in u32
  *
 */
-u32 bme280_compensate_P_int64(s32 v_uncom_pressure_s32)
+u32 bme280_compensate_pressure_int64(s32 v_uncom_pressure_s32)
 {
-       s64 v_x1_s64r = BME280_ZERO_U8X;
-       s64 v_x2_s64r = BME280_ZERO_U8X;
-       s64 pressure = BME280_ZERO_U8X;
+       s64 v_x1_s64r = BME280_INIT_VALUE;
+       s64 v_x2_s64r = BME280_INIT_VALUE;
+       s64 pressure = BME280_INIT_VALUE;
+
        v_x1_s64r = ((s64)p_bme280->cal_param.t_fine)
-       - BME280_TRUE_PRESSURE_1_2_8_0_0_0_DATA;
+       - 128000;
        v_x2_s64r = v_x1_s64r * v_x1_s64r *
        (s64)p_bme280->cal_param.dig_P6;
        v_x2_s64r = v_x2_s64r + ((v_x1_s64r *
        (s64)p_bme280->cal_param.dig_P5)
-       << SHIFT_LEFT_17_POSITION);
+       << BME280_SHIFT_BIT_POSITION_BY_17_BITS);
        v_x2_s64r = v_x2_s64r +
        (((s64)p_bme280->cal_param.dig_P4)
-       << SHIFT_LEFT_35_POSITION);
+       << BME280_SHIFT_BIT_POSITION_BY_35_BITS);
        v_x1_s64r = ((v_x1_s64r * v_x1_s64r *
        (s64)p_bme280->cal_param.dig_P3)
-       >> SHIFT_RIGHT_8_POSITION) +
+       >> BME280_SHIFT_BIT_POSITION_BY_08_BITS) +
        ((v_x1_s64r * (s64)p_bme280->cal_param.dig_P2)
-       << SHIFT_LEFT_12_POSITION);
-       v_x1_s64r = (((((s64)BME280_ONE_U8X)
-       << SHIFT_LEFT_47_POSITION) + v_x1_s64r)) *
+       << BME280_SHIFT_BIT_POSITION_BY_12_BITS);
+       v_x1_s64r = (((((s64)1)
+       << BME280_SHIFT_BIT_POSITION_BY_47_BITS) + v_x1_s64r)) *
        ((s64)p_bme280->cal_param.dig_P1)
-       >> SHIFT_RIGHT_33_POSITION;
-       pressure = BME280_TRUE_PRESSURE_1_0_4_8_5_7_6_DATA
-       - v_uncom_pressure_s32;
+       >> BME280_SHIFT_BIT_POSITION_BY_33_BITS;
+       pressure = 1048576 - v_uncom_pressure_s32;
        /* Avoid exception caused by division by zero */
-       if (v_x1_s64r != BME280_ZERO_U8X)
+       if (v_x1_s64r != BME280_INIT_VALUE)
                #if defined __KERNEL__
                        pressure = div64_s64((((pressure
-                       << SHIFT_LEFT_31_POSITION) - v_x2_s64r)
-                       * BME280_TRUE_PRESSURE_3_1_2_5_DATA),
-                       v_x1_s64r);
+                       << BME280_SHIFT_BIT_POSITION_BY_31_BITS) - v_x2_s64r)
+                       * 3125), v_x1_s64r);
                #else
                        pressure = (((pressure
-                       << SHIFT_LEFT_31_POSITION) - v_x2_s64r)
-                       * BME280_TRUE_PRESSURE_3_1_2_5_DATA) / v_x1_s64r;
+                       << BME280_SHIFT_BIT_POSITION_BY_31_BITS) - v_x2_s64r)
+                       * 3125) / v_x1_s64r;
                #endif
        else
-               return BME280_ZERO_U8X;
+               return BME280_INVALID_DATA;
        v_x1_s64r = (((s64)p_bme280->cal_param.dig_P9) *
-       (pressure >> SHIFT_RIGHT_13_POSITION) *
-       (pressure >> SHIFT_RIGHT_13_POSITION))
-       >> SHIFT_RIGHT_25_POSITION;
+       (pressure >> BME280_SHIFT_BIT_POSITION_BY_13_BITS) *
+       (pressure >> BME280_SHIFT_BIT_POSITION_BY_13_BITS))
+       >> BME280_SHIFT_BIT_POSITION_BY_25_BITS;
        v_x2_s64r = (((s64)p_bme280->cal_param.dig_P8) *
-       pressure) >> SHIFT_RIGHT_19_POSITION;
+       pressure) >> BME280_SHIFT_BIT_POSITION_BY_19_BITS;
        pressure = (((pressure + v_x1_s64r +
-       v_x2_s64r) >> SHIFT_RIGHT_8_POSITION) +
+       v_x2_s64r) >> BME280_SHIFT_BIT_POSITION_BY_08_BITS) +
        (((s64)p_bme280->cal_param.dig_P7)
-       << SHIFT_LEFT_4_POSITION));
+       << BME280_SHIFT_BIT_POSITION_BY_04_BITS));
 
        return (u32)pressure;
 }
@@ -2119,11 +2165,14 @@ u32 bme280_compensate_P_int64(s32 v_uncom_pressure_s32)
  *  @return the actual pressure in u32
  *
 */
-u32 bme280_compensate_P_int64_twentyfour_bit_output(s32 v_uncom_pressure_s32)
+u32 bme280_compensate_pressure_int64_twentyfour_bit_output(
+s32 v_uncom_pressure_s32)
 {
-       u32 pressure = BME280_ZERO_U8X;
-       pressure = bme280_compensate_P_int64(v_uncom_pressure_s32);
-       pressure = (u32)(pressure >> SHIFT_RIGHT_1_POSITION);
+       u32 pressure = BME280_INIT_VALUE;
+
+       pressure = bme280_compensate_pressure_int64(
+       v_uncom_pressure_s32);
+       pressure = (u32)(pressure >> BME280_SHIFT_BIT_POSITION_BY_01_BIT);
        return pressure;
 }
 #endif
@@ -2148,17 +2197,16 @@ BME280_RETURN_FUNCTION_TYPE bme280_compute_wait_time(u8
 
        *v_delaytime_u8 = (T_INIT_MAX +
        T_MEASURE_PER_OSRS_MAX *
-       (((BME280_ONE_U8X
-       << p_bme280->oversamp_temperature)
-       >> SHIFT_RIGHT_1_POSITION) +
-       ((BME280_ONE_U8X << p_bme280->oversamp_pressure)
-       >> SHIFT_RIGHT_1_POSITION) +
-       ((BME280_ONE_U8X << p_bme280->oversamp_humidity)
-       >> SHIFT_RIGHT_1_POSITION))+
-       (p_bme280->oversamp_pressure ?
-       T_SETUP_PRESSURE_MAX : BME280_ZERO_U8X) +
+       (((1 <<
+       p_bme280->oversamp_temperature)
+       >> BME280_SHIFT_BIT_POSITION_BY_01_BIT)
+       + ((1 << p_bme280->oversamp_pressure)
+       >> BME280_SHIFT_BIT_POSITION_BY_01_BIT) +
+       ((1 << p_bme280->oversamp_humidity)
+       >> BME280_SHIFT_BIT_POSITION_BY_01_BIT))
+       (p_bme280->oversamp_pressure ?
+       T_SETUP_PRESSURE_MAX : 0) +
        (p_bme280->oversamp_humidity ?
-       T_SETUP_HUMIDITY_MAX : BME280_ZERO_U8X)
-       + BME280_FIVETEEN_U8X) / BME280_SIXTEEN_U8X;
+       T_SETUP_HUMIDITY_MAX : 0) + 15) / 16;
        return com_rslt;
 }