diff --git a/README.md b/README.md index 5e05b13ae..1fac28e61 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## Sonoff-Tasmota Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE. -Current version is **5.10.0d** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.10.0e** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### ATTENTION All versions @@ -42,6 +42,7 @@ The following devices are supported: - [iTead Sonoff 4CH](https://www.itead.cc/smart-home/sonoff-4ch.html) - [iTead Sonoff 4CH Pro](https://www.itead.cc/smart-home/sonoff-4ch-pro.html) - [iTead S20 Smart Socket](https://www.itead.cc/smart-socket.html) +- [Sonoff S22 Smart Socket](https://github.com/arendst/Sonoff-Tasmota/issues/627) - [iTead Slampher](https://www.itead.cc/slampher.html) - [iTead Sonoff Touch](https://www.itead.cc/sonoff-touch.html) - [iTead Sonoff T1](https://www.itead.cc/sonoff-t1.html) @@ -54,8 +55,13 @@ The following devices are supported: - [iTead 1 Channel Switch 5V / 12V](https://www.itead.cc/smart-home/inching-self-locking-wifi-wireless-switch.html) - [iTead Motor Clockwise/Anticlockwise](https://www.itead.cc/smart-home/motor-reversing-wifi-wireless-switch.html) - [Electrodragon IoT Relay Board](http://www.electrodragon.com/product/wifi-iot-relay-board-based-esp8266/) -- [AI Light or any my9291 compatible RGBW LED](http://www.ebay.com/itm/172644855726) -- MagicHome and AriLux AL-LC01 and AL-LC11 +- AI Light or any my9291 compatible RGBW LED bulb +- H801 PWM LED controller +- [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) +- [Luani HVIO board](https://luani.de/projekte/esp8266-hvio/) +- Wemos D1 mini and NodeMcu ### License diff --git a/platformio.ini b/platformio.ini index a105642b9..da811a266 100644 --- a/platformio.ini +++ b/platformio.ini @@ -15,6 +15,8 @@ src_dir = sonoff ;env_default = sonoff-NL ;env_default = sonoff-DE ;env_default = sonoff-PL +;env_default = sonoff-IT +;env_default = sonoff-emulation ;env_default = sonoff-minimal ;env_default = sonoff-ds18x20 @@ -73,8 +75,31 @@ lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON ; *** Serial Monitor options monitor_baud = 115200 +[env:sonoff-IT] +platform = espressif8266 +framework = arduino +board = esp01_1m +board_flash_mode = dout +build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMQTT_MAX_PACKET_SIZE=512 -DMY_LANGUAGE=it-IT +lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON + +; *** Serial Monitor options +monitor_baud = 115200 + +; Sonoff with Wemo and Hue emulation +[env:sonoff-emulation] +platform = espressif8266 +framework = arduino +board = esp01_1m +board_flash_mode = dout +build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMQTT_MAX_PACKET_SIZE=512 -DUSE_EMULATION +lib_deps = PubSubClient, NeoPixelBus, IRremoteESP8266, ArduinoJSON + +; Serial Monitor options +monitor_baud = 115200 + ; Sonoff minimal -[env:sonoff-minimal] ; Placeholder to be configured +[env:sonoff-minimal] platform = espressif8266 framework = arduino board = esp01_1m diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index c3773add0..9ec2c7e84 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,9 @@ -/* 5.10.0d +/* 5.10.0e + * Add Italian language file (#1449) + * Fix Wemo Emulation once again closest to issue (#1357) + * Add support for sensor SHT3x + * + * 5.10.0d * Renamed commands Color2,3,4 to Color3,4,5 * Add command Color2 to set color while keeping same dimmer value * Add led signal to Carbon Dioxide (CO2) sensors (see user_config.h) diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index 0131fd0f1..0a1068155 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -118,6 +118,7 @@ #define D_INITIALIZED "Inizializzato" #define D_IP_ADDRESS "Indirizzo IP" #define D_LIGHT "Light" +#define D_LIMIT "Limit" #define D_LOCAL_TIME "Local" #define D_LOW "Low" #define D_LWT "LWT" @@ -706,4 +707,4 @@ #define D_CMND_MAXENERGY "MaxEnergy" #define D_CMND_MAXENERGYSTART "MaxEnergyStart" -#endif // _LANGUAGE_EN_GB_H_ +#endif // _LANGUAGE_IT_IT_H_ diff --git a/sonoff/settings.ino b/sonoff/settings.ino index c6ed275db..92d3b926d 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -18,7 +18,11 @@ */ #ifndef DOMOTICZ_UPDATE_TIMER -#define DOMOTICZ_UPDATE_TIMER 0 // [DomoticzUpdateTimer] Send relay status (0 = disable, 1 - 3600 seconds) (Optional) +#define DOMOTICZ_UPDATE_TIMER 0 // [DomoticzUpdateTimer] Send relay status (0 = disable, 1 - 3600 seconds) (Optional) +#endif + +#ifndef EMULATION +#define EMULATION EMUL_NONE // [Emulation] Select Belkin WeMo (single relay/light) or Hue Bridge emulation (multi relay/light) (EMUL_NONE, EMUL_WEMO or EMUL_HUE) #endif /*********************************************************************************************\ diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 770aab982..23afff59e 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,8 +25,8 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050A0004 -#define VERSION_STRING "5.10.0d" // Would be great to have a macro that fills this from VERSION ... +#define VERSION 0x050A0005 +#define VERSION_STRING "5.10.0e" // Would be great to have a macro that fills this from VERSION ... // Location specific includes #include "sonoff.h" // Enumaration used in user_config.h diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 263bbdce6..78016fd9e 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -33,6 +33,7 @@ //#define MY_LANGUAGE nl-NL // Dutch in the Netherlands //#define MY_LANGUAGE de-DE // German in Germany //#define MY_LANGUAGE pl-PL // Polish in Poland +//#define MY_LANGUAGE it-IT // Italian in Italy // -- Project ------------------------------------- #define PROJECT "sonoff" // PROJECT is used as the default topic delimiter and OTA file name @@ -122,7 +123,7 @@ #define WEB_USERNAME "admin" // Web server Admin mode user name #define WEB_PASSWORD "" // [WebPassword] Web server Admin mode Password for WEB_USERNAME (empty string = Disable) #define FRIENDLY_NAME "Sonoff" // [FriendlyName] Friendlyname up to 32 characters used by webpages and Alexa - #define USE_EMULATION // Enable Belkin WeMo and Hue Bridge emulation for Alexa (+11k code, +2k mem) + #define USE_EMULATION // Enable Belkin WeMo and Hue Bridge emulation for Alexa (+16k code, +2k mem) #define EMULATION EMUL_NONE // [Emulation] Select Belkin WeMo (single relay/light) or Hue Bridge emulation (multi relay/light) (EMUL_NONE, EMUL_WEMO or EMUL_HUE) // -- mDNS ---------------------------------------- @@ -172,9 +173,7 @@ // -- I2C sensors --------------------------------- #define USE_I2C // I2C using library wire (+10k code, 0k2 mem, 124 iram) #define USE_SHT // Add I2C emulating code for SHT1X sensor (+1k4 code) -// #define USE_SHT3X // Add I2C code for SHT3x sensor based on Adafruit (+0k7 code) -// #define USE_SHT3X_V2 // Add I2C code for SHT3x sensor based on EspEasy (+0k7 code) -// #define USE_SHT3X_V3 // Add I2C code for SHT3x sensor based on Wemos (+0k7 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_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) diff --git a/sonoff/xdrv_wemohue.ino b/sonoff/xdrv_wemohue.ino index e441cf513..2bd7c3100 100755 --- a/sonoff/xdrv_wemohue.ino +++ b/sonoff/xdrv_wemohue.ino @@ -241,6 +241,38 @@ void PollUdp() \*********************************************************************************************/ const char WEMO_EVENTSERVICE_XML[] PROGMEM = +/* + // Original + "" + "" + "" + "SetBinaryState" + "" + "" + "" + "BinaryState" + "BinaryState" + "in" + "" + "" + "" + "" + "BinaryState" + "Boolean" + "0" + "" + "" + "level" + "string" + "0" + "" + "" + "" + "\r\n" + "\r\n"; +*/ + +/* // XosePerez version 20171108 - v2.3.0 "" "" @@ -277,19 +309,63 @@ const char WEMO_EVENTSERVICE_XML[] PROGMEM = "" "" ""; +*/ + + // Reloxx13 from #1357 + "" + "" + "" + "SetBinaryState" + "" + "" + "" + "BinaryState" + "BinaryState" + "in" + "" + "" + "" + "" + "BinaryState" + "Boolean" + "0" + "" + "" + "level" + "string" + "0" + "" + "" + "" + "" + "GetBinaryState" + "" + "" + "" + "BinaryState" + "BinaryState" + "out" + "" + "" + "" + "" + "\r\n" + "\r\n"; const char WEMO_RESPONSE_STATE_SOAP[] PROGMEM = - "" + // Reloxx13 from #1357 + "" "" - "" + "" "{x1" - "" + "" "" - ""; + "\r\n" + "\r\n"; const char WEMO_SETUP_XML[] PROGMEM = "" - "" + "" "" "urn:Belkin:device:controllee:1" "{x1" @@ -316,6 +392,7 @@ const char WEMO_SETUP_XML[] PROGMEM = void HandleUpnpEvent() { AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_WEMO_BASIC_EVENT)); + String request = WebServer->arg(0); String state_xml = FPSTR(WEMO_RESPONSE_STATE_SOAP); //differentiate get and set state @@ -328,7 +405,7 @@ void HandleUpnpEvent() } } else if(request.indexOf(F("GetBinaryState")) > 0){ - state_xml.replace(F("SetBinaryState"), F("GetBinaryStateResponse")); + state_xml.replace(F("Set"), F("Get")); } state_xml.replace("{x1", String(bitRead(power, devices_present -1))); WebServer->send(200, FPSTR(HDR_CTYPE_XML), state_xml); @@ -337,6 +414,7 @@ void HandleUpnpEvent() void HandleUpnpService() { AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, PSTR(D_WEMO_EVENT_SERVICE)); + WebServer->send(200, FPSTR(HDR_CTYPE_PLAIN), FPSTR(WEMO_EVENTSERVICE_XML)); } diff --git a/sonoff/xsns_14_sht3x.ino b/sonoff/xsns_14_sht3x.ino index 39b24d8b4..60d35c787 100644 --- a/sonoff/xsns_14_sht3x.ino +++ b/sonoff/xsns_14_sht3x.ino @@ -22,26 +22,16 @@ /*********************************************************************************************\ * SHT3X - Temperature and Humidy * - * Required library: none but based on Adafruit Industries SHT31 library - * * I2C Address: 0x44 or 0x45 \*********************************************************************************************/ -#define SHT3X_ADDR_GND 0x44 // address pin low (GND) -#define SHT3X_ADDR_VDD 0x45 // address pin high (VDD) +#define SHT3X_ADDR_GND 0x44 // address pin low (GND) +#define SHT3X_ADDR_VDD 0x45 // address pin high (VDD) uint8_t sht3x_type = 0; uint8_t sht3x_address; uint8_t sht3x_addresses[] = { SHT3X_ADDR_GND, SHT3X_ADDR_VDD }; -bool Sht3xConvert() -{ - if (sht3x_type) { - return I2cWrite8(sht3x_address, 0x2C, 0x06); - } - return false; -} - bool Sht3xRead(float &t, float &h) { unsigned int data[6]; @@ -49,22 +39,20 @@ bool Sht3xRead(float &t, float &h) t = NAN; h = NAN; - Wire.requestFrom(sht3x_address, (uint8_t)6); - if (Wire.available() != 6) { + Wire.beginTransmission(sht3x_address); + Wire.write(0x2C); // Enable clock stretching + Wire.write(0x06); // High repeatability + if (Wire.endTransmission() != 0) { // Stop I2C transmission return false; } - // Read 6 bytes of data - // cTemp msb, cTemp lsb, cTemp crc, humidity msb, humidity lsb, humidity crc - for (uint8_t i = 0; i < 6; i++) { - data[i] = Wire.read(); - } -// delay(50); -// if (Wire.available() != 0) { -// return false; -// } + delay(30); // Timing verified with logic analyzer (10 is to short) + Wire.requestFrom(sht3x_address, (uint8_t)6); // Request 6 bytes of data + for (int i = 0; i < 6; i++) { + data[i] = Wire.read(); // cTemp msb, cTemp lsb, cTemp crc, humidity msb, humidity lsb, humidity crc + }; t = ConvertTemp((float)((((data[0] << 8) | data[1]) * 175) / 65535.0) - 45); h = (float)((((data[3] << 8) | data[4]) * 100) / 65535.0); - return true; + return (!isnan(t) && !isnan(h)); } /********************************************************************************************/ @@ -75,10 +63,12 @@ void Sht3xDetect() return; } + float t; + float h; sht3x_type = 1; for (byte i = 0; i < sizeof(sht3x_addresses); i++) { sht3x_address = sht3x_addresses[i]; - if (Sht3xConvert()) { + if (Sht3xRead(t, h)) { snprintf_P(log_data, sizeof(log_data), S_LOG_I2C_FOUND_AT, "SHT3X", sht3x_address); AddLog(LOG_LEVEL_DEBUG); return; @@ -128,16 +118,12 @@ boolean Xsns14(byte function) case FUNC_INIT: Sht3xDetect(); break; - case FUNC_PREP_BEFORE_TELEPERIOD: - Sht3xConvert(); - break; case FUNC_JSON_APPEND: Sht3xShow(1); break; #ifdef USE_WEBSERVER case FUNC_WEB_APPEND: Sht3xShow(0); - Sht3xConvert(); break; #endif // USE_WEBSERVER } diff --git a/sonoff/xsns_14_sht3x_v2.ino b/sonoff/xsns_14_sht3x_v2.ino deleted file mode 100644 index 85de8512a..000000000 --- a/sonoff/xsns_14_sht3x_v2.ino +++ /dev/null @@ -1,142 +0,0 @@ -/* - xsns_14_sht3x.ino - SHT3X temperature and humidity sensor support for Sonoff-Tasmota - - Copyright (C) 2018 Theo Arends - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#ifdef USE_I2C -#ifdef USE_SHT3X_V2 -/*********************************************************************************************\ - * SHT3X - Temperature and Humidy - * - * Required library: none but based on EspEasy plugin 68 - * - * I2C Address: 0x44 or 0x45 -\*********************************************************************************************/ - -#define SHT3X_ADDR_GND 0x44 // address pin low (GND) -#define SHT3X_ADDR_VDD 0x45 // address pin high (VDD) - -uint8_t sht3x_type = 0; -uint8_t sht3x_address; -uint8_t sht3x_addresses[] = { SHT3X_ADDR_GND, SHT3X_ADDR_VDD }; - -bool Sht3xInit() -{ - if (sht3x_type) { - return I2cWrite8(sht3x_address, 0x20, 0x32); // Periodic 0.5mps and repeatability high - } - return false; -} - -bool Sht3xRead(float &t, float &h) -{ - unsigned int data[6]; - - t = NAN; - h = NAN; - - I2cWrite8(sht3x_address, 0xE0, 0x00); // Fetch data - Wire.requestFrom(sht3x_address, (uint8_t)6); - if (Wire.available() != 6) { - return false; - } - // Read 6 bytes of data - // cTemp msb, cTemp lsb, cTemp crc, humidity msb, humidity lsb, humidity crc - for (uint8_t i = 0; i < 6; i++) { - data[i] = Wire.read(); - } - t = ConvertTemp((float)((((data[0] << 8) | data[1]) * 175) / 65535.0) - 45); - h = (float)((((data[3] << 8) | data[4]) * 100) / 65535.0); - return true; -} - -/********************************************************************************************/ - -void Sht3xDetect() -{ - if (sht3x_type) { - return; - } - - sht3x_type = 1; - for (byte i = 0; i < sizeof(sht3x_addresses); i++) { - sht3x_address = sht3x_addresses[i]; - if (Sht3xInit()) { - snprintf_P(log_data, sizeof(log_data), S_LOG_I2C_FOUND_AT, "SHT3X", sht3x_address); - AddLog(LOG_LEVEL_DEBUG); - return; - } - } - sht3x_type = 0; -} - -void Sht3xShow(boolean json) -{ - if (sht3x_type) { - float t; - float h; - if (Sht3xRead(t, h)) { - char temperature[10]; - char humidity[10]; - dtostrfd(t, Settings.flag2.temperature_resolution, temperature); - dtostrfd(h, Settings.flag2.humidity_resolution, humidity); - - if (json) { - snprintf_P(mqtt_data, sizeof(mqtt_data), JSON_SNS_TEMPHUM, mqtt_data, "SHT3X", temperature, humidity); -#ifdef USE_DOMOTICZ - DomoticzTempHumSensor(temperature, humidity); -#endif // USE_DOMOTICZ -#ifdef USE_WEBSERVER - } else { - snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_TEMP, mqtt_data, "SHT3X", temperature, TempUnit()); - snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_HUM, mqtt_data, "SHT3X", humidity); -#endif // USE_WEBSERVER - } - } - } -} - -/*********************************************************************************************\ - * Interface -\*********************************************************************************************/ - -#define XSNS_14 - -boolean Xsns14(byte function) -{ - boolean result = false; - - if (i2c_flg) { - switch (function) { - case FUNC_INIT: - Sht3xDetect(); - break; - case FUNC_JSON_APPEND: - Sht3xShow(1); - break; -#ifdef USE_WEBSERVER - case FUNC_WEB_APPEND: - Sht3xShow(0); - break; -#endif // USE_WEBSERVER - } - } - return result; -} - -#endif // USE_SHT3X_V2 -#endif // USE_I2C \ No newline at end of file diff --git a/sonoff/xsns_14_sht3x_v3.ino b/sonoff/xsns_14_sht3x_v3.ino deleted file mode 100644 index aff368c1a..000000000 --- a/sonoff/xsns_14_sht3x_v3.ino +++ /dev/null @@ -1,156 +0,0 @@ -/* - xsns_14_sht3x.ino - SHT3X temperature and humidity sensor support for Sonoff-Tasmota - - Copyright (C) 2018 Theo Arends - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#ifdef USE_I2C -#ifdef USE_SHT3X_V3 -/*********************************************************************************************\ - * SHT3X - Temperature and Humidy - * - * Required library: none but based on Wemos library - * - * I2C Address: 0x44 or 0x45 -\*********************************************************************************************/ - -#define SHT3X_ADDR_GND 0x44 // address pin low (GND) -#define SHT3X_ADDR_VDD 0x45 // address pin high (VDD) - -uint8_t sht3x_type = 0; -uint8_t sht3x_address; -uint8_t sht3x_addresses[] = { SHT3X_ADDR_GND, SHT3X_ADDR_VDD }; - -bool Sht3xConvert() -{ - if (sht3x_type) { - // Start I2C Transmission - Wire.beginTransmission(sht3x_address); - // Send measurement command - Wire.write(0x2C); - Wire.write(0x06); - // Stop I2C transmission - if (Wire.endTransmission() != 0) { - return false; - } - } - return true; -} - -bool Sht3xRead(float &t, float &h) -{ - unsigned int data[6]; - - t = NAN; - h = NAN; - - // Request 6 bytes of data - Wire.requestFrom(sht3x_address, (uint8_t)6); - // Read 6 bytes of data - // cTemp msb, cTemp lsb, cTemp crc, humidity msb, humidity lsb, humidity crc - for (int i = 0; i < 6; i++) { - data[i] = Wire.read(); - }; - delay(50); - if (Wire.available() != 0) { - return false; - } - // Convert the data - t = ConvertTemp((float)((((data[0] << 8) | data[1]) * 175) / 65535.0) - 45); - h = (float)((((data[3] << 8) | data[4]) * 100) / 65535.0); - return true; -} - -/********************************************************************************************/ - -void Sht3xDetect() -{ - if (sht3x_type) { - return; - } - - sht3x_type = 1; - for (byte i = 0; i < sizeof(sht3x_addresses); i++) { - sht3x_address = sht3x_addresses[i]; - if (Sht3xConvert()) { - snprintf_P(log_data, sizeof(log_data), S_LOG_I2C_FOUND_AT, "SHT3X", sht3x_address); - AddLog(LOG_LEVEL_DEBUG); - return; - } - } - sht3x_type = 0; -} - -void Sht3xShow(boolean json) -{ - if (sht3x_type) { - float t; - float h; - if (Sht3xRead(t, h)) { - char temperature[10]; - char humidity[10]; - dtostrfd(t, Settings.flag2.temperature_resolution, temperature); - dtostrfd(h, Settings.flag2.humidity_resolution, humidity); - - if (json) { - snprintf_P(mqtt_data, sizeof(mqtt_data), JSON_SNS_TEMPHUM, mqtt_data, "SHT3X", temperature, humidity); -#ifdef USE_DOMOTICZ - DomoticzTempHumSensor(temperature, humidity); -#endif // USE_DOMOTICZ -#ifdef USE_WEBSERVER - } else { - snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_TEMP, mqtt_data, "SHT3X", temperature, TempUnit()); - snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_HUM, mqtt_data, "SHT3X", humidity); -#endif // USE_WEBSERVER - } - } - } -} - -/*********************************************************************************************\ - * Interface -\*********************************************************************************************/ - -#define XSNS_14 - -boolean Xsns14(byte function) -{ - boolean result = false; - - if (i2c_flg) { - switch (function) { - case FUNC_INIT: - Sht3xDetect(); - break; - case FUNC_PREP_BEFORE_TELEPERIOD: - Sht3xConvert(); - break; - case FUNC_JSON_APPEND: - Sht3xShow(1); - break; -#ifdef USE_WEBSERVER - case FUNC_WEB_APPEND: - Sht3xShow(0); - Sht3xConvert(); - break; -#endif // USE_WEBSERVER - } - } - return result; -} - -#endif // USE_SHT3X_V3 -#endif // USE_I2C \ No newline at end of file