electro
/
esp8266-meteo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bmp lib fixed

Browse Source
master
Ondřej Hruška 2 years ago
parent 24152cbc0b
commit 1bb827c5db
6 changed files with 180 additions and 111 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 0
      components/bmp280/CMakeLists.txt
  2. 0
      components/bmp280/README.md
  3. 107
      components/bmp280/bmp280.c
  4. 10
      components/bmp280/bmp280.h
  5. 0
      components/bmp280/component.mk
  6. 72
      main/meteo_task.c

0
components-todo/bmp280/CMakeLists.txt → components/bmp280/CMakeLists.txt
Unescape View File

0
components-todo/bmp280/README.md → components/bmp280/README.md
Unescape View File

107
components-todo/bmp280/bmp280.c → components/bmp280/bmp280.c
Unescape View File

@ -23,6 +23,7 @@
*/ */
#include <stddef.h> #include <stddef.h>
#include "bmp280.h" #include "bmp280.h"
#include "driver/i2c.h"
#ifdef BMP280_DEBUG #ifdef BMP280_DEBUG
#include <stdio.h> #include <stdio.h>
@ -65,36 +66,58 @@ void bmp280_init_default_params(bmp280_params_t *params)
params->standby = BMP280_STANDBY_250; params->standby = BMP280_STANDBY_250;
} }
static bool read_register16(i2c_dev_t *dev, uint8_t addr, uint16_t *value) static inline esp_err_t read_data(bmp280_i2c_dev_t *dev, uint8_t addr, uint8_t *value, uint8_t len)
{ {
uint8_t d[] = {0, 0}; int ret;
if (!i2c_slave_read(dev->bus, dev->addr, &addr, d, sizeof(d))) { i2c_cmd_handle_t cmd = i2c_cmd_link_create();
*value = d[0] | (d[1] << 8); i2c_master_start(cmd);
return true; i2c_master_write_byte(cmd, dev->addr << 1 | I2C_MASTER_WRITE, true);
} i2c_master_write_byte(cmd, addr, true);
return false; i2c_master_start(cmd);
i2c_master_write_byte(cmd, dev->addr << 1 | I2C_MASTER_READ, true);
i2c_master_read(cmd, value, len, I2C_MASTER_LAST_NACK);
i2c_master_stop(cmd);
ret = i2c_master_cmd_begin(dev->i2c_num, cmd, pdMS_TO_TICKS(BMP280_I2C_TIMEOUT_MS));
i2c_cmd_link_delete(cmd);
return ret;
} }
static inline int read_data(i2c_dev_t *dev, uint8_t addr, uint8_t *value, uint8_t len) static esp_err_t read_register16(bmp280_i2c_dev_t *dev, uint8_t addr, uint16_t *value)
{ {
return i2c_slave_read(dev->bus, dev->addr, &addr, value, len); uint8_t bytes[2];
esp_err_t ret = read_data(dev, addr, bytes, 2);
*value = bytes[1] << 8 | bytes[0];
return ret;
} }
static bool read_calibration_data(bmp280_t *dev) static esp_err_t write_register8(bmp280_i2c_dev_t *dev, uint8_t addr, uint8_t value)
{ {
int ret;
i2c_cmd_handle_t cmd = i2c_cmd_link_create();
i2c_master_start(cmd);
i2c_master_write_byte(cmd, dev->addr << 1 | I2C_MASTER_WRITE, 1);
i2c_master_write_byte(cmd, addr, true);
i2c_master_write_byte(cmd, value, true);
i2c_master_stop(cmd);
ret = i2c_master_cmd_begin(dev->i2c_num, cmd, pdMS_TO_TICKS(BMP280_I2C_TIMEOUT_MS));
i2c_cmd_link_delete(cmd);
return ret;
}
if (read_register16(&dev->i2c_dev, 0x88, &dev->dig_T1) && static bool read_calibration_data(bmp280_t *dev)
read_register16(&dev->i2c_dev, 0x8a, (uint16_t *)&dev->dig_T2) && {
read_register16(&dev->i2c_dev, 0x8c, (uint16_t *)&dev->dig_T3) && if (ESP_OK == read_register16(&dev->i2c_dev, 0x88, &dev->dig_T1) &&
read_register16(&dev->i2c_dev, 0x8e, &dev->dig_P1) && ESP_OK == read_register16(&dev->i2c_dev, 0x8a, (uint16_t *)&dev->dig_T2) &&
read_register16(&dev->i2c_dev, 0x90, (uint16_t *)&dev->dig_P2) && ESP_OK == read_register16(&dev->i2c_dev, 0x8c, (uint16_t *)&dev->dig_T3) &&
read_register16(&dev->i2c_dev, 0x92, (uint16_t *)&dev->dig_P3) && ESP_OK == read_register16(&dev->i2c_dev, 0x8e, &dev->dig_P1) &&
read_register16(&dev->i2c_dev, 0x94, (uint16_t *)&dev->dig_P4) && ESP_OK == read_register16(&dev->i2c_dev, 0x90, (uint16_t *)&dev->dig_P2) &&
read_register16(&dev->i2c_dev, 0x96, (uint16_t *)&dev->dig_P5) && ESP_OK == read_register16(&dev->i2c_dev, 0x92, (uint16_t *)&dev->dig_P3) &&
read_register16(&dev->i2c_dev, 0x98, (uint16_t *)&dev->dig_P6) && ESP_OK == read_register16(&dev->i2c_dev, 0x94, (uint16_t *)&dev->dig_P4) &&
read_register16(&dev->i2c_dev, 0x9a, (uint16_t *)&dev->dig_P7) && ESP_OK == read_register16(&dev->i2c_dev, 0x96, (uint16_t *)&dev->dig_P5) &&
read_register16(&dev->i2c_dev, 0x9c, (uint16_t *)&dev->dig_P8) && ESP_OK == read_register16(&dev->i2c_dev, 0x98, (uint16_t *)&dev->dig_P6) &&
read_register16(&dev->i2c_dev, 0x9e, (uint16_t *)&dev->dig_P9)) { ESP_OK == read_register16(&dev->i2c_dev, 0x9a, (uint16_t *)&dev->dig_P7) &&
ESP_OK == read_register16(&dev->i2c_dev, 0x9c, (uint16_t *)&dev->dig_P8) &&
ESP_OK == read_register16(&dev->i2c_dev, 0x9e, (uint16_t *)&dev->dig_P9)) {
debug("Calibration data received:"); debug("Calibration data received:");
debug("dig_T1=%d", dev->dig_T1); debug("dig_T1=%d", dev->dig_T1);
@ -120,12 +143,13 @@ static bool read_hum_calibration_data(bmp280_t *dev)
{ {
uint16_t h4, h5; uint16_t h4, h5;
if (!read_data(&dev->i2c_dev, 0xa1, &dev->dig_H1, 1) && if (ESP_OK == read_data(&dev->i2c_dev, 0xa1, &dev->dig_H1, 1) &&
read_register16(&dev->i2c_dev, 0xe1, (uint16_t *)&dev->dig_H2) && ESP_OK == read_register16(&dev->i2c_dev, 0xe1, (uint16_t *)&dev->dig_H2) &&
!read_data(&dev->i2c_dev, 0xe3, &dev->dig_H3, 1) && ESP_OK == read_data(&dev->i2c_dev, 0xe3, &dev->dig_H3, 1) &&
read_register16(&dev->i2c_dev, 0xe4, &h4) && ESP_OK == read_register16(&dev->i2c_dev, 0xe4, &h4) &&
read_register16(&dev->i2c_dev, 0xe5, &h5) && ESP_OK == read_register16(&dev->i2c_dev, 0xe5, &h5) &&
!read_data(&dev->i2c_dev, 0xe7, (uint8_t *)&dev->dig_H6, 1)) { ESP_OK == read_data(&dev->i2c_dev, 0xe7, (uint8_t *)&dev->dig_H6, 1))
{
dev->dig_H4 = (h4 & 0x00ff) << 4 | (h4 & 0x0f00) >> 8; dev->dig_H4 = (h4 & 0x00ff) << 4 | (h4 & 0x0f00) >> 8;
dev->dig_H5 = h5 >> 4; dev->dig_H5 = h5 >> 4;
debug("Calibration data received:"); debug("Calibration data received:");
@ -141,11 +165,6 @@ static bool read_hum_calibration_data(bmp280_t *dev)
return false; return false;
} }
static int write_register8(i2c_dev_t *dev, uint8_t addr, uint8_t value)
{
return i2c_slave_write(dev->bus, dev->addr, &addr, &value, 1);
}
bool bmp280_init(bmp280_t *dev, bmp280_params_t *params) bool bmp280_init(bmp280_t *dev, bmp280_params_t *params)
{ {
@ -154,7 +173,7 @@ bool bmp280_init(bmp280_t *dev, bmp280_params_t *params)
return false; return false;
} }
if (read_data(&dev->i2c_dev, BMP280_REG_ID, &dev->id, 1)) { if (ESP_OK != read_data(&dev->i2c_dev, BMP280_REG_ID, &dev->id, 1)) {
debug("Sensor not found"); debug("Sensor not found");
return false; return false;
} }
@ -165,15 +184,15 @@ bool bmp280_init(bmp280_t *dev, bmp280_params_t *params)
} }
// Soft reset. // Soft reset.
if (write_register8(&dev->i2c_dev, BMP280_REG_RESET, BMP280_RESET_VALUE)) { if (ESP_OK != write_register8(&dev->i2c_dev, BMP280_REG_RESET, BMP280_RESET_VALUE)) {
debug("Failed resetting sensor"); debug("Failed resetting sensor");
return false; return false;
} }
// Wait until finished copying over the NVP data. // Wait until finished copying over the NVP data.
while (1) { while (1) {
uint8_t status; uint8_t status = 1;
if (!read_data(&dev->i2c_dev, BMP280_REG_STATUS, &status, 1) && (status & 1) == 0) if (ESP_OK != read_data(&dev->i2c_dev, BMP280_REG_STATUS, &status, 1) || (status & 1) == 0)
break; break;
} }
@ -189,7 +208,7 @@ bool bmp280_init(bmp280_t *dev, bmp280_params_t *params)
uint8_t config = (params->standby << 5) | (params->filter << 2); uint8_t config = (params->standby << 5) | (params->filter << 2);
debug("Writing config reg=%x", config); debug("Writing config reg=%x", config);
if (write_register8(&dev->i2c_dev, BMP280_REG_CONFIG, config)) { if (ESP_OK != write_register8(&dev->i2c_dev, BMP280_REG_CONFIG, config)) {
debug("Failed configuring sensor"); debug("Failed configuring sensor");
return false; return false;
} }
@ -206,14 +225,14 @@ bool bmp280_init(bmp280_t *dev, bmp280_params_t *params)
// Write crtl hum reg first, only active after write to BMP280_REG_CTRL. // Write crtl hum reg first, only active after write to BMP280_REG_CTRL.
uint8_t ctrl_hum = params->oversampling_humidity; uint8_t ctrl_hum = params->oversampling_humidity;
debug("Writing ctrl hum reg=%x", ctrl_hum); debug("Writing ctrl hum reg=%x", ctrl_hum);
if (write_register8(&dev->i2c_dev, BMP280_REG_CTRL_HUM, ctrl_hum)) { if (ESP_OK != write_register8(&dev->i2c_dev, BMP280_REG_CTRL_HUM, ctrl_hum)) {
debug("Failed controlling sensor"); debug("Failed controlling sensor");
return false; return false;
} }
} }
debug("Writing ctrl reg=%x", ctrl); debug("Writing ctrl reg=%x", ctrl);
if (write_register8(&dev->i2c_dev, BMP280_REG_CTRL, ctrl)) { if (ESP_OK != write_register8(&dev->i2c_dev, BMP280_REG_CTRL, ctrl)) {
debug("Failed controlling sensor"); debug("Failed controlling sensor");
return false; return false;
} }
@ -224,12 +243,12 @@ bool bmp280_init(bmp280_t *dev, bmp280_params_t *params)
bool bmp280_force_measurement(bmp280_t *dev) bool bmp280_force_measurement(bmp280_t *dev)
{ {
uint8_t ctrl; uint8_t ctrl;
if (read_data(&dev->i2c_dev, BMP280_REG_CTRL, &ctrl, 1)) if (ESP_OK != read_data(&dev->i2c_dev, BMP280_REG_CTRL, &ctrl, 1))
return false; return false;
ctrl &= ~0b11; // clear two lower bits ctrl &= ~0b11; // clear two lower bits
ctrl |= BMP280_MODE_FORCED; ctrl |= BMP280_MODE_FORCED;
debug("Writing ctrl reg=%x", ctrl); debug("Writing ctrl reg=%x", ctrl);
if (write_register8(&dev->i2c_dev, BMP280_REG_CTRL, ctrl)) { if (ESP_OK != write_register8(&dev->i2c_dev, BMP280_REG_CTRL, ctrl)) {
debug("Failed starting forced mode"); debug("Failed starting forced mode");
return false; return false;
} }
@ -239,7 +258,7 @@ bool bmp280_force_measurement(bmp280_t *dev)
bool bmp280_is_measuring(bmp280_t *dev) bool bmp280_is_measuring(bmp280_t *dev)
{ {
uint8_t status; uint8_t status;
if (read_data(&dev->i2c_dev, BMP280_REG_STATUS, &status, 1)) if (ESP_OK != read_data(&dev->i2c_dev, BMP280_REG_STATUS, &status, 1))
return false; return false;
if (status & (1 << 3)) { if (status & (1 << 3)) {
debug("Status: measuring"); debug("Status: measuring");
@ -341,7 +360,7 @@ bool bmp280_read_fixed(bmp280_t *dev, int32_t *temperature,
// Need to read in one sequence to ensure they match. // Need to read in one sequence to ensure they match.
size_t size = humidity ? 8 : 6; size_t size = humidity ? 8 : 6;
if (read_data(&dev->i2c_dev, 0xf7, data, size)) { if (ESP_OK != read_data(&dev->i2c_dev, 0xf7, data, size)) {
debug("Failed reading"); debug("Failed reading");
return false; return false;
} }

10
components-todo/bmp280/bmp280.h → components/bmp280/bmp280.h
Unescape View File

@ -26,7 +26,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "i2c/i2c.h" #include <driver/i2c.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -37,6 +37,8 @@ extern "C" {
*/ */
// #define BMP280_DEBUG // #define BMP280_DEBUG
#define BMP280_I2C_TIMEOUT_MS 1000
/** /**
* BMP280 or BME280 address is 0x77 if SDO pin is high, and is 0x76 if * BMP280 or BME280 address is 0x77 if SDO pin is high, and is 0x76 if
* SDO pin is low. * SDO pin is low.
@ -105,6 +107,10 @@ typedef struct {
BMP280_StandbyTime standby; BMP280_StandbyTime standby;
} bmp280_params_t; } bmp280_params_t;
typedef struct {
uint8_t addr;
i2c_port_t i2c_num;
} bmp280_i2c_dev_t;
typedef struct { typedef struct {
uint16_t dig_T1; uint16_t dig_T1;
@ -128,7 +134,7 @@ typedef struct {
int16_t dig_H5; int16_t dig_H5;
int8_t dig_H6; int8_t dig_H6;
i2c_dev_t i2c_dev; /* I2C dev setting. */ bmp280_i2c_dev_t i2c_dev; /* I2C dev setting. */
uint8_t id; /* Chip ID */ uint8_t id; /* Chip ID */
} bmp280_t; } bmp280_t;

0
components-todo/bmp280/component.mk → components/bmp280/component.mk
Unescape View File

72
main/meteo_task.c
Unescape View File

@ -11,7 +11,9 @@
#include "ds18b20.h" #include "ds18b20.h"
#include "dht.h" #include "dht.h"
#include "driver/gpio.h" #include "driver/gpio.h"
#include "driver/i2c.h"
#include "circbuf.h" #include "circbuf.h"
#include "bmp280.h"
static volatile uint32_t timestamp = 0; static volatile uint32_t timestamp = 0;
@ -41,7 +43,7 @@ void hw_timer_callback1s(void *arg)
if (cbuf_full(&rps_cb)) { if (cbuf_full(&rps_cb)) {
cbuf_pop_back(&rps_cb, NULL); cbuf_pop_back(&rps_cb, NULL);
} }
cbuf_push(&rps_cb, (void*) &cycle_count); cbuf_push(&rps_cb, (void *) &cycle_count);
cycle_count = 0; cycle_count = 0;
calculate_wind(); calculate_wind();
@ -57,7 +59,7 @@ void calculate_wind()
uint32_t tenmin_sum = 0; uint32_t tenmin_sum = 0;
uint32_t numsecs = cbuf_count(&rps_cb); uint32_t numsecs = cbuf_count(&rps_cb);
uint16_t threesec1 = 0, threesec2 = 0; uint16_t threesec1 = 0, threesec2 = 0;
for(size_t i = 0; i < numsecs; i++) { for (size_t i = 0; i < numsecs; i++) {
uint16_t *slot = cbuf_ptr_nth(&rps_cb, i); uint16_t *slot = cbuf_ptr_nth(&rps_cb, i);
if (!slot) { if (!slot) {
continue; continue;
@ -71,19 +73,19 @@ void calculate_wind()
threesec1 = threesec2; threesec1 = threesec2;
threesec2 = slotval; threesec2 = slotval;
float gust_avg = (float)gust_sum * (float)20.0f; float gust_avg = (float) gust_sum * (float) 20.0f;
if (gust_avg > max_gust) { if (gust_avg > max_gust) {
max_gust = gust_avg; max_gust = gust_avg;
} }
} }
rpm_gust = max_gust; rpm_gust = max_gust;
rpm_average = ((float)tenmin_sum / (float)numsecs) * 60.0f; rpm_average = ((float) tenmin_sum / (float) numsecs) * 60.0f;
} }
void meteo_task(void* pvParameters) void meteo_task(void *pvParameters)
{ {
cbuf_init(&rps_cb, (void*)history, RPS_BUFFER_LEN, 2); // uint16 fields cbuf_init(&rps_cb, (void *) history, RPS_BUFFER_LEN, 2); // uint16 fields
// Try to unfuck GPIOs // Try to unfuck GPIOs
PIN_FUNC_SELECT(PERIPHS_IO_MUX_MTDI_U, FUNC_GPIO12); PIN_FUNC_SELECT(PERIPHS_IO_MUX_MTDI_U, FUNC_GPIO12);
@ -92,8 +94,8 @@ void meteo_task(void* pvParameters)
PIN_FUNC_SELECT(PERIPHS_IO_MUX_MTDO_U, FUNC_GPIO15); PIN_FUNC_SELECT(PERIPHS_IO_MUX_MTDO_U, FUNC_GPIO15);
// start timer used for timebase // start timer used for timebase
hw_timer_init(hw_timer_callback1s, NULL); ESP_ERROR_CHECK(hw_timer_init(hw_timer_callback1s, NULL));
hw_timer_alarm_us(1000000, true); // 1s timer ESP_ERROR_CHECK(hw_timer_alarm_us(1000000, true)); // 1s timer
gpio_config_t io_conf; gpio_config_t io_conf;
io_conf.intr_type = GPIO_INTR_POSEDGE; io_conf.intr_type = GPIO_INTR_POSEDGE;
@ -101,21 +103,63 @@ void meteo_task(void* pvParameters)
io_conf.pin_bit_mask = 1 << 14; io_conf.pin_bit_mask = 1 << 14;
io_conf.pull_down_en = 1; io_conf.pull_down_en = 1;
io_conf.pull_up_en = 0; io_conf.pull_up_en = 0;
gpio_config(&io_conf); ESP_ERROR_CHECK(gpio_config(&io_conf));
gpio_install_isr_service(0); ESP_ERROR_CHECK(gpio_install_isr_service(0));
gpio_isr_handler_add(14, gpio_isr_handler, NULL); ESP_ERROR_CHECK(gpio_isr_handler_add(14, gpio_isr_handler, NULL));
/* I2C driver & peri setup */
int i2c_master_port = I2C_NUM_0;
i2c_config_t conf;
conf.mode = I2C_MODE_MASTER;
conf.sda_io_num = 4;
conf.sda_pullup_en = 1;
conf.scl_io_num = 5;
conf.scl_pullup_en = 1;
conf.clk_stretch_tick = 300; // 300 ticks, Clock stretch is about 210us, you can make changes according to the actual situation.
ESP_ERROR_CHECK(i2c_driver_install(i2c_master_port, conf.mode));
ESP_ERROR_CHECK(i2c_param_config(i2c_master_port, &conf));
bmp280_params_t bmp_conf;
bmp280_init_default_params(&bmp_conf);
bmp280_t bmp_dev = {
.i2c_dev = {
.addr = BMP280_I2C_ADDRESS_0,
.i2c_num = I2C_NUM_0,
}
};
bmp280_init(&bmp_dev, &bmp_conf);
vTaskDelay(pdMS_TO_TICKS(500));
float dht_hum, dht_temp, ds_temp; float dht_hum, dht_temp, ds_temp, bmp_temp, bmp_hum, bmp_press;
while (1) { while (1) {
dht_hum = 0;
dht_temp = 0;
ds_temp = 0;
bmp_temp = 0;
bmp_press = 0;
// this works ... // this works ...
ds_temp = ds18b20_measure_and_read(0, DS18B20_ANY); ds_temp = ds18b20_measure_and_read(0, DS18B20_ANY);
if (ds_temp != ds_temp) {
printf("DS failed\n");
}
if (!dht_read_float_data(DHT_TYPE_DHT22, 12, &dht_hum, &dht_temp)) { if (!dht_read_float_data(DHT_TYPE_DHT22, 12, &dht_hum, &dht_temp)) {
dht_hum = dht_temp = NAN; dht_hum = dht_temp = NAN;
printf("DHT failed\n");
}
if(!bmp280_read_float(&bmp_dev, &bmp_temp, &bmp_press, &bmp_hum)) {
printf("BMP failed\n");
} }
printf("Dallas: %.2f °C, DHT %.2f °C, %.1f %%r.H, HALL avg %.1f RPM, gust %.1f RPM\n", printf("Dallas: %.2f °C, ** DHT %.2f °C, %.1f %%r.H, ** WIND avg %.1f, gust %.1f RPM, ** BMP %.2f °C, %f Pa \n",
ds_temp, dht_temp, dht_hum, rpm_average, rpm_gust); ds_temp, dht_temp, dht_hum,
rpm_average, rpm_gust,
bmp_temp, bmp_press);
vTaskDelay(pdMS_TO_TICKS(500)); vTaskDelay(pdMS_TO_TICKS(500));
} }

Write Preview
Loading…
Cancel
Save