From cfabf0e6a24d6bc6a6ca416d50acf8fed0c7f2fa Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Fri, 16 Sep 2016 09:30:45 +0200
Subject: [PATCH 1/9] Support for BME280 added. 	new file:  
 dev/bme280/README.bme280 	new file:   dev/bme280/bme280-sensor.c 	new
 file:   dev/bme280/bme280-sensor.h 	new file:   dev/bme280/bme280.c 
 new file:   dev/bme280/bme280.h

---
 dev/bme280/README.bme280   |  26 ++++
 dev/bme280/bme280-sensor.c |  82 +++++++++++
 dev/bme280/bme280-sensor.h |  49 +++++++
 dev/bme280/bme280.c        | 272 +++++++++++++++++++++++++++++++++++++
 dev/bme280/bme280.h        | 106 +++++++++++++++
 5 files changed, 535 insertions(+)
 create mode 100644 dev/bme280/README.bme280
 create mode 100644 dev/bme280/bme280-sensor.c
 create mode 100644 dev/bme280/bme280-sensor.h
 create mode 100644 dev/bme280/bme280.c
 create mode 100644 dev/bme280/bme280.h

diff --git a/dev/bme280/README.bme280 b/dev/bme280/README.bme280
new file mode 100644
index 000000000..7ce35cb1d
--- /dev/null
+++ b/dev/bme280/README.bme280
@@ -0,0 +1,26 @@
+
+Contiki implementation for Bosch Sensortec BME280 sensor. 
+BME280 is compact and fast and includes temp, RH, and pressure. 
+Chip uses I2C or SPI. This implementation and follow Contiki 
+device API and I2C.
+
+For better performance, less chip warm up and less I2C transactions
+burst read is recommended. Here all T/RH/P is read in one single 
+I2C read and kept the measurements have the same time. 
+
+The burst read is stored in struct bme280_mea which accessible from 
+the Contiki. Also note that the full chip resolution is available. 
+The variables are overscaled to give the app full controlover resolution.
+
+See bme280.h
+
+The pressure can be calculated with 32 or 64. The define BME280_64BIT
+controls this. Typically in your project-conf.h
+ 
+Implemented according to datasheet Rev 1.1.
+
+Limitations:
+Implementation implements Weather Mode which uses forced one-shot 
+mode no oversampling nor filters and reads all T/RH/P in one read.
+
+
diff --git a/dev/bme280/bme280-sensor.c b/dev/bme280/bme280-sensor.c
new file mode 100644
index 000000000..0a15cfaa4
--- /dev/null
+++ b/dev/bme280/bme280-sensor.c
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2015, Copyright Robert Olsson
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ *
+ * Author  : Robert Olsson rolss@kth.se/robert@radio-sensors.com
+ * Created : 2016-09-14
+ */
+
+#include <stdlib.h>
+#include "contiki.h"
+#include "lib/sensors.h"
+#include "dev/bme280/bme280.h"
+#include "dev/bme280/bme280-sensor.h"
+
+const struct sensors_sensor bme280_sensor;
+
+static int
+value(int type)
+{
+
+  /* Read all measurements with one burst read */
+  bme280_read(BME280_MODE_WEATHER);
+
+  /* Return a la Contiki API */
+  switch(type) {
+
+  case BME280_SENSOR_TEMP:
+    return bme280_mea.t_overscale100 / 100;
+
+  case BME280_SENSOR_HUMIDITY:
+    return bme280_mea.h_overscale1024>>10;
+
+  case BME280_SENSOR_PRESSURE:
+    /* Scale down w. 10 not to overslow the signed int */
+#ifdef BME280_64BIT
+    return bme280_mea.p_overscale256/(256*10);
+#else
+    return bme280_mea.p/10;
+#endif
+  }
+  return 0;
+}
+
+static int
+status(int type)
+{
+  return 0;
+}
+
+static int
+configure(int type, int c)
+{
+  bme280_init(BME280_MODE_WEATHER);
+}
+SENSORS_SENSOR(bme280_sensor, "bme280", value, configure, status);
diff --git a/dev/bme280/bme280-sensor.h b/dev/bme280/bme280-sensor.h
new file mode 100644
index 000000000..92dfae0d1
--- /dev/null
+++ b/dev/bme280/bme280-sensor.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2015, Copyright Robert Olsson
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ *
+ * Author  : Robert Olsson rolss@kth.se/robert@radio-sensors.com
+ * Created : 2016-09-14
+ */
+
+#ifndef BME280_SENSOR_H_
+#define BME280_SENSOR_H_
+
+#include "lib/sensors.h"
+#include "lib/sensors.h"
+#include "bme280.h"
+
+extern const struct sensors_sensor bme280_sensor;
+
+#define BME280_SENSOR_TEMP         0
+#define BME280_SENSOR_HUMIDITY     1
+#define BME280_SENSOR_PRESSURE     2
+
+#endif /* BME280_SENSOR_H_ */
diff --git a/dev/bme280/bme280.c b/dev/bme280/bme280.c
new file mode 100644
index 000000000..7377acaf6
--- /dev/null
+++ b/dev/bme280/bme280.c
@@ -0,0 +1,272 @@
+/*
+ * Copyright (c) 2015, Copyright Robert Olsson
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ *
+ * Author  : Robert Olsson rolss@kth.se/robert@radio-sensors.com
+ * Created : 2016-09-14
+ */
+
+/**
+ * \file
+ *        Basic functions for Bosch BME280 based on datasheel Rev 1.1
+ */
+
+#include "contiki.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <math.h>
+#include "bme280.h"
+#include "dev/bme280-arch.h"
+
+static struct {
+  unsigned short dig_t1;
+  signed short dig_t2;
+  signed short dig_t3;
+  unsigned short dig_p1;
+  signed short dig_p2;
+  signed short dig_p3;
+  signed short dig_p4;
+  signed short dig_p5;
+  signed short dig_p6;
+  signed short dig_p7;
+  signed short dig_p8;
+  signed short dig_p9;
+  unsigned char dig_h1;
+  signed short dig_h2;
+  unsigned char dig_h3;
+  signed short dig_h4;
+  signed short dig_h5;
+  signed char dig_h6;
+  int32_t t_fine;
+  uint8_t mode;
+} bm;
+
+int32_t
+bme280_t_overscale100(int32_t ut)
+{
+  int32_t v1, v2, t;
+
+  v1 = ((((ut >> 3) - ((int32_t)bm.dig_t1 << 1))) *
+        ((int32_t)bm.dig_t2)) >> 11;
+
+  v2 = (((((ut >> 4) - ((int32_t)bm.dig_t1)) * ((ut >> 4) -
+                                                ((int32_t)bm.dig_t1))) >> 12) * ((int32_t)bm.dig_t3)) >> 14;
+
+  bm.t_fine = v1 + v2;
+  t = (bm.t_fine * 5 + 128) >> 8;
+  return t;
+}
+#ifdef BME280_32BIT
+static uint32_t
+bme280_p(int32_t up)
+{
+  int32_t v1, v2;
+  uint32_t p;
+
+  v1 = (((int32_t)bm.t_fine) >> 1) - (int32_t)64000;
+  v2 = (((v1 >> 2) * (v1 >> 2)) >> 11) * ((int32_t)bm.dig_p6);
+  v2 = v2 + ((v1 * ((int32_t)bm.dig_p5)) << 1);
+  v2 = (v2 >> 2) + (((int32_t)bm.dig_p4) << 16);
+
+  v1 = (((bm.dig_p3 * (((v1 >> 2) * (v1 >> 2)) >> 13)) >> 3) +
+        ((((int32_t)bm.dig_p2) * v1) >> 1)) >> 18;
+
+  v1 = ((((32768 + v1)) * ((int32_t)bm.dig_p1)) >> 15);
+
+  if(v1 == 0) {
+    return 0;
+  }
+
+  p = (((uint32_t)(((int32_t)1048576) - up) - (v2 >> 12))) * 3125;
+
+  if(p < 0x80000000) {
+    p = (p << 1) / ((uint32_t)v1);
+  } else {
+    p = (p / (uint32_t)v1) * 2;
+  }
+
+  v1 = (((int32_t)bm.dig_p9) * ((int32_t)(((p >> 3) * (p >> 3)) >> 13))) >> 12;
+  v2 = (((int32_t)(p >> 2)) * ((int32_t)bm.dig_p8)) >> 13;
+  p = (uint32_t)((int32_t)p + ((v1 + v2 + bm.dig_p7) >> 4));
+  return p;
+}
+#else
+
+static uint32_t
+bme280_p_overscale256(int32_t up)
+{
+  int64_t v1, v2, p;
+
+  v1 = ((int64_t)bm.t_fine) - 128000;
+  v2 = v1 * v1 * (int64_t)bm.dig_p6;
+  v2 = v2 + ((v1 * (int64_t)bm.dig_p5) << 17);
+  v2 = v2 + (((int64_t)bm.dig_p4) << 35);
+  v1 = ((v1 * v1 * (int64_t)bm.dig_p3) >> 8) + ((v1 * (int64_t)bm.dig_p2) << 12);
+  v1 = (((((int64_t)1) << 47) + v1)) * ((int64_t)bm.dig_p1) >> 33;
+
+  if(v1 == 0) {
+    return 0;
+  }
+
+  p = 1048576 - up;
+  p = (((p << 31) - v2) * 3125) / v1;
+  v1 = (((int64_t)bm.dig_p9) * (p >> 13) * (p >> 13)) >> 25;
+  v2 = (((int64_t)bm.dig_p8) * p) >> 19;
+  p = (((p + v1 + v2) >> 8) + (((int64_t)bm.dig_p7) << 4));
+  return (uint32_t)p;
+}
+#endif
+
+static uint32_t
+bme280_h_overscale1024(int32_t uh)
+{
+  int32_t v1;
+  v1 = (bm.t_fine - ((int32_t)76800));
+  v1 = (((((uh << 14) - (((int32_t)bm.dig_h4) << 20) - (((int32_t)bm.dig_h5) * v1)) + ((int32_t)16384)) >> 15)
+        * (((((((v1 * ((int32_t)bm.dig_h6)) >> 10) * (((v1 * ((int32_t)bm.dig_h3)) >> 11) + ((int32_t)32768)))
+              >> 10) + ((int32_t)2097152)) * ((int32_t)bm.dig_h2) + 8192) >> 14));
+  v1 = (v1 - (((((v1 >> 15) * (v1 >> 15)) >> 7) * ((int32_t)bm.dig_h1)) >> 4));
+  v1 = (v1 < 0 ? 0 : v1);
+  v1 = (v1 > 419430400 ? 419430400 : v1);
+  return (uint32_t)(v1 >> 12);
+}
+void
+bme280_init(uint8_t mode)
+{
+  uint8_t buf[26];
+
+  /* Do not mess with other chips */
+  i2c_read_mem(BME280_ADDR, 0xD0, buf, 1);
+  if(buf[0] != BME280_CHIP_ID) {
+    return;
+  }
+
+  i2c_write_mem(BME280_ADDR, BME280_CNTL_RESET, 0xB6);
+  clock_delay_msec(BME280_MAX_WAIT);
+
+  memset(buf, 0, sizeof(buf));
+
+  /* Burst read of all calibration part 1 */
+  i2c_read_mem(BME280_ADDR, BME280_DIG_T1_ADDR, buf, sizeof(buf));
+  bm.dig_t1 = ((uint16_t)buf[1] << 8) | (uint16_t)buf[0];
+  bm.dig_t2 = ((int16_t)buf[3] << 8) | (uint16_t)buf[2];
+  bm.dig_t3 = ((int16_t)buf[5] << 8) | (uint16_t)buf[4];
+  bm.dig_p1 = ((uint16_t)buf[7] << 8) | (uint16_t)buf[6];
+  bm.dig_p2 = ((int16_t)buf[9] << 8) | (uint16_t)buf[8];
+  bm.dig_p3 = ((int16_t)buf[11] << 8) | (uint16_t)buf[10];
+  bm.dig_p4 = ((int16_t)buf[13] << 8) | (uint16_t)buf[12];
+  bm.dig_p5 = ((int16_t)buf[15] << 8) | (uint16_t)buf[14];
+  bm.dig_p6 = ((int16_t)buf[17] << 8) | (uint16_t)buf[16];
+  bm.dig_p7 = ((int16_t)buf[19] << 8) | (uint16_t)buf[18];
+  bm.dig_p8 = ((int16_t)buf[21] << 8) | (uint16_t)buf[20];
+  bm.dig_p9 = ((int16_t)buf[23] << 8) | (uint16_t)buf[22];
+  /* A0 not used */
+  bm.dig_h1 = (unsigned char)buf[25];
+
+  /* Burst read of all calibration part 2 */
+  i2c_read_mem(BME280_ADDR, BME280_DIG_H2_ADDR, buf, 8);
+  bm.dig_h2 = ((int16_t)buf[1] << 8) | (uint16_t)buf[0];
+  bm.dig_h3 = (unsigned char)buf[2];
+  bm.dig_h4 = ((int16_t)buf[3] << 4) | (((uint16_t)buf[4]) & 0xF);
+  bm.dig_h5 = ((int16_t)buf[6] << 4) | (((uint16_t)buf[5]) & 0xF);
+  bm.dig_h6 = (unsigned char)buf[7];
+
+  bm.mode = mode;
+}
+void
+bme280_read(uint8_t mode)
+{
+  int32_t ut, uh, up;
+  uint8_t buf[8], sleep;
+  uint16_t i;
+  memset(buf, 0, sizeof(buf));
+
+  /* Are we initilized and in the right mode? */
+  if(mode == BME280_MODE_NONE || mode != bm.mode) {
+    return;
+  }
+
+  ut = uh = up = 0;
+
+  /* Weather mode. See sectiom 3.5 Datasheet */
+  if(mode == BME280_MODE_WEATHER) {
+    /* Humidity oversampling *1 */
+    i2c_write_mem(BME280_ADDR, BME280_CNTL_HUM, 0x01);
+
+    /*  00100111  0x27 oversampling *1 for t and p plus normal mode */
+    /* 0.5 ms -- no filter -- no SPI */
+    i2c_write_mem(BME280_ADDR, BME280_CONTROL, 0x00);
+
+    /*  00100110  0x26 oversampling *1 for t and p  plus forced mode */
+    /* Trigger measurement needed for every time in forced mode */
+    i2c_write_mem(BME280_ADDR, BME280_CNTL_MEAS, 0x26);
+    /* Wait to get into sleep mode == measurement done */
+    for(i = 0; i < BME280_MAX_WAIT; i++) {
+      i2c_read_mem(BME280_ADDR, BME280_CNTL_MEAS, &sleep, 1);
+      sleep = sleep& 0x03;
+      if(sleep== 0) {
+        break;
+      } else {
+        clock_delay_msec(1);
+      }
+    }
+    if(i == BME280_MAX_WAIT) {
+      return; /* error  wait*/
+    }
+  } else {  /* if(mode == BME280_MODE_WEATHER) */
+    return; /* error mode*/
+  }
+
+  /* Burst read of all measurements */
+  i2c_read_mem(BME280_ADDR, BME280_PRESS, buf, 8);
+  ut = (uint32_t)(buf[3]) << 12 | (uint32_t)(buf[4]) << 4 | (uint32_t)buf[5] >> 4;
+  up = (uint32_t)(buf[0]) << 12 | (uint32_t)(buf[1]) << 4 | (uint32_t)buf[2] >> 4;
+  uh = (uint32_t)(buf[6]) << 8 | (uint32_t)buf[7];
+
+  bme280_mea.t_overscale100 = bme280_t_overscale100(ut);
+  bme280_mea.h_overscale1024 = bme280_h_overscale1024(uh);
+#ifdef BME280_64BIT
+  bme280_mea.p_overscale256 = bme280_p_overscale256(up);
+#else
+  bme280_mea.p = bme280_p(up);
+#endif
+
+#if TEST
+  printf("T_BME280=%5.2f", (double)bme280_mea.t_overscale100 / 100.);
+  printf(" RH_BME280=%5.2f ", (double)bme280_mea.h_overscale1024 / 1024.);
+#ifdef BME280_64BIT
+  printf(" P_BME280=%5.2f\n", (double)bme280_mea.p_overscale256 / 256.);
+#else
+  printf(" P_BME280=%5.2f\n", (double)bme280_mea.p);
+#endif
+#endif
+}
diff --git a/dev/bme280/bme280.h b/dev/bme280/bme280.h
new file mode 100644
index 000000000..9486738c3
--- /dev/null
+++ b/dev/bme280/bme280.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2015, Copyright Robert Olsson
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ *
+ * Author  : Robert Olsson rolss@kth.se/robert@radio-sensors.com
+ * 
+ * Created : 2016-09-14
+ */
+
+/**
+ * \file
+ *         Definitions for the Bosch BME280 based on datasheel Rev 1.1
+ */
+
+#ifndef BME280_H
+#define BME280_H
+
+#ifndef BME280_32BIT
+#define BME280_64BIT
+#endif
+
+void bme280_init(uint8_t mode);
+void bme280_read(uint8_t mode);
+
+#define  BME280_ADDR   (0x77 << 1) /* Alternative 0x76 */
+
+/* Diffrent BOSCH chip id's */
+#define BMP085_CHIP_ID 0x55  /* And also BMP180 */
+#define BMP280_CHIP_ID 0x58
+#define BME280_CHIP_ID 0x60
+
+/* Address map */
+#define BME280_DIG_T1_ADDR 0x88
+#define BME280_DIG_T2_ADDR 0x8A
+#define BME280_DIG_T3_ADDR 0x8C
+#define BME280_DIG_P1_ADDR 0x8E
+#define BME280_DIG_P2_ADDR 0x90
+#define BME280_DIG_P3_ADDR 0x92
+#define BME280_DIG_P4_ADDR 0x94
+#define BME280_DIG_P5_ADDR 0x96
+#define BME280_DIG_P6_ADDR 0x98
+#define BME280_DIG_P7_ADDR 0x9A
+#define BME280_DIG_P8_ADDR 0x9C
+#define BME280_DIG_P9_ADDR 0x9E
+#define BME280_DIG_H1_ADDR 0xA1
+#define BMP_CHIP_ID_ADDR 0xD0
+#define BME280_CNTL_RESET 0xE0
+#define BME280_DIG_H2_ADDR 0xE1
+#define BME280_DIG_H3_ADDR 0xE3
+#define BME280_DIG_H4_ADDR 0xE4
+#define BME280_DIG_H5_ADDR 0xE5
+#define BME280_DIG_H6_ADDR 0xE7
+#define BME280_CNTL_HUM 0xF2
+#define BME280_STATUS 0xF3
+#define BME280_CNTL_MEAS 0xF4
+#define BME280_CONTROL 0xF5
+#define BME280_PRESS 0xF7
+
+/* Function modes outlined in datasheet */
+#define BME280_MODE_NONE 0
+#define BME280_MODE_WEATHER 1
+#define BME280_MODE_HUMIDITY 2
+#define BME280_MODE_INDOOR_NAVIGATION 3
+#define BME280_MODE_GAMING 4
+
+#define BME280_MAX_WAIT 300 /* ms. Forced mode max wait */
+#define BME280_STARTUP_TIME 2 /* ms */
+
+struct {
+  int32_t t_overscale100;
+  uint32_t h_overscale1024;
+#ifdef BME280_64BIT
+  uint32_t p_overscale256;
+#else
+  uint32_t p;
+#endif
+} bme280_mea;
+
+#endif /* BME280_H */

From 5c25ec4d11080bd558c450ba883bcf0efde6605a Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Fri, 16 Sep 2016 09:34:14 +0200
Subject: [PATCH 2/9] Example modified to use BME280

---
 examples/avr-rss2/hello-sensors/Makefile      |  1 +
 .../avr-rss2/hello-sensors/hello-sensors.c    | 18 +++++++
 .../avr-rss2/hello-sensors/project-conf.h     |  2 +
 platform/avr-rss2/dev/bme280-arch.h           | 47 +++++++++++++++++++
 4 files changed, 68 insertions(+)
 create mode 100644 platform/avr-rss2/dev/bme280-arch.h

diff --git a/examples/avr-rss2/hello-sensors/Makefile b/examples/avr-rss2/hello-sensors/Makefile
index 0d1d41b9f..22c0f611c 100644
--- a/examples/avr-rss2/hello-sensors/Makefile
+++ b/examples/avr-rss2/hello-sensors/Makefile
@@ -8,6 +8,7 @@ PRINTF_LIB_MIN  = -Wl,-u,vfprintf -lprintf_min
 PRINTF_LIB      = $(PRINTF_LIB_FLT)
 CLIBS           = $(PRINTF_LIB) 
 
+MODULES += dev/bme280
 
 CUSTOM_RULE_LINK = 1
 %.$(TARGET): %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a 
diff --git a/examples/avr-rss2/hello-sensors/hello-sensors.c b/examples/avr-rss2/hello-sensors/hello-sensors.c
index 42be6109e..256efe3d9 100644
--- a/examples/avr-rss2/hello-sensors/hello-sensors.c
+++ b/examples/avr-rss2/hello-sensors/hello-sensors.c
@@ -49,6 +49,7 @@
 #include "dev/temp_mcu-sensor.h"
 #include "dev/light-sensor.h"
 #include "dev/pulse-sensor.h"
+#include "dev/bme280/bme280-sensor.h"
 #ifdef CO2
 #include "dev/co2_sa_kxx-sensor.h"
 #endif
@@ -83,6 +84,22 @@ read_values(void)
 #ifdef CO2
   printf(" CO2=%-d", co2_sa_kxx_sensor.value( CO2_SA_KXX_CO2));
 #endif
+#if STD_API
+  printf(" BME280_TEMP=%-d", bme280_sensor.value(BME280_SENSOR_TEMP));
+  printf(" BME280_RH=%-d", bme280_sensor.value(BME280_SENSOR_HUMIDITY));
+  printf(" BME280_P=%-d", bme280_sensor.value(BME280_SENSOR_PRESSURE));
+#else 
+  /* Trigger burst read */
+  (void *) bme280_sensor.value(BME280_SENSOR_TEMP);
+  printf(" T_BME280=%5.2f", (double)bme280_mea.t_overscale100 / 100.);
+  printf(" RH_BME280=%5.2f ", (double)bme280_mea.h_overscale1024 / 1024.);
+#ifdef BME280_64BIT
+  printf(" P_BME280=%5.2f ", (double)bme280_mea.p_overscale256 / 256.);
+#else
+  printf(" P_BME280=%5.2f ", (double)bme280_mea.p);
+#endif
+#endif
+
   printf("\n");
 }
 /*---------------------------------------------------------------------------*/
@@ -95,6 +112,7 @@ PROCESS_THREAD(hello_sensors_process, ev, data)
   SENSORS_ACTIVATE(temp_mcu_sensor);
   SENSORS_ACTIVATE(light_sensor);
   SENSORS_ACTIVATE(pulse_sensor);
+  SENSORS_ACTIVATE(bme280_sensor);
 #ifdef CO2
   SENSORS_ACTIVATE(co2_sa_kxx_sensor);
 #endif
diff --git a/examples/avr-rss2/hello-sensors/project-conf.h b/examples/avr-rss2/hello-sensors/project-conf.h
index 8d1bc434f..72163ce4e 100644
--- a/examples/avr-rss2/hello-sensors/project-conf.h
+++ b/examples/avr-rss2/hello-sensors/project-conf.h
@@ -42,6 +42,8 @@
 #ifndef PROJECT_CONF_H_
 #define PROJECT_CONF_H_
 
+/* #define BME280_32BIT */
+
 #define NETSTACK_CONF_RDC nullrdc_driver
 #define NETSTACK_CONF_MAC nullmac_driver
 
diff --git a/platform/avr-rss2/dev/bme280-arch.h b/platform/avr-rss2/dev/bme280-arch.h
new file mode 100644
index 000000000..7c84e93ba
--- /dev/null
+++ b/platform/avr-rss2/dev/bme280-arch.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2015, Copyright Robert Olsson
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ *
+ * Author  : Robert Olsson rolss@kth.se/robert@radio-sensors.com
+ * Created : 2016-09-14
+ */
+
+#ifndef BME280_ARCH_H
+#define BME280_ARCH_H
+
+/**
+ * \file
+ *	Architecture-specific definitions for the BME280 sensor for avr-rss2
+ * \author
+ * 	Robert Olsson
+ */
+
+
+#endif

From dcbb5f6271f870755f07549034bc3fd4aee76e49 Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Fri, 16 Sep 2016 14:34:39 +0200
Subject: [PATCH 3/9] BME280 I2C integration fixes

---
 dev/bme280/bme280.h                 | 4 ++++
 platform/avr-rss2/dev/bme280-arch.h | 1 +
 platform/avr-rss2/dev/i2c.c         | 6 ++++++
 platform/avr-rss2/dev/i2c.h         | 3 ++-
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/dev/bme280/bme280.h b/dev/bme280/bme280.h
index 9486738c3..787186fda 100644
--- a/dev/bme280/bme280.h
+++ b/dev/bme280/bme280.h
@@ -49,7 +49,11 @@
 void bme280_init(uint8_t mode);
 void bme280_read(uint8_t mode);
 
+#ifdef  I2C_BME280_ADDR
+#define BME280_ADDR I2C_BME280_ADDR
+#else
 #define  BME280_ADDR   (0x77 << 1) /* Alternative 0x76 */
+#endif
 
 /* Diffrent BOSCH chip id's */
 #define BMP085_CHIP_ID 0x55  /* And also BMP180 */
diff --git a/platform/avr-rss2/dev/bme280-arch.h b/platform/avr-rss2/dev/bme280-arch.h
index 7c84e93ba..3fbc83ccd 100644
--- a/platform/avr-rss2/dev/bme280-arch.h
+++ b/platform/avr-rss2/dev/bme280-arch.h
@@ -43,5 +43,6 @@
  * 	Robert Olsson
  */
 
+#include "i2c.h"
 
 #endif
diff --git a/platform/avr-rss2/dev/i2c.c b/platform/avr-rss2/dev/i2c.c
index 2668aad58..ee0d29125 100644
--- a/platform/avr-rss2/dev/i2c.c
+++ b/platform/avr-rss2/dev/i2c.c
@@ -224,5 +224,11 @@ i2c_probe(void)
     probed |= I2C_CO2SA;
     print_delim(p++, "CO2SA", del);
   }
+  watchdog_periodic();
+  if(!i2c_start(I2C_BME280_ADDR)) {
+    i2c_stop();
+    probed |= I2C_BME280;
+    print_delim(p++, "BME280", del);
+  }
   return probed;
 }
diff --git a/platform/avr-rss2/dev/i2c.h b/platform/avr-rss2/dev/i2c.h
index 3aa124953..e380cda52 100644
--- a/platform/avr-rss2/dev/i2c.h
+++ b/platform/avr-rss2/dev/i2c.h
@@ -40,12 +40,13 @@
 /* Here we define the i2c address for dev we support */
 #define I2C_AT24MAC_ADDR  0xB0 /* EUI64 ADDR */
 #define I2C_SHT2X_ADDR    (0x40 << 1) /* SHT2X ADDR */
-
+#define I2C_BME280_ADDR   (0x77 << 1) /* Alternative 0x76 */
 
 /* Here we define a enumration for devices */
 #define I2C_AT24MAC       (1<<0)
 #define I2C_SHT2X         (1<<1)
 #define I2C_CO2SA         (1<<2)  /* Sense-Air CO2 */
+#define I2C_BME280        (1<<3)
 
 #define I2C_READ    1
 #define I2C_WRITE   0

From cfed856720f5a6302490ca92217d2d9f57b43ff4 Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Fri, 16 Sep 2016 14:36:19 +0200
Subject: [PATCH 4/9] I2C fixes 	modified:  
 examples/avr-rss2/hello-sensors/hello-sensors.c

---
 .../avr-rss2/hello-sensors/hello-sensors.c    | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/examples/avr-rss2/hello-sensors/hello-sensors.c b/examples/avr-rss2/hello-sensors/hello-sensors.c
index 256efe3d9..59d231678 100644
--- a/examples/avr-rss2/hello-sensors/hello-sensors.c
+++ b/examples/avr-rss2/hello-sensors/hello-sensors.c
@@ -50,9 +50,7 @@
 #include "dev/light-sensor.h"
 #include "dev/pulse-sensor.h"
 #include "dev/bme280/bme280-sensor.h"
-#ifdef CO2
 #include "dev/co2_sa_kxx-sensor.h"
-#endif
 /*---------------------------------------------------------------------------*/
 PROCESS(hello_sensors_process, "Hello sensor process");
 AUTOSTART_PROCESSES(&hello_sensors_process);
@@ -81,24 +79,28 @@ read_values(void)
   printf(" LIGHT=%-d", light_sensor.value(0));
   printf(" PULSE_0=%-d", pulse_sensor.value(0));
   printf(" PULSE_1=%-d", pulse_sensor.value(1));
-#ifdef CO2
-  printf(" CO2=%-d", co2_sa_kxx_sensor.value( CO2_SA_KXX_CO2));
-#endif
+
+  if( i2c_probed & I2C_CO2SA ) {
+    printf(" CO2=%-d", co2_sa_kxx_sensor.value( CO2_SA_KXX_CO2));
+  }
+
+  if( i2c_probed & I2C_BME280 ) {
 #if STD_API
-  printf(" BME280_TEMP=%-d", bme280_sensor.value(BME280_SENSOR_TEMP));
-  printf(" BME280_RH=%-d", bme280_sensor.value(BME280_SENSOR_HUMIDITY));
-  printf(" BME280_P=%-d", bme280_sensor.value(BME280_SENSOR_PRESSURE));
+    printf(" BME280_TEMP=%-d", bme280_sensor.value(BME280_SENSOR_TEMP));
+    printf(" BME280_RH=%-d", bme280_sensor.value(BME280_SENSOR_HUMIDITY));
+    printf(" BME280_P=%-d", bme280_sensor.value(BME280_SENSOR_PRESSURE));
 #else 
-  /* Trigger burst read */
-  (void *) bme280_sensor.value(BME280_SENSOR_TEMP);
-  printf(" T_BME280=%5.2f", (double)bme280_mea.t_overscale100 / 100.);
-  printf(" RH_BME280=%5.2f ", (double)bme280_mea.h_overscale1024 / 1024.);
+    /* Trigger burst read */
+    bme280_sensor.value(BME280_SENSOR_TEMP);
+    printf(" T_BME280=%5.2f", (double)bme280_mea.t_overscale100 / 100.);
+    printf(" RH_BME280=%5.2f", (double)bme280_mea.h_overscale1024 / 1024.);
 #ifdef BME280_64BIT
-  printf(" P_BME280=%5.2f ", (double)bme280_mea.p_overscale256 / 256.);
+    printf(" P_BME280=%5.2f", (double)bme280_mea.p_overscale256 / 256.);
 #else
-  printf(" P_BME280=%5.2f ", (double)bme280_mea.p);
+    printf(" P_BME280=%5.2f", (double)bme280_mea.p);
 #endif
 #endif
+  }
 
   printf("\n");
 }
@@ -112,10 +114,14 @@ PROCESS_THREAD(hello_sensors_process, ev, data)
   SENSORS_ACTIVATE(temp_mcu_sensor);
   SENSORS_ACTIVATE(light_sensor);
   SENSORS_ACTIVATE(pulse_sensor);
-  SENSORS_ACTIVATE(bme280_sensor);
-#ifdef CO2
-  SENSORS_ACTIVATE(co2_sa_kxx_sensor);
-#endif
+
+  if( i2c_probed & I2C_BME280 ) {
+    SENSORS_ACTIVATE(bme280_sensor);
+  }
+
+  if( i2c_probed & I2C_CO2SA ) {
+    SENSORS_ACTIVATE(co2_sa_kxx_sensor);
+  }
   leds_init(); 
   leds_on(LEDS_RED);
   leds_on(LEDS_YELLOW);

From 1c0e33be792bd57aefa03d9e7efc682524bd9922 Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Fri, 16 Sep 2016 17:29:50 +0200
Subject: [PATCH 5/9] Update README.bme280

---
 dev/bme280/README.bme280 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/bme280/README.bme280 b/dev/bme280/README.bme280
index 7ce35cb1d..718013cdc 100644
--- a/dev/bme280/README.bme280
+++ b/dev/bme280/README.bme280
@@ -4,7 +4,7 @@ BME280 is compact and fast and includes temp, RH, and pressure.
 Chip uses I2C or SPI. This implementation and follow Contiki 
 device API and I2C.
 
-For better performance, less chip warm up and less I2C transactions
+For better performance and less chip warm up and less I2C transactions
 burst read is recommended. Here all T/RH/P is read in one single 
 I2C read and kept the measurements have the same time. 
 

From 23a481600afe474b3ea63d8f653a747572de457e Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Fri, 30 Sep 2016 13:17:28 +0200
Subject: [PATCH 6/9] BME280 fixes, codestyle, return code for bme280_init
 added, Unneeded header files removed

---
 dev/bme280/bme280-sensor.c | 11 ++++-------
 dev/bme280/bme280.c        |  9 +++------
 dev/bme280/bme280.h        |  4 ++--
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/dev/bme280/bme280-sensor.c b/dev/bme280/bme280-sensor.c
index 0a15cfaa4..d6ed44d10 100644
--- a/dev/bme280/bme280-sensor.c
+++ b/dev/bme280/bme280-sensor.c
@@ -33,7 +33,6 @@
  * Created : 2016-09-14
  */
 
-#include <stdlib.h>
 #include "contiki.h"
 #include "lib/sensors.h"
 #include "dev/bme280/bme280.h"
@@ -55,28 +54,26 @@ value(int type)
     return bme280_mea.t_overscale100 / 100;
 
   case BME280_SENSOR_HUMIDITY:
-    return bme280_mea.h_overscale1024>>10;
+    return bme280_mea.h_overscale1024 >> 10;
 
   case BME280_SENSOR_PRESSURE:
     /* Scale down w. 10 not to overslow the signed int */
 #ifdef BME280_64BIT
-    return bme280_mea.p_overscale256/(256*10);
+    return bme280_mea.p_overscale256 / (256 * 10);
 #else
-    return bme280_mea.p/10;
+    return bme280_mea.p / 10;
 #endif
   }
   return 0;
 }
-
 static int
 status(int type)
 {
   return 0;
 }
-
 static int
 configure(int type, int c)
 {
-  bme280_init(BME280_MODE_WEATHER);
+  return bme280_init(BME280_MODE_WEATHER);
 }
 SENSORS_SENSOR(bme280_sensor, "bme280", value, configure, status);
diff --git a/dev/bme280/bme280.c b/dev/bme280/bme280.c
index 7377acaf6..e0ebcf647 100644
--- a/dev/bme280/bme280.c
+++ b/dev/bme280/bme280.c
@@ -39,11 +39,7 @@
  */
 
 #include "contiki.h"
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
-#include <math.h>
 #include "bme280.h"
 #include "dev/bme280-arch.h"
 
@@ -159,7 +155,7 @@ bme280_h_overscale1024(int32_t uh)
   v1 = (v1 > 419430400 ? 419430400 : v1);
   return (uint32_t)(v1 >> 12);
 }
-void
+uint8_t
 bme280_init(uint8_t mode)
 {
   uint8_t buf[26];
@@ -167,7 +163,7 @@ bme280_init(uint8_t mode)
   /* Do not mess with other chips */
   i2c_read_mem(BME280_ADDR, 0xD0, buf, 1);
   if(buf[0] != BME280_CHIP_ID) {
-    return;
+    return 0;
   }
 
   i2c_write_mem(BME280_ADDR, BME280_CNTL_RESET, 0xB6);
@@ -201,6 +197,7 @@ bme280_init(uint8_t mode)
   bm.dig_h6 = (unsigned char)buf[7];
 
   bm.mode = mode;
+  return 1;
 }
 void
 bme280_read(uint8_t mode)
diff --git a/dev/bme280/bme280.h b/dev/bme280/bme280.h
index 787186fda..cb86c37a2 100644
--- a/dev/bme280/bme280.h
+++ b/dev/bme280/bme280.h
@@ -30,7 +30,7 @@
  *
  *
  * Author  : Robert Olsson rolss@kth.se/robert@radio-sensors.com
- * 
+ *
  * Created : 2016-09-14
  */
 
@@ -46,7 +46,7 @@
 #define BME280_64BIT
 #endif
 
-void bme280_init(uint8_t mode);
+uint8_t bme280_init(uint8_t mode);
 void bme280_read(uint8_t mode);
 
 #ifdef  I2C_BME280_ADDR

From bd1a6bf94e1dbbd5186a02b11a64506b92077a9a Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Thu, 3 Nov 2016 09:04:33 +0100
Subject: [PATCH 7/9] zoul: Added bme280 example

---
 examples/zolertia/zoul/Makefile      |  5 +-
 examples/zolertia/zoul/test-bme280.c | 91 ++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 examples/zolertia/zoul/test-bme280.c

diff --git a/examples/zolertia/zoul/Makefile b/examples/zolertia/zoul/Makefile
index f0d8c6535..8ec446d63 100644
--- a/examples/zolertia/zoul/Makefile
+++ b/examples/zolertia/zoul/Makefile
@@ -5,13 +5,16 @@ CONTIKI_PROJECT += test-bmp085-bmp180 test-motion test-rotation-sensor
 CONTIKI_PROJECT += test-grove-light-sensor test-grove-loudness-sensor
 CONTIKI_PROJECT += test-weather-meter test-grove-gyro test-lcd test-iaq
 CONTIKI_PROJECT += test-pm10-sensor test-vac-sensor test-aac-sensor
-CONTIKI_PROJECT += test-zonik test-dht22.c test-ac-dimmer.c
+CONTIKI_PROJECT += test-zonik test-dht22.c test-ac-dimmer.c test-servo.c
+CONTIKI_PROJECT += test-bme280
 
 CONTIKI_TARGET_SOURCEFILES += tsl256x.c sht25.c bmpx8x.c motion-sensor.c
 CONTIKI_TARGET_SOURCEFILES += adc-sensors.c weather-meter.c grove-gyro.c
 CONTIKI_TARGET_SOURCEFILES += rgb-bl-lcd.c pm10-sensor.c iaq.c zonik.c relay.c
 CONTIKI_TARGET_SOURCEFILES += dht22.c servo.c ac-dimmer.c
 
+MODULES += /dev/bme280
+
 all: $(CONTIKI_PROJECT)
 
 CONTIKI = ../../..
diff --git a/examples/zolertia/zoul/test-bme280.c b/examples/zolertia/zoul/test-bme280.c
new file mode 100644
index 000000000..7636ceb2f
--- /dev/null
+++ b/examples/zolertia/zoul/test-bme280.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2015, Zolertia <http://www.zolertia.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ */
+/**
+ * \addtogroup zoul-examples
+ * @{
+ *
+ * \defgroup zoul-bme280-test BME280 temperature and humidity sensor test
+ *
+ * Demonstrates the use of the BME280 digital temperature and humidity sensor
+ * @{
+ *
+ * \file
+ *         A quick program for testing the BME280 temperature and humidity sensor
+ * \author
+ *         Antonio Lignan <alinan@zolertia.com>
+ */
+/*---------------------------------------------------------------------------*/
+#include <stdio.h>
+#include "contiki.h"
+#include "dev/bme280.h"
+/*---------------------------------------------------------------------------*/
+#define BME280_USE_STD_API  1
+/*---------------------------------------------------------------------------*/
+PROCESS(zoul_bme280_process, "BME280 test");
+AUTOSTART_PROCESSES(&zoul_bme280_process);
+/*---------------------------------------------------------------------------*/
+static struct etimer et;
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(zoul_bme280_process, ev, data)
+{
+  PROCESS_BEGIN();
+  SENSORS_ACTIVATE(bme280_sensor);
+
+  /* Let it spin and read sensor data */
+
+  while(1) {
+    etimer_set(&et, CLOCK_SECOND);
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+#if BME280_USE_STD_API
+    printf("temperature = %-d ", bme280_sensor.value(BME280_SENSOR_TEMP));
+    printf("humidity = %-d ",    bme280_sensor.value(BME280_SENSOR_HUMIDITY));
+    printf("pressure = %-d\n",   bme280_sensor.value(BME280_SENSOR_PRESSURE));
+#else /* BME280_USE_STD_API */
+    /* Trigger burst read */
+    bme280_sensor.value(BME280_SENSOR_TEMP);
+    printf("temperature = %5.2f" , (double)bme280_mea.t_overscale100 / 100.);
+    printf("humidity = %5.2f ",    (double)bme280_mea.h_overscale1024 / 1024.);
+#ifdef BME280_64BIT
+    printf("pressure = %5.2f\n", (double)bme280_mea.p_overscale256 / 256.);
+#else /* BME280_64BIT */
+    printf("pressure = %5.2f\n", (double)bme280_mea.p);
+#endif /* BME280_64BIT */
+#endif /* BME280_USE_STD_API */
+  }
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
+

From f9b32f813910df6ed5306148e13fd38ae01b8125 Mon Sep 17 00:00:00 2001
From: Antonio Lignan <alinan@zolertia.com>
Date: Thu, 3 Nov 2016 11:12:20 +0100
Subject: [PATCH 8/9] bme280: reworked to allow platform-specific I2C
 implementations

---
 .../avr-rss2/dev => dev/bme280}/bme280-arch.h | 27 +++----
 dev/bme280/bme280-sensor.c                    |  8 +-
 dev/bme280/bme280-sensor.h                    |  1 -
 dev/bme280/bme280.c                           | 29 +++----
 dev/bme280/bme280.h                           | 77 +++++++++---------
 examples/zolertia/zoul/Makefile               |  2 +-
 examples/zolertia/zoul/project-conf.h         |  3 +
 examples/zolertia/zoul/test-bme280.c          |  6 +-
 platform/avr-rss2/dev/bme280-arch.c           | 51 ++++++++++++
 platform/zoul/dev/bme280-arch.c               | 78 +++++++++++++++++++
 10 files changed, 207 insertions(+), 75 deletions(-)
 rename {platform/avr-rss2/dev => dev/bme280}/bme280-arch.h (74%)
 create mode 100644 platform/avr-rss2/dev/bme280-arch.c
 create mode 100644 platform/zoul/dev/bme280-arch.c

diff --git a/platform/avr-rss2/dev/bme280-arch.h b/dev/bme280/bme280-arch.h
similarity index 74%
rename from platform/avr-rss2/dev/bme280-arch.h
rename to dev/bme280/bme280-arch.h
index 3fbc83ccd..b6a48edb5 100644
--- a/platform/avr-rss2/dev/bme280-arch.h
+++ b/dev/bme280/bme280-arch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Copyright Robert Olsson
+ * Copyright (c) 2016, Zolertia <http://www.zolertia.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,24 +25,21 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * This file is part of the Contiki operating system.
- *
- *
- * Author  : Robert Olsson rolss@kth.se/robert@radio-sensors.com
- * Created : 2016-09-14
  */
-
+/*---------------------------------------------------------------------------*/
 #ifndef BME280_ARCH_H
 #define BME280_ARCH_H
 
-/**
- * \file
- *	Architecture-specific definitions for the BME280 sensor for avr-rss2
- * \author
- * 	Robert Olsson
- */
+/* Initialize the I2C module */
+void bme280_arch_i2c_init();
 
-#include "i2c.h"
+/* I2C read registers */
+void bme280_arch_i2c_read_mem(uint8_t addr, uint8_t reg, uint8_t *buf,
+                              uint8_t bytes);
+
+/* I2C write to a single register */
+void bme280_arch_i2c_write_mem(uint8_t addr, uint8_t reg, uint8_t value);
 
 #endif
+/*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/dev/bme280/bme280-sensor.c b/dev/bme280/bme280-sensor.c
index d6ed44d10..cb2980e8a 100644
--- a/dev/bme280/bme280-sensor.c
+++ b/dev/bme280/bme280-sensor.c
@@ -37,13 +37,10 @@
 #include "lib/sensors.h"
 #include "dev/bme280/bme280.h"
 #include "dev/bme280/bme280-sensor.h"
-
-const struct sensors_sensor bme280_sensor;
-
+/*---------------------------------------------------------------------------*/
 static int
 value(int type)
 {
-
   /* Read all measurements with one burst read */
   bme280_read(BME280_MODE_WEATHER);
 
@@ -66,14 +63,17 @@ value(int type)
   }
   return 0;
 }
+/*---------------------------------------------------------------------------*/
 static int
 status(int type)
 {
   return 0;
 }
+/*---------------------------------------------------------------------------*/
 static int
 configure(int type, int c)
 {
   return bme280_init(BME280_MODE_WEATHER);
 }
+/*---------------------------------------------------------------------------*/
 SENSORS_SENSOR(bme280_sensor, "bme280", value, configure, status);
diff --git a/dev/bme280/bme280-sensor.h b/dev/bme280/bme280-sensor.h
index 92dfae0d1..4b34b6997 100644
--- a/dev/bme280/bme280-sensor.h
+++ b/dev/bme280/bme280-sensor.h
@@ -36,7 +36,6 @@
 #ifndef BME280_SENSOR_H_
 #define BME280_SENSOR_H_
 
-#include "lib/sensors.h"
 #include "lib/sensors.h"
 #include "bme280.h"
 
diff --git a/dev/bme280/bme280.c b/dev/bme280/bme280.c
index e0ebcf647..3c3e76047 100644
--- a/dev/bme280/bme280.c
+++ b/dev/bme280/bme280.c
@@ -35,13 +35,14 @@
 
 /**
  * \file
- *        Basic functions for Bosch BME280 based on datasheel Rev 1.1
+ *        Basic functions for Bosch BME280 based on datasheet Rev 1.1
  */
 
 #include "contiki.h"
 #include <string.h>
 #include "bme280.h"
-#include "dev/bme280-arch.h"
+#include "bme280-arch.h"
+#include "lib/sensors.h"
 
 static struct {
   unsigned short dig_t1;
@@ -160,19 +161,21 @@ bme280_init(uint8_t mode)
 {
   uint8_t buf[26];
 
+  bme280_arch_i2c_init();
+
   /* Do not mess with other chips */
-  i2c_read_mem(BME280_ADDR, 0xD0, buf, 1);
+  bme280_arch_i2c_read_mem(BME280_ADDR, 0xD0, buf, 1);
   if(buf[0] != BME280_CHIP_ID) {
     return 0;
   }
 
-  i2c_write_mem(BME280_ADDR, BME280_CNTL_RESET, 0xB6);
-  clock_delay_msec(BME280_MAX_WAIT);
+  bme280_arch_i2c_write_mem(BME280_ADDR, BME280_CNTL_RESET, 0xB6);
+  clock_delay_usec(BME280_MAX_WAIT);
 
   memset(buf, 0, sizeof(buf));
 
   /* Burst read of all calibration part 1 */
-  i2c_read_mem(BME280_ADDR, BME280_DIG_T1_ADDR, buf, sizeof(buf));
+  bme280_arch_i2c_read_mem(BME280_ADDR, BME280_DIG_T1_ADDR, buf, sizeof(buf));
   bm.dig_t1 = ((uint16_t)buf[1] << 8) | (uint16_t)buf[0];
   bm.dig_t2 = ((int16_t)buf[3] << 8) | (uint16_t)buf[2];
   bm.dig_t3 = ((int16_t)buf[5] << 8) | (uint16_t)buf[4];
@@ -189,7 +192,7 @@ bme280_init(uint8_t mode)
   bm.dig_h1 = (unsigned char)buf[25];
 
   /* Burst read of all calibration part 2 */
-  i2c_read_mem(BME280_ADDR, BME280_DIG_H2_ADDR, buf, 8);
+  bme280_arch_i2c_read_mem(BME280_ADDR, BME280_DIG_H2_ADDR, buf, 8);
   bm.dig_h2 = ((int16_t)buf[1] << 8) | (uint16_t)buf[0];
   bm.dig_h3 = (unsigned char)buf[2];
   bm.dig_h4 = ((int16_t)buf[3] << 4) | (((uint16_t)buf[4]) & 0xF);
@@ -217,23 +220,23 @@ bme280_read(uint8_t mode)
   /* Weather mode. See sectiom 3.5 Datasheet */
   if(mode == BME280_MODE_WEATHER) {
     /* Humidity oversampling *1 */
-    i2c_write_mem(BME280_ADDR, BME280_CNTL_HUM, 0x01);
+    bme280_arch_i2c_write_mem(BME280_ADDR, BME280_CNTL_HUM, 0x01);
 
     /*  00100111  0x27 oversampling *1 for t and p plus normal mode */
     /* 0.5 ms -- no filter -- no SPI */
-    i2c_write_mem(BME280_ADDR, BME280_CONTROL, 0x00);
+    bme280_arch_i2c_write_mem(BME280_ADDR, BME280_CONTROL, 0x00);
 
     /*  00100110  0x26 oversampling *1 for t and p  plus forced mode */
     /* Trigger measurement needed for every time in forced mode */
-    i2c_write_mem(BME280_ADDR, BME280_CNTL_MEAS, 0x26);
+    bme280_arch_i2c_write_mem(BME280_ADDR, BME280_CNTL_MEAS, 0x26);
     /* Wait to get into sleep mode == measurement done */
     for(i = 0; i < BME280_MAX_WAIT; i++) {
-      i2c_read_mem(BME280_ADDR, BME280_CNTL_MEAS, &sleep, 1);
+      bme280_arch_i2c_read_mem(BME280_ADDR, BME280_CNTL_MEAS, &sleep, 1);
       sleep = sleep& 0x03;
       if(sleep== 0) {
         break;
       } else {
-        clock_delay_msec(1);
+        clock_delay_usec(1000);
       }
     }
     if(i == BME280_MAX_WAIT) {
@@ -244,7 +247,7 @@ bme280_read(uint8_t mode)
   }
 
   /* Burst read of all measurements */
-  i2c_read_mem(BME280_ADDR, BME280_PRESS, buf, 8);
+  bme280_arch_i2c_read_mem(BME280_ADDR, BME280_PRESS, buf, 8);
   ut = (uint32_t)(buf[3]) << 12 | (uint32_t)(buf[4]) << 4 | (uint32_t)buf[5] >> 4;
   up = (uint32_t)(buf[0]) << 12 | (uint32_t)(buf[1]) << 4 | (uint32_t)buf[2] >> 4;
   uh = (uint32_t)(buf[6]) << 8 | (uint32_t)buf[7];
diff --git a/dev/bme280/bme280.h b/dev/bme280/bme280.h
index cb86c37a2..215d7553d 100644
--- a/dev/bme280/bme280.h
+++ b/dev/bme280/bme280.h
@@ -36,7 +36,7 @@
 
 /**
  * \file
- *         Definitions for the Bosch BME280 based on datasheel Rev 1.1
+ *         Definitions for the Bosch BME280 based on datasheet Rev 1.1
  */
 
 #ifndef BME280_H
@@ -49,53 +49,52 @@
 uint8_t bme280_init(uint8_t mode);
 void bme280_read(uint8_t mode);
 
-#ifdef  I2C_BME280_ADDR
-#define BME280_ADDR I2C_BME280_ADDR
+#ifdef BME280_CONF_ADDR
+#define BME280_ADDR         BME280_CONF_ADDR
 #else
-#define  BME280_ADDR   (0x77 << 1) /* Alternative 0x76 */
+#define BME280_ADDR              (0x77 << 1) /* Alternative 0x76 */
 #endif
 
 /* Diffrent BOSCH chip id's */
-#define BMP085_CHIP_ID 0x55  /* And also BMP180 */
-#define BMP280_CHIP_ID 0x58
-#define BME280_CHIP_ID 0x60
+#define BMP085_CHIP_ID                 0x55  /* And also BMP180 */
+#define BMP280_CHIP_ID                 0x58
+#define BME280_CHIP_ID                 0x60
 
 /* Address map */
-#define BME280_DIG_T1_ADDR 0x88
-#define BME280_DIG_T2_ADDR 0x8A
-#define BME280_DIG_T3_ADDR 0x8C
-#define BME280_DIG_P1_ADDR 0x8E
-#define BME280_DIG_P2_ADDR 0x90
-#define BME280_DIG_P3_ADDR 0x92
-#define BME280_DIG_P4_ADDR 0x94
-#define BME280_DIG_P5_ADDR 0x96
-#define BME280_DIG_P6_ADDR 0x98
-#define BME280_DIG_P7_ADDR 0x9A
-#define BME280_DIG_P8_ADDR 0x9C
-#define BME280_DIG_P9_ADDR 0x9E
-#define BME280_DIG_H1_ADDR 0xA1
-#define BMP_CHIP_ID_ADDR 0xD0
-#define BME280_CNTL_RESET 0xE0
-#define BME280_DIG_H2_ADDR 0xE1
-#define BME280_DIG_H3_ADDR 0xE3
-#define BME280_DIG_H4_ADDR 0xE4
-#define BME280_DIG_H5_ADDR 0xE5
-#define BME280_DIG_H6_ADDR 0xE7
-#define BME280_CNTL_HUM 0xF2
-#define BME280_STATUS 0xF3
-#define BME280_CNTL_MEAS 0xF4
-#define BME280_CONTROL 0xF5
-#define BME280_PRESS 0xF7
+#define BME280_DIG_T1_ADDR             0x88
+#define BME280_DIG_T2_ADDR             0x8A
+#define BME280_DIG_T3_ADDR             0x8C
+#define BME280_DIG_P1_ADDR             0x8E
+#define BME280_DIG_P2_ADDR             0x90
+#define BME280_DIG_P3_ADDR             0x92
+#define BME280_DIG_P4_ADDR             0x94
+#define BME280_DIG_P5_ADDR             0x96
+#define BME280_DIG_P6_ADDR             0x98
+#define BME280_DIG_P7_ADDR             0x9A
+#define BME280_DIG_P8_ADDR             0x9C
+#define BME280_DIG_P9_ADDR             0x9E
+#define BME280_DIG_H1_ADDR             0xA1
+#define BMP_CHIP_ID_ADDR               0xD0
+#define BME280_CNTL_RESET              0xE0
+#define BME280_DIG_H2_ADDR             0xE1
+#define BME280_DIG_H3_ADDR             0xE3
+#define BME280_DIG_H4_ADDR             0xE4
+#define BME280_DIG_H5_ADDR             0xE5
+#define BME280_DIG_H6_ADDR             0xE7
+#define BME280_CNTL_HUM                0xF2
+#define BME280_STATUS                  0xF3
+#define BME280_CNTL_MEAS               0xF4
+#define BME280_CONTROL                 0xF5
+#define BME280_PRESS                   0xF7
 
 /* Function modes outlined in datasheet */
-#define BME280_MODE_NONE 0
-#define BME280_MODE_WEATHER 1
-#define BME280_MODE_HUMIDITY 2
-#define BME280_MODE_INDOOR_NAVIGATION 3
-#define BME280_MODE_GAMING 4
+#define BME280_MODE_NONE               0
+#define BME280_MODE_WEATHER            1
+#define BME280_MODE_HUMIDITY           2
+#define BME280_MODE_INDOOR_NAVIGATION  3
+#define BME280_MODE_GAMING             4
 
-#define BME280_MAX_WAIT 300 /* ms. Forced mode max wait */
-#define BME280_STARTUP_TIME 2 /* ms */
+#define BME280_MAX_WAIT                300000 /* ms. Forced mode max wait */
 
 struct {
   int32_t t_overscale100;
diff --git a/examples/zolertia/zoul/Makefile b/examples/zolertia/zoul/Makefile
index 8ec446d63..33b223d1e 100644
--- a/examples/zolertia/zoul/Makefile
+++ b/examples/zolertia/zoul/Makefile
@@ -11,7 +11,7 @@ CONTIKI_PROJECT += test-bme280
 CONTIKI_TARGET_SOURCEFILES += tsl256x.c sht25.c bmpx8x.c motion-sensor.c
 CONTIKI_TARGET_SOURCEFILES += adc-sensors.c weather-meter.c grove-gyro.c
 CONTIKI_TARGET_SOURCEFILES += rgb-bl-lcd.c pm10-sensor.c iaq.c zonik.c relay.c
-CONTIKI_TARGET_SOURCEFILES += dht22.c servo.c ac-dimmer.c
+CONTIKI_TARGET_SOURCEFILES += dht22.c servo.c ac-dimmer.c bme280-arch.c
 
 MODULES += /dev/bme280
 
diff --git a/examples/zolertia/zoul/project-conf.h b/examples/zolertia/zoul/project-conf.h
index 46287f5fd..36ba331ac 100644
--- a/examples/zolertia/zoul/project-conf.h
+++ b/examples/zolertia/zoul/project-conf.h
@@ -50,6 +50,9 @@
 #define MOTION_SENSOR_PIN        5
 #define MOTION_SENSOR_VECTOR     GPIO_A_IRQn
 
+/* Use the following I2C address for the BME280 sensor (from MikroElektronika) */
+#define BME280_CONF_ADDR         0x76
+
 #endif /* PROJECT_CONF_H_ */
 
 /** @} */
diff --git a/examples/zolertia/zoul/test-bme280.c b/examples/zolertia/zoul/test-bme280.c
index 7636ceb2f..fe5e46542 100644
--- a/examples/zolertia/zoul/test-bme280.c
+++ b/examples/zolertia/zoul/test-bme280.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Zolertia <http://www.zolertia.com>
+ * Copyright (c) 2016, Zolertia <http://www.zolertia.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,6 +29,7 @@
  * This file is part of the Contiki operating system.
  *
  */
+/*---------------------------------------------------------------------------*/
 /**
  * \addtogroup zoul-examples
  * @{
@@ -46,7 +47,8 @@
 /*---------------------------------------------------------------------------*/
 #include <stdio.h>
 #include "contiki.h"
-#include "dev/bme280.h"
+#include "dev/bme280/bme280.h"
+#include "dev/bme280/bme280-sensor.h"
 /*---------------------------------------------------------------------------*/
 #define BME280_USE_STD_API  1
 /*---------------------------------------------------------------------------*/
diff --git a/platform/avr-rss2/dev/bme280-arch.c b/platform/avr-rss2/dev/bme280-arch.c
new file mode 100644
index 000000000..963bf568e
--- /dev/null
+++ b/platform/avr-rss2/dev/bme280-arch.c
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2016, Zolertia
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*---------------------------------------------------------------------------*/
+#include "contiki.h"
+#include "i2c.h"
+/*---------------------------------------------------------------------------*/
+void
+bme280_arch_i2c_init(void)
+{
+  /* Does nothing */
+}
+/*---------------------------------------------------------------------------*/
+void
+bme280_arch_i2c_write_mem(uint8_t addr, uint8_t reg, uint8_t value)
+{
+  i2c_write_mem(addr, reg, value);
+}
+/*---------------------------------------------------------------------------*/
+void
+bme280_arch_i2c_read_mem(uint8_t addr, uint8_t reg, uint8_t *buf, uint8_t bytes)
+{
+  i2c_read_mem(addr, reg, buf, bytes);
+}
diff --git a/platform/zoul/dev/bme280-arch.c b/platform/zoul/dev/bme280-arch.c
new file mode 100644
index 000000000..86790e10f
--- /dev/null
+++ b/platform/zoul/dev/bme280-arch.c
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2015, Zolertia
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*---------------------------------------------------------------------------*/
+/**
+ * \addtogroup zoul-bme280-sensor
+ * @{
+ *
+ * \file
+ *  Architecture-specific I2C for the external BME280 weather sensor
+ *
+ * \author
+ *         Antonio Lignan <alinan@zolertia.com>
+ */
+/*---------------------------------------------------------------------------*/
+#include "contiki.h"
+#include "dev/i2c.h"
+/*---------------------------------------------------------------------------*/
+void
+bme280_arch_i2c_init(void)
+{
+  i2c_init(I2C_SDA_PORT, I2C_SDA_PIN, I2C_SCL_PORT, I2C_SCL_PIN,
+           I2C_SCL_NORMAL_BUS_SPEED);
+}
+/*---------------------------------------------------------------------------*/
+void
+bme280_arch_i2c_write_mem(uint8_t addr, uint8_t reg, uint8_t value)
+{
+  uint8_t buf[2];
+
+  buf[0] = reg;
+  buf[1] = value;
+
+  i2c_master_enable();
+  i2c_burst_send(addr, buf, 2);
+}
+/*---------------------------------------------------------------------------*/
+void
+bme280_arch_i2c_read_mem(uint8_t addr, uint8_t reg, uint8_t *buf, uint8_t bytes)
+{
+  i2c_master_enable();
+  if(i2c_single_send(addr, reg) == I2C_MASTER_ERR_NONE) {
+    while(i2c_master_busy());
+    i2c_burst_receive(addr, buf, bytes);
+  }
+}
+/*---------------------------------------------------------------------------*/
+/**
+ * @}
+ */
+

From 4ef4bdd0a51fe23d56370b60675b848e0f3d1bdb Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Wed, 30 Nov 2016 11:51:10 +0100
Subject: [PATCH 9/9] bme280 delay fixes plus Makefile for avr-rss2

---
 dev/bme280/bme280.c                 | 6 +++++-
 dev/bme280/bme280.h                 | 3 ++-
 platform/avr-rss2/Makefile.avr-rss2 | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev/bme280/bme280.c b/dev/bme280/bme280.c
index 3c3e76047..43bf76185 100644
--- a/dev/bme280/bme280.c
+++ b/dev/bme280/bme280.c
@@ -159,6 +159,7 @@ bme280_h_overscale1024(int32_t uh)
 uint8_t
 bme280_init(uint8_t mode)
 {
+  uint16_t i;
   uint8_t buf[26];
 
   bme280_arch_i2c_init();
@@ -170,7 +171,10 @@ bme280_init(uint8_t mode)
   }
 
   bme280_arch_i2c_write_mem(BME280_ADDR, BME280_CNTL_RESET, 0xB6);
-  clock_delay_usec(BME280_MAX_WAIT);
+
+  for(i = 0; i < BME280_MAX_WAIT; i++) {
+    clock_delay_usec(1000);
+  }
 
   memset(buf, 0, sizeof(buf));
 
diff --git a/dev/bme280/bme280.h b/dev/bme280/bme280.h
index 215d7553d..10b3ad6ac 100644
--- a/dev/bme280/bme280.h
+++ b/dev/bme280/bme280.h
@@ -94,7 +94,8 @@ void bme280_read(uint8_t mode);
 #define BME280_MODE_INDOOR_NAVIGATION  3
 #define BME280_MODE_GAMING             4
 
-#define BME280_MAX_WAIT                300000 /* ms. Forced mode max wait */
+#define BME280_MAX_WAIT                300 /* ms. Forced mode max wait */
+
 
 struct {
   int32_t t_overscale100;
diff --git a/platform/avr-rss2/Makefile.avr-rss2 b/platform/avr-rss2/Makefile.avr-rss2
index 2655b8b4a..c0162aeb2 100644
--- a/platform/avr-rss2/Makefile.avr-rss2
+++ b/platform/avr-rss2/Makefile.avr-rss2
@@ -10,6 +10,7 @@ CONTIKI_TARGET_SOURCEFILES += temp-sensor.c
 
 CONTIKI_TARGET_SOURCEFILES += enc28j60_avr.c
 CONTIKI_TARGET_SOURCEFILES += co2_sa_kxx-sensor.c
+CONTIKI_TARGET_SOURCEFILES += bme280-arch.c
 
 CONTIKIAVR=$(CONTIKI)/cpu/avr
 CONTIKIBOARD=.