From 165f2813f5f09444fdc264eb48043502c7ce6c4d Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Sun, 25 Nov 2018 12:49:49 +0100 Subject: [PATCH] testing --- platformio.ini | 5 ++--- src/bme680mems.cpp | 22 +++++++++++++++------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/platformio.ini b/platformio.ini index 8a08339a..f6cb3e1f 100644 --- a/platformio.ini +++ b/platformio.ini @@ -60,9 +60,8 @@ lib_deps_all = ${common.lib_deps_rgbled} ${common.lib_deps_gps} build_flags_basic = - ;-include include/wifiscan.h - -include $PROJECTSRC_DIR/hal/${PIOENV}.h - -include $PROJECTSRC_DIR/paxcounter.conf + '-include $PROJECTSRC_DIR/hal/${PIOENV}.h' + '-include $PROJECTSRC_DIR/paxcounter.conf' -w ;'-DARDUINO_LMIC_PROJECT_CONFIG_H="/$PROJECTSRC_DIR/lmic_config.h"' '-DARDUINO_LMIC_PROJECT_CONFIG_H=../../../src/lmic_config.h' diff --git a/src/bme680mems.cpp b/src/bme680mems.cpp index ada4ab54..2c18c706 100644 --- a/src/bme680mems.cpp +++ b/src/bme680mems.cpp @@ -10,7 +10,7 @@ static const char TAG[] = "main"; bmeStatus_t bme_status; // initialize BME680 sensor - int bme_init(void) { +int bme_init(void) { return_values_init ret = {BME680_OK, BSEC_OK}; struct bme680_dev gas_sensor; @@ -48,14 +48,22 @@ bool bme_read(void) { */ } -/* -//Call to endless loop function which reads and processes data based on -//sensor settings -//State is saved every 10.000 samples, which means every 10.000 * 3 secs = -//500 minutes +// loop function which reads and processes data based on sensor settings +void bme_loop(void *pvParameters) { + configASSERT(((uint32_t)pvParameters) == 1); // FreeRTOS check + +#ifdef HAS_BME + + // State is saved every 10.000 samples, which means every 10.000 * 3 secs = + // 500 minutes bsec_iot_loop(sleep, get_timestamp_us, output_ready, state_save, 10000); -*/ + + vTaskDelete(NULL); // shoud never be reached + +#endif + +} // bme_loop() int8_t user_i2c_read(uint8_t dev_id, uint8_t reg_addr, uint8_t *reg_data, uint16_t len) {