jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-24 11:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into pre-release-9.3.0

Browse Source
This commit is contained in:
Theo Arends 2021-02-12 15:19:21 +01:00
commit 2b34c6843a
38 changed files with 408 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.github/workflows/CI_github_ESP32.yml vendored
View File

@ -104,26 +104,6 @@ jobs:
name: firmware
path: ./build_output
tasmota32-minimal:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v1
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -U platformio
platformio upgrade --dev
platformio update
- name: Run PlatformIO
run: |
platformio run -e tasmota32-minimal
- uses: actions/upload-artifact@v2
with:
name: firmware
path: ./build_output
tasmota32-lite:
runs-on: ubuntu-latest
steps:

41
.github/workflows/Tasmota_build.yml vendored
View File

@ -724,26 +724,6 @@ jobs:
path: ./build_output
tasmota32-minimal:
needs: tasmota_pull
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v1
- name: Install dependencies
run: |
pip install -U platformio
- name: Run PlatformIO
run: |
platformio run -e tasmota32-minimal
- uses: actions/upload-artifact@v2
with:
name: firmware
path: ./build_output
tasmota32-lite:
needs: tasmota_pull
runs-on: ubuntu-latest
@ -1104,6 +1084,26 @@ jobs:
path: ./build_output
tasmota32-FY:
needs: tasmota_pull
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v1
- name: Install dependencies
run: |
pip install -U platformio
- name: Run PlatformIO
run: |
platformio run -e tasmota32-FY
- uses: actions/upload-artifact@v2
with:
name: firmware
path: ./build_output
tasmota32-GR:
needs: tasmota_pull
runs-on: ubuntu-latest
@ -1455,7 +1455,6 @@ jobs:
[ ! -f ./mv_firmware/firmware/tasmota-zbbridge.* ] || mv ./mv_firmware/firmware/tasmota-zbbridge.* ./firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota32.* ] || mv ./mv_firmware/firmware/tasmota32.* ./firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-sensors.* ] || mv ./mv_firmware/firmware/tasmota32-sensors.* ./firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-minimal.* ] || mv ./mv_firmware/firmware/tasmota32-minimal.* ./firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-lite.* ] || mv ./mv_firmware/firmware/tasmota32-lite.* ./firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-ir*.* ] || mv ./mv_firmware/firmware/tasmota32-ir*.* ./firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-display.* ] || mv ./mv_firmware/firmware/tasmota32-display.* ./firmware/tasmota32/

41
.github/workflows/Tasmota_build_master.yml vendored
View File

@ -724,26 +724,6 @@ jobs:
path: ./build_output
tasmota32-minimal:
needs: tasmota_pull
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v1
- name: Install dependencies
run: |
pip install -U platformio
- name: Run PlatformIO
run: |
platformio run -e tasmota32-minimal
- uses: actions/upload-artifact@v2
with:
name: firmware
path: ./build_output
tasmota32-lite:
needs: tasmota_pull
runs-on: ubuntu-latest
@ -1104,6 +1084,26 @@ jobs:
path: ./build_output
tasmota32-FY:
needs: tasmota_pull
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v1
- name: Install dependencies
run: |
pip install -U platformio
- name: Run PlatformIO
run: |
platformio run -e tasmota32-FY
- uses: actions/upload-artifact@v2
with:
name: firmware
path: ./build_output
tasmota32-GR:
needs: tasmota_pull
runs-on: ubuntu-latest
@ -1455,7 +1455,6 @@ jobs:
[ ! -f ./mv_firmware/firmware/tasmota-zbbridge.* ] || mv ./mv_firmware/firmware/tasmota-zbbridge.* ./firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota32.* ] || mv ./mv_firmware/firmware/tasmota32.* ./firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-sensors.* ] || mv ./mv_firmware/firmware/tasmota32-sensors.* ./firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-minimal.* ] || mv ./mv_firmware/firmware/tasmota32-minimal.* ./firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-lite.* ] || mv ./mv_firmware/firmware/tasmota32-lite.* ./firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-ir*.* ] || mv ./mv_firmware/firmware/tasmota32-ir*.* ./firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-display.* ] || mv ./mv_firmware/firmware/tasmota32-display.* ./firmware/tasmota32/

3
CHANGELOG.md
View File

@ -11,10 +11,11 @@ All notable changes to this project will be documented in this file.
- Support for Device Groups Device Map (#10898)
- Support for Eastron SDM72D-M three phase 100A Modbus energy meter (#10862)
- Support for Frysk language translations by Christiaan Heerze
- ESP8266 Fallback to ``*.bin.gz`` binary when OTA upload of ``*.bin`` binary fails
## [9.2.0.6] 20210210
### Changed
- Removed migration support for versions before v8.1.0 (Doris)
- Remove support for direct migration from versions before v8.1.0 (Doris)
- ESP32 Increase number of switch GPIOs from 8 to 28
- ESP32 Increase number of interlock groups from 4 to 14
- Increase number of button GPIOs from 4 to 8

2
MODULES.md
View File

@ -80,4 +80,4 @@ Module | LCode | Description
74 Sonoff D1 | x | Sonoff D1 Wifi and RF Dimmer
75 Sonoff ZbBridge | x | Sonoff Zigbee bridge
Over 1650 additional devices are supported using [templates](TEMPLATES.md).
Over 1850 additional devices are supported using [templates](TEMPLATES.md).

31
RELEASENOTES.md
View File

@ -4,7 +4,7 @@
## Migration Information
This version removes migration support for versions before v8.1.0 (Doris)
**This version removes support for direct migration from versions before v8.1.0 (Doris)**
See [migration path](https://tasmota.github.io/docs/Upgrading#migration-path) for instructions how to migrate to a major version. Pay attention to the following version breaks due to dynamic settings updates:
@ -40,6 +40,7 @@ For initial configuration this release supports Webserver based **WifiManager**
## Provided Binary Downloads
### ESP8266 or ESP8285 based
The following binary downloads have been compiled with ESP8266/Arduino library core version **2.7.4.9**.
- **tasmota.bin** = The Tasmota version with most drivers. **RECOMMENDED RELEASE BINARY**
@ -47,12 +48,31 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
- **tasmota-lite.bin** = The Lite version without most drivers and sensors.
- **tasmota-knx.bin** = The Knx version without some features but adds KNX support.
- **tasmota-sensors.bin** = The Sensors version adds more useful sensors.
- **tasmota-ir** = The InfraRed Receiver and transmitter version allowing all available protocols provided by library IRremoteESP8266 but without most other features.
- **tasmota-ir.bin** = The InfraRed Receiver and transmitter version allowing all available protocols provided by library IRremoteESP8266 but without most other features.
- **tasmota-display.bin** = The Display version without Energy Monitoring but adds display support.
- **tasmota-zbbridge.bin** = The dedicated Sonoff Zigbee Bridge version.
- **tasmota-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**.
The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota/release for ESP8266 or http://ota.tasmota.com/tasmota32/release for ESP32. The links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmota.com/tasmota/release/tasmota.bin.gz``
Above binaries are also available as gzipped version allowing faster uploads.
The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota/release. The links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmota.com/tasmota/release/tasmota.bin.gz``
### ESP32 based
The following binary downloads have been compiled with ESP32/Arduino library core version **1.0.5-rc6**.
- **tasmota32.bin** = The Tasmota version with most drivers. **RECOMMENDED RELEASE BINARY**
- **tasmota32-BG.bin** to **tasmota32-TW.bin** = The Tasmota version in different languages.
- **tasmota32-lite.bin** = The Lite version without most drivers and sensors.
- **tasmota32-knx.bin** = The Knx version without some features but adds KNX support.
- **tasmota32-sensors.bin** = The Sensors version adds more useful sensors.
- **tasmota32-ir.bin** = The InfraRed Receiver and transmitter version allowing all available protocols provided by library IRremoteESP8266 but without most other features.
- **tasmota32-display.bin** = The Display version without Energy Monitoring but adds display support.
- **tasmota32-webcam.bin** = The Webcam version adds webcam support.
- **tasmota32-bluetooth.bin** = The Bluetooth version adds BLE support.
- **tasmota32-odroidgo.bin** = The Odroid-Go version is specifically tailored to Odroid_go hardware.
- **tasmota32-core2.bin** = The Core2 version is specifically tailored to M5Stack Core2 hardware.
The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota32/release. The links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmota.com/tasmota32/release/tasmota32.bin``
[List](MODULES.md) of embedded modules.
@ -66,7 +86,7 @@ The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota
- Command ``Speed2`` to control a once off fade [#10741](https://github.com/arendst/Tasmota/issues/10741)
- Command ``VirtualCT`` to simulate or fine tune CT bulbs with 3,4,5 channels [#10311](https://github.com/arendst/Tasmota/issues/10311)
- Command ``SetOption40 0..250`` to disable button functionality if activated for over 0.1 second re-introduced
- Command ``SetOption43 1..255`` to control Rotary step (#10407)
- Command ``SetOption43 1..255`` to control Rotary step [#10407](https://github.com/arendst/Tasmota/issues/10407)
- Command ``SetOption118 1`` to move ZbReceived from JSON message and into the subtopic replacing "SENSOR" default [#10353](https://github.com/arendst/Tasmota/issues/10353)
- Command ``SetOption119 1`` to remove the device addr from json payload, can be used with zb_topic_fname where the addr is already known from the topic [#10355](https://github.com/arendst/Tasmota/issues/10355)
- Zigbee command ``SetOption120 1`` or ``ZbEndpointTopic 1`` to add the zigbee endpoint as suffix in topic when using ``SetOption89 1``
@ -105,6 +125,7 @@ The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota
- Rule trigger string comparisons for EndsWith ``$>``, StartsWith ``$<`` and Contains ``$|`` [#10538](https://github.com/arendst/Tasmota/issues/10538)
- SPI display driver SSD1331 Color oled by Jeroen Vermeulen [#10376](https://github.com/arendst/Tasmota/issues/10376)
- Compile time option ``USE_MQTT_TLS_DROP_OLD_FINGERPRINT`` to drop old (less secure) TLS fingerprint
- ESP8266 Fallback to ``*.bin.gz`` binary when OTA upload of ``*.bin`` binary fails
### Breaking Changed
- ESP32 switch from default SPIFFS to default LittleFS file system loosing current (zigbee) files
@ -119,7 +140,7 @@ The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota
- Replaced RA8876 GPIO selection from ``SPI CS`` by ``RA8876 CS``
### Changed
- Removed migration support for versions before v8.1.0 (Doris)
- Remove support for direct migration from versions before v8.1.0 (Doris)
- Command ``Sleep 0`` removes any sleep from wifi modem except when ESP32 BLE is active
- Logging from heap to stack freeing 700 bytes RAM
- Disabled ``USE_LIGHT`` light support for ZBBridge saving 17.6kB [#10374](https://github.com/arendst/Tasmota/issues/10374)

304
TEMPLATES.md
View File

File diff suppressed because it is too large Load Diff

2
lib/default/PubSubClient-EspEasy-2.7.12/library.properties
View File

@ -6,4 +6,4 @@ sentence=A client library for MQTT messaging.
paragraph=MQTT is a lightweight messaging protocol ideal for small devices. This library allows you to send and receive MQTT messages. It supports the latest MQTT 3.1.1 protocol and can be configured to use the older MQTT 3.1 if needed. It supports all Arduino Ethernet Client compatible hardware, including the Intel Galileo/Edison, ESP8266 and TI CC3000.
category=Communication
url=http://pubsubclient.knolleary.net
architectures=*
architectures=esp8266,esp32

2
lib/default/UdpListener/library.properties
View File

@ -4,4 +4,4 @@ author=Ivan Grokhotkov, Stephan Hadinger
maintainer=Stephan <stephan.hadinger@gmail.com>
sentence=UdpListener optimized for static and limite memory allocation, to reduce memory footprint of receiving SSDP request, as a replacement for WifiUdp.
paragraph=This class only handles receiving UDP Multicast packets. For sending packets, use WifiUdp.
architectures=esp8266
architectures=esp8266,esp32

2
lib/default/Unishox-1.0-shadinger/library.properties
View File

@ -5,4 +5,4 @@ maintainer=Arun <arun@siara.cc>, Stephan <stephan.hadinger@gmail.com>
sentence=Unishox compression for Tasmota Rules
paragraph=It is based on Unishox hybrid encoding technique. This version has specific Unicode code removed for size.
url=https://github.com/siara-cc/Unishox
architectures=esp8266
architectures=esp8266,esp32

2
lib/default/jsmn-shadinger-1.0/library.properties
View File

@ -5,4 +5,4 @@ maintainer=Stephan <stephan.hadinger@gmail.com>
sentence=Lightweight in-place JSON parser
paragraph=
url=https://github.com/zserge/jsmn
architectures=esp8266
architectures=esp8266,esp32

1
lib/lib_audio/ESP8266Audio/library.json
View File

@ -20,6 +20,7 @@
"SPI": "1.0"
},
"frameworks": "Arduino",
"platforms": ["espressif8266", "espressif32"],
"examples": [
"examples/*/*.ino"
]

1
lib/lib_audio/ESP8266SAM/library.json
View File

@ -17,6 +17,7 @@
"version": "1.0",
"homepage": "https://github.com/earlephilhower/ESP8266SAM",
"frameworks": "Arduino",
"platforms": ["espressif8266", "espressif32"],
"examples": [
"examples/*/*.ino"
]

2
lib/lib_basic/NeoPixelBus-2.6.0/library.json
View File

@ -9,6 +9,6 @@
},
"version": "2.6.0",
"frameworks": "arduino",
"platforms": "*"
"platforms": ["espressif8266", "espressif32"]
}

1
lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/library.json
View File

@ -55,6 +55,7 @@
"version": "2.3.2",
"homepage": "https://www.pjrc.com/teensy/td_libs_OneWire.html",
"frameworks": "Arduino",
"platforms": ["espressif8266", "espressif32"],
"examples": [
"examples/*/*.pde"
]

5
lib/lib_display/LiquidCrystal_I2C-1.1.3/library.json
View File

@ -8,8 +8,5 @@
"url": "https://github.com/marcoschwartz/LiquidCrystal_I2C.git"
},
"frameworks": "arduino",
"platforms":
[
"*"
]
"platforms": ["espressif8266", "espressif32"]
}

2
lib/lib_div/LibTeleinfo/library.json
View File

@ -14,6 +14,6 @@
"url": "http://hallard.me"
},
"frameworks": "arduino",
"platforms": "*"
"platforms": ["espressif8266", "espressif32"]
}

2
lib/lib_div/NewPing-1.9.1/library.properties
View File

@ -6,5 +6,5 @@ sentence=A library that makes working with ultrasonic sensors easy.
paragraph=When I first received an ultrasonic sensor I was not happy with how poorly it performed. I soon realized the problem was not the sensor, it was the available ping and ultrasonic libraries causing the problem. The NewPing library totally fixes these problems, adds many new features, and breathes new life into these very affordable distance sensors.
category=Sensors
url=https://bitbucket.org/teckel12/arduino-new-ping/wiki/Home
architectures=avr,arm,esp8266
architectures=*
includes=NewPing.h

2
lib/lib_div/esp-knx-ip-0.5.2/library.properties.off → lib/lib_div/esp-knx-ip-0.5.2/library.properties
View File

@ -6,5 +6,5 @@ sentence=ESP8266 library for KNX/IP communication.
paragraph=Build your own IoT devices with KNX/IP connectivity!
category=Communication
url=https://github.com/envy/esp-knx-ip
architectures=esp8266
architectures=*
includes=esp-knx-ip.h

26
lib/lib_i2c/I2Cdevlib-Core/.library.json
View File

@ -1,31 +1,31 @@
{
"name": "I2Cdevlib-Core",
"name": "I2Cdevlib-Core",
"repository": {
"url": "https://github.com/jrowberg/i2cdevlib.git",
"url": "https://github.com/jrowberg/i2cdevlib.git",
"type": "git"
},
},
"platforms": [
"*"
],
"frameworks": [
"arduino"
],
"version": "6744ce0ac4",
],
"version": "6744ce0ac4",
"export": {
"include": "Arduino/I2Cdev"
},
},
"authors": [
{
"maintainer": false,
"name": "Jeff Rowberg",
"url": "https://github.com/jrowberg",
"maintainer": false,
"name": "Jeff Rowberg",
"url": "https://github.com/jrowberg",
"email": "jeff@rowberg.net"
}
],
],
"keywords": [
"i2cdevlib",
"i2cdevlib",
"i2c"
],
"id": 11,
],
"id": 11,
"description": "The I2C Device Library (I2Cdevlib) is a collection of uniform and well-documented classes to provide simple and intuitive interfaces to I2C devices."
}

2
lib/lib_rf/KeeloqLib/library.properties
View File

@ -6,4 +6,4 @@ sentence=C++ Class Implementing Keeloq cipher by Microchip.com.
paragraph=Developed/Tested on Arduino/ESP8266 with Arduino IDE Environment.
category=Uncategorized
url=http://none.net
architectures=*
architectures=esp8266,esp32

8
lib/lib_rf/cc1101/library.json Normal file
View File

@ -0,0 +1,8 @@
{
"name": "cc1101",
"keywords": "rf, esp8266",
"description": "cc1101 library",
"version": "1.0",
"frameworks": "arduino",
"platforms": "espressif8266"
}

2
lib/lib_rf/cc1101/library.properties
View File

@ -6,4 +6,4 @@ sentence=.
paragraph=
category=
url=
architectures=esp8266,esp32
architectures=esp8266

8
lib/libesp32/CORE2_Library/library.json Normal file
View File

@ -0,0 +1,8 @@
{
"name": "M5 Stack Core2 library",
"keywords": "esp32, sensor, mqtt, m2m, iot",
"description": "M5 Stack Core2 library",
"version": "1.0",
"frameworks": "arduino",
"platforms": "espressif32"
}

2
lib/libesp32/CORE2_Library/library.properties
View File

@ -6,4 +6,4 @@ sentence=Allows Tasmota to use Core2
paragraph=Allows Tasmota to Core2 for esp32
category=ESP32
url=
architectures=*
architectures=esp32

8
lib/libesp32/ESP32-Ethernet/library.json Normal file
View File

@ -0,0 +1,8 @@
{
"name": "ESP32 Ethernet",
"keywords": "esp32, ethernet, communication",
"description": "Ethernet Library for ESP32",
"version": "1.1.0",
"frameworks": "arduino",
"platforms": "espressif32"
}

10
lib/libesp32/ESP32-Ethernet/library.properties
View File

@ -1,17 +1,9 @@
name=ESP32 Ethernet
version=1.1.0
author=Espressif
maintainer=Espressif
sentence=Ethernet Library for ESP32
paragraph=This library allows ESP32 to use ethernet hardware
paragraph=This library allows ESP32 to use ethernet hardware
category=Communication
url=
architectures=esp32

8
lib/libesp32/ESP32-Mail-Client/library.json Normal file
View File

@ -0,0 +1,8 @@
{
"name": "ESP32 Mail Client",
"keywords": "esp32, mail, communication",
"description": "Mail Client Arduino Library for ESP32",
"version": "2.1.4",
"frameworks": "arduino",
"platforms": "espressif32"
}

8
lib/libesp32/ESP32-Mail-Client/library.properties
View File

@ -1,17 +1,9 @@
name=ESP32 Mail Client
version=2.1.4
author=Mobizt
maintainer=Mobizt <k_suwatchai@hotmail.com.com>
sentence=Mail Client Arduino Library for ESP32
paragraph=This library allows ESP32 to send Email with/without attachment and receive Email with/without attachment download through SMTP and IMAP servers.
category=Communication
url=https://github.com/mobizt/ESP32-Mail-Client
architectures=esp32

8
lib/libesp32/ESP32-to-ESP8266-compat/library.json Normal file
View File

@ -0,0 +1,8 @@
{
"name": "ESP32-to-ESP8266-compat",
"keywords": "esp32, esp8266",
"description": "Allows Tasmota to compile for esp32",
"version": "0.0.2",
"frameworks": "arduino",
"platforms": "espressif32"
}

2
lib/libesp32/ESP32-to-ESP8266-compat/library.properties
View File

@ -6,4 +6,4 @@ sentence=Allows Tasmota to compile for esp32
paragraph=Allows Tasmota to compile for esp32
category=ESP32
url=
architectures=*
architectures=esp32

5
lib/libesp32/LITTLEFS/library.json
View File

@ -15,8 +15,5 @@
"version": "1.0.5",
"license": "LGPL-2.0",
"frameworks": "arduino",
"platforms": "espressif32",
"build": {
"libCompatMode": 2
}
"platforms": "espressif32"
}

8
lib/libesp32/NimBLE-Arduino/library.json Normal file
View File

@ -0,0 +1,8 @@
{
"name": "NimBLE-Arduino",
"keywords": "esp32, bluetooth",
"description": "Bluetooth low energy (BLE) library for arduino-esp32 based on NimBLE",
"version": "1.0.2",
"frameworks": "arduino",
"platforms": "espressif32"
}

8
lib/libesp32/rtsp/library.json Normal file
View File

@ -0,0 +1,8 @@
{
"name": "Micro-RTSP",
"keywords": "esp32, rtsp",
"description": "Mikro RTSP server",
"version": "0.1.6",
"frameworks": "arduino",
"platforms": "espressif32"
}

2
lib/libesp32/rtsp/library.properties
View File

@ -6,4 +6,4 @@ sentence=Mikro RTSP server for mikros
paragraph=A small/efficient RTSP server for ESP32 and other micros
category=Data Storage
url=https://github.com/geeksville/Micro-RTSP.git
architectures=*
architectures=esp32

8
tasmota/language/it_IT.h
View File

@ -1,7 +1,7 @@
/*
it-IT.h - localization for Italian - Italy for Tasmota
Copyright (C) 2021 Gennaro Tortone - some mods by Antonio Fragola - Updated by bovirus - rev. 04.02.2021
Copyright (C) 2021 Gennaro Tortone - some mods by Antonio Fragola - Updated by bovirus - rev. 12.02.2021
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
@ -630,8 +630,8 @@
#define D_SENSOR_SBR_TX "SerBr - TX"
#define D_SENSOR_SR04_TRIG "SR04 Tri - TX"
#define D_SENSOR_SR04_ECHO "SR04 Ech - RX"
#define D_SENSOR_SDM72_TX "SDM72 Tx"
#define D_SENSOR_SDM72_RX "SDM72 Rx"
#define D_SENSOR_SDM72_TX "SDM72 - TX"
#define D_SENSOR_SDM72_RX "SDM72 - RX"
#define D_SENSOR_SDM120_TX "SDMx20 - TX"
#define D_SENSOR_SDM120_RX "SDMx20 - RX"
#define D_SENSOR_SDM630_TX "SDM630 - TX"
@ -838,7 +838,7 @@
//SDM220, SDM120, SDM72, LE01MR
#define D_EXPORT_POWER "Potenza esportata"
#define D_IMPORT_POWER "Potenza importata"
#define D_PHASE_ANGLE "Angolo Fase"
#define D_PHASE_ANGLE "Angolo fase"
#define D_IMPORT_ACTIVE "Potenza attiva importata"
#define D_EXPORT_ACTIVE "Potenza attiva esportata"
#define D_IMPORT_REACTIVE "Potenza reattiva importata"

9
tasmota/support_tasmota.ino
View File

@ -1077,6 +1077,15 @@ void Every250mSeconds(void)
snprintf_P(TasmotaGlobal.mqtt_data, sizeof(TasmotaGlobal.mqtt_data), PSTR("%s-" D_JSON_MINIMAL "%s"), TasmotaGlobal.mqtt_data, ota_url_type); // Minimal filename must be filename-minimal
}
#endif // FIRMWARE_MINIMAL
#ifdef ESP8266
if (ota_retry_counter < OTA_ATTEMPTS / 2) {
if (!strcasecmp_P(TasmotaGlobal.mqtt_data, PSTR(".gz"))) {
ota_retry_counter = 1;
} else {
strcat_P(TasmotaGlobal.mqtt_data, PSTR(".gz"));
}
}
#endif // ESP8266
AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPLOAD "%s"), TasmotaGlobal.mqtt_data);
WiFiClient OTAclient;
ota_result = (HTTP_UPDATE_FAILED != ESPhttpUpdate.update(OTAclient, TasmotaGlobal.mqtt_data));

4
tasmota/tasmota.h
View File

@ -147,7 +147,11 @@ const uint32_t BOOT_LOOP_TIME = 10; // Number of seconds to stop detecti
const uint32_t POWER_CYCLE_TIME = 8; // Number of seconds to reset power cycle boot loops
const uint16_t SYSLOG_TIMER = 600; // Seconds to restore syslog_level
const uint16_t SERIALLOG_TIMER = 600; // Seconds to disable SerialLog
#ifdef ESP8266
const uint8_t OTA_ATTEMPTS = 10; // Number of times to try fetching the new firmware
#else
const uint8_t OTA_ATTEMPTS = 5; // Number of times to try fetching the new firmware
#endif // ESP8266
const uint16_t INPUT_BUFFER_SIZE = 520; // Max number of characters in serial command buffer
const uint16_t FLOATSZ = 16; // Max number of characters in float result from dtostrfd (max 32)