Prep for release 6.5

2025-07-24 11:16:34 +00:00 · 2019-03-15 11:43:14 +01:00 · 2019-03-15 11:43:14 +01:00 · 640e28f7cf
commit 640e28f7cf
parent d9aa3102a7
5 changed files with 90 additions and 73 deletions
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@ -93,7 +93,7 @@ Module            | Description
 69 SYF05          | Sunyesmart SYF05 RGBWW Wifi Led Bulb

 ## Provided Binary Downloads
-The following binary downloads have been compiled with ESP8266/Arduino library core version **2.4.2** patched with the Alexa fix.
+The following binary downloads have been compiled with ESP8266/Arduino library core version **2.3.0**.

 - **sonoff-minimal.bin** = The Minimal version allows intermediate OTA uploads to support larger versions and does NOT change any persistent parameter. This version **should NOT be used for initial installation**.
 - **sonoff-classic.bin** = The Classic version allows **initial installation** using either WifiManager, Wps or SmartConfig.
@ -103,6 +103,8 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - **sonoff-display.bin** = The Display version without Wps and SmartConfig configuration but adds display support.
 - **sonoff-knx.bin** = The Knx version without Wps and SmartConfig configuration and some other features but adds KNX support.

+Core version **2.4.2** binaries can be found at http://thehackbox.org/tasmota/
+
 ### Available Features and Sensors

 | Feature or Sensor              | minimal | basic | classic | sonoff | knx  | sensors | Remarks
@ -125,6 +127,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 | USE_TIMERS_WEB                 | - | x | - | x | x | x |
 | USE_SUNRISE                    | - | x | - | x | x | x |
 | USE_RULES                      | - | x | - | x | x | x |
+| USE_EXPRESSION                 | - | - | - | - | - | - |
 |                                |   |   |   |   |   |
 | USE_ADC_VCC                    | x | x | x | x | x | - |
 | USE_DS18B20                    | - | - | - | - | - | - | Single sensor
@ -146,7 +149,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 | USE_TSL2561                    | - | - | - | - | - | x |
 | USE_MGS                        | - | - | - | - | - | x |
 | USE_SGP30                      | - | - | - | x | x | x |
-| USE_SI1145                     | - | - | - | - | - | x |
+| USE_SI1145                     | - | - | - | - | - | - |
 | USE_LM75AD                     | - | - | - | x | x | x |
 | USE_APDS9960                   | - | - | - | - | - | - |
 | USE_MCP230xx                   | - | - | - | - | - | - |
@ -157,7 +160,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 | USE_DS3231                     | - | - | - | - | - | - |
 | USE_MGC3130                    | - | - | - | - | - | - |
 | USE_MAX44009                   | - | - | - | - | - | - |
-| USE_SCD30                      | - | - | - | - | - | - |
+| USE_SCD30                      | - | - | - | - | - | x |
 |                                |   |   |   |   |   |   |
 | Feature or Sensor              | minimal | basic | classic | sonoff | knx  | sensors |
 | USE_SPI                        | - | - | - | - | - | - |
@ -177,7 +180,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 | USE_ARMTRONIX_DIMMERS          | - | x | - | x | x | x |
 | USE_PS_16_DZ                   | - | x | - | x | x | x |
 | USE_AZ7798                     | - | - | - | - | - | - |
-| USE_PN532_HSU                  | - | - | - | - | - | - |
+| USE_PN532_HSU                  | - | - | - | - | - | x |
 | USE_IR_REMOTE                  | - | - | - | x | x | x |
 | USE_IR_HVAC                    | - | - | - | - | - | x |
 | USE_IR_RECEIVE                 | - | - | - | x | x | x |
--- a/lib/NeoPixelBus-2.2.9/src/internal/NeoEsp8266DmaMethod.h
+++ b/lib/NeoPixelBus-2.2.9/src/internal/NeoEsp8266DmaMethod.h
@ -48,7 +48,11 @@ extern "C"
 #include "ets_sys.h"
 #include "user_interface.h"

+// Workaround STAGE compile error
+#include <core_version.h>
+#if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_2) || defined(ARDUINO_ESP8266_RELEASE_2_5_0)
    void rom_i2c_writeReg_Mask(uint32_t block, uint32_t host_id, uint32_t reg_add, uint32_t Msb, uint32_t Lsb, uint32_t indata);
+#endif
 }

 struct slc_queue_item
@ -74,7 +78,7 @@ public:
 class NeoEsp8266DmaSpeed800Kbps
 {
 public:
-    const static uint32_t I2sClockDivisor = 3; 
+    const static uint32_t I2sClockDivisor = 3;
    const static uint32_t I2sBaseClockDivisor = 16;
    const static uint32_t ResetTimeUs = 50;
 };
@ -82,7 +86,7 @@ public:
 class NeoEsp8266DmaSpeed400Kbps
 {
 public:
-    const static uint32_t I2sClockDivisor = 6; 
+    const static uint32_t I2sClockDivisor = 6;
    const static uint32_t I2sBaseClockDivisor = 16;
    const static uint32_t ResetTimeUs = 50;
 };
@ -100,7 +104,7 @@ const uint8_t c_I2sPin = 3; // due to I2S hardware, the pin used is restricted t
 template<typename T_SPEED> class NeoEsp8266DmaMethodBase
 {
 public:
-    NeoEsp8266DmaMethodBase(uint16_t pixelCount, size_t elementSize) 
+    NeoEsp8266DmaMethodBase(uint16_t pixelCount, size_t elementSize)
    {
        uint16_t dmaPixelSize = c_dmaBytesPerPixelBytes * elementSize;

@ -269,7 +273,7 @@ public:
 private:
    static NeoEsp8266DmaMethodBase* s_this; // for the ISR

-    size_t    _pixelsSize;    // Size of '_pixels' buffer 
+    size_t    _pixelsSize;    // Size of '_pixels' buffer
    uint8_t*  _pixels;        // Holds LED color values

    uint32_t _i2sBufferSize; // total size of _i2sBuffer
@ -310,7 +314,7 @@ private:
                    slc_queue_item* finished_item = (slc_queue_item*)SLCRXEDA;

                    // data block has pending data waiting to send, prepare it
-                    // point last state block to top 
+                    // point last state block to top
                    (finished_item + 1)->next_link_ptr = (uint32_t)(s_this->_i2sBufDesc);

                    s_this->_dmaState = NeoDmaState_Sending;
@ -367,7 +371,7 @@ private:
    }
 };

-template<typename T_SPEED> 
+template<typename T_SPEED>
 NeoEsp8266DmaMethodBase<T_SPEED>* NeoEsp8266DmaMethodBase<T_SPEED>::s_this;

 typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaSpeedWs2813> NeoEsp8266DmaWs2813Method;
--- a/platformio.ini
+++ b/platformio.ini
@ -89,6 +89,10 @@ build_flags               = ${esp82xx_defaults.build_flags}
 platform                  = https://github.com/platformio/platform-espressif8266.git#feature/stage
 build_flags               = ${esp82xx_defaults.build_flags}
                            -Wl,-Teagle.flash.1m.ld
+; nonos-sdk 22x
+                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x
+; nonos-sdk-pre-v3
+;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3                            
 ; lwIP 1.4 (Default)
 ;                            -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
 ; lwIP 2 - Low Memory
--- a/sonoff/language/he-HE.h
+++ b/sonoff/language/he-HE.h
@ -55,20 +55,20 @@
 #define D_AIR_QUALITY "איכות אוויר"
 #define D_AP "AP"                    // Access Point
 #define D_AS "as"
-#define D_AUTO "AUTO"
+#define D_AUTO "אוטומטי"
 #define D_BLINK "מהבהב"
 #define D_BLINKOFF "כיבוי היבהוב"
 #define D_BOOT_COUNT "מונה הפעלה מחדש"
 #define D_BRIGHTLIGHT "בהירות"
 #define D_BSSID "BSSId"
 #define D_BUTTON "לחצן"
-#define D_BY "by"                    // Written by me
+#define D_BY "ע"                    // Written by me
 #define D_BYTES "בייט"
 #define D_CELSIUS "צלזיוס"
 #define D_CHANNEL "ערוץ"
 #define D_CO2 "Carbon dioxide"
 #define D_CODE "קוד"                // Button code
-#define D_COLDLIGHT "קור"
+#define D_COLDLIGHT "אור קר"
 #define D_COMMAND "פקודה"
 #define D_CONNECTED "מחובר"
 #define D_COUNT "סופר"
@ -148,7 +148,7 @@
 #define D_STOP "עצירה"
 #define D_SUBNET_MASK "רשת מסכת משנה"
 #define D_SUBSCRIBE_TO "הרשם ל"
-#define D_UNSUBSCRIBE_FROM "Unsubscribe from"
+#define D_UNSUBSCRIBE_FROM "בטל רישום"
 #define D_SUCCESSFUL "הצליח"
 #define D_SUNRISE "זריחה"
 #define D_SUNSET "שקיעה"
@ -176,33 +176,33 @@
 #define D_UV_POWER "UV Power"
 #define D_VERSION "גרסה"
 #define D_VOLTAGE "מתח"
-#define D_WEIGHT "Weight"
+#define D_WEIGHT "משקל"
 #define D_WARMLIGHT "חום"
 #define D_WEB_SERVER "Web שרת"

 // sonoff.ino
-#define D_WARNING_MINIMAL_VERSION "WARNING This version does not support persistent settings"
+#define D_WARNING_MINIMAL_VERSION "אזהרה גרסה זו אינה תומכת בהגדרות קבועות"
 #define D_LEVEL_10 "level 1-0"
 #define D_LEVEL_01 "level 0-1"
-#define D_SERIAL_LOGGING_DISABLED "Serial logging disabled"
-#define D_SYSLOG_LOGGING_REENABLED "Syslog logging re-enabled"
+#define D_SERIAL_LOGGING_DISABLED "רישום טורי מושבת"
+#define D_SYSLOG_LOGGING_REENABLED "הופעל מחדש Syslog רישום"

-#define D_SET_BAUDRATE_TO "Set Baudrate to"
-#define D_RECEIVED_TOPIC "Received Topic"
-#define D_DATA_SIZE "Data Size"
+#define D_SET_BAUDRATE_TO "הגדר קצב שידור ל"
+#define D_RECEIVED_TOPIC "Topic התקבל"
+#define D_DATA_SIZE "גודל נתונים"
 #define D_ANALOG_INPUT "אנלוגי"

 // support.ino
 #define D_OSWATCH "osWatch"
-#define D_BLOCKED_LOOP "Blocked Loop"
-#define D_WPS_FAILED_WITH_STATUS "WPSconfig FAILED with status"
-#define D_ACTIVE_FOR_3_MINUTES "active for 3 minutes"
-#define D_FAILED_TO_START "failed to start"
-#define D_PATCH_ISSUE_2186 "Patch issue 2186"
-#define D_CONNECTING_TO_AP "Connecting to AP"
-#define D_IN_MODE "in mode"
-#define D_CONNECT_FAILED_NO_IP_ADDRESS "Connect failed as no IP address received"
-#define D_CONNECT_FAILED_AP_NOT_REACHED "Connect failed as AP cannot be reached"
+#define D_BLOCKED_LOOP "לולאות חסומות"
+#define D_WPS_FAILED_WITH_STATUS "נכשל עם הסטטוס WPSconfig"
+#define D_ACTIVE_FOR_3_MINUTES "פעיל במשך 3 דקות"
+#define D_FAILED_TO_START "נכשל בנסיון להתחיל"
+#define D_PATCH_ISSUE_2186 "בעית תיקון 2186"
+#define D_CONNECTING_TO_AP "AP -מתחבר ל"
+#define D_IN_MODE "במצב"
+#define D_CONNECT_FAILED_NO_IP_ADDRESS "IP החיבור נכשל מכיוון שלא התקבלה כתובת"
+#define D_CONNECT_FAILED_AP_NOT_REACHED "זמין AP החיבור נכשל כיוון שאין"
 #define D_CONNECT_FAILED_WRONG_PASSWORD "Connect failed with AP incorrect password"
 #define D_CONNECT_FAILED_AP_TIMEOUT "Connect failed with AP timeout"
 #define D_ATTEMPTING_CONNECTION "Attempting connection..."
@ -213,19 +213,19 @@
 #define D_SYSLOG_HOST_NOT_FOUND "Syslog Host not found"

 // settings.ino
-#define D_SAVED_TO_FLASH_AT "Saved to flash at"
-#define D_LOADED_FROM_FLASH_AT "Loaded from flash at"
+#define D_SAVED_TO_FLASH_AT "נשמר לפלאש ב"
+#define D_LOADED_FROM_FLASH_AT "נטען מהפלאש מ"
 #define D_USE_DEFAULTS "השתמש בהגדרות ברירת המחדל"
 #define D_ERASED_SECTOR "סקטור מחוק"

 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "JavaScript - כדי להשתמש ב קושחה אסמוטה אנא הפעל"
 #define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "קושחה מינימלית - בבקשה אנא שדרג"
-#define D_WEBSERVER_ACTIVE_ON "Web server active on"
-#define D_WITH_IP_ADDRESS "with IP address"
-#define D_WEBSERVER_STOPPED "Web server stopped"
-#define D_FILE_NOT_FOUND "File Not Found"
-#define D_REDIRECTED "Redirected to captive portal"
+#define D_WEBSERVER_ACTIVE_ON "שרת ווב פעיל"
+#define D_WITH_IP_ADDRESS "IP עם כתובת"
+#define D_WEBSERVER_STOPPED "שרת ווב הופסק"
+#define D_FILE_NOT_FOUND "קובץ לא נמצא"
+#define D_REDIRECTED "הופנה מחדש לפורטל"
 #define D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION "Wifimanager set AccessPoint and keep Station"
 #define D_WIFIMANAGER_SET_ACCESSPOINT "Wifimanager set AccessPoint"
 #define D_TRYING_TO_CONNECT "מנסה לחבר את ההתקן לרשת"
@ -254,7 +254,7 @@

 #define D_MODULE_PARAMETERS "מודול פרמטרים"
 #define D_MODULE_TYPE "סוג מודול"
-#define D_PULLUP_ENABLE "No Button/Switch pull-up"
+#define D_PULLUP_ENABLE "pull-up אין לחצן/מתג"
 #define D_GPIO " רגל "
 #define D_SERIAL_IN "כניסת סריאל"
 #define D_SERIAL_OUT "יציאת סריאל"
@ -299,13 +299,13 @@
 #define D_SINGLE_DEVICE "התקן בודד"
 #define D_MULTI_DEVICE "התקנים"

-#define D_CONFIGURE_TEMPLATE "Configure Template"
-#define D_TEMPLATE_PARAMETERS "Template parameters"
-#define D_TEMPLATE_NAME "Name"
-#define D_BASE_TYPE "Based on"
-#define D_TEMPLATE_FLAGS "Options"
-#define D_ALLOW_ADC0 "ADC0 input"
-#define D_ALLOW_PULLUP "User pull-up selection"
+#define D_CONFIGURE_TEMPLATE "הגדר תבנית"
+#define D_TEMPLATE_PARAMETERS "פרמטרים של תבנית"
+#define D_TEMPLATE_NAME "שם"
+#define D_BASE_TYPE "מבוסס על"
+#define D_TEMPLATE_FLAGS "אפשריות"
+#define D_ALLOW_ADC0 "ADC0 כניסת"
+#define D_ALLOW_PULLUP "pull-up בחירת משתמש עבור"

 #define D_SAVE_CONFIGURATION "שמירת הגדרות"
 #define D_CONFIGURATION_SAVED "הגדרות נשמרו"
@ -357,12 +357,12 @@
 #define D_NEED_USER_AND_PASSWORD "Need user=<username>&password=<password>"

 // xdrv_01_mqtt.ino
-#define D_FINGERPRINT "Verify TLS fingerprint..."
-#define D_TLS_CONNECT_FAILED_TO "TLS Connect failed to"
-#define D_RETRY_IN "Retry in"
-#define D_VERIFIED "Verified using Fingerprint"
-#define D_INSECURE "Insecure connection due to invalid Fingerprint"
-#define D_CONNECT_FAILED_TO "Connect failed to"
+#define D_FINGERPRINT "...TLS אמת טביעת אצבע של"
+#define D_TLS_CONNECT_FAILED_TO "נכשל TLS חיבור"
+#define D_RETRY_IN "נסה שוב תוך"
+#define D_VERIFIED "מאומת באמצעות טביעת אצבע"
+#define D_INSECURE "חיבור לא מאובטח עקב טביעת אצבע לא חוקית"
+#define D_CONNECT_FAILED_TO "חיבור נכשל ל"

 // xplg_wemohue.ino
 #define D_MULTICAST_DISABLED "Multicast disabled"
@ -441,16 +441,16 @@
 #define D_ENERGY_TOTAL "צריכה כללית"

 // xsns_05_ds18b20.ino
-#define D_SENSOR_BUSY "Sensor busy"
-#define D_SENSOR_CRC_ERROR "Sensor CRC error"
-#define D_SENSORS_FOUND "Sensors found"
+#define D_SENSOR_BUSY "שרת עסוק"
+#define D_SENSOR_CRC_ERROR "בחיישן CRC שגיאת"
+#define D_SENSORS_FOUND "חיישנים לא נמצאו"

 // xsns_06_dht.ino
-#define D_TIMEOUT_WAITING_FOR "Timeout waiting for"
-#define D_START_SIGNAL_LOW "start signal low"
-#define D_START_SIGNAL_HIGH "start signal high"
-#define D_PULSE "pulse"
-#define D_CHECKSUM_FAILURE "Checksum failure"
+#define D_TIMEOUT_WAITING_FOR "הזמן הקצוב להמתנה"
+#define D_START_SIGNAL_LOW "להתחיל אות נמוך"
+#define D_START_SIGNAL_HIGH "להתחיל אות גבוה"
+#define D_PULSE "פעימה"
+#define D_CHECKSUM_FAILURE "בדיקת כשל נכשלה"

 // xsns_07_sht1x.ino
 #define D_SENSOR_DID_NOT_ACK_COMMAND "Sensor did not ACK command"
@ -470,17 +470,17 @@
 #define D_GZ_AXIS "Gyro Z-Axis"

 // xsns_34_hx711.ino
-#define D_HX_CAL_REMOVE "Remove weigth"
-#define D_HX_CAL_REFERENCE "Load reference weigth"
-#define D_HX_CAL_DONE "Calibrated"
-#define D_HX_CAL_FAIL "Calibration failed"
-#define D_RESET_HX711 "Reset Scale"
-#define D_CONFIGURE_HX711 "Configure Scale"
-#define D_HX711_PARAMETERS "Scale parameters"
-#define D_ITEM_WEIGHT "Item weight"
-#define D_REFERENCE_WEIGHT "Reference weigth"
-#define D_CALIBRATE "Calibrate"
-#define D_CALIBRATION "Calibration"
+#define D_HX_CAL_REMOVE "הסר משקל"
+#define D_HX_CAL_REFERENCE "טען משקל התייחסות"
+#define D_HX_CAL_DONE "מכויל"
+#define D_HX_CAL_FAIL "כיול נכשל"
+#define D_RESET_HX711 "אפס את קנה המידה"
+#define D_CONFIGURE_HX711 "הגדר קנה מידה"
+#define D_HX711_PARAMETERS "פרמטרים של קנה מידה"
+#define D_ITEM_WEIGHT "משקל פריט"
+#define D_REFERENCE_WEIGHT "משקל הפניה"
+#define D_CALIBRATE "כייל"
+#define D_CALIBRATION "כיול"

 //xsns_35_tx20.ino
 #define D_TX20_WIND_DIRECTION "Wind Direction"
@ -494,7 +494,7 @@

 // sonoff_template.h - keep them as short as possible to be able to fit them in GUI drop down box
 #define D_SENSOR_NONE          "None"
-#define D_SENSOR_USER          "User"
+#define D_SENSOR_USER          "משתמש"
 #define D_SENSOR_DHT11         "DHT11"
 #define D_SENSOR_AM2301        "AM2301"
 #define D_SENSOR_SI7021        "SI7021"
@ -502,7 +502,7 @@
 #define D_SENSOR_I2C_SCL       "I2C SCL"
 #define D_SENSOR_I2C_SDA       "I2C SDA"
 #define D_SENSOR_WS2812        "WS2812"
-#define D_SENSOR_DFR562        "MP3 Player"
+#define D_SENSOR_DFR562        "נגן מוזיקה"
 #define D_SENSOR_IRSEND        "IRsend"
 #define D_SENSOR_SWITCH        "מתג"        // Suffix "1"
 #define D_SENSOR_BUTTON        "לחצן"       // Suffix "1"
--- a/tools/decode-config.py
+++ b/tools/decode-config.py
@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-VER = '2.1.0021'
+VER = '2.1.0022'

 """
    decode-config.py - Backup/Restore Sonoff-Tasmota configuration data
@ -873,7 +873,13 @@ Setting_6_4_1_16.update({
 Setting_6_4_1_17 = copy.deepcopy(Setting_6_4_1_16)
 Setting_6_4_1_17['flag3'][0].pop('no_pullup',None)
 # ======================================================================
+Setting_6_4_1_18 = copy.deepcopy(Setting_6_4_1_17)
+Setting_6_4_1_18['flag3'][0].update ({
+        'no_hold_retain':                ('<L', (0x3A0,1,12), (None, None,                      ('SetOption',   '"SetOption62 {}".format($)')) ),
+                                    })
+# ======================================================================
 Settings = [
+            (0x6040112, 0xe00, Setting_6_4_1_18),
            (0x6040111, 0xe00, Setting_6_4_1_17),
            (0x6040110, 0xe00, Setting_6_4_1_16),
            (0x604010D, 0xe00, Setting_6_4_1_13),