Merge pull request #1957 from alignan/pull/bme280-sensor

sensors: bme280 weather sensor
This commit is contained in:
Antonio Lignan 2016-12-10 18:37:21 +01:00 committed by GitHub
commit ac2a31455e
17 changed files with 857 additions and 10 deletions

View file

@ -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

View file

@ -49,9 +49,8 @@
#include "dev/temp_mcu-sensor.h"
#include "dev/light-sensor.h"
#include "dev/pulse-sensor.h"
#ifdef CO2
#include "dev/bme280/bme280-sensor.h"
#include "dev/co2_sa_kxx-sensor.h"
#endif
/*---------------------------------------------------------------------------*/
PROCESS(hello_sensors_process, "Hello sensor process");
AUTOSTART_PROCESSES(&hello_sensors_process);
@ -80,9 +79,29 @@ 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));
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));
#else
/* 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.);
#else
printf(" P_BME280=%5.2f", (double)bme280_mea.p);
#endif
#endif
}
printf("\n");
}
/*---------------------------------------------------------------------------*/
@ -95,9 +114,14 @@ PROCESS_THREAD(hello_sensors_process, ev, data)
SENSORS_ACTIVATE(temp_mcu_sensor);
SENSORS_ACTIVATE(light_sensor);
SENSORS_ACTIVATE(pulse_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);

View file

@ -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

View file

@ -5,12 +5,15 @@ 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
CONTIKI_TARGET_SOURCEFILES += dht22.c servo.c ac-dimmer.c bme280-arch.c
MODULES += /dev/bme280
all: $(CONTIKI_PROJECT)

View file

@ -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_ */
/** @} */

View file

@ -0,0 +1,93 @@
/*
* Copyright (c) 2016, 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/bme280.h"
#include "dev/bme280/bme280-sensor.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();
}
/*---------------------------------------------------------------------------*/
/**
* @}
* @}
*/