DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

testing

Browse Source
This commit is contained in:
Klaus K Wilting 2018-11-25 12:49:49 +01:00
parent 222dfb5a95
commit 165f2813f5
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platformio.ini
View File

@ -60,9 +60,8 @@ lib_deps_all =
${common.lib_deps_rgbled} ${common.lib_deps_rgbled}
${common.lib_deps_gps} ${common.lib_deps_gps}
build_flags_basic = build_flags_basic =
;-include include/wifiscan.h '-include $PROJECTSRC_DIR/hal/${PIOENV}.h'
-include $PROJECTSRC_DIR/hal/${PIOENV}.h '-include $PROJECTSRC_DIR/paxcounter.conf'
-include $PROJECTSRC_DIR/paxcounter.conf
-w -w
;'-DARDUINO_LMIC_PROJECT_CONFIG_H="/$PROJECTSRC_DIR/lmic_config.h"' ;'-DARDUINO_LMIC_PROJECT_CONFIG_H="/$PROJECTSRC_DIR/lmic_config.h"'
'-DARDUINO_LMIC_PROJECT_CONFIG_H=../../../src/lmic_config.h' '-DARDUINO_LMIC_PROJECT_CONFIG_H=../../../src/lmic_config.h'

22
src/bme680mems.cpp
View File

@ -10,7 +10,7 @@ static const char TAG[] = "main";
bmeStatus_t bme_status; bmeStatus_t bme_status;
// initialize BME680 sensor // initialize BME680 sensor
int bme_init(void) { int bme_init(void) {
return_values_init ret = {BME680_OK, BSEC_OK}; return_values_init ret = {BME680_OK, BSEC_OK};
struct bme680_dev gas_sensor; struct bme680_dev gas_sensor;
@ -48,14 +48,22 @@ bool bme_read(void) {
*/ */
} }
/* // loop function which reads and processes data based on sensor settings
//Call to endless loop function which reads and processes data based on void bme_loop(void *pvParameters) {
//sensor settings
//State is saved every 10.000 samples, which means every 10.000 * 3 secs =
//500 minutes
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); 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, int8_t user_i2c_read(uint8_t dev_id, uint8_t reg_addr, uint8_t *reg_data,
uint16_t len) { uint16_t len) {