Merge branch 'development' of https://github.com/arendst/Tasmota into development

This commit is contained in:
Theo Arends 2022-03-09 10:33:03 +01:00
commit 2e859b7cd7
5 changed files with 8 additions and 2 deletions

View File

@ -22,6 +22,7 @@ jobs:
matrix: matrix:
variant: variant:
- tasmota - tasmota
- tasmota4M
- tasmota-minimal - tasmota-minimal
- tasmota-display - tasmota-display
- tasmota-ir - tasmota-ir

View File

@ -21,6 +21,7 @@ jobs:
matrix: matrix:
variant: variant:
- tasmota - tasmota
- tasmota4M
- tasmota-minimal - tasmota-minimal
- tasmota-display - tasmota-display
- tasmota-ir - tasmota-ir

View File

@ -24,6 +24,7 @@ jobs:
matrix: matrix:
variant: variant:
- tasmota - tasmota
- tasmota4M
- tasmota-display - tasmota-display
- tasmota-ir - tasmota-ir
- tasmota-knx - tasmota-knx

View File

@ -34,6 +34,9 @@ lib_ignore =
[env:tasmota] [env:tasmota]
[env:tasmota4M]
board = esp8266_4M2M
[env:tasmota-minimal] [env:tasmota-minimal]
build_flags = ${env.build_flags} -DFIRMWARE_MINIMAL build_flags = ${env.build_flags} -DFIRMWARE_MINIMAL
lib_extra_dirs = lib_extra_dirs =

View File

@ -28,7 +28,7 @@
* Use online command StateText to translate ON, OFF, HOLD and TOGGLE. * Use online command StateText to translate ON, OFF, HOLD and TOGGLE.
* Use online command Prefix to translate cmnd, stat and tele. * Use online command Prefix to translate cmnd, stat and tele.
* *
* Updated until v10.1.0.6 - Last update 20.02.2022 * Updated until v10.1.0.6 - Last update 08.03.2022
\*********************************************************************/ \*********************************************************************/
#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) #define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English)
@ -851,7 +851,7 @@
#define D_SENSOR_BL6523_TX "BL6523 - TX" #define D_SENSOR_BL6523_TX "BL6523 - TX"
#define D_SENSOR_BL6523_RX "BL6523 - RX" #define D_SENSOR_BL6523_RX "BL6523 - RX"
#define D_SENSOR_HEARTBEAT "Battito cardiaco" #define D_SENSOR_HEARTBEAT "Battito cardiaco"
#define D_SENSOR_RESET "Reset" #define D_SENSOR_RESET "Ripristino"
#define D_GPIO_SHIFT595_SRCLK "74x595 - SRCLK" #define D_GPIO_SHIFT595_SRCLK "74x595 - SRCLK"
#define D_GPIO_SHIFT595_RCLK "74x595 - RCLK" #define D_GPIO_SHIFT595_RCLK "74x595 - RCLK"
#define D_GPIO_SHIFT595_OE "74x595 - OE" #define D_GPIO_SHIFT595_OE "74x595 - OE"