From c1083c6e1c4f8bafc926adbf088ecfd3f00328d5 Mon Sep 17 00:00:00 2001 From: arendst Date: Sun, 7 Jan 2018 14:56:23 +0100 Subject: [PATCH] v5.11.0a Align with master --- README.md | 2 +- sonoff/_releasenotes.ino | 82 +++++++++++++--------------------------- sonoff/settings.ino | 11 ++++++ sonoff/sonoff.ino | 4 +- sonoff/sonoff_template.h | 15 ++++++++ sonoff/webserver.ino | 8 ++-- 6 files changed, 60 insertions(+), 62 deletions(-) diff --git a/README.md b/README.md index edff41892..bd7844b9e 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.0j** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. +Current version is **5.11.0a** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information. ### ATTENTION All versions diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 6bdada0bb..aa3373ee6 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,66 +1,38 @@ -/* 5.10.0j - * Allow conditional code based on core version - * Removed all MQTT, JSON and Command language defines from locale files (#1473) +/* 5.11.0a * - * 5.10.0i - * Add device function pointers - * Moved Command and JSON English language defines to one file (i18n.h) - * Update it-IT.h language file (#1449) - * Fix Wemo and Hue emulation by adding M-Search response delay (#1486) - * - * 5.10.0h - * Fix Wemo Emulation for Gen 2 devices (#1486) - * - * 5.10.0g - * Add 2nd Gen Alexa support to Wemo emulation discovery (#1357, #1450) - * - * 5.10.0f - * Differentiate between JSON text defines and other text defines to allow for English JSON while using different locale (#1449) - * Fix display of build date and time in non-english locale (#1465) - * Add define for additional number of WS2812 schemes (#1463) - * - * 5.10.0e - * Add Italian language file (#1449) - * Fix Wemo Emulation once again closest to issue (#1357) - * Add support for sensor SHT3x (#1314) - * - * 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) - * Fix Wemo Emulation again (#1357) + * 5.11.0 20180107 + * Minor webpage HTML optimizations (#1358) * Updated German translation (#1438) - * - * 5.10.0c - * Consolidate device serial (MH-Z19, SenseAir and Pzem004T) into TasmotaSerial library - * Consolidate PWM device recognition - * Fix Wemo Emulation (#1357) - * Add support for Arilux LC06 (#1414) - * - * 5.10.0b - * Add support for PZEM004T energy sensor to be enabled with define USE_PZEM004T in user_config.h * Change Sonoff Pow Energy MQTT data message and consolidate Status 8 into Status 10 + * Change ADS1115 default voltage range from +/-2V to +/-6V (#1289) + * Change text to Active for 3 minutes (#1364) * Change Wemo SetBinaryState to distinguish from GetBinaryState (#1357) * Change output of HTTP command to valid JSON and Array only (#1363) - * Add support for MH-Z19(B) CO2 sensor to be enabled with define USE_MHZ19 in user_config.h (#561, #1248) - * Add support for SenseAir S8 CO2 sensor to be enabled with define USE_SENSEAIR in user_config.h - * Add support for Domoticz Air Quality sensor to be used by MH-Z19(B) and SenseAir sensors - * - * 5.10.0a - * Add (experimental) support for sensor SHT3x - * Add support for iTead SI7021 temperature and humidity sensor by consolidating DHT22 into AM2301 and using former DHT22 as SI7021 (#735) + * Removed all MQTT, JSON and Command language defines from locale files and set fixed to English (#1473) + * Renamed commands Color2,3,4 to Color3,4,5 * Fix BME280 calculation (#1051) - * Add support for BME680 using adafruit libraries (#1212) - * Change ADS1115 default voltage range from +/-2V to +/-6V (#1289) - * Add multipress support and more user configurable options to Sonoff Dual R2 (#1291) * Fix Sonoff Bridge missed learned key if learned data contains 0x55 (End of Transmission) flag (#1095, #1294) - * Add support for TSL2561 using adafruit library (#661, #1311) - * Add alternative support for SHT3x enabled with define USE_SHT3X_V2 in user_config.h (#1314) - * Add alternative support for SHT3x enabled with define USE_SHT3X_V3 in user_config.h (#1314) * Fix PWM initialization in Dimmer/Color mode (#1321) - * Fix BME680 pressure data (#1356) - * Minor webpage HTML optimizations (#1358) - * Change text to Active for 3 minutes (#1364) + * Fix Wemo Emulation (#1357) + * Fix display of build date and time in non-english locale (#1465) + * Fix Wemo and Hue emulation by adding M-Search response delay (#1486) + * Add libraries Adafruit_BME680-1.0.5, Adafruit_Sensor-1.0.2.02, TasmotaSerial-1.0.0 and TSL2561-Arduino-Library + * Add command Color2 to set color while keeping same dimmer value + * Add device function pointers + * Add support for SenseAir S8 CO2 sensor + * Add color led signal to Carbon Dioxide (CO2) sensors using defines CO2_LOW and CO2_HIGH in user_config.h + * Add support for Domoticz Air Quality sensor to be used by MH-Z19(B) and SenseAir sensors + * Add support for PZEM004T energy sensor + * Add support for iTead SI7021 temperature and humidity sensor by consolidating DHT22 into AM2301 and using former DHT22 as SI7021 (#735) + * Add support for BME680 using adafruit libraries (#1212) + * Add support for MH-Z19(B) CO2 sensor (#561, #1248) + * Add multipress support and more user configurable GPIO to Sonoff Dual R2 (#1291) + * Add support for TSL2561 using adafruit library (#661, #1311) + * Add support for SHT3x (#1314) + * Add support for Arilux LC06 (#1414) + * Add Italian language file (#1449) + * Add 2nd Gen Alexa support to Wemo emulation discovery (#1357, #1450) + * Add define for additional number of WS2812 schemes (#1463) * * 5.10.0 20171201 * Upgrade library ArduinoJson to 5.11.2 diff --git a/sonoff/settings.ino b/sonoff/settings.ino index 90b3e025d..81afd3461 100644 --- a/sonoff/settings.ino +++ b/sonoff/settings.ino @@ -25,6 +25,17 @@ #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 +#ifndef USE_DISPLAY // Add Display Support for up to eigth Matrices +#define MTX_ADDRESS1 0 +#define MTX_ADDRESS2 0 +#define MTX_ADDRESS3 0 +#define MTX_ADDRESS4 0 +#define MTX_ADDRESS5 0 +#define MTX_ADDRESS6 0 +#define MTX_ADDRESS7 0 +#define MTX_ADDRESS8 0 +#endif + /*********************************************************************************************\ * RTC memory \*********************************************************************************************/ diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 88c2f7be9..27b008ab1 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,8 +25,8 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x050A000A -#define VERSION_STRING "5.10.0j" // Would be great to have a macro that fills this from VERSION ... +#define VERSION 0x050B0001 +#define VERSION_STRING "5.11.0a" // 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/sonoff_template.h b/sonoff/sonoff_template.h index f0c1c5608..518538290 100644 --- a/sonoff/sonoff_template.h +++ b/sonoff/sonoff_template.h @@ -844,6 +844,21 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_LED1, // GPIO15 Led (1 = On, 0 = Off) 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 + GPIO_KEY1, // GPIO00 Optional Button + 0, + GPIO_USER, // GPIO02 Empty pad + 0, + GPIO_USER, // GPIO04 W2 - PWM5 + 0, + 0, 0, 0, 0, 0, 0, // Flash connection + GPIO_PWM2, // GPIO12 RGB LED Green + GPIO_PWM1, // GPIO13 RGB LED Red + GPIO_PWM3, // GPIO14 RGB LED Blue + 0, 0, 0 + } + */ #endif // _SONOFF_TEMPLATE_H_ \ No newline at end of file diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index 1b13e8690..bc37f1bb2 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -222,7 +222,7 @@ const char HTTP_FORM_LOG1[] PROGMEM = "
 " D_LOGGING_PARAMETERS " 
" ""; const char HTTP_FORM_LOG2[] PROGMEM = - "
{b0" D_LOG_LEVEL " ({b1)
" "0 " D_NONE "" "1 " D_ERROR "" "2 " D_INFO "" @@ -837,7 +837,7 @@ void HandleLoggingConfiguration() page += FPSTR(HTTP_FORM_LOG2); switch (idx) { case 0: - page.replace(F("{b0"), F(D_SERIAL " ")); + page.replace(F("{b0"), F(D_SERIAL_LOG_LEVEL)); page.replace(F("{b1"), STR(SERIAL_LOG_LEVEL)); page.replace(F("{b2"), F("ls")); for (byte i = LOG_LEVEL_NONE; i < LOG_LEVEL_ALL; i++) { @@ -845,7 +845,7 @@ void HandleLoggingConfiguration() } break; case 1: - page.replace(F("{b0"), F(D_WEB " ")); + page.replace(F("{b0"), F(D_WEB_LOG_LEVEL)); page.replace(F("{b1"), STR(WEB_LOG_LEVEL)); page.replace(F("{b2"), F("lw")); for (byte i = LOG_LEVEL_NONE; i < LOG_LEVEL_ALL; i++) { @@ -853,7 +853,7 @@ void HandleLoggingConfiguration() } break; case 2: - page.replace(F("{b0"), F(D_SYS)); + page.replace(F("{b0"), F(D_SYS_LOG_LEVEL)); page.replace(F("{b1"), STR(SYS_LOG_LEVEL)); page.replace(F("{b2"), F("ll")); for (byte i = LOG_LEVEL_NONE; i < LOG_LEVEL_ALL; i++) {