From d3d876f030d1af7c1ce44beaa2f48fcf94fbe121 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Sun, 1 Jul 2018 15:06:44 +0200 Subject: [PATCH 1/9] Add Sonoff iFan02 support Add support for Sonoff iFan02 as module 44 introducing command FanSpeed 0..3 (#2839) --- sonoff/_releasenotes.ino | 2 +- sonoff/sonoff.ino | 55 +++++++++++++++++++++--------------- sonoff/sonoff_template.h | 16 +++++------ sonoff/xdrv_01_mqtt.ino | 23 ++++++++++----- sonoff/xdrv_02_webserver.ino | 50 ++++++++++++++++++++++++-------- 5 files changed, 97 insertions(+), 49 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 197a0a140..31ad23fcc 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,5 +1,5 @@ /* 6.0.0b - * Add initial support for Sonoff iFan02 - Module 44 - Command FanSpeed 0..3 - Webpage will only allow Toggle1 (#2839) + * Add support for Sonoff iFan02 as module 44 introducing command FanSpeed 0..3 (#2839) * Add support for Sonoff S26 Smart Socket (#2808) * Add command SetOption30 to enforce Hass discovery as light group (#1784) * Add decimal values support for commands ADD, SUB, MULT and SCALE (#3083, #3089) diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 6cd62ec56..12a6a35a2 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -96,9 +96,7 @@ const char kTasmotaCommands[] PROGMEM = D_CMND_TELEPERIOD "|" D_CMND_RESTART "|" D_CMND_RESET "|" D_CMND_TIMEZONE "|" D_CMND_TIMESTD "|" D_CMND_TIMEDST "|" D_CMND_ALTITUDE "|" D_CMND_LEDPOWER "|" D_CMND_LEDSTATE "|" D_CMND_I2CSCAN "|" D_CMND_SERIALSEND "|" D_CMND_BAUDRATE "|" D_CMND_SERIALDELIMITER; -//const uint8_t kIFan02Speed[4][3] = {{0,0,0}, {1,0,0}, {1,1,0}, {1,0,1}}; const uint8_t kIFan02Speed[4][3] = {{6,6,6}, {7,6,6}, {7,7,6}, {7,6,7}}; -//const uint8_t kIFan02Speed[4][3] = {{16,16,16}, {17,16,16}, {17,17,16}, {17,16,17}}; // Global variables unsigned long feature_drv1; // Compiled driver feature map @@ -363,6 +361,23 @@ void SetLedPower(uint8_t state) digitalWrite(pin[GPIO_LED1], (bitRead(led_inverted, 0)) ? !state : state); } +uint8_t GetFanspeed() +{ + uint8_t fanspeed = 0; + +// if (SONOFF_IFAN02 == Settings.module) { + /* Fanspeed is controlled by relay 2, 3 and 4 as in Sonoff 4CH. + 000x = 0 + 001x = 1 + 011x = 2 + 101x = 3 + */ + fanspeed = (uint8_t)(power &0xF) >> 1; + if (fanspeed) { fanspeed = (fanspeed >> 1) +1; } +// } + return fanspeed; +} + /********************************************************************************************/ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) @@ -507,17 +522,14 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) return; } else if ((CMND_FANSPEED == command_code) && (SONOFF_IFAN02 == Settings.module)) { - uint8_t fanspeed = (uint8_t)(power &0xF) >> 1; - if (fanspeed) { fanspeed = (fanspeed >> 1) +1; } - if ((payload >= 0) && (payload <= 3) && (payload != fanspeed)) { - fanspeed = payload; + if ((payload >= 0) && (payload <= 3) && (payload != GetFanspeed())) { for (byte i = 0; i < 3; i++) { - uint8_t state = kIFan02Speed[fanspeed][i]; -// uint8_t state = pgm_read_byte(kIFan02Speed +(fanspeed *3) +i); - ExecuteCommandPower(i +2, state, SRC_IGNORE); + uint8_t state = kIFan02Speed[payload][i]; +// uint8_t state = pgm_read_byte(kIFan02Speed +(payload *3) +i); + ExecuteCommandPower(i +2, state, SRC_IGNORE); // Use relay 2, 3 and 4 } } - snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, fanspeed); + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, GetFanspeed()); } else if (CMND_STATUS == command_code) { if ((payload < 0) || (payload > MAX_STATUS)) payload = 99; @@ -1207,20 +1219,14 @@ void ExecuteCommandPower(byte device, byte state, int source) // ShowSource(source); -/* if (SONOFF_IFAN02 == Settings.module) { - if (state > 15) { // Only allow Fanspeed control over relay 2..4 - state -= 10; - blink_mask &= 1; - Settings.flag.interlock = 0; - Settings.pulse_timer[1] = 0; - Settings.pulse_timer[2] = 0; - Settings.pulse_timer[3] = 0; - } else { - device = 1; // Only allow user control over light - } + blink_mask &= 1; // No blinking on the fan relays + Settings.flag.interlock = 0; // No interlock mode as it is already done by the microcontroller + Settings.pulse_timer[1] = 0; // No pulsetimers on the fan relays + Settings.pulse_timer[2] = 0; + Settings.pulse_timer[3] = 0; } -*/ + uint8_t publish_power = 1; if ((POWER_OFF_NO_STATE == state) || (POWER_ON_NO_STATE == state)) { state &= 1; @@ -1447,6 +1453,10 @@ void MqttShowState() LightState(1); } else { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"%s\":\"%s\""), mqtt_data, GetPowerDevice(stemp1, i +1, sizeof(stemp1), Settings.flag.device_index_enable), GetStateText(bitRead(power, i))); + if (SONOFF_IFAN02 == Settings.module) { + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"" D_CMND_FANSPEED "\":%d"), mqtt_data, GetFanspeed()); + break; + } } } @@ -1521,6 +1531,7 @@ void PerformEverySecond() if (!status_update_timer) { for (byte i = 1; i <= devices_present; i++) { MqttPublishPowerState(i); + if (SONOFF_IFAN02 == Settings.module) { break; } // Only report status of light relay } } } diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h index 85cdd7044..dd061cae6 100644 --- a/sonoff/sonoff_template.h +++ b/sonoff/sonoff_template.h @@ -838,20 +838,20 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { 0, 0, 0, 0 }, { "Sonoff iFan02", // Sonoff iFan02 (ESP8285) - GPIO_KEY1, // GPIO00 Virtual button 1 + GPIO_KEY1, // GPIO00 Virtual button 1 as feedback from RC GPIO_USER, // GPIO01 Serial RXD and Optional sensor 0, // GPIO02 Optional sensor GPIO_USER, // GPIO03 Serial TXD and Optional sensor - GPIO_REL3, // GPIO04 Relay 3 (0 = Off, 1 = On) - GPIO_REL2, // GPIO05 Relay 2 (0 = Off, 1 = On) + GPIO_REL3, // GPIO04 Relay 3 (0 = Off, 1 = On) controlling the fan + GPIO_REL2, // GPIO05 Relay 2 (0 = Off, 1 = On) controlling the fan 0, 0, 0, // Flash connection - GPIO_KEY2, // GPIO09 Virtual button 2 - GPIO_KEY3, // GPIO10 Virtual button 3 + GPIO_KEY2, // GPIO09 Virtual button 2 as feedback from RC + GPIO_KEY3, // GPIO10 Virtual button 3 as feedback from RC 0, // Flash connection - GPIO_REL1, // GPIO12 Relay 1 (0 = Off, 1 = On) + GPIO_REL1, // GPIO12 Relay 1 (0 = Off, 1 = On) controlling the light GPIO_LED1_INV, // GPIO13 Blue Led on PCA (0 = On, 1 = Off) - GPIO_KEY4, // GPIO14 Virtual button 4 - GPIO_REL4, // GPIO15 Relay 4 (0 = Off, 1 = On) + GPIO_KEY4, // GPIO14 Virtual button 4 as feedback from RC + GPIO_REL4, // GPIO15 Relay 4 (0 = Off, 1 = On) controlling the fan 0, 0 } }; diff --git a/sonoff/xdrv_01_mqtt.ino b/sonoff/xdrv_01_mqtt.ino index 77c1e88f4..aa43dd85d 100644 --- a/sonoff/xdrv_01_mqtt.ino +++ b/sonoff/xdrv_01_mqtt.ino @@ -283,15 +283,24 @@ void MqttPublishPowerState(byte device) char scommand[33]; if ((device < 1) || (device > devices_present)) { device = 1; } - GetPowerDevice(scommand, device, sizeof(scommand), Settings.flag.device_index_enable); - GetTopic_P(stopic, STAT, mqtt_topic, (Settings.flag.mqtt_response) ? scommand : S_RSLT_RESULT); - snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, scommand, GetStateText(bitRead(power, device -1))); - MqttPublish(stopic); + if ((SONOFF_IFAN02 == Settings.module) && (device > 1)) { // Do not report status of fan relays + if (GetFanspeed() < 4) { + snprintf_P(scommand, sizeof(scommand), PSTR(D_CMND_FANSPEED)); + GetTopic_P(stopic, STAT, mqtt_topic, (Settings.flag.mqtt_response) ? scommand : S_RSLT_RESULT); + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, scommand, GetFanspeed()); + MqttPublish(stopic); + } + } else { + GetPowerDevice(scommand, device, sizeof(scommand), Settings.flag.device_index_enable); + GetTopic_P(stopic, STAT, mqtt_topic, (Settings.flag.mqtt_response) ? scommand : S_RSLT_RESULT); + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, scommand, GetStateText(bitRead(power, device -1))); + MqttPublish(stopic); - GetTopic_P(stopic, STAT, mqtt_topic, scommand); - snprintf_P(mqtt_data, sizeof(mqtt_data), GetStateText(bitRead(power, device -1))); - MqttPublish(stopic, Settings.flag.mqtt_power_retain); + GetTopic_P(stopic, STAT, mqtt_topic, scommand); + snprintf_P(mqtt_data, sizeof(mqtt_data), GetStateText(bitRead(power, device -1))); + MqttPublish(stopic, Settings.flag.mqtt_power_retain); + } } void MqttPublishPowerBlinkState(byte device) diff --git a/sonoff/xdrv_02_webserver.ino b/sonoff/xdrv_02_webserver.ino index c9f3df134..f658a2098 100644 --- a/sonoff/xdrv_02_webserver.ino +++ b/sonoff/xdrv_02_webserver.ino @@ -313,6 +313,9 @@ const char HTTP_END[] PROGMEM = "" ""; +const char HTTP_DEVICE_CONTROL[] PROGMEM = ""; +const char HTTP_DEVICE_STATE[] PROGMEM = "%s%s"; // {c} = %'>
"), - 100 / devices_present, idx, (devices_present < 5) ? D_BUTTON_TOGGLE : "", (devices_present > 1) ? stemp : ""); + if (SONOFF_IFAN02 == Settings.module) { + snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_DEVICE_CONTROL, 36, 1, D_BUTTON_TOGGLE, ""); page += mqtt_data; + for (byte i = 0; i < 4; i++) { + snprintf_P(stemp, sizeof(stemp), PSTR("%d"), i); + snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_DEVICE_CONTROL, 16, i +2, stemp, ""); + page += mqtt_data; + } + } else { + for (byte idx = 1; idx <= devices_present; idx++) { + snprintf_P(stemp, sizeof(stemp), PSTR(" %d"), idx); + snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_DEVICE_CONTROL, + 100 / devices_present, idx, (devices_present < 5) ? D_BUTTON_TOGGLE : "", (devices_present > 1) ? stemp : ""); + page += mqtt_data; + } } page += F(""); } @@ -592,10 +605,16 @@ void HandleAjaxStatusRefresh() WebGetArg("o", tmp, sizeof(tmp)); if (strlen(tmp)) { ShowWebSource(SRC_WEBGUI); - if (SONOFF_IFAN02 == Settings.module) { // QandD - ExecuteCommandPower(1, POWER_TOGGLE, SRC_IGNORE); + uint8_t device = atoi(tmp); + if (SONOFF_IFAN02 == Settings.module) { + if (device < 2) { + ExecuteCommandPower(1, POWER_TOGGLE, SRC_IGNORE); + } else { + snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_FANSPEED " %d"), device -2); + ExecuteCommand(svalue, SRC_WEBGUI); + } } else { - ExecuteCommandPower(atoi(tmp), POWER_TOGGLE, SRC_IGNORE); + ExecuteCommandPower(device, POWER_TOGGLE, SRC_IGNORE); } } WebGetArg("d", tmp, sizeof(tmp)); @@ -627,10 +646,19 @@ void HandleAjaxStatusRefresh() if (devices_present) { snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s{t}"), mqtt_data); uint8_t fsize = (devices_present < 5) ? 70 - (devices_present * 8) : 32; - for (byte idx = 1; idx <= devices_present; idx++) { - snprintf_P(svalue, sizeof(svalue), PSTR("%d"), bitRead(power, idx -1)); - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s%s
"), // {c} = %'>
0 ? "," : ""), Settings.friendlyname[i]); diff --git a/sonoff/xdrv_01_mqtt.ino b/sonoff/xdrv_01_mqtt.ino index aa43dd85d..a526f489d 100644 --- a/sonoff/xdrv_01_mqtt.ino +++ b/sonoff/xdrv_01_mqtt.ino @@ -284,8 +284,8 @@ void MqttPublishPowerState(byte device) if ((device < 1) || (device > devices_present)) { device = 1; } - if ((SONOFF_IFAN02 == Settings.module) && (device > 1)) { // Do not report status of fan relays - if (GetFanspeed() < 4) { + if ((SONOFF_IFAN02 == Settings.module) && (device > 1)) { + if (GetFanspeed() < 4) { // 4 occurs when fanspeed is 3 and RC button 2 is pressed snprintf_P(scommand, sizeof(scommand), PSTR(D_CMND_FANSPEED)); GetTopic_P(stopic, STAT, mqtt_topic, (Settings.flag.mqtt_response) ? scommand : S_RSLT_RESULT); snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, scommand, GetFanspeed()); diff --git a/sonoff/xdrv_02_webserver.ino b/sonoff/xdrv_02_webserver.ino index f658a2098..b29e32ea2 100644 --- a/sonoff/xdrv_02_webserver.ino +++ b/sonoff/xdrv_02_webserver.ino @@ -942,6 +942,7 @@ void HandleOtherConfiguration() page += FPSTR(HTTP_FORM_OTHER); page.replace(F("{r1"), (Settings.flag.mqtt_enabled) ? F(" checked") : F("")); uint8_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : (!devices_present) ? 1 : devices_present; + if (SONOFF_IFAN02 == Settings.module) { maxfn = 1; } for (byte i = 0; i < maxfn; i++) { page += FPSTR(HTTP_FORM_OTHER2); page.replace(F("{1"), String(i +1)); @@ -1659,6 +1660,7 @@ void HandleInformation() func += F("}1" D_BOOT_COUNT "}2"); func += String(Settings.bootcount); func += F("}1" D_RESTART_REASON "}2"); func += GetResetReason(); uint8_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : devices_present; + if (SONOFF_IFAN02 == Settings.module) { maxfn = 1; } for (byte i = 0; i < maxfn; i++) { func += F("}1" D_FRIENDLY_NAME " "); func += i +1; func += F("}2"); func += Settings.friendlyname[i]; } From dd92abff5479ac601c239ad0cb7245cf944ccb6a Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 2 Jul 2018 10:22:01 +0200 Subject: [PATCH 3/9] Reserve space for MCP23017 Reserve space for MCP23017 (#3107) --- sonoff/settings.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/sonoff/settings.h b/sonoff/settings.h index 7dbd61952..1c702356f 100644 --- a/sonoff/settings.h +++ b/sonoff/settings.h @@ -114,6 +114,20 @@ typedef union { }; } Timer; +typedef union { + uint8_t data; + struct { + uint8_t enable : 1; // Enable INPUT + uint8_t pullup : 1; // Enable internal weak pull-up resistor + uint8_t inten : 1; // Enable Interrupt on PIN + uint8_t intmode : 1; // Change on STATE or match COMPARATOR + uint8_t intcomp : 1; // Interrupt COMPARATOR + uint8_t b5 : 1; + uint8_t b6 : 1; + uint8_t b7 : 1; + }; +} Mcp230xxCfg; + /* struct SYSCFG { unsigned long cfg_holder; // 000 Pre v6 header @@ -267,14 +281,14 @@ struct SYSCFG { Timer timer[MAX_TIMERS]; // 670 int latitude; // 6B0 int longitude; // 6B4 - uint16_t knx_physsical_addr; // 6B8 (address_t is a uint16_t) uint16_t knx_GA_addr[MAX_KNX_GA]; // 6BA (address_t is a uint16_t) x KNX_max_GA uint16_t knx_CB_addr[MAX_KNX_CB]; // 6CE (address_t is a uint16_t) x KNX_max_CB byte knx_GA_param[MAX_KNX_GA]; // 6E2 Type of Input (relay changed, button pressed, sensor read <-teleperiod) byte knx_CB_param[MAX_KNX_CB]; // 6EC Type of Output (set relay, toggle relay, reply sensor value) + Mcp230xxCfg mcp230xx_config[16]; // 6F6 - byte free_6f6[216]; // 6F6 + byte free_6f6[200]; // 706 char mems[RULES_MAX_MEMS][10]; // 7CE // 800 Full - no more free locations From 8f60a88a208dbf8199e53b131e966f6ac78e3b3c Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 2 Jul 2018 14:25:02 +0200 Subject: [PATCH 4/9] Add support for BlitzWolf BW-SHP2 Add support for BlitzWolf BW-SHP2 (and Homecube, Gosund SP1) Energy Monitoring Smart Socket (#2223) --- README.md | 1 + sonoff/_releasenotes.ino | 1 + sonoff/sonoff_template.h | 55 ++++++++++++++++++++++++++++++--------- sonoff/xdrv_03_energy.ino | 43 +++++++++++++++++++++++------- 4 files changed, 79 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index de88efcf0..78f9776e1 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,7 @@ The following devices are supported: - [MagicHome PWM LED controller](https://github.com/arendst/Sonoff-Tasmota/wiki/MagicHome-LED-strip-controller) - AriLux AL-LC01, AL-LC06 and AL-LC11 PWM LED controller - [Supla device - Espablo-inCan mod. for electrical Installation box](https://forum.supla.org/viewtopic.php?f=33&t=2188) +- [BlitzWolf BW-SHP2 Smart Socket with Energy Monitoring](https://www.banggood.com/BlitzWolf-BW-SHP2-Smart-WIFI-Socket-EU-Plug-220V-16A-Work-with-Amazon-Alexa-Google-Assistant-p-1292899.html) - [Luani HVIO board](https://luani.de/projekte/esp8266-hvio/) - Wemos D1 mini, NodeMcu and Ledunia diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 31ad23fcc..580e5a0be 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,5 @@ /* 6.0.0b + * Add support for BlitzWolf BW-SHP2 (and Homecube, Gosund SP1) Energy Monitoring Smart Socket (#2223) * Add support for Sonoff iFan02 as module 44 introducing command FanSpeed 0..3 (#2839) * Add support for Sonoff S26 Smart Socket (#2808) * Add command SetOption30 to enforce Hass discovery as light group (#1784) diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h index dd061cae6..4eeb3bf80 100644 --- a/sonoff/sonoff_template.h +++ b/sonoff/sonoff_template.h @@ -200,6 +200,7 @@ enum SupportedModules { ZENGGE_ZF_WF017, SONOFF_POW_R2, SONOFF_IFAN02, + BLITZWOLF_BWSHP2, MAXMODULE }; /********************************************************************************************/ @@ -251,6 +252,7 @@ const uint8_t kNiceList[MAXMODULE] PROGMEM = { LUANIHVIO, YUNSHAN, WION, + BLITZWOLF_BWSHP2, H801, MAGICHOME, ARILUX_LC01, @@ -456,7 +458,8 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_LED1, // GPIO16 Green/Blue Led (1 = On, 0 = Off) GPIO_ADC0 // ADC0 A0 Analog input }, - { "EXS Relay", // Latching relay https://ex-store.de/ESP8266-WiFi-Relay-V31 (ESP8266) + { "EXS Relay", // Latching relay (ESP8266) + // https://ex-store.de/ESP8266-WiFi-Relay-V31 // Module Pin 1 VCC 3V3, Module Pin 6 GND GPIO_KEY1, // GPIO00 Module Pin 8 - Button (firmware flash) GPIO_USER, // GPIO01 Module Pin 2 = UART0_TXD @@ -472,7 +475,8 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_USER, // GPIO16 Module Pin 4 0 }, - { "WiOn", // Indoor Tap https://www.amazon.com/gp/product/B00ZYLUBJU/ref=s9_acsd_al_bw_c_x_3_w (ESP8266) + { "WiOn", // Indoor Tap (ESP8266) + // https://www.amazon.com/gp/product/B00ZYLUBJU/ref=s9_acsd_al_bw_c_x_3_w GPIO_USER, // GPIO00 Optional sensor (pm clock) 0, GPIO_LED1, // GPIO02 Green Led (1 = On, 0 = Off) @@ -664,7 +668,8 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_LED1_INV, // GPIO13 Blue Led (0 = On, 1 = Off) 0, 0, 0, 0 }, - { "Supla Espablo", // Supla Espablo (ESP8266) - http://www.wykop.pl/ramka/3325399/diy-supla-do-puszki-instalacyjnej-podtynkowej-supla-org/ + { "Supla Espablo", // Supla Espablo (ESP8266) + // http://www.wykop.pl/ramka/3325399/diy-supla-do-puszki-instalacyjnej-podtynkowej-supla-org/ 0, // GPIO00 Flash jumper GPIO_USER, // GPIO01 Serial RXD and Optional sensor GPIO_DSB, // GPIO02 DS18B20 sensor @@ -679,7 +684,8 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_LED1, // GPIO16 Led (1 = On, 0 = Off) GPIO_ADC0 // ADC0 A0 Analog input }, - { "Witty Cloud", // Witty Cloud Dev Board (ESP8266) - https://www.aliexpress.com/item/ESP8266-serial-WIFI-Witty-cloud-Development-Board-ESP-12F-module-MINI-nodemcu/32643464555.html + { "Witty Cloud", // Witty Cloud Dev Board (ESP8266) + // https://www.aliexpress.com/item/ESP8266-serial-WIFI-Witty-cloud-Development-Board-ESP-12F-module-MINI-nodemcu/32643464555.html GPIO_USER, // GPIO00 D3 flash push button on interface board GPIO_USER, // GPIO01 Serial RXD and Optional sensor GPIO_LED1_INV, // GPIO02 D4 Blue Led (0 = On, 1 = Off) on ESP-12F @@ -694,7 +700,8 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_USER, // GPIO16 D0 optional sensor GPIO_ADC0 // ADC0 A0 Light sensor / Requires USE_ADC_VCC in user_config.h to be disabled }, - { "Yunshan Relay", // Yunshan Wifi Relay (ESP8266) - https://www.ebay.com/p/Esp8266-220v-10a-Network-Relay-WiFi-Module/1369583381 + { "Yunshan Relay", // Yunshan Wifi Relay (ESP8266) + // https://www.ebay.com/p/Esp8266-220v-10a-Network-Relay-WiFi-Module/1369583381 // Schematics and Info https://ucexperiment.wordpress.com/2016/12/18/yunshan-esp8266-250v-15a-acdc-network-wifi-relay-module/ 0, // GPIO00 Flash jumper - Module Pin 8 GPIO_USER, // GPIO01 Serial RXD and Optional sensor - Module Pin 2 @@ -705,7 +712,8 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { 0, 0, 0, 0, 0, 0, // Flash connection 0, 0, 0, 0, 0 }, - { "MagicHome", // Magic Home (aka Flux-light) (ESP8266) - https://www.aliexpress.com/item/Magic-Home-Mini-RGB-RGBW-Wifi-Controller-For-Led-Strip-Panel-light-Timing-Function-16million-colors/32686853650.html + { "MagicHome", // Magic Home (aka Flux-light) (ESP8266) + // https://www.aliexpress.com/item/Magic-Home-Mini-RGB-RGBW-Wifi-Controller-For-Led-Strip-Panel-light-Timing-Function-16million-colors/32686853650.html 0, GPIO_USER, // GPIO01 Serial RXD and Optional sensor GPIO_LED1_INV, // GPIO02 Blue onboard LED @@ -718,7 +726,8 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_PWM1, // GPIO14 RGB LED Red 0, 0, 0 }, - { "Luani HVIO", // ESP8266_HVIO - https://luani.de/projekte/esp8266-hvio/ + { "Luani HVIO", // ESP8266_HVIO + // https://luani.de/projekte/esp8266-hvio/ 0, // GPIO00 Flash jumper GPIO_USER, // GPIO01 Serial RXD and Optional sensor GPIO_USER, // GPIO02 Optional sensor / I2C SDA pad @@ -733,7 +742,8 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { 0, GPIO_ADC0 // ADC0 A0 Analog input }, - { "KMC 70011", // KMC 70011 (https://www.amazon.com/KMC-Timing-Monitoring-Network-125V-240V/dp/B06XRX2GTQ) + { "KMC 70011", // KMC 70011 + // https://www.amazon.com/KMC-Timing-Monitoring-Network-125V-240V/dp/B06XRX2GTQ GPIO_KEY1, // GPIO00 Button 0, 0, 0, GPIO_HLW_CF, // GPIO04 HLW8012 CF @@ -744,7 +754,8 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_REL1, // GPIO14 Relay 0, 0, 0 }, - { "Arilux LC01", // Arilux AL-LC01 (ESP8285) - https://www.banggood.com/nl/ARILUX-AL-LC01-Super-Mini-LED-WIFI-Smart-RGB-Controller-For-RGB-LED-Strip-Light-DC-9-12V-p-1058603.html + { "Arilux LC01", // Arilux AL-LC01 (ESP8285) + // https://www.banggood.com/nl/ARILUX-AL-LC01-Super-Mini-LED-WIFI-Smart-RGB-Controller-For-RGB-LED-Strip-Light-DC-9-12V-p-1058603.html // (PwmFrequency 1111Hz) GPIO_KEY1, // GPIO00 Optional Button GPIO_USER, // GPIO01 Serial RXD and Optional sensor @@ -758,7 +769,8 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_USER, // GPIO14 RGBW LED White (optional - set to PWM4 for Cold White or Warm White) 0, 0, 0 }, - { "Arilux LC11", // Arilux AL-LC11 (ESP8266) - https://www.banggood.com/nl/ARILUX-AL-LC11-Super-Mini-LED-WIFI-APP-Controller-RF-Remote-Control-For-RGBWW-LED-Strip-DC9-28V-p-1085112.html + { "Arilux LC11", // Arilux AL-LC11 (ESP8266) + // https://www.banggood.com/nl/ARILUX-AL-LC11-Super-Mini-LED-WIFI-APP-Controller-RF-Remote-Control-For-RGBWW-LED-Strip-DC9-28V-p-1085112.html // (PwmFrequency 540Hz) GPIO_KEY1, // GPIO00 Optional Button GPIO_USER, // GPIO01 Serial RXD and Optional sensor @@ -788,7 +800,8 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_LED1_INV, // GPIO13 Blue Led (0 = On, 1 = Off) 0, 0, 0, 0 }, - { "Arilux LC06", // Arilux AL-LC06 (ESP8285) - https://www.banggood.com/ARILUX-AL-LC06-LED-WIFI-Smartphone-Controller-Romote-5-Channels-DC12-24V-For-RGBWW-Strip-light-p-1061476.html + { "Arilux LC06", // Arilux AL-LC06 (ESP8285) + // https://www.banggood.com/ARILUX-AL-LC06-LED-WIFI-Smartphone-Controller-Romote-5-Channels-DC12-24V-For-RGBWW-Strip-light-p-1061476.html GPIO_KEY1, // GPIO00 Optional Button GPIO_USER, // GPIO01 Serial RXD and Optional sensor GPIO_USER, // GPIO02 Empty pad @@ -813,7 +826,8 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_LED1_INV, // GPIO13 Green Led (0 = On, 1 = Off) 0, 0, 0, 0 }, - { "Zengge WF017", // Zenggee ZJ-WF017-A (ESP12S)) - https://www.ebay.com/p/Smartphone-Android-IOS-WiFi-Music-Controller-for-RGB-5050-3528-LED-Strip-Light/534446632?_trksid=p2047675.l2644 + { "Zengge WF017", // Zenggee ZJ-WF017-A (ESP12S)) + // https://www.ebay.com/p/Smartphone-Android-IOS-WiFi-Music-Controller-for-RGB-5050-3528-LED-Strip-Light/534446632?_trksid=p2047675.l2644 GPIO_KEY1, // GPIO00 Optional Button 0, GPIO_USER, // GPIO02 Empty pad @@ -853,6 +867,23 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_KEY4, // GPIO14 Virtual button 4 as feedback from RC GPIO_REL4, // GPIO15 Relay 4 (0 = Off, 1 = On) controlling the fan 0, 0 + }, + { "BlitzWolf SHP2", // BlitzWolf BW-SHP2 (ESP8285 - BL0937 or HJL-01 Energy Monitoring) + // https://www.banggood.com/BlitzWolf-BW-SHP2-Smart-WIFI-Socket-EU-Plug-220V-16A-Work-with-Amazon-Alexa-Google-Assistant-p-1292899.html + // https://www.amazon.de/Steckdose-Homecube-intelligente-Verbrauchsanzeige-funktioniert/dp/B076Q2LKHG/ref=sr_1_fkmr0_1 + // https://www.amazon.de/Intelligente-Stromverbrauch-Fernsteurung-Schaltbare-Energieklasse/dp/B076WZQS4S/ref=sr_1_1 + GPIO_LED2_INV, // GPIO00 Red Led (1 = On, 0 = Off) + GPIO_USER, // GPIO01 Serial RXD and Optional sensor + GPIO_LED1_INV, // GPIO02 Blue Led (1 = On, 0 = Off) + GPIO_USER, // GPIO03 Serial TXD and Optional sensor + 0, + GPIO_HLW_CF, // GPIO05 BL0937 or HJL-01 CF power + 0, 0, 0, 0, 0, 0, // Flash connection + GPIO_HLW_SEL, // GPIO12 BL0937 or HJL-01 Sel output + GPIO_KEY1, // GPIO13 Button + GPIO_HLW_CF1, // GPIO14 BL0937 or HJL-01 CF1 voltage / current + GPIO_REL1, // GPIO15 Relay (0 = Off, 1 = On) + 0, 0 } }; diff --git a/sonoff/xdrv_03_energy.ino b/sonoff/xdrv_03_energy.ino index 180e9b858..e862ffdcd 100644 --- a/sonoff/xdrv_03_energy.ino +++ b/sonoff/xdrv_03_energy.ino @@ -93,18 +93,27 @@ void EnergyUpdateToday() } /*********************************************************************************************\ - * HLW8012 - Energy (Sonoff Pow) + * HLW8012, BL0937 or HJL-01 - Energy (Sonoff Pow) * * Based on Source: Shenzhen Heli Technology Co., Ltd \*********************************************************************************************/ +// HLW8012 based (Sonoff Pow, KMC70011) #define HLW_PREF 10000 // 1000.0W #define HLW_UREF 2200 // 220.0V #define HLW_IREF 4545 // 4.545A +#define HLW_SEL_VOLTAGE 1 + +// HJL-01 based (Homecube, BlitzWolf) +#define HJL_PREF 1362 +#define HJL_UREF 822 +#define HJL_IREF 3300 +#define HJL_SEL_VOLTAGE 0 #define HLW_POWER_PROBE_TIME 10 // Number of seconds to probe for power before deciding none used byte hlw_select_ui_flag; +byte hlw_ui_flag = 1; byte hlw_load_off; byte hlw_cf1_timer; unsigned long hlw_cf_pulse_length; @@ -117,6 +126,10 @@ unsigned long hlw_cf1_voltage_pulse_length; unsigned long hlw_cf1_current_pulse_length; unsigned long hlw_energy_period_counter; +unsigned long hlw_power_ratio = 0; +unsigned long hlw_voltage_ratio = 0; +unsigned long hlw_current_ratio = 0; + unsigned long hlw_cf1_voltage_max_pulse_counter; unsigned long hlw_cf1_current_max_pulse_counter; @@ -162,7 +175,7 @@ void HlwEverySecond() hlw_len = 10000 / hlw_energy_period_counter; hlw_energy_period_counter = 0; if (hlw_len) { - energy_kWhtoday_delta += ((HLW_PREF * Settings.energy_power_calibration) / hlw_len) / 36; + energy_kWhtoday_delta += ((hlw_power_ratio * Settings.energy_power_calibration) / hlw_len) / 36; EnergyUpdateToday(); } } @@ -180,7 +193,7 @@ void HlwEvery200ms() } if (hlw_cf_pulse_length && energy_power_on && !hlw_load_off) { - hlw_w = (HLW_PREF * Settings.energy_power_calibration) / hlw_cf_pulse_length; + hlw_w = (hlw_power_ratio * Settings.energy_power_calibration) / hlw_cf_pulse_length; energy_power = (float)hlw_w / 10; } else { energy_power = 0; @@ -197,12 +210,12 @@ void HlwEvery200ms() } else { hlw_cf1_pulse_length = 0; } - if (hlw_select_ui_flag) { + if (hlw_select_ui_flag == hlw_ui_flag) { hlw_cf1_voltage_pulse_length = hlw_cf1_pulse_length; hlw_cf1_voltage_max_pulse_counter = hlw_cf1_pulse_counter; if (hlw_cf1_voltage_pulse_length && energy_power_on) { // If powered on always provide voltage - hlw_u = (HLW_UREF * Settings.energy_voltage_calibration) / hlw_cf1_voltage_pulse_length; + hlw_u = (hlw_voltage_ratio * Settings.energy_voltage_calibration) / hlw_cf1_voltage_pulse_length; energy_voltage = (float)hlw_u / 10; } else { energy_voltage = 0; @@ -213,7 +226,7 @@ void HlwEvery200ms() hlw_cf1_current_max_pulse_counter = hlw_cf1_pulse_counter; if (hlw_cf1_current_pulse_length && energy_power) { // No current if no power being consumed - hlw_i = (HLW_IREF * Settings.energy_current_calibration) / hlw_cf1_current_pulse_length; + hlw_i = (hlw_current_ratio * Settings.energy_current_calibration) / hlw_cf1_current_pulse_length; energy_current = (float)hlw_i / 1000; } else { energy_current = 0; @@ -233,6 +246,18 @@ void HlwInit() Settings.energy_current_calibration = HLW_IREF_PULSE; } + if (BLITZWOLF_BWSHP2 == Settings.module) { + hlw_power_ratio = HJL_PREF; + hlw_voltage_ratio = HJL_UREF; + hlw_current_ratio = HJL_IREF; + hlw_ui_flag = HJL_SEL_VOLTAGE; + } else { + hlw_power_ratio = HLW_PREF; + hlw_voltage_ratio = HLW_UREF; + hlw_current_ratio = HLW_IREF; + hlw_ui_flag = HLW_SEL_VOLTAGE; + } + hlw_cf_pulse_length = 0; hlw_cf_pulse_last_time = 0; hlw_cf1_pulse_length = 0; @@ -918,7 +943,7 @@ boolean EnergyCommand() else if (((ENERGY_HLW8012 == energy_flg) || (ENERGY_CSE7766 == energy_flg)) && (CMND_POWERSET == command_code)) { // Watt if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 3601)) { if ((ENERGY_HLW8012 == energy_flg) && hlw_cf_pulse_length) { - Settings.energy_power_calibration = (XdrvMailbox.payload * 10 * hlw_cf_pulse_length) / HLW_PREF; + Settings.energy_power_calibration = (XdrvMailbox.payload * 10 * hlw_cf_pulse_length) / hlw_power_ratio; } else if ((ENERGY_CSE7766 == energy_flg) && power_cycle) { Settings.energy_power_calibration = (XdrvMailbox.payload * power_cycle) / CSE_PREF; @@ -938,7 +963,7 @@ boolean EnergyCommand() else if (((ENERGY_HLW8012 == energy_flg) || (ENERGY_CSE7766 == energy_flg)) && (CMND_VOLTAGESET == command_code)) { // Volt if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 501)) { if ((ENERGY_HLW8012 == energy_flg) && hlw_cf1_voltage_pulse_length) { - Settings.energy_voltage_calibration = (XdrvMailbox.payload * 10 * hlw_cf1_voltage_pulse_length) / HLW_UREF; + Settings.energy_voltage_calibration = (XdrvMailbox.payload * 10 * hlw_cf1_voltage_pulse_length) / hlw_voltage_ratio; } else if ((ENERGY_CSE7766 == energy_flg) && voltage_cycle) { Settings.energy_voltage_calibration = (XdrvMailbox.payload * voltage_cycle) / CSE_UREF; @@ -958,7 +983,7 @@ boolean EnergyCommand() else if (((ENERGY_HLW8012 == energy_flg) || (ENERGY_CSE7766 == energy_flg)) && (CMND_CURRENTSET == command_code)) { // milliAmpere if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload < 16001)) { if ((ENERGY_HLW8012 == energy_flg) && hlw_cf1_current_pulse_length) { - Settings.energy_current_calibration = (XdrvMailbox.payload * hlw_cf1_current_pulse_length) / HLW_IREF; + Settings.energy_current_calibration = (XdrvMailbox.payload * hlw_cf1_current_pulse_length) / hlw_current_ratio; } else if ((ENERGY_CSE7766 == energy_flg) && current_cycle) { Settings.energy_current_calibration = (XdrvMailbox.payload * current_cycle) / 1000; From d5a08077afcbd9347c2d9de28db7e7079c6d6fff Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Mon, 2 Jul 2018 14:49:58 +0200 Subject: [PATCH 5/9] Add migration instructions Add migration instructions --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 78f9776e1..6c4133ddc 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,10 @@ Alternative firmware for _ESP8266 based devices_ like [iTead](https://www.itead. [![License](https://img.shields.io/github/license/arendst/Sonoff-Tasmota.svg)](https://github.com/arendst/Sonoff-Tasmota/blob/development/LICENSE.txt) If you like **Sonoff-Tasmota**, give it a star, or fork it and contribute! + [![GitHub stars](https://img.shields.io/github/stars/arendst/Sonoff-Tasmota.svg?style=social&label=Star)](https://github.com/arendst/Sonoff-Tasmota/stargazers) [![GitHub forks](https://img.shields.io/github/forks/arendst/Sonoff-Tasmota.svg?style=social&label=Fork)](https://github.com/arendst/Sonoff-Tasmota/network) +[![donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://paypal.me/tasmota) ### Development [![Build Status](https://img.shields.io/travis/arendst/Sonoff-Tasmota.svg)](https://travis-ci.org/arendst/Sonoff-Tasmota) @@ -37,6 +39,15 @@ If you want to compile Sonoff-Tasmota yourself keep in mind the following: - Once uploaded select module using the configuration webpage or the commands ```Modules``` and ```Module```. - After reboot select config menu again or use commands ```GPIOs``` and ```GPIO``` to change GPIO with desired sensor. +### Migration Instructions +See [wiki migration path](https://github.com/arendst/Sonoff-Tasmota/wiki/Upgrade#migration-path) for instructions how to migrate to a major version. Pay attention to the following version breaks due to dynamic settings updates: + +1. Migrate to **Sonoff-Tasmota 3.9.x** +2. Migrate to **Sonoff-Tasmota 4.x** +3. Migrate to **Sonoff-Tasmota 5.14** +4. Migrate to **Sonoff-Tasmota 6.x** + +### Support Information See [Wiki](https://github.com/arendst/Sonoff-Tasmota/wiki) for more information.
From c896437124db3a4f07ef66b5b4235644705cb8ee Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Tue, 3 Jul 2018 12:48:56 +0200 Subject: [PATCH 6/9] v6.0.0c - Add spare SetOptions 6.0.0c * Add support for bitflags SetOption50 .. SetOption81 (#3118) --- README.md | 9 +++- sonoff/_releasenotes.ino | 5 +- sonoff/settings.h | 58 ++++++++++++++++++----- sonoff/settings.ino | 5 ++ sonoff/sonoff.ino | 100 +++++++++++++++++++-------------------- 5 files changed, 113 insertions(+), 64 deletions(-) diff --git a/README.md b/README.md index 6c4133ddc..9fef62adb 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you like **Sonoff-Tasmota**, give it a star, or fork it and contribute! ### Development [![Build Status](https://img.shields.io/travis/arendst/Sonoff-Tasmota.svg)](https://travis-ci.org/arendst/Sonoff-Tasmota) -Current version is **6.0.0b** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **6.0.0c** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### Disclaimer :warning: **DANGER OF ELECTROCUTION** :warning: @@ -123,6 +123,7 @@ Different firmware images are released based on Features and Sensors selection g | USE_SHT | x | x | - | x | x | | USE_SHT3X | x | x | - | x | x | | USE_HTU | x | x | - | x | x | +| USE_LM75AD | x | - | - | x | x | | USE_BMP | x | x | - | x | x | | USE_BME680 | - | - | - | - | x | | USE_SGP30 | x | - | - | x | x | @@ -133,6 +134,7 @@ Different firmware images are released based on Features and Sensors selection g | USE_ADS1115 | - | - | - | - | x | | USE_ADS1115_I2CDEV | - | - | - | - | - | | USE_INA219 | - | - | - | - | x | +| USE_APDS9960 | - | - | - | - | - | | USE_MGS | - | - | - | - | x | | USE_SPI | - | - | - | - | - | | USE_MHZ19 | x | x | - | x | x | @@ -141,7 +143,8 @@ Different firmware images are released based on Features and Sensors selection g | USE_NOVA_SDS | x | - | - | x | x | | USE_PZEM004T | x | x | - | x | x | | USE_SERIAL_BRIDGE | x | - | - | x | x | -| USE_SDM120 | - | - | - | - | x | +| USE_SDM120 | x | - | - | - | x | +| USE_SDM630 | x | - | - | - | x | | USE_IR_REMOTE | x | x | - | x | x | | USE_IR_HVAC | - | - | - | - | x | | USE_IR_RECEIVE | x | - | - | x | x | @@ -149,6 +152,8 @@ Different firmware images are released based on Features and Sensors selection g | USE_WS2812_DMA | - | - | - | - | - | | USE_ARILUX_RF | x | x | - | x | x | | USE_SR04 | x | - | - | x | x | +| USE_TM1638 | - | - | - | - | - | +| USE_RF_FLASH | x | - | - | x | x | #### Typical File Size diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 580e5a0be..dae998c73 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,7 @@ -/* 6.0.0b +/* 6.0.0c + * Add support for bitflags SetOption50 .. SetOption81 (#3118) + * + * 6.0.0b * Add support for BlitzWolf BW-SHP2 (and Homecube, Gosund SP1) Energy Monitoring Smart Socket (#2223) * Add support for Sonoff iFan02 as module 44 introducing command FanSpeed 0..3 (#2839) * Add support for Sonoff S26 Smart Socket (#2808) diff --git a/sonoff/settings.h b/sonoff/settings.h index 1c702356f..c4de3d659 100644 --- a/sonoff/settings.h +++ b/sonoff/settings.h @@ -20,21 +20,21 @@ #ifndef _SETTINGS_H_ #define _SETTINGS_H_ -#define PARAM8_SIZE 18 // Number of param bytes +#define PARAM8_SIZE 18 // Number of param bytes (SetOption) typedef union { // Restricted by MISRA-C Rule 18.4 but so usefull... uint32_t data; // Allow bit manipulation using SetOption - struct { + struct { // SetOption0 .. SetOption31 uint32_t save_state : 1; // bit 0 uint32_t button_restrict : 1; // bit 1 uint32_t value_units : 1; // bit 2 uint32_t mqtt_enabled : 1; // bit 3 uint32_t mqtt_response : 1; // bit 4 - uint32_t mqtt_power_retain : 1; - uint32_t mqtt_button_retain : 1; - uint32_t mqtt_switch_retain : 1; + uint32_t mqtt_power_retain : 1; // CMND_POWERRETAIN + uint32_t mqtt_button_retain : 1; // CMND_BUTTONRETAIN + uint32_t mqtt_switch_retain : 1; // CMND_SWITCHRETAIN uint32_t temperature_conversion : 1; // bit 8 - uint32_t mqtt_sensor_retain : 1; + uint32_t mqtt_sensor_retain : 1; // CMND_SENSORRETAIN uint32_t mqtt_offline : 1; // bit 10 uint32_t button_swap : 1; // bit 11 (v5.1.6) uint32_t stop_flash_rotate : 1; // bit 12 (v5.2.0) @@ -60,8 +60,46 @@ typedef union { // Restricted by MISRA-C Rule 18.4 bu }; } SysBitfield; -typedef union { +typedef union { // Restricted by MISRA-C Rule 18.4 but so usefull... uint32_t data; // Allow bit manipulation using SetOption + struct { // SetOption50 .. SetOption81 + uint32_t spare00 : 1; + uint32_t spare01 : 1; + uint32_t spare02 : 1; + uint32_t spare03 : 1; + uint32_t spare04 : 1; + uint32_t spare05 : 1; + uint32_t spare06 : 1; + uint32_t spare07 : 1; + uint32_t spare08 : 1; + uint32_t spare09 : 1; + uint32_t spare10 : 1; + uint32_t spare11 : 1; + uint32_t spare12 : 1; + uint32_t spare13 : 1; + uint32_t spare14 : 1; + uint32_t spare15 : 1; + uint32_t spare16 : 1; + uint32_t spare17 : 1; + uint32_t spare18 : 1; + uint32_t spare19 : 1; + uint32_t spare20 : 1; + uint32_t spare21 : 1; + uint32_t spare22 : 1; + uint32_t spare23 : 1; + uint32_t spare24 : 1; + uint32_t spare25 : 1; + uint32_t spare26 : 1; + uint32_t spare27 : 1; + uint32_t spare28 : 1; + uint32_t spare29 : 1; + uint32_t spare30 : 1; + uint32_t spare31 : 1; + }; +} SysBitfield3; + +typedef union { + uint32_t data; // Allow bit manipulation struct { uint32_t spare00 : 1; uint32_t spare01 : 1; @@ -192,7 +230,7 @@ struct SYSCFG { byte free_2fa[1]; // 2FA uint8_t ledstate; // 2FB - uint8_t param[PARAM8_SIZE]; // 2FC + uint8_t param[PARAM8_SIZE]; // 2FC SetOption32 .. SetOption49 int16_t toffset[2]; // 30E byte free_312[1]; // 312 @@ -229,9 +267,7 @@ struct SYSCFG { uint16_t blinktime; // 39A uint16_t blinkcount; // 39C uint16_t light_rotation; // 39E - - byte free_3A0[4]; // 3A0 - + SysBitfield3 flag3; // 3A0 uint8_t switchmode[MAX_SWITCHES]; // 3A4 (6.0.0b - moved from 0x4CA) char friendlyname[MAX_FRIENDLYNAMES][33]; // 3AC char switch_topic[33]; // 430 diff --git a/sonoff/settings.ino b/sonoff/settings.ino index f472e2685..d39c4e7a3 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -777,6 +777,11 @@ void SettingsDelta() } } } + if (Settings.version < 0x06000003) { + Settings.flag.rules_enabled = 0; + Settings.flag.rules_once = 0; + Settings.flag3.data = 0; + } Settings.version = VERSION; SettingsSave(1); diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 3fac2d502..3d51f2490 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x06000002 // 6.0.0b +#define VERSION 0x06000003 // 6.0.0c // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) @@ -402,7 +402,6 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) char stemp1[TOPSZ]; char *p; char *type = NULL; - byte ptype = 0; byte jsflg = 0; byte lines = 1; uint8_t grpflg = 0; @@ -602,75 +601,76 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) XsnsCall(FUNC_COMMAND); // if (!XsnsCall(FUNC_COMMAND)) type = NULL; } - else if ((CMND_SETOPTION == command_code) && (index <= P_MAX_PARAM8 + 31)) { - if (index <= 31) { - ptype = 0; // SetOption0 .. 31 - } else { - ptype = 1; // SetOption32 .. - index = index -32; + else if ((CMND_SETOPTION == command_code) && (index < 82)) { + byte ptype; + byte pindex; + if (index <= 31) { // SetOption0 .. 31 = Settings.flag + ptype = 0; + pindex = index; // 0 .. 31 + } + else if (index <= 49) { // SetOption32 .. 49 = Settings.param + ptype = 2; + pindex = index -32; // 0 .. 17 (= PARAM8_SIZE -1) + } + else { // SetOption50 .. 81 = Settings.flag3 + ptype = 1; + pindex = index -50; // 0 .. 31 } if (payload >= 0) { - if (0 == ptype) { // SetOption0 .. 31 + if (0 == ptype) { // SetOption0 .. 31 if (payload <= 1) { - switch (index) { - case 3: // mqtt - case 15: // pwm_control + switch (pindex) { + case 5: // mqtt_power_retain (CMND_POWERRETAIN) + case 6: // mqtt_button_retain (CMND_BUTTONRETAIN) + case 7: // mqtt_switch_retain (CMND_SWITCHRETAIN) + case 9: // mqtt_sensor_retain (CMND_SENSORRETAIN) + case 22: // mqtt_serial (SerialSend and SerialLog) + ptype = 99; // Command Error + break; // Ignore command SetOption + case 3: // mqtt + case 15: // pwm_control restart_flag = 2; - case 0: // save_state - case 1: // button_restrict - case 2: // value_units - case 4: // mqtt_response - case 8: // temperature_conversion - case 10: // mqtt_offline - case 11: // button_swap - case 12: // stop_flash_rotate - case 13: // button_single - case 14: // interlock - case 16: // ws_clock_reverse - case 17: // decimal_text - case 18: // light_signal - case 19: // hass_discovery - case 20: // not_power_linked - case 21: // no_power_on_check -// case 22: // mqtt_serial - use commands SerialSend and SerialLog -// case 23: // rules_enabled - use command Rule -// case 24: // rules_once -// case 25: // knx_enabled - case 26: // device_index_enable -// case 27: // knx_enable_enhancement - case 28: // rf_receive_decimal - case 29: // ir_receive_decimal - case 30: // hass_light - bitWrite(Settings.flag.data, index, payload); + default: + bitWrite(Settings.flag.data, pindex, payload); } - if (12 == index) { // stop_flash_rotate + if (12 == pindex) { // stop_flash_rotate stop_flash_rotate = payload; SettingsSave(2); } #ifdef USE_HOME_ASSISTANT - if ((19 == index) || (30 == index)) { // hass_discovery or hass_light - HAssDiscovery(1); + if ((19 == pindex) || (30 == pindex)) { + HAssDiscovery(1); // hass_discovery or hass_light } #endif // USE_HOME_ASSISTANT } } - else { // SetOption32 .. - switch (index) { + else if (1 == ptype) { // SetOption50 .. 81 + if (payload <= 1) { + bitWrite(Settings.flag3.data, pindex, payload); + } + } + else { // SetOption32 .. 49 +/* + switch (pindex) { case P_HOLD_TIME: - if ((payload >= 1) && (payload <= 250)) { - Settings.param[P_HOLD_TIME] = payload; - } - break; case P_MAX_POWER_RETRY: if ((payload >= 1) && (payload <= 250)) { - Settings.param[P_MAX_POWER_RETRY] = payload; + Settings.param[pindex] = payload; } break; + default: + ptype = 99; // Command Error + } +*/ + if ((payload >= 1) && (payload <= 250)) { + Settings.param[pindex] = payload; } } } - if (ptype) snprintf_P(stemp1, sizeof(stemp1), PSTR("%d"), Settings.param[index]); - snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_SVALUE, command, (ptype) ? index +32 : index, (ptype) ? stemp1 : GetStateText(bitRead(Settings.flag.data, index))); + if (ptype < 99) { + if (2 == ptype) snprintf_P(stemp1, sizeof(stemp1), PSTR("%d"), Settings.param[pindex]); + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_INDEX_SVALUE, command, index, (2 == ptype) ? stemp1 : (1 == ptype) ? GetStateText(bitRead(Settings.flag3.data, pindex)) : GetStateText(bitRead(Settings.flag.data, pindex))); + } } else if (CMND_TEMPERATURE_RESOLUTION == command_code) { if ((payload >= 0) && (payload <= 3)) { From d08cefb0dfc6ce95c5e702d1892ab29519db9327 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Wed, 4 Jul 2018 18:41:00 +0200 Subject: [PATCH 7/9] Rewrite BME680 driver Rewrite BME680 driver now using latest Bosch BME680 library (#2969) --- lib/Adafruit_BME680-1.0.5/.gitignore | 1 - lib/Adafruit_BME680-1.0.5/Adafruit_BME680.cpp | 605 ---- lib/Adafruit_BME680-1.0.5/Adafruit_BME680.h | 107 - lib/Adafruit_BME680-1.0.5/Doxyfile | 2492 ----------------- lib/Adafruit_BME680-1.0.5/README.md | 12 - .../docs/_adafruit___b_m_e680_8h_source.html | 91 - lib/Adafruit_BME680-1.0.5/docs/annotated.html | 78 - lib/Adafruit_BME680-1.0.5/docs/bc_s.png | Bin 676 -> 0 bytes lib/Adafruit_BME680-1.0.5/docs/bdwn.png | Bin 147 -> 0 bytes lib/Adafruit_BME680-1.0.5/docs/bme680_8c.html | 157 -- lib/Adafruit_BME680-1.0.5/docs/bme680_8h.html | 129 - .../docs/bme680_8h_source.html | 87 - .../docs/bme680__defs_8h.html | 1160 -------- .../docs/bme680__defs_8h_source.html | 135 - .../class_adafruit___b_m_e680-members.html | 94 - .../docs/class_adafruit___b_m_e680.html | 537 ---- lib/Adafruit_BME680-1.0.5/docs/classes.html | 82 - lib/Adafruit_BME680-1.0.5/docs/closed.png | Bin 132 -> 0 bytes lib/Adafruit_BME680-1.0.5/docs/doc.png | Bin 746 -> 0 bytes lib/Adafruit_BME680-1.0.5/docs/doxygen.css | 1596 ----------- lib/Adafruit_BME680-1.0.5/docs/doxygen.png | Bin 3779 -> 0 bytes lib/Adafruit_BME680-1.0.5/docs/dynsections.js | 97 - lib/Adafruit_BME680-1.0.5/docs/files.html | 78 - .../docs/folderclosed.png | Bin 616 -> 0 bytes lib/Adafruit_BME680-1.0.5/docs/folderopen.png | Bin 597 -> 0 bytes lib/Adafruit_BME680-1.0.5/docs/functions.html | 122 - .../docs/functions_func.html | 110 - .../docs/functions_vars.html | 83 - lib/Adafruit_BME680-1.0.5/docs/globals.html | 188 -- .../docs/globals_defs.html | 172 -- .../docs/globals_enum.html | 74 - .../docs/globals_eval.html | 77 - .../docs/globals_func.html | 115 - .../docs/globals_type.html | 74 - .../docs/globals_vars.html | 77 - .../docs/group___b_m_e680.html | 73 - lib/Adafruit_BME680-1.0.5/docs/index.html | 73 - lib/Adafruit_BME680-1.0.5/docs/jquery.js | 87 - .../docs/md__r_e_a_d_m_e.html | 80 - lib/Adafruit_BME680-1.0.5/docs/menu.js | 26 - lib/Adafruit_BME680-1.0.5/docs/menudata.js | 12 - lib/Adafruit_BME680-1.0.5/docs/modules.html | 78 - lib/Adafruit_BME680-1.0.5/docs/nav_f.png | Bin 153 -> 0 bytes lib/Adafruit_BME680-1.0.5/docs/nav_g.png | Bin 95 -> 0 bytes lib/Adafruit_BME680-1.0.5/docs/nav_h.png | Bin 98 -> 0 bytes lib/Adafruit_BME680-1.0.5/docs/open.png | Bin 123 -> 0 bytes lib/Adafruit_BME680-1.0.5/docs/pages.html | 78 - .../docs/search/all_0.html | 26 - .../docs/search/all_0.js | 4 - .../docs/search/all_1.html | 26 - .../docs/search/all_1.js | 4 - .../docs/search/all_10.html | 26 - .../docs/search/all_10.js | 4 - .../docs/search/all_2.html | 26 - .../docs/search/all_2.js | 4 - .../docs/search/all_3.html | 26 - .../docs/search/all_3.js | 4 - .../docs/search/all_4.html | 26 - .../docs/search/all_4.js | 5 - .../docs/search/all_5.html | 26 - .../docs/search/all_5.js | 9 - .../docs/search/all_6.html | 26 - .../docs/search/all_6.js | 8 - .../docs/search/all_7.html | 26 - .../docs/search/all_7.js | 4 - .../docs/search/all_8.html | 26 - .../docs/search/all_8.js | 5 - .../docs/search/all_9.html | 26 - .../docs/search/all_9.js | 5 - .../docs/search/all_a.html | 26 - .../docs/search/all_a.js | 6 - .../docs/search/all_b.html | 26 - .../docs/search/all_b.js | 28 - .../docs/search/all_c.html | 26 - .../docs/search/all_c.js | 10 - .../docs/search/all_d.html | 26 - .../docs/search/all_d.js | 8 - .../docs/search/all_e.html | 26 - .../docs/search/all_e.js | 6 - .../docs/search/all_f.html | 26 - .../docs/search/all_f.js | 4 - .../docs/search/classes_0.html | 26 - .../docs/search/classes_0.js | 4 - .../docs/search/classes_1.html | 26 - .../docs/search/classes_1.js | 8 - .../docs/search/close.png | Bin 273 -> 0 bytes .../docs/search/defines_0.html | 26 - .../docs/search/defines_0.js | 36 - .../docs/search/enums_0.html | 26 - .../docs/search/enums_0.js | 4 - .../docs/search/enumvalues_0.html | 26 - .../docs/search/enumvalues_0.js | 5 - .../docs/search/files_0.html | 26 - .../docs/search/files_0.js | 4 - .../docs/search/functions_0.html | 26 - .../docs/search/functions_0.js | 4 - .../docs/search/functions_1.html | 26 - .../docs/search/functions_1.js | 4 - .../docs/search/functions_2.html | 26 - .../docs/search/functions_2.js | 4 - .../docs/search/functions_3.html | 26 - .../docs/search/functions_3.js | 8 - .../docs/search/functions_4.html | 26 - .../docs/search/functions_4.js | 8 - .../docs/search/groups_0.html | 26 - .../docs/search/groups_0.js | 4 - .../docs/search/mag_sel.png | Bin 563 -> 0 bytes .../docs/search/nomatches.html | 12 - .../docs/search/pages_0.html | 26 - .../docs/search/pages_0.js | 4 - .../docs/search/search.css | 271 -- .../docs/search/search.js | 791 ------ .../docs/search/search_l.png | Bin 604 -> 0 bytes .../docs/search/search_m.png | Bin 158 -> 0 bytes .../docs/search/search_r.png | Bin 612 -> 0 bytes .../docs/search/searchdata.js | 27 - .../docs/search/typedefs_0.html | 26 - .../docs/search/typedefs_0.js | 4 - .../docs/search/variables_0.html | 26 - .../docs/search/variables_0.js | 4 - .../docs/search/variables_1.html | 26 - .../docs/search/variables_1.js | 4 - .../docs/search/variables_2.html | 26 - .../docs/search/variables_2.js | 4 - .../docs/search/variables_3.html | 26 - .../docs/search/variables_3.js | 4 - .../docs/search/variables_4.html | 26 - .../docs/search/variables_4.js | 6 - .../docs/search/variables_5.html | 26 - .../docs/search/variables_5.js | 7 - .../docs/search/variables_6.html | 26 - .../docs/search/variables_6.js | 5 - .../docs/search/variables_7.html | 26 - .../docs/search/variables_7.js | 5 - .../docs/search/variables_8.html | 26 - .../docs/search/variables_8.js | 5 - .../docs/search/variables_9.html | 26 - .../docs/search/variables_9.js | 6 - .../docs/search/variables_a.html | 26 - .../docs/search/variables_a.js | 28 - .../docs/search/variables_b.html | 26 - .../docs/search/variables_b.js | 8 - .../docs/search/variables_c.html | 26 - .../docs/search/variables_c.js | 4 - .../docs/search/variables_d.html | 26 - .../docs/search/variables_d.js | 6 - .../docs/search/variables_e.html | 26 - .../docs/search/variables_e.js | 4 - .../docs/search/variables_f.html | 26 - .../docs/search/variables_f.js | 4 - lib/Adafruit_BME680-1.0.5/docs/splitbar.png | Bin 314 -> 0 bytes .../structbme680__calib__data-members.html | 103 - .../docs/structbme680__calib__data.html | 550 ---- .../docs/structbme680__dev-members.html | 91 - .../docs/structbme680__dev.html | 346 --- .../structbme680__field__data-members.html | 83 - .../docs/structbme680__field__data.html | 210 -- .../docs/structbme680__gas__sett-members.html | 81 - .../docs/structbme680__gas__sett.html | 176 -- .../docs/structbme680__tph__sett-members.html | 80 - .../docs/structbme680__tph__sett.html | 159 -- lib/Adafruit_BME680-1.0.5/docs/sync_off.png | Bin 853 -> 0 bytes lib/Adafruit_BME680-1.0.5/docs/sync_on.png | Bin 845 -> 0 bytes lib/Adafruit_BME680-1.0.5/docs/tab_a.png | Bin 142 -> 0 bytes lib/Adafruit_BME680-1.0.5/docs/tab_b.png | Bin 169 -> 0 bytes lib/Adafruit_BME680-1.0.5/docs/tab_h.png | Bin 177 -> 0 bytes lib/Adafruit_BME680-1.0.5/docs/tab_s.png | Bin 184 -> 0 bytes lib/Adafruit_BME680-1.0.5/docs/tabs.css | 1 - .../examples/bme680oled/bme680oled.ino | 88 - .../examples/bme680test/bme680test.ino | 79 - lib/Adafruit_BME680-1.0.5/library.properties | 9 - .../Adafruit_Sensor.h | 154 - lib/Adafruit_Sensor-1.0.2.02/README.md | 221 -- .../library.properties | 9 - lib/BME680_driver-bme680_v3.5.9/LICENSE | 39 + lib/BME680_driver-bme680_v3.5.9/README.md | 282 ++ .../Self test/bme680_selftest.c | 187 ++ .../Self test/bme680_selftest.h | 88 + .../bme680.c | 297 +- .../bme680.h | 4 +- .../bme680_defs.h | 55 +- sonoff/_releasenotes.ino | 1 + sonoff/sonoff.ino | 2 + sonoff/sonoff_template.h | 24 +- sonoff/support.ino | 27 + sonoff/xsns_09_bmp.ino | 120 +- 186 files changed, 1041 insertions(+), 14308 deletions(-) delete mode 100644 lib/Adafruit_BME680-1.0.5/.gitignore delete mode 100644 lib/Adafruit_BME680-1.0.5/Adafruit_BME680.cpp delete mode 100644 lib/Adafruit_BME680-1.0.5/Adafruit_BME680.h delete mode 100644 lib/Adafruit_BME680-1.0.5/Doxyfile delete mode 100644 lib/Adafruit_BME680-1.0.5/README.md delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/_adafruit___b_m_e680_8h_source.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/annotated.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/bc_s.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/bdwn.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/bme680_8c.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/bme680_8h.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/bme680_8h_source.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/bme680__defs_8h.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/bme680__defs_8h_source.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/class_adafruit___b_m_e680-members.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/class_adafruit___b_m_e680.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/classes.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/closed.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/doc.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/doxygen.css delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/doxygen.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/dynsections.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/files.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/folderclosed.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/folderopen.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/functions.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/functions_func.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/functions_vars.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/globals.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/globals_defs.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/globals_enum.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/globals_eval.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/globals_func.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/globals_type.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/globals_vars.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/group___b_m_e680.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/index.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/jquery.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/md__r_e_a_d_m_e.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/menu.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/menudata.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/modules.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/nav_f.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/nav_g.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/nav_h.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/open.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/pages.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_0.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_0.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_1.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_1.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_10.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_10.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_2.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_2.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_3.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_3.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_4.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_4.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_5.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_5.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_6.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_6.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_7.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_7.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_8.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_8.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_9.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_9.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_a.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_a.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_b.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_b.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_c.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_c.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_d.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_d.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_e.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_e.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_f.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/all_f.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/classes_0.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/classes_0.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/classes_1.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/classes_1.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/close.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/defines_0.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/defines_0.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/enums_0.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/enums_0.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/enumvalues_0.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/enumvalues_0.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/files_0.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/files_0.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/functions_0.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/functions_0.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/functions_1.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/functions_1.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/functions_2.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/functions_2.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/functions_3.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/functions_3.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/functions_4.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/functions_4.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/groups_0.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/groups_0.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/mag_sel.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/nomatches.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/pages_0.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/pages_0.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/search.css delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/search.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/search_l.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/search_m.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/search_r.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/searchdata.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/typedefs_0.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/typedefs_0.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_0.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_0.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_1.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_1.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_2.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_2.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_3.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_3.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_4.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_4.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_5.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_5.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_6.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_6.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_7.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_7.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_8.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_8.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_9.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_9.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_a.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_a.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_b.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_b.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_c.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_c.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_d.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_d.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_e.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_e.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_f.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/search/variables_f.js delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/splitbar.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/structbme680__calib__data-members.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/structbme680__calib__data.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/structbme680__dev-members.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/structbme680__dev.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/structbme680__field__data-members.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/structbme680__field__data.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/structbme680__gas__sett-members.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/structbme680__gas__sett.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/structbme680__tph__sett-members.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/structbme680__tph__sett.html delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/sync_off.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/sync_on.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/tab_a.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/tab_b.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/tab_h.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/tab_s.png delete mode 100644 lib/Adafruit_BME680-1.0.5/docs/tabs.css delete mode 100644 lib/Adafruit_BME680-1.0.5/examples/bme680oled/bme680oled.ino delete mode 100644 lib/Adafruit_BME680-1.0.5/examples/bme680test/bme680test.ino delete mode 100644 lib/Adafruit_BME680-1.0.5/library.properties delete mode 100644 lib/Adafruit_Sensor-1.0.2.02/Adafruit_Sensor.h delete mode 100644 lib/Adafruit_Sensor-1.0.2.02/README.md delete mode 100644 lib/Adafruit_Sensor-1.0.2.02/library.properties create mode 100644 lib/BME680_driver-bme680_v3.5.9/LICENSE create mode 100644 lib/BME680_driver-bme680_v3.5.9/README.md create mode 100644 lib/BME680_driver-bme680_v3.5.9/Self test/bme680_selftest.c create mode 100644 lib/BME680_driver-bme680_v3.5.9/Self test/bme680_selftest.h rename lib/{Adafruit_BME680-1.0.5 => BME680_driver-bme680_v3.5.9}/bme680.c (80%) rename lib/{Adafruit_BME680-1.0.5 => BME680_driver-bme680_v3.5.9}/bme680.h (99%) rename lib/{Adafruit_BME680-1.0.5 => BME680_driver-bme680_v3.5.9}/bme680_defs.h (92%) diff --git a/lib/Adafruit_BME680-1.0.5/.gitignore b/lib/Adafruit_BME680-1.0.5/.gitignore deleted file mode 100644 index b25c15b81..000000000 --- a/lib/Adafruit_BME680-1.0.5/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*~ diff --git a/lib/Adafruit_BME680-1.0.5/Adafruit_BME680.cpp b/lib/Adafruit_BME680-1.0.5/Adafruit_BME680.cpp deleted file mode 100644 index 089065994..000000000 --- a/lib/Adafruit_BME680-1.0.5/Adafruit_BME680.cpp +++ /dev/null @@ -1,605 +0,0 @@ -/*************************************************************************** - This is a library for the BME680 humidity, temperature & pressure sensor - - Designed specifically to work with the Adafruit BME680 Breakout - ----> http://www.adafruit.com/products/2650 - - These sensors use I2C or SPI to communicate, 2 or 4 pins are required - to interface. - - Adafruit invests time and resources providing this open source code, - please support Adafruit andopen-source hardware by purchasing products - from Adafruit! - - Written by Limor Fried & Kevin Townsend for Adafruit Industries. - BSD license, all text above must be included in any redistribution - ***************************************************************************/ -#include "Arduino.h" -#include "Adafruit_BME680.h" - -//#define BME680_DEBUG - -// must be global in order to work with underlying library -int8_t _BME680_SoftwareSPI_MOSI, _BME680_SoftwareSPI_MISO, _BME680_SoftwareSPI_SCK; - -// Our hardware interface functions -static int8_t i2c_write(uint8_t dev_id, uint8_t reg_addr, uint8_t *reg_data, uint16_t len); -static int8_t i2c_read(uint8_t dev_id, uint8_t reg_addr, uint8_t *reg_data, uint16_t len); -static int8_t spi_read(uint8_t dev_id, uint8_t reg_addr, uint8_t *reg_data, uint16_t len); -static int8_t spi_write(uint8_t dev_id, uint8_t reg_addr, uint8_t *reg_data, uint16_t len); -static uint8_t spi_transfer(uint8_t x); -static void delay_msec(uint32_t ms); - -/*************************************************************************** - PUBLIC FUNCTIONS - ***************************************************************************/ - -/**************************************************************************/ -/*! - @brief Instantiates sensor with Hardware SPI or I2C. - @param cspin SPI chip select. If not passed in, I2C will be used -*/ -/**************************************************************************/ -Adafruit_BME680::Adafruit_BME680(int8_t cspin) - : _cs(cspin) -{ - _BME680_SoftwareSPI_MOSI = -1; - _BME680_SoftwareSPI_MISO = -1; - _BME680_SoftwareSPI_SCK = -1; - _filterEnabled = _tempEnabled = _humEnabled = _presEnabled = _gasEnabled = false; -} - - -/**************************************************************************/ -/*! - @brief Instantiates sensor with Software (bit-bang) SPI. - @param cspin SPI chip select - @param mosipin SPI MOSI (Data from microcontroller to sensor) - @param misopin SPI MISO (Data to microcontroller from sensor) - @param sckpin SPI Clock -*/ -/**************************************************************************/ -Adafruit_BME680::Adafruit_BME680(int8_t cspin, int8_t mosipin, int8_t misopin, int8_t sckpin) - : _cs(cspin) -{ - _BME680_SoftwareSPI_MOSI = mosipin; - _BME680_SoftwareSPI_MISO = misopin; - _BME680_SoftwareSPI_SCK = sckpin; - _filterEnabled = _tempEnabled = _humEnabled = _presEnabled = _gasEnabled = false; -} - - - -/**************************************************************************/ -/*! - @brief Initializes the sensor - - Hardware ss initialized, verifies it is in the I2C or SPI bus, then reads - calibration data in preparation for sensor reads. - - @param addr Optional parameter for the I2C address of BME680. Default is 0x77 - @return True on sensor initialization success. False on failure. -*/ -/**************************************************************************/ -bool Adafruit_BME680::begin(uint8_t addr) { - _i2caddr = addr; - - if (_cs == -1) { - // i2c - Wire.begin(); - - gas_sensor.dev_id = addr; - gas_sensor.intf = BME680_I2C_INTF; - gas_sensor.read = &i2c_read; - gas_sensor.write = &i2c_write; - } else { - digitalWrite(_cs, HIGH); - pinMode(_cs, OUTPUT); - - if (_BME680_SoftwareSPI_SCK == -1) { - // hardware SPI - SPI.begin(); - } else { - // software SPI - pinMode(_BME680_SoftwareSPI_SCK, OUTPUT); - pinMode(_BME680_SoftwareSPI_MOSI, OUTPUT); - pinMode(_BME680_SoftwareSPI_MISO, INPUT); - } - - gas_sensor.dev_id = _cs; - gas_sensor.intf = BME680_SPI_INTF; - gas_sensor.read = &spi_read; - gas_sensor.write = &spi_write; - } - - gas_sensor.delay_ms = delay_msec; - - int8_t rslt = BME680_OK; - rslt = bme680_init(&gas_sensor); -#ifdef BME680_DEBUG - Serial.print("Result: "); Serial.println(rslt); -#endif - - if (rslt != BME680_OK) - return false; - -#ifdef BME680_DEBUG - Serial.print("T1 = "); Serial.println(gas_sensor.calib.par_t1); - Serial.print("T2 = "); Serial.println(gas_sensor.calib.par_t2); - Serial.print("T3 = "); Serial.println(gas_sensor.calib.par_t3); - Serial.print("P1 = "); Serial.println(gas_sensor.calib.par_p1); - Serial.print("P2 = "); Serial.println(gas_sensor.calib.par_p2); - Serial.print("P3 = "); Serial.println(gas_sensor.calib.par_p3); - Serial.print("P4 = "); Serial.println(gas_sensor.calib.par_p4); - Serial.print("P5 = "); Serial.println(gas_sensor.calib.par_p5); - Serial.print("P6 = "); Serial.println(gas_sensor.calib.par_p6); - Serial.print("P7 = "); Serial.println(gas_sensor.calib.par_p7); - Serial.print("P8 = "); Serial.println(gas_sensor.calib.par_p8); - Serial.print("P9 = "); Serial.println(gas_sensor.calib.par_p9); - Serial.print("P10 = "); Serial.println(gas_sensor.calib.par_p10); - Serial.print("H1 = "); Serial.println(gas_sensor.calib.par_h1); - Serial.print("H2 = "); Serial.println(gas_sensor.calib.par_h2); - Serial.print("H3 = "); Serial.println(gas_sensor.calib.par_h3); - Serial.print("H4 = "); Serial.println(gas_sensor.calib.par_h4); - Serial.print("H5 = "); Serial.println(gas_sensor.calib.par_h5); - Serial.print("H6 = "); Serial.println(gas_sensor.calib.par_h6); - Serial.print("H7 = "); Serial.println(gas_sensor.calib.par_h7); - Serial.print("G1 = "); Serial.println(gas_sensor.calib.par_gh1); - Serial.print("G2 = "); Serial.println(gas_sensor.calib.par_gh2); - Serial.print("G3 = "); Serial.println(gas_sensor.calib.par_gh3); - Serial.print("G1 = "); Serial.println(gas_sensor.calib.par_gh1); - Serial.print("G2 = "); Serial.println(gas_sensor.calib.par_gh2); - Serial.print("G3 = "); Serial.println(gas_sensor.calib.par_gh3); - Serial.print("Heat Range = "); Serial.println(gas_sensor.calib.res_heat_range); - Serial.print("Heat Val = "); Serial.println(gas_sensor.calib.res_heat_val); - Serial.print("SW Error = "); Serial.println(gas_sensor.calib.range_sw_err); -#endif - - setTemperatureOversampling(BME680_OS_8X); - setHumidityOversampling(BME680_OS_2X); - setPressureOversampling(BME680_OS_4X); - setIIRFilterSize(BME680_FILTER_SIZE_3); - setGasHeater(320, 150); // 320*C for 150 ms - - // don't do anything till we request a reading - gas_sensor.power_mode = BME680_FORCED_MODE; - - return true; -} - - - -/**************************************************************************/ -/*! - @brief Performs a reading and returns the ambient temperature. - @return Temperature in degrees Centigrade -*/ -/**************************************************************************/ -float Adafruit_BME680::readTemperature(void) { - performReading(); - return temperature; -} - - -/**************************************************************************/ -/*! - @brief Performs a reading and returns the barometric pressure. - @return Barometic pressure in Pascals -*/ -/**************************************************************************/ -float Adafruit_BME680::readPressure(void) { - performReading(); - return pressure; -} - - -/**************************************************************************/ -/*! - @brief Performs a reading and returns the relative humidity. - @return Relative humidity as floating point -*/ -/**************************************************************************/ -float Adafruit_BME680::readHumidity(void) { - performReading(); - return humidity; -} - -/**************************************************************************/ -/*! - @brief Calculates the resistance of the MOX gas sensor. - @return Resistance in Ohms -*/ -/**************************************************************************/ -uint32_t Adafruit_BME680::readGas(void) { - performReading(); - return gas_resistance; -} - - -/**************************************************************************/ -/*! - @brief Calculates the altitude (in meters). - - Reads the current atmostpheric pressure (in hPa) from the sensor and calculates - via the provided sea-level pressure (in hPa). - - @param seaLevel Sea-level pressure in hPa - @return Altitude in meters -*/ -/**************************************************************************/ -float Adafruit_BME680::readAltitude(float seaLevel) -{ - // Equation taken from BMP180 datasheet (page 16): - // http://www.adafruit.com/datasheets/BST-BMP180-DS000-09.pdf - - // Note that using the equation from wikipedia can give bad results - // at high altitude. See this thread for more information: - // http://forums.adafruit.com/viewtopic.php?f=22&t=58064 - - float atmospheric = readPressure() / 100.0F; - return 44330.0 * (1.0 - pow(atmospheric / seaLevel, 0.1903)); -} - -/**************************************************************************/ -/*! - @brief Performs a full reading of all 4 sensors in the BME680. - - Assigns the internal Adafruit_BME680#temperature, Adafruit_BME680#pressure, Adafruit_BME680#humidity - and Adafruit_BME680#gas_resistance member variables - - @return True on success, False on failure -*/ -/**************************************************************************/ -bool Adafruit_BME680::performReading(void) { - uint8_t set_required_settings = 0; - struct bme680_field_data data; - int8_t rslt; - - /* Select the power mode */ - /* Must be set before writing the sensor configuration */ - gas_sensor.power_mode = BME680_FORCED_MODE; - - /* Set the required sensor settings needed */ - if (_tempEnabled) - set_required_settings |= BME680_OST_SEL; - if (_humEnabled) - set_required_settings |= BME680_OSH_SEL; - if (_presEnabled) - set_required_settings |= BME680_OSP_SEL; - if (_filterEnabled) - set_required_settings |= BME680_FILTER_SEL; - if (_gasEnabled) - set_required_settings |= BME680_GAS_SENSOR_SEL; - - /* Set the desired sensor configuration */ - //Serial.println("Setting sensor settings"); - rslt = bme680_set_sensor_settings(set_required_settings, &gas_sensor); - if (rslt != BME680_OK) - return false; - - /* Set the power mode */ - //Serial.println("Setting power mode"); - rslt = bme680_set_sensor_mode(&gas_sensor); - if (rslt != BME680_OK) - return false; - - /* Get the total measurement duration so as to sleep or wait till the - * measurement is complete */ - uint16_t meas_period; - bme680_get_profile_dur(&meas_period, &gas_sensor); - //Serial.print("Waiting (ms) "); Serial.println(meas_period); - delay(meas_period * 2); /* Delay till the measurement is ready */ - - //Serial.print("t_fine = "); Serial.println(gas_sensor.calib.t_fine); - - //Serial.println("Getting sensor data"); - rslt = bme680_get_sensor_data(&data, &gas_sensor); - if (rslt != BME680_OK) - return false; - - if (_tempEnabled) { - //Serial.print("Temp: "); Serial.println(data.temperature / 100.0, 2); - temperature = data.temperature / 100.0; - } else { - temperature = NAN; - } - - if (_humEnabled) { - //Serial.print("Hum: "); Serial.println(data.humidity / 1000.0, 2); - humidity = data.humidity / 1000.0; - } else { - humidity = NAN; - } - - if (_presEnabled) { - //Serial.print("Pres: "); Serial.println(data.pressure / 100.0, 2); - pressure = data.pressure; - } else { - pressure = NAN; - } - - /* Avoid using measurements from an unstable heating setup */ - if (_gasEnabled) { - if (data.status & BME680_HEAT_STAB_MSK) { - //Serial.print("Gas resistance: "); Serial.println(data.gas_resistance); - gas_resistance = data.gas_resistance; - } else { - gas_resistance = 0; - //Serial.println("Gas reading unstable!"); - } - } - - return true; -} - -/**************************************************************************/ -/*! - @brief Enable and configure gas reading + heater - @param heaterTemp Desired temperature in degrees Centigrade - @param heaterTime Time to keep heater on in milliseconds - @return True on success, False on failure -*/ -/**************************************************************************/ -bool Adafruit_BME680::setGasHeater(uint16_t heaterTemp, uint16_t heaterTime) { - gas_sensor.gas_sett.heatr_temp = heaterTemp; - gas_sensor.gas_sett.heatr_dur = heaterTime; - - if ( (heaterTemp == 0) || (heaterTime == 0) ) { - // disabled! - gas_sensor.gas_sett.run_gas = BME680_DISABLE_GAS_MEAS; - _gasEnabled = false; - } else { - gas_sensor.gas_sett.run_gas = BME680_ENABLE_GAS_MEAS; - _gasEnabled = true; - } - return true; -} - - -/**************************************************************************/ -/*! - @brief Setter for Temperature oversampling - @param oversample Oversampling setting, can be BME680_OS_NONE (turn off Temperature reading), - BME680_OS_1X, BME680_OS_2X, BME680_OS_4X, BME680_OS_8X or BME680_OS_16X - @return True on success, False on failure -*/ -/**************************************************************************/ - -bool Adafruit_BME680::setTemperatureOversampling(uint8_t oversample) { - if (oversample > BME680_OS_16X) return false; - - gas_sensor.tph_sett.os_temp = oversample; - - if (oversample == BME680_OS_NONE) - _tempEnabled = false; - else - _tempEnabled = true; - - return true; -} - - -/**************************************************************************/ -/*! - @brief Setter for Humidity oversampling - @param oversample Oversampling setting, can be BME680_OS_NONE (turn off Humidity reading), - BME680_OS_1X, BME680_OS_2X, BME680_OS_4X, BME680_OS_8X or BME680_OS_16X - @return True on success, False on failure -*/ -/**************************************************************************/ - -bool Adafruit_BME680::setHumidityOversampling(uint8_t oversample) { - if (oversample > BME680_OS_16X) return false; - - gas_sensor.tph_sett.os_hum = oversample; - - if (oversample == BME680_OS_NONE) - _humEnabled = false; - else - _humEnabled = true; - - return true; -} - - -/**************************************************************************/ -/*! - @brief Setter for Pressure oversampling - @param oversample Oversampling setting, can be BME680_OS_NONE (turn off Pressure reading), - BME680_OS_1X, BME680_OS_2X, BME680_OS_4X, BME680_OS_8X or BME680_OS_16X - @return True on success, False on failure -*/ -/**************************************************************************/ -bool Adafruit_BME680::setPressureOversampling(uint8_t oversample) { - if (oversample > BME680_OS_16X) return false; - - gas_sensor.tph_sett.os_pres = oversample; - - if (oversample == BME680_OS_NONE) - _presEnabled = false; - else - _presEnabled = true; - - return true; -} - -/**************************************************************************/ -/*! - @brief Setter for IIR filter. - @param filtersize Size of the filter (in samples). Can be BME680_FILTER_SIZE_0 (no filtering), BME680_FILTER_SIZE_1, BME680_FILTER_SIZE_3, BME680_FILTER_SIZE_7, BME680_FILTER_SIZE_15, BME680_FILTER_SIZE_31, BME680_FILTER_SIZE_63, BME680_FILTER_SIZE_127 - @return True on success, False on failure - -*/ -/**************************************************************************/ -bool Adafruit_BME680::setIIRFilterSize(uint8_t filtersize) { - if (filtersize > BME680_FILTER_SIZE_127) return false; - - gas_sensor.tph_sett.filter = filtersize; - - if (filtersize == BME680_FILTER_SIZE_0) - _filterEnabled = false; - else - _filterEnabled = true; - - return true; -} - -/**************************************************************************/ -/*! - @brief Reads 8 bit values over I2C -*/ -/**************************************************************************/ -int8_t i2c_read(uint8_t dev_id, uint8_t reg_addr, uint8_t *reg_data, uint16_t len) { -#ifdef BME680_DEBUG - Serial.print("\tI2C $"); Serial.print(reg_addr, HEX); Serial.print(" => "); -#endif - - Wire.beginTransmission((uint8_t)dev_id); - Wire.write((uint8_t)reg_addr); - Wire.endTransmission(); - if (len != Wire.requestFrom((uint8_t)dev_id, (byte)len)) { -#ifdef BME680_DEBUG - Serial.print("Failed to read "); Serial.print(len); Serial.print(" bytes from "); Serial.println(dev_id, HEX); -#endif - return 1; - } - while (len--) { - *reg_data = (uint8_t)Wire.read(); -#ifdef BME680_DEBUG - Serial.print("0x"); Serial.print(*reg_data, HEX); Serial.print(", "); -#endif - reg_data++; - } -#ifdef BME680_DEBUG - Serial.println(""); -#endif - return 0; -} - -/**************************************************************************/ -/*! - @brief Writes 8 bit values over I2C -*/ -/**************************************************************************/ -int8_t i2c_write(uint8_t dev_id, uint8_t reg_addr, uint8_t *reg_data, uint16_t len) { -#ifdef BME680_DEBUG - Serial.print("\tI2C $"); Serial.print(reg_addr, HEX); Serial.print(" <= "); -#endif - Wire.beginTransmission((uint8_t)dev_id); - Wire.write((uint8_t)reg_addr); - while (len--) { - Wire.write(*reg_data); -#ifdef BME680_DEBUG - Serial.print("0x"); Serial.print(*reg_data, HEX); Serial.print(", "); -#endif - reg_data++; - } - Wire.endTransmission(); -#ifdef BME680_DEBUG - Serial.println(""); -#endif - return 0; -} - - - -/**************************************************************************/ -/*! - @brief Reads 8 bit values over SPI -*/ -/**************************************************************************/ -static int8_t spi_read(uint8_t cspin, uint8_t reg_addr, uint8_t *reg_data, uint16_t len) { -#ifdef BME680_DEBUG - Serial.print("\tSPI $"); Serial.print(reg_addr, HEX); Serial.print(" => "); -#endif - - digitalWrite(cspin, LOW); - - // If hardware SPI we should use transactions! - if (_BME680_SoftwareSPI_SCK == -1) { - SPI.beginTransaction(SPISettings(BME680_DEFAULT_SPIFREQ, MSBFIRST, SPI_MODE0)); - } - - spi_transfer(reg_addr); - - while (len--) { - *reg_data = spi_transfer(0x00); -#ifdef BME680_DEBUG - Serial.print("0x"); Serial.print(*reg_data, HEX); Serial.print(", "); -#endif - reg_data++; - } - - if (_BME680_SoftwareSPI_SCK == -1) { - SPI.endTransaction(); - } - - digitalWrite(cspin, HIGH); - -#ifdef BME680_DEBUG - Serial.println(""); -#endif - return 0; -} - -/**************************************************************************/ -/*! - @brief Writes 8 bit values over SPI -*/ -/**************************************************************************/ -static int8_t spi_write(uint8_t cspin, uint8_t reg_addr, uint8_t *reg_data, uint16_t len) { -#ifdef BME680_DEBUG - Serial.print("\tSPI $"); Serial.print(reg_addr, HEX); Serial.print(" <= "); -#endif - - digitalWrite(cspin, LOW); - - // If hardware SPI we should use transactions! - if (_BME680_SoftwareSPI_SCK == -1) { - SPI.beginTransaction(SPISettings(BME680_DEFAULT_SPIFREQ, MSBFIRST, SPI_MODE0)); - } - - spi_transfer(reg_addr); - while (len--) { - spi_transfer(*reg_data); -#ifdef BME680_DEBUG - Serial.print("0x"); Serial.print(*reg_data, HEX); Serial.print(", "); -#endif - reg_data++; - } - - if (_BME680_SoftwareSPI_SCK == -1) { - SPI.endTransaction(); - } - - digitalWrite(cspin, HIGH); - -#ifdef BME680_DEBUG - Serial.println(""); -#endif - return 0; -} - - -static uint8_t spi_transfer(uint8_t x) { - if (_BME680_SoftwareSPI_SCK == -1) - return SPI.transfer(x); - - // software spi - //Serial.println("Software SPI"); - uint8_t reply = 0; - for (int i=7; i>=0; i--) { - reply <<= 1; - digitalWrite(_BME680_SoftwareSPI_SCK, LOW); - digitalWrite(_BME680_SoftwareSPI_MOSI, x & (1< http://www.adafruit.com/products/XXXX - - These sensors use I2C or SPI to communicate, 2 or 4 pins are required - to interface. - - Adafruit invests time and resources providing this open source code, - please support Adafruit andopen-source hardware by purchasing products - from Adafruit! - - Written by Limor Fried & Kevin Townsend for Adafruit Industries. - BSD license, all text above must be included in any redistribution - ***************************************************************************/ -#ifndef __BME680_H__ -#define __BME680_H__ - -#if (ARDUINO >= 100) - #include "Arduino.h" -#else - #include "WProgram.h" -#endif -#include -#include -#include -#include -#include "bme680.h" - - -/*========================================================================= - I2C ADDRESS/BITS - -----------------------------------------------------------------------*/ -#define BME680_DEFAULT_ADDRESS (0x77) -/*=========================================================================*/ -#define BME680_DEFAULT_SPIFREQ (1000000) - - - -/* -class Adafruit_BME680_Unified : public Adafruit_Sensor -{ -public: - Adafruit_BME680_Unified(int32_t sensorID = -1); - - bool begin(uint8_t addr = BME680_ADDRESS); - void getTemperature(float *temp); - void getPressure(float *pressure); - float pressureToAltitude(float seaLevel, float atmospheric, float temp); - float seaLevelForAltitude(float altitude, float atmospheric, float temp); - void getEvent(sensors_event_t*); - void getSensor(sensor_t*); - - private: - uint8_t _i2c_addr; - int32_t _sensorID; -}; - -*/ - -/** Adafruit_BME680 Class for both I2C and SPI usage. - * Wraps the Bosch library for Arduino usage - */ - -class Adafruit_BME680 -{ - public: - Adafruit_BME680(int8_t cspin = -1); - Adafruit_BME680(int8_t cspin, int8_t mosipin, int8_t misopin, int8_t sckpin); - - bool begin(uint8_t addr = BME680_DEFAULT_ADDRESS); - float readTemperature(void); - float readPressure(void); - float readHumidity(void); - uint32_t readGas(void); - float readAltitude(float seaLevel); - - bool setTemperatureOversampling(uint8_t os); - bool setPressureOversampling(uint8_t os); - bool setHumidityOversampling(uint8_t os); - bool setIIRFilterSize(uint8_t fs); - bool setGasHeater(uint16_t heaterTemp, uint16_t heaterTime); - - bool performReading(void); - - /// Temperature (Celsius) assigned after calling performReading() - float temperature; - /// Pressure (Pascals) assigned after calling performReading() - float pressure; - /// Humidity (RH %) assigned after calling performReading() - float humidity; - /// Gas resistor (ohms) assigned after calling performReading() - float gas_resistance; - private: - - bool _filterEnabled, _tempEnabled, _humEnabled, _presEnabled, _gasEnabled; - uint8_t _i2caddr; - int32_t _sensorID; - int8_t _cs; - - uint8_t spixfer(uint8_t x); - - struct bme680_dev gas_sensor; -}; - -#endif diff --git a/lib/Adafruit_BME680-1.0.5/Doxyfile b/lib/Adafruit_BME680-1.0.5/Doxyfile deleted file mode 100644 index f21c9d41d..000000000 --- a/lib/Adafruit_BME680-1.0.5/Doxyfile +++ /dev/null @@ -1,2492 +0,0 @@ -# Doxyfile 1.8.13 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project. -# -# All text after a double hash (##) is considered a comment and is placed in -# front of the TAG it is preceding. -# -# All text after a single hash (#) is considered a comment and will be ignored. -# The format is: -# TAG = value [value, ...] -# For lists, items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (\" \"). - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all text -# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. -# The default value is: UTF-8. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by -# double-quotes, unless you are using Doxywizard) that should identify the -# project for which the documentation is generated. This name is used in the -# title of most generated pages and in a few other places. -# The default value is: My Project. - -PROJECT_NAME = "Adafruit BME680 Library" - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. This -# could be handy for archiving the generated documentation or if some version -# control system is used. - -PROJECT_NUMBER = - -# Using the PROJECT_BRIEF tag one can provide an optional one line description -# for a project that appears at the top of each page and should give viewer a -# quick idea about the purpose of the project. Keep the description short. - -PROJECT_BRIEF = - -# With the PROJECT_LOGO tag one can specify a logo or an icon that is included -# in the documentation. The maximum height of the logo should not exceed 55 -# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy -# the logo to the output directory. - -PROJECT_LOGO = - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path -# into which the generated documentation will be written. If a relative path is -# entered, it will be relative to the location where doxygen was started. If -# left blank the current directory will be used. - -OUTPUT_DIRECTORY = - -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this -# option can be useful when feeding doxygen a huge amount of source files, where -# putting all generated files in the same directory would otherwise causes -# performance problems for the file system. -# The default value is: NO. - -CREATE_SUBDIRS = NO - -# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII -# characters to appear in the names of generated files. If set to NO, non-ASCII -# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode -# U+3044. -# The default value is: NO. - -ALLOW_UNICODE_NAMES = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. -# The default value is: English. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member -# descriptions after the members that are listed in the file and class -# documentation (similar to Javadoc). Set to NO to disable this. -# The default value is: YES. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief -# description of a member or function before the detailed description -# -# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. -# The default value is: YES. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator that is -# used to form the text in various listings. Each string in this list, if found -# as the leading text of the brief description, will be stripped from the text -# and the result, after processing the whole list, is used as the annotated -# text. Otherwise, the brief description is used as-is. If left blank, the -# following values are used ($name is automatically replaced with the name of -# the entity):The $name class, The $name widget, The $name file, is, provides, -# specifies, contains, represents, a, an and the. - -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# doxygen will generate a detailed section even if there is only a brief -# description. -# The default value is: NO. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. -# The default value is: NO. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path -# before files name in the file list and in the header files. If set to NO the -# shortest path that makes the file name unique will be used -# The default value is: YES. - -FULL_PATH_NAMES = YES - -# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. -# Stripping is only done if one of the specified strings matches the left-hand -# part of the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the path to -# strip. -# -# Note that you can specify absolute paths here, but also relative paths, which -# will be relative from the directory where doxygen is started. -# This tag requires that the tag FULL_PATH_NAMES is set to YES. - -STRIP_FROM_PATH = - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the -# path mentioned in the documentation of a class, which tells the reader which -# header file to include in order to use a class. If left blank only the name of -# the header file containing the class definition is used. Otherwise one should -# specify the list of include paths that are normally passed to the compiler -# using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but -# less readable) file names. This can be useful is your file systems doesn't -# support long names like on DOS, Mac, or CD-ROM. -# The default value is: NO. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the -# first line (until the first dot) of a Javadoc-style comment as the brief -# description. If set to NO, the Javadoc-style will behave just like regular Qt- -# style comments (thus requiring an explicit @brief command for a brief -# description.) -# The default value is: NO. - -JAVADOC_AUTOBRIEF = NO - -# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first -# line (until the first dot) of a Qt-style comment as the brief description. If -# set to NO, the Qt-style will behave just like regular Qt-style comments (thus -# requiring an explicit \brief command for a brief description.) -# The default value is: NO. - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a -# multi-line C++ special comment block (i.e. a block of //! or /// comments) as -# a brief description. This used to be the default behavior. The new default is -# to treat a multi-line C++ comment block as a detailed description. Set this -# tag to YES if you prefer the old behavior instead. -# -# Note that setting this tag to YES also means that rational rose comments are -# not recognized any more. -# The default value is: NO. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the -# documentation from any documented member that it re-implements. -# The default value is: YES. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new -# page for each member. If set to NO, the documentation of a member will be part -# of the file/class/namespace that contains it. -# The default value is: NO. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen -# uses this value to replace tabs by spaces in code fragments. -# Minimum value: 1, maximum value: 16, default value: 4. - -TAB_SIZE = 4 - -# This tag can be used to specify a number of aliases that act as commands in -# the documentation. An alias has the form: -# name=value -# For example adding -# "sideeffect=@par Side Effects:\n" -# will allow you to put the command \sideeffect (or @sideeffect) in the -# documentation, which will result in a user-defined paragraph with heading -# "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. - -ALIASES = - -# This tag can be used to specify a number of word-keyword mappings (TCL only). -# A mapping has the form "name=value". For example adding "class=itcl::class" -# will allow you to use the command class in the itcl::class meaning. - -TCL_SUBST = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources -# only. Doxygen will then generate output that is more tailored for C. For -# instance, some of the names that are used will be different. The list of all -# members will be omitted, etc. -# The default value is: NO. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or -# Python sources only. Doxygen will then generate output that is more tailored -# for that language. For instance, namespaces will be presented as packages, -# qualified scopes will look different, etc. -# The default value is: NO. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources. Doxygen will then generate output that is tailored for Fortran. -# The default value is: NO. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for VHDL. -# The default value is: NO. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Doxygen selects the parser to use depending on the extension of the files it -# parses. With this tag you can assign which parser to use for a given -# extension. Doxygen has a built-in mapping, but you can override or extend it -# using this tag. The format is ext=language, where ext is a file extension, and -# language is one of the parsers supported by doxygen: IDL, Java, Javascript, -# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: -# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: -# Fortran. In the later case the parser tries to guess whether the code is fixed -# or free formatted code, this is the default for Fortran type files), VHDL. For -# instance to make doxygen treat .inc files as Fortran files (default is PHP), -# and .f files as C (default is Fortran), use: inc=Fortran f=C. -# -# Note: For files without extension you can use no_extension as a placeholder. -# -# Note that for custom extensions you also need to set FILE_PATTERNS otherwise -# the files are not read by doxygen. - -EXTENSION_MAPPING = - -# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments -# according to the Markdown format, which allows for more readable -# documentation. See http://daringfireball.net/projects/markdown/ for details. -# The output of markdown processing is further processed by doxygen, so you can -# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in -# case of backward compatibilities issues. -# The default value is: YES. - -MARKDOWN_SUPPORT = YES - -# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up -# to that level are automatically included in the table of contents, even if -# they do not have an id attribute. -# Note: This feature currently applies only to Markdown headings. -# Minimum value: 0, maximum value: 99, default value: 0. -# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. - -TOC_INCLUDE_HEADINGS = 0 - -# When enabled doxygen tries to link words that correspond to documented -# classes, or namespaces to their corresponding documentation. Such a link can -# be prevented in individual cases by putting a % sign in front of the word or -# globally by setting AUTOLINK_SUPPORT to NO. -# The default value is: YES. - -AUTOLINK_SUPPORT = YES - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should set this -# tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); -# versus func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. -# The default value is: NO. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. -# The default value is: NO. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen -# will parse them like normal C++ but will assume all classes use public instead -# of private inheritance when no explicit protection keyword is present. -# The default value is: NO. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate -# getter and setter methods for a property. Setting this option to YES will make -# doxygen to replace the get and set methods by a property in the documentation. -# This will only work if the methods are indeed getting or setting a simple -# type. If this is not the case, or you want to show the methods anyway, you -# should set this option to NO. -# The default value is: YES. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. -# The default value is: NO. - -DISTRIBUTE_GROUP_DOC = NO - -# If one adds a struct or class to a group and this option is enabled, then also -# any nested class or struct is added to the same group. By default this option -# is disabled and one has to add nested compounds explicitly via \ingroup. -# The default value is: NO. - -GROUP_NESTED_COMPOUNDS = NO - -# Set the SUBGROUPING tag to YES to allow class member groups of the same type -# (for instance a group of public functions) to be put as a subgroup of that -# type (e.g. under the Public Functions section). Set it to NO to prevent -# subgrouping. Alternatively, this can be done per class using the -# \nosubgrouping command. -# The default value is: YES. - -SUBGROUPING = YES - -# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions -# are shown inside the group in which they are included (e.g. using \ingroup) -# instead of on a separate page (for HTML and Man pages) or section (for LaTeX -# and RTF). -# -# Note that this feature does not work in combination with -# SEPARATE_MEMBER_PAGES. -# The default value is: NO. - -INLINE_GROUPED_CLASSES = NO - -# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions -# with only public data fields or simple typedef fields will be shown inline in -# the documentation of the scope in which they are defined (i.e. file, -# namespace, or group documentation), provided this scope is documented. If set -# to NO, structs, classes, and unions are shown on a separate page (for HTML and -# Man pages) or section (for LaTeX and RTF). -# The default value is: NO. - -INLINE_SIMPLE_STRUCTS = NO - -# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or -# enum is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically be -# useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. -# The default value is: NO. - -TYPEDEF_HIDES_STRUCT = NO - -# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This -# cache is used to resolve symbols given their name and scope. Since this can be -# an expensive process and often the same symbol appears multiple times in the -# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small -# doxygen will become slower. If the cache is too large, memory is wasted. The -# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range -# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 -# symbols. At the end of a run doxygen will report the cache usage and suggest -# the optimal cache size from a speed point of view. -# Minimum value: 0, maximum value: 9, default value: 0. - -LOOKUP_CACHE_SIZE = 0 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in -# documentation are documented, even if no documentation was available. Private -# class members and static file members will be hidden unless the -# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. -# Note: This will also disable the warnings about undocumented members that are -# normally produced when WARNINGS is set to YES. -# The default value is: NO. - -EXTRACT_ALL = NO - -# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will -# be included in the documentation. -# The default value is: NO. - -EXTRACT_PRIVATE = NO - -# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal -# scope will be included in the documentation. -# The default value is: NO. - -EXTRACT_PACKAGE = NO - -# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be -# included in the documentation. -# The default value is: NO. - -EXTRACT_STATIC = NO - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined -# locally in source files will be included in the documentation. If set to NO, -# only classes defined in header files are included. Does not have any effect -# for Java sources. -# The default value is: YES. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. If set to YES, local methods, -# which are defined in the implementation section but not in the interface are -# included in the documentation. If set to NO, only methods in the interface are -# included. -# The default value is: NO. - -EXTRACT_LOCAL_METHODS = NO - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base name of -# the file that contains the anonymous namespace. By default anonymous namespace -# are hidden. -# The default value is: NO. - -EXTRACT_ANON_NSPACES = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all -# undocumented members inside documented classes or files. If set to NO these -# members will be included in the various overviews, but no documentation -# section is generated. This option has no effect if EXTRACT_ALL is enabled. -# The default value is: NO. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. If set -# to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. -# The default value is: NO. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend -# (class|struct|union) declarations. If set to NO, these declarations will be -# included in the documentation. -# The default value is: NO. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any -# documentation blocks found inside the body of a function. If set to NO, these -# blocks will be appended to the function's detailed documentation block. -# The default value is: NO. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation that is typed after a -# \internal command is included. If the tag is set to NO then the documentation -# will be excluded. Set it to YES to include the internal documentation. -# The default value is: NO. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file -# names in lower-case letters. If set to YES, upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. -# The default value is: system dependent. - -CASE_SENSE_NAMES = NO - -# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with -# their full class and namespace scopes in the documentation. If set to YES, the -# scope will be hidden. -# The default value is: NO. - -HIDE_SCOPE_NAMES = NO - -# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will -# append additional text to a page's title, such as Class Reference. If set to -# YES the compound reference will be hidden. -# The default value is: NO. - -HIDE_COMPOUND_REFERENCE= NO - -# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of -# the files that are included by a file in the documentation of that file. -# The default value is: YES. - -SHOW_INCLUDE_FILES = YES - -# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each -# grouped member an include statement to the documentation, telling the reader -# which file to include in order to use the member. -# The default value is: NO. - -SHOW_GROUPED_MEMB_INC = NO - -# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include -# files with double quotes in the documentation rather than with sharp brackets. -# The default value is: NO. - -FORCE_LOCAL_INCLUDES = NO - -# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the -# documentation for inline members. -# The default value is: YES. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the -# (detailed) documentation of file and class members alphabetically by member -# name. If set to NO, the members will appear in declaration order. -# The default value is: YES. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief -# descriptions of file, namespace and class members alphabetically by member -# name. If set to NO, the members will appear in declaration order. Note that -# this will also influence the order of the classes in the class list. -# The default value is: NO. - -SORT_BRIEF_DOCS = NO - -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the -# (brief and detailed) documentation of class members so that constructors and -# destructors are listed first. If set to NO the constructors will appear in the -# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. -# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief -# member documentation. -# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting -# detailed member documentation. -# The default value is: NO. - -SORT_MEMBERS_CTORS_1ST = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy -# of group names into alphabetical order. If set to NO the group names will -# appear in their defined order. -# The default value is: NO. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by -# fully-qualified names, including namespaces. If set to NO, the class list will -# be sorted only by class name, not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the alphabetical -# list. -# The default value is: NO. - -SORT_BY_SCOPE_NAME = NO - -# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper -# type resolution of all parameters of a function it will reject a match between -# the prototype and the implementation of a member function even if there is -# only one candidate or it is obvious which candidate to choose by doing a -# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still -# accept a match between prototype and implementation in such cases. -# The default value is: NO. - -STRICT_PROTO_MATCHING = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo -# list. This list is created by putting \todo commands in the documentation. -# The default value is: YES. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test -# list. This list is created by putting \test commands in the documentation. -# The default value is: YES. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug -# list. This list is created by putting \bug commands in the documentation. -# The default value is: YES. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) -# the deprecated list. This list is created by putting \deprecated commands in -# the documentation. -# The default value is: YES. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional documentation -# sections, marked by \if ... \endif and \cond -# ... \endcond blocks. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the -# initial value of a variable or macro / define can have for it to appear in the -# documentation. If the initializer consists of more lines than specified here -# it will be hidden. Use a value of 0 to hide initializers completely. The -# appearance of the value of individual variables and macros / defines can be -# controlled using \showinitializer or \hideinitializer command in the -# documentation regardless of this setting. -# Minimum value: 0, maximum value: 10000, default value: 30. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at -# the bottom of the documentation of classes and structs. If set to YES, the -# list will mention the files that were used to generate the documentation. -# The default value is: YES. - -SHOW_USED_FILES = YES - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This -# will remove the Files entry from the Quick Index and from the Folder Tree View -# (if specified). -# The default value is: YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces -# page. This will remove the Namespaces entry from the Quick Index and from the -# Folder Tree View (if specified). -# The default value is: YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command command input-file, where command is the value of the -# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided -# by doxygen. Whatever the program writes to standard output is used as the file -# version. For an example see the documentation. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed -# by doxygen. The layout file controls the global structure of the generated -# output files in an output format independent way. To create the layout file -# that represents doxygen's defaults, run doxygen with the -l option. You can -# optionally specify a file name after the option, if omitted DoxygenLayout.xml -# will be used as the name of the layout file. -# -# Note that if you run doxygen from a directory containing a file called -# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE -# tag is left empty. - -LAYOUT_FILE = - -# The CITE_BIB_FILES tag can be used to specify one or more bib files containing -# the reference definitions. This must be a list of .bib files. The .bib -# extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. -# For LaTeX the style of the bibliography can be controlled using -# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the -# search path. See also \cite for info how to create references. - -CITE_BIB_FILES = - -#--------------------------------------------------------------------------- -# Configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated to -# standard output by doxygen. If QUIET is set to YES this implies that the -# messages are off. -# The default value is: NO. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES -# this implies that the warnings are on. -# -# Tip: Turn warnings on while writing the documentation. -# The default value is: YES. - -WARNINGS = YES - -# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate -# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag -# will automatically be disabled. -# The default value is: YES. - -WARN_IF_UNDOCUMENTED = YES - -# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some parameters -# in a documented function, or documenting parameters that don't exist or using -# markup commands wrongly. -# The default value is: YES. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that -# are documented, but have no documentation for their parameters or return -# value. If set to NO, doxygen will only warn about wrong or incomplete -# parameter documentation, but not about the absence of documentation. -# The default value is: NO. - -WARN_NO_PARAMDOC = NO - -# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when -# a warning is encountered. -# The default value is: NO. - -WARN_AS_ERROR = NO - -# The WARN_FORMAT tag determines the format of the warning messages that doxygen -# can produce. The string should contain the $file, $line, and $text tags, which -# will be replaced by the file and line number from which the warning originated -# and the warning text. Optionally the format may contain $version, which will -# be replaced by the version of the file (if it could be obtained via -# FILE_VERSION_FILTER) -# The default value is: $file:$line: $text. - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning and error -# messages should be written. If left blank the output is written to standard -# error (stderr). - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# Configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag is used to specify the files and/or directories that contain -# documented source files. You may enter file names like myfile.cpp or -# directories like /usr/src/myproject. Separate the files or directories with -# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING -# Note: If this tag is empty the current directory is searched. - -INPUT = - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses -# libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of -# possible encodings. -# The default value is: UTF-8. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and -# *.h) to filter out the source-files in the directories. -# -# Note that for custom extensions or not directly supported extensions you also -# need to set EXTENSION_MAPPING for the extension otherwise the files are not -# read by doxygen. -# -# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp, -# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, -# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, -# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, -# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf. - -FILE_PATTERNS = *.c \ - *.cc \ - *.cxx \ - *.cpp \ - *.c++ \ - *.java \ - *.ii \ - *.ixx \ - *.ipp \ - *.i++ \ - *.inl \ - *.idl \ - *.ddl \ - *.odl \ - *.h \ - *.hh \ - *.hxx \ - *.hpp \ - *.h++ \ - *.cs \ - *.d \ - *.php \ - *.php4 \ - *.php5 \ - *.phtml \ - *.inc \ - *.m \ - *.markdown \ - *.md \ - *.mm \ - *.dox \ - *.py \ - *.pyw \ - *.f90 \ - *.f95 \ - *.f03 \ - *.f08 \ - *.f \ - *.for \ - *.tcl \ - *.vhd \ - *.vhdl \ - *.ucf \ - *.qsf - -# The RECURSIVE tag can be used to specify whether or not subdirectories should -# be searched for input files as well. -# The default value is: NO. - -RECURSIVE = NO - -# The EXCLUDE tag can be used to specify files and/or directories that should be -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. -# -# Note that relative paths are relative to the directory from which doxygen is -# run. - -EXCLUDE = bme680.c bme680.h bme680_defs.h - -# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or -# directories that are symbolic links (a Unix file system feature) are excluded -# from the input. -# The default value is: NO. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. -# -# Note that the wildcards are matched against the file with absolute path, so to -# exclude all test directories for example use the pattern */test/* - -EXCLUDE_PATTERNS = - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test -# -# Note that the wildcards are matched against the file with absolute path, so to -# exclude all test directories use the pattern */test/* - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or directories -# that contain example code fragments that are included (see the \include -# command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and -# *.h) to filter out the source-files in the directories. If left blank all -# files are included. - -EXAMPLE_PATTERNS = * - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude commands -# irrespective of the value of the RECURSIVE tag. -# The default value is: NO. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or directories -# that contain images that are to be included in the documentation (see the -# \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command: -# -# -# -# where is the value of the INPUT_FILTER tag, and is the -# name of an input file. Doxygen will then use the output that the filter -# program writes to standard output. If FILTER_PATTERNS is specified, this tag -# will be ignored. -# -# Note that the filter must not add or remove lines; it is applied before the -# code is scanned, but not when the output code is generated. If lines are added -# or removed, the anchors will not be placed correctly. -# -# Note that for custom extensions or not directly supported extensions you also -# need to set EXTENSION_MAPPING for the extension otherwise the files are not -# properly processed by doxygen. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: pattern=filter -# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how -# filters are used. If the FILTER_PATTERNS tag is empty or if none of the -# patterns match the file name, INPUT_FILTER is applied. -# -# Note that for custom extensions or not directly supported extensions you also -# need to set EXTENSION_MAPPING for the extension otherwise the files are not -# properly processed by doxygen. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will also be used to filter the input files that are used for -# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). -# The default value is: NO. - -FILTER_SOURCE_FILES = NO - -# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file -# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and -# it is also possible to disable source filtering for a specific pattern using -# *.ext= (so without naming a filter). -# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. - -FILTER_SOURCE_PATTERNS = - -# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that -# is part of the input, its contents will be placed on the main page -# (index.html). This can be useful if you have a project on for instance GitHub -# and want to reuse the introduction page also for the doxygen output. - -USE_MDFILE_AS_MAINPAGE = - -#--------------------------------------------------------------------------- -# Configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will be -# generated. Documented entities will be cross-referenced with these sources. -# -# Note: To get rid of all source code in the generated output, make sure that -# also VERBATIM_HEADERS is set to NO. -# The default value is: NO. - -SOURCE_BROWSER = NO - -# Setting the INLINE_SOURCES tag to YES will include the body of functions, -# classes and enums directly into the documentation. -# The default value is: NO. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any -# special comment blocks from generated source code fragments. Normal C, C++ and -# Fortran comments will always remain visible. -# The default value is: YES. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES then for each documented -# function all documented functions referencing it will be listed. -# The default value is: NO. - -REFERENCED_BY_RELATION = NO - -# If the REFERENCES_RELATION tag is set to YES then for each documented function -# all documented entities called/used by that function will be listed. -# The default value is: NO. - -REFERENCES_RELATION = NO - -# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set -# to YES then the hyperlinks from functions in REFERENCES_RELATION and -# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will -# link to the documentation. -# The default value is: YES. - -REFERENCES_LINK_SOURCE = YES - -# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the -# source code will show a tooltip with additional information such as prototype, -# brief description and links to the definition and documentation. Since this -# will make the HTML file larger and loading of large files a bit slower, you -# can opt to disable this feature. -# The default value is: YES. -# This tag requires that the tag SOURCE_BROWSER is set to YES. - -SOURCE_TOOLTIPS = YES - -# If the USE_HTAGS tag is set to YES then the references to source code will -# point to the HTML generated by the htags(1) tool instead of doxygen built-in -# source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version -# 4.8.6 or higher. -# -# To use it do the following: -# - Install the latest version of global -# - Enable SOURCE_BROWSER and USE_HTAGS in the config file -# - Make sure the INPUT points to the root of the source tree -# - Run doxygen as normal -# -# Doxygen will invoke htags (and that will in turn invoke gtags), so these -# tools must be available from the command line (i.e. in the search path). -# -# The result: instead of the source browser generated by doxygen, the links to -# source code will now point to the output of htags. -# The default value is: NO. -# This tag requires that the tag SOURCE_BROWSER is set to YES. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a -# verbatim copy of the header file for each class for which an include is -# specified. Set to NO to disable this. -# See also: Section \class. -# The default value is: YES. - -VERBATIM_HEADERS = YES - -# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the -# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the -# cost of reduced performance. This can be particularly helpful with template -# rich C++ code for which doxygen's built-in parser lacks the necessary type -# information. -# Note: The availability of this option depends on whether or not doxygen was -# generated with the -Duse-libclang=ON option for CMake. -# The default value is: NO. - -CLANG_ASSISTED_PARSING = NO - -# If clang assisted parsing is enabled you can provide the compiler with command -# line options that you would normally use when invoking the compiler. Note that -# the include paths will already be set by doxygen for the files and directories -# specified with INPUT and INCLUDE_PATH. -# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. - -CLANG_OPTIONS = - -#--------------------------------------------------------------------------- -# Configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all -# compounds will be generated. Enable this if the project contains a lot of -# classes, structs, unions or interfaces. -# The default value is: YES. - -ALPHABETICAL_INDEX = YES - -# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in -# which the alphabetical index list will be split. -# Minimum value: 1, maximum value: 20, default value: 5. -# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. -# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output -# The default value is: YES. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a -# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of -# it. -# The default directory is: html. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_OUTPUT = docs - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each -# generated HTML page (for example: .htm, .php, .asp). -# The default value is: .html. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a user-defined HTML header file for -# each generated HTML page. If the tag is left blank doxygen will generate a -# standard header. -# -# To get valid HTML the header file that includes any scripts and style sheets -# that doxygen needs, which is dependent on the configuration options used (e.g. -# the setting GENERATE_TREEVIEW). It is highly recommended to start with a -# default header using -# doxygen -w html new_header.html new_footer.html new_stylesheet.css -# YourConfigFile -# and then modify the file new_header.html. See also section "Doxygen usage" -# for information on how to generate the default header that doxygen normally -# uses. -# Note: The header is subject to change so you typically have to regenerate the -# default header when upgrading to a newer version of doxygen. For a description -# of the possible markers and block names see the documentation. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each -# generated HTML page. If the tag is left blank doxygen will generate a standard -# footer. See HTML_HEADER for more information on how to generate a default -# footer and what special commands can be used inside the footer. See also -# section "Doxygen usage" for information on how to generate the default footer -# that doxygen normally uses. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style -# sheet that is used by each HTML page. It can be used to fine-tune the look of -# the HTML output. If left blank doxygen will generate a default style sheet. -# See also section "Doxygen usage" for information on how to generate the style -# sheet that doxygen normally uses. -# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as -# it is more robust and this tag (HTML_STYLESHEET) will in the future become -# obsolete. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_STYLESHEET = - -# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined -# cascading style sheets that are included after the standard style sheets -# created by doxygen. Using this option one can overrule certain style aspects. -# This is preferred over using HTML_STYLESHEET since it does not replace the -# standard style sheet and is therefore more robust against future updates. -# Doxygen will copy the style sheet files to the output directory. -# Note: The order of the extra style sheet files is of importance (e.g. the last -# style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_EXTRA_STYLESHEET = - -# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or -# other source files which should be copied to the HTML output directory. Note -# that these files will be copied to the base HTML output directory. Use the -# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these -# files. In the HTML_STYLESHEET file, use the file name only. Also note that the -# files will be copied as-is; there are no commands or markers available. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_EXTRA_FILES = - -# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen -# will adjust the colors in the style sheet and background images according to -# this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value -# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 -# purple, and 360 is red again. -# Minimum value: 0, maximum value: 359, default value: 220. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_HUE = 220 - -# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors -# in the HTML output. For a value of 0 the output will use grayscales only. A -# value of 255 will produce the most vivid colors. -# Minimum value: 0, maximum value: 255, default value: 100. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_SAT = 100 - -# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the -# luminance component of the colors in the HTML output. Values below 100 -# gradually make the output lighter, whereas values above 100 make the output -# darker. The value divided by 100 is the actual gamma applied, so 80 represents -# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not -# change the gamma. -# Minimum value: 40, maximum value: 240, default value: 80. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_GAMMA = 80 - -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting this -# to YES can help to show when doxygen was last run and thus if the -# documentation is up to date. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_TIMESTAMP = NO - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_DYNAMIC_SECTIONS = NO - -# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries -# shown in the various tree structured indices initially; the user can expand -# and collapse entries dynamically later on. Doxygen will expand the tree to -# such a level that at most the specified number of entries are visible (unless -# a fully collapsed tree already exceeds this amount). So setting the number of -# entries 1 will produce a full collapsed tree by default. 0 is a special value -# representing an infinite number of entries and will result in a full expanded -# tree by default. -# Minimum value: 0, maximum value: 9999, default value: 100. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_INDEX_NUM_ENTRIES = 100 - -# If the GENERATE_DOCSET tag is set to YES, additional index files will be -# generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with -# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a -# Makefile in the HTML output directory. Running make will produce the docset in -# that directory and running make install will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html -# for more information. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_DOCSET = NO - -# This tag determines the name of the docset feed. A documentation feed provides -# an umbrella under which multiple documentation sets from a single provider -# (such as a company or product suite) can be grouped. -# The default value is: Doxygen generated docs. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# This tag specifies a string that should uniquely identify the documentation -# set bundle. This should be a reverse domain-name style string, e.g. -# com.mycompany.MyDocSet. Doxygen will append .docset to the name. -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify -# the documentation publisher. This should be a reverse domain-name style -# string, e.g. com.mycompany.MyDocSet.documentation. -# The default value is: org.doxygen.Publisher. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_PUBLISHER_ID = org.doxygen.Publisher - -# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. -# The default value is: Publisher. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_PUBLISHER_NAME = Publisher - -# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three -# additional HTML index files: index.hhp, index.hhc, and index.hhk. The -# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop -# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on -# Windows. -# -# The HTML Help Workshop contains a compiler that can convert all HTML output -# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML -# files are now used as the Windows 98 help format, and will replace the old -# Windows help format (.hlp) on all Windows platforms in the future. Compressed -# HTML files also contain an index, a table of contents, and you can search for -# words in the documentation. The HTML workshop also contains a viewer for -# compressed HTML files. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_HTMLHELP = NO - -# The CHM_FILE tag can be used to specify the file name of the resulting .chm -# file. You can add a path in front of the file if the result should not be -# written to the html output directory. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -CHM_FILE = - -# The HHC_LOCATION tag can be used to specify the location (absolute path -# including file name) of the HTML help compiler (hhc.exe). If non-empty, -# doxygen will try to run the HTML help compiler on the generated index.hhp. -# The file has to be specified with full path. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -HHC_LOCATION = - -# The GENERATE_CHI flag controls if a separate .chi index file is generated -# (YES) or that it should be included in the master .chm file (NO). -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -GENERATE_CHI = NO - -# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) -# and project file content. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -CHM_INDEX_ENCODING = - -# The BINARY_TOC flag controls whether a binary table of contents is generated -# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it -# enables the Previous and Next buttons. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members to -# the table of contents of the HTML help documentation and to the tree view. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -TOC_EXPAND = NO - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and -# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that -# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help -# (.qch) of the generated HTML documentation. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_QHP = NO - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify -# the file name of the resulting .qch file. The path specified is relative to -# the HTML output folder. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help -# Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_NAMESPACE = org.doxygen.Project - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt -# Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). -# The default value is: doc. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_VIRTUAL_FOLDER = doc - -# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom -# filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_CUST_FILTER_NAME = - -# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the -# custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_CUST_FILTER_ATTRS = - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this -# project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_SECT_FILTER_ATTRS = - -# The QHG_LOCATION tag can be used to specify the location of Qt's -# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the -# generated .qhp file. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHG_LOCATION = - -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be -# generated, together with the HTML files, they form an Eclipse help plugin. To -# install this plugin and make it available under the help contents menu in -# Eclipse, the contents of the directory containing the HTML and XML files needs -# to be copied into the plugins directory of eclipse. The name of the directory -# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. -# After copying Eclipse needs to be restarted before the help appears. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_ECLIPSEHELP = NO - -# A unique identifier for the Eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have this -# name. Each documentation set should have its own identifier. -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. - -ECLIPSE_DOC_ID = org.doxygen.Project - -# If you want full control over the layout of the generated HTML pages it might -# be necessary to disable the index and replace it with your own. The -# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top -# of each HTML page. A value of NO enables the index and the value YES disables -# it. Since the tabs in the index contain the same information as the navigation -# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -DISABLE_INDEX = NO - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. If the tag -# value is set to YES, a side panel will be generated containing a tree-like -# index structure (just like the one that is generated for HTML Help). For this -# to work a browser that supports JavaScript, DHTML, CSS and frames is required -# (i.e. any modern browser). Windows users are probably better off using the -# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can -# further fine-tune the look of the index. As an example, the default style -# sheet generated by doxygen has an example that shows how to put an image at -# the root of the tree instead of the PROJECT_NAME. Since the tree basically has -# the same information as the tab index, you could consider setting -# DISABLE_INDEX to YES when enabling this option. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_TREEVIEW = NO - -# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that -# doxygen will group on one line in the generated HTML documentation. -# -# Note that a value of 0 will completely suppress the enum values from appearing -# in the overview section. -# Minimum value: 0, maximum value: 20, default value: 4. -# This tag requires that the tag GENERATE_HTML is set to YES. - -ENUM_VALUES_PER_LINE = 4 - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used -# to set the initial width (in pixels) of the frame in which the tree is shown. -# Minimum value: 0, maximum value: 1500, default value: 250. -# This tag requires that the tag GENERATE_HTML is set to YES. - -TREEVIEW_WIDTH = 250 - -# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to -# external symbols imported via tag files in a separate window. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -EXT_LINKS_IN_WINDOW = NO - -# Use this tag to change the font size of LaTeX formulas included as images in -# the HTML documentation. When you change the font size after a successful -# doxygen run you need to manually remove any form_*.png images from the HTML -# output directory to force them to be regenerated. -# Minimum value: 8, maximum value: 50, default value: 10. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_FONTSIZE = 10 - -# Use the FORMULA_TRANPARENT tag to determine whether or not the images -# generated for formulas are transparent PNGs. Transparent PNGs are not -# supported properly for IE 6.0, but are supported on all modern browsers. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - -# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering -# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX -# installed or if you want to formulas look prettier in the HTML output. When -# enabled you may also need to install MathJax separately and configure the path -# to it using the MATHJAX_RELPATH option. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -USE_MATHJAX = NO - -# When MathJax is enabled you can set the default output format to be used for -# the MathJax output. See the MathJax site (see: -# http://docs.mathjax.org/en/latest/output.html) for more details. -# Possible values are: HTML-CSS (which is slower, but has the best -# compatibility), NativeMML (i.e. MathML) and SVG. -# The default value is: HTML-CSS. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_FORMAT = HTML-CSS - -# When MathJax is enabled you need to specify the location relative to the HTML -# output directory using the MATHJAX_RELPATH option. The destination directory -# should contain the MathJax.js script. For instance, if the mathjax directory -# is located at the same level as the HTML output directory, then -# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax -# Content Delivery Network so you can quickly see the result without installing -# MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest - -# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax -# extension names that should be enabled during MathJax rendering. For example -# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_EXTENSIONS = - -# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces -# of code that will be used on startup of the MathJax code. See the MathJax site -# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an -# example see the documentation. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_CODEFILE = - -# When the SEARCHENGINE tag is enabled doxygen will generate a search box for -# the HTML output. The underlying search engine uses javascript and DHTML and -# should work on any modern browser. Note that when using HTML help -# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) -# there is already a search function so this one should typically be disabled. -# For large projects the javascript based search engine can be slow, then -# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to -# search using the keyboard; to jump to the search box use + S -# (what the is depends on the OS and browser, but it is typically -# , /
- - - - - - - - - -
-
- - -
- -
- -
-
-
Modules
-
-
-
Here is a list of all modules:
- - -
 SENSOR API
-
-
- -
-Generated by   -doxygen - 1.8.13 -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/nav_f.png b/lib/Adafruit_BME680-1.0.5/docs/nav_f.png deleted file mode 100644 index 72a58a529ed3a9ed6aa0c51a79cf207e026deee2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^j6iI`!2~2XGqLUlQVE_ejv*C{Z|{2ZH7M}7UYxc) zn!W8uqtnIQ>_z8U diff --git a/lib/Adafruit_BME680-1.0.5/docs/nav_g.png b/lib/Adafruit_BME680-1.0.5/docs/nav_g.png deleted file mode 100644 index 2093a237a94f6c83e19ec6e5fd42f7ddabdafa81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^j6lrB!3HFm1ilyoDK$?Q$B+ufw|5PB85lU25BhtE tr?otc=hd~V+ws&_A@j8Fiv!KF$B+ufw|5=67#uj90@pIL wZ=Q8~_Ju`#59=RjDrmm`tMD@M=!-l18IR?&vFVdQ&MBb@0HFXL1|%O$WD@{VPM$7~Ar*{o?;hlAFyLXmaDC0y znK1_#cQqJWPES%4Uujug^TE?jMft$}Eq^WaR~)%f)vSNs&gek&x%A9X9sM - - - - - - -Adafruit BME680 Library: Related Pages - - - - - - - - - -
-
- - - - - - -
-
Adafruit BME680 Library -
-
-
- - - - - - - -
- -
-
- - -
- -
- -
-
-
Related Pages
-
-
-
Here is a list of all related documentation pages:
- - -
 README
-
-
- -
-Generated by   -doxygen - 1.8.13 -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_0.html b/lib/Adafruit_BME680-1.0.5/docs/search/all_0.html deleted file mode 100644 index f25360b71..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_0.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_0.js b/lib/Adafruit_BME680-1.0.5/docs/search/all_0.js deleted file mode 100644 index 60767b579..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_0.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['adafruit_5fbme680',['Adafruit_BME680',['../class_adafruit___b_m_e680.html',1,'Adafruit_BME680'],['../class_adafruit___b_m_e680.html#af147d564868b9eac61a2c7fcd8f614cd',1,'Adafruit_BME680::Adafruit_BME680(int8_t cspin=-1)'],['../class_adafruit___b_m_e680.html#a8e89aaed66497bb2dde7ab678aa81173',1,'Adafruit_BME680::Adafruit_BME680(int8_t cspin, int8_t mosipin, int8_t misopin, int8_t sckpin)']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_1.html b/lib/Adafruit_BME680-1.0.5/docs/search/all_1.html deleted file mode 100644 index b13f0f7f3..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_1.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_1.js b/lib/Adafruit_BME680-1.0.5/docs/search/all_1.js deleted file mode 100644 index af0f57629..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_1.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['begin',['begin',['../class_adafruit___b_m_e680.html#ac6d9d5dc90424c2c3c3a3b311c1141dc',1,'Adafruit_BME680']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_10.html b/lib/Adafruit_BME680-1.0.5/docs/search/all_10.html deleted file mode 100644 index d1345a1f0..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_10.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_10.js b/lib/Adafruit_BME680-1.0.5/docs/search/all_10.js deleted file mode 100644 index 2a78ddde3..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_10.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['write',['write',['../structbme680__dev.html#a5e1e5dad78b9831125c240dde61b13a2',1,'bme680_dev']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_2.html b/lib/Adafruit_BME680-1.0.5/docs/search/all_2.html deleted file mode 100644 index 9543c57b1..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_2.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_2.js b/lib/Adafruit_BME680-1.0.5/docs/search/all_2.js deleted file mode 100644 index ec96e83bd..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_2.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['gas_5fresistance',['gas_resistance',['../class_adafruit___b_m_e680.html#aef05921539684ec297168bdd0cee7c7c',1,'Adafruit_BME680']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_3.html b/lib/Adafruit_BME680-1.0.5/docs/search/all_3.html deleted file mode 100644 index 03405c0fb..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_3.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_3.js b/lib/Adafruit_BME680-1.0.5/docs/search/all_3.js deleted file mode 100644 index fd849062f..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_3.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['humidity',['humidity',['../class_adafruit___b_m_e680.html#a442787f3ad0f2ab9087535ba9c22102b',1,'Adafruit_BME680']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_4.html b/lib/Adafruit_BME680-1.0.5/docs/search/all_4.html deleted file mode 100644 index 8e1f4b9cd..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_4.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_4.js b/lib/Adafruit_BME680-1.0.5/docs/search/all_4.js deleted file mode 100644 index 04edd5fbd..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_4.js +++ /dev/null @@ -1,5 +0,0 @@ -var searchData= -[ - ['performreading',['performReading',['../class_adafruit___b_m_e680.html#aa58210864cad77b272669eb86f1d2a88',1,'Adafruit_BME680']]], - ['pressure',['pressure',['../class_adafruit___b_m_e680.html#a956b36e719ef0b37e59e6c3ecb8c5583',1,'Adafruit_BME680']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_5.html b/lib/Adafruit_BME680-1.0.5/docs/search/all_5.html deleted file mode 100644 index 89a879ea9..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_5.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_5.js b/lib/Adafruit_BME680-1.0.5/docs/search/all_5.js deleted file mode 100644 index be315aca9..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_5.js +++ /dev/null @@ -1,9 +0,0 @@ -var searchData= -[ - ['readme',['README',['../md__r_e_a_d_m_e.html',1,'']]], - ['readaltitude',['readAltitude',['../class_adafruit___b_m_e680.html#a3caae92aa981508f0084b11b1fed4883',1,'Adafruit_BME680']]], - ['readgas',['readGas',['../class_adafruit___b_m_e680.html#ae0b55eb1049c5949ff186de86aaafb55',1,'Adafruit_BME680']]], - ['readhumidity',['readHumidity',['../class_adafruit___b_m_e680.html#a1402c97860f9c61bf133be7e7056658b',1,'Adafruit_BME680']]], - ['readpressure',['readPressure',['../class_adafruit___b_m_e680.html#afd081183a7845fee1d1c080cce20495e',1,'Adafruit_BME680']]], - ['readtemperature',['readTemperature',['../class_adafruit___b_m_e680.html#a7b554e6edf5cea06cf480e53bcb65aec',1,'Adafruit_BME680']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_6.html b/lib/Adafruit_BME680-1.0.5/docs/search/all_6.html deleted file mode 100644 index 6afac0662..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_6.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_6.js b/lib/Adafruit_BME680-1.0.5/docs/search/all_6.js deleted file mode 100644 index 97a154533..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_6.js +++ /dev/null @@ -1,8 +0,0 @@ -var searchData= -[ - ['setgasheater',['setGasHeater',['../class_adafruit___b_m_e680.html#a2e6a61b5441c51bf5e44c3af3ee3fec8',1,'Adafruit_BME680']]], - ['sethumidityoversampling',['setHumidityOversampling',['../class_adafruit___b_m_e680.html#af1f05d2f024e946c1d7cbe3fb90b0859',1,'Adafruit_BME680']]], - ['setiirfiltersize',['setIIRFilterSize',['../class_adafruit___b_m_e680.html#a42f25a4f258aad9abad4abb6bd95ec77',1,'Adafruit_BME680']]], - ['setpressureoversampling',['setPressureOversampling',['../class_adafruit___b_m_e680.html#a73a9467c838951a187a268172a2b5d8c',1,'Adafruit_BME680']]], - ['settemperatureoversampling',['setTemperatureOversampling',['../class_adafruit___b_m_e680.html#a640ee0a0cb7ca57af30e8408260cc6e6',1,'Adafruit_BME680']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_7.html b/lib/Adafruit_BME680-1.0.5/docs/search/all_7.html deleted file mode 100644 index de1910770..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_7.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_7.js b/lib/Adafruit_BME680-1.0.5/docs/search/all_7.js deleted file mode 100644 index aedb1576c..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_7.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['temperature',['temperature',['../class_adafruit___b_m_e680.html#a074501406d2bf249551e3e489cb9316e',1,'Adafruit_BME680']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_8.html b/lib/Adafruit_BME680-1.0.5/docs/search/all_8.html deleted file mode 100644 index 11e27cdb4..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_8.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_8.js b/lib/Adafruit_BME680-1.0.5/docs/search/all_8.js deleted file mode 100644 index d535a5ab4..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_8.js +++ /dev/null @@ -1,5 +0,0 @@ -var searchData= -[ - ['meas_5findex',['meas_index',['../structbme680__field__data.html#add2cb9f6b7d736908aa9f75904122d3c',1,'bme680_field_data']]], - ['mem_5fpage',['mem_page',['../structbme680__dev.html#a388e543d88b93a2a5c91e1f66ed0e998',1,'bme680_dev']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_9.html b/lib/Adafruit_BME680-1.0.5/docs/search/all_9.html deleted file mode 100644 index f8abbbe59..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_9.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_9.js b/lib/Adafruit_BME680-1.0.5/docs/search/all_9.js deleted file mode 100644 index 69a9314e7..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_9.js +++ /dev/null @@ -1,5 +0,0 @@ -var searchData= -[ - ['nb_5fconv',['nb_conv',['../structbme680__gas__sett.html#ad0fd15bcd071158faaa40037171cd798',1,'bme680_gas_sett']]], - ['new_5ffields',['new_fields',['../structbme680__dev.html#a488698f8c1c548bb19ac1f8ee67cbadd',1,'bme680_dev']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_a.html b/lib/Adafruit_BME680-1.0.5/docs/search/all_a.html deleted file mode 100644 index 9601fcee1..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_a.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_a.js b/lib/Adafruit_BME680-1.0.5/docs/search/all_a.js deleted file mode 100644 index 27c835cce..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_a.js +++ /dev/null @@ -1,6 +0,0 @@ -var searchData= -[ - ['os_5fhum',['os_hum',['../structbme680__tph__sett.html#a12b21e2faba6c4e235f14070e9a9bb3e',1,'bme680_tph_sett']]], - ['os_5fpres',['os_pres',['../structbme680__tph__sett.html#ad754f858d10c2164e1d18756c9cf8db0',1,'bme680_tph_sett']]], - ['os_5ftemp',['os_temp',['../structbme680__tph__sett.html#a80a4dec6bde73d2083d464cb79ae8df8',1,'bme680_tph_sett']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_b.html b/lib/Adafruit_BME680-1.0.5/docs/search/all_b.html deleted file mode 100644 index 0814e4e03..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_b.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_b.js b/lib/Adafruit_BME680-1.0.5/docs/search/all_b.js deleted file mode 100644 index 77a01024d..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_b.js +++ /dev/null @@ -1,28 +0,0 @@ -var searchData= -[ - ['par_5fgh1',['par_gh1',['../structbme680__calib__data.html#ab9c4601c2e89a776257bbd27f66c9e2c',1,'bme680_calib_data']]], - ['par_5fgh2',['par_gh2',['../structbme680__calib__data.html#aeebd7cb98502f77c4cce34d6a9a1f6db',1,'bme680_calib_data']]], - ['par_5fgh3',['par_gh3',['../structbme680__calib__data.html#aaae5921c2ddbee1935665f428266f373',1,'bme680_calib_data']]], - ['par_5fh1',['par_h1',['../structbme680__calib__data.html#a14a76f440f0f9df731057cd511403a29',1,'bme680_calib_data']]], - ['par_5fh2',['par_h2',['../structbme680__calib__data.html#a8c241a150118622dcab5a1daae8c5893',1,'bme680_calib_data']]], - ['par_5fh3',['par_h3',['../structbme680__calib__data.html#a43a808580e91172a5b840210e8a85bf0',1,'bme680_calib_data']]], - ['par_5fh4',['par_h4',['../structbme680__calib__data.html#a8d73c2a1a2b56bd9530f467f86f02c7a',1,'bme680_calib_data']]], - ['par_5fh5',['par_h5',['../structbme680__calib__data.html#afa1dcf66631dcb16aa8c091a65e1d580',1,'bme680_calib_data']]], - ['par_5fh6',['par_h6',['../structbme680__calib__data.html#ad97ebd01754136bd9af03c9e09c43005',1,'bme680_calib_data']]], - ['par_5fh7',['par_h7',['../structbme680__calib__data.html#a59dd799e9a4b5faad9b3755aeb88ad30',1,'bme680_calib_data']]], - ['par_5fp1',['par_p1',['../structbme680__calib__data.html#aac7cb7d36376532cd4a39aa5ddfe68c0',1,'bme680_calib_data']]], - ['par_5fp10',['par_p10',['../structbme680__calib__data.html#a49b5fb944862a2937be8aafee042108c',1,'bme680_calib_data']]], - ['par_5fp2',['par_p2',['../structbme680__calib__data.html#a97ee906971dca54be2deada4ede4664b',1,'bme680_calib_data']]], - ['par_5fp3',['par_p3',['../structbme680__calib__data.html#a997a9f626fb184d400c178c84575c01a',1,'bme680_calib_data']]], - ['par_5fp4',['par_p4',['../structbme680__calib__data.html#aa5757dfc40816cf3c8e29e2aeb4a521a',1,'bme680_calib_data']]], - ['par_5fp5',['par_p5',['../structbme680__calib__data.html#adf1614f15852812b5a4346d75f9d37f4',1,'bme680_calib_data']]], - ['par_5fp6',['par_p6',['../structbme680__calib__data.html#af70bee9d3b48b1ce25557b2639093ef3',1,'bme680_calib_data']]], - ['par_5fp7',['par_p7',['../structbme680__calib__data.html#ad3af987b1e051ffb136efd2b8d2ba19e',1,'bme680_calib_data']]], - ['par_5fp8',['par_p8',['../structbme680__calib__data.html#a4e75e3ba3a52bda30daffc6c0e242c03',1,'bme680_calib_data']]], - ['par_5fp9',['par_p9',['../structbme680__calib__data.html#aebe0a4d1259e37c56b57e221add89bd9',1,'bme680_calib_data']]], - ['par_5ft1',['par_t1',['../structbme680__calib__data.html#a0f01e767396f9328edb6e5ae9a314b2f',1,'bme680_calib_data']]], - ['par_5ft2',['par_t2',['../structbme680__calib__data.html#a5ba9c77d416227faae07642a7537788f',1,'bme680_calib_data']]], - ['par_5ft3',['par_t3',['../structbme680__calib__data.html#acda7c141bb94e5e6b3654387fc8bce47',1,'bme680_calib_data']]], - ['power_5fmode',['power_mode',['../structbme680__dev.html#a7b2b2947aa6a6e336c90811373de1a6b',1,'bme680_dev']]], - ['pressure',['pressure',['../structbme680__field__data.html#af92dbc060536ac0cd546a1f402fcecb4',1,'bme680_field_data']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_c.html b/lib/Adafruit_BME680-1.0.5/docs/search/all_c.html deleted file mode 100644 index da08c387a..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_c.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_c.js b/lib/Adafruit_BME680-1.0.5/docs/search/all_c.js deleted file mode 100644 index 580fbcb3e..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_c.js +++ /dev/null @@ -1,10 +0,0 @@ -var searchData= -[ - ['readme',['README',['../md__r_e_a_d_m_e.html',1,'']]], - ['range_5fsw_5ferr',['range_sw_err',['../structbme680__calib__data.html#ab42378cffea08117ba872e9b7b2e3580',1,'bme680_calib_data']]], - ['read',['read',['../structbme680__dev.html#aa36aaa5af7488e1a9dce5b8b834b1956',1,'bme680_dev']]], - ['readaltitude',['readAltitude',['../class_adafruit___b_m_e680.html#a3caae92aa981508f0084b11b1fed4883',1,'Adafruit_BME680']]], - ['res_5fheat_5frange',['res_heat_range',['../structbme680__calib__data.html#ae37d0c08a01ea1ecf19b82fe4b08f1a8',1,'bme680_calib_data']]], - ['res_5fheat_5fval',['res_heat_val',['../structbme680__calib__data.html#aa77e96c4bd34ffd5611e014192b936fc',1,'bme680_calib_data']]], - ['run_5fgas',['run_gas',['../structbme680__gas__sett.html#a01ce898d2f312f59dd4bda78d7abe951',1,'bme680_gas_sett']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_d.html b/lib/Adafruit_BME680-1.0.5/docs/search/all_d.html deleted file mode 100644 index 9986c9cbf..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_d.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_d.js b/lib/Adafruit_BME680-1.0.5/docs/search/all_d.js deleted file mode 100644 index 44d68cd30..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_d.js +++ /dev/null @@ -1,8 +0,0 @@ -var searchData= -[ - ['sensor_20api',['SENSOR API',['../group___b_m_e680.html',1,'']]], - ['setgasheater',['setGasHeater',['../class_adafruit___b_m_e680.html#a2e6a61b5441c51bf5e44c3af3ee3fec8',1,'Adafruit_BME680']]], - ['setiirfiltersize',['setIIRFilterSize',['../class_adafruit___b_m_e680.html#a42f25a4f258aad9abad4abb6bd95ec77',1,'Adafruit_BME680']]], - ['settemperatureoversampling',['setTemperatureOversampling',['../class_adafruit___b_m_e680.html#a640ee0a0cb7ca57af30e8408260cc6e6',1,'Adafruit_BME680']]], - ['status',['status',['../structbme680__field__data.html#af52b43f86807c1f1ef7526bbb9584c5b',1,'bme680_field_data']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_e.html b/lib/Adafruit_BME680-1.0.5/docs/search/all_e.html deleted file mode 100644 index 9fa42bbac..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_e.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_e.js b/lib/Adafruit_BME680-1.0.5/docs/search/all_e.js deleted file mode 100644 index 3fe3954ac..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_e.js +++ /dev/null @@ -1,6 +0,0 @@ -var searchData= -[ - ['t_5ffine',['t_fine',['../structbme680__calib__data.html#aae7b1a022503644a5e31996a97c032ae',1,'bme680_calib_data']]], - ['temperature',['temperature',['../structbme680__field__data.html#a8954536ec56e28e4bc79ed7bf1bc5176',1,'bme680_field_data']]], - ['tph_5fsett',['tph_sett',['../structbme680__dev.html#a38a17360e0b57778b734393e80819294',1,'bme680_dev']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_f.html b/lib/Adafruit_BME680-1.0.5/docs/search/all_f.html deleted file mode 100644 index 6ecfc0ed8..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_f.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/all_f.js b/lib/Adafruit_BME680-1.0.5/docs/search/all_f.js deleted file mode 100644 index 2a78ddde3..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/all_f.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['write',['write',['../structbme680__dev.html#a5e1e5dad78b9831125c240dde61b13a2',1,'bme680_dev']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/classes_0.html b/lib/Adafruit_BME680-1.0.5/docs/search/classes_0.html deleted file mode 100644 index 1c3e406ac..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/classes_0.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/classes_0.js b/lib/Adafruit_BME680-1.0.5/docs/search/classes_0.js deleted file mode 100644 index 2972a9bdf..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/classes_0.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['adafruit_5fbme680',['Adafruit_BME680',['../class_adafruit___b_m_e680.html',1,'']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/classes_1.html b/lib/Adafruit_BME680-1.0.5/docs/search/classes_1.html deleted file mode 100644 index a8e706950..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/classes_1.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/classes_1.js b/lib/Adafruit_BME680-1.0.5/docs/search/classes_1.js deleted file mode 100644 index 56a9158a4..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/classes_1.js +++ /dev/null @@ -1,8 +0,0 @@ -var searchData= -[ - ['bme680_5fcalib_5fdata',['bme680_calib_data',['../structbme680__calib__data.html',1,'']]], - ['bme680_5fdev',['bme680_dev',['../structbme680__dev.html',1,'']]], - ['bme680_5ffield_5fdata',['bme680_field_data',['../structbme680__field__data.html',1,'']]], - ['bme680_5fgas_5fsett',['bme680_gas_sett',['../structbme680__gas__sett.html',1,'']]], - ['bme680_5ftph_5fsett',['bme680_tph_sett',['../structbme680__tph__sett.html',1,'']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/close.png b/lib/Adafruit_BME680-1.0.5/docs/search/close.png deleted file mode 100644 index 9342d3dfeea7b7c4ee610987e717804b5a42ceb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmV+s0q*{ZP)4(RlMby96)VwnbG{ zbe&}^BDn7x>$<{ck4zAK-=nT;=hHG)kmplIF${xqm8db3oX6wT3bvp`TE@m0cg;b) zBuSL}5?N7O(iZLdAlz@)b)Rd~DnSsSX&P5qC`XwuFwcAYLC+d2>+1(8on;wpt8QIC X2MT$R4iQDd00000NkvXXu0mjfia~GN diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/defines_0.html b/lib/Adafruit_BME680-1.0.5/docs/search/defines_0.html deleted file mode 100644 index 5b252045f..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/defines_0.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/defines_0.js b/lib/Adafruit_BME680-1.0.5/docs/search/defines_0.js deleted file mode 100644 index 632335049..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/defines_0.js +++ /dev/null @@ -1,36 +0,0 @@ -var searchData= -[ - ['bme680_5faddr_5fres_5fheat_5fval_5faddr',['BME680_ADDR_RES_HEAT_VAL_ADDR',['../bme680__defs_8h.html#af6a74cbd7c52c150a5d83766e86f3bf1',1,'bme680_defs.h']]], - ['bme680_5fchip_5fid',['BME680_CHIP_ID',['../bme680__defs_8h.html#a762d33b22cceaa1f90dc2044ace463ee',1,'bme680_defs.h']]], - ['bme680_5fchip_5fid_5faddr',['BME680_CHIP_ID_ADDR',['../bme680__defs_8h.html#aa24d214515e9c3606dcefb874888c055',1,'bme680_defs.h']]], - ['bme680_5fcoeff_5faddr1',['BME680_COEFF_ADDR1',['../bme680__defs_8h.html#a839d12e3afe0332b3383be0e258c472e',1,'bme680_defs.h']]], - ['bme680_5fcoeff_5fsize',['BME680_COEFF_SIZE',['../bme680__defs_8h.html#a4cf6e3574a83160f0adbfcf8cc5e3729',1,'bme680_defs.h']]], - ['bme680_5fconcat_5fbytes',['BME680_CONCAT_BYTES',['../bme680__defs_8h.html#a9aac51cc4b47a1f1c9f30c07026840ab',1,'bme680_defs.h']]], - ['bme680_5fconf_5fheat_5fctrl_5faddr',['BME680_CONF_HEAT_CTRL_ADDR',['../bme680__defs_8h.html#a995aae4506cba06c735bb2ff37fbca49',1,'bme680_defs.h']]], - ['bme680_5fdisable_5fgas_5fmeas',['BME680_DISABLE_GAS_MEAS',['../bme680__defs_8h.html#ad5a18c765061877212395397d58e2c20',1,'bme680_defs.h']]], - ['bme680_5fenable_5fheater',['BME680_ENABLE_HEATER',['../bme680__defs_8h.html#a9e973dfcc1a103110cc44077f3ed86c1',1,'bme680_defs.h']]], - ['bme680_5ffield0_5faddr',['BME680_FIELD0_ADDR',['../bme680__defs_8h.html#aa1126d8a0cab009b3812d4dba28beec3',1,'bme680_defs.h']]], - ['bme680_5ffield_5flength',['BME680_FIELD_LENGTH',['../bme680__defs_8h.html#a7cb775d981358b7e58eb8db0094bd1d7',1,'bme680_defs.h']]], - ['bme680_5ffilter_5fsize_5f0',['BME680_FILTER_SIZE_0',['../bme680__defs_8h.html#a5edcb9fcb77440f52d2b2865a89b5475',1,'bme680_defs.h']]], - ['bme680_5fgas_5fmeas_5fmsk',['BME680_GAS_MEAS_MSK',['../bme680__defs_8h.html#adff9a0ef09e48aa5fcecc9bcfb0bf6f2',1,'bme680_defs.h']]], - ['bme680_5fgas_5fmeas_5fpos',['BME680_GAS_MEAS_POS',['../bme680__defs_8h.html#aa72739940e9ab88370b0ae23ef687f15',1,'bme680_defs.h']]], - ['bme680_5fhum_5freg_5fshift_5fval',['BME680_HUM_REG_SHIFT_VAL',['../bme680__defs_8h.html#aa9320cbf90a9bb81b912da4bf036e73b',1,'bme680_defs.h']]], - ['bme680_5fi2c_5faddr_5fprimary',['BME680_I2C_ADDR_PRIMARY',['../bme680__defs_8h.html#af27a16304a83f75bb23883d754610df3',1,'bme680_defs.h']]], - ['bme680_5fmem_5fpage0',['BME680_MEM_PAGE0',['../bme680__defs_8h.html#a2af2d059c5cdc5925dc050a5d67f2d0b',1,'bme680_defs.h']]], - ['bme680_5fnbconv_5fmin',['BME680_NBCONV_MIN',['../bme680__defs_8h.html#a8b0bdbbedd050d35a8bc27e23c9c96c4',1,'bme680_defs.h']]], - ['bme680_5fok',['BME680_OK',['../bme680__defs_8h.html#a2e82e5c447a9dbbeebf95b1ba189effb',1,'bme680_defs.h']]], - ['bme680_5fos_5fnone',['BME680_OS_NONE',['../bme680__defs_8h.html#a5ba113b3902da4c9baf45da5f32958d0',1,'bme680_defs.h']]], - ['bme680_5fost_5fsel',['BME680_OST_SEL',['../bme680__defs_8h.html#a7ecfc9ebc2dc3fae358c38215821db6d',1,'bme680_defs.h']]], - ['bme680_5fpoll_5fperiod_5fms',['BME680_POLL_PERIOD_MS',['../bme680__defs_8h.html#a7545f57cf8b21f71292f4d2998049ab0',1,'bme680_defs.h']]], - ['bme680_5freg_5ffilter_5findex',['BME680_REG_FILTER_INDEX',['../bme680__defs_8h.html#abead566b839b70723d7dc5be6eb65c12',1,'bme680_defs.h']]], - ['bme680_5fres_5fheat0_5faddr',['BME680_RES_HEAT0_ADDR',['../bme680__defs_8h.html#ad1429130a198bff35d0bb98bd1d4cbc1',1,'bme680_defs.h']]], - ['bme680_5freset_5fperiod',['BME680_RESET_PERIOD',['../bme680__defs_8h.html#a6409d476475762c095a746a1b785bdd6',1,'bme680_defs.h']]], - ['bme680_5frun_5fgas_5fdisable',['BME680_RUN_GAS_DISABLE',['../bme680__defs_8h.html#a7cdfa822370f97878b251ec8ae437ad8',1,'bme680_defs.h']]], - ['bme680_5fset_5fbits',['BME680_SET_BITS',['../bme680__defs_8h.html#aa2dfae23c0c4a846bde4fdf3780c390e',1,'bme680_defs.h']]], - ['bme680_5fset_5fbits_5fpos_5f0',['BME680_SET_BITS_POS_0',['../bme680__defs_8h.html#a5e3fed11d9e1cb98d8c05bc5f418d4e8',1,'bme680_defs.h']]], - ['bme680_5fsleep_5fmode',['BME680_SLEEP_MODE',['../bme680__defs_8h.html#a9fc5e8034aa79028c0286ea4c974ee69',1,'bme680_defs.h']]], - ['bme680_5fsoft_5freset_5faddr',['BME680_SOFT_RESET_ADDR',['../bme680__defs_8h.html#a69bae1e3eba277068c1055e3028bbf41',1,'bme680_defs.h']]], - ['bme680_5fsoft_5freset_5fcmd',['BME680_SOFT_RESET_CMD',['../bme680__defs_8h.html#a6da379a1060ef5079d34ba88191c3488',1,'bme680_defs.h']]], - ['bme680_5ft2_5flsb_5freg',['BME680_T2_LSB_REG',['../bme680__defs_8h.html#ab0bf47738f04f4e67488166d66096752',1,'bme680_defs.h']]], - ['bme680_5ftmp_5fbuffer_5flength',['BME680_TMP_BUFFER_LENGTH',['../bme680__defs_8h.html#a9be3bfa321b5d7b421ae2b8900d49eff',1,'bme680_defs.h']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/enums_0.html b/lib/Adafruit_BME680-1.0.5/docs/search/enums_0.html deleted file mode 100644 index ee343ac0b..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/enums_0.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/enums_0.js b/lib/Adafruit_BME680-1.0.5/docs/search/enums_0.js deleted file mode 100644 index 844aa767a..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/enums_0.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['bme680_5fintf',['bme680_intf',['../bme680__defs_8h.html#a2232c03d0c1282e976af41b39e1b87d6',1,'bme680_defs.h']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/enumvalues_0.html b/lib/Adafruit_BME680-1.0.5/docs/search/enumvalues_0.html deleted file mode 100644 index 9387b6a37..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/enumvalues_0.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/enumvalues_0.js b/lib/Adafruit_BME680-1.0.5/docs/search/enumvalues_0.js deleted file mode 100644 index 47fb24a29..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/enumvalues_0.js +++ /dev/null @@ -1,5 +0,0 @@ -var searchData= -[ - ['bme680_5fi2c_5fintf',['BME680_I2C_INTF',['../bme680__defs_8h.html#a2232c03d0c1282e976af41b39e1b87d6a8c5c46109186b1f476eafcb0fa608cf5',1,'bme680_defs.h']]], - ['bme680_5fspi_5fintf',['BME680_SPI_INTF',['../bme680__defs_8h.html#a2232c03d0c1282e976af41b39e1b87d6a504bd691a4b57b0c914cc8c77bd696c3',1,'bme680_defs.h']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/files_0.html b/lib/Adafruit_BME680-1.0.5/docs/search/files_0.html deleted file mode 100644 index 4f272b83a..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/files_0.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/files_0.js b/lib/Adafruit_BME680-1.0.5/docs/search/files_0.js deleted file mode 100644 index 9486e3879..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/files_0.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['bme680_5fdefs_2eh',['bme680_defs.h',['../bme680__defs_8h.html',1,'']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/functions_0.html b/lib/Adafruit_BME680-1.0.5/docs/search/functions_0.html deleted file mode 100644 index 4e6d87d15..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/functions_0.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/functions_0.js b/lib/Adafruit_BME680-1.0.5/docs/search/functions_0.js deleted file mode 100644 index f80bbd160..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/functions_0.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['adafruit_5fbme680',['Adafruit_BME680',['../class_adafruit___b_m_e680.html#af147d564868b9eac61a2c7fcd8f614cd',1,'Adafruit_BME680::Adafruit_BME680(int8_t cspin=-1)'],['../class_adafruit___b_m_e680.html#a8e89aaed66497bb2dde7ab678aa81173',1,'Adafruit_BME680::Adafruit_BME680(int8_t cspin, int8_t mosipin, int8_t misopin, int8_t sckpin)']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/functions_1.html b/lib/Adafruit_BME680-1.0.5/docs/search/functions_1.html deleted file mode 100644 index b343e2db5..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/functions_1.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/functions_1.js b/lib/Adafruit_BME680-1.0.5/docs/search/functions_1.js deleted file mode 100644 index af0f57629..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/functions_1.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['begin',['begin',['../class_adafruit___b_m_e680.html#ac6d9d5dc90424c2c3c3a3b311c1141dc',1,'Adafruit_BME680']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/functions_2.html b/lib/Adafruit_BME680-1.0.5/docs/search/functions_2.html deleted file mode 100644 index ecce2f318..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/functions_2.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/functions_2.js b/lib/Adafruit_BME680-1.0.5/docs/search/functions_2.js deleted file mode 100644 index fc1c22403..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/functions_2.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['performreading',['performReading',['../class_adafruit___b_m_e680.html#aa58210864cad77b272669eb86f1d2a88',1,'Adafruit_BME680']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/functions_3.html b/lib/Adafruit_BME680-1.0.5/docs/search/functions_3.html deleted file mode 100644 index 15f06abdc..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/functions_3.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/functions_3.js b/lib/Adafruit_BME680-1.0.5/docs/search/functions_3.js deleted file mode 100644 index f128d156e..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/functions_3.js +++ /dev/null @@ -1,8 +0,0 @@ -var searchData= -[ - ['readaltitude',['readAltitude',['../class_adafruit___b_m_e680.html#a3caae92aa981508f0084b11b1fed4883',1,'Adafruit_BME680']]], - ['readgas',['readGas',['../class_adafruit___b_m_e680.html#ae0b55eb1049c5949ff186de86aaafb55',1,'Adafruit_BME680']]], - ['readhumidity',['readHumidity',['../class_adafruit___b_m_e680.html#a1402c97860f9c61bf133be7e7056658b',1,'Adafruit_BME680']]], - ['readpressure',['readPressure',['../class_adafruit___b_m_e680.html#afd081183a7845fee1d1c080cce20495e',1,'Adafruit_BME680']]], - ['readtemperature',['readTemperature',['../class_adafruit___b_m_e680.html#a7b554e6edf5cea06cf480e53bcb65aec',1,'Adafruit_BME680']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/functions_4.html b/lib/Adafruit_BME680-1.0.5/docs/search/functions_4.html deleted file mode 100644 index 8985ff278..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/functions_4.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/functions_4.js b/lib/Adafruit_BME680-1.0.5/docs/search/functions_4.js deleted file mode 100644 index 97a154533..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/functions_4.js +++ /dev/null @@ -1,8 +0,0 @@ -var searchData= -[ - ['setgasheater',['setGasHeater',['../class_adafruit___b_m_e680.html#a2e6a61b5441c51bf5e44c3af3ee3fec8',1,'Adafruit_BME680']]], - ['sethumidityoversampling',['setHumidityOversampling',['../class_adafruit___b_m_e680.html#af1f05d2f024e946c1d7cbe3fb90b0859',1,'Adafruit_BME680']]], - ['setiirfiltersize',['setIIRFilterSize',['../class_adafruit___b_m_e680.html#a42f25a4f258aad9abad4abb6bd95ec77',1,'Adafruit_BME680']]], - ['setpressureoversampling',['setPressureOversampling',['../class_adafruit___b_m_e680.html#a73a9467c838951a187a268172a2b5d8c',1,'Adafruit_BME680']]], - ['settemperatureoversampling',['setTemperatureOversampling',['../class_adafruit___b_m_e680.html#a640ee0a0cb7ca57af30e8408260cc6e6',1,'Adafruit_BME680']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/groups_0.html b/lib/Adafruit_BME680-1.0.5/docs/search/groups_0.html deleted file mode 100644 index 1ede28dff..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/groups_0.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/groups_0.js b/lib/Adafruit_BME680-1.0.5/docs/search/groups_0.js deleted file mode 100644 index 792e1240b..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/groups_0.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['sensor_20api',['SENSOR API',['../group___b_m_e680.html',1,'']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/mag_sel.png b/lib/Adafruit_BME680-1.0.5/docs/search/mag_sel.png deleted file mode 100644 index 81f6040a2092402b4d98f9ffa8855d12a0d4ca17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 563 zcmV-30?hr1P)zxx&tqG15pu7)IiiXFflOc2k;dXd>%13GZAy? zRz!q0=|E6a6vV)&ZBS~G9oe0kbqyw1*gvY`{Pop2oKq#FlzgXt@Xh-7fxh>}`Fxg> z$%N%{$!4=5nM{(;=c!aG1Ofr^Do{u%Ih{^&Fc@H2)+a-?TBXrw5DW&z%Nb6mQ!L9O zl}b@6mB?f=tX3;#vl)}ggh(Vpyh(IK z(Mb0D{l{U$FsRjP;!{($+bsaaVi8T#1c0V#qEIOCYa9@UVLV`f__E81L;?WEaRA;Y zUH;rZ;vb;mk7JX|$=i3O~&If0O@oZfLg8gfIjW=dcBsz;gI=!{-r4# z4%6v$&~;q^j7Fo67yJ(NJWuX+I~I!tj^nW3?}^9bq|<3^+vapS5sgM^x7!cs(+mMT z&y%j};&~po+YO)3hoUH4E*E;e9>?R6SS&`X)p`njycAVcg{rEb41T{~Hk(bl-7eSb zmFxA2uIqo#@R?lKm50ND`~6Nfn|-b1|L6O98vt3Tx@gKz#isxO002ovPDHLkV1kyW B_l^Jn diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/nomatches.html b/lib/Adafruit_BME680-1.0.5/docs/search/nomatches.html deleted file mode 100644 index b1ded27e9..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/nomatches.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - -
-
No Matches
-
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/pages_0.html b/lib/Adafruit_BME680-1.0.5/docs/search/pages_0.html deleted file mode 100644 index 4955b9e4f..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/pages_0.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/pages_0.js b/lib/Adafruit_BME680-1.0.5/docs/search/pages_0.js deleted file mode 100644 index b9205585e..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/pages_0.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['readme',['README',['../md__r_e_a_d_m_e.html',1,'']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/search.css b/lib/Adafruit_BME680-1.0.5/docs/search/search.css deleted file mode 100644 index 3cf9df94a..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/search.css +++ /dev/null @@ -1,271 +0,0 @@ -/*---------------- Search Box */ - -#FSearchBox { - float: left; -} - -#MSearchBox { - white-space : nowrap; - float: none; - margin-top: 8px; - right: 0px; - width: 170px; - height: 24px; - z-index: 102; -} - -#MSearchBox .left -{ - display:block; - position:absolute; - left:10px; - width:20px; - height:19px; - background:url('search_l.png') no-repeat; - background-position:right; -} - -#MSearchSelect { - display:block; - position:absolute; - width:20px; - height:19px; -} - -.left #MSearchSelect { - left:4px; -} - -.right #MSearchSelect { - right:5px; -} - -#MSearchField { - display:block; - position:absolute; - height:19px; - background:url('search_m.png') repeat-x; - border:none; - width:115px; - margin-left:20px; - padding-left:4px; - color: #909090; - outline: none; - font: 9pt Arial, Verdana, sans-serif; - -webkit-border-radius: 0px; -} - -#FSearchBox #MSearchField { - margin-left:15px; -} - -#MSearchBox .right { - display:block; - position:absolute; - right:10px; - top:8px; - width:20px; - height:19px; - background:url('search_r.png') no-repeat; - background-position:left; -} - -#MSearchClose { - display: none; - position: absolute; - top: 4px; - background : none; - border: none; - margin: 0px 4px 0px 0px; - padding: 0px 0px; - outline: none; -} - -.left #MSearchClose { - left: 6px; -} - -.right #MSearchClose { - right: 2px; -} - -.MSearchBoxActive #MSearchField { - color: #000000; -} - -/*---------------- Search filter selection */ - -#MSearchSelectWindow { - display: none; - position: absolute; - left: 0; top: 0; - border: 1px solid #90A5CE; - background-color: #F9FAFC; - z-index: 10001; - padding-top: 4px; - padding-bottom: 4px; - -moz-border-radius: 4px; - -webkit-border-top-left-radius: 4px; - -webkit-border-top-right-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); -} - -.SelectItem { - font: 8pt Arial, Verdana, sans-serif; - padding-left: 2px; - padding-right: 12px; - border: 0px; -} - -span.SelectionMark { - margin-right: 4px; - font-family: monospace; - outline-style: none; - text-decoration: none; -} - -a.SelectItem { - display: block; - outline-style: none; - color: #000000; - text-decoration: none; - padding-left: 6px; - padding-right: 12px; -} - -a.SelectItem:focus, -a.SelectItem:active { - color: #000000; - outline-style: none; - text-decoration: none; -} - -a.SelectItem:hover { - color: #FFFFFF; - background-color: #3D578C; - outline-style: none; - text-decoration: none; - cursor: pointer; - display: block; -} - -/*---------------- Search results window */ - -iframe#MSearchResults { - width: 60ex; - height: 15em; -} - -#MSearchResultsWindow { - display: none; - position: absolute; - left: 0; top: 0; - border: 1px solid #000; - background-color: #EEF1F7; - z-index:10000; -} - -/* ----------------------------------- */ - - -#SRIndex { - clear:both; - padding-bottom: 15px; -} - -.SREntry { - font-size: 10pt; - padding-left: 1ex; -} - -.SRPage .SREntry { - font-size: 8pt; - padding: 1px 5px; -} - -body.SRPage { - margin: 5px 2px; -} - -.SRChildren { - padding-left: 3ex; padding-bottom: .5em -} - -.SRPage .SRChildren { - display: none; -} - -.SRSymbol { - font-weight: bold; - color: #425E97; - font-family: Arial, Verdana, sans-serif; - text-decoration: none; - outline: none; -} - -a.SRScope { - display: block; - color: #425E97; - font-family: Arial, Verdana, sans-serif; - text-decoration: none; - outline: none; -} - -a.SRSymbol:focus, a.SRSymbol:active, -a.SRScope:focus, a.SRScope:active { - text-decoration: underline; -} - -span.SRScope { - padding-left: 4px; -} - -.SRPage .SRStatus { - padding: 2px 5px; - font-size: 8pt; - font-style: italic; -} - -.SRResult { - display: none; -} - -DIV.searchresults { - margin-left: 10px; - margin-right: 10px; -} - -/*---------------- External search page results */ - -.searchresult { - background-color: #F0F3F8; -} - -.pages b { - color: white; - padding: 5px 5px 3px 5px; - background-image: url("../tab_a.png"); - background-repeat: repeat-x; - text-shadow: 0 1px 1px #000000; -} - -.pages { - line-height: 17px; - margin-left: 4px; - text-decoration: none; -} - -.hl { - font-weight: bold; -} - -#searchresults { - margin-bottom: 20px; -} - -.searchpages { - margin-top: 10px; -} - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/search.js b/lib/Adafruit_BME680-1.0.5/docs/search/search.js deleted file mode 100644 index dedce3bf0..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/search.js +++ /dev/null @@ -1,791 +0,0 @@ -function convertToId(search) -{ - var result = ''; - for (i=0;i do a search - { - this.Search(); - } - } - - this.OnSearchSelectKey = function(evt) - { - var e = (evt) ? evt : window.event; // for IE - if (e.keyCode==40 && this.searchIndex0) // Up - { - this.searchIndex--; - this.OnSelectItem(this.searchIndex); - } - else if (e.keyCode==13 || e.keyCode==27) - { - this.OnSelectItem(this.searchIndex); - this.CloseSelectionWindow(); - this.DOMSearchField().focus(); - } - return false; - } - - // --------- Actions - - // Closes the results window. - this.CloseResultsWindow = function() - { - this.DOMPopupSearchResultsWindow().style.display = 'none'; - this.DOMSearchClose().style.display = 'none'; - this.Activate(false); - } - - this.CloseSelectionWindow = function() - { - this.DOMSearchSelectWindow().style.display = 'none'; - } - - // Performs a search. - this.Search = function() - { - this.keyTimeout = 0; - - // strip leading whitespace - var searchValue = this.DOMSearchField().value.replace(/^ +/, ""); - - var code = searchValue.toLowerCase().charCodeAt(0); - var idxChar = searchValue.substr(0, 1).toLowerCase(); - if ( 0xD800 <= code && code <= 0xDBFF && searchValue > 1) // surrogate pair - { - idxChar = searchValue.substr(0, 2); - } - - var resultsPage; - var resultsPageWithSearch; - var hasResultsPage; - - var idx = indexSectionsWithContent[this.searchIndex].indexOf(idxChar); - if (idx!=-1) - { - var hexCode=idx.toString(16); - resultsPage = this.resultsPath + '/' + indexSectionNames[this.searchIndex] + '_' + hexCode + '.html'; - resultsPageWithSearch = resultsPage+'?'+escape(searchValue); - hasResultsPage = true; - } - else // nothing available for this search term - { - resultsPage = this.resultsPath + '/nomatches.html'; - resultsPageWithSearch = resultsPage; - hasResultsPage = false; - } - - window.frames.MSearchResults.location = resultsPageWithSearch; - var domPopupSearchResultsWindow = this.DOMPopupSearchResultsWindow(); - - if (domPopupSearchResultsWindow.style.display!='block') - { - var domSearchBox = this.DOMSearchBox(); - this.DOMSearchClose().style.display = 'inline'; - if (this.insideFrame) - { - var domPopupSearchResults = this.DOMPopupSearchResults(); - domPopupSearchResultsWindow.style.position = 'relative'; - domPopupSearchResultsWindow.style.display = 'block'; - var width = document.body.clientWidth - 8; // the -8 is for IE :-( - domPopupSearchResultsWindow.style.width = width + 'px'; - domPopupSearchResults.style.width = width + 'px'; - } - else - { - var domPopupSearchResults = this.DOMPopupSearchResults(); - var left = getXPos(domSearchBox) + 150; // domSearchBox.offsetWidth; - var top = getYPos(domSearchBox) + 20; // domSearchBox.offsetHeight + 1; - domPopupSearchResultsWindow.style.display = 'block'; - left -= domPopupSearchResults.offsetWidth; - domPopupSearchResultsWindow.style.top = top + 'px'; - domPopupSearchResultsWindow.style.left = left + 'px'; - } - } - - this.lastSearchValue = searchValue; - this.lastResultsPage = resultsPage; - } - - // -------- Activation Functions - - // Activates or deactivates the search panel, resetting things to - // their default values if necessary. - this.Activate = function(isActive) - { - if (isActive || // open it - this.DOMPopupSearchResultsWindow().style.display == 'block' - ) - { - this.DOMSearchBox().className = 'MSearchBoxActive'; - - var searchField = this.DOMSearchField(); - - if (searchField.value == this.searchLabel) // clear "Search" term upon entry - { - searchField.value = ''; - this.searchActive = true; - } - } - else if (!isActive) // directly remove the panel - { - this.DOMSearchBox().className = 'MSearchBoxInactive'; - this.DOMSearchField().value = this.searchLabel; - this.searchActive = false; - this.lastSearchValue = '' - this.lastResultsPage = ''; - } - } -} - -// ----------------------------------------------------------------------- - -// The class that handles everything on the search results page. -function SearchResults(name) -{ - // The number of matches from the last run of . - this.lastMatchCount = 0; - this.lastKey = 0; - this.repeatOn = false; - - // Toggles the visibility of the passed element ID. - this.FindChildElement = function(id) - { - var parentElement = document.getElementById(id); - var element = parentElement.firstChild; - - while (element && element!=parentElement) - { - if (element.nodeName == 'DIV' && element.className == 'SRChildren') - { - return element; - } - - if (element.nodeName == 'DIV' && element.hasChildNodes()) - { - element = element.firstChild; - } - else if (element.nextSibling) - { - element = element.nextSibling; - } - else - { - do - { - element = element.parentNode; - } - while (element && element!=parentElement && !element.nextSibling); - - if (element && element!=parentElement) - { - element = element.nextSibling; - } - } - } - } - - this.Toggle = function(id) - { - var element = this.FindChildElement(id); - if (element) - { - if (element.style.display == 'block') - { - element.style.display = 'none'; - } - else - { - element.style.display = 'block'; - } - } - } - - // Searches for the passed string. If there is no parameter, - // it takes it from the URL query. - // - // Always returns true, since other documents may try to call it - // and that may or may not be possible. - this.Search = function(search) - { - if (!search) // get search word from URL - { - search = window.location.search; - search = search.substring(1); // Remove the leading '?' - search = unescape(search); - } - - search = search.replace(/^ +/, ""); // strip leading spaces - search = search.replace(/ +$/, ""); // strip trailing spaces - search = search.toLowerCase(); - search = convertToId(search); - - var resultRows = document.getElementsByTagName("div"); - var matches = 0; - - var i = 0; - while (i < resultRows.length) - { - var row = resultRows.item(i); - if (row.className == "SRResult") - { - var rowMatchName = row.id.toLowerCase(); - rowMatchName = rowMatchName.replace(/^sr\d*_/, ''); // strip 'sr123_' - - if (search.length<=rowMatchName.length && - rowMatchName.substr(0, search.length)==search) - { - row.style.display = 'block'; - matches++; - } - else - { - row.style.display = 'none'; - } - } - i++; - } - document.getElementById("Searching").style.display='none'; - if (matches == 0) // no results - { - document.getElementById("NoMatches").style.display='block'; - } - else // at least one result - { - document.getElementById("NoMatches").style.display='none'; - } - this.lastMatchCount = matches; - return true; - } - - // return the first item with index index or higher that is visible - this.NavNext = function(index) - { - var focusItem; - while (1) - { - var focusName = 'Item'+index; - focusItem = document.getElementById(focusName); - if (focusItem && focusItem.parentNode.parentNode.style.display=='block') - { - break; - } - else if (!focusItem) // last element - { - break; - } - focusItem=null; - index++; - } - return focusItem; - } - - this.NavPrev = function(index) - { - var focusItem; - while (1) - { - var focusName = 'Item'+index; - focusItem = document.getElementById(focusName); - if (focusItem && focusItem.parentNode.parentNode.style.display=='block') - { - break; - } - else if (!focusItem) // last element - { - break; - } - focusItem=null; - index--; - } - return focusItem; - } - - this.ProcessKeys = function(e) - { - if (e.type == "keydown") - { - this.repeatOn = false; - this.lastKey = e.keyCode; - } - else if (e.type == "keypress") - { - if (!this.repeatOn) - { - if (this.lastKey) this.repeatOn = true; - return false; // ignore first keypress after keydown - } - } - else if (e.type == "keyup") - { - this.lastKey = 0; - this.repeatOn = false; - } - return this.lastKey!=0; - } - - this.Nav = function(evt,itemIndex) - { - var e = (evt) ? evt : window.event; // for IE - if (e.keyCode==13) return true; - if (!this.ProcessKeys(e)) return false; - - if (this.lastKey==38) // Up - { - var newIndex = itemIndex-1; - var focusItem = this.NavPrev(newIndex); - if (focusItem) - { - var child = this.FindChildElement(focusItem.parentNode.parentNode.id); - if (child && child.style.display == 'block') // children visible - { - var n=0; - var tmpElem; - while (1) // search for last child - { - tmpElem = document.getElementById('Item'+newIndex+'_c'+n); - if (tmpElem) - { - focusItem = tmpElem; - } - else // found it! - { - break; - } - n++; - } - } - } - if (focusItem) - { - focusItem.focus(); - } - else // return focus to search field - { - parent.document.getElementById("MSearchField").focus(); - } - } - else if (this.lastKey==40) // Down - { - var newIndex = itemIndex+1; - var focusItem; - var item = document.getElementById('Item'+itemIndex); - var elem = this.FindChildElement(item.parentNode.parentNode.id); - if (elem && elem.style.display == 'block') // children visible - { - focusItem = document.getElementById('Item'+itemIndex+'_c0'); - } - if (!focusItem) focusItem = this.NavNext(newIndex); - if (focusItem) focusItem.focus(); - } - else if (this.lastKey==39) // Right - { - var item = document.getElementById('Item'+itemIndex); - var elem = this.FindChildElement(item.parentNode.parentNode.id); - if (elem) elem.style.display = 'block'; - } - else if (this.lastKey==37) // Left - { - var item = document.getElementById('Item'+itemIndex); - var elem = this.FindChildElement(item.parentNode.parentNode.id); - if (elem) elem.style.display = 'none'; - } - else if (this.lastKey==27) // Escape - { - parent.searchBox.CloseResultsWindow(); - parent.document.getElementById("MSearchField").focus(); - } - else if (this.lastKey==13) // Enter - { - return true; - } - return false; - } - - this.NavChild = function(evt,itemIndex,childIndex) - { - var e = (evt) ? evt : window.event; // for IE - if (e.keyCode==13) return true; - if (!this.ProcessKeys(e)) return false; - - if (this.lastKey==38) // Up - { - if (childIndex>0) - { - var newIndex = childIndex-1; - document.getElementById('Item'+itemIndex+'_c'+newIndex).focus(); - } - else // already at first child, jump to parent - { - document.getElementById('Item'+itemIndex).focus(); - } - } - else if (this.lastKey==40) // Down - { - var newIndex = childIndex+1; - var elem = document.getElementById('Item'+itemIndex+'_c'+newIndex); - if (!elem) // last child, jump to parent next parent - { - elem = this.NavNext(itemIndex+1); - } - if (elem) - { - elem.focus(); - } - } - else if (this.lastKey==27) // Escape - { - parent.searchBox.CloseResultsWindow(); - parent.document.getElementById("MSearchField").focus(); - } - else if (this.lastKey==13) // Enter - { - return true; - } - return false; - } -} - -function setKeyActions(elem,action) -{ - elem.setAttribute('onkeydown',action); - elem.setAttribute('onkeypress',action); - elem.setAttribute('onkeyup',action); -} - -function setClassAttr(elem,attr) -{ - elem.setAttribute('class',attr); - elem.setAttribute('className',attr); -} - -function createResults() -{ - var results = document.getElementById("SRResults"); - for (var e=0; ek7RCwB~R6VQOP#AvB$vH7i{6H{96zot$7cZT<7246EF5Np6N}+$IbiG6W zg#87A+NFaX+=_^xM1#gCtshC=E{%9^uQX_%?YwXvo{#q&MnpJ8uh(O?ZRc&~_1%^SsPxG@rfElJg-?U zm!Cz-IOn(qJP3kDp-^~qt+FGbl=5jNli^Wj_xIBG{Rc0en{!oFvyoNC7{V~T8}b>| z=jL2WIReZzX(YN(_9fV;BBD$VXQIxNasAL8ATvEu822WQ%mvv4FO#qs` BFGc_W diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/search_r.png b/lib/Adafruit_BME680-1.0.5/docs/search/search_r.png deleted file mode 100644 index 97ee8b439687084201b79c6f776a41f495c6392a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 612 zcmV-q0-ODbP)PbXFRCwB?)W514K@j&X?z2*SxFI6-@HT2E2K=9X9%Pb zEK*!TBw&g(DMC;|A)uGlRkOS9vd-?zNs%bR4d$w+ox_iFnE8fvIvv7^5<(>Te12Li z7C)9srCzmK{ZcNM{YIl9j{DePFgOWiS%xG@5CnnnJa4nvY<^glbz7^|-ZY!dUkAwd z{gaTC@_>b5h~;ug#R0wRL0>o5!hxm*s0VW?8dr}O#zXTRTnrQm_Z7z1Mrnx>&p zD4qifUjzLvbVVWi?l?rUzwt^sdb~d!f_LEhsRVIXZtQ=qSxuxqm zEX#tf>$?M_Y1-LSDT)HqG?`%-%ZpY!#{N!rcNIiL;G7F0`l?)mNGTD9;f9F5Up3Kg zw}a<-JylhG&;=!>B+fZaCX+?C+kHYrP%c?X2!Zu_olK|GcS4A70HEy;vn)I0>0kLH z`jc(WIaaHc7!HS@f*^R^Znx8W=_jIl2oWJoQ*h1^$FX!>*PqR1J8k|fw}w_y}TpE>7m8DqDO<3z`OzXt$ccSejbEZCg@0000 - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/typedefs_0.js b/lib/Adafruit_BME680-1.0.5/docs/search/typedefs_0.js deleted file mode 100644 index 72ee1dcfd..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/typedefs_0.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['bme680_5fcom_5ffptr_5ft',['bme680_com_fptr_t',['../bme680__defs_8h.html#aa7d183195e66f1db50f64f3a3d4ede57',1,'bme680_defs.h']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_0.html b/lib/Adafruit_BME680-1.0.5/docs/search/variables_0.html deleted file mode 100644 index 74ce80724..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_0.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_0.js b/lib/Adafruit_BME680-1.0.5/docs/search/variables_0.js deleted file mode 100644 index ec96e83bd..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_0.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['gas_5fresistance',['gas_resistance',['../class_adafruit___b_m_e680.html#aef05921539684ec297168bdd0cee7c7c',1,'Adafruit_BME680']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_1.html b/lib/Adafruit_BME680-1.0.5/docs/search/variables_1.html deleted file mode 100644 index 84237b6e7..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_1.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_1.js b/lib/Adafruit_BME680-1.0.5/docs/search/variables_1.js deleted file mode 100644 index fd849062f..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_1.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['humidity',['humidity',['../class_adafruit___b_m_e680.html#a442787f3ad0f2ab9087535ba9c22102b',1,'Adafruit_BME680']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_2.html b/lib/Adafruit_BME680-1.0.5/docs/search/variables_2.html deleted file mode 100644 index 5c9de1aab..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_2.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_2.js b/lib/Adafruit_BME680-1.0.5/docs/search/variables_2.js deleted file mode 100644 index 36c3ab694..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_2.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['pressure',['pressure',['../class_adafruit___b_m_e680.html#a956b36e719ef0b37e59e6c3ecb8c5583',1,'Adafruit_BME680']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_3.html b/lib/Adafruit_BME680-1.0.5/docs/search/variables_3.html deleted file mode 100644 index f95e34c60..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_3.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_3.js b/lib/Adafruit_BME680-1.0.5/docs/search/variables_3.js deleted file mode 100644 index aedb1576c..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_3.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['temperature',['temperature',['../class_adafruit___b_m_e680.html#a074501406d2bf249551e3e489cb9316e',1,'Adafruit_BME680']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_4.html b/lib/Adafruit_BME680-1.0.5/docs/search/variables_4.html deleted file mode 100644 index d7db285ee..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_4.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_4.js b/lib/Adafruit_BME680-1.0.5/docs/search/variables_4.js deleted file mode 100644 index d0973ba09..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_4.js +++ /dev/null @@ -1,6 +0,0 @@ -var searchData= -[ - ['gas_5findex',['gas_index',['../structbme680__field__data.html#ae96ceedb9e36dc0671ac533e88160f5b',1,'bme680_field_data']]], - ['gas_5fresistance',['gas_resistance',['../structbme680__field__data.html#a6ce58ca03356c0df2e4b02bac6c4ce26',1,'bme680_field_data']]], - ['gas_5fsett',['gas_sett',['../structbme680__dev.html#aaf0d4528b207d86b53e14a907bb3d7b8',1,'bme680_dev']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_5.html b/lib/Adafruit_BME680-1.0.5/docs/search/variables_5.html deleted file mode 100644 index 7bbceeb0d..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_5.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_5.js b/lib/Adafruit_BME680-1.0.5/docs/search/variables_5.js deleted file mode 100644 index 0f6e33bd9..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_5.js +++ /dev/null @@ -1,7 +0,0 @@ -var searchData= -[ - ['heatr_5fctrl',['heatr_ctrl',['../structbme680__gas__sett.html#a014791860332df8fab25684e443cd0ac',1,'bme680_gas_sett']]], - ['heatr_5fdur',['heatr_dur',['../structbme680__gas__sett.html#ac740d0456aafd8e5ac2cd7656260a527',1,'bme680_gas_sett']]], - ['heatr_5ftemp',['heatr_temp',['../structbme680__gas__sett.html#a0d7a200cbfe2d07e32a69da90759b278',1,'bme680_gas_sett']]], - ['humidity',['humidity',['../structbme680__field__data.html#ac84103cb41a2fab9614a61b467e5410e',1,'bme680_field_data']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_6.html b/lib/Adafruit_BME680-1.0.5/docs/search/variables_6.html deleted file mode 100644 index 4eb162d67..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_6.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_6.js b/lib/Adafruit_BME680-1.0.5/docs/search/variables_6.js deleted file mode 100644 index 510f08cbf..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_6.js +++ /dev/null @@ -1,5 +0,0 @@ -var searchData= -[ - ['info_5fmsg',['info_msg',['../structbme680__dev.html#a7bb14424d37da3c8fb0a527b7967a0d5',1,'bme680_dev']]], - ['intf',['intf',['../structbme680__dev.html#a6000144e9ce5cca76d3945f61b1d4ac9',1,'bme680_dev']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_7.html b/lib/Adafruit_BME680-1.0.5/docs/search/variables_7.html deleted file mode 100644 index 040882958..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_7.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_7.js b/lib/Adafruit_BME680-1.0.5/docs/search/variables_7.js deleted file mode 100644 index d535a5ab4..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_7.js +++ /dev/null @@ -1,5 +0,0 @@ -var searchData= -[ - ['meas_5findex',['meas_index',['../structbme680__field__data.html#add2cb9f6b7d736908aa9f75904122d3c',1,'bme680_field_data']]], - ['mem_5fpage',['mem_page',['../structbme680__dev.html#a388e543d88b93a2a5c91e1f66ed0e998',1,'bme680_dev']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_8.html b/lib/Adafruit_BME680-1.0.5/docs/search/variables_8.html deleted file mode 100644 index d54d09666..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_8.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_8.js b/lib/Adafruit_BME680-1.0.5/docs/search/variables_8.js deleted file mode 100644 index 69a9314e7..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_8.js +++ /dev/null @@ -1,5 +0,0 @@ -var searchData= -[ - ['nb_5fconv',['nb_conv',['../structbme680__gas__sett.html#ad0fd15bcd071158faaa40037171cd798',1,'bme680_gas_sett']]], - ['new_5ffields',['new_fields',['../structbme680__dev.html#a488698f8c1c548bb19ac1f8ee67cbadd',1,'bme680_dev']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_9.html b/lib/Adafruit_BME680-1.0.5/docs/search/variables_9.html deleted file mode 100644 index 234dc60a4..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_9.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_9.js b/lib/Adafruit_BME680-1.0.5/docs/search/variables_9.js deleted file mode 100644 index 27c835cce..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_9.js +++ /dev/null @@ -1,6 +0,0 @@ -var searchData= -[ - ['os_5fhum',['os_hum',['../structbme680__tph__sett.html#a12b21e2faba6c4e235f14070e9a9bb3e',1,'bme680_tph_sett']]], - ['os_5fpres',['os_pres',['../structbme680__tph__sett.html#ad754f858d10c2164e1d18756c9cf8db0',1,'bme680_tph_sett']]], - ['os_5ftemp',['os_temp',['../structbme680__tph__sett.html#a80a4dec6bde73d2083d464cb79ae8df8',1,'bme680_tph_sett']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_a.html b/lib/Adafruit_BME680-1.0.5/docs/search/variables_a.html deleted file mode 100644 index 089248815..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_a.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_a.js b/lib/Adafruit_BME680-1.0.5/docs/search/variables_a.js deleted file mode 100644 index 77a01024d..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_a.js +++ /dev/null @@ -1,28 +0,0 @@ -var searchData= -[ - ['par_5fgh1',['par_gh1',['../structbme680__calib__data.html#ab9c4601c2e89a776257bbd27f66c9e2c',1,'bme680_calib_data']]], - ['par_5fgh2',['par_gh2',['../structbme680__calib__data.html#aeebd7cb98502f77c4cce34d6a9a1f6db',1,'bme680_calib_data']]], - ['par_5fgh3',['par_gh3',['../structbme680__calib__data.html#aaae5921c2ddbee1935665f428266f373',1,'bme680_calib_data']]], - ['par_5fh1',['par_h1',['../structbme680__calib__data.html#a14a76f440f0f9df731057cd511403a29',1,'bme680_calib_data']]], - ['par_5fh2',['par_h2',['../structbme680__calib__data.html#a8c241a150118622dcab5a1daae8c5893',1,'bme680_calib_data']]], - ['par_5fh3',['par_h3',['../structbme680__calib__data.html#a43a808580e91172a5b840210e8a85bf0',1,'bme680_calib_data']]], - ['par_5fh4',['par_h4',['../structbme680__calib__data.html#a8d73c2a1a2b56bd9530f467f86f02c7a',1,'bme680_calib_data']]], - ['par_5fh5',['par_h5',['../structbme680__calib__data.html#afa1dcf66631dcb16aa8c091a65e1d580',1,'bme680_calib_data']]], - ['par_5fh6',['par_h6',['../structbme680__calib__data.html#ad97ebd01754136bd9af03c9e09c43005',1,'bme680_calib_data']]], - ['par_5fh7',['par_h7',['../structbme680__calib__data.html#a59dd799e9a4b5faad9b3755aeb88ad30',1,'bme680_calib_data']]], - ['par_5fp1',['par_p1',['../structbme680__calib__data.html#aac7cb7d36376532cd4a39aa5ddfe68c0',1,'bme680_calib_data']]], - ['par_5fp10',['par_p10',['../structbme680__calib__data.html#a49b5fb944862a2937be8aafee042108c',1,'bme680_calib_data']]], - ['par_5fp2',['par_p2',['../structbme680__calib__data.html#a97ee906971dca54be2deada4ede4664b',1,'bme680_calib_data']]], - ['par_5fp3',['par_p3',['../structbme680__calib__data.html#a997a9f626fb184d400c178c84575c01a',1,'bme680_calib_data']]], - ['par_5fp4',['par_p4',['../structbme680__calib__data.html#aa5757dfc40816cf3c8e29e2aeb4a521a',1,'bme680_calib_data']]], - ['par_5fp5',['par_p5',['../structbme680__calib__data.html#adf1614f15852812b5a4346d75f9d37f4',1,'bme680_calib_data']]], - ['par_5fp6',['par_p6',['../structbme680__calib__data.html#af70bee9d3b48b1ce25557b2639093ef3',1,'bme680_calib_data']]], - ['par_5fp7',['par_p7',['../structbme680__calib__data.html#ad3af987b1e051ffb136efd2b8d2ba19e',1,'bme680_calib_data']]], - ['par_5fp8',['par_p8',['../structbme680__calib__data.html#a4e75e3ba3a52bda30daffc6c0e242c03',1,'bme680_calib_data']]], - ['par_5fp9',['par_p9',['../structbme680__calib__data.html#aebe0a4d1259e37c56b57e221add89bd9',1,'bme680_calib_data']]], - ['par_5ft1',['par_t1',['../structbme680__calib__data.html#a0f01e767396f9328edb6e5ae9a314b2f',1,'bme680_calib_data']]], - ['par_5ft2',['par_t2',['../structbme680__calib__data.html#a5ba9c77d416227faae07642a7537788f',1,'bme680_calib_data']]], - ['par_5ft3',['par_t3',['../structbme680__calib__data.html#acda7c141bb94e5e6b3654387fc8bce47',1,'bme680_calib_data']]], - ['power_5fmode',['power_mode',['../structbme680__dev.html#a7b2b2947aa6a6e336c90811373de1a6b',1,'bme680_dev']]], - ['pressure',['pressure',['../structbme680__field__data.html#af92dbc060536ac0cd546a1f402fcecb4',1,'bme680_field_data']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_b.html b/lib/Adafruit_BME680-1.0.5/docs/search/variables_b.html deleted file mode 100644 index ea46965c3..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_b.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_b.js b/lib/Adafruit_BME680-1.0.5/docs/search/variables_b.js deleted file mode 100644 index 9b5a7f657..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_b.js +++ /dev/null @@ -1,8 +0,0 @@ -var searchData= -[ - ['range_5fsw_5ferr',['range_sw_err',['../structbme680__calib__data.html#ab42378cffea08117ba872e9b7b2e3580',1,'bme680_calib_data']]], - ['read',['read',['../structbme680__dev.html#aa36aaa5af7488e1a9dce5b8b834b1956',1,'bme680_dev']]], - ['res_5fheat_5frange',['res_heat_range',['../structbme680__calib__data.html#ae37d0c08a01ea1ecf19b82fe4b08f1a8',1,'bme680_calib_data']]], - ['res_5fheat_5fval',['res_heat_val',['../structbme680__calib__data.html#aa77e96c4bd34ffd5611e014192b936fc',1,'bme680_calib_data']]], - ['run_5fgas',['run_gas',['../structbme680__gas__sett.html#a01ce898d2f312f59dd4bda78d7abe951',1,'bme680_gas_sett']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_c.html b/lib/Adafruit_BME680-1.0.5/docs/search/variables_c.html deleted file mode 100644 index 94bf1a67c..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_c.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_c.js b/lib/Adafruit_BME680-1.0.5/docs/search/variables_c.js deleted file mode 100644 index 09b2d0b47..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_c.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['status',['status',['../structbme680__field__data.html#af52b43f86807c1f1ef7526bbb9584c5b',1,'bme680_field_data']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_d.html b/lib/Adafruit_BME680-1.0.5/docs/search/variables_d.html deleted file mode 100644 index b9381e99e..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_d.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_d.js b/lib/Adafruit_BME680-1.0.5/docs/search/variables_d.js deleted file mode 100644 index 3fe3954ac..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_d.js +++ /dev/null @@ -1,6 +0,0 @@ -var searchData= -[ - ['t_5ffine',['t_fine',['../structbme680__calib__data.html#aae7b1a022503644a5e31996a97c032ae',1,'bme680_calib_data']]], - ['temperature',['temperature',['../structbme680__field__data.html#a8954536ec56e28e4bc79ed7bf1bc5176',1,'bme680_field_data']]], - ['tph_5fsett',['tph_sett',['../structbme680__dev.html#a38a17360e0b57778b734393e80819294',1,'bme680_dev']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_e.html b/lib/Adafruit_BME680-1.0.5/docs/search/variables_e.html deleted file mode 100644 index 375ad705d..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_e.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_e.js b/lib/Adafruit_BME680-1.0.5/docs/search/variables_e.js deleted file mode 100644 index 2a78ddde3..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_e.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['write',['write',['../structbme680__dev.html#a5e1e5dad78b9831125c240dde61b13a2',1,'bme680_dev']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_f.html b/lib/Adafruit_BME680-1.0.5/docs/search/variables_f.html deleted file mode 100644 index d37141866..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_f.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
-
Loading...
-
- -
Searching...
-
No Matches
- -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/search/variables_f.js b/lib/Adafruit_BME680-1.0.5/docs/search/variables_f.js deleted file mode 100644 index 2a78ddde3..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/search/variables_f.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['write',['write',['../structbme680__dev.html#a5e1e5dad78b9831125c240dde61b13a2',1,'bme680_dev']]] -]; diff --git a/lib/Adafruit_BME680-1.0.5/docs/splitbar.png b/lib/Adafruit_BME680-1.0.5/docs/splitbar.png deleted file mode 100644 index fe895f2c58179b471a22d8320b39a4bd7312ec8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^Yzz!63>-{AmhX=Jf(#6djGiuzAr*{o?=JLmPLyc> z_*`QK&+BH@jWrYJ7>r6%keRM@)Qyv8R=enp0jiI>aWlGyB58O zFVR20d+y`K7vDw(hJF3;>dD*3-?v=<8M)@x|EEGLnJsniYK!2U1 Y!`|5biEc?d1`HDhPgg&ebxsLQ02F6;9RL6T diff --git a/lib/Adafruit_BME680-1.0.5/docs/structbme680__calib__data-members.html b/lib/Adafruit_BME680-1.0.5/docs/structbme680__calib__data-members.html deleted file mode 100644 index ac6540bcf..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/structbme680__calib__data-members.html +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - -Adafruit BME680 Library: Member List - - - - - - - - - -
-
- - - - - - -
-
Adafruit BME680 Library -
-
-
- - - - - - - - -
-
- - -
- -
- -
-
-
-
bme680_calib_data Member List
-
-
- -

This is the complete list of members for bme680_calib_data, including all inherited members.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
par_gh1bme680_calib_data
par_gh2bme680_calib_data
par_gh3bme680_calib_data
par_h1bme680_calib_data
par_h2bme680_calib_data
par_h3bme680_calib_data
par_h4bme680_calib_data
par_h5bme680_calib_data
par_h6bme680_calib_data
par_h7bme680_calib_data
par_p1bme680_calib_data
par_p10bme680_calib_data
par_p2bme680_calib_data
par_p3bme680_calib_data
par_p4bme680_calib_data
par_p5bme680_calib_data
par_p6bme680_calib_data
par_p7bme680_calib_data
par_p8bme680_calib_data
par_p9bme680_calib_data
par_t1bme680_calib_data
par_t2bme680_calib_data
par_t3bme680_calib_data
range_sw_errbme680_calib_data
res_heat_rangebme680_calib_data
res_heat_valbme680_calib_data
t_finebme680_calib_data
- -
-Generated by   -doxygen - 1.8.13 -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/structbme680__calib__data.html b/lib/Adafruit_BME680-1.0.5/docs/structbme680__calib__data.html deleted file mode 100644 index 7adab1857..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/structbme680__calib__data.html +++ /dev/null @@ -1,550 +0,0 @@ - - - - - - - -Adafruit BME680 Library: bme680_calib_data Struct Reference - - - - - - - - - -
-
- - - - - - -
-
Adafruit BME680 Library -
-
-
- - - - - - - - -
-
- - -
- -
- -
-
-
-Public Attributes | -List of all members
-
-
bme680_calib_data Struct Reference
-
-
- -

Structure to hold the Calibration data. - More...

- -

#include <bme680_defs.h>

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Attributes

uint16_t par_h1
 
uint16_t par_h2
 
int8_t par_h3
 
int8_t par_h4
 
int8_t par_h5
 
uint8_t par_h6
 
int8_t par_h7
 
int8_t par_gh1
 
int16_t par_gh2
 
int8_t par_gh3
 
uint16_t par_t1
 
int16_t par_t2
 
int8_t par_t3
 
uint16_t par_p1
 
int16_t par_p2
 
int8_t par_p3
 
int16_t par_p4
 
int16_t par_p5
 
int8_t par_p6
 
int8_t par_p7
 
int16_t par_p8
 
int16_t par_p9
 
uint8_t par_p10
 
int32_t t_fine
 
uint8_t res_heat_range
 
int8_t res_heat_val
 
int8_t range_sw_err
 
-

Detailed Description

-

Structure to hold the Calibration data.

-

Member Data Documentation

- -

◆ par_gh1

- -
-
- - - - -
int8_t bme680_calib_data::par_gh1
-
-

Variable to store calibrated gas data

- -
-
- -

◆ par_gh2

- -
-
- - - - -
int16_t bme680_calib_data::par_gh2
-
-

Variable to store calibrated gas data

- -
-
- -

◆ par_gh3

- -
-
- - - - -
int8_t bme680_calib_data::par_gh3
-
-

Variable to store calibrated gas data

- -
-
- -

◆ par_h1

- -
-
- - - - -
uint16_t bme680_calib_data::par_h1
-
-

Variable to store calibrated humidity data

- -
-
- -

◆ par_h2

- -
-
- - - - -
uint16_t bme680_calib_data::par_h2
-
-

Variable to store calibrated humidity data

- -
-
- -

◆ par_h3

- -
-
- - - - -
int8_t bme680_calib_data::par_h3
-
-

Variable to store calibrated humidity data

- -
-
- -

◆ par_h4

- -
-
- - - - -
int8_t bme680_calib_data::par_h4
-
-

Variable to store calibrated humidity data

- -
-
- -

◆ par_h5

- -
-
- - - - -
int8_t bme680_calib_data::par_h5
-
-

Variable to store calibrated humidity data

- -
-
- -

◆ par_h6

- -
-
- - - - -
uint8_t bme680_calib_data::par_h6
-
-

Variable to store calibrated humidity data

- -
-
- -

◆ par_h7

- -
-
- - - - -
int8_t bme680_calib_data::par_h7
-
-

Variable to store calibrated humidity data

- -
-
- -

◆ par_p1

- -
-
- - - - -
uint16_t bme680_calib_data::par_p1
-
-

Variable to store calibrated pressure data

- -
-
- -

◆ par_p10

- -
-
- - - - -
uint8_t bme680_calib_data::par_p10
-
-

Variable to store calibrated pressure data

- -
-
- -

◆ par_p2

- -
-
- - - - -
int16_t bme680_calib_data::par_p2
-
-

Variable to store calibrated pressure data

- -
-
- -

◆ par_p3

- -
-
- - - - -
int8_t bme680_calib_data::par_p3
-
-

Variable to store calibrated pressure data

- -
-
- -

◆ par_p4

- -
-
- - - - -
int16_t bme680_calib_data::par_p4
-
-

Variable to store calibrated pressure data

- -
-
- -

◆ par_p5

- -
-
- - - - -
int16_t bme680_calib_data::par_p5
-
-

Variable to store calibrated pressure data

- -
-
- -

◆ par_p6

- -
-
- - - - -
int8_t bme680_calib_data::par_p6
-
-

Variable to store calibrated pressure data

- -
-
- -

◆ par_p7

- -
-
- - - - -
int8_t bme680_calib_data::par_p7
-
-

Variable to store calibrated pressure data

- -
-
- -

◆ par_p8

- -
-
- - - - -
int16_t bme680_calib_data::par_p8
-
-

Variable to store calibrated pressure data

- -
-
- -

◆ par_p9

- -
-
- - - - -
int16_t bme680_calib_data::par_p9
-
-

Variable to store calibrated pressure data

- -
-
- -

◆ par_t1

- -
-
- - - - -
uint16_t bme680_calib_data::par_t1
-
-

Variable to store calibrated temperature data

- -
-
- -

◆ par_t2

- -
-
- - - - -
int16_t bme680_calib_data::par_t2
-
-

Variable to store calibrated temperature data

- -
-
- -

◆ par_t3

- -
-
- - - - -
int8_t bme680_calib_data::par_t3
-
-

Variable to store calibrated temperature data

- -
-
- -

◆ range_sw_err

- -
-
- - - - -
int8_t bme680_calib_data::range_sw_err
-
-

Variable to store error range

- -
-
- -

◆ res_heat_range

- -
-
- - - - -
uint8_t bme680_calib_data::res_heat_range
-
-

Variable to store heater resistance range

- -
-
- -

◆ res_heat_val

- -
-
- - - - -
int8_t bme680_calib_data::res_heat_val
-
-

Variable to store heater resistance value

- -
-
- -

◆ t_fine

- -
-
- - - - -
int32_t bme680_calib_data::t_fine
-
-

Variable to store t_fine size

- -
-
-
The documentation for this struct was generated from the following file: -
- -
-Generated by   -doxygen - 1.8.13 -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/structbme680__dev-members.html b/lib/Adafruit_BME680-1.0.5/docs/structbme680__dev-members.html deleted file mode 100644 index 3d77627a1..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/structbme680__dev-members.html +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - -Adafruit BME680 Library: Member List - - - - - - - - - -
-
- - - - - - -
-
Adafruit BME680 Library -
-
-
- - - - - - - - -
-
- - -
- -
- -
-
-
-
bme680_dev Member List
-
-
- -

This is the complete list of members for bme680_dev, including all inherited members.

- - - - - - - - - - - - - - - - -
amb_tempbme680_dev
calibbme680_dev
chip_idbme680_dev
com_rsltbme680_dev
delay_msbme680_dev
dev_idbme680_dev
gas_settbme680_dev
info_msgbme680_dev
intfbme680_dev
mem_pagebme680_dev
new_fieldsbme680_dev
power_modebme680_dev
readbme680_dev
tph_settbme680_dev
writebme680_dev
- -
-Generated by   -doxygen - 1.8.13 -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/structbme680__dev.html b/lib/Adafruit_BME680-1.0.5/docs/structbme680__dev.html deleted file mode 100644 index a8773c192..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/structbme680__dev.html +++ /dev/null @@ -1,346 +0,0 @@ - - - - - - - -Adafruit BME680 Library: bme680_dev Struct Reference - - - - - - - - - -
-
- - - - - - -
-
Adafruit BME680 Library -
-
-
- - - - - - - - -
-
- - -
- -
- -
-
-
-Public Attributes | -List of all members
-
-
bme680_dev Struct Reference
-
-
- -

BME680 device structure. - More...

- -

#include <bme680_defs.h>

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Attributes

uint8_t chip_id
 
uint8_t dev_id
 
enum bme680_intf intf
 
uint8_t mem_page
 
int8_t amb_temp
 
struct bme680_calib_data calib
 
struct bme680_tph_sett tph_sett
 
struct bme680_gas_sett gas_sett
 
uint8_t power_mode
 
uint8_t new_fields
 
uint8_t info_msg
 
bme680_com_fptr_t read
 
bme680_com_fptr_t write
 
bme680_delay_fptr_t delay_ms
 
int8_t com_rslt
 
-

Detailed Description

-

BME680 device structure.

-

Member Data Documentation

- -

◆ amb_temp

- -
-
- - - - -
int8_t bme680_dev::amb_temp
-
-

Ambient temperature in Degree C

- -
-
- -

◆ calib

- -
-
- - - - -
struct bme680_calib_data bme680_dev::calib
-
-

Sensor calibration data

- -
-
- -

◆ chip_id

- -
-
- - - - -
uint8_t bme680_dev::chip_id
-
-

Chip Id

- -
-
- -

◆ com_rslt

- -
-
- - - - -
int8_t bme680_dev::com_rslt
-
-

Communication function result

- -
-
- -

◆ delay_ms

- -
-
- - - - -
bme680_delay_fptr_t bme680_dev::delay_ms
-
-

Delay in ms

- -
-
- -

◆ dev_id

- -
-
- - - - -
uint8_t bme680_dev::dev_id
-
-

Device Id

- -
-
- -

◆ gas_sett

- -
-
- - - - -
struct bme680_gas_sett bme680_dev::gas_sett
-
-

Gas Sensor settings

- -
-
- -

◆ info_msg

- -
-
- - - - -
uint8_t bme680_dev::info_msg
-
-

Store the info messages

- -
-
- -

◆ intf

- -
-
- - - - -
enum bme680_intf bme680_dev::intf
-
-

SPI/I2C interface

- -
-
- -

◆ mem_page

- -
-
- - - - -
uint8_t bme680_dev::mem_page
-
-

Memory page used

- -
-
- -

◆ new_fields

- -
-
- - - - -
uint8_t bme680_dev::new_fields
-
-

New sensor fields

- -
-
- -

◆ power_mode

- -
-
- - - - -
uint8_t bme680_dev::power_mode
-
-

Sensor power modes

- -
-
- -

◆ read

- -
-
- - - - -
bme680_com_fptr_t bme680_dev::read
-
-

Burst read structure

- -
-
- -

◆ tph_sett

- -
-
- - - - -
struct bme680_tph_sett bme680_dev::tph_sett
-
-

Sensor settings

- -
-
- -

◆ write

- -
-
- - - - -
bme680_com_fptr_t bme680_dev::write
-
-

Burst write structure

- -
-
-
The documentation for this struct was generated from the following file: -
- -
-Generated by   -doxygen - 1.8.13 -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/structbme680__field__data-members.html b/lib/Adafruit_BME680-1.0.5/docs/structbme680__field__data-members.html deleted file mode 100644 index 17327ca3e..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/structbme680__field__data-members.html +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - -Adafruit BME680 Library: Member List - - - - - - - - - -
-
- - - - - - -
-
Adafruit BME680 Library -
-
-
- - - - - - - - -
-
- - -
- -
- -
-
-
-
bme680_field_data Member List
-
-
- -

This is the complete list of members for bme680_field_data, including all inherited members.

- - - - - - - - -
gas_indexbme680_field_data
gas_resistancebme680_field_data
humiditybme680_field_data
meas_indexbme680_field_data
pressurebme680_field_data
statusbme680_field_data
temperaturebme680_field_data
- -
-Generated by   -doxygen - 1.8.13 -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/structbme680__field__data.html b/lib/Adafruit_BME680-1.0.5/docs/structbme680__field__data.html deleted file mode 100644 index 77b938416..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/structbme680__field__data.html +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - - -Adafruit BME680 Library: bme680_field_data Struct Reference - - - - - - - - - -
-
- - - - - - -
-
Adafruit BME680 Library -
-
-
- - - - - - - - -
-
- - -
- -
- -
-
-
-Public Attributes | -List of all members
-
-
bme680_field_data Struct Reference
-
-
- -

Sensor field data structure. - More...

- -

#include <bme680_defs.h>

- - - - - - - - - - - - - - - - -

-Public Attributes

uint8_t status
 
uint8_t gas_index
 
uint8_t meas_index
 
int16_t temperature
 
uint32_t pressure
 
uint32_t humidity
 
uint32_t gas_resistance
 
-

Detailed Description

-

Sensor field data structure.

-

Member Data Documentation

- -

◆ gas_index

- -
-
- - - - -
uint8_t bme680_field_data::gas_index
-
-

The index of the heater profile used

- -
-
- -

◆ gas_resistance

- -
-
- - - - -
uint32_t bme680_field_data::gas_resistance
-
-

Gas resistance in Ohms

- -
-
- -

◆ humidity

- -
-
- - - - -
uint32_t bme680_field_data::humidity
-
-

Humidity in % relative humidity x1000

- -
-
- -

◆ meas_index

- -
-
- - - - -
uint8_t bme680_field_data::meas_index
-
-

Measurement index to track order

- -
-
- -

◆ pressure

- -
-
- - - - -
uint32_t bme680_field_data::pressure
-
-

Pressure in Pascal

- -
-
- -

◆ status

- -
-
- - - - -
uint8_t bme680_field_data::status
-
-

Contains new_data, gasm_valid & heat_stab

- -
-
- -

◆ temperature

- -
-
- - - - -
int16_t bme680_field_data::temperature
-
-

Temperature in degree celsius x100

- -
-
-
The documentation for this struct was generated from the following file: -
- -
-Generated by   -doxygen - 1.8.13 -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/structbme680__gas__sett-members.html b/lib/Adafruit_BME680-1.0.5/docs/structbme680__gas__sett-members.html deleted file mode 100644 index 189fc7675..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/structbme680__gas__sett-members.html +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - -Adafruit BME680 Library: Member List - - - - - - - - - -
-
- - - - - - -
-
Adafruit BME680 Library -
-
-
- - - - - - - - -
-
- - -
- -
- -
-
-
-
bme680_gas_sett Member List
-
-
- -

This is the complete list of members for bme680_gas_sett, including all inherited members.

- - - - - - -
heatr_ctrlbme680_gas_sett
heatr_durbme680_gas_sett
heatr_tempbme680_gas_sett
nb_convbme680_gas_sett
run_gasbme680_gas_sett
- -
-Generated by   -doxygen - 1.8.13 -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/structbme680__gas__sett.html b/lib/Adafruit_BME680-1.0.5/docs/structbme680__gas__sett.html deleted file mode 100644 index 14d5c91c2..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/structbme680__gas__sett.html +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - -Adafruit BME680 Library: bme680_gas_sett Struct Reference - - - - - - - - - -
-
- - - - - - -
-
Adafruit BME680 Library -
-
-
- - - - - - - - -
-
- - -
- -
- -
-
-
-Public Attributes | -List of all members
-
-
bme680_gas_sett Struct Reference
-
-
- -

BME680 gas sensor which comprises of gas settings and status parameters. - More...

- -

#include <bme680_defs.h>

- - - - - - - - - - - - -

-Public Attributes

uint8_t nb_conv
 
uint8_t heatr_ctrl
 
uint8_t run_gas
 
uint16_t heatr_temp
 
uint16_t heatr_dur
 
-

Detailed Description

-

BME680 gas sensor which comprises of gas settings and status parameters.

-

Member Data Documentation

- -

◆ heatr_ctrl

- -
-
- - - - -
uint8_t bme680_gas_sett::heatr_ctrl
-
-

Variable to store heater control

- -
-
- -

◆ heatr_dur

- -
-
- - - - -
uint16_t bme680_gas_sett::heatr_dur
-
-

Pointer to store duration profile

- -
-
- -

◆ heatr_temp

- -
-
- - - - -
uint16_t bme680_gas_sett::heatr_temp
-
-

Pointer to store heater temperature

- -
-
- -

◆ nb_conv

- -
-
- - - - -
uint8_t bme680_gas_sett::nb_conv
-
-

Variable to store nb conversion

- -
-
- -

◆ run_gas

- -
-
- - - - -
uint8_t bme680_gas_sett::run_gas
-
-

Run gas enable value

- -
-
-
The documentation for this struct was generated from the following file: -
- -
-Generated by   -doxygen - 1.8.13 -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/structbme680__tph__sett-members.html b/lib/Adafruit_BME680-1.0.5/docs/structbme680__tph__sett-members.html deleted file mode 100644 index 245fb2f21..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/structbme680__tph__sett-members.html +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - -Adafruit BME680 Library: Member List - - - - - - - - - -
-
- - - - - - -
-
Adafruit BME680 Library -
-
-
- - - - - - - - -
-
- - -
- -
- -
-
-
-
bme680_tph_sett Member List
-
-
- -

This is the complete list of members for bme680_tph_sett, including all inherited members.

- - - - - -
filterbme680_tph_sett
os_humbme680_tph_sett
os_presbme680_tph_sett
os_tempbme680_tph_sett
- -
-Generated by   -doxygen - 1.8.13 -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/structbme680__tph__sett.html b/lib/Adafruit_BME680-1.0.5/docs/structbme680__tph__sett.html deleted file mode 100644 index d7e4767b1..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/structbme680__tph__sett.html +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - -Adafruit BME680 Library: bme680_tph_sett Struct Reference - - - - - - - - - -
-
- - - - - - -
-
Adafruit BME680 Library -
-
-
- - - - - - - - -
-
- - -
- -
- -
-
-
-Public Attributes | -List of all members
-
-
bme680_tph_sett Struct Reference
-
-
- -

BME680 sensor settings structure which comprises of ODR, over-sampling and filter settings. - More...

- -

#include <bme680_defs.h>

- - - - - - - - - - -

-Public Attributes

uint8_t os_hum
 
uint8_t os_temp
 
uint8_t os_pres
 
uint8_t filter
 
-

Detailed Description

-

BME680 sensor settings structure which comprises of ODR, over-sampling and filter settings.

-

Member Data Documentation

- -

◆ filter

- -
-
- - - - -
uint8_t bme680_tph_sett::filter
-
-

Filter coefficient

- -
-
- -

◆ os_hum

- -
-
- - - - -
uint8_t bme680_tph_sett::os_hum
-
-

Humidity oversampling

- -
-
- -

◆ os_pres

- -
-
- - - - -
uint8_t bme680_tph_sett::os_pres
-
-

Pressure oversampling

- -
-
- -

◆ os_temp

- -
-
- - - - -
uint8_t bme680_tph_sett::os_temp
-
-

Temperature oversampling

- -
-
-
The documentation for this struct was generated from the following file: -
- -
-Generated by   -doxygen - 1.8.13 -
- - diff --git a/lib/Adafruit_BME680-1.0.5/docs/sync_off.png b/lib/Adafruit_BME680-1.0.5/docs/sync_off.png deleted file mode 100644 index 3b443fc62892114406e3d399421b2a881b897acc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 853 zcmV-b1FHOqP)oT|#XixUYy%lpuf3i8{fX!o zUyDD0jOrAiT^tq>fLSOOABs-#u{dV^F$b{L9&!2=9&RmV;;8s^x&UqB$PCj4FdKbh zoB1WTskPUPu05XzFbA}=KZ-GP1fPpAfSs>6AHb12UlR%-i&uOlTpFNS7{jm@mkU1V zh`nrXr~+^lsV-s1dkZOaI|kYyVj3WBpPCY{n~yd%u%e+d=f%`N0FItMPtdgBb@py; zq@v6NVArhyTC7)ULw-Jy8y42S1~4n(3LkrW8mW(F-4oXUP3E`e#g**YyqI7h-J2zK zK{m9##m4ri!7N>CqQqCcnI3hqo1I;Yh&QLNY4T`*ptiQGozK>FF$!$+84Z`xwmeMh zJ0WT+OH$WYFALEaGj2_l+#DC3t7_S`vHpSivNeFbP6+r50cO8iu)`7i%Z4BTPh@_m3Tk!nAm^)5Bqnr%Ov|Baunj#&RPtRuK& z4RGz|D5HNrW83-#ydk}tVKJrNmyYt-sTxLGlJY5nc&Re zU4SgHNPx8~Yxwr$bsju?4q&%T1874xxzq+_%?h8_ofw~(bld=o3iC)LUNR*BY%c0y zWd_jX{Y8`l%z+ol1$@Qa?Cy!(0CVIEeYpKZ`(9{z>3$CIe;pJDQk$m3p}$>xBm4lb zKo{4S)`wdU9Ba9jJbVJ0C=SOefZe%d$8=2r={nu<_^a3~>c#t_U6dye5)JrR(_a^E f@}b6j1K9lwFJq@>o)+Ry00000NkvXXu0mjfWa5j* diff --git a/lib/Adafruit_BME680-1.0.5/docs/sync_on.png b/lib/Adafruit_BME680-1.0.5/docs/sync_on.png deleted file mode 100644 index e08320fb64e6fa33b573005ed6d8fe294e19db76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 845 zcmV-T1G4;yP)Y;xxyHF2B5Wzm| zOOGupOTn@c(JmBOl)e;XMNnZuiTJP>rM8<|Q`7I_))aP?*T)ow&n59{}X4$3Goat zgjs?*aasfbrokzG5cT4K=uG`E14xZl@z)F={P0Y^?$4t z>v!teRnNZym<6h{7sLyF1V0HsfEl+l6TrZpsfr1}luH~F7L}ktXu|*uVX^RG$L0`K zWs3j|0tIvVe(N%_?2{(iCPFGf#B6Hjy6o&}D$A%W%jfO8_W%ZO#-mh}EM$LMn7joJ z05dHr!5Y92g+31l<%i1(=L1a1pXX+OYnalY>31V4K}BjyRe3)9n#;-cCVRD_IG1fT zOKGeNY8q;TL@K{dj@D^scf&VCs*-Jb>8b>|`b*osv52-!A?BpbYtTQBns5EAU**$m zSnVSm(teh>tQi*S*A>#ySc=n;`BHz`DuG4&g4Kf8lLhca+zvZ7t7RflD6-i-mcK=M z!=^P$*u2)bkY5asG4gsss!Hn%u~>}kIW`vMs%lJLH+u*9<4PaV_c6U`KqWXQH%+Nu zTv41O(^ZVi@qhjQdG!fbZw&y+2o!iYymO^?ud3{P*HdoX83YV*Uu_HB=?U&W9%AU# z80}k1SS-CXTU7dcQlsm<^oYLxVSseqY6NO}dc`Nj?8vrhNuCdm@^{a3AQ_>6myOj+ z`1RsLUXF|dm|3k7s2jD(B{rzE>WI2scH8i1;=O5Cc9xB3^aJk%fQjqsu+kH#0=_5a z0nCE8@dbQa-|YIuUVvG0L_IwHMEhOj$Mj4Uq05 X8=0q~qBNan00000NkvXXu0mjfptF>5 diff --git a/lib/Adafruit_BME680-1.0.5/docs/tab_a.png b/lib/Adafruit_BME680-1.0.5/docs/tab_a.png deleted file mode 100644 index 3b725c41c5a527a3a3e40097077d0e206a681247..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^j6kfy!2~3aiye;!QlXwMjv*C{Z|8b*H5dputLHD# z=<0|*y7z(Vor?d;H&?EG&cXR}?!j-Lm&u1OOI7AIF5&c)RFE;&p0MYK>*Kl@eiymD r@|NpwKX@^z+;{u_Z~trSBfrMKa%3`zocFjEXaR$#tDnm{r-UW|TZ1%4 diff --git a/lib/Adafruit_BME680-1.0.5/docs/tab_b.png b/lib/Adafruit_BME680-1.0.5/docs/tab_b.png deleted file mode 100644 index e2b4a8638cb3496a016eaed9e16ffc12846dea18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^j6kfy!2~3aiye;!QU#tajv*C{Z}0l@H7kg?K0Lnr z!j&C6_(~HV9oQ0Pa6x{-v0AGV_E?vLn=ZI-;YrdjIl`U`uzuDWSP?o#Dmo{%SgM#oan kX~E1%D-|#H#QbHoIja2U-MgvsK&LQxy85}Sb4q9e0Efg%P5=M^ diff --git a/lib/Adafruit_BME680-1.0.5/docs/tabs.css b/lib/Adafruit_BME680-1.0.5/docs/tabs.css deleted file mode 100644 index a28614b8e..000000000 --- a/lib/Adafruit_BME680-1.0.5/docs/tabs.css +++ /dev/null @@ -1 +0,0 @@ -.sm{position:relative;z-index:9999}.sm,.sm ul,.sm li{display:block;list-style:none;margin:0;padding:0;line-height:normal;direction:ltr;text-align:left;-webkit-tap-highlight-color:rgba(0,0,0,0)}.sm-rtl,.sm-rtl ul,.sm-rtl li{direction:rtl;text-align:right}.sm>li>h1,.sm>li>h2,.sm>li>h3,.sm>li>h4,.sm>li>h5,.sm>li>h6{margin:0;padding:0}.sm ul{display:none}.sm li,.sm a{position:relative}.sm a{display:block}.sm a.disabled{cursor:not-allowed}.sm:after{content:"\00a0";display:block;height:0;font:0/0 serif;clear:both;visibility:hidden;overflow:hidden}.sm,.sm *,.sm *:before,.sm *:after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}#doc-content{overflow:auto;display:block;padding:0;margin:0;-webkit-overflow-scrolling:touch}.sm-dox{background-image:url("tab_b.png")}.sm-dox a,.sm-dox a:focus,.sm-dox a:hover,.sm-dox a:active{padding:0 12px;padding-right:43px;font-family:"Lucida Grande","Geneva","Helvetica",Arial,sans-serif;font-size:13px;font-weight:bold;line-height:36px;text-decoration:none;text-shadow:0 1px 1px rgba(255,255,255,0.9);color:#283a5d;outline:0}.sm-dox a:hover{background-image:url("tab_a.png");background-repeat:repeat-x;color:white;text-shadow:0 1px 1px black}.sm-dox a.current{color:#d23600}.sm-dox a.disabled{color:#bbb}.sm-dox a span.sub-arrow{position:absolute;top:50%;margin-top:-14px;left:auto;right:3px;width:28px;height:28px;overflow:hidden;font:bold 12px/28px monospace!important;text-align:center;text-shadow:none;background:rgba(255,255,255,0.5);-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.sm-dox a.highlighted span.sub-arrow:before{display:block;content:'-'}.sm-dox>li:first-child>a,.sm-dox>li:first-child>:not(ul) a{-moz-border-radius:5px 5px 0 0;-webkit-border-radius:5px;border-radius:5px 5px 0 0}.sm-dox>li:last-child>a,.sm-dox>li:last-child>*:not(ul) a,.sm-dox>li:last-child>ul,.sm-dox>li:last-child>ul>li:last-child>a,.sm-dox>li:last-child>ul>li:last-child>*:not(ul) a,.sm-dox>li:last-child>ul>li:last-child>ul,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>a,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>*:not(ul) a,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>a,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>*:not(ul) a,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>a,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>*:not(ul) a,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul{-moz-border-radius:0 0 5px 5px;-webkit-border-radius:0;border-radius:0 0 5px 5px}.sm-dox>li:last-child>a.highlighted,.sm-dox>li:last-child>*:not(ul) a.highlighted,.sm-dox>li:last-child>ul>li:last-child>a.highlighted,.sm-dox>li:last-child>ul>li:last-child>*:not(ul) a.highlighted,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>a.highlighted,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>*:not(ul) a.highlighted,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>a.highlighted,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>*:not(ul) a.highlighted,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>a.highlighted,.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>*:not(ul) a.highlighted{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0}.sm-dox ul{background:rgba(162,162,162,0.1)}.sm-dox ul a,.sm-dox ul a:focus,.sm-dox ul a:hover,.sm-dox ul a:active{font-size:12px;border-left:8px solid transparent;line-height:36px;text-shadow:none;background-color:white;background-image:none}.sm-dox ul a:hover{background-image:url("tab_a.png");background-repeat:repeat-x;color:white;text-shadow:0 1px 1px black}.sm-dox ul ul a,.sm-dox ul ul a:hover,.sm-dox ul ul a:focus,.sm-dox ul ul a:active{border-left:16px solid transparent}.sm-dox ul ul ul a,.sm-dox ul ul ul a:hover,.sm-dox ul ul ul a:focus,.sm-dox ul ul ul a:active{border-left:24px solid transparent}.sm-dox ul ul ul ul a,.sm-dox ul ul ul ul a:hover,.sm-dox ul ul ul ul a:focus,.sm-dox ul ul ul ul a:active{border-left:32px solid transparent}.sm-dox ul ul ul ul ul a,.sm-dox ul ul ul ul ul a:hover,.sm-dox ul ul ul ul ul a:focus,.sm-dox ul ul ul ul ul a:active{border-left:40px solid transparent}@media(min-width:768px){.sm-dox ul{position:absolute;width:12em}.sm-dox li{float:left}.sm-dox.sm-rtl li{float:right}.sm-dox ul li,.sm-dox.sm-rtl ul li,.sm-dox.sm-vertical li{float:none}.sm-dox a{white-space:nowrap}.sm-dox ul a,.sm-dox.sm-vertical a{white-space:normal}.sm-dox .sm-nowrap>li>a,.sm-dox .sm-nowrap>li>:not(ul) a{white-space:nowrap}.sm-dox{padding:0 10px;background-image:url("tab_b.png");line-height:36px}.sm-dox a span.sub-arrow{top:50%;margin-top:-2px;right:12px;width:0;height:0;border-width:4px;border-style:solid dashed dashed dashed;border-color:#283a5d transparent transparent transparent;background:transparent;-moz-border-radius:0;-webkit-border-radius:0;border-radius:0}.sm-dox a,.sm-dox a:focus,.sm-dox a:active,.sm-dox a:hover,.sm-dox a.highlighted{padding:0 12px;background-image:url("tab_s.png");background-repeat:no-repeat;background-position:right;-moz-border-radius:0!important;-webkit-border-radius:0;border-radius:0!important}.sm-dox a:hover{background-image:url("tab_a.png");background-repeat:repeat-x;color:white;text-shadow:0 1px 1px black}.sm-dox a:hover span.sub-arrow{border-color:white transparent transparent transparent}.sm-dox a.has-submenu{padding-right:24px}.sm-dox li{border-top:0}.sm-dox>li>ul:before,.sm-dox>li>ul:after{content:'';position:absolute;top:-18px;left:30px;width:0;height:0;overflow:hidden;border-width:9px;border-style:dashed dashed solid dashed;border-color:transparent transparent #bbb transparent}.sm-dox>li>ul:after{top:-16px;left:31px;border-width:8px;border-color:transparent transparent #fff transparent}.sm-dox ul{border:1px solid #bbb;padding:5px 0;background:#fff;-moz-border-radius:5px!important;-webkit-border-radius:5px;border-radius:5px!important;-moz-box-shadow:0 5px 9px rgba(0,0,0,0.2);-webkit-box-shadow:0 5px 9px rgba(0,0,0,0.2);box-shadow:0 5px 9px rgba(0,0,0,0.2)}.sm-dox ul a span.sub-arrow{right:8px;top:50%;margin-top:-5px;border-width:5px;border-color:transparent transparent transparent #555;border-style:dashed dashed dashed solid}.sm-dox ul a,.sm-dox ul a:hover,.sm-dox ul a:focus,.sm-dox ul a:active,.sm-dox ul a.highlighted{color:#555;background-image:none;border:0!important;color:#555;background-image:none}.sm-dox ul a:hover{background-image:url("tab_a.png");background-repeat:repeat-x;color:white;text-shadow:0 1px 1px black}.sm-dox ul a:hover span.sub-arrow{border-color:transparent transparent transparent white}.sm-dox span.scroll-up,.sm-dox span.scroll-down{position:absolute;display:none;visibility:hidden;overflow:hidden;background:#fff;height:36px}.sm-dox span.scroll-up:hover,.sm-dox span.scroll-down:hover{background:#eee}.sm-dox span.scroll-up:hover span.scroll-up-arrow,.sm-dox span.scroll-up:hover span.scroll-down-arrow{border-color:transparent transparent #d23600 transparent}.sm-dox span.scroll-down:hover span.scroll-down-arrow{border-color:#d23600 transparent transparent transparent}.sm-dox span.scroll-up-arrow,.sm-dox span.scroll-down-arrow{position:absolute;top:0;left:50%;margin-left:-6px;width:0;height:0;overflow:hidden;border-width:6px;border-style:dashed dashed solid dashed;border-color:transparent transparent #555 transparent}.sm-dox span.scroll-down-arrow{top:8px;border-style:solid dashed dashed dashed;border-color:#555 transparent transparent transparent}.sm-dox.sm-rtl a.has-submenu{padding-right:12px;padding-left:24px}.sm-dox.sm-rtl a span.sub-arrow{right:auto;left:12px}.sm-dox.sm-rtl.sm-vertical a.has-submenu{padding:10px 20px}.sm-dox.sm-rtl.sm-vertical a span.sub-arrow{right:auto;left:8px;border-style:dashed solid dashed dashed;border-color:transparent #555 transparent transparent}.sm-dox.sm-rtl>li>ul:before{left:auto;right:30px}.sm-dox.sm-rtl>li>ul:after{left:auto;right:31px}.sm-dox.sm-rtl ul a.has-submenu{padding:10px 20px!important}.sm-dox.sm-rtl ul a span.sub-arrow{right:auto;left:8px;border-style:dashed solid dashed dashed;border-color:transparent #555 transparent transparent}.sm-dox.sm-vertical{padding:10px 0;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.sm-dox.sm-vertical a{padding:10px 20px}.sm-dox.sm-vertical a:hover,.sm-dox.sm-vertical a:focus,.sm-dox.sm-vertical a:active,.sm-dox.sm-vertical a.highlighted{background:#fff}.sm-dox.sm-vertical a.disabled{background-image:url("tab_b.png")}.sm-dox.sm-vertical a span.sub-arrow{right:8px;top:50%;margin-top:-5px;border-width:5px;border-style:dashed dashed dashed solid;border-color:transparent transparent transparent #555}.sm-dox.sm-vertical>li>ul:before,.sm-dox.sm-vertical>li>ul:after{display:none}.sm-dox.sm-vertical ul a{padding:10px 20px}.sm-dox.sm-vertical ul a:hover,.sm-dox.sm-vertical ul a:focus,.sm-dox.sm-vertical ul a:active,.sm-dox.sm-vertical ul a.highlighted{background:#eee}.sm-dox.sm-vertical ul a.disabled{background:#fff}} \ No newline at end of file diff --git a/lib/Adafruit_BME680-1.0.5/examples/bme680oled/bme680oled.ino b/lib/Adafruit_BME680-1.0.5/examples/bme680oled/bme680oled.ino deleted file mode 100644 index bec28a01f..000000000 --- a/lib/Adafruit_BME680-1.0.5/examples/bme680oled/bme680oled.ino +++ /dev/null @@ -1,88 +0,0 @@ -/*************************************************************************** - This is a library for the BME680 gas, humidity, temperature & pressure sensor - - Designed specifically to work with the Adafruit BME680 Breakout - ----> http://www.adafruit.com/products/3660 - - These sensors use I2C or SPI to communicate, 2 or 4 pins are required - to interface. - - Adafruit invests time and resources providing this open source code, - please support Adafruit and open-source hardware by purchasing products - from Adafruit! - - Written by Limor Fried & Kevin Townsend for Adafruit Industries. - BSD license, all text above must be included in any redistribution - ***************************************************************************/ - -#include -#include -#include -#include "Adafruit_BME680.h" -#include -#include - -#define BME_SCK 13 -#define BME_MISO 12 -#define BME_MOSI 11 -#define BME_CS 10 - -#define SEALEVELPRESSURE_HPA (1013.25) - -Adafruit_BME680 bme; // I2C -//Adafruit_BME680 bme(BME_CS); // hardware SPI -//Adafruit_BME680 bme(BME_CS, BME_MOSI, BME_MISO, BME_SCK); - -Adafruit_SSD1306 display = Adafruit_SSD1306(); - -void setup() { - Serial.begin(9600); - Serial.println(F("BME680 test")); - - // by default, we'll generate the high voltage from the 3.3v line internally! (neat!) - display.begin(SSD1306_SWITCHCAPVCC, 0x3C); // initialize with the I2C addr 0x3C (for the 128x32) - // init done - display.display(); - delay(100); - display.clearDisplay(); - display.display(); - display.setTextSize(1); - display.setTextColor(WHITE); - - if (!bme.begin()) { - Serial.println("Could not find a valid BME680 sensor, check wiring!"); - while (1); - } - - // Set up oversampling and filter initialization - bme.setTemperatureOversampling(BME680_OS_8X); - bme.setHumidityOversampling(BME680_OS_2X); - bme.setPressureOversampling(BME680_OS_4X); - bme.setIIRFilterSize(BME680_FILTER_SIZE_3); - bme.setGasHeater(320, 150); // 320*C for 150 ms -} - -void loop() { - display.setCursor(0,0); - display.clearDisplay(); - - if (! bme.performReading()) { - Serial.println("Failed to perform reading :("); - return; - } - Serial.print("Temperature = "); Serial.print(bme.temperature); Serial.println(" *C"); - display.print("Temperature: "); display.print(bme.temperature); display.println(" *C"); - - Serial.print("Pressure = "); Serial.print(bme.pressure / 100.0); Serial.println(" hPa"); - display.print("Pressure: "); display.print(bme.pressure / 100); display.println(" hPa"); - - Serial.print("Humidity = "); Serial.print(bme.humidity); Serial.println(" %"); - display.print("Humidity: "); display.print(bme.humidity); display.println(" %"); - - Serial.print("Gas = "); Serial.print(bme.gas_resistance / 1000.0); Serial.println(" KOhms"); - display.print("Gas: "); display.print(bme.gas_resistance / 1000.0); display.println(" KOhms"); - - Serial.println(); - display.display(); - delay(2000); -} \ No newline at end of file diff --git a/lib/Adafruit_BME680-1.0.5/examples/bme680test/bme680test.ino b/lib/Adafruit_BME680-1.0.5/examples/bme680test/bme680test.ino deleted file mode 100644 index 887e11e00..000000000 --- a/lib/Adafruit_BME680-1.0.5/examples/bme680test/bme680test.ino +++ /dev/null @@ -1,79 +0,0 @@ -/*************************************************************************** - This is a library for the BME680 gas, humidity, temperature & pressure sensor - - Designed specifically to work with the Adafruit BME680 Breakout - ----> http://www.adafruit.com/products/3660 - - These sensors use I2C or SPI to communicate, 2 or 4 pins are required - to interface. - - Adafruit invests time and resources providing this open source code, - please support Adafruit and open-source hardware by purchasing products - from Adafruit! - - Written by Limor Fried & Kevin Townsend for Adafruit Industries. - BSD license, all text above must be included in any redistribution - ***************************************************************************/ - -#include -#include -#include -#include "Adafruit_BME680.h" - -#define BME_SCK 13 -#define BME_MISO 12 -#define BME_MOSI 11 -#define BME_CS 10 - -#define SEALEVELPRESSURE_HPA (1013.25) - -Adafruit_BME680 bme; // I2C -//Adafruit_BME680 bme(BME_CS); // hardware SPI -//Adafruit_BME680 bme(BME_CS, BME_MOSI, BME_MISO, BME_SCK); - -void setup() { - Serial.begin(9600); - while (!Serial); - Serial.println(F("BME680 test")); - - if (!bme.begin()) { - Serial.println("Could not find a valid BME680 sensor, check wiring!"); - while (1); - } - - // Set up oversampling and filter initialization - bme.setTemperatureOversampling(BME680_OS_8X); - bme.setHumidityOversampling(BME680_OS_2X); - bme.setPressureOversampling(BME680_OS_4X); - bme.setIIRFilterSize(BME680_FILTER_SIZE_3); - bme.setGasHeater(320, 150); // 320*C for 150 ms -} - -void loop() { - if (! bme.performReading()) { - Serial.println("Failed to perform reading :("); - return; - } - Serial.print("Temperature = "); - Serial.print(bme.temperature); - Serial.println(" *C"); - - Serial.print("Pressure = "); - Serial.print(bme.pressure / 100.0); - Serial.println(" hPa"); - - Serial.print("Humidity = "); - Serial.print(bme.humidity); - Serial.println(" %"); - - Serial.print("Gas = "); - Serial.print(bme.gas_resistance / 1000.0); - Serial.println(" KOhms"); - - Serial.print("Approx. Altitude = "); - Serial.print(bme.readAltitude(SEALEVELPRESSURE_HPA)); - Serial.println(" m"); - - Serial.println(); - delay(2000); -} \ No newline at end of file diff --git a/lib/Adafruit_BME680-1.0.5/library.properties b/lib/Adafruit_BME680-1.0.5/library.properties deleted file mode 100644 index da906505a..000000000 --- a/lib/Adafruit_BME680-1.0.5/library.properties +++ /dev/null @@ -1,9 +0,0 @@ -name=Adafruit BME680 Library -version=1.0.5 -author=Adafruit -maintainer=Adafruit -sentence=Arduino library for BME680 sensors. -paragraph=Arduino library for BME680 humidity and pressure sensors. -category=Sensors -url=https://github.com/adafruit/Adafruit_BME680 -architectures=* diff --git a/lib/Adafruit_Sensor-1.0.2.02/Adafruit_Sensor.h b/lib/Adafruit_Sensor-1.0.2.02/Adafruit_Sensor.h deleted file mode 100644 index 7742afc1d..000000000 --- a/lib/Adafruit_Sensor-1.0.2.02/Adafruit_Sensor.h +++ /dev/null @@ -1,154 +0,0 @@ -/* -* Copyright (C) 2008 The Android Open Source Project -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software< /span> -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -/* Update by K. Townsend (Adafruit Industries) for lighter typedefs, and - * extended sensor support to include color, voltage and current */ - -#ifndef _ADAFRUIT_SENSOR_H -#define _ADAFRUIT_SENSOR_H - -#if ARDUINO >= 100 - #include "Arduino.h" - #include "Print.h" -#else - #include "WProgram.h" -#endif - -/* Intentionally modeled after sensors.h in the Android API: - * https://github.com/android/platform_hardware_libhardware/blob/master/include/hardware/sensors.h */ - -/* Constants */ -#define SENSORS_GRAVITY_EARTH (9.80665F) /**< Earth's gravity in m/s^2 */ -#define SENSORS_GRAVITY_MOON (1.6F) /**< The moon's gravity in m/s^2 */ -#define SENSORS_GRAVITY_SUN (275.0F) /**< The sun's gravity in m/s^2 */ -#define SENSORS_GRAVITY_STANDARD (SENSORS_GRAVITY_EARTH) -#define SENSORS_MAGFIELD_EARTH_MAX (60.0F) /**< Maximum magnetic field on Earth's surface */ -#define SENSORS_MAGFIELD_EARTH_MIN (30.0F) /**< Minimum magnetic field on Earth's surface */ -#define SENSORS_PRESSURE_SEALEVELHPA (1013.25F) /**< Average sea level pressure is 1013.25 hPa */ -#define SENSORS_DPS_TO_RADS (0.017453293F) /**< Degrees/s to rad/s multiplier */ -#define SENSORS_GAUSS_TO_MICROTESLA (100) /**< Gauss to micro-Tesla multiplier */ - -/** Sensor types */ -typedef enum -{ - SENSOR_TYPE_ACCELEROMETER = (1), /**< Gravity + linear acceleration */ - SENSOR_TYPE_MAGNETIC_FIELD = (2), - SENSOR_TYPE_ORIENTATION = (3), - SENSOR_TYPE_GYROSCOPE = (4), - SENSOR_TYPE_LIGHT = (5), - SENSOR_TYPE_PRESSURE = (6), - SENSOR_TYPE_PROXIMITY = (8), - SENSOR_TYPE_GRAVITY = (9), - SENSOR_TYPE_LINEAR_ACCELERATION = (10), /**< Acceleration not including gravity */ - SENSOR_TYPE_ROTATION_VECTOR = (11), - SENSOR_TYPE_RELATIVE_HUMIDITY = (12), - SENSOR_TYPE_AMBIENT_TEMPERATURE = (13), - SENSOR_TYPE_VOLTAGE = (15), - SENSOR_TYPE_CURRENT = (16), - SENSOR_TYPE_COLOR = (17) -} sensors_type_t; - -/** struct sensors_vec_s is used to return a vector in a common format. */ -typedef struct { - union { - float v[3]; - struct { - float x; - float y; - float z; - }; - /* Orientation sensors */ - struct { - float roll; /**< Rotation around the longitudinal axis (the plane body, 'X axis'). Roll is positive and increasing when moving downward. -90°<=roll<=90° */ - float pitch; /**< Rotation around the lateral axis (the wing span, 'Y axis'). Pitch is positive and increasing when moving upwards. -180°<=pitch<=180°) */ - float heading; /**< Angle between the longitudinal axis (the plane body) and magnetic north, measured clockwise when viewing from the top of the device. 0-359° */ - }; - }; - int8_t status; - uint8_t reserved[3]; -} sensors_vec_t; - -/** struct sensors_color_s is used to return color data in a common format. */ -typedef struct { - union { - float c[3]; - /* RGB color space */ - struct { - float r; /**< Red component */ - float g; /**< Green component */ - float b; /**< Blue component */ - }; - }; - uint32_t rgba; /**< 24-bit RGBA value */ -} sensors_color_t; - -/* Sensor event (36 bytes) */ -/** struct sensor_event_s is used to provide a single sensor event in a common format. */ -typedef struct -{ - int32_t version; /**< must be sizeof(struct sensors_event_t) */ - int32_t sensor_id; /**< unique sensor identifier */ - int32_t type; /**< sensor type */ - int32_t reserved0; /**< reserved */ - int32_t timestamp; /**< time is in milliseconds */ - union - { - float data[4]; - sensors_vec_t acceleration; /**< acceleration values are in meter per second per second (m/s^2) */ - sensors_vec_t magnetic; /**< magnetic vector values are in micro-Tesla (uT) */ - sensors_vec_t orientation; /**< orientation values are in degrees */ - sensors_vec_t gyro; /**< gyroscope values are in rad/s */ - float temperature; /**< temperature is in degrees centigrade (Celsius) */ - float distance; /**< distance in centimeters */ - float light; /**< light in SI lux units */ - float pressure; /**< pressure in hectopascal (hPa) */ - float relative_humidity; /**< relative humidity in percent */ - float current; /**< current in milliamps (mA) */ - float voltage; /**< voltage in volts (V) */ - sensors_color_t color; /**< color in RGB component values */ - }; -} sensors_event_t; - -/* Sensor details (40 bytes) */ -/** struct sensor_s is used to describe basic information about a specific sensor. */ -typedef struct -{ - char name[12]; /**< sensor name */ - int32_t version; /**< version of the hardware + driver */ - int32_t sensor_id; /**< unique sensor identifier */ - int32_t type; /**< this sensor's type (ex. SENSOR_TYPE_LIGHT) */ - float max_value; /**< maximum value of this sensor's value in SI units */ - float min_value; /**< minimum value of this sensor's value in SI units */ - float resolution; /**< smallest difference between two values reported by this sensor */ - int32_t min_delay; /**< min delay in microseconds between events. zero = not a constant rate */ -} sensor_t; - -class Adafruit_Sensor { - public: - // Constructor(s) - Adafruit_Sensor() {} - virtual ~Adafruit_Sensor() {} - - // These must be defined by the subclass - virtual void enableAutoRange(bool enabled) {}; - virtual bool getEvent(sensors_event_t*) = 0; - virtual void getSensor(sensor_t*) = 0; - - private: - bool _autoRange; -}; - -#endif diff --git a/lib/Adafruit_Sensor-1.0.2.02/README.md b/lib/Adafruit_Sensor-1.0.2.02/README.md deleted file mode 100644 index a4cd6aebe..000000000 --- a/lib/Adafruit_Sensor-1.0.2.02/README.md +++ /dev/null @@ -1,221 +0,0 @@ -# Adafruit Unified Sensor Driver # - -Many small embedded systems exist to collect data from sensors, analyse the data, and either take an appropriate action or send that sensor data to another system for processing. - -One of the many challenges of embedded systems design is the fact that parts you used today may be out of production tomorrow, or system requirements may change and you may need to choose a different sensor down the road. - -Creating new drivers is a relatively easy task, but integrating them into existing systems is both error prone and time consuming since sensors rarely use the exact same units of measurement. - -By reducing all data to a single **sensors\_event\_t** 'type' and settling on specific, **standardised SI units** for each sensor family the same sensor types return values that are comparable with any other similar sensor. This enables you to switch sensor models with very little impact on the rest of the system, which can help mitigate some of the risks and problems of sensor availability and code reuse. - -The unified sensor abstraction layer is also useful for data-logging and data-transmission since you only have one well-known type to log or transmit over the air or wire. - -## Unified Sensor Drivers ## - -The following drivers are based on the Adafruit Unified Sensor Driver: - -**Accelerometers** - - [Adafruit\_ADXL345](https://github.com/adafruit/Adafruit_ADXL345) - - [Adafruit\_LSM303DLHC](https://github.com/adafruit/Adafruit_LSM303DLHC) - - [Adafruit\_MMA8451\_Library](https://github.com/adafruit/Adafruit_MMA8451_Library) - -**Gyroscope** - - [Adafruit\_L3GD20\_U](https://github.com/adafruit/Adafruit_L3GD20_U) - -**Light** - - [Adafruit\_TSL2561](https://github.com/adafruit/Adafruit_TSL2561) - - [Adafruit\_TSL2591\_Library](https://github.com/adafruit/Adafruit_TSL2591_Library) - -**Magnetometers** - - [Adafruit\_LSM303DLHC](https://github.com/adafruit/Adafruit_LSM303DLHC) - - [Adafruit\_HMC5883\_Unified](https://github.com/adafruit/Adafruit_HMC5883_Unified) - -**Barometric Pressure** - - [Adafruit\_BMP085\_Unified](https://github.com/adafruit/Adafruit_BMP085_Unified) - - [Adafruit\_BMP183\_Unified\_Library](https://github.com/adafruit/Adafruit_BMP183_Unified_Library) - -**Humidity & Temperature** - - [DHT-sensor-library](https://github.com/adafruit/DHT-sensor-library) - -**Orientation** - - [Adafruit_BNO055](https://github.com/adafruit/Adafruit_BNO055) - -## How Does it Work? ## - -Any driver that supports the Adafruit unified sensor abstraction layer will implement the Adafruit\_Sensor base class. There are two main typedefs and one enum defined in Adafruit_Sensor.h that are used to 'abstract' away the sensor details and values: - -**Sensor Types (sensors\_type\_t)** - -These pre-defined sensor types are used to properly handle the two related typedefs below, and allows us determine what types of units the sensor uses, etc. - -``` -/** Sensor types */ -typedef enum -{ - SENSOR_TYPE_ACCELEROMETER = (1), - SENSOR_TYPE_MAGNETIC_FIELD = (2), - SENSOR_TYPE_ORIENTATION = (3), - SENSOR_TYPE_GYROSCOPE = (4), - SENSOR_TYPE_LIGHT = (5), - SENSOR_TYPE_PRESSURE = (6), - SENSOR_TYPE_PROXIMITY = (8), - SENSOR_TYPE_GRAVITY = (9), - SENSOR_TYPE_LINEAR_ACCELERATION = (10), - SENSOR_TYPE_ROTATION_VECTOR = (11), - SENSOR_TYPE_RELATIVE_HUMIDITY = (12), - SENSOR_TYPE_AMBIENT_TEMPERATURE = (13), - SENSOR_TYPE_VOLTAGE = (15), - SENSOR_TYPE_CURRENT = (16), - SENSOR_TYPE_COLOR = (17) -} sensors_type_t; -``` - -**Sensor Details (sensor\_t)** - -This typedef describes the specific capabilities of this sensor, and allows us to know what sensor we are using beneath the abstraction layer. - -``` -/* Sensor details (40 bytes) */ -/** struct sensor_s is used to describe basic information about a specific sensor. */ -typedef struct -{ - char name[12]; - int32_t version; - int32_t sensor_id; - int32_t type; - float max_value; - float min_value; - float resolution; - int32_t min_delay; -} sensor_t; -``` - -The individual fields are intended to be used as follows: - -- **name**: The sensor name or ID, up to a maximum of twelve characters (ex. "MPL115A2") -- **version**: The version of the sensor HW and the driver to allow us to differentiate versions of the board or driver -- **sensor\_id**: A unique sensor identifier that is used to differentiate this specific sensor instance from any others that are present on the system or in the sensor network -- **type**: The sensor type, based on **sensors\_type\_t** in sensors.h -- **max\_value**: The maximum value that this sensor can return (in the appropriate SI unit) -- **min\_value**: The minimum value that this sensor can return (in the appropriate SI unit) -- **resolution**: The smallest difference between two values that this sensor can report (in the appropriate SI unit) -- **min\_delay**: The minimum delay in microseconds between two sensor events, or '0' if there is no constant sensor rate - -**Sensor Data/Events (sensors\_event\_t)** - -This typedef is used to return sensor data from any sensor supported by the abstraction layer, using standard SI units and scales. - -``` -/* Sensor event (36 bytes) */ -/** struct sensor_event_s is used to provide a single sensor event in a common format. */ -typedef struct -{ - int32_t version; - int32_t sensor_id; - int32_t type; - int32_t reserved0; - int32_t timestamp; - union - { - float data[4]; - sensors_vec_t acceleration; - sensors_vec_t magnetic; - sensors_vec_t orientation; - sensors_vec_t gyro; - float temperature; - float distance; - float light; - float pressure; - float relative_humidity; - float current; - float voltage; - sensors_color_t color; - }; -} sensors_event_t; -``` -It includes the following fields: - -- **version**: Contain 'sizeof(sensors\_event\_t)' to identify which version of the API we're using in case this changes in the future -- **sensor\_id**: A unique sensor identifier that is used to differentiate this specific sensor instance from any others that are present on the system or in the sensor network (must match the sensor\_id value in the corresponding sensor\_t enum above!) -- **type**: the sensor type, based on **sensors\_type\_t** in sensors.h -- **timestamp**: time in milliseconds when the sensor value was read -- **data[4]**: An array of four 32-bit values that allows us to encapsulate any type of sensor data via a simple union (further described below) - -**Required Functions** - -In addition to the two standard types and the sensor type enum, all drivers based on Adafruit_Sensor must also implement the following two functions: - -``` -bool getEvent(sensors_event_t*); -``` -Calling this function will populate the supplied sensors\_event\_t reference with the latest available sensor data. You should call this function as often as you want to update your data. - -``` -void getSensor(sensor_t*); -``` -Calling this function will provide some basic information about the sensor (the sensor name, driver version, min and max values, etc. - -**Standardised SI values for sensors\_event\_t** - -A key part of the abstraction layer is the standardisation of values on SI units of a particular scale, which is accomplished via the data[4] union in sensors\_event\_t above. This 16 byte union includes fields for each main sensor type, and uses the following SI units and scales: - -- **acceleration**: values are in **meter per second per second** (m/s^2) -- **magnetic**: values are in **micro-Tesla** (uT) -- **orientation**: values are in **degrees** -- **gyro**: values are in **rad/s** -- **temperature**: values in **degrees centigrade** (Celsius) -- **distance**: values are in **centimeters** -- **light**: values are in **SI lux** units -- **pressure**: values are in **hectopascal** (hPa) -- **relative\_humidity**: values are in **percent** -- **current**: values are in **milliamps** (mA) -- **voltage**: values are in **volts** (V) -- **color**: values are in 0..1.0 RGB channel luminosity and 32-bit RGBA format - -## The Unified Driver Abstraction Layer in Practice ## - -Using the unified sensor abstraction layer is relatively easy once a compliant driver has been created. - -Every compliant sensor can now be read using a single, well-known 'type' (sensors\_event\_t), and there is a standardised way of interrogating a sensor about its specific capabilities (via sensor\_t). - -An example of reading the [TSL2561](https://github.com/adafruit/Adafruit_TSL2561) light sensor can be seen below: - -``` - Adafruit_TSL2561 tsl = Adafruit_TSL2561(TSL2561_ADDR_FLOAT, 12345); - ... - /* Get a new sensor event */ - sensors_event_t event; - tsl.getEvent(&event); - - /* Display the results (light is measured in lux) */ - if (event.light) - { - Serial.print(event.light); Serial.println(" lux"); - } - else - { - /* If event.light = 0 lux the sensor is probably saturated - and no reliable data could be generated! */ - Serial.println("Sensor overload"); - } -``` - -Similarly, we can get the basic technical capabilities of this sensor with the following code: - -``` - sensor_t sensor; - - sensor_t sensor; - tsl.getSensor(&sensor); - - /* Display the sensor details */ - Serial.println("------------------------------------"); - Serial.print ("Sensor: "); Serial.println(sensor.name); - Serial.print ("Driver Ver: "); Serial.println(sensor.version); - Serial.print ("Unique ID: "); Serial.println(sensor.sensor_id); - Serial.print ("Max Value: "); Serial.print(sensor.max_value); Serial.println(" lux"); - Serial.print ("Min Value: "); Serial.print(sensor.min_value); Serial.println(" lux"); - Serial.print ("Resolution: "); Serial.print(sensor.resolution); Serial.println(" lux"); - Serial.println("------------------------------------"); - Serial.println(""); -``` diff --git a/lib/Adafruit_Sensor-1.0.2.02/library.properties b/lib/Adafruit_Sensor-1.0.2.02/library.properties deleted file mode 100644 index fa7eefa7b..000000000 --- a/lib/Adafruit_Sensor-1.0.2.02/library.properties +++ /dev/null @@ -1,9 +0,0 @@ -name=Adafruit Unified Sensor -version=1.0.2 -author=Adafruit -maintainer=Adafruit -sentence=Required for all Adafruit Unified Sensor based libraries. -paragraph=A unified sensor abstraction layer used by many Adafruit sensor libraries. -category=Sensors -url=https://github.com/adafruit/Adafruit_Sensor -architectures=* diff --git a/lib/BME680_driver-bme680_v3.5.9/LICENSE b/lib/BME680_driver-bme680_v3.5.9/LICENSE new file mode 100644 index 000000000..ab7a8c8b2 --- /dev/null +++ b/lib/BME680_driver-bme680_v3.5.9/LICENSE @@ -0,0 +1,39 @@ +Copyright (C) 2017 - 2018 Bosch Sensortec GmbH + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +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. + +Neither the name of the copyright holder nor the names of the +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER +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 + +The information provided is believed to be accurate and reliable. +The copyright holder assumes no responsibility +for the consequences of use +of such information nor for any infringement of patents or +other rights of third parties which may result from its use. +No license is granted by implication or otherwise under any patent or +patent rights of the copyright holder. \ No newline at end of file diff --git a/lib/BME680_driver-bme680_v3.5.9/README.md b/lib/BME680_driver-bme680_v3.5.9/README.md new file mode 100644 index 000000000..43abe55c8 --- /dev/null +++ b/lib/BME680_driver-bme680_v3.5.9/README.md @@ -0,0 +1,282 @@ +# BME680 sensor API + +## Introduction + +This package contains the Bosch Sensortec's BME680 gas sensor API + +The sensor driver package includes bme680.h, bme680.c and bme680_defs.h files + +## Version + +File | Version | Date +--------------|---------|------------- +bme680.c | 3.5.9 | 19 Jun 2018 +bme680.h | 3.5.9 | 19 Jun 2018 +bme680_defs.h | 3.5.9 | 19 Jun 2018 + +## Integration details + +* Integrate bme680.h, bme680_defs.h and bme680.c file in to your project. +* Include the bme680.h file in your code like below. + +``` c +#include "bme680.h" +``` + +## File information + +* bme680_defs.h : This header file has the constants, macros and datatype declarations. +* bme680.h : This header file contains the declarations of the sensor driver APIs. +* bme680.c : This source file contains the definitions of the sensor driver APIs. + +## Supported sensor interfaces + +* SPI 4-wire +* I2C + +## Usage guide + +### Initializing the sensor + +To initialize the sensor, you will first need to create a device structure. You +can do this by creating an instance of the structure bme680_dev. Then go on to +fill in the various parameters as shown below + +#### Example for SPI 4-Wire + +``` c + struct bme680_dev gas_sensor; + + /* You may assign a chip select identifier to be handled later */ + gas_sensor.dev_id = 0; + gas_sensor.intf = BME680_SPI_INTF; + gas_sensor.read = user_spi_read; + gas_sensor.write = user_spi_write; + gas_sensor.delay_ms = user_delay_ms; + /* amb_temp can be set to 25 prior to configuring the gas sensor + * or by performing a few temperature readings without operating the gas sensor. + */ + gas_sensor.amb_temp = 25; + + int8_t rslt = BME680_OK; + rslt = bme680_init(&gas_sensor); +``` + +#### Example for I2C + +``` c + struct bme680_dev gas_sensor; + + gas_sensor.dev_id = BME680_I2C_ADDR_PRIMARY; + gas_sensor.intf = BME680_I2C_INTF; + gas_sensor.read = user_i2c_read; + gas_sensor.write = user_i2c_write; + gas_sensor.delay_ms = user_delay_ms; + /* amb_temp can be set to 25 prior to configuring the gas sensor + * or by performing a few temperature readings without operating the gas sensor. + */ + gas_sensor.amb_temp = 25; + + + int8_t rslt = BME680_OK; + rslt = bme680_init(&gas_sensor); +``` + +Regarding compensation functions for temperature, pressure, humidity and gas we have two implementations. + + - Integer version + - floating point version + +By default, Integer version is used in the API + +If the user needs the floating point version, the user has to un-comment BME680_FLOAT_POINT_COMPENSATION macro +in bme680_defs.h file or to add it in the compiler flags. + +### Configuring the sensor + +#### Example for configuring the sensor in forced mode + +``` c + uint8_t set_required_settings; + + /* Set the temperature, pressure and humidity settings */ + gas_sensor.tph_sett.os_hum = BME680_OS_2X; + gas_sensor.tph_sett.os_pres = BME680_OS_4X; + gas_sensor.tph_sett.os_temp = BME680_OS_8X; + gas_sensor.tph_sett.filter = BME680_FILTER_SIZE_3; + + /* Set the remaining gas sensor settings and link the heating profile */ + gas_sensor.gas_sett.run_gas = BME680_ENABLE_GAS_MEAS; + /* Create a ramp heat waveform in 3 steps */ + gas_sensor.gas_sett.heatr_temp = 320; /* degree Celsius */ + gas_sensor.gas_sett.heatr_dur = 150; /* milliseconds */ + + /* Select the power mode */ + /* Must be set before writing the sensor configuration */ + gas_sensor.power_mode = BME680_FORCED_MODE; + + /* Set the required sensor settings needed */ + set_required_settings = BME680_OST_SEL | BME680_OSP_SEL | BME680_OSH_SEL | BME680_FILTER_SEL + | BME680_GAS_SENSOR_SEL; + + /* Set the desired sensor configuration */ + rslt = bme680_set_sensor_settings(set_required_settings,&gas_sensor); + + /* Set the power mode */ + rslt = bme680_set_sensor_mode(&gas_sensor); + + +``` + +### Reading sensor data + +#### Example for reading all sensor data + +``` c + /* Get the total measurement duration so as to sleep or wait till the + * measurement is complete */ + uint16_t meas_period; + bme680_get_profile_dur(&meas_period, &gas_sensor); + + struct bme680_field_data data; + + while(1) + { + user_delay_ms(meas_period); /* Delay till the measurement is ready */ + + rslt = bme680_get_sensor_data(&data, &gas_sensor); + + printf("T: %.2f degC, P: %.2f hPa, H %.2f %%rH ", data.temperature / 100.0f, + data.pressure / 100.0f, data.humidity / 1000.0f ); + /* Avoid using measurements from an unstable heating setup */ + if(data.status & BME680_GASM_VALID_MSK) + printf(", G: %d ohms", data.gas_resistance); + + printf("\r\n"); + + /* Trigger the next measurement if you would like to read data out continuously */ + if (gas_sensor.power_mode == BME680_FORCED_MODE) { + rslt = bme680_set_sensor_mode(&gas_sensor); + } + } +``` + +### Templates for function pointers + +``` c + +void user_delay_ms(uint32_t period) +{ + /* + * Return control or wait, + * for a period amount of milliseconds + */ +} + +int8_t user_spi_read(uint8_t dev_id, uint8_t reg_addr, uint8_t *reg_data, uint16_t len) +{ + int8_t rslt = 0; /* Return 0 for Success, non-zero for failure */ + + /* + * The parameter dev_id can be used as a variable to select which Chip Select pin has + * to be set low to activate the relevant device on the SPI bus + */ + + /* + * Data on the bus should be like + * |----------------+---------------------+-------------| + * | MOSI | MISO | Chip Select | + * |----------------+---------------------|-------------| + * | (don't care) | (don't care) | HIGH | + * | (reg_addr) | (don't care) | LOW | + * | (don't care) | (reg_data[0]) | LOW | + * | (....) | (....) | LOW | + * | (don't care) | (reg_data[len - 1]) | LOW | + * | (don't care) | (don't care) | HIGH | + * |----------------+---------------------|-------------| + */ + + return rslt; +} + +int8_t user_spi_write(uint8_t dev_id, uint8_t reg_addr, uint8_t *reg_data, uint16_t len) +{ + int8_t rslt = 0; /* Return 0 for Success, non-zero for failure */ + + /* + * The parameter dev_id can be used as a variable to select which Chip Select pin has + * to be set low to activate the relevant device on the SPI bus + */ + + /* + * Data on the bus should be like + * |---------------------+--------------+-------------| + * | MOSI | MISO | Chip Select | + * |---------------------+--------------|-------------| + * | (don't care) | (don't care) | HIGH | + * | (reg_addr) | (don't care) | LOW | + * | (reg_data[0]) | (don't care) | LOW | + * | (....) | (....) | LOW | + * | (reg_data[len - 1]) | (don't care) | LOW | + * | (don't care) | (don't care) | HIGH | + * |---------------------+--------------|-------------| + */ + + return rslt; +} + +int8_t user_i2c_read(uint8_t dev_id, uint8_t reg_addr, uint8_t *reg_data, uint16_t len) +{ + int8_t rslt = 0; /* Return 0 for Success, non-zero for failure */ + + /* + * The parameter dev_id can be used as a variable to store the I2C address of the device + */ + + /* + * Data on the bus should be like + * |------------+---------------------| + * | I2C action | Data | + * |------------+---------------------| + * | Start | - | + * | Write | (reg_addr) | + * | Stop | - | + * | Start | - | + * | Read | (reg_data[0]) | + * | Read | (....) | + * | Read | (reg_data[len - 1]) | + * | Stop | - | + * |------------+---------------------| + */ + + return rslt; +} + +int8_t user_i2c_write(uint8_t dev_id, uint8_t reg_addr, uint8_t *reg_data, uint16_t len) +{ + int8_t rslt = 0; /* Return 0 for Success, non-zero for failure */ + + /* + * The parameter dev_id can be used as a variable to store the I2C address of the device + */ + + /* + * Data on the bus should be like + * |------------+---------------------| + * | I2C action | Data | + * |------------+---------------------| + * | Start | - | + * | Write | (reg_addr) | + * | Write | (reg_data[0]) | + * | Write | (....) | + * | Write | (reg_data[len - 1]) | + * | Stop | - | + * |------------+---------------------| + */ + + return rslt; +} + +``` + +## Copyright (C) 2017 - 2018 Bosch Sensortec GmbH \ No newline at end of file diff --git a/lib/BME680_driver-bme680_v3.5.9/Self test/bme680_selftest.c b/lib/BME680_driver-bme680_v3.5.9/Self test/bme680_selftest.c new file mode 100644 index 000000000..c64e5f421 --- /dev/null +++ b/lib/BME680_driver-bme680_v3.5.9/Self test/bme680_selftest.c @@ -0,0 +1,187 @@ +/**\mainpage + * Copyright (C) 2017 - 2018 Bosch Sensortec GmbH + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 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. + * + * Neither the name of the copyright holder nor the names of the + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER + * 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 + * + * The information provided is believed to be accurate and reliable. + * The copyright holder assumes no responsibility + * for the consequences of use + * of such information nor for any infringement of patents or + * other rights of third parties which may result from its use. + * No license is granted by implication or otherwise under any patent or + * patent rights of the copyright holder. + * + * File bme680_selftest.c + * @date 16 May 2018 + * @version 3.5.3 + * + */ + +/*! + * @addtogroup bme680_selftest + * @brief + * @{*/ + +#include "bme680_selftest.h" + +#define MIN_TEMPERATURE INT16_C(0) /* 0 degree Celsius */ +#define MAX_TEMPERATURE INT16_C(6000) /* 60 degree Celsius */ + +#define MIN_PRESSURE UINT32_C(90000) /* 900 hecto Pascals */ +#define MAX_PRESSURE UINT32_C(110000) /* 1100 hecto Pascals */ + +#define MIN_HUMIDITY UINT32_C(20000) /* 20% relative humidity */ +#define MAX_HUMIDITY UINT32_C(80000) /* 80% relative humidity*/ + +#define HEATR_DUR 2000 +#define N_MEAS 6 +#define LOW_TEMP 150 +#define HIGH_TEMP 350 + +/*! + * @brief Function to analyze the sensor data + * + * @param[in] data Array of measurement data + * @param[in] n_meas Number of measurements + * + * @return Error code + * @retval 0 Success + * @retval > 0 Warning + */ +static int8_t analyze_sensor_data(struct bme680_field_data *data, uint8_t n_meas); + +/*! + * @brief Self-test API for the BME680 + */ +int8_t bme680_self_test(struct bme680_dev *dev) +{ + int8_t rslt = BME680_OK; + struct bme680_field_data data[N_MEAS]; + + struct bme680_dev t_dev; + + /* Copy required parameters from reference bme680_dev struct */ + t_dev.dev_id = dev->dev_id; + t_dev.amb_temp = 25; + t_dev.read = dev->read; + t_dev.write = dev->write; + t_dev.intf = dev->intf; + t_dev.delay_ms = dev->delay_ms; + + rslt = bme680_init(&t_dev); + + if (rslt == BME680_OK) { + /* Select the power mode */ + /* Must be set before writing the sensor configuration */ + t_dev.power_mode = BME680_FORCED_MODE; + + uint16_t settings_sel; + + /* Set the temperature, pressure and humidity & filter settings */ + t_dev.tph_sett.os_hum = BME680_OS_1X; + t_dev.tph_sett.os_pres = BME680_OS_16X; + t_dev.tph_sett.os_temp = BME680_OS_2X; + + /* Set the remaining gas sensor settings and link the heating profile */ + t_dev.gas_sett.run_gas = BME680_ENABLE_GAS_MEAS; + t_dev.gas_sett.heatr_dur = HEATR_DUR; + + settings_sel = BME680_OST_SEL | BME680_OSP_SEL | BME680_OSH_SEL | BME680_GAS_SENSOR_SEL; + + uint16_t profile_dur = 0; + bme680_get_profile_dur(&profile_dur, &t_dev); + + uint8_t i = 0; + while ((rslt == BME680_OK) && (i < N_MEAS)) { + if (rslt == BME680_OK) { + + if (i % 2 == 0) + t_dev.gas_sett.heatr_temp = HIGH_TEMP; /* Higher temperature */ + else + t_dev.gas_sett.heatr_temp = LOW_TEMP; /* Lower temperature */ + + rslt = bme680_set_sensor_settings(settings_sel, &t_dev); + + if (rslt == BME680_OK) { + + rslt = bme680_set_sensor_mode(&t_dev); /* Trigger a measurement */ + + t_dev.delay_ms(profile_dur); /* Wait for the measurement to complete */ + + rslt = bme680_get_sensor_data(&data[i], &t_dev); + } + } + + i++; + } + + if (rslt == BME680_OK) + rslt = analyze_sensor_data(data, N_MEAS); + } + + return rslt; +} + +/*! + * @brief Function to analyze the sensor data + */ +static int8_t analyze_sensor_data(struct bme680_field_data *data, uint8_t n_meas) +{ + int8_t rslt = BME680_OK; + uint8_t self_test_failed = 0, i; + uint32_t cent_res = 0; + + if ((data[0].temperature < MIN_TEMPERATURE) || (data[0].temperature > MAX_TEMPERATURE)) + self_test_failed++; + + if ((data[0].pressure < MIN_PRESSURE) || (data[0].pressure > MAX_PRESSURE)) + self_test_failed++; + + if ((data[0].humidity < MIN_HUMIDITY) || (data[0].humidity > MAX_HUMIDITY)) + self_test_failed++; + + for (i = 0; i < n_meas; i++) /* Every gas measurement should be valid */ + if (!(data[i].status & BME680_GASM_VALID_MSK)) + self_test_failed++; + + if (n_meas >= 6) + cent_res = (data[3].gas_resistance + data[5].gas_resistance) / (2 * data[4].gas_resistance); + + if ((cent_res * 5) < 6) + self_test_failed++; + + if (self_test_failed) + rslt = BME680_W_SELF_TEST_FAILED; + + return rslt; +} + +/** @}*/ diff --git a/lib/BME680_driver-bme680_v3.5.9/Self test/bme680_selftest.h b/lib/BME680_driver-bme680_v3.5.9/Self test/bme680_selftest.h new file mode 100644 index 000000000..7cc4e639f --- /dev/null +++ b/lib/BME680_driver-bme680_v3.5.9/Self test/bme680_selftest.h @@ -0,0 +1,88 @@ +/** + * Copyright (C) 2017 - 2018 Bosch Sensortec GmbH + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 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. + * + * Neither the name of the copyright holder nor the names of the + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER + * 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 + * + * The information provided is believed to be accurate and reliable. + * The copyright holder assumes no responsibility + * for the consequences of use + * of such information nor for any infringement of patents or + * other rights of third parties which may result from its use. + * No license is granted by implication or otherwise under any patent or + * patent rights of the copyright holder. + * + * @file bme680_selftest.h + * @date 16 May 2018 + * @version 3.5.3 + * @brief + * + */ + +/*! + * @addtogroup bme680_selftest + * @brief + * @{*/ + + +#ifndef BME680_SELFTEST_H_ +#define BME680_SELFTEST_H_ + +#include "bme680.h" + +/*! CPP guard */ +#ifdef __cplusplus +extern "C" +{ +#endif + +#define BME680_W_SELF_TEST_FAILED 3 + +/*! + * @brief Self-test API for the BME680 + * + * @param[in] Device structure containing relevant information on how + * to communicate with the sensor + * + * @return Error code + * @retval 0 Success + * @retval < 0 Error + * @retval > 0 Warning + */ +int8_t bme680_self_test(struct bme680_dev *dev); + +/*! CPP guard */ +#ifdef __cplusplus +} +#endif + +#endif /* BME680_SELFTEST_H_ */ + +/** @}*/ diff --git a/lib/Adafruit_BME680-1.0.5/bme680.c b/lib/BME680_driver-bme680_v3.5.9/bme680.c similarity index 80% rename from lib/Adafruit_BME680-1.0.5/bme680.c rename to lib/BME680_driver-bme680_v3.5.9/bme680.c index b68e20e6f..6067725a9 100644 --- a/lib/Adafruit_BME680-1.0.5/bme680.c +++ b/lib/BME680_driver-bme680_v3.5.9/bme680.c @@ -40,8 +40,8 @@ * patent rights of the copyright holder. * * File bme680.c - * @date 20 Nov 2017 - * @version 3.5.5 + * @date 19 Jun 2018 + * @version 3.5.9 * */ @@ -49,18 +49,6 @@ @brief Sensor driver for BME680 sensor */ #include "bme680.h" -/**static variables */ -/**Look up table for the possible gas range values */ -uint32_t lookupTable1[16] = { UINT32_C(2147483647), UINT32_C(2147483647), UINT32_C(2147483647), UINT32_C(2147483647), - UINT32_C(2147483647), UINT32_C(2126008810), UINT32_C(2147483647), UINT32_C(2130303777), UINT32_C(2147483647), - UINT32_C(2147483647), UINT32_C(2143188679), UINT32_C(2136746228), UINT32_C(2147483647), UINT32_C(2126008810), - UINT32_C(2147483647), UINT32_C(2147483647) }; -/**Look up table for the possible gas range values */ -uint32_t lookupTable2[16] = { UINT32_C(4096000000), UINT32_C(2048000000), UINT32_C(1024000000), UINT32_C(512000000), - UINT32_C(255744255), UINT32_C(127110228), UINT32_C(64000000), UINT32_C(32258064), UINT32_C(16016016), UINT32_C( - 8000000), UINT32_C(4000000), UINT32_C(2000000), UINT32_C(1000000), UINT32_C(500000), UINT32_C(250000), - UINT32_C(125000) }; - /*! * @brief This internal API is used to read the calibrated data from the sensor. * @@ -90,6 +78,8 @@ static int8_t set_gas_config(struct bme680_dev *dev); /*! * @brief This internal API is used to get the gas configuration of the sensor. + * @note heatr_temp and heatr_dur values are currently register data + * and not the actual values set * * @param[in] dev :Structure instance of bme680_dev. * @@ -107,6 +97,8 @@ static int8_t get_gas_config(struct bme680_dev *dev); */ static uint8_t calc_heater_dur(uint16_t dur); +#ifndef BME680_FLOAT_POINT_COMPENSATION + /*! * @brief This internal API is used to calculate the temperature value. * @@ -151,13 +143,72 @@ static uint32_t calc_gas_resistance(uint16_t gas_res_adc, uint8_t gas_range, con /*! * @brief This internal API is used to calculate the Heat Resistance value. * - * @param[in] dev :Structure instance of bme680_dev. - * @param[in] temp :Contains the temporary value. + * @param[in] dev : Structure instance of bme680_dev + * @param[in] temp : Contains the target temperature value. * * @return uint8_t calculated heater resistance. */ static uint8_t calc_heater_res(uint16_t temp, const struct bme680_dev *dev); +#else +/*! + * @brief This internal API is used to calculate the + * temperature value value in float format + * + * @param[in] dev :Structure instance of bme680_dev. + * @param[in] temp_adc :Contains the temperature ADC value . + * + * @return Calculated temperature in float + */ +static float calc_temperature(uint32_t temp_adc, struct bme680_dev *dev); + +/*! + * @brief This internal API is used to calculate the + * pressure value value in float format + * + * @param[in] dev :Structure instance of bme680_dev. + * @param[in] pres_adc :Contains the pressure ADC value . + * + * @return Calculated pressure in float. + */ +static float calc_pressure(uint32_t pres_adc, const struct bme680_dev *dev); + +/*! + * @brief This internal API is used to calculate the + * humidity value value in float format + * + * @param[in] dev :Structure instance of bme680_dev. + * @param[in] hum_adc :Contains the humidity ADC value. + * + * @return Calculated humidity in float. + */ +static float calc_humidity(uint16_t hum_adc, const struct bme680_dev *dev); + +/*! + * @brief This internal API is used to calculate the + * gas resistance value value in float format + * + * @param[in] dev :Structure instance of bme680_dev. + * @param[in] gas_res_adc :Contains the Gas Resistance ADC value. + * @param[in] gas_range :Contains the range of gas values. + * + * @return Calculated gas resistance in float. + */ +static float calc_gas_resistance(uint16_t gas_res_adc, uint8_t gas_range, const struct bme680_dev *dev); + +/*! + * @brief This internal API is used to calculate the + * heater resistance value in float format + * + * @param[in] temp : Contains the target temperature value. + * @param[in] dev : Structure instance of bme680_dev. + * + * @return Calculated heater resistance in float. + */ +static float calc_heater_res(uint16_t temp, const struct bme680_dev *dev); + +#endif + /*! * @brief This internal API is used to calculate the field data of sensor. * @@ -545,7 +596,7 @@ int8_t bme680_set_sensor_mode(struct bme680_dev *dev) /* Check for null pointer in the device structure*/ rslt = null_ptr_check(dev); if (rslt == BME680_OK) { - /* Call recursively until in sleep */ + /* Call repeatedly until in sleep */ do { rslt = bme680_get_regs(BME680_CONF_T_P_MODE_ADDR, &tmp_pow_mode, 1, dev); if (rslt == BME680_OK) { @@ -782,6 +833,8 @@ static int8_t set_gas_config(struct bme680_dev *dev) /*! * @brief This internal API is used to get the gas configuration of the sensor. + * @note heatr_temp and heatr_dur values are currently register data + * and not the actual values set */ static int8_t get_gas_config(struct bme680_dev *dev) { @@ -789,8 +842,7 @@ static int8_t get_gas_config(struct bme680_dev *dev) /* starting address of the register array for burst read*/ uint8_t reg_addr1 = BME680_ADDR_SENS_CONF_START; uint8_t reg_addr2 = BME680_ADDR_GAS_CONF_START; - uint8_t data_array[BME680_GAS_HEATER_PROF_LEN_MAX] = { 0 }; - uint8_t index; + uint8_t reg_data = 0; /* Check for null pointer in the device structure*/ rslt = null_ptr_check(dev); @@ -801,16 +853,14 @@ static int8_t get_gas_config(struct bme680_dev *dev) } if (rslt == BME680_OK) { - rslt = bme680_get_regs(reg_addr1, data_array, BME680_GAS_HEATER_PROF_LEN_MAX, dev); + rslt = bme680_get_regs(reg_addr1, ®_data, 1, dev); if (rslt == BME680_OK) { - for (index = 0; index < BME680_GAS_HEATER_PROF_LEN_MAX; index++) - dev->gas_sett.heatr_temp = data_array[index]; - } - - rslt = bme680_get_regs(reg_addr2, data_array, BME680_GAS_HEATER_PROF_LEN_MAX, dev); - if (rslt == BME680_OK) { - for (index = 0; index < BME680_GAS_HEATER_PROF_LEN_MAX; index++) - dev->gas_sett.heatr_dur = data_array[index]; + dev->gas_sett.heatr_temp = reg_data; + rslt = bme680_get_regs(reg_addr2, ®_data, 1, dev); + if (rslt == BME680_OK) { + /* Heating duration register value */ + dev->gas_sett.heatr_dur = reg_data; + } } } } @@ -818,6 +868,8 @@ static int8_t get_gas_config(struct bme680_dev *dev) return rslt; } +#ifndef BME680_FLOAT_POINT_COMPENSATION + /*! * @brief This internal API is used to calculate the temperature value. */ @@ -843,11 +895,10 @@ static int16_t calc_temperature(uint32_t temp_adc, struct bme680_dev *dev) */ static uint32_t calc_pressure(uint32_t pres_adc, const struct bme680_dev *dev) { - int32_t var1 = 0; - int32_t var2 = 0; - int32_t var3 = 0; - int32_t var4 = 0; - int32_t pressure_comp = 0; + int32_t var1; + int32_t var2; + int32_t var3; + int32_t pressure_comp; var1 = (((int32_t)dev->calib.t_fine) >> 1) - 64000; var2 = ((((var1 >> 2) * (var1 >> 2)) >> 11) * @@ -861,11 +912,10 @@ static uint32_t calc_pressure(uint32_t pres_adc, const struct bme680_dev *dev) var1 = ((32768 + var1) * (int32_t)dev->calib.par_p1) >> 15; pressure_comp = 1048576 - pres_adc; pressure_comp = (int32_t)((pressure_comp - (var2 >> 12)) * ((uint32_t)3125)); - var4 = (1 << 31); - if (pressure_comp >= var4) - pressure_comp = ((pressure_comp / (uint32_t)var1) << 1); + if (pressure_comp >= BME680_MAX_OVERFLOW_VAL) + pressure_comp = ((pressure_comp / var1) << 1); else - pressure_comp = ((pressure_comp << 1) / (uint32_t)var1); + pressure_comp = ((pressure_comp << 1) / var1); var1 = ((int32_t)dev->calib.par_p9 * (int32_t)(((pressure_comp >> 3) * (pressure_comp >> 3)) >> 13)) >> 12; var2 = ((int32_t)(pressure_comp >> 2) * @@ -926,6 +976,16 @@ static uint32_t calc_gas_resistance(uint16_t gas_res_adc, uint8_t gas_range, con uint64_t var2; int64_t var3; uint32_t calc_gas_res; + /**Look up table 1 for the possible gas range values */ + uint32_t lookupTable1[16] = { UINT32_C(2147483647), UINT32_C(2147483647), UINT32_C(2147483647), UINT32_C(2147483647), + UINT32_C(2147483647), UINT32_C(2126008810), UINT32_C(2147483647), UINT32_C(2130303777), + UINT32_C(2147483647), UINT32_C(2147483647), UINT32_C(2143188679), UINT32_C(2136746228), + UINT32_C(2147483647), UINT32_C(2126008810), UINT32_C(2147483647), UINT32_C(2147483647) }; + /**Look up table 2 for the possible gas range values */ + uint32_t lookupTable2[16] = { UINT32_C(4096000000), UINT32_C(2048000000), UINT32_C(1024000000), UINT32_C(512000000), + UINT32_C(255744255), UINT32_C(127110228), UINT32_C(64000000), UINT32_C(32258064), UINT32_C(16016016), + UINT32_C(8000000), UINT32_C(4000000), UINT32_C(2000000), UINT32_C(1000000), UINT32_C(500000), + UINT32_C(250000), UINT32_C(125000) }; var1 = (int64_t) ((1340 + (5 * (int64_t) dev->calib.range_sw_err)) * ((int64_t) lookupTable1[gas_range])) >> 16; @@ -949,9 +1009,7 @@ static uint8_t calc_heater_res(uint16_t temp, const struct bme680_dev *dev) int32_t var5; int32_t heatr_res_x100; - if (temp < 200) /* Cap temperature */ - temp = 200; - else if (temp > 400) + if (temp > 400) /* Cap temperature */ temp = 400; var1 = (((int32_t) dev->amb_temp * dev->calib.par_gh3) / 1000) * 256; @@ -965,6 +1023,165 @@ static uint8_t calc_heater_res(uint16_t temp, const struct bme680_dev *dev) return heatr_res; } +#else + + +/*! + * @brief This internal API is used to calculate the + * temperature value in float format + */ +static float calc_temperature(uint32_t temp_adc, struct bme680_dev *dev) +{ + float var1 = 0; + float var2 = 0; + float calc_temp = 0; + + /* calculate var1 data */ + var1 = ((((float)temp_adc / 16384.0f) - ((float)dev->calib.par_t1 / 1024.0f)) + * ((float)dev->calib.par_t2)); + + /* calculate var2 data */ + var2 = (((((float)temp_adc / 131072.0f) - ((float)dev->calib.par_t1 / 8192.0f)) * + (((float)temp_adc / 131072.0f) - ((float)dev->calib.par_t1 / 8192.0f))) * + ((float)dev->calib.par_t3 * 16.0f)); + + /* t_fine value*/ + dev->calib.t_fine = (var1 + var2); + + /* compensated temperature data*/ + calc_temp = ((dev->calib.t_fine) / 5120.0f); + + return calc_temp; +} + +/*! + * @brief This internal API is used to calculate the + * pressure value in float format + */ +static float calc_pressure(uint32_t pres_adc, const struct bme680_dev *dev) +{ + float var1 = 0; + float var2 = 0; + float var3 = 0; + float calc_pres = 0; + + var1 = (((float)dev->calib.t_fine / 2.0f) - 64000.0f); + var2 = var1 * var1 * (((float)dev->calib.par_p6) / (131072.0f)); + var2 = var2 + (var1 * ((float)dev->calib.par_p5) * 2.0f); + var2 = (var2 / 4.0f) + (((float)dev->calib.par_p4) * 65536.0f); + var1 = (((((float)dev->calib.par_p3 * var1 * var1) / 16384.0f) + + ((float)dev->calib.par_p2 * var1)) / 524288.0f); + var1 = ((1.0f + (var1 / 32768.0f)) * ((float)dev->calib.par_p1)); + calc_pres = (1048576.0f - ((float)pres_adc)); + + /* Avoid exception caused by division by zero */ + if ((int)var1 != 0) { + calc_pres = (((calc_pres - (var2 / 4096.0f)) * 6250.0f) / var1); + var1 = (((float)dev->calib.par_p9) * calc_pres * calc_pres) / 2147483648.0f; + var2 = calc_pres * (((float)dev->calib.par_p8) / 32768.0f); + var3 = ((calc_pres / 256.0f) * (calc_pres / 256.0f) * (calc_pres / 256.0f) + * (dev->calib.par_p10 / 131072.0f)); + calc_pres = (calc_pres + (var1 + var2 + var3 + ((float)dev->calib.par_p7 * 128.0f)) / 16.0f); + } else { + calc_pres = 0; + } + + return calc_pres; +} + +/*! + * @brief This internal API is used to calculate the + * humidity value in float format + */ +static float calc_humidity(uint16_t hum_adc, const struct bme680_dev *dev) +{ + float calc_hum = 0; + float var1 = 0; + float var2 = 0; + float var3 = 0; + float var4 = 0; + float temp_comp; + + /* compensated temperature data*/ + temp_comp = ((dev->calib.t_fine) / 5120.0f); + + var1 = (float)((float)hum_adc) - (((float)dev->calib.par_h1 * 16.0f) + (((float)dev->calib.par_h3 / 2.0f) + * temp_comp)); + + var2 = var1 * ((float)(((float) dev->calib.par_h2 / 262144.0f) * (1.0f + (((float)dev->calib.par_h4 / 16384.0f) + * temp_comp) + (((float)dev->calib.par_h5 / 1048576.0f) * temp_comp * temp_comp)))); + + var3 = (float) dev->calib.par_h6 / 16384.0f; + + var4 = (float) dev->calib.par_h7 / 2097152.0f; + + calc_hum = var2 + ((var3 + (var4 * temp_comp)) * var2 * var2); + + if (calc_hum > 100.0f) + calc_hum = 100.0f; + else if (calc_hum < 0.0f) + calc_hum = 0.0f; + + return calc_hum; +} + +/*! + * @brief This internal API is used to calculate the + * gas resistance value in float format + */ +static float calc_gas_resistance(uint16_t gas_res_adc, uint8_t gas_range, const struct bme680_dev *dev) +{ + float calc_gas_res; + float var1 = 0; + float var2 = 0; + float var3 = 0; + + const float lookup_k1_range[16] = { + 0.0, 0.0, 0.0, 0.0, 0.0, -1.0, 0.0, -0.8, + 0.0, 0.0, -0.2, -0.5, 0.0, -1.0, 0.0, 0.0}; + const float lookup_k2_range[16] = { + 0.0, 0.0, 0.0, 0.0, 0.1, 0.7, 0.0, -0.8, + -0.1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + + var1 = (1340.0f + (5.0f * dev->calib.range_sw_err)); + var2 = (var1) * (1.0f + lookup_k1_range[gas_range]/100.0f); + var3 = 1.0f + (lookup_k2_range[gas_range]/100.0f); + + calc_gas_res = 1.0f / (float)(var3 * (0.000000125f) * (float)(1 << gas_range) * (((((float)gas_res_adc) + - 512.0f)/var2) + 1.0f)); + + return calc_gas_res; +} + +/*! + * @brief This internal API is used to calculate the + * heater resistance value in float format + */ +static float calc_heater_res(uint16_t temp, const struct bme680_dev *dev) +{ + float var1 = 0; + float var2 = 0; + float var3 = 0; + float var4 = 0; + float var5 = 0; + float res_heat = 0; + + if (temp > 400) /* Cap temperature */ + temp = 400; + + var1 = (((float)dev->calib.par_gh1 / (16.0f)) + 49.0f); + var2 = ((((float)dev->calib.par_gh2 / (32768.0f)) * (0.0005f)) + 0.00235f); + var3 = ((float)dev->calib.par_gh3 / (1024.0f)); + var4 = (var1 * (1.0f + (var2 * (float)temp))); + var5 = (var4 + (var3 * (float)dev->amb_temp)); + res_heat = (uint8_t)(3.4f * ((var5 * (4 / (4 + (float)dev->calib.res_heat_range)) * + (1/(1 + ((float) dev->calib.res_heat_val * 0.002f)))) - 25)); + + return res_heat; +} + +#endif + /*! * @brief This internal API is used to calculate the Heat duration value. */ diff --git a/lib/Adafruit_BME680-1.0.5/bme680.h b/lib/BME680_driver-bme680_v3.5.9/bme680.h similarity index 99% rename from lib/Adafruit_BME680-1.0.5/bme680.h rename to lib/BME680_driver-bme680_v3.5.9/bme680.h index 71960582a..7c59be0f6 100644 --- a/lib/Adafruit_BME680-1.0.5/bme680.h +++ b/lib/BME680_driver-bme680_v3.5.9/bme680.h @@ -40,8 +40,8 @@ * patent rights of the copyright holder. * * @file bme680.h - * @date 20 Nov 2017 - * @version 3.5.5 + * @date 19 Jun 2018 + * @version 3.5.9 * @brief * */ diff --git a/lib/Adafruit_BME680-1.0.5/bme680_defs.h b/lib/BME680_driver-bme680_v3.5.9/bme680_defs.h similarity index 92% rename from lib/Adafruit_BME680-1.0.5/bme680_defs.h rename to lib/BME680_driver-bme680_v3.5.9/bme680_defs.h index 0cf581b06..495edfe00 100644 --- a/lib/Adafruit_BME680-1.0.5/bme680_defs.h +++ b/lib/BME680_driver-bme680_v3.5.9/bme680_defs.h @@ -40,8 +40,8 @@ * patent rights of the copyright holder. * * @file bme680_defs.h - * @date 20 Nov 2017 - * @version 3.5.5 + * @date 19 Jun 2018 + * @version 3.5.9 * @brief * */ @@ -100,6 +100,12 @@ #endif #endif +/** BME680 configuration macros */ +/** Enable or un-comment the macro to provide floating point data output */ +#ifndef BME680_FLOAT_POINT_COMPENSATION +/* #define BME680_FLOAT_POINT_COMPENSATION */ +#endif + /** BME680 General config */ #define BME680_POLL_PERIOD_MS UINT8_C(10) @@ -220,7 +226,6 @@ #define BME680_REG_BUFFER_LENGTH UINT8_C(6) #define BME680_FIELD_DATA_LENGTH UINT8_C(3) #define BME680_GAS_REG_BUF_LENGTH UINT8_C(20) -#define BME680_GAS_HEATER_PROF_LEN_MAX UINT8_C(10) /** Settings selector */ #define BME680_OST_SEL UINT16_C(1) @@ -311,6 +316,14 @@ #define BME680_REG_RUN_GAS_INDEX UINT8_C(1) #define BME680_REG_HCTRL_INDEX UINT8_C(0) +/** BME680 pressure calculation macros */ +/*! This max value is used to provide precedence to multiplication or division + * in pressure compensation equation to achieve least loss of precision and + * avoiding overflows. + * i.e Comparing value, BME680_MAX_OVERFLOW_VAL = INT32_C(1 << 30) + */ +#define BME680_MAX_OVERFLOW_VAL INT32_C(0x40000000) + /** Macro to combine two 8 bit data's to form a 16 bit data */ #define BME680_CONCAT_BYTES(msb, lsb) (((uint16_t)msb << 8) | (uint16_t)lsb) @@ -328,7 +341,7 @@ #define BME680_GET_BITS_POS_0(reg_data, bitname) (reg_data & (bitname##_MSK)) /** Type definitions */ -/* +/*! * Generic communication function pointer * @param[in] dev_id: Place holder to store the id of the device structure * Can be used to store the index of the Chip select or @@ -340,7 +353,7 @@ */ typedef int8_t (*bme680_com_fptr_t)(uint8_t dev_id, uint8_t reg_addr, uint8_t *data, uint16_t len); -/* +/*! * Delay function pointer * @param[in] period: Time period in milliseconds */ @@ -367,6 +380,8 @@ struct bme680_field_data { uint8_t gas_index; /*! Measurement index to track order */ uint8_t meas_index; + +#ifndef BME680_FLOAT_POINT_COMPENSATION /*! Temperature in degree celsius x100 */ int16_t temperature; /*! Pressure in Pascal */ @@ -375,6 +390,18 @@ struct bme680_field_data { uint32_t humidity; /*! Gas resistance in Ohms */ uint32_t gas_resistance; +#else + /*! Temperature in degree celsius */ + float temperature; + /*! Pressure in Pascal */ + float pressure; + /*! Humidity in % relative humidity x1000 */ + float humidity; + /*! Gas resistance in Ohms */ + float gas_resistance; + +#endif + }; /*! @@ -427,8 +454,14 @@ struct bme680_calib_data { int16_t par_p9; /*! Variable to store calibrated pressure data */ uint8_t par_p10; + +#ifndef BME680_FLOAT_POINT_COMPENSATION /*! Variable to store t_fine size */ int32_t t_fine; +#else + /*! Variable to store t_fine size */ + float t_fine; +#endif /*! Variable to store heater resistance range */ uint8_t res_heat_range; /*! Variable to store heater resistance value */ @@ -463,9 +496,9 @@ struct bme680_gas_sett { uint8_t heatr_ctrl; /*! Run gas enable value */ uint8_t run_gas; - /*! Pointer to store heater temperature */ + /*! Heater temperature value */ uint16_t heatr_temp; - /*! Pointer to store duration profile */ + /*! Duration profile value */ uint16_t heatr_dur; }; @@ -481,7 +514,7 @@ struct bme680_dev { enum bme680_intf intf; /*! Memory page used */ uint8_t mem_page; - /*! Ambient temperature in Degree C*/ + /*! Ambient temperature in Degree C */ int8_t amb_temp; /*! Sensor calibration data */ struct bme680_calib_data calib; @@ -495,11 +528,11 @@ struct bme680_dev { uint8_t new_fields; /*! Store the info messages */ uint8_t info_msg; - /*! Burst read structure */ + /*! Bus read function pointer */ bme680_com_fptr_t read; - /*! Burst write structure */ + /*! Bus write function pointer */ bme680_com_fptr_t write; - /*! Delay in ms */ + /*! delay function pointer */ bme680_delay_fptr_t delay_ms; /*! Communication function result */ int8_t com_rslt; diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index dae998c73..25d26f547 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,5 @@ /* 6.0.0c + * Rewrite BME680 driver now using latest Bosch BME680 library (#2969) * Add support for bitflags SetOption50 .. SetOption81 (#3118) * * 6.0.0b diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 3d51f2490..e23627f26 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -625,6 +625,8 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) case 7: // mqtt_switch_retain (CMND_SWITCHRETAIN) case 9: // mqtt_sensor_retain (CMND_SENSORRETAIN) case 22: // mqtt_serial (SerialSend and SerialLog) + case 25: // knx_enabled (Web config) + case 27: // knx_enable_enhancement (Web config) ptype = 99; // Command Error break; // Ignore command SetOption case 3: // mqtt diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h index 4eeb3bf80..62221d938 100644 --- a/sonoff/sonoff_template.h +++ b/sonoff/sonoff_template.h @@ -852,20 +852,20 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { 0, 0, 0, 0 }, { "Sonoff iFan02", // Sonoff iFan02 (ESP8285) - GPIO_KEY1, // GPIO00 Virtual button 1 as feedback from RC - GPIO_USER, // GPIO01 Serial RXD and Optional sensor - 0, // GPIO02 Optional sensor - GPIO_USER, // GPIO03 Serial TXD and Optional sensor - GPIO_REL3, // GPIO04 Relay 3 (0 = Off, 1 = On) controlling the fan - GPIO_REL2, // GPIO05 Relay 2 (0 = Off, 1 = On) controlling the fan + GPIO_KEY1, // GPIO00 WIFI_KEY0 Virtual button 1 as feedback from RC + GPIO_USER, // GPIO01 ESP_TXD Serial RXD and Optional sensor + 0, // GPIO02 ESP_LOG + GPIO_USER, // GPIO03 ESP_RXD Serial TXD and Optional sensor + GPIO_REL3, // GPIO04 WIFI_O2 Relay 3 (0 = Off, 1 = On) controlling the fan + GPIO_REL2, // GPIO05 WIFI_O1 Relay 2 (0 = Off, 1 = On) controlling the fan 0, 0, 0, // Flash connection - GPIO_KEY2, // GPIO09 Virtual button 2 as feedback from RC - GPIO_KEY3, // GPIO10 Virtual button 3 as feedback from RC + GPIO_KEY2, // GPIO09 WIFI_KEY1 Virtual button 2 as feedback from RC + GPIO_KEY3, // GPIO10 WIFI_KEY2 Virtual button 3 as feedback from RC 0, // Flash connection - GPIO_REL1, // GPIO12 Relay 1 (0 = Off, 1 = On) controlling the light - GPIO_LED1_INV, // GPIO13 Blue Led on PCA (0 = On, 1 = Off) - GPIO_KEY4, // GPIO14 Virtual button 4 as feedback from RC - GPIO_REL4, // GPIO15 Relay 4 (0 = Off, 1 = On) controlling the fan + GPIO_REL1, // GPIO12 WIFI_O0 Relay 1 (0 = Off, 1 = On) controlling the light + GPIO_LED1_INV, // GPIO13 WIFI_CHK Blue Led on PCA (0 = On, 1 = Off) + GPIO_KEY4, // GPIO14 WIFI_KEY3 Virtual button 4 as feedback from RC + GPIO_REL4, // GPIO15 WIFI_O3 Relay 4 (0 = Off, 1 = On) controlling the fan 0, 0 }, { "BlitzWolf SHP2", // BlitzWolf BW-SHP2 (ESP8285 - BL0937 or HJL-01 Energy Monitoring) diff --git a/sonoff/support.ino b/sonoff/support.ino index 76e4e2d9e..54ec20b73 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -1425,6 +1425,33 @@ bool I2cWrite16(uint8_t addr, uint8_t reg, uint16_t val) return I2cWrite(addr, reg, val, 2); } +int8_t I2cReadBuffer(uint8_t addr, uint8_t reg, uint8_t *reg_data, uint16_t len) +{ + Wire.beginTransmission((uint8_t)addr); + Wire.write((uint8_t)reg); + Wire.endTransmission(); + if (len != Wire.requestFrom((uint8_t)addr, (byte)len)) { + return 1; + } + while (len--) { + *reg_data = (uint8_t)Wire.read(); + reg_data++; + } + return 0; +} + +int8_t I2cWriteBuffer(uint8_t addr, uint8_t reg, uint8_t *reg_data, uint16_t len) +{ + Wire.beginTransmission((uint8_t)addr); + Wire.write((uint8_t)reg); + while (len--) { + Wire.write(*reg_data); + reg_data++; + } + Wire.endTransmission(); + return 0; +} + void I2cScan(char *devs, unsigned int devs_len) { byte error; diff --git a/sonoff/xsns_09_bmp.ino b/sonoff/xsns_09_bmp.ino index e6b4e03fd..a3769f8bc 100644 --- a/sonoff/xsns_09_bmp.ino +++ b/sonoff/xsns_09_bmp.ino @@ -338,17 +338,104 @@ double Bme280ReadHumidity(void) #ifdef USE_BME680 /*********************************************************************************************\ - * BME680 + * BME680 support by Bosch https://github.com/BoschSensortec/BME680_driver \*********************************************************************************************/ -#include -Adafruit_BME680 bme680; +#include + +struct bme680_dev gas_sensor; + +static void BmeDelayMs(uint32_t ms) +{ + delay(ms); +} + +uint8_t bme680_state = 0; +float bme680_temperature; +float bme680_pressure; +float bme680_humidity; +float bme680_gas_resistance; + +boolean Bme680Init() +{ + gas_sensor.dev_id = bmp_address; + gas_sensor.intf = BME680_I2C_INTF; + gas_sensor.read = &I2cReadBuffer; + gas_sensor.write = &I2cWriteBuffer; + gas_sensor.delay_ms = BmeDelayMs; + /* amb_temp can be set to 25 prior to configuring the gas sensor + * or by performing a few temperature readings without operating the gas sensor. + */ + gas_sensor.amb_temp = 25; + + int8_t rslt = BME680_OK; + rslt = bme680_init(&gas_sensor); + if (rslt != BME680_OK) { return false; } + + /* Set the temperature, pressure and humidity settings */ + gas_sensor.tph_sett.os_hum = BME680_OS_2X; + gas_sensor.tph_sett.os_pres = BME680_OS_4X; + gas_sensor.tph_sett.os_temp = BME680_OS_8X; + gas_sensor.tph_sett.filter = BME680_FILTER_SIZE_3; + + /* Set the remaining gas sensor settings and link the heating profile */ + gas_sensor.gas_sett.run_gas = BME680_ENABLE_GAS_MEAS; + /* Create a ramp heat waveform in 3 steps */ + gas_sensor.gas_sett.heatr_temp = 320; /* degree Celsius */ + gas_sensor.gas_sett.heatr_dur = 150; /* milliseconds */ + + /* Select the power mode */ + /* Must be set before writing the sensor configuration */ + gas_sensor.power_mode = BME680_FORCED_MODE; + + /* Set the required sensor settings needed */ + uint8_t set_required_settings = BME680_OST_SEL | BME680_OSP_SEL | BME680_OSH_SEL | BME680_FILTER_SEL | BME680_GAS_SENSOR_SEL; + + /* Set the desired sensor configuration */ + rslt = bme680_set_sensor_settings(set_required_settings,&gas_sensor); + if (rslt != BME680_OK) { return false; } + + bme680_state = 0; + + return true; +} void Bme680PerformReading() { + int8_t rslt = BME680_OK; + if (BME680_CHIPID == bmp_type) { - bme680.performReading(); + if (0 == bme680_state) { + /* Trigger the next measurement if you would like to read data out continuously */ + rslt = bme680_set_sensor_mode(&gas_sensor); + if (rslt != BME680_OK) { return; } + + /* Get the total measurement duration so as to sleep or wait till the + * measurement is complete */ +// uint16_t meas_period; +// bme680_get_profile_dur(&meas_period, &gas_sensor); +// delay(meas_period); /* Delay till the measurement is ready */ // 183 mSec - we'll wait a second + + bme680_state = 1; + } else { + bme680_state = 0; + + struct bme680_field_data data; + rslt = bme680_get_sensor_data(&data, &gas_sensor); + if (rslt != BME680_OK) { return; } + + bme680_temperature = data.temperature / 100.0; + bme680_humidity = data.humidity / 1000.0; + bme680_pressure = data.pressure; + /* Avoid using measurements from an unstable heating setup */ + if (data.status & BME680_GASM_VALID_MSK) { + bme680_gas_resistance = data.gas_resistance; + } else { + bme680_gas_resistance = 0; + } + } } + return; } #endif // USE_BME680 @@ -385,7 +472,7 @@ void BmpDetect() #ifdef USE_BME680 case BME680_CHIPID: bmp_model = 3; // 2 - success = bme680.begin(bmp_address); + success = Bme680Init(); break; #endif // USE_BME680 } @@ -422,10 +509,10 @@ void BmpShow(boolean json) break; #ifdef USE_BME680 case BME680_CHIPID: - t = bme680.temperature; - p = bme680.pressure / 100.0; - h = bme680.humidity; - g = bme680.gas_resistance / 1000.0; + t = bme680_temperature; + p = bme680_pressure / 100.0; + h = bme680_humidity; + g = bme680_gas_resistance / 1000.0; break; #endif // USE_BME680 } @@ -512,16 +599,12 @@ boolean Xsns09(byte function) if (i2c_flg) { switch (function) { - case FUNC_PREP_BEFORE_TELEPERIOD: - BmpDetect(); - break; case FUNC_EVERY_SECOND: -#ifdef USE_BME680 - if ((Settings.tele_period - tele_period) < 300) { // 5 minute stabilization time - if (tele_period &1) { - Bme680PerformReading(); // Keep BME680 busy every two seconds - } + if (tele_period == Settings.tele_period -2) { // Allow 2 seconds to prepare BME680 readings + BmpDetect(); } +#ifdef USE_BME680 + Bme680PerformReading(); #endif // USE_BME680 break; case FUNC_JSON_APPEND: @@ -530,9 +613,6 @@ boolean Xsns09(byte function) #ifdef USE_WEBSERVER case FUNC_WEB_APPEND: BmpShow(0); -#ifdef USE_BME680 - Bme680PerformReading(); -#endif // USE_BME680 break; #endif // USE_WEBSERVER } From 2058b9fa951928b4bba9ad1d3e39d1509c26be85 Mon Sep 17 00:00:00 2001 From: Theo Arends Date: Fri, 6 Jul 2018 18:00:50 +0200 Subject: [PATCH 8/9] Updated to v6.1.0a Updated to v6.1.0a --- README.md | 33 ++--- platformio.ini | 5 +- sonoff/_releasenotes.ino | 49 ++++--- sonoff/sonoff.ino | 110 ++++++++------- sonoff/sonoff_post.h | 133 ++++++------------ sonoff/user_config.h | 4 +- sonoff/xdrv_02_webserver.ino | 252 ++++++++++++++++++----------------- sonoff/xdrv_03_energy.ino | 8 +- 8 files changed, 280 insertions(+), 314 deletions(-) diff --git a/README.md b/README.md index 9fef62adb..46c76619f 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you like **Sonoff-Tasmota**, give it a star, or fork it and contribute! ### Development [![Build Status](https://img.shields.io/travis/arendst/Sonoff-Tasmota.svg)](https://travis-ci.org/arendst/Sonoff-Tasmota) -Current version is **6.0.0c** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **6.1.0a** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### Disclaimer :warning: **DANGER OF ELECTROCUTION** :warning: @@ -39,7 +39,7 @@ If you want to compile Sonoff-Tasmota yourself keep in mind the following: - Once uploaded select module using the configuration webpage or the commands ```Modules``` and ```Module```. - After reboot select config menu again or use commands ```GPIOs``` and ```GPIO``` to change GPIO with desired sensor. -### Migration Instructions +### Migration Information See [wiki migration path](https://github.com/arendst/Sonoff-Tasmota/wiki/Upgrade#migration-path) for instructions how to migrate to a major version. Pay attention to the following version breaks due to dynamic settings updates: 1. Migrate to **Sonoff-Tasmota 3.9.x** @@ -134,34 +134,34 @@ Different firmware images are released based on Features and Sensors selection g | USE_ADS1115 | - | - | - | - | x | | USE_ADS1115_I2CDEV | - | - | - | - | - | | USE_INA219 | - | - | - | - | x | -| USE_APDS9960 | - | - | - | - | - | | USE_MGS | - | - | - | - | x | | USE_SPI | - | - | - | - | - | | USE_MHZ19 | x | x | - | x | x | -| USE_SENSEAIR | x | x | - | x | x | -| USE_PMS5003 | x | x | - | x | x | +| USE_SENSEAIR | x | - | - | x | x | +| USE_PMS5003 | x | - | - | x | x | | USE_NOVA_SDS | x | - | - | x | x | -| USE_PZEM004T | x | x | - | x | x | +| USE_PZEM004T | x | - | - | x | x | | USE_SERIAL_BRIDGE | x | - | - | x | x | -| USE_SDM120 | x | - | - | - | x | -| USE_SDM630 | x | - | - | - | x | +| USE_SDM120 | - | - | - | - | x | +| USE_SDM630 | - | - | - | - | x | | USE_IR_REMOTE | x | x | - | x | x | | USE_IR_HVAC | - | - | - | - | x | | USE_IR_RECEIVE | x | - | - | x | x | | USE_WS2812 | x | x | - | x | x | | USE_WS2812_DMA | - | - | - | - | - | -| USE_ARILUX_RF | x | x | - | x | x | +| USE_ARILUX_RF | x | - | - | x | x | | USE_SR04 | x | - | - | x | x | -| USE_TM1638 | - | - | - | - | - | | USE_RF_FLASH | x | - | - | x | x | -#### Typical File Size +#### Typical file size | ESP/Arduino library version | sonoff | classic | minimal | knx | allsensors | |-----------------------------|--------|---------|---------|------|------------| -| ESP/Arduino lib v2.3.0 | 529k | 490k | 429k | 538k | 554k | -| ESP/Arduino lib v2.4.0 | 534k | 498k | 436k | 542k | 558k | -| ESP/Arduino lib v2.4.1 | 536k | 501k | 439k | 545k | 560k | +| ESP/Arduino lib v2.3.0 | 538k | 490k | 399k | 548k | 562k | +| ESP/Arduino lib v2.4.0 | 543k | 498k | 406k | 553k | 565k | +| ESP/Arduino lib v2.4.1 | 544k | 500k | 408k | 555k | 567k | + +See [Tasmota ESP/Arduino library version related issues](https://github.com/arendst/Sonoff-Tasmota/wiki/Theo's-Tasmota-Tips#20180523---relation-tasmota-and-esp8266arduino-core-version) for more information. ### Contribute You can contribute to Sonoff-Tasmota by @@ -176,13 +176,14 @@ You can contribute to Sonoff-Tasmota by #### Libraries Used Libraries used with Sonoff-Tasmota are: - [ESP8266 core for Arduino](https://github.com/esp8266/Arduino) -- [Adafruit BME680](https://github.com/adafruit/Adafruit_BME680) -- [Adafruit Sensor](https://github.com/adafruit/Adafruit_Sensor) - [Adafruit SGP30](https://github.com/adafruit/Adafruit_SGP30) - [ArduinoJson](https://arduinojson.org/) +- [Bosch BME680](https://github.com/BoschSensortec/BME680_driver) +- [C2 Programmer](http://app.cear.ufpb.br/~lucas.hartmann/tag/efm8bb1/) - [Esp8266MqttClient](https://github.com/tuanpmt/ESP8266MQTTClient) - [esp-knx-ip](https://github.com/envy/esp-knx-ip) - [esp-mqtt-arduino](https://github.com/i-n-g-o/esp-mqtt-arduino) +- [ESPAsyncUDP](https://github.com/me-no-dev/ESPAsyncUDP) - [I2Cdevlib](https://github.com/jrowberg/i2cdevlib) - [IRremoteEsp8266](https://github.com/markszabo/IRremoteESP8266) - [JobaTsl2561](https://github.com/joba-1/Joba_Tsl2561) diff --git a/platformio.ini b/platformio.ini index cb5da39a9..4e1e4be7b 100644 --- a/platformio.ini +++ b/platformio.ini @@ -39,7 +39,7 @@ platform = espressif8266@1.5.0 ; *** Esp8266 core for Arduino version 2.4.0 ;platform = espressif8266@1.6.0 ; *** Esp8266 core for Arduino version 2.4.1 -;platform = espressif8266@1.7.0 +;platform = espressif8266@1.7.3 ; *** Esp8266 core for Arduino version latest beta ;platform = https://github.com/platformio/platform-espressif8266.git#feature/stage ; *** Esp8266 core for Arduino current version @@ -62,8 +62,7 @@ build_flags = monitor_speed = 115200 ; *** Upload Serial reset method for Wemos and NodeMCU -;upload_speed = 115200 -upload_speed = 512000 +upload_speed = 115200 upload_resetmethod = nodemcu upload_port = COM5 ; *** Fix Esp/Arduino core 2.4.x induced Tasmota unused floating point includes diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 25d26f547..0892f1364 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,38 +1,37 @@ -/* 6.0.0c - * Rewrite BME680 driver now using latest Bosch BME680 library (#2969) - * Add support for bitflags SetOption50 .. SetOption81 (#3118) - * - * 6.0.0b - * Add support for BlitzWolf BW-SHP2 (and Homecube, Gosund SP1) Energy Monitoring Smart Socket (#2223) - * Add support for Sonoff iFan02 as module 44 introducing command FanSpeed 0..3 (#2839) - * Add support for Sonoff S26 Smart Socket (#2808) - * Add command SetOption30 to enforce Hass discovery as light group (#1784) - * Add decimal values support for commands ADD, SUB, MULT and SCALE (#3083, #3089) +/* 6.1.0a * Add experimental (untested) TM1638 switch support (#2226) - * Change number of switches from 4 to 8 (#2885, #3086) - * - * 6.0.0a * Add support for APDS9960 proximity sensor (#3051) - * Add increment and decrement value to command Counter (#2838) - * Add option 0 to command Timers disarming all timers (#2962) - * Add time in minutes to rule Time#Initialized, Time#set and Time#Minute (#2669) - * Add rule variables %time% for minutes since midnight, %uptime%, %sunrise% and %sunset% giving time in minutes (#2669) * Add heap and stack debug information - * Add command SetOption28 to switch between hex or decimal Sonoff Bridge RF received data format (#3008) - * Add command SetOption29 to switch between hex or decimal IR received data format - * Add performance improvement when updating multiple individual WS2812 pixels (#3007) * Add debug facilities using optional xdrv_99_debug.ino to enable in user_config.h - * Add KNX support for DS18S20 Temperature sensor - * Add CRC to Settings making future upgrades more fail-safe - * Add support for uploading Sonoff Bridge firmware found in tools/fw_efm8bb1 folder build by Portisch using Web Gui File Upload (#2886) - * Add support for I2C temperature sensor LM75AD (#2909) - * Add command RfRaw to control Portisch firmware features + * + * 6.1.0 20180706 * Remove version 3, 4 and pre 5.2 settings auto-upgrade. See https://github.com/arendst/Sonoff-Tasmota/wiki/Upgrade#migration-path * Change default CFG_HOLDER from 0x20161209 to 4617 (=0x1209) - no impact on default upgrades + * Change number of supported switches from 4 to 8 (#2885, #3086) + * Change BME680 driver from Adafruit to Bosch BME680 library (#2969) * Fix Pzem004T checksum error * Fix KNX bug when doing reply of sensors values * Fix rules induced LWT message * Fix possible wifi connection problem (#1366) + * Add Ukrainian language file + * Add KNX support for DS18S20 Temperature sensor + * Add CRC to Settings making future upgrades more fail-safe + * Add command SetOption30 to enforce Hass discovery as light group (#1784) + * Add support for BlitzWolf BW-SHP2 (and Homecube, Gosund SP1) Energy Monitoring Smart Socket (#2223) + * Add time in minutes to rule Time#Initialized, Time#set and Time#Minute (#2669) + * Add rule variables %time% for minutes since midnight, %uptime%, %sunrise% and %sunset% giving time in minutes (#2669) + * Add support for Sonoff S26 Smart Socket (#2808) + * Add increment and decrement value to command Counter (#2838) + * Add support for Sonoff iFan02 as module 44 introducing command FanSpeed 0..3 (#2839) + * Add support for uploading Sonoff Bridge firmware found in tools/fw_efm8bb1 folder build by Portisch using Web Gui File Upload (#2886) + * Add command RfRaw to control Portisch firmware features + * Add support for I2C temperature sensor LM75AD (#2909) + * Add option 0 to command Timers disarming all timers (#2962) + * Add performance improvement when updating multiple individual WS2812 pixels (#3007) + * Add command SetOption28 to switch between hex or decimal Sonoff Bridge RF received data format (#3008) + * Add command SetOption29 to switch between hex or decimal IR received data format + * Add decimal values support for commands ADD, SUB, MULT and SCALE (#3083, #3089) + * Add support for bitflags SetOption50 .. SetOption81 (#3118) * * 5.14.0b * Add Console Commands to send KNX Commands diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index e23627f26..99ce6f759 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x06000003 // 6.0.0c +#define VERSION 0x06010001 // 6.1.0a // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) @@ -75,6 +75,12 @@ // Structs #include "settings.h" +#ifdef BE_MINIMAL +enum TasmotaCommands { + CMND_POWER, CMND_FANSPEED, CMND_STATUS, CMND_STATE, CMND_SLEEP, CMND_UPGRADE, CMND_UPLOAD, CMND_OTAURL, CMND_SERIALLOG, CMND_RESTART }; +const char kTasmotaCommands[] PROGMEM = + D_CMND_POWER "|" D_CMND_FANSPEED "|" D_CMND_STATUS "|" D_CMND_STATE "|" D_CMND_SLEEP "|" D_CMND_UPGRADE "|" D_CMND_UPLOAD "|" D_CMND_OTAURL "|" D_CMND_SERIALLOG "|" D_CMND_RESTART; +#else enum TasmotaCommands { CMND_BACKLOG, CMND_DELAY, CMND_POWER, CMND_FANSPEED, CMND_STATUS, CMND_STATE, CMND_POWERONSTATE, CMND_PULSETIME, CMND_BLINKTIME, CMND_BLINKCOUNT, CMND_SENSOR, CMND_SAVEDATA, CMND_SETOPTION, CMND_TEMPERATURE_RESOLUTION, CMND_HUMIDITY_RESOLUTION, @@ -95,6 +101,7 @@ const char kTasmotaCommands[] PROGMEM = D_CMND_WIFICONFIG "|" D_CMND_FRIENDLYNAME "|" D_CMND_SWITCHMODE "|" D_CMND_TELEPERIOD "|" D_CMND_RESTART "|" D_CMND_RESET "|" D_CMND_TIMEZONE "|" D_CMND_TIMESTD "|" D_CMND_TIMEDST "|" D_CMND_ALTITUDE "|" D_CMND_LEDPOWER "|" D_CMND_LEDSTATE "|" D_CMND_I2CSCAN "|" D_CMND_SERIALSEND "|" D_CMND_BAUDRATE "|" D_CMND_SERIALDELIMITER; +#endif const uint8_t kIFan02Speed[4][3] = {{6,6,6}, {7,6,6}, {7,7,6}, {7,6,7}}; @@ -480,6 +487,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) type = NULL; // Unknown command } } +#ifndef BE_MINIMAL else if (CMND_BACKLOG == command_code) { if (data_len) { uint8_t bl_pointer = (!backlog_pointer) ? MAX_BACKLOG -1 : backlog_pointer; @@ -513,6 +521,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) if ((payload >= MIN_BACKLOG_DELAY) && (payload <= 3600)) backlog_delay = payload; snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, backlog_delay); } +#endif // Not BE_MINIMAL else if ((CMND_POWER == command_code) && (index > 0) && (index <= devices_present)) { if ((payload < 0) || (payload > 4)) payload = 9; // Settings.flag.device_index_enable = user_append_index; @@ -540,6 +549,54 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) mqtt_data[0] = '\0'; MqttShowState(); } + else if (CMND_SLEEP == command_code) { + if ((payload >= 0) && (payload < 251)) { + if ((!Settings.sleep && payload) || (Settings.sleep && !payload)) restart_flag = 2; + Settings.sleep = payload; + sleep = payload; + } + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE_UNIT_NVALUE_UNIT, command, sleep, (Settings.flag.value_units) ? " " D_UNIT_MILLISECOND : "", Settings.sleep, (Settings.flag.value_units) ? " " D_UNIT_MILLISECOND : ""); + } + else if ((CMND_UPGRADE == command_code) || (CMND_UPLOAD == command_code)) { + // Check if the payload is numerically 1, and had no trailing chars. + // e.g. "1foo" or "1.2.3" could fool us. + // Check if the version we have been asked to upgrade to is higher than our current version. + // We also need at least 3 chars to make a valid version number string. + if (((1 == data_len) && (1 == payload)) || ((data_len >= 3) && NewerVersion(dataBuf))) { + ota_state_flag = 3; +// snprintf_P(mqtt_data, sizeof(mqtt_data), "{\"%s\":\"" D_JSON_VERSION " %s " D_JSON_FROM " %s\"}", command, my_version, Settings.ota_url); + snprintf_P(mqtt_data, sizeof(mqtt_data), "{\"%s\":\"" D_JSON_VERSION " %s " D_JSON_FROM " %s\"}", command, my_version, GetOtaUrl(stemp1, sizeof(stemp1))); + } else { + snprintf_P(mqtt_data, sizeof(mqtt_data), "{\"%s\":\"" D_JSON_ONE_OR_GT "\"}", command, my_version); + } + } + else if (CMND_OTAURL == command_code) { + if ((data_len > 0) && (data_len < sizeof(Settings.ota_url))) + strlcpy(Settings.ota_url, (1 == payload) ? OTA_URL : dataBuf, sizeof(Settings.ota_url)); + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, Settings.ota_url); + } + else if (CMND_SERIALLOG == command_code) { + if ((payload >= LOG_LEVEL_NONE) && (payload <= LOG_LEVEL_ALL)) { + Settings.flag.mqtt_serial = 0; + SetSeriallog(payload); + } + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE, command, Settings.seriallog_level, seriallog_level); + } + else if (CMND_RESTART == command_code) { + switch (payload) { + case 1: + restart_flag = 2; + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, D_JSON_RESTARTING); + break; + case 99: + AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_RESTARTING)); + EspRestart(); + break; + default: + snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, D_JSON_ONE_TO_RESTART); + } + } +#ifndef BE_MINIMAL else if ((CMND_POWERONSTATE == command_code) && (Settings.module != MOTOR)) { /* 0 = Keep relays off after power on * 1 = Turn relays on after power on, if PulseTime set wait for PulseTime seconds, and turn relays off @@ -854,32 +911,6 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, Settings.pulse_counter_debounce); } - else if (CMND_SLEEP == command_code) { - if ((payload >= 0) && (payload < 251)) { - if ((!Settings.sleep && payload) || (Settings.sleep && !payload)) restart_flag = 2; - Settings.sleep = payload; - sleep = payload; - } - snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE_UNIT_NVALUE_UNIT, command, sleep, (Settings.flag.value_units) ? " " D_UNIT_MILLISECOND : "", Settings.sleep, (Settings.flag.value_units) ? " " D_UNIT_MILLISECOND : ""); - } - else if ((CMND_UPGRADE == command_code) || (CMND_UPLOAD == command_code)) { - // Check if the payload is numerically 1, and had no trailing chars. - // e.g. "1foo" or "1.2.3" could fool us. - // Check if the version we have been asked to upgrade to is higher than our current version. - // We also need at least 3 chars to make a valid version number string. - if (((1 == data_len) && (1 == payload)) || ((data_len >= 3) && NewerVersion(dataBuf))) { - ota_state_flag = 3; -// snprintf_P(mqtt_data, sizeof(mqtt_data), "{\"%s\":\"" D_JSON_VERSION " %s " D_JSON_FROM " %s\"}", command, my_version, Settings.ota_url); - snprintf_P(mqtt_data, sizeof(mqtt_data), "{\"%s\":\"" D_JSON_VERSION " %s " D_JSON_FROM " %s\"}", command, my_version, GetOtaUrl(stemp1, sizeof(stemp1))); - } else { - snprintf_P(mqtt_data, sizeof(mqtt_data), "{\"%s\":\"" D_JSON_ONE_OR_GT "\"}", command, my_version); - } - } - else if (CMND_OTAURL == command_code) { - if ((data_len > 0) && (data_len < sizeof(Settings.ota_url))) - strlcpy(Settings.ota_url, (1 == payload) ? OTA_URL : dataBuf, sizeof(Settings.ota_url)); - snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, Settings.ota_url); - } else if (CMND_BAUDRATE == command_code) { if (payload32 > 0) { payload32 /= 1200; // Make it a valid baudrate @@ -917,13 +948,6 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, Settings.serial_delimiter); } - else if (CMND_SERIALLOG == command_code) { - if ((payload >= LOG_LEVEL_NONE) && (payload <= LOG_LEVEL_ALL)) { - Settings.flag.mqtt_serial = 0; - SetSeriallog(payload); - } - snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE, command, Settings.seriallog_level, seriallog_level); - } else if (CMND_SYSLOG == command_code) { if ((payload >= LOG_LEVEL_NONE) && (payload <= LOG_LEVEL_ALL)) { Settings.syslog_level = payload; @@ -1040,20 +1064,6 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) } snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE_UNIT, command, Settings.tele_period, (Settings.flag.value_units) ? " " D_UNIT_SECOND : ""); } - else if (CMND_RESTART == command_code) { - switch (payload) { - case 1: - restart_flag = 2; - snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, D_JSON_RESTARTING); - break; - case 99: - AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_RESTARTING)); - EspRestart(); - break; - default: - snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, D_JSON_ONE_TO_RESTART); - } - } else if (CMND_RESET == command_code) { switch (payload) { case 1: @@ -1147,6 +1157,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) I2cScan(mqtt_data, sizeof(mqtt_data)); } #endif // USE_I2C +#endif // Not BE_MINIMAL else type = NULL; // Unknown command } if (type == NULL) { @@ -2142,6 +2153,7 @@ void SerialInput() } } +#ifdef USE_ENERGY_SENSOR /*-------------------------------------------------------------------------------------------*\ * Sonoff S31 and Sonoff Pow R2 4800 baud serial interface \*-------------------------------------------------------------------------------------------*/ @@ -2152,7 +2164,7 @@ void SerialInput() return; } } - +#endif // USE_ENERGY_SENSOR /*-------------------------------------------------------------------------------------------*/ if (serial_in_byte > 127) { // binary data... diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h index afdded74d..9c9aab0f6 100644 --- a/sonoff/sonoff_post.h +++ b/sonoff/sonoff_post.h @@ -51,6 +51,7 @@ void KNX_CB_Action(message_t const &msg, void *arg); #endif #define USE_DHT // Default DHT11 sensor needs no external library +#define USE_ENERGY_SENSOR // Use energy sensors /*********************************************************************************************\ * [sonoff-allsensors.bin] @@ -58,6 +59,7 @@ void KNX_CB_Action(message_t const &msg, void *arg); \*********************************************************************************************/ #ifdef USE_ALL_SENSORS + #define USE_ADC_VCC // Display Vcc in Power status. Disable for use as Analog input on selected devices #define USE_DS18x20 // For more than one DS18x20 sensors with id sort, single scan and read retry (+1k3 code) //#define USE_DS18x20_LEGACY // For more than one DS18x20 sensors with dynamic scan using library OneWire (+1k5 code) @@ -65,16 +67,19 @@ void KNX_CB_Action(message_t const &msg, void *arg); #define USE_SHT // Add I2C emulating code for SHT1X sensor (+1k4 code) #define USE_SHT3X // Add I2C code for SHT3x sensor (+0k6 code) #define USE_HTU // Add I2C code for HTU21/SI7013/SI7020/SI7021 sensor (+1k5 code) +#define USE_LM75AD // Add I2C code for LM75AD sensor (+0k5 code) #define USE_BMP // Add I2C code for BMP085/BMP180/BMP280/BME280 sensor (+4k code) - #define USE_BME680 // Add additional support for BME680 sensor using Adafruit Sensor and BME680 libraries (+6k code) + #define USE_BME680 // Add additional support for BME680 sensor using Bosch BME680 library (+4k code) #define USE_SGP30 // Add I2C code for SGP30 sensor (+1k1 code) #define USE_BH1750 // Add I2C code for BH1750 sensor (+0k5 code) #define USE_VEML6070 // Add I2C code for VEML6070 sensor (+0k5 code) #define USE_TSL2561 // Add I2C code for TSL2561 sensor using library Adafruit TSL2561 Arduino (+1k2 code) +//#define USE_SI1145 // Add I2C code for SI1145/46/47 sensor (+1k code) #define USE_ADS1115 // Add I2C code for ADS1115 16 bit A/D converter based on Adafruit ADS1x15 library (no library needed) (+0k7 code) //#define USE_ADS1115_I2CDEV // Add I2C code for ADS1115 16 bit A/D converter using library i2cdevlib-Core and i2cdevlib-ADS1115 (+2k code) #define USE_INA219 // Add I2C code for INA219 Low voltage and current sensor (+1k code) #define USE_MGS // Add I2C code for Xadow and Grove Mutichannel Gas sensor using library Multichannel_Gas_Sensor (+10k code) +//#define USE_APDS9960 // Add I2C code for APDS9960 Proximity Sensor. Disables SHT and VEML6070 (+4k7 code) #define USE_MHZ19 // Add support for MH-Z19 CO2 sensor (+2k code) #define USE_SENSEAIR // Add support for SenseAir K30, K70 and S8 CO2 sensor (+2k3 code) #ifndef CO2_LOW @@ -87,6 +92,8 @@ void KNX_CB_Action(message_t const &msg, void *arg); #define USE_NOVA_SDS // Add support for SDS011 and SDS021 particle concentration sensor (+0k7 code) #define USE_PZEM004T // Add support for PZEM004T Energy monitor (+2k code) #define USE_SERIAL_BRIDGE // Add support for software Serial Bridge (+0k8 code) +#define USE_SDM120 // Add support for Eastron SDM120-Modbus energy meter (+1k7 code) +#define USE_SDM630 // Add support for Eastron SDM630-Modbus energy meter (+2k code) #define USE_IR_REMOTE // Send IR remote commands using library IRremoteESP8266 and ArduinoJson (+4k code, 0k3 mem, 48 iram) #define USE_IR_HVAC // Support for HVAC system using IR (+2k code) #define USE_IR_RECEIVE // Support for IR receiver (+5k5 code, 264 iram) @@ -105,36 +112,28 @@ void KNX_CB_Action(message_t const &msg, void *arg); \*********************************************************************************************/ #ifdef USE_CLASSIC -#ifdef USE_KNX -#undef USE_KNX -#endif -#ifdef USE_TIMERS -#undef USE_TIMERS -#endif -#ifdef USE_TIMERS_WEB -#undef USE_TIMERS_WEB -#endif -#ifdef USE_SUNRISE -#undef USE_SUNRISE -#endif -#ifdef USE_RULES -#undef USE_RULES -#endif -#ifdef USE_SGP30 -#undef USE_SGP30 -#endif -#ifdef USE_NOVA_SDS -#undef USE_NOVA_SDS -#endif -#ifdef USE_IR_RECEIVE -#undef USE_IR_RECEIVE -#endif -#ifdef USE_SERIAL_BRIDGE -#undef USE_SERIAL_BRIDGE -#endif -#ifdef USE_SR04 -#undef USE_SR04 -#endif + +#undef USE_KNX // Disable KNX IP Protocol Support +#undef USE_TIMERS // Disable support for up to 16 timers +#undef USE_TIMERS_WEB // Disable support for timer webpage +#undef USE_SUNRISE // Disable support for Sunrise and sunset tools +#undef USE_RULES // Disable support for rules +#undef USE_LM75AD // Disable sensor +#undef USE_BME680 // Disable sensor +#undef USE_SGP30 // Disable sensor +#undef USE_SENSEAIR // Disable support for SenseAir K30, K70 and S8 CO2 sensor +#undef USE_NOVA_SDS // Disable support for SDS011 and SDS021 particle concentration sensor +#undef USE_PZEM004T // Disable PZEM004T energy sensor +#undef USE_IR_RECEIVE // Disable support for IR receiver +#undef USE_SERIAL_BRIDGE // Disable support for software Serial Bridge +#undef USE_SDM120 // Disable support for Eastron SDM120-Modbus energy meter +#undef USE_SDM630 // Disable support for Eastron SDM630-Modbus energy meter +#undef USE_ARILUX_RF // Disable support for Arilux RF remote controller +#undef USE_SR04 // Disable support for for HC-SR04 ultrasonic devices +#undef USE_TM1638 // Disable support for TM1638 switches copying Switch1 .. Switch8 +#undef USE_RF_FLASH // Disable support for flashing the EFM8BB1 chip on the Sonoff RF Bridge. C2CK must be connected to GPIO4, C2D to GPIO5 on the PCB +#undef DEBUG_THEO // Disable debug code +#undef USE_DEBUG_DRIVER // Disable debug code #endif // USE_CLASSIC /*********************************************************************************************\ @@ -143,12 +142,11 @@ void KNX_CB_Action(message_t const &msg, void *arg); \*********************************************************************************************/ #ifdef USE_KNX_NO_EMULATION + #ifndef USE_KNX #define USE_KNX // Enable KNX IP Protocol Support (+23k code, +3k3 mem) #endif -#ifdef USE_EMULATION #undef USE_EMULATION // Disable Belkin WeMo and Hue Bridge emulation for Alexa (-16k code, -2k mem) -#endif #endif // USE_KNX_NO_EMULATION /*********************************************************************************************\ @@ -166,90 +164,43 @@ void KNX_CB_Action(message_t const &msg, void *arg); \*********************************************************************************************/ #ifdef BE_MINIMAL -#ifdef USE_MQTT_TLS -#undef USE_MQTT_TLS // Disable TLS support won't work as the MQTTHost is not set -#endif -#ifdef USE_DISCOVERY -#undef USE_DISCOVERY // Disable Discovery services for both MQTT and web server -#endif -#ifdef USE_DOMOTICZ + +#undef USE_ENERGY_SENSOR // Disable energy sensors +#undef USE_ARDUINO_OTA // Disable support for Arduino OTA #undef USE_DOMOTICZ // Disable Domoticz -#endif -#ifdef USE_HOME_ASSISTANT #undef USE_HOME_ASSISTANT // Disable Home Assistant -#endif -#ifdef USE_KNX +#undef USE_MQTT_TLS // Disable TLS support won't work as the MQTTHost is not set #undef USE_KNX // Disable KNX IP Protocol Support -#endif -//#ifdef USE_WEBSERVER //#undef USE_WEBSERVER // Disable Webserver -//#endif -#ifdef USE_EMULATION +#undef USE_DISCOVERY // Disable Discovery services for both MQTT and web server #undef USE_EMULATION // Disable Wemo or Hue emulation -#endif -#ifdef USE_TIMERS #undef USE_TIMERS // Disable support for up to 16 timers -#endif -#ifdef USE_SUNRISE +#undef USE_TIMERS_WEB // Disable support for timer webpage #undef USE_SUNRISE // Disable support for Sunrise and sunset tools -#endif -#ifdef USE_RULES #undef USE_RULES // Disable support for rules -#endif -#ifdef USE_DHT #undef USE_DHT // Disable internal DHT sensor -#endif -#ifdef USE_DS18x20 #undef USE_DS18x20 // Disable DS18x20 sensor -#endif -#ifdef USE_DS18B20 +#undef USE_DS18x20_LEGACY // Disable DS18x20 sensor #undef USE_DS18B20 // Disable internal DS18B20 sensor -#endif -#ifdef USE_I2C #undef USE_I2C // Disable all I2C sensors and devices -#endif -#ifdef USE_SPI #undef USE_SPI // Disable all SPI devices -#endif -#ifdef USE_DISPLAY #undef USE_DISPLAY // Disable Display support -#endif -#ifdef USE_MHZ19 #undef USE_MHZ19 // Disable support for MH-Z19 CO2 sensor -#endif -#ifdef USE_SENSEAIR #undef USE_SENSEAIR // Disable support for SenseAir K30, K70 and S8 CO2 sensor -#endif -#ifdef USE_PMS5003 #undef USE_PMS5003 // Disable support for PMS5003 and PMS7003 particle concentration sensor -#endif -#ifdef USE_NOVA_SDS #undef USE_NOVA_SDS // Disable support for SDS011 and SDS021 particle concentration sensor -#endif -#ifdef USE_PZEM004T #undef USE_PZEM004T // Disable PZEM004T energy sensor -#endif -#ifdef USE_SERIAL_BRIDGE #undef USE_SERIAL_BRIDGE // Disable support for software Serial Bridge -#endif -#ifdef USE_IR_REMOTE +#undef USE_SDM120 // Disable support for Eastron SDM120-Modbus energy meter +#undef USE_SDM630 // Disable support for Eastron SDM630-Modbus energy meter #undef USE_IR_REMOTE // Disable IR driver -#endif -#ifdef USE_WS2812 #undef USE_WS2812 // Disable WS2812 Led string -#endif -#ifdef USE_ARILUX_RF #undef USE_ARILUX_RF // Disable support for Arilux RF remote controller -#endif -#ifdef USE_SR04 #undef USE_SR04 // Disable support for for HC-SR04 ultrasonic devices -#endif -#ifdef DEBUG_THEO +#undef USE_TM1638 // Disable support for TM1638 switches copying Switch1 .. Switch8 +#undef USE_RF_FLASH // Disable support for flashing the EFM8BB1 chip on the Sonoff RF Bridge. C2CK must be connected to GPIO4, C2D to GPIO5 on the PCB #undef DEBUG_THEO // Disable debug code -#endif -#ifdef USE_DEBUG_DRIVER #undef USE_DEBUG_DRIVER // Disable debug code -#endif #endif // BE_MINIMAL /*********************************************************************************************\ diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 0c4aa66f5..f54cf865f 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -44,7 +44,7 @@ \*********************************************************************************************/ // -- Master parameter control -------------------- -#define CFG_HOLDER 4617 // [Reset 1] Change this value to load SECTION1 configuration parameters to flash +#define CFG_HOLDER 4617 // [Reset 1] Change this value (max 32000) to load SECTION1 configuration parameters to flash // -- Project ------------------------------------- #define PROJECT "sonoff" // PROJECT is used as the default topic delimiter @@ -265,7 +265,7 @@ #define USE_HTU // Add I2C code for HTU21/SI7013/SI7020/SI7021 sensor (+1k5 code) #define USE_LM75AD // Add I2C code for LM75AD sensor (+0k5 code) #define USE_BMP // Add I2C code for BMP085/BMP180/BMP280/BME280 sensor (+4k code) -// #define USE_BME680 // Add additional support for BME680 sensor using Adafruit Sensor and BME680 libraries (+6k code) +// #define USE_BME680 // Add additional support for BME680 sensor using Bosch BME680 library (+4k code) #define USE_SGP30 // Add I2C code for SGP30 sensor (+1k1 code) #define USE_BH1750 // Add I2C code for BH1750 sensor (+0k5 code) // #define USE_VEML6070 // Add I2C code for VEML6070 sensor (+0k5 code) diff --git a/sonoff/xdrv_02_webserver.ino b/sonoff/xdrv_02_webserver.ino index b29e32ea2..d04226b9d 100644 --- a/sonoff/xdrv_02_webserver.ino +++ b/sonoff/xdrv_02_webserver.ino @@ -367,6 +367,14 @@ void StartWebserver(int type, IPAddress ipweb) if (!WebServer) { WebServer = new ESP8266WebServer((HTTP_MANAGER==type) ? 80 : WEB_PORT); WebServer->on("/", HandleRoot); + WebServer->on("/up", HandleUpgradeFirmware); + WebServer->on("/u1", HandleUpgradeFirmwareStart); // OTA + WebServer->on("/u2", HTTP_POST, HandleUploadDone, HandleUploadLoop); + WebServer->on("/cs", HandleConsole); + WebServer->on("/ax", HandleAjaxConsoleRefresh); + WebServer->on("/ay", HandleAjaxStatusRefresh); + WebServer->on("/rb", HandleRestart); +#ifndef BE_MINIMAL WebServer->on("/cn", HandleConfiguration); WebServer->on("/md", HandleModuleConfiguration); #if defined(USE_TIMERS) && defined(USE_TIMERS_WEB) @@ -389,17 +397,9 @@ void StartWebserver(int type, IPAddress ipweb) WebServer->on("/sv", HandleSaveSettings); WebServer->on("/rs", HandleRestoreConfiguration); WebServer->on("/rt", HandleResetConfiguration); - WebServer->on("/up", HandleUpgradeFirmware); - WebServer->on("/u1", HandleUpgradeFirmwareStart); // OTA - WebServer->on("/u2", HTTP_POST, HandleUploadDone, HandleUploadLoop); WebServer->on("/u2", HTTP_OPTIONS, HandlePreflightRequest); WebServer->on("/cm", HandleHttpCommand); - WebServer->on("/cs", HandleConsole); - WebServer->on("/ax", HandleAjaxConsoleRefresh); - WebServer->on("/ay", HandleAjaxStatusRefresh); WebServer->on("/in", HandleInformation); - WebServer->on("/rb", HandleRestart); - WebServer->on("/fwlink", HandleRoot); // Microsoft captive portal. Maybe not needed. Might be handled by notFound handler. #ifdef USE_EMULATION if (EMUL_WEMO == Settings.flag2.emulation) { WebServer->on("/upnp/control/basicevent1", HTTP_POST, HandleUpnpEvent); @@ -411,6 +411,8 @@ void StartWebserver(int type, IPAddress ipweb) WebServer->on("/description.xml", HandleUpnpSetupHue); } #endif // USE_EMULATION +#endif // Not BE_MINIMAL + WebServer->on("/fwlink", HandleRoot); // Microsoft captive portal. Maybe not needed. Might be handled by notFound handler. WebServer->onNotFound(HandleNotFound); } reset_web_log_flag = 0; @@ -520,6 +522,7 @@ void HandleRoot() if (CaptivePortal()) { return; } // If captive portal redirect instead of displaying the page. if (HTTP_MANAGER == webserver_state) { +#ifndef BE_MINIMAL if ((Settings.web_password[0] != 0) && !(WebServer->hasArg("USER1")) && !(WebServer->hasArg("PASS1"))) { HandleWifiLogin(); } else { @@ -537,6 +540,7 @@ void HandleRoot() HandleWifiLogin(); } } +#endif // Not BE_MINIMAL } else { char stemp[10]; String page = FPSTR(HTTP_HEAD); @@ -672,6 +676,7 @@ boolean HttpUser() return status; } +#ifndef BE_MINIMAL void HandleConfiguration() { if (HttpUser()) { return; } @@ -1205,6 +1210,122 @@ void HandleRestoreConfiguration() upload_file_type = UPL_SETTINGS; } +void HandleInformation() +{ + if (HttpUser()) { return; } + AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_INFORMATION); + + char stopic[TOPSZ]; + + int freeMem = ESP.getFreeHeap(); + + String page = FPSTR(HTTP_HEAD); + page.replace(F("{v}"), FPSTR(S_INFORMATION)); + page += FPSTR(HTTP_HEAD_STYLE); + // page += F("
 Information "); + + page += F(""); + page += F("
"); + + // Save 1k of code space replacing table html with javascript replace codes + // }1 = + // }2 = + String func = FPSTR(HTTP_SCRIPT_INFO_BEGIN); + func += F("
"); + func += F(D_PROGRAM_VERSION "}2"); func += my_version; + func += F("}1" D_BUILD_DATE_AND_TIME "}2"); func += GetBuildDateAndTime(); + func += F("}1" D_CORE_AND_SDK_VERSION "}2" ARDUINO_ESP8266_RELEASE "/"); func += String(ESP.getSdkVersion()); + func += F("}1" D_UPTIME "}2"); func += GetDateAndTime(DT_UPTIME); + snprintf_P(stopic, sizeof(stopic), PSTR(" at %X"), GetSettingsAddress()); + func += F("}1" D_FLASH_WRITE_COUNT "}2"); func += String(Settings.save_flag); func += stopic; + func += F("}1" D_BOOT_COUNT "}2"); func += String(Settings.bootcount); + func += F("}1" D_RESTART_REASON "}2"); func += GetResetReason(); + uint8_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : devices_present; + if (SONOFF_IFAN02 == Settings.module) { maxfn = 1; } + for (byte i = 0; i < maxfn; i++) { + func += F("}1" D_FRIENDLY_NAME " "); func += i +1; func += F("}2"); func += Settings.friendlyname[i]; + } + + func += F("}1}2 "); // Empty line + func += F("}1" D_AP); func += String(Settings.sta_active +1); + func += F(" " D_SSID " (" D_RSSI ")}2"); func += Settings.sta_ssid[Settings.sta_active]; func += F(" ("); func += WifiGetRssiAsQuality(WiFi.RSSI()); func += F("%)"); + func += F("}1" D_HOSTNAME "}2"); func += my_hostname; + if (static_cast(WiFi.localIP()) != 0) { + func += F("}1" D_IP_ADDRESS "}2"); func += WiFi.localIP().toString(); + func += F("}1" D_GATEWAY "}2"); func += IPAddress(Settings.ip_address[1]).toString(); + func += F("}1" D_SUBNET_MASK "}2"); func += IPAddress(Settings.ip_address[2]).toString(); + func += F("}1" D_DNS_SERVER "}2"); func += IPAddress(Settings.ip_address[3]).toString(); + func += F("}1" D_MAC_ADDRESS "}2"); func += WiFi.macAddress(); + } + if (static_cast(WiFi.softAPIP()) != 0) { + func += F("}1" D_AP " " D_IP_ADDRESS "}2"); func += WiFi.softAPIP().toString(); + func += F("}1" D_AP " " D_GATEWAY "}2"); func += WiFi.softAPIP().toString(); + func += F("}1" D_AP " " D_MAC_ADDRESS "}2"); func += WiFi.softAPmacAddress(); + } + + func += F("}1}2 "); // Empty line + if (Settings.flag.mqtt_enabled) { + func += F("}1" D_MQTT_HOST "}2"); func += Settings.mqtt_host; + func += F("}1" D_MQTT_PORT "}2"); func += String(Settings.mqtt_port); + func += F("}1" D_MQTT_CLIENT " &
 " D_FALLBACK_TOPIC "}2"); func += mqtt_client; + func += F("}1" D_MQTT_USER "}2"); func += Settings.mqtt_user; + func += F("}1" D_MQTT_TOPIC "}2"); func += Settings.mqtt_topic; + func += F("}1" D_MQTT_GROUP_TOPIC "}2"); func += Settings.mqtt_grptopic; + GetTopic_P(stopic, CMND, mqtt_topic, ""); + func += F("}1" D_MQTT_FULL_TOPIC "}2"); func += stopic; + + } else { + func += F("}1" D_MQTT "}2" D_DISABLED); + } + + func += F("}1}2 "); // Empty line + func += F("}1" D_EMULATION "}2"); +#ifdef USE_EMULATION + if (EMUL_WEMO == Settings.flag2.emulation) { + func += F(D_BELKIN_WEMO); + } + else if (EMUL_HUE == Settings.flag2.emulation) { + func += F(D_HUE_BRIDGE); + } + else { + func += F(D_NONE); + } +#else + func += F(D_DISABLED); +#endif // USE_EMULATION + + func += F("}1" D_MDNS_DISCOVERY "}2"); +#ifdef USE_DISCOVERY + func += F(D_ENABLED); + func += F("}1" D_MDNS_ADVERTISE "}2"); +#ifdef WEBSERVER_ADVERTISE + func += F(D_WEB_SERVER); +#else + func += F(D_DISABLED); +#endif // WEBSERVER_ADVERTISE +#else + func += F(D_DISABLED); +#endif // USE_DISCOVERY + + func += F("}1}2 "); // Empty line + func += F("}1" D_ESP_CHIP_ID "}2"); func += String(ESP.getChipId()); + func += F("}1" D_FLASH_CHIP_ID "}2"); func += String(ESP.getFlashChipId()); + func += F("}1" D_FLASH_CHIP_SIZE "}2"); func += String(ESP.getFlashChipRealSize() / 1024); func += F("kB"); + func += F("}1" D_PROGRAM_FLASH_SIZE "}2"); func += String(ESP.getFlashChipSize() / 1024); func += F("kB"); + func += F("}1" D_PROGRAM_SIZE "}2"); func += String(ESP.getSketchSize() / 1024); func += F("kB"); + func += F("}1" D_FREE_PROGRAM_SPACE "}2"); func += String(ESP.getFreeSketchSpace() / 1024); func += F("kB"); + func += F("}1" D_FREE_MEMORY "}2"); func += String(freeMem / 1024); func += F("kB"); + func += F("
"); + func += FPSTR(HTTP_SCRIPT_INFO_END); + page.replace(F(""), func); + page.replace(F(""), F("")); + + // page += F("
"); + page += FPSTR(HTTP_BTN_MAIN); + ShowPage(page); +} +#endif // Not BE_MINIMAL + void HandleUpgradeFirmware() { if (HttpUser()) { return; } @@ -1629,121 +1750,6 @@ void HandleAjaxConsoleRefresh() WebServer->send(200, FPSTR(HDR_CTYPE_XML), message); } -void HandleInformation() -{ - if (HttpUser()) { return; } - AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_INFORMATION); - - char stopic[TOPSZ]; - - int freeMem = ESP.getFreeHeap(); - - String page = FPSTR(HTTP_HEAD); - page.replace(F("{v}"), FPSTR(S_INFORMATION)); - page += FPSTR(HTTP_HEAD_STYLE); - // page += F("
 Information "); - - page += F(""); - page += F("
"); - - // Save 1k of code space replacing table html with javascript replace codes - // }1 = - // }2 = - String func = FPSTR(HTTP_SCRIPT_INFO_BEGIN); - func += F("
"); - func += F(D_PROGRAM_VERSION "}2"); func += my_version; - func += F("}1" D_BUILD_DATE_AND_TIME "}2"); func += GetBuildDateAndTime(); - func += F("}1" D_CORE_AND_SDK_VERSION "}2" ARDUINO_ESP8266_RELEASE "/"); func += String(ESP.getSdkVersion()); - func += F("}1" D_UPTIME "}2"); func += GetDateAndTime(DT_UPTIME); - snprintf_P(stopic, sizeof(stopic), PSTR(" at %X"), GetSettingsAddress()); - func += F("}1" D_FLASH_WRITE_COUNT "}2"); func += String(Settings.save_flag); func += stopic; - func += F("}1" D_BOOT_COUNT "}2"); func += String(Settings.bootcount); - func += F("}1" D_RESTART_REASON "}2"); func += GetResetReason(); - uint8_t maxfn = (devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : devices_present; - if (SONOFF_IFAN02 == Settings.module) { maxfn = 1; } - for (byte i = 0; i < maxfn; i++) { - func += F("}1" D_FRIENDLY_NAME " "); func += i +1; func += F("}2"); func += Settings.friendlyname[i]; - } - - func += F("}1}2 "); // Empty line - func += F("}1" D_AP); func += String(Settings.sta_active +1); - func += F(" " D_SSID " (" D_RSSI ")}2"); func += Settings.sta_ssid[Settings.sta_active]; func += F(" ("); func += WifiGetRssiAsQuality(WiFi.RSSI()); func += F("%)"); - func += F("}1" D_HOSTNAME "}2"); func += my_hostname; - if (static_cast(WiFi.localIP()) != 0) { - func += F("}1" D_IP_ADDRESS "}2"); func += WiFi.localIP().toString(); - func += F("}1" D_GATEWAY "}2"); func += IPAddress(Settings.ip_address[1]).toString(); - func += F("}1" D_SUBNET_MASK "}2"); func += IPAddress(Settings.ip_address[2]).toString(); - func += F("}1" D_DNS_SERVER "}2"); func += IPAddress(Settings.ip_address[3]).toString(); - func += F("}1" D_MAC_ADDRESS "}2"); func += WiFi.macAddress(); - } - if (static_cast(WiFi.softAPIP()) != 0) { - func += F("}1" D_AP " " D_IP_ADDRESS "}2"); func += WiFi.softAPIP().toString(); - func += F("}1" D_AP " " D_GATEWAY "}2"); func += WiFi.softAPIP().toString(); - func += F("}1" D_AP " " D_MAC_ADDRESS "}2"); func += WiFi.softAPmacAddress(); - } - - func += F("}1}2 "); // Empty line - if (Settings.flag.mqtt_enabled) { - func += F("}1" D_MQTT_HOST "}2"); func += Settings.mqtt_host; - func += F("}1" D_MQTT_PORT "}2"); func += String(Settings.mqtt_port); - func += F("}1" D_MQTT_CLIENT " &
 " D_FALLBACK_TOPIC "}2"); func += mqtt_client; - func += F("}1" D_MQTT_USER "}2"); func += Settings.mqtt_user; - func += F("}1" D_MQTT_TOPIC "}2"); func += Settings.mqtt_topic; - func += F("}1" D_MQTT_GROUP_TOPIC "}2"); func += Settings.mqtt_grptopic; - GetTopic_P(stopic, CMND, mqtt_topic, ""); - func += F("}1" D_MQTT_FULL_TOPIC "}2"); func += stopic; - - } else { - func += F("}1" D_MQTT "}2" D_DISABLED); - } - - func += F("}1}2 "); // Empty line - func += F("}1" D_EMULATION "}2"); -#ifdef USE_EMULATION - if (EMUL_WEMO == Settings.flag2.emulation) { - func += F(D_BELKIN_WEMO); - } - else if (EMUL_HUE == Settings.flag2.emulation) { - func += F(D_HUE_BRIDGE); - } - else { - func += F(D_NONE); - } -#else - func += F(D_DISABLED); -#endif // USE_EMULATION - - func += F("}1" D_MDNS_DISCOVERY "}2"); -#ifdef USE_DISCOVERY - func += F(D_ENABLED); - func += F("}1" D_MDNS_ADVERTISE "}2"); -#ifdef WEBSERVER_ADVERTISE - func += F(D_WEB_SERVER); -#else - func += F(D_DISABLED); -#endif // WEBSERVER_ADVERTISE -#else - func += F(D_DISABLED); -#endif // USE_DISCOVERY - - func += F("}1}2 "); // Empty line - func += F("}1" D_ESP_CHIP_ID "}2"); func += String(ESP.getChipId()); - func += F("}1" D_FLASH_CHIP_ID "}2"); func += String(ESP.getFlashChipId()); - func += F("}1" D_FLASH_CHIP_SIZE "}2"); func += String(ESP.getFlashChipRealSize() / 1024); func += F("kB"); - func += F("}1" D_PROGRAM_FLASH_SIZE "}2"); func += String(ESP.getFlashChipSize() / 1024); func += F("kB"); - func += F("}1" D_PROGRAM_SIZE "}2"); func += String(ESP.getSketchSize() / 1024); func += F("kB"); - func += F("}1" D_FREE_PROGRAM_SPACE "}2"); func += String(ESP.getFreeSketchSpace() / 1024); func += F("kB"); - func += F("}1" D_FREE_MEMORY "}2"); func += String(freeMem / 1024); func += F("kB"); - func += F("
"); - func += FPSTR(HTTP_SCRIPT_INFO_END); - page.replace(F(""), func); - page.replace(F(""), F("")); - - // page += F("
"); - page += FPSTR(HTTP_BTN_MAIN); - ShowPage(page); -} - void HandleRestart() { if (HttpUser()) { return; } diff --git a/sonoff/xdrv_03_energy.ino b/sonoff/xdrv_03_energy.ino index e862ffdcd..3e12ef94f 100644 --- a/sonoff/xdrv_03_energy.ino +++ b/sonoff/xdrv_03_energy.ino @@ -17,8 +17,6 @@ along with this program. If not, see . */ -#define USE_ENERGY_SENSOR - #ifdef USE_ENERGY_SENSOR /*********************************************************************************************\ * HLW8012 and PZEM004T - Energy @@ -93,18 +91,18 @@ void EnergyUpdateToday() } /*********************************************************************************************\ - * HLW8012, BL0937 or HJL-01 - Energy (Sonoff Pow) + * HLW8012, BL0937 or HJL-01 - Energy (Sonoff Pow, HuaFan, KMC70011, BlitzWolf) * * Based on Source: Shenzhen Heli Technology Co., Ltd \*********************************************************************************************/ -// HLW8012 based (Sonoff Pow, KMC70011) +// HLW8012 based (Sonoff Pow, KMC70011, HuaFan) #define HLW_PREF 10000 // 1000.0W #define HLW_UREF 2200 // 220.0V #define HLW_IREF 4545 // 4.545A #define HLW_SEL_VOLTAGE 1 -// HJL-01 based (Homecube, BlitzWolf) +// HJL-01 based (BlitzWolf, Homecube, Gosund) #define HJL_PREF 1362 #define HJL_UREF 822 #define HJL_IREF 3300 From 9236c082f6dc906cdf6d50ec08974dcd1f741561 Mon Sep 17 00:00:00 2001 From: Matias B Date: Fri, 6 Jul 2018 14:58:19 -0300 Subject: [PATCH 9/9] Fix es-AR typos --- sonoff/language/es-AR.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index cb50b7377..1c4b4924a 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -131,7 +131,7 @@ #define D_PROGRAM_SIZE "Tamaño Programa" #define D_PROJECT "Proyecto" #define D_RECEIVED "Recibido" -#define D_RESTART "Reinicio" +#define D_RESTART "Reiniciar" #define D_RESTARTING "Reiniciando" #define D_RESTART_REASON "Causa Reinicio" #define D_RESTORE "Restauración" @@ -168,7 +168,7 @@ #define D_WEB_SERVER "Servidor Web" // sonoff.ino -#define D_WARNING_MINIMAL_VERSION "Precaución, esta versión no salva los cambios" +#define D_WARNING_MINIMAL_VERSION "Cuidado, esta versión no guarda los cambios" #define D_LEVEL_10 "level 1-0" #define D_LEVEL_01 "level 0-1" #define D_SERIAL_LOGGING_DISABLED "Log serial deshabilitado" @@ -188,12 +188,12 @@ #define D_PATCH_ISSUE_2186 "Patch issue 2186" #define D_CONNECTING_TO_AP "Connectando a AP" #define D_IN_MODE "en modo" -#define D_CONNECT_FAILED_NO_IP_ADDRESS "Falló Conección, Dirección IP no recibida" -#define D_CONNECT_FAILED_AP_NOT_REACHED "Falló Conección, AP no pudo ser contactado" -#define D_CONNECT_FAILED_WRONG_PASSWORD "Falló Conección, clave de AP incorrecta" -#define D_CONNECT_FAILED_AP_TIMEOUT "Falló Conección, timeout de AP" +#define D_CONNECT_FAILED_NO_IP_ADDRESS "Falló Conexión, Dirección IP no recibida" +#define D_CONNECT_FAILED_AP_NOT_REACHED "Falló Conexión, AP no pudo ser contactado" +#define D_CONNECT_FAILED_WRONG_PASSWORD "Falló Conexión, clave de AP incorrecta" +#define D_CONNECT_FAILED_AP_TIMEOUT "Falló Conexión, timeout de AP" #define D_ATTEMPTING_CONNECTION "Intentando conectar..." -#define D_CHECKING_CONNECTION "Probando conección..." +#define D_CHECKING_CONNECTION "Probando conexión..." #define D_QUERY_DONE "Consulta lista. Servicio MQTT encontrado" #define D_MQTT_SERVICE_FOUND "Servicio MQTT encontrado en" #define D_FOUND_AT "encontrado en" @@ -211,18 +211,18 @@ #define D_WITH_IP_ADDRESS "con dirección IP" #define D_WEBSERVER_STOPPED "Servidor web detenido" #define D_FILE_NOT_FOUND "Archivo No Encontrado" -#define D_REDIRECTED "Redireccinado al portal captivo" +#define D_REDIRECTED "Redireccionado al portal captivo" #define D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION "Wifimanager como AccessPoint y Estación" #define D_WIFIMANAGER_SET_ACCESSPOINT "Wifimanager como AccessPoint" #define D_TRYING_TO_CONNECT "Intentado conectar dispositivo a la red" #define D_RESTART_IN "Reinicio en" #define D_SECONDS "segundos" -#define D_DEVICE_WILL_RESTART "El dispositivo se reiniciará en pocos segundos" +#define D_DEVICE_WILL_RESTART "El dispositivo se reiniciará en unos segundos" #define D_BUTTON_TOGGLE "Alternar ON/OFF" #define D_CONFIGURATION "Configuración" #define D_INFORMATION "Información" -#define D_FIRMWARE_UPGRADE "Actualización Firmware" +#define D_FIRMWARE_UPGRADE "Actualizar Firmware" #define D_CONSOLE "Consola" #define D_CONFIRM_RESTART "Confirmar Reinicio" @@ -239,7 +239,7 @@ #define D_MAIN_MENU "Menú Principal" #define D_MODULE_PARAMETERS "Parámetros del módulo" -#define D_MODULE_TYPE "Tipo módulo" +#define D_MODULE_TYPE "Tipo de módulo" #define D_GPIO "GPIO" #define D_SERIAL_IN "Serial In" #define D_SERIAL_OUT "Serial Out" @@ -250,7 +250,7 @@ #define D_NO_NETWORKS_FOUND "Ninguna red encontrada" #define D_REFRESH_TO_SCAN_AGAIN "Recargar página para buscar nuevamente" #define D_DUPLICATE_ACCESSPOINT "AccessPoint duplicado" -#define D_SKIPPING_LOW_QUALITY "Ignorado debido a baja calidad" +#define D_SKIPPING_LOW_QUALITY "Ignorado por baja calidad" #define D_RSSI "RSSI" #define D_WEP "WEP" #define D_WPA_PSK "WPA PSK" @@ -268,7 +268,7 @@ #define D_SERIAL_LOG_LEVEL "Nivel de log Serial" #define D_WEB_LOG_LEVEL "Nivel de log Web" #define D_SYS_LOG_LEVEL "Nivel de Syslog" -#define D_MORE_DEBUG "Mas Debug" +#define D_MORE_DEBUG "Más Debug" #define D_SYSLOG_HOST "Host del Syslog" #define D_SYSLOG_PORT "Puerto del Syslog" #define D_TELEMETRY_PERIOD "Período de Telemetría" @@ -287,7 +287,7 @@ #define D_CONFIGURATION_RESET "Configuración restablecida" #define D_PROGRAM_VERSION "Versión del Programa" -#define D_BUILD_DATE_AND_TIME "Fecha y Hora de la Compilación" +#define D_BUILD_DATE_AND_TIME "Fecha y Hora de Compilación" #define D_CORE_AND_SDK_VERSION "Versión Core/SDK" #define D_FLASH_WRITE_COUNT "Contador de escritura en Flash" #define D_MAC_ADDRESS "Dirección MAC" @@ -333,16 +333,16 @@ // xdrv_01_mqtt.ino #define D_FINGERPRINT "Verificar TLS fingerprint..." -#define D_TLS_CONNECT_FAILED_TO "Falló Conección TLS a" +#define D_TLS_CONNECT_FAILED_TO "Falló Conexión TLS a" #define D_RETRY_IN "Reintentando" #define D_VERIFIED "Verificado Fingerprint" -#define D_INSECURE "Conección insegura por Fingerprint no válido" -#define D_CONNECT_FAILED_TO "Falló Conección a" +#define D_INSECURE "Conexión insegura por Fingerprint inválido" +#define D_CONNECT_FAILED_TO "Falló Conexión a" // xplg_wemohue.ino #define D_MULTICAST_DISABLED "Multicast deshabilitado" #define D_MULTICAST_REJOINED "Multicast (re)conectado" -#define D_MULTICAST_JOIN_FAILED "Conección Multicast fallida" +#define D_MULTICAST_JOIN_FAILED "Conexión Multicast fallida" #define D_FAILED_TO_SEND_RESPONSE "Falla al enviar respuesta" #define D_WEMO "WeMo"