pim/prometheus-sensors
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add BME280 Sensor

Browse Source 
- Plumb BME280 all the way through to Prometheus.
- Add README detailing the diff between BME280 and BMP280
- Refactor source files to be *_drv.c to avoid naming clashes with
  upstream libraries.
This commit is contained in:
Pim van Pelt
2018-03-26 15:07:17 +02:00
parent fb87c4070a
commit a7b78521f1
6 changed files with 87 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -41,4 +41,3 @@ UV{band="UVA",sensor="0",type="VEML6075"} 0
UV{band="UVB",sensor="0",type="VEML6075"} 2
UVIndex{sensor="0",type="VEML6075"} 0.00125
```

3
mos.yml
View File

@ -20,6 +20,8 @@ config_schema:
- ["sensors.dht_period", "i", 3, {title: "Sample period in seconds for DHT sensors"}]
- ["sensors.veml6075_i2caddr", "i", 0x10, {title: "I2C Address for VEML6075 sensor"}]
- ["sensors.veml6075_period", "i", 3, {title: "Sample period in seconds for VEML6075 sensor"}]
- ["sensors.bme280_i2caddr", "i", 0x77, {title: "I2C Address for BME280 sensor"}]
- ["sensors.bme280_period", "i", 3, {title: "Sample period in seconds for BME280 sensor"}]
- ["sensors.pushgateway_period", "i", 10, {title: "Period in seconds for Prometheus Pushgateway POSTs"}]
- ["prometheus.pushgateway", "prometheus.example.net:9091"]
@ -28,6 +30,7 @@ config_schema:
# Note: To use sensor libraries, include one or more of these in your application mos.yml:
# - origin: https://github.com/mongoose-os-libs/dht
# - origin: https://github.com/mongoose-os-libs/veml6075-i2c
# - origin: https://github.com/mongoose-os-libs/bme280
libs:
- origin: https://github.com/mongoose-os-libs/prometheus-metrics

64
src/bme280_drv.c Normal file
View File

@ -0,0 +1,64 @@
#include "mgos.h"
#ifdef MGOS_HAVE_BME280
#include "mgos_bme280.h"
#include "mgos_config.h"
#include "mgos_prometheus_metrics.h"
#include "mgos_prometheus_sensors.h"
static struct mgos_bme280 *s_bme280;
static struct mgos_bme280_data s_bme280_data;
static void bme280_prometheus_metrics(struct mg_connection *nc, void *user_data) {
if (!s_bme280) return;
mgos_prometheus_metrics_printf(nc, GAUGE,
"pressure", "Barometer pressure in HPa",
"{sensor=\"0\", type=\"BME280\"} %f", s_bme280_data.press);
mgos_prometheus_metrics_printf(nc, GAUGE,
"temperature", "Temperature in Celcius",
"{sensor=\"0\",type=\"BME280\"} %f", s_bme280_data.temp);
if (mgos_bme280_is_bme280(s_bme280)) {
mgos_prometheus_metrics_printf(nc, GAUGE,
"humidity", "Relative humidity in percent",
"{sensor=\"0\",type=\"BME280\"} %f", s_bme280_data.humid);
}
(void) user_data;
}
static void bme280_timer_cb(void *user_data) {
double start;
uint32_t usecs=0;
start=mgos_uptime();
mgos_bme280_read(s_bme280, &s_bme280_data);
usecs=1000000*(mgos_uptime()-start);
if (mgos_bme280_is_bme280(s_bme280)) {
LOG(LL_INFO, ("sensor=0 humidity=%.1f%% temperature=%.1fC pressure=%.1fHPa usecs=%u", s_bme280_data.humid, s_bme280_data.temp, s_bme280_data.press, usecs));
} else {
LOG(LL_INFO, ("sensor=0 temperature=%.1fC pressure=%.1fHPa usecs=%u", s_bme280_data.temp, s_bme280_data.press, usecs));
}
(void) user_data;
}
void bme280_drv_init() {
s_bme280 = mgos_bme280_i2c_create(mgos_sys_config_get_sensors_bme280_i2caddr());
if (s_bme280) {
mgos_set_timer(mgos_sys_config_get_sensors_bme280_period()*1000, true, bme280_timer_cb, NULL);
mgos_prometheus_metrics_add_handler(bme280_prometheus_metrics, NULL);
} else {
LOG(LL_ERROR, ("Could not create BME280 sensor on I2C address 0x%02x", mgos_sys_config_get_sensors_bme280_i2caddr()));
}
}
#else
void bme280_drv_init() {
LOG(LL_ERROR, ("BME280 disabled, include library in mos.yml to enable"));
}
#endif

31
src/dht.c → src/dht_drv.c
View File

@ -19,36 +19,17 @@ struct dht_sensor {
static struct dht_sensor *s_dht_sensor[MAX_DHT];
static int s_num_dht = 0;
static void print_chunk(struct mg_connection *nc, char *name, char *fmt, ...) {
char chunk[500];
int chunklen=0;
va_list ap;
snprintf(chunk, sizeof(chunk), "%s%s", name, fmt[0]=='{' ? "" : " ");
va_start(ap, fmt);
vsnprintf(chunk+strlen(chunk), sizeof(chunk)-strlen(chunk), fmt, ap);
va_end(ap);
strncat(chunk, "\n", sizeof(chunk));
chunklen=strlen(chunk);
LOG(LL_DEBUG, ("Chunk '%s' with length %d", chunk, chunklen));
mg_printf(nc, "%X\r\n%s\r\n", chunklen, chunk);
}
static void dht_prometheus_metrics(struct mg_connection *nc, void *user_data) {
int i;
// BUG -- repeated HELP and TYPE makes Prometheus parser bork :(
for (i=0; i<s_num_dht; i++) {
mgos_prometheus_metrics_printf(nc, GAUGE,
"temperature", "Temperature in celcius",
"{sensor=\"0\",type=\"DHT\"} %f", s_dht_sensor[0]->temp);
"temperature", "Temperature in Celcius",
"{sensor=\"%d\",type=\"DHT\"} %f", i, s_dht_sensor[i]->temp);
mgos_prometheus_metrics_printf(nc, GAUGE,
"humidity", "Relative humidity percentage",
"{sensor=\"0\",type=\"DHT\"} %f", s_dht_sensor[0]->humidity);
"{sensor=\"%d\",type=\"DHT\"} %f", i, s_dht_sensor[i]->humidity);
for (i=1; i<s_num_dht; i++) {
print_chunk(nc, "temperature", "{sensor=\"%d\",type=\"DHT\"} %f", i, s_dht_sensor[i]->temp);
print_chunk(nc, "humidity", "{sensor=\"%d\",type=\"DHT\"} %f", i, s_dht_sensor[i]->humidity);
}
(void) user_data;
@ -106,7 +87,7 @@ float mgos_prometheus_sensors_dht_get_humidity(uint8_t idx) {
return s_dht_sensor[idx]->humidity;
}
void dht_init() {
void dht_drv_init() {
char *tok;
memset(s_dht_sensor, 0, sizeof (struct mgos_dht_sensor *) * MAX_DHT);
@ -124,7 +105,7 @@ void dht_init() {
}
#else
void dht_init() {
void dht_drv_init() {
LOG(LL_ERROR, ("DHT disabled, include library in mos.yml to enable"));
}
#endif

10
src/mgos_prometheus_sensors.c
View File

@ -2,8 +2,9 @@
#include "mgos_prometheus_metrics.h"
#include "mgos_prometheus_sensors.h"
void dht_init();
void veml6075_init();
void dht_drv_init();
void veml6075_drv_init();
void bme280_drv_init();
static void pushgateway_timer(void *user_data) {
mgos_prometheus_metrics_push(MGOS_APP, mgos_sys_config_get_device_id());
@ -11,8 +12,9 @@ static void pushgateway_timer(void *user_data) {
}
bool mgos_prometheus_sensors_init(void) {
dht_init();
veml6075_init();
dht_drv_init();
veml6075_drv_init();
bme280_drv_init();
if (mgos_sys_config_get_sensors_pushgateway_period()>0)
mgos_set_timer(mgos_sys_config_get_sensors_pushgateway_period()*1000, true, pushgateway_timer, NULL);
return true;

25
src/veml6075.c → src/veml6075_drv.c
View File

@ -8,28 +8,13 @@
static struct mgos_veml6075 *s_veml6075;
static void print_chunk(struct mg_connection *nc, char *name, char *fmt, ...) {
char chunk[500];
int chunklen=0;
va_list ap;
snprintf(chunk, sizeof(chunk), "%s%s", name, fmt[0]=='{' ? "" : " ");
va_start(ap, fmt);
vsnprintf(chunk+strlen(chunk), sizeof(chunk)-strlen(chunk), fmt, ap);
va_end(ap);
strncat(chunk, "\n", sizeof(chunk));
chunklen=strlen(chunk);
// LOG(LL_DEBUG, ("Chunk '%s' with length %d", chunk, chunklen));
mg_printf(nc, "%X\r\n%s\r\n", chunklen, chunk);
}
static void veml6075_prometheus_metrics(struct mg_connection *nc, void *user_data) {
// BUG -- repeated HELP and TYPE makes Prometheus parser bork :(
mgos_prometheus_metrics_printf(nc, GAUGE,
"UV", "Ultra Violet light intensity, in sensor counts",
"{band=\"UVA\",type=\"VEML6075\", sensor=\"0\"} %f", mgos_veml6075_getUVA(s_veml6075));
print_chunk(nc, "UV", "{band=\"UVB\",type=\"VEML6075\", sensor=\"0\"} %f", mgos_veml6075_getUVB(s_veml6075));
mgos_prometheus_metrics_printf(nc, GAUGE,
"UV", "Ultra Violet light intensity, in sensor counts",
"{band=\"UVB\",type=\"VEML6075\", sensor=\"0\"} %f", mgos_veml6075_getUVB(s_veml6075));
mgos_prometheus_metrics_printf(nc, GAUGE,
"UVIndex", "2: Low, 5.5 Moderate, 7.5 High, 10.5 Very High, else Extreme",
"{sensor=\"0\",type=\"VEML6075\"} %f", mgos_veml6075_getUVIndex(s_veml6075));
@ -52,7 +37,7 @@ static void veml6075_timer_cb(void *user_data) {
(void) user_data;
}
void veml6075_init() {
void veml6075_drv_init() {
s_veml6075 = mgos_veml6075_create(mgos_sys_config_get_sensors_veml6075_i2caddr());
if (s_veml6075) {
mgos_set_timer(mgos_sys_config_get_sensors_veml6075_period()*1000, true, veml6075_timer_cb, NULL);
@ -61,7 +46,7 @@ void veml6075_init() {
}
#else
void veml6075_init() {
void veml6075_drv_init() {
LOG(LL_ERROR, ("VEML6075 disabled, include library in mos.yml to enable"));
}
#endif