+
# Support
@@ -6,10 +6,9 @@ If you're looking for support on **Tasmota** there are some options available:
## Documentation:
-* [Wiki Pages](https://github.com/arendst/Tasmota/wiki): For information on how to Flash Tasmota, configure and use it.
-* [FAQ](https://github.com/arendst/Tasmota/wiki/FAQ): For information on common problems and solutions.
-* [Troubleshooting Information](https://github.com/arendst/Tasmota/wiki/Troubleshooting): For ways to debug and troubleshoot.
-* [Commands Information](https://github.com/arendst/Tasmota/wiki/Commands): For information on all the commands supported by Tasmota.
+* [Documentation Site](https://tasmota.github.io/docs): For information on how to flash Tasmota, configure, use and expand it
+* [FAQ and Troubleshooting](https://tasmota.github.io/docs/#/help/): For information on common problems and solutions.
+* [Commands Information](https://tasmota.github.io/docs/#/Commands): For information on all the commands supported by Tasmota.
## Support's Community:
diff --git a/arduino/version 2.6.0/platform.txt b/arduino/version 2.6.0/platform.txt
deleted file mode 100644
index 3aeb47444..000000000
--- a/arduino/version 2.6.0/platform.txt
+++ /dev/null
@@ -1,162 +0,0 @@
- # ESP8266 platform
-# ------------------------------
-
-# For more info:
-# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5-3rd-party-Hardware-specification
-
-name=ESP8266 Boards (2.6.0)
-version=2.6.0
-
-# These will be removed by the packager script when doing a JSON release
-
-
-
-
-runtime.tools.signing={runtime.platform.path}/tools/signing.py
-runtime.tools.elf2bin={runtime.platform.path}/tools/elf2bin.py
-runtime.tools.sizes={runtime.platform.path}/tools/sizes.py
-runtime.tools.makecorever={runtime.platform.path}/tools/makecorever.py
-runtime.tools.eboot={runtime.platform.path}/bootloaders/eboot/eboot.elf
-
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-
-build.lwip_lib=-llwip_gcc
-build.lwip_include=lwip/include
-build.lwip_flags=-DLWIP_OPEN_SRC
-
-build.vtable_flags=-DVTABLES_IN_FLASH
-
-build.sslflags=
-
-build.exception_flags=-fno-exceptions
-build.stdcpp_lib=-lstdc++
-build.stdcpp_level=-std=gnu++11
-
-# build.float=-u _printf_float -u _scanf_float
-build.float=
-build.led=
-
-# default SDK for all boards
-# (generic board overrides this variable)
-#build.sdk=NONOSDK22x_190703
-build.sdk=NONOSDK22x_191024
-#build.sdk=NONOSDK22x_191105
-
-compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
-compiler.sdk.path={runtime.platform.path}/tools/sdk
-
-compiler.libc.path={runtime.platform.path}/tools/sdk/libc/xtensa-lx106-elf
-compiler.cpreprocessor.flags=-D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I{compiler.sdk.path}/include" "-I{compiler.sdk.path}/{build.lwip_include}" "-I{compiler.libc.path}/include" "-I{build.path}/core"
-
-compiler.c.cmd=xtensa-lx106-elf-gcc
-compiler.c.flags=-c {compiler.warning_flags} -Os -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -falign-functions=4 -MMD -std=gnu99 -ffunction-sections -fdata-sections {build.exception_flags} {build.sslflags}
-
-compiler.S.cmd=xtensa-lx106-elf-gcc
-compiler.S.flags=-c -g -x assembler-with-cpp -MMD -mlongcalls
-
-compiler.c.elf.flags=-g {compiler.warning_flags} -Os -nostdlib -Wl,--no-check-sections -u app_entry {build.float} -Wl,-static "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/lib/{build.sdk}" "-L{compiler.sdk.path}/ld" "-L{compiler.libc.path}/lib" "-T{build.flash_ld}" -Wl,--gc-sections -Wl,-wrap,system_restart_local -Wl,-wrap,spi_flash_read
-
-compiler.c.elf.cmd=xtensa-lx106-elf-gcc
-compiler.c.elf.libs=-lhal -lphy -lpp -lnet80211 {build.lwip_lib} -lwpa -lcrypto -lmain -lwps -lbearssl -laxtls -lespnow -lsmartconfig -lairkiss -lwpa2 {build.stdcpp_lib} -lm -lc -lgcc
-
-compiler.cpp.cmd=xtensa-lx106-elf-g++
-compiler.cpp.flags=-c {compiler.warning_flags} -Os -g -mlongcalls -mtext-section-literals -fno-rtti -falign-functions=4 {build.stdcpp_level} -MMD -ffunction-sections -fdata-sections {build.exception_flags} {build.sslflags}
-
-compiler.as.cmd=xtensa-lx106-elf-as
-
-compiler.ar.cmd=xtensa-lx106-elf-ar
-compiler.ar.flags=cru
-
-compiler.elf2hex.cmd=esptool
-compiler.elf2hex.flags=
-
-compiler.size.cmd=xtensa-lx106-elf-size
-
-# This can be overriden in boards.txt
-build.extra_flags=-DESP8266
-
-# These can be overridden in platform.local.txt
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.S.extra_flags=
-compiler.cpp.extra_flags=
-compiler.ar.extra_flags=
-compiler.objcopy.eep.extra_flags=
-compiler.elf2hex.extra_flags=
-
-## generate file with git version number
-## needs git
-recipe.hooks.sketch.prebuild.pattern="{runtime.tools.python3.path}/python3" "{runtime.tools.signing}" --mode header --publickey "{build.source.path}/public.key" --out "{build.path}/core/Updater_Signing.h"
-# This is quite a working hack. This form of prebuild hook, while intuitive, is not explicitly documented.
-recipe.hooks.prebuild.10.pattern="{runtime.tools.python3.path}/python3" "{runtime.tools.makecorever}" --build_path "{build.path}" --platform_path "{runtime.platform.path}" --version "unix-{version}"
-
-## Build the app.ld linker file
-recipe.hooks.linking.prelink.1.pattern="{compiler.path}{compiler.c.cmd}" -CC -E -P {build.vtable_flags} "{runtime.platform.path}/tools/sdk/ld/eagle.app.v6.common.ld.h" -o "{build.path}/local.eagle.app.v6.common.ld"
-
-## Compile c files
-recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -D{build.sdk}=1 -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {build.flash_flags} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
-
-## Compile c++ files
-recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} -D{build.sdk}=1 -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {build.flash_flags} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
-
-## Compile S files
-recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.S.flags} -D{build.sdk}=1 -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {build.led} {build.flash_flags} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
-
-## Create archives
-recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
-
-## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {build.exception_flags} -Wl,-Map "-Wl,{build.path}/{build.project_name}.map" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" -Wl,--start-group {object_files} "{archive_file_path}" {compiler.c.elf.libs} -Wl,--end-group "-L{build.path}"
-
-## Create eeprom
-recipe.objcopy.eep.pattern=
-
-## Create hex
-recipe.objcopy.hex.1.pattern="{runtime.tools.python3.path}/python3" "{runtime.tools.elf2bin}" --eboot "{runtime.tools.eboot}" --app "{build.path}/{build.project_name}.elf" --flash_mode {build.flash_mode} --flash_freq {build.flash_freq} --flash_size {build.flash_size} --path "{runtime.tools.xtensa-lx106-elf-gcc.path}/bin" --out "{build.path}/{build.project_name}.bin"
-recipe.objcopy.hex.2.pattern="{runtime.tools.python3.path}/python3" "{runtime.tools.signing}" --mode sign --privatekey "{build.source.path}/private.key" --bin "{build.path}/{build.project_name}.bin" --out "{build.path}/{build.project_name}.bin.signed" --legacy "{build.path}/{build.project_name}.bin.legacy_sig"
-recipe.objcopy.hex.3.pattern="{runtime.tools.python3.path}/python3" "{runtime.tools.sizes}" --elf "{build.path}/{build.project_name}.elf" --path "{runtime.tools.xtensa-lx106-elf-gcc.path}/bin"
-
-## Save hex
-recipe.output.tmp_file={build.project_name}.bin
-recipe.output.save_file={build.project_name}.{build.variant}.bin
-
-## Compute size
-recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
-recipe.size.regex=^(?:\.irom0\.text|\.text|\.text1|\.data|\.rodata|)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.rodata|\.bss)\s+([0-9]+).*
-#recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-
-# ------------------------------
-
-tools.esptool.path=
-# Because the variable expansion doesn't allow one tool to find another, the following lines
-# will point to "{runtime.platform.path}/tools/python3/python3" in GIT and
-# "{runtime.tools.python3.path}/python3" for JSON board manager releases.
-tools.esptool.cmd={runtime.tools.python3.path}/python3
-tools.esptool.network_cmd={runtime.tools.python3.path}/python3
-
-
-
-tools.esptool.upload.protocol=esp
-# esptool.py --trace option is a debug option, not a verbose option
-tools.esptool.upload.params.verbose=
-tools.esptool.upload.params.quiet=
-
-# First, potentially perform an erase or nothing
-# Next, do the binary upload
-# Combined in one rule because Arduino doesn't suport upload.1.pattern/upload.3.pattern
-tools.esptool.upload.pattern="{cmd}" "{runtime.platform.path}/tools/upload.py" --chip esp8266 --port "{serial.port}" --baud "{upload.speed}" "{upload.verbose}" {upload.erase_cmd} --end --chip esp8266 --port "{serial.port}" --baud "{upload.speed}" {upload.resetmethod} "{upload.verbose}" write_flash 0x0 "{build.path}/{build.project_name}.bin" --end
-
-tools.esptool.upload.network_pattern="{network_cmd}" "{runtime.platform.path}/tools/espota.py" -i "{serial.port}" -p "{network.port}" "--auth={network.password}" -f "{build.path}/{build.project_name}.bin"
-
-tools.mkspiffs.cmd=mkspiffs
-tools.mkspiffs.cmd.windows=mkspiffs.exe
-tools.mkspiffs.path={runtime.tools.mkspiffs.path}
-
-tools.mklittlefs.cmd=mklittlefs
-tools.mklittlefs.cmd.windows=mklittlefs.exe
-tools.mklittlefs.path={runtime.platform.path}/tools/mklittlefs
diff --git a/arduino/version pre-2.6.0/boards.txt b/arduino/version 2.6.1/boards.txt
similarity index 89%
rename from arduino/version pre-2.6.0/boards.txt
rename to arduino/version 2.6.1/boards.txt
index 401ff23ea..e0eab55a7 100644
--- a/arduino/version pre-2.6.0/boards.txt
+++ b/arduino/version 2.6.1/boards.txt
@@ -5,23 +5,23 @@
#
menu.BoardModel=Model
-menu.baud=Upload Speed
+menu.ESPModule=Module
menu.UploadTool=Upload Using
+menu.led=Builtin Led
+menu.baud=Upload Speed
menu.xtal=CPU Frequency
menu.CrystalFreq=Crystal Frequency
menu.eesz=Flash Size
menu.FlashMode=Flash Mode
menu.FlashFreq=Flash Frequency
menu.ResetMethod=Reset Method
-menu.ESPModule=Module
menu.dbg=Debug port
menu.lvl=Debug Level
menu.ip=lwIP Variant
menu.vt=VTables
menu.exception=Exceptions
-menu.led=Builtin Led
menu.wipe=Erase Flash
menu.sdk=Espressif FW
menu.ssl=SSL Support
@@ -32,7 +32,7 @@ generic.build.board=ESP8266_GENERIC
generic.upload.tool=esptool
generic.upload.maximum_data_size=81920
generic.upload.wait_for_upload_port=true
-generic.upload.erase_cmd=version
+generic.upload.erase_cmd=
generic.serial.disableDTR=true
generic.serial.disableRTS=true
generic.build.mcu=esp8266
@@ -71,14 +71,12 @@ generic.menu.ssl.all=All SSL ciphers (most compatible)
generic.menu.ssl.all.build.sslflags=
generic.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
generic.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-generic.menu.ResetMethod.ck=ck
-generic.menu.ResetMethod.ck.upload.resetmethod=ck
-generic.menu.ResetMethod.nodemcu=nodemcu
-generic.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
-generic.menu.ResetMethod.none=none
-generic.menu.ResetMethod.none.upload.resetmethod=none
-generic.menu.ResetMethod.dtrset=dtrset
-generic.menu.ResetMethod.dtrset.upload.resetmethod=dtrset
+generic.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
+generic.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
+generic.menu.ResetMethod.ck=no dtr (aka ck)
+generic.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
+generic.menu.ResetMethod.nodtr_nosync=no dtr, no_sync
+generic.menu.ResetMethod.nodtr_nosync.upload.resetmethod=--before no_reset_no_sync --after soft_reset
generic.menu.CrystalFreq.26=26 MHz
generic.menu.CrystalFreq.40=40 MHz
generic.menu.CrystalFreq.40.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
@@ -384,11 +382,15 @@ generic.menu.led.15=15
generic.menu.led.15.build.led=-DLED_BUILTIN=15
generic.menu.led.16=16
generic.menu.led.16.build.led=-DLED_BUILTIN=16
-generic.menu.sdk.nonosdk222_100=nonos-sdk 2.2.1+100 (testing)
-generic.menu.sdk.nonosdk222_100.build.sdk=NONOSDK22y
+generic.menu.sdk.nonosdk_191024=nonos-sdk 2.2.1+111 (191024)
+generic.menu.sdk.nonosdk_191024.build.sdk=NONOSDK22x_191024
+generic.menu.sdk.nonosdk_191105=nonos-sdk 2.2.1+113 (191105)
+generic.menu.sdk.nonosdk_191105.build.sdk=NONOSDK22x_191105
+generic.menu.sdk.nonosdk_190703=nonos-sdk 2.2.1+100 (190703)
+generic.menu.sdk.nonosdk_190703.build.sdk=NONOSDK22x_190703
generic.menu.sdk.nonosdk221=nonos-sdk 2.2.1 (legacy)
generic.menu.sdk.nonosdk221.build.sdk=NONOSDK221
-generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (known issues)
+generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (180626 known issues)
generic.menu.sdk.nonosdk3v0.build.sdk=NONOSDK3V0
generic.menu.ip.lm2f=v2 Lower Memory
generic.menu.ip.lm2f.build.lwip_include=lwip2/include
@@ -480,7 +482,7 @@ generic.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOO
generic.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
generic.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
generic.menu.wipe.none=Only Sketch
-generic.menu.wipe.none.upload.erase_cmd=version
+generic.menu.wipe.none.upload.erase_cmd=
generic.menu.wipe.sdk=Sketch + WiFi Settings
generic.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
generic.menu.wipe.all=All Flash Contents
@@ -511,7 +513,7 @@ esp8285.build.variant=esp8285
esp8285.upload.tool=esptool
esp8285.upload.maximum_data_size=81920
esp8285.upload.wait_for_upload_port=true
-esp8285.upload.erase_cmd=version
+esp8285.upload.erase_cmd=
esp8285.serial.disableDTR=true
esp8285.serial.disableRTS=true
esp8285.build.mcu=esp8266
@@ -542,14 +544,12 @@ esp8285.menu.ssl.all=All SSL ciphers (most compatible)
esp8285.menu.ssl.all.build.sslflags=
esp8285.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
esp8285.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-esp8285.menu.ResetMethod.ck=ck
-esp8285.menu.ResetMethod.ck.upload.resetmethod=ck
-esp8285.menu.ResetMethod.nodemcu=nodemcu
-esp8285.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
-esp8285.menu.ResetMethod.none=none
-esp8285.menu.ResetMethod.none.upload.resetmethod=none
-esp8285.menu.ResetMethod.dtrset=dtrset
-esp8285.menu.ResetMethod.dtrset.upload.resetmethod=dtrset
+esp8285.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
+esp8285.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
+esp8285.menu.ResetMethod.ck=no dtr (aka ck)
+esp8285.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
+esp8285.menu.ResetMethod.nodtr_nosync=no dtr, no_sync
+esp8285.menu.ResetMethod.nodtr_nosync.upload.resetmethod=--before no_reset_no_sync --after soft_reset
esp8285.menu.CrystalFreq.26=26 MHz
esp8285.menu.CrystalFreq.40=40 MHz
esp8285.menu.CrystalFreq.40.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
@@ -757,7 +757,7 @@ esp8285.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOO
esp8285.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
esp8285.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
esp8285.menu.wipe.none=Only Sketch
-esp8285.menu.wipe.none.upload.erase_cmd=version
+esp8285.menu.wipe.none.upload.erase_cmd=
esp8285.menu.wipe.sdk=Sketch + WiFi Settings
esp8285.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
esp8285.menu.wipe.all=All Flash Contents
@@ -786,9 +786,9 @@ espduino.name=ESPDuino (ESP-13 Module)
espduino.build.board=ESP8266_ESP13
espduino.build.variant=ESPDuino
espduino.menu.ResetMethod.v1=ESPduino-V1
-espduino.menu.ResetMethod.v1.upload.resetmethod=ck
+espduino.menu.ResetMethod.v1.upload.resetmethod=--before no_reset --after soft_reset
espduino.menu.ResetMethod.v2=ESPduino-V2
-espduino.menu.ResetMethod.v2.upload.resetmethod=nodemcu
+espduino.menu.ResetMethod.v2.upload.resetmethod=--before default_reset --after hard_reset
espduino.menu.UploadTool.espota=OTA
espduino.menu.UploadTool.espota.upload.tool=espota
espduino.menu.UploadTool.esptool=Serial
@@ -797,7 +797,7 @@ espduino.menu.UploadTool.esptool.upload.verbose=--trace
espduino.upload.tool=esptool
espduino.upload.maximum_data_size=81920
espduino.upload.wait_for_upload_port=true
-espduino.upload.erase_cmd=version
+espduino.upload.erase_cmd=
espduino.serial.disableDTR=true
espduino.serial.disableRTS=true
espduino.build.mcu=esp8266
@@ -958,7 +958,7 @@ espduino.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAO
espduino.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
espduino.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
espduino.menu.wipe.none=Only Sketch
-espduino.menu.wipe.none.upload.erase_cmd=version
+espduino.menu.wipe.none.upload.erase_cmd=
espduino.menu.wipe.sdk=Sketch + WiFi Settings
espduino.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
espduino.menu.wipe.all=All Flash Contents
@@ -989,7 +989,7 @@ huzzah.build.variant=adafruit
huzzah.upload.tool=esptool
huzzah.upload.maximum_data_size=81920
huzzah.upload.wait_for_upload_port=true
-huzzah.upload.erase_cmd=version
+huzzah.upload.erase_cmd=
huzzah.serial.disableDTR=true
huzzah.serial.disableRTS=true
huzzah.build.mcu=esp8266
@@ -1020,7 +1020,7 @@ huzzah.menu.ssl.all=All SSL ciphers (most compatible)
huzzah.menu.ssl.all.build.sslflags=
huzzah.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
huzzah.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-huzzah.upload.resetmethod=nodemcu
+huzzah.upload.resetmethod=--before default_reset --after hard_reset
huzzah.build.flash_mode=qio
huzzah.build.flash_flags=-DFLASHMODE_QIO
huzzah.build.flash_freq=40
@@ -1151,7 +1151,7 @@ huzzah.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM
huzzah.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
huzzah.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
huzzah.menu.wipe.none=Only Sketch
-huzzah.menu.wipe.none.upload.erase_cmd=version
+huzzah.menu.wipe.none.upload.erase_cmd=
huzzah.menu.wipe.sdk=Sketch + WiFi Settings
huzzah.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
huzzah.menu.wipe.all=All Flash Contents
@@ -1182,7 +1182,7 @@ inventone.build.variant=inventone
inventone.upload.tool=esptool
inventone.upload.maximum_data_size=81920
inventone.upload.wait_for_upload_port=true
-inventone.upload.erase_cmd=version
+inventone.upload.erase_cmd=
inventone.serial.disableDTR=true
inventone.serial.disableRTS=true
inventone.build.mcu=esp8266
@@ -1213,7 +1213,7 @@ inventone.menu.ssl.all=All SSL ciphers (most compatible)
inventone.menu.ssl.all.build.sslflags=
inventone.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
inventone.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-inventone.upload.resetmethod=nodemcu
+inventone.upload.resetmethod=--before default_reset --after hard_reset
inventone.build.flash_mode=dio
inventone.build.flash_flags=-DFLASHMODE_DIO
inventone.build.flash_freq=40
@@ -1344,7 +1344,7 @@ inventone.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTA
inventone.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
inventone.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
inventone.menu.wipe.none=Only Sketch
-inventone.menu.wipe.none.upload.erase_cmd=version
+inventone.menu.wipe.none.upload.erase_cmd=
inventone.menu.wipe.sdk=Sketch + WiFi Settings
inventone.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
inventone.menu.wipe.all=All Flash Contents
@@ -1375,7 +1375,7 @@ cw01.build.variant=xinabox
cw01.upload.tool=esptool
cw01.upload.maximum_data_size=81920
cw01.upload.wait_for_upload_port=true
-cw01.upload.erase_cmd=version
+cw01.upload.erase_cmd=
cw01.serial.disableDTR=true
cw01.serial.disableRTS=true
cw01.build.mcu=esp8266
@@ -1406,7 +1406,7 @@ cw01.menu.ssl.all=All SSL ciphers (most compatible)
cw01.menu.ssl.all.build.sslflags=
cw01.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
cw01.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-cw01.upload.resetmethod=nodemcu
+cw01.upload.resetmethod=--before default_reset --after hard_reset
cw01.menu.CrystalFreq.26=26 MHz
cw01.menu.CrystalFreq.40=40 MHz
cw01.menu.CrystalFreq.40.build.extra_flags=-DF_CRYSTAL=40000000 -DESP8266
@@ -1540,7 +1540,7 @@ cw01.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMD
cw01.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
cw01.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
cw01.menu.wipe.none=Only Sketch
-cw01.menu.wipe.none.upload.erase_cmd=version
+cw01.menu.wipe.none.upload.erase_cmd=
cw01.menu.wipe.sdk=Sketch + WiFi Settings
cw01.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
cw01.menu.wipe.all=All Flash Contents
@@ -1571,7 +1571,7 @@ espresso_lite_v1.build.variant=espresso_lite_v1
espresso_lite_v1.upload.tool=esptool
espresso_lite_v1.upload.maximum_data_size=81920
espresso_lite_v1.upload.wait_for_upload_port=true
-espresso_lite_v1.upload.erase_cmd=version
+espresso_lite_v1.upload.erase_cmd=
espresso_lite_v1.serial.disableDTR=true
espresso_lite_v1.serial.disableRTS=true
espresso_lite_v1.build.mcu=esp8266
@@ -1642,10 +1642,10 @@ espresso_lite_v1.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
espresso_lite_v1.menu.eesz.4M.build.spiffs_pagesize=256
espresso_lite_v1.menu.eesz.4M.upload.maximum_size=1044464
espresso_lite_v1.menu.eesz.4M.build.rfcal_addr=0x3FC000
-espresso_lite_v1.menu.ResetMethod.ck=ck
-espresso_lite_v1.menu.ResetMethod.ck.upload.resetmethod=ck
-espresso_lite_v1.menu.ResetMethod.nodemcu=nodemcu
-espresso_lite_v1.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
+espresso_lite_v1.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
+espresso_lite_v1.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
+espresso_lite_v1.menu.ResetMethod.ck=no dtr (aka ck)
+espresso_lite_v1.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
espresso_lite_v1.menu.ip.lm2f=v2 Lower Memory
espresso_lite_v1.menu.ip.lm2f.build.lwip_include=lwip2/include
espresso_lite_v1.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
@@ -1736,7 +1736,7 @@ espresso_lite_v1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPD
espresso_lite_v1.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
espresso_lite_v1.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
espresso_lite_v1.menu.wipe.none=Only Sketch
-espresso_lite_v1.menu.wipe.none.upload.erase_cmd=version
+espresso_lite_v1.menu.wipe.none.upload.erase_cmd=
espresso_lite_v1.menu.wipe.sdk=Sketch + WiFi Settings
espresso_lite_v1.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
espresso_lite_v1.menu.wipe.all=All Flash Contents
@@ -1767,7 +1767,7 @@ espresso_lite_v2.build.variant=espresso_lite_v2
espresso_lite_v2.upload.tool=esptool
espresso_lite_v2.upload.maximum_data_size=81920
espresso_lite_v2.upload.wait_for_upload_port=true
-espresso_lite_v2.upload.erase_cmd=version
+espresso_lite_v2.upload.erase_cmd=
espresso_lite_v2.serial.disableDTR=true
espresso_lite_v2.serial.disableRTS=true
espresso_lite_v2.build.mcu=esp8266
@@ -1838,10 +1838,10 @@ espresso_lite_v2.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
espresso_lite_v2.menu.eesz.4M.build.spiffs_pagesize=256
espresso_lite_v2.menu.eesz.4M.upload.maximum_size=1044464
espresso_lite_v2.menu.eesz.4M.build.rfcal_addr=0x3FC000
-espresso_lite_v2.menu.ResetMethod.ck=ck
-espresso_lite_v2.menu.ResetMethod.ck.upload.resetmethod=ck
-espresso_lite_v2.menu.ResetMethod.nodemcu=nodemcu
-espresso_lite_v2.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
+espresso_lite_v2.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
+espresso_lite_v2.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
+espresso_lite_v2.menu.ResetMethod.ck=no dtr (aka ck)
+espresso_lite_v2.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
espresso_lite_v2.menu.ip.lm2f=v2 Lower Memory
espresso_lite_v2.menu.ip.lm2f.build.lwip_include=lwip2/include
espresso_lite_v2.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
@@ -1932,7 +1932,7 @@ espresso_lite_v2.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPD
espresso_lite_v2.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
espresso_lite_v2.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
espresso_lite_v2.menu.wipe.none=Only Sketch
-espresso_lite_v2.menu.wipe.none.upload.erase_cmd=version
+espresso_lite_v2.menu.wipe.none.upload.erase_cmd=
espresso_lite_v2.menu.wipe.sdk=Sketch + WiFi Settings
espresso_lite_v2.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
espresso_lite_v2.menu.wipe.all=All Flash Contents
@@ -1963,7 +1963,7 @@ phoenix_v1.build.variant=phoenix_v1
phoenix_v1.upload.tool=esptool
phoenix_v1.upload.maximum_data_size=81920
phoenix_v1.upload.wait_for_upload_port=true
-phoenix_v1.upload.erase_cmd=version
+phoenix_v1.upload.erase_cmd=
phoenix_v1.serial.disableDTR=true
phoenix_v1.serial.disableRTS=true
phoenix_v1.build.mcu=esp8266
@@ -2034,10 +2034,10 @@ phoenix_v1.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
phoenix_v1.menu.eesz.4M.build.spiffs_pagesize=256
phoenix_v1.menu.eesz.4M.upload.maximum_size=1044464
phoenix_v1.menu.eesz.4M.build.rfcal_addr=0x3FC000
-phoenix_v1.menu.ResetMethod.ck=ck
-phoenix_v1.menu.ResetMethod.ck.upload.resetmethod=ck
-phoenix_v1.menu.ResetMethod.nodemcu=nodemcu
-phoenix_v1.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
+phoenix_v1.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
+phoenix_v1.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
+phoenix_v1.menu.ResetMethod.ck=no dtr (aka ck)
+phoenix_v1.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
phoenix_v1.menu.ip.lm2f=v2 Lower Memory
phoenix_v1.menu.ip.lm2f.build.lwip_include=lwip2/include
phoenix_v1.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
@@ -2128,7 +2128,7 @@ phoenix_v1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROT
phoenix_v1.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
phoenix_v1.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
phoenix_v1.menu.wipe.none=Only Sketch
-phoenix_v1.menu.wipe.none.upload.erase_cmd=version
+phoenix_v1.menu.wipe.none.upload.erase_cmd=
phoenix_v1.menu.wipe.sdk=Sketch + WiFi Settings
phoenix_v1.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
phoenix_v1.menu.wipe.all=All Flash Contents
@@ -2159,7 +2159,7 @@ phoenix_v2.build.variant=phoenix_v2
phoenix_v2.upload.tool=esptool
phoenix_v2.upload.maximum_data_size=81920
phoenix_v2.upload.wait_for_upload_port=true
-phoenix_v2.upload.erase_cmd=version
+phoenix_v2.upload.erase_cmd=
phoenix_v2.serial.disableDTR=true
phoenix_v2.serial.disableRTS=true
phoenix_v2.build.mcu=esp8266
@@ -2230,10 +2230,10 @@ phoenix_v2.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
phoenix_v2.menu.eesz.4M.build.spiffs_pagesize=256
phoenix_v2.menu.eesz.4M.upload.maximum_size=1044464
phoenix_v2.menu.eesz.4M.build.rfcal_addr=0x3FC000
-phoenix_v2.menu.ResetMethod.ck=ck
-phoenix_v2.menu.ResetMethod.ck.upload.resetmethod=ck
-phoenix_v2.menu.ResetMethod.nodemcu=nodemcu
-phoenix_v2.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
+phoenix_v2.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
+phoenix_v2.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
+phoenix_v2.menu.ResetMethod.ck=no dtr (aka ck)
+phoenix_v2.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
phoenix_v2.menu.ip.lm2f=v2 Lower Memory
phoenix_v2.menu.ip.lm2f.build.lwip_include=lwip2/include
phoenix_v2.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
@@ -2324,7 +2324,7 @@ phoenix_v2.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROT
phoenix_v2.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
phoenix_v2.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
phoenix_v2.menu.wipe.none=Only Sketch
-phoenix_v2.menu.wipe.none.upload.erase_cmd=version
+phoenix_v2.menu.wipe.none.upload.erase_cmd=
phoenix_v2.menu.wipe.sdk=Sketch + WiFi Settings
phoenix_v2.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
phoenix_v2.menu.wipe.all=All Flash Contents
@@ -2355,7 +2355,7 @@ nodemcu.build.variant=nodemcu
nodemcu.upload.tool=esptool
nodemcu.upload.maximum_data_size=81920
nodemcu.upload.wait_for_upload_port=true
-nodemcu.upload.erase_cmd=version
+nodemcu.upload.erase_cmd=
nodemcu.serial.disableDTR=true
nodemcu.serial.disableRTS=true
nodemcu.build.mcu=esp8266
@@ -2386,7 +2386,7 @@ nodemcu.menu.ssl.all=All SSL ciphers (most compatible)
nodemcu.menu.ssl.all.build.sslflags=
nodemcu.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
nodemcu.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-nodemcu.upload.resetmethod=nodemcu
+nodemcu.upload.resetmethod=--before default_reset --after hard_reset
nodemcu.build.flash_mode=qio
nodemcu.build.flash_flags=-DFLASHMODE_QIO
nodemcu.build.flash_freq=40
@@ -2517,7 +2517,7 @@ nodemcu.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOO
nodemcu.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
nodemcu.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
nodemcu.menu.wipe.none=Only Sketch
-nodemcu.menu.wipe.none.upload.erase_cmd=version
+nodemcu.menu.wipe.none.upload.erase_cmd=
nodemcu.menu.wipe.sdk=Sketch + WiFi Settings
nodemcu.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
nodemcu.menu.wipe.all=All Flash Contents
@@ -2548,7 +2548,7 @@ nodemcuv2.build.variant=nodemcu
nodemcuv2.upload.tool=esptool
nodemcuv2.upload.maximum_data_size=81920
nodemcuv2.upload.wait_for_upload_port=true
-nodemcuv2.upload.erase_cmd=version
+nodemcuv2.upload.erase_cmd=
nodemcuv2.serial.disableDTR=true
nodemcuv2.serial.disableRTS=true
nodemcuv2.build.mcu=esp8266
@@ -2579,7 +2579,7 @@ nodemcuv2.menu.ssl.all=All SSL ciphers (most compatible)
nodemcuv2.menu.ssl.all.build.sslflags=
nodemcuv2.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
nodemcuv2.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-nodemcuv2.upload.resetmethod=nodemcu
+nodemcuv2.upload.resetmethod=--before default_reset --after hard_reset
nodemcuv2.build.flash_mode=dio
nodemcuv2.build.flash_flags=-DFLASHMODE_DIO
nodemcuv2.build.flash_freq=40
@@ -2620,6 +2620,10 @@ nodemcuv2.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
nodemcuv2.menu.eesz.4M.build.spiffs_pagesize=256
nodemcuv2.menu.eesz.4M.upload.maximum_size=1044464
nodemcuv2.menu.eesz.4M.build.rfcal_addr=0x3FC000
+nodemcuv2.menu.led.2=2
+nodemcuv2.menu.led.2.build.led=-DLED_BUILTIN=2
+nodemcuv2.menu.led.16=16
+nodemcuv2.menu.led.16.build.led=-DLED_BUILTIN=16
nodemcuv2.menu.ip.lm2f=v2 Lower Memory
nodemcuv2.menu.ip.lm2f.build.lwip_include=lwip2/include
nodemcuv2.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
@@ -2710,7 +2714,7 @@ nodemcuv2.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTA
nodemcuv2.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
nodemcuv2.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
nodemcuv2.menu.wipe.none=Only Sketch
-nodemcuv2.menu.wipe.none.upload.erase_cmd=version
+nodemcuv2.menu.wipe.none.upload.erase_cmd=
nodemcuv2.menu.wipe.sdk=Sketch + WiFi Settings
nodemcuv2.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
nodemcuv2.menu.wipe.all=All Flash Contents
@@ -2741,7 +2745,7 @@ modwifi.build.variant=modwifi
modwifi.upload.tool=esptool
modwifi.upload.maximum_data_size=81920
modwifi.upload.wait_for_upload_port=true
-modwifi.upload.erase_cmd=version
+modwifi.upload.erase_cmd=
modwifi.serial.disableDTR=true
modwifi.serial.disableRTS=true
modwifi.build.mcu=esp8266
@@ -2772,7 +2776,7 @@ modwifi.menu.ssl.all=All SSL ciphers (most compatible)
modwifi.menu.ssl.all.build.sslflags=
modwifi.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
modwifi.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-modwifi.upload.resetmethod=ck
+modwifi.upload.resetmethod=--before no_reset --after soft_reset
modwifi.build.flash_mode=qio
modwifi.build.flash_flags=-DFLASHMODE_QIO
modwifi.build.flash_freq=40
@@ -2923,7 +2927,7 @@ modwifi.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOO
modwifi.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
modwifi.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
modwifi.menu.wipe.none=Only Sketch
-modwifi.menu.wipe.none.upload.erase_cmd=version
+modwifi.menu.wipe.none.upload.erase_cmd=
modwifi.menu.wipe.sdk=Sketch + WiFi Settings
modwifi.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
modwifi.menu.wipe.all=All Flash Contents
@@ -2954,7 +2958,7 @@ thing.build.variant=thing
thing.upload.tool=esptool
thing.upload.maximum_data_size=81920
thing.upload.wait_for_upload_port=true
-thing.upload.erase_cmd=version
+thing.upload.erase_cmd=
thing.serial.disableDTR=true
thing.serial.disableRTS=true
thing.build.mcu=esp8266
@@ -2985,7 +2989,7 @@ thing.menu.ssl.all=All SSL ciphers (most compatible)
thing.menu.ssl.all.build.sslflags=
thing.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
thing.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-thing.upload.resetmethod=ck
+thing.upload.resetmethod=--before no_reset --after soft_reset
thing.build.flash_mode=qio
thing.build.flash_flags=-DFLASHMODE_QIO
thing.build.flash_freq=40
@@ -3116,7 +3120,7 @@ thing.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMM
thing.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
thing.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
thing.menu.wipe.none=Only Sketch
-thing.menu.wipe.none.upload.erase_cmd=version
+thing.menu.wipe.none.upload.erase_cmd=
thing.menu.wipe.sdk=Sketch + WiFi Settings
thing.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
thing.menu.wipe.all=All Flash Contents
@@ -3147,7 +3151,7 @@ thingdev.build.variant=thing
thingdev.upload.tool=esptool
thingdev.upload.maximum_data_size=81920
thingdev.upload.wait_for_upload_port=true
-thingdev.upload.erase_cmd=version
+thingdev.upload.erase_cmd=
thingdev.serial.disableDTR=true
thingdev.serial.disableRTS=true
thingdev.build.mcu=esp8266
@@ -3178,7 +3182,7 @@ thingdev.menu.ssl.all=All SSL ciphers (most compatible)
thingdev.menu.ssl.all.build.sslflags=
thingdev.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
thingdev.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-thingdev.upload.resetmethod=nodemcu
+thingdev.upload.resetmethod=--before default_reset --after hard_reset
thingdev.build.flash_mode=dio
thingdev.build.flash_flags=-DFLASHMODE_DIO
thingdev.build.flash_freq=40
@@ -3309,7 +3313,7 @@ thingdev.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAO
thingdev.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
thingdev.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
thingdev.menu.wipe.none=Only Sketch
-thingdev.menu.wipe.none.upload.erase_cmd=version
+thingdev.menu.wipe.none.upload.erase_cmd=
thingdev.menu.wipe.sdk=Sketch + WiFi Settings
thingdev.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
thingdev.menu.wipe.all=All Flash Contents
@@ -3333,13 +3337,206 @@ thingdev.menu.baud.921600.upload.speed=921600
thingdev.menu.baud.3000000=3000000
thingdev.menu.baud.3000000.upload.speed=3000000
+##############################################################
+blynk.name=SparkFun Blynk Board
+blynk.build.board=ESP8266_THING
+blynk.build.variant=thing
+blynk.upload.tool=esptool
+blynk.upload.maximum_data_size=81920
+blynk.upload.wait_for_upload_port=true
+blynk.upload.erase_cmd=
+blynk.serial.disableDTR=true
+blynk.serial.disableRTS=true
+blynk.build.mcu=esp8266
+blynk.build.core=esp8266
+blynk.build.spiffs_pagesize=256
+blynk.build.debug_port=
+blynk.build.debug_level=
+blynk.menu.xtal.80=80 MHz
+blynk.menu.xtal.80.build.f_cpu=80000000L
+blynk.menu.xtal.160=160 MHz
+blynk.menu.xtal.160.build.f_cpu=160000000L
+blynk.menu.vt.flash=Flash
+blynk.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+blynk.menu.vt.heap=Heap
+blynk.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+blynk.menu.vt.iram=IRAM
+blynk.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+blynk.menu.exception.legacy=Legacy (new can return nullptr)
+blynk.menu.exception.legacy.build.exception_flags=-fno-exceptions
+blynk.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+blynk.menu.exception.disabled=Disabled (new can abort)
+blynk.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+blynk.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+blynk.menu.exception.enabled=Enabled
+blynk.menu.exception.enabled.build.exception_flags=-fexceptions
+blynk.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+blynk.menu.ssl.all=All SSL ciphers (most compatible)
+blynk.menu.ssl.all.build.sslflags=
+blynk.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+blynk.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+blynk.upload.resetmethod=--before default_reset --after hard_reset
+blynk.build.flash_mode=qio
+blynk.build.flash_flags=-DFLASHMODE_QIO
+blynk.build.flash_freq=40
+blynk.menu.eesz.4M2M=4MB (FS:2MB OTA:~1019KB)
+blynk.menu.eesz.4M2M.build.flash_size=4M
+blynk.menu.eesz.4M2M.build.flash_size_bytes=0x400000
+blynk.menu.eesz.4M2M.build.flash_ld=eagle.flash.4m2m.ld
+blynk.menu.eesz.4M2M.build.spiffs_pagesize=256
+blynk.menu.eesz.4M2M.upload.maximum_size=1044464
+blynk.menu.eesz.4M2M.build.rfcal_addr=0x3FC000
+blynk.menu.eesz.4M2M.build.spiffs_start=0x200000
+blynk.menu.eesz.4M2M.build.spiffs_end=0x3FA000
+blynk.menu.eesz.4M2M.build.spiffs_blocksize=8192
+blynk.menu.eesz.4M3M=4MB (FS:3MB OTA:~512KB)
+blynk.menu.eesz.4M3M.build.flash_size=4M
+blynk.menu.eesz.4M3M.build.flash_size_bytes=0x400000
+blynk.menu.eesz.4M3M.build.flash_ld=eagle.flash.4m3m.ld
+blynk.menu.eesz.4M3M.build.spiffs_pagesize=256
+blynk.menu.eesz.4M3M.upload.maximum_size=1044464
+blynk.menu.eesz.4M3M.build.rfcal_addr=0x3FC000
+blynk.menu.eesz.4M3M.build.spiffs_start=0x100000
+blynk.menu.eesz.4M3M.build.spiffs_end=0x3FA000
+blynk.menu.eesz.4M3M.build.spiffs_blocksize=8192
+blynk.menu.eesz.4M1M=4MB (FS:1MB OTA:~1019KB)
+blynk.menu.eesz.4M1M.build.flash_size=4M
+blynk.menu.eesz.4M1M.build.flash_size_bytes=0x400000
+blynk.menu.eesz.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+blynk.menu.eesz.4M1M.build.spiffs_pagesize=256
+blynk.menu.eesz.4M1M.upload.maximum_size=1044464
+blynk.menu.eesz.4M1M.build.rfcal_addr=0x3FC000
+blynk.menu.eesz.4M1M.build.spiffs_start=0x300000
+blynk.menu.eesz.4M1M.build.spiffs_end=0x3FA000
+blynk.menu.eesz.4M1M.build.spiffs_blocksize=8192
+blynk.menu.eesz.4M=4MB (FS:none OTA:~1019KB)
+blynk.menu.eesz.4M.build.flash_size=4M
+blynk.menu.eesz.4M.build.flash_size_bytes=0x400000
+blynk.menu.eesz.4M.build.flash_ld=eagle.flash.4m.ld
+blynk.menu.eesz.4M.build.spiffs_pagesize=256
+blynk.menu.eesz.4M.upload.maximum_size=1044464
+blynk.menu.eesz.4M.build.rfcal_addr=0x3FC000
+blynk.menu.ip.lm2f=v2 Lower Memory
+blynk.menu.ip.lm2f.build.lwip_include=lwip2/include
+blynk.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+blynk.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+blynk.menu.ip.hb2f=v2 Higher Bandwidth
+blynk.menu.ip.hb2f.build.lwip_include=lwip2/include
+blynk.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+blynk.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+blynk.menu.ip.lm2n=v2 Lower Memory (no features)
+blynk.menu.ip.lm2n.build.lwip_include=lwip2/include
+blynk.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+blynk.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+blynk.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+blynk.menu.ip.hb2n.build.lwip_include=lwip2/include
+blynk.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+blynk.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+blynk.menu.ip.lm6f=v2 IPv6 Lower Memory
+blynk.menu.ip.lm6f.build.lwip_include=lwip2/include
+blynk.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+blynk.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+blynk.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+blynk.menu.ip.hb6f.build.lwip_include=lwip2/include
+blynk.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+blynk.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+blynk.menu.ip.hb1=v1.4 Higher Bandwidth
+blynk.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+blynk.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+blynk.menu.ip.src=v1.4 Compile from source
+blynk.menu.ip.src.build.lwip_lib=-llwip_src
+blynk.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+blynk.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+blynk.menu.dbg.Disabled=Disabled
+blynk.menu.dbg.Disabled.build.debug_port=
+blynk.menu.dbg.Serial=Serial
+blynk.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+blynk.menu.dbg.Serial1=Serial1
+blynk.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+blynk.menu.lvl.None____=None
+blynk.menu.lvl.None____.build.debug_level=
+blynk.menu.lvl.SSL=SSL
+blynk.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+blynk.menu.lvl.TLS_MEM=TLS_MEM
+blynk.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+blynk.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+blynk.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+blynk.menu.lvl.HTTP_SERVER=HTTP_SERVER
+blynk.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+blynk.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+blynk.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+blynk.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+blynk.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+blynk.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+blynk.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+blynk.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+blynk.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+blynk.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+blynk.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+blynk.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+blynk.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+blynk.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+blynk.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+blynk.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+blynk.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+blynk.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+blynk.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+blynk.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+blynk.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+blynk.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+blynk.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+blynk.menu.lvl.CORE=CORE
+blynk.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+blynk.menu.lvl.WIFI=WIFI
+blynk.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+blynk.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+blynk.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+blynk.menu.lvl.UPDATER=UPDATER
+blynk.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+blynk.menu.lvl.OTA=OTA
+blynk.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+blynk.menu.lvl.OOM=OOM
+blynk.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+blynk.menu.lvl.MDNS=MDNS
+blynk.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+blynk.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+blynk.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+blynk.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+blynk.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+blynk.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+blynk.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+blynk.menu.wipe.none=Only Sketch
+blynk.menu.wipe.none.upload.erase_cmd=
+blynk.menu.wipe.sdk=Sketch + WiFi Settings
+blynk.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+blynk.menu.wipe.all=All Flash Contents
+blynk.menu.wipe.all.upload.erase_cmd=erase_flash
+blynk.menu.baud.115200=115200
+blynk.menu.baud.115200.upload.speed=115200
+blynk.menu.baud.57600=57600
+blynk.menu.baud.57600.upload.speed=57600
+blynk.menu.baud.230400.linux=230400
+blynk.menu.baud.230400.macosx=230400
+blynk.menu.baud.230400.upload.speed=230400
+blynk.menu.baud.256000.windows=256000
+blynk.menu.baud.256000.upload.speed=256000
+blynk.menu.baud.460800.linux=460800
+blynk.menu.baud.460800.macosx=460800
+blynk.menu.baud.460800.upload.speed=460800
+blynk.menu.baud.512000.windows=512000
+blynk.menu.baud.512000.upload.speed=512000
+blynk.menu.baud.921600=921600
+blynk.menu.baud.921600.upload.speed=921600
+blynk.menu.baud.3000000=3000000
+blynk.menu.baud.3000000.upload.speed=3000000
+
##############################################################
esp210.name=SweetPea ESP-210
esp210.build.board=ESP8266_ESP210
esp210.upload.tool=esptool
esp210.upload.maximum_data_size=81920
esp210.upload.wait_for_upload_port=true
-esp210.upload.erase_cmd=version
+esp210.upload.erase_cmd=
esp210.serial.disableDTR=true
esp210.serial.disableRTS=true
esp210.build.mcu=esp8266
@@ -3371,7 +3568,7 @@ esp210.menu.ssl.all=All SSL ciphers (most compatible)
esp210.menu.ssl.all.build.sslflags=
esp210.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
esp210.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-esp210.upload.resetmethod=ck
+esp210.upload.resetmethod=--before no_reset --after soft_reset
esp210.build.flash_mode=qio
esp210.build.flash_flags=-DFLASHMODE_QIO
esp210.build.flash_freq=40
@@ -3502,7 +3699,7 @@ esp210.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM
esp210.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
esp210.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
esp210.menu.wipe.none=Only Sketch
-esp210.menu.wipe.none.upload.erase_cmd=version
+esp210.menu.wipe.none.upload.erase_cmd=
esp210.menu.wipe.sdk=Sketch + WiFi Settings
esp210.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
esp210.menu.wipe.all=All Flash Contents
@@ -3533,7 +3730,7 @@ d1_mini.build.variant=d1_mini
d1_mini.upload.tool=esptool
d1_mini.upload.maximum_data_size=81920
d1_mini.upload.wait_for_upload_port=true
-d1_mini.upload.erase_cmd=version
+d1_mini.upload.erase_cmd=
d1_mini.serial.disableDTR=true
d1_mini.serial.disableRTS=true
d1_mini.build.mcu=esp8266
@@ -3564,7 +3761,7 @@ d1_mini.menu.ssl.all=All SSL ciphers (most compatible)
d1_mini.menu.ssl.all.build.sslflags=
d1_mini.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
d1_mini.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-d1_mini.upload.resetmethod=nodemcu
+d1_mini.upload.resetmethod=--before default_reset --after hard_reset
d1_mini.build.flash_mode=dio
d1_mini.build.flash_flags=-DFLASHMODE_DIO
d1_mini.build.flash_freq=40
@@ -3695,7 +3892,7 @@ d1_mini.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOO
d1_mini.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
d1_mini.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
d1_mini.menu.wipe.none=Only Sketch
-d1_mini.menu.wipe.none.upload.erase_cmd=version
+d1_mini.menu.wipe.none.upload.erase_cmd=
d1_mini.menu.wipe.sdk=Sketch + WiFi Settings
d1_mini.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
d1_mini.menu.wipe.all=All Flash Contents
@@ -3726,7 +3923,7 @@ d1_mini_pro.build.variant=d1_mini
d1_mini_pro.upload.tool=esptool
d1_mini_pro.upload.maximum_data_size=81920
d1_mini_pro.upload.wait_for_upload_port=true
-d1_mini_pro.upload.erase_cmd=version
+d1_mini_pro.upload.erase_cmd=
d1_mini_pro.serial.disableDTR=true
d1_mini_pro.serial.disableRTS=true
d1_mini_pro.build.mcu=esp8266
@@ -3757,7 +3954,7 @@ d1_mini_pro.menu.ssl.all=All SSL ciphers (most compatible)
d1_mini_pro.menu.ssl.all.build.sslflags=
d1_mini_pro.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
d1_mini_pro.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-d1_mini_pro.upload.resetmethod=nodemcu
+d1_mini_pro.upload.resetmethod=--before default_reset --after hard_reset
d1_mini_pro.build.flash_mode=dio
d1_mini_pro.build.flash_flags=-DFLASHMODE_DIO
d1_mini_pro.build.flash_freq=40
@@ -3871,7 +4068,7 @@ d1_mini_pro.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATERO
d1_mini_pro.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
d1_mini_pro.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
d1_mini_pro.menu.wipe.none=Only Sketch
-d1_mini_pro.menu.wipe.none.upload.erase_cmd=version
+d1_mini_pro.menu.wipe.none.upload.erase_cmd=
d1_mini_pro.menu.wipe.sdk=Sketch + WiFi Settings
d1_mini_pro.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
d1_mini_pro.menu.wipe.all=All Flash Contents
@@ -3902,7 +4099,7 @@ d1_mini_lite.build.variant=d1_mini
d1_mini_lite.upload.tool=esptool
d1_mini_lite.upload.maximum_data_size=81920
d1_mini_lite.upload.wait_for_upload_port=true
-d1_mini_lite.upload.erase_cmd=version
+d1_mini_lite.upload.erase_cmd=
d1_mini_lite.serial.disableDTR=true
d1_mini_lite.serial.disableRTS=true
d1_mini_lite.build.mcu=esp8266
@@ -3933,7 +4130,7 @@ d1_mini_lite.menu.ssl.all=All SSL ciphers (most compatible)
d1_mini_lite.menu.ssl.all.build.sslflags=
d1_mini_lite.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
d1_mini_lite.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-d1_mini_lite.upload.resetmethod=nodemcu
+d1_mini_lite.upload.resetmethod=--before default_reset --after hard_reset
d1_mini_lite.build.flash_mode=dout
d1_mini_lite.build.flash_flags=-DFLASHMODE_DOUT
d1_mini_lite.build.flash_freq=40
@@ -4104,7 +4301,7 @@ d1_mini_lite.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATER
d1_mini_lite.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
d1_mini_lite.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
d1_mini_lite.menu.wipe.none=Only Sketch
-d1_mini_lite.menu.wipe.none.upload.erase_cmd=version
+d1_mini_lite.menu.wipe.none.upload.erase_cmd=
d1_mini_lite.menu.wipe.sdk=Sketch + WiFi Settings
d1_mini_lite.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
d1_mini_lite.menu.wipe.all=All Flash Contents
@@ -4135,7 +4332,7 @@ d1.build.variant=d1
d1.upload.tool=esptool
d1.upload.maximum_data_size=81920
d1.upload.wait_for_upload_port=true
-d1.upload.erase_cmd=version
+d1.upload.erase_cmd=
d1.serial.disableDTR=true
d1.serial.disableRTS=true
d1.build.mcu=esp8266
@@ -4166,7 +4363,7 @@ d1.menu.ssl.all=All SSL ciphers (most compatible)
d1.menu.ssl.all.build.sslflags=
d1.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
d1.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-d1.upload.resetmethod=nodemcu
+d1.upload.resetmethod=--before default_reset --after hard_reset
d1.build.flash_mode=dio
d1.build.flash_flags=-DFLASHMODE_DIO
d1.build.flash_freq=40
@@ -4297,7 +4494,7 @@ d1.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS
d1.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
d1.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
d1.menu.wipe.none=Only Sketch
-d1.menu.wipe.none.upload.erase_cmd=version
+d1.menu.wipe.none.upload.erase_cmd=
d1.menu.wipe.sdk=Sketch + WiFi Settings
d1.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
d1.menu.wipe.all=All Flash Contents
@@ -4328,7 +4525,7 @@ espino.build.variant=espino
espino.upload.tool=esptool
espino.upload.maximum_data_size=81920
espino.upload.wait_for_upload_port=true
-espino.upload.erase_cmd=version
+espino.upload.erase_cmd=
espino.serial.disableDTR=true
espino.serial.disableRTS=true
espino.build.mcu=esp8266
@@ -4359,10 +4556,10 @@ espino.menu.ssl.all=All SSL ciphers (most compatible)
espino.menu.ssl.all.build.sslflags=
espino.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
espino.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-espino.menu.ResetMethod.ck=ck
-espino.menu.ResetMethod.ck.upload.resetmethod=ck
-espino.menu.ResetMethod.nodemcu=nodemcu
-espino.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
+espino.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
+espino.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
+espino.menu.ResetMethod.ck=no dtr (aka ck)
+espino.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
espino.build.flash_mode=qio
espino.build.flash_flags=-DFLASHMODE_QIO
espino.build.flash_freq=40
@@ -4493,7 +4690,7 @@ espino.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOM
espino.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
espino.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
espino.menu.wipe.none=Only Sketch
-espino.menu.wipe.none.upload.erase_cmd=version
+espino.menu.wipe.none.upload.erase_cmd=
espino.menu.wipe.sdk=Sketch + WiFi Settings
espino.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
espino.menu.wipe.all=All Flash Contents
@@ -4524,7 +4721,7 @@ espinotee.build.variant=espinotee
espinotee.upload.tool=esptool
espinotee.upload.maximum_data_size=81920
espinotee.upload.wait_for_upload_port=true
-espinotee.upload.erase_cmd=version
+espinotee.upload.erase_cmd=
espinotee.serial.disableDTR=true
espinotee.serial.disableRTS=true
espinotee.build.mcu=esp8266
@@ -4555,7 +4752,7 @@ espinotee.menu.ssl.all=All SSL ciphers (most compatible)
espinotee.menu.ssl.all.build.sslflags=
espinotee.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
espinotee.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-espinotee.upload.resetmethod=nodemcu
+espinotee.upload.resetmethod=--before default_reset --after hard_reset
espinotee.build.flash_mode=qio
espinotee.build.flash_flags=-DFLASHMODE_QIO
espinotee.build.flash_freq=40
@@ -4686,7 +4883,7 @@ espinotee.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTA
espinotee.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
espinotee.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
espinotee.menu.wipe.none=Only Sketch
-espinotee.menu.wipe.none.upload.erase_cmd=version
+espinotee.menu.wipe.none.upload.erase_cmd=
espinotee.menu.wipe.sdk=Sketch + WiFi Settings
espinotee.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
espinotee.menu.wipe.all=All Flash Contents
@@ -4734,7 +4931,7 @@ wifinfo.menu.ESPModule.ESP12.upload.maximum_size=1044464
wifinfo.upload.tool=esptool
wifinfo.upload.maximum_data_size=81920
wifinfo.upload.wait_for_upload_port=true
-wifinfo.upload.erase_cmd=version
+wifinfo.upload.erase_cmd=
wifinfo.serial.disableDTR=true
wifinfo.serial.disableRTS=true
wifinfo.build.mcu=esp8266
@@ -4765,7 +4962,7 @@ wifinfo.menu.ssl.all=All SSL ciphers (most compatible)
wifinfo.menu.ssl.all.build.sslflags=
wifinfo.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
wifinfo.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-wifinfo.upload.resetmethod=nodemcu
+wifinfo.upload.resetmethod=--before default_reset --after hard_reset
wifinfo.build.flash_mode=qio
wifinfo.build.flash_flags=-DFLASHMODE_QIO
wifinfo.menu.FlashFreq.40=40MHz
@@ -4943,7 +5140,7 @@ wifinfo.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOO
wifinfo.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
wifinfo.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
wifinfo.menu.wipe.none=Only Sketch
-wifinfo.menu.wipe.none.upload.erase_cmd=version
+wifinfo.menu.wipe.none.upload.erase_cmd=
wifinfo.menu.wipe.sdk=Sketch + WiFi Settings
wifinfo.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
wifinfo.menu.wipe.all=All Flash Contents
@@ -4985,7 +5182,7 @@ arduino-esp8266.menu.BoardModel.unowifideved.build.variant=arduino_uart
arduino-esp8266.upload.tool=esptool
arduino-esp8266.upload.maximum_data_size=81920
arduino-esp8266.upload.wait_for_upload_port=true
-arduino-esp8266.upload.erase_cmd=version
+arduino-esp8266.upload.erase_cmd=
arduino-esp8266.serial.disableDTR=true
arduino-esp8266.serial.disableRTS=true
arduino-esp8266.build.mcu=esp8266
@@ -5017,7 +5214,7 @@ arduino-esp8266.menu.ssl.all=All SSL ciphers (most compatible)
arduino-esp8266.menu.ssl.all.build.sslflags=
arduino-esp8266.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
arduino-esp8266.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-arduino-esp8266.upload.resetmethod=ck
+arduino-esp8266.upload.resetmethod=--before no_reset --after soft_reset
arduino-esp8266.build.flash_mode=qio
arduino-esp8266.build.flash_flags=-DFLASHMODE_QIO
arduino-esp8266.build.flash_freq=40
@@ -5148,7 +5345,7 @@ arduino-esp8266.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDA
arduino-esp8266.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
arduino-esp8266.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
arduino-esp8266.menu.wipe.none=Only Sketch
-arduino-esp8266.menu.wipe.none.upload.erase_cmd=version
+arduino-esp8266.menu.wipe.none.upload.erase_cmd=
arduino-esp8266.menu.wipe.sdk=Sketch + WiFi Settings
arduino-esp8266.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
arduino-esp8266.menu.wipe.all=All Flash Contents
@@ -5180,7 +5377,7 @@ gen4iod.build.variant=generic
gen4iod.upload.tool=esptool
gen4iod.upload.maximum_data_size=81920
gen4iod.upload.wait_for_upload_port=true
-gen4iod.upload.erase_cmd=version
+gen4iod.upload.erase_cmd=
gen4iod.serial.disableDTR=true
gen4iod.serial.disableRTS=true
gen4iod.build.mcu=esp8266
@@ -5211,7 +5408,7 @@ gen4iod.menu.ssl.all=All SSL ciphers (most compatible)
gen4iod.menu.ssl.all.build.sslflags=
gen4iod.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
gen4iod.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-gen4iod.upload.resetmethod=nodemcu
+gen4iod.upload.resetmethod=--before default_reset --after hard_reset
gen4iod.build.flash_mode=dio
gen4iod.build.flash_flags=-DFLASHMODE_DIO
gen4iod.build.flash_freq=80
@@ -5342,7 +5539,7 @@ gen4iod.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOO
gen4iod.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
gen4iod.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
gen4iod.menu.wipe.none=Only Sketch
-gen4iod.menu.wipe.none.upload.erase_cmd=version
+gen4iod.menu.wipe.none.upload.erase_cmd=
gen4iod.menu.wipe.sdk=Sketch + WiFi Settings
gen4iod.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
gen4iod.menu.wipe.all=All Flash Contents
@@ -5374,7 +5571,7 @@ oak.upload.maximum_size=1040368
oak.upload.tool=esptool
oak.upload.maximum_data_size=81920
oak.upload.wait_for_upload_port=true
-oak.upload.erase_cmd=version
+oak.upload.erase_cmd=
oak.serial.disableDTR=true
oak.serial.disableRTS=true
oak.build.mcu=esp8266
@@ -5405,7 +5602,7 @@ oak.menu.ssl.all=All SSL ciphers (most compatible)
oak.menu.ssl.all.build.sslflags=
oak.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
oak.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-oak.upload.resetmethod=none
+oak.upload.resetmethod=--before no_reset --after soft_reset
oak.build.flash_mode=dio
oak.build.flash_flags=-DFLASHMODE_DIO
oak.build.flash_freq=40
@@ -5536,7 +5733,7 @@ oak.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDN
oak.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
oak.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
oak.menu.wipe.none=Only Sketch
-oak.menu.wipe.none.upload.erase_cmd=version
+oak.menu.wipe.none.upload.erase_cmd=
oak.menu.wipe.sdk=Sketch + WiFi Settings
oak.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
oak.menu.wipe.all=All Flash Contents
@@ -5567,7 +5764,7 @@ wifiduino.build.variant=wifiduino
wifiduino.upload.tool=esptool
wifiduino.upload.maximum_data_size=81920
wifiduino.upload.wait_for_upload_port=true
-wifiduino.upload.erase_cmd=version
+wifiduino.upload.erase_cmd=
wifiduino.serial.disableDTR=true
wifiduino.serial.disableRTS=true
wifiduino.build.mcu=esp8266
@@ -5598,7 +5795,7 @@ wifiduino.menu.ssl.all=All SSL ciphers (most compatible)
wifiduino.menu.ssl.all.build.sslflags=
wifiduino.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
wifiduino.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-wifiduino.upload.resetmethod=nodemcu
+wifiduino.upload.resetmethod=--before default_reset --after hard_reset
wifiduino.build.flash_mode=dio
wifiduino.build.flash_flags=-DFLASHMODE_DIO
wifiduino.build.flash_freq=40
@@ -5729,7 +5926,7 @@ wifiduino.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTA
wifiduino.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
wifiduino.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
wifiduino.menu.wipe.none=Only Sketch
-wifiduino.menu.wipe.none.upload.erase_cmd=version
+wifiduino.menu.wipe.none.upload.erase_cmd=
wifiduino.menu.wipe.sdk=Sketch + WiFi Settings
wifiduino.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
wifiduino.menu.wipe.all=All Flash Contents
@@ -5760,7 +5957,7 @@ wifi_slot.build.variant=wifi_slot
wifi_slot.upload.tool=esptool
wifi_slot.upload.maximum_data_size=81920
wifi_slot.upload.wait_for_upload_port=true
-wifi_slot.upload.erase_cmd=version
+wifi_slot.upload.erase_cmd=
wifi_slot.serial.disableDTR=true
wifi_slot.serial.disableRTS=true
wifi_slot.build.mcu=esp8266
@@ -5791,7 +5988,7 @@ wifi_slot.menu.ssl.all=All SSL ciphers (most compatible)
wifi_slot.menu.ssl.all.build.sslflags=
wifi_slot.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
wifi_slot.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-wifi_slot.upload.resetmethod=nodemcu
+wifi_slot.upload.resetmethod=--before default_reset --after hard_reset
wifi_slot.menu.FlashFreq.40=40MHz
wifi_slot.menu.FlashFreq.40.build.flash_freq=40
wifi_slot.menu.FlashFreq.80=80MHz
@@ -6036,7 +6233,7 @@ wifi_slot.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTA
wifi_slot.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
wifi_slot.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
wifi_slot.menu.wipe.none=Only Sketch
-wifi_slot.menu.wipe.none.upload.erase_cmd=version
+wifi_slot.menu.wipe.none.upload.erase_cmd=
wifi_slot.menu.wipe.sdk=Sketch + WiFi Settings
wifi_slot.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
wifi_slot.menu.wipe.all=All Flash Contents
@@ -6067,7 +6264,7 @@ wiolink.build.variant=wiolink
wiolink.upload.tool=esptool
wiolink.upload.maximum_data_size=81920
wiolink.upload.wait_for_upload_port=true
-wiolink.upload.erase_cmd=version
+wiolink.upload.erase_cmd=
wiolink.serial.disableDTR=true
wiolink.serial.disableRTS=true
wiolink.build.mcu=esp8266
@@ -6098,7 +6295,7 @@ wiolink.menu.ssl.all=All SSL ciphers (most compatible)
wiolink.menu.ssl.all.build.sslflags=
wiolink.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
wiolink.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-wiolink.upload.resetmethod=nodemcu
+wiolink.upload.resetmethod=--before default_reset --after hard_reset
wiolink.build.flash_mode=qio
wiolink.build.flash_flags=-DFLASHMODE_QIO
wiolink.build.flash_freq=40
@@ -6229,7 +6426,7 @@ wiolink.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOO
wiolink.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
wiolink.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
wiolink.menu.wipe.none=Only Sketch
-wiolink.menu.wipe.none.upload.erase_cmd=version
+wiolink.menu.wipe.none.upload.erase_cmd=
wiolink.menu.wipe.sdk=Sketch + WiFi Settings
wiolink.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
wiolink.menu.wipe.all=All Flash Contents
@@ -6260,7 +6457,7 @@ espectro.build.variant=espectro
espectro.upload.tool=esptool
espectro.upload.maximum_data_size=81920
espectro.upload.wait_for_upload_port=true
-espectro.upload.erase_cmd=version
+espectro.upload.erase_cmd=
espectro.serial.disableDTR=true
espectro.serial.disableRTS=true
espectro.build.mcu=esp8266
@@ -6291,7 +6488,7 @@ espectro.menu.ssl.all=All SSL ciphers (most compatible)
espectro.menu.ssl.all.build.sslflags=
espectro.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
espectro.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
-espectro.upload.resetmethod=nodemcu
+espectro.upload.resetmethod=--before default_reset --after hard_reset
espectro.build.flash_mode=dio
espectro.build.flash_flags=-DFLASHMODE_DIO
espectro.build.flash_freq=40
@@ -6422,7 +6619,7 @@ espectro.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAO
espectro.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
espectro.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
espectro.menu.wipe.none=Only Sketch
-espectro.menu.wipe.none.upload.erase_cmd=version
+espectro.menu.wipe.none.upload.erase_cmd=
espectro.menu.wipe.sdk=Sketch + WiFi Settings
espectro.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
espectro.menu.wipe.all=All Flash Contents
@@ -6446,3 +6643,480 @@ espectro.menu.baud.921600.upload.speed=921600
espectro.menu.baud.3000000=3000000
espectro.menu.baud.3000000.upload.speed=3000000
+##############################################################
+sonoff.name=ITEAD Sonoff
+sonoff.build.board=SONOFF_SV
+sonoff.build.extra_flags=-DESP8266
+sonoff.build.flash_size=1M
+sonoff.build.variant=itead
+sonoff.menu.BoardModel.sonoffBasic=ITEAD Sonoff Basic
+sonoff.menu.BoardModel.sonoffBasic.build.board=SONOFF_BASIC
+sonoff.menu.BoardModel.sonoffS20=ITEAD Sonoff S20
+sonoff.menu.BoardModel.sonoffS20.build.board=SONOFF_S20
+sonoff.menu.BoardModel.sonoffSV=ITEAD Sonoff SV
+sonoff.menu.BoardModel.sonoffSV.build.board=SONOFF_SV
+sonoff.menu.BoardModel.sonoffTH=ITEAD Sonoff TH
+sonoff.menu.BoardModel.sonoffTH.build.board=SONOFF_TH
+sonoff.upload.tool=esptool
+sonoff.upload.maximum_data_size=81920
+sonoff.upload.wait_for_upload_port=true
+sonoff.upload.erase_cmd=
+sonoff.serial.disableDTR=true
+sonoff.serial.disableRTS=true
+sonoff.build.mcu=esp8266
+sonoff.build.core=esp8266
+sonoff.build.spiffs_pagesize=256
+sonoff.build.debug_port=
+sonoff.build.debug_level=
+sonoff.menu.xtal.80=80 MHz
+sonoff.menu.xtal.80.build.f_cpu=80000000L
+sonoff.menu.xtal.160=160 MHz
+sonoff.menu.xtal.160.build.f_cpu=160000000L
+sonoff.menu.vt.flash=Flash
+sonoff.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+sonoff.menu.vt.heap=Heap
+sonoff.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+sonoff.menu.vt.iram=IRAM
+sonoff.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+sonoff.menu.exception.legacy=Legacy (new can return nullptr)
+sonoff.menu.exception.legacy.build.exception_flags=-fno-exceptions
+sonoff.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+sonoff.menu.exception.disabled=Disabled (new can abort)
+sonoff.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+sonoff.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+sonoff.menu.exception.enabled=Enabled
+sonoff.menu.exception.enabled.build.exception_flags=-fexceptions
+sonoff.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+sonoff.menu.ssl.all=All SSL ciphers (most compatible)
+sonoff.menu.ssl.all.build.sslflags=
+sonoff.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+sonoff.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+sonoff.upload.resetmethod=--before no_reset --after soft_reset
+sonoff.build.flash_mode=dout
+sonoff.build.flash_flags=-DFLASHMODE_DOUT
+sonoff.build.flash_freq=40
+sonoff.menu.eesz.1M64=1MB (FS:64KB OTA:~470KB)
+sonoff.menu.eesz.1M64.build.flash_size=1M
+sonoff.menu.eesz.1M64.build.flash_size_bytes=0x100000
+sonoff.menu.eesz.1M64.build.flash_ld=eagle.flash.1m64.ld
+sonoff.menu.eesz.1M64.build.spiffs_pagesize=256
+sonoff.menu.eesz.1M64.upload.maximum_size=958448
+sonoff.menu.eesz.1M64.build.rfcal_addr=0xFC000
+sonoff.menu.eesz.1M64.build.spiffs_start=0xEB000
+sonoff.menu.eesz.1M64.build.spiffs_end=0xFB000
+sonoff.menu.eesz.1M64.build.spiffs_blocksize=4096
+sonoff.menu.eesz.1M128=1MB (FS:128KB OTA:~438KB)
+sonoff.menu.eesz.1M128.build.flash_size=1M
+sonoff.menu.eesz.1M128.build.flash_size_bytes=0x100000
+sonoff.menu.eesz.1M128.build.flash_ld=eagle.flash.1m128.ld
+sonoff.menu.eesz.1M128.build.spiffs_pagesize=256
+sonoff.menu.eesz.1M128.upload.maximum_size=892912
+sonoff.menu.eesz.1M128.build.rfcal_addr=0xFC000
+sonoff.menu.eesz.1M128.build.spiffs_start=0xDB000
+sonoff.menu.eesz.1M128.build.spiffs_end=0xFB000
+sonoff.menu.eesz.1M128.build.spiffs_blocksize=4096
+sonoff.menu.eesz.1M144=1MB (FS:144KB OTA:~430KB)
+sonoff.menu.eesz.1M144.build.flash_size=1M
+sonoff.menu.eesz.1M144.build.flash_size_bytes=0x100000
+sonoff.menu.eesz.1M144.build.flash_ld=eagle.flash.1m144.ld
+sonoff.menu.eesz.1M144.build.spiffs_pagesize=256
+sonoff.menu.eesz.1M144.upload.maximum_size=876528
+sonoff.menu.eesz.1M144.build.rfcal_addr=0xFC000
+sonoff.menu.eesz.1M144.build.spiffs_start=0xD7000
+sonoff.menu.eesz.1M144.build.spiffs_end=0xFB000
+sonoff.menu.eesz.1M144.build.spiffs_blocksize=4096
+sonoff.menu.eesz.1M160=1MB (FS:160KB OTA:~422KB)
+sonoff.menu.eesz.1M160.build.flash_size=1M
+sonoff.menu.eesz.1M160.build.flash_size_bytes=0x100000
+sonoff.menu.eesz.1M160.build.flash_ld=eagle.flash.1m160.ld
+sonoff.menu.eesz.1M160.build.spiffs_pagesize=256
+sonoff.menu.eesz.1M160.upload.maximum_size=860144
+sonoff.menu.eesz.1M160.build.rfcal_addr=0xFC000
+sonoff.menu.eesz.1M160.build.spiffs_start=0xD3000
+sonoff.menu.eesz.1M160.build.spiffs_end=0xFB000
+sonoff.menu.eesz.1M160.build.spiffs_blocksize=4096
+sonoff.menu.eesz.1M192=1MB (FS:192KB OTA:~406KB)
+sonoff.menu.eesz.1M192.build.flash_size=1M
+sonoff.menu.eesz.1M192.build.flash_size_bytes=0x100000
+sonoff.menu.eesz.1M192.build.flash_ld=eagle.flash.1m192.ld
+sonoff.menu.eesz.1M192.build.spiffs_pagesize=256
+sonoff.menu.eesz.1M192.upload.maximum_size=827376
+sonoff.menu.eesz.1M192.build.rfcal_addr=0xFC000
+sonoff.menu.eesz.1M192.build.spiffs_start=0xCB000
+sonoff.menu.eesz.1M192.build.spiffs_end=0xFB000
+sonoff.menu.eesz.1M192.build.spiffs_blocksize=4096
+sonoff.menu.eesz.1M256=1MB (FS:256KB OTA:~374KB)
+sonoff.menu.eesz.1M256.build.flash_size=1M
+sonoff.menu.eesz.1M256.build.flash_size_bytes=0x100000
+sonoff.menu.eesz.1M256.build.flash_ld=eagle.flash.1m256.ld
+sonoff.menu.eesz.1M256.build.spiffs_pagesize=256
+sonoff.menu.eesz.1M256.upload.maximum_size=761840
+sonoff.menu.eesz.1M256.build.rfcal_addr=0xFC000
+sonoff.menu.eesz.1M256.build.spiffs_start=0xBB000
+sonoff.menu.eesz.1M256.build.spiffs_end=0xFB000
+sonoff.menu.eesz.1M256.build.spiffs_blocksize=4096
+sonoff.menu.eesz.1M512=1MB (FS:512KB OTA:~246KB)
+sonoff.menu.eesz.1M512.build.flash_size=1M
+sonoff.menu.eesz.1M512.build.flash_size_bytes=0x100000
+sonoff.menu.eesz.1M512.build.flash_ld=eagle.flash.1m512.ld
+sonoff.menu.eesz.1M512.build.spiffs_pagesize=256
+sonoff.menu.eesz.1M512.upload.maximum_size=499696
+sonoff.menu.eesz.1M512.build.rfcal_addr=0xFC000
+sonoff.menu.eesz.1M512.build.spiffs_start=0x7B000
+sonoff.menu.eesz.1M512.build.spiffs_end=0xFB000
+sonoff.menu.eesz.1M512.build.spiffs_blocksize=8192
+sonoff.menu.eesz.1M=1MB (FS:none OTA:~502KB)
+sonoff.menu.eesz.1M.build.flash_size=1M
+sonoff.menu.eesz.1M.build.flash_size_bytes=0x100000
+sonoff.menu.eesz.1M.build.flash_ld=eagle.flash.1m.ld
+sonoff.menu.eesz.1M.build.spiffs_pagesize=256
+sonoff.menu.eesz.1M.upload.maximum_size=1023984
+sonoff.menu.eesz.1M.build.rfcal_addr=0xFC000
+sonoff.menu.ip.lm2f=v2 Lower Memory
+sonoff.menu.ip.lm2f.build.lwip_include=lwip2/include
+sonoff.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+sonoff.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+sonoff.menu.ip.hb2f=v2 Higher Bandwidth
+sonoff.menu.ip.hb2f.build.lwip_include=lwip2/include
+sonoff.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+sonoff.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+sonoff.menu.ip.lm2n=v2 Lower Memory (no features)
+sonoff.menu.ip.lm2n.build.lwip_include=lwip2/include
+sonoff.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+sonoff.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+sonoff.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+sonoff.menu.ip.hb2n.build.lwip_include=lwip2/include
+sonoff.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+sonoff.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+sonoff.menu.ip.lm6f=v2 IPv6 Lower Memory
+sonoff.menu.ip.lm6f.build.lwip_include=lwip2/include
+sonoff.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+sonoff.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+sonoff.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+sonoff.menu.ip.hb6f.build.lwip_include=lwip2/include
+sonoff.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+sonoff.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+sonoff.menu.ip.hb1=v1.4 Higher Bandwidth
+sonoff.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+sonoff.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+sonoff.menu.ip.src=v1.4 Compile from source
+sonoff.menu.ip.src.build.lwip_lib=-llwip_src
+sonoff.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+sonoff.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+sonoff.menu.dbg.Disabled=Disabled
+sonoff.menu.dbg.Disabled.build.debug_port=
+sonoff.menu.dbg.Serial=Serial
+sonoff.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+sonoff.menu.dbg.Serial1=Serial1
+sonoff.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+sonoff.menu.lvl.None____=None
+sonoff.menu.lvl.None____.build.debug_level=
+sonoff.menu.lvl.SSL=SSL
+sonoff.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+sonoff.menu.lvl.TLS_MEM=TLS_MEM
+sonoff.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+sonoff.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+sonoff.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+sonoff.menu.lvl.HTTP_SERVER=HTTP_SERVER
+sonoff.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+sonoff.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+sonoff.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+sonoff.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+sonoff.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+sonoff.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+sonoff.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+sonoff.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+sonoff.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+sonoff.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+sonoff.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+sonoff.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+sonoff.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+sonoff.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+sonoff.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+sonoff.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+sonoff.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+sonoff.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+sonoff.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+sonoff.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+sonoff.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+sonoff.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+sonoff.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+sonoff.menu.lvl.CORE=CORE
+sonoff.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+sonoff.menu.lvl.WIFI=WIFI
+sonoff.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+sonoff.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+sonoff.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+sonoff.menu.lvl.UPDATER=UPDATER
+sonoff.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+sonoff.menu.lvl.OTA=OTA
+sonoff.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+sonoff.menu.lvl.OOM=OOM
+sonoff.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+sonoff.menu.lvl.MDNS=MDNS
+sonoff.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+sonoff.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+sonoff.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+sonoff.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+sonoff.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+sonoff.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+sonoff.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+sonoff.menu.wipe.none=Only Sketch
+sonoff.menu.wipe.none.upload.erase_cmd=
+sonoff.menu.wipe.sdk=Sketch + WiFi Settings
+sonoff.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+sonoff.menu.wipe.all=All Flash Contents
+sonoff.menu.wipe.all.upload.erase_cmd=erase_flash
+sonoff.menu.baud.115200=115200
+sonoff.menu.baud.115200.upload.speed=115200
+sonoff.menu.baud.57600=57600
+sonoff.menu.baud.57600.upload.speed=57600
+sonoff.menu.baud.230400.linux=230400
+sonoff.menu.baud.230400.macosx=230400
+sonoff.menu.baud.230400.upload.speed=230400
+sonoff.menu.baud.256000.windows=256000
+sonoff.menu.baud.256000.upload.speed=256000
+sonoff.menu.baud.460800.linux=460800
+sonoff.menu.baud.460800.macosx=460800
+sonoff.menu.baud.460800.upload.speed=460800
+sonoff.menu.baud.512000.windows=512000
+sonoff.menu.baud.512000.upload.speed=512000
+sonoff.menu.baud.921600=921600
+sonoff.menu.baud.921600.upload.speed=921600
+sonoff.menu.baud.3000000=3000000
+sonoff.menu.baud.3000000.upload.speed=3000000
+
+##############################################################
+espmxdevkit.name=DOIT ESP-Mx DevKit (ESP8285)
+espmxdevkit.build.board=ESP8266_ESP01
+espmxdevkit.build.led=-DLED_BUILTIN=16
+espmxdevkit.build.variant=esp8285
+espmxdevkit.upload.tool=esptool
+espmxdevkit.upload.maximum_data_size=81920
+espmxdevkit.upload.wait_for_upload_port=true
+espmxdevkit.upload.erase_cmd=
+espmxdevkit.serial.disableDTR=true
+espmxdevkit.serial.disableRTS=true
+espmxdevkit.build.mcu=esp8266
+espmxdevkit.build.core=esp8266
+espmxdevkit.build.spiffs_pagesize=256
+espmxdevkit.build.debug_port=
+espmxdevkit.build.debug_level=
+espmxdevkit.menu.xtal.80=80 MHz
+espmxdevkit.menu.xtal.80.build.f_cpu=80000000L
+espmxdevkit.menu.xtal.160=160 MHz
+espmxdevkit.menu.xtal.160.build.f_cpu=160000000L
+espmxdevkit.menu.vt.flash=Flash
+espmxdevkit.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+espmxdevkit.menu.vt.heap=Heap
+espmxdevkit.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+espmxdevkit.menu.vt.iram=IRAM
+espmxdevkit.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+espmxdevkit.menu.exception.legacy=Legacy (new can return nullptr)
+espmxdevkit.menu.exception.legacy.build.exception_flags=-fno-exceptions
+espmxdevkit.menu.exception.legacy.build.stdcpp_lib=-lstdc++
+espmxdevkit.menu.exception.disabled=Disabled (new can abort)
+espmxdevkit.menu.exception.disabled.build.exception_flags=-fno-exceptions -DNEW_OOM_ABORT
+espmxdevkit.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+espmxdevkit.menu.exception.enabled=Enabled
+espmxdevkit.menu.exception.enabled.build.exception_flags=-fexceptions
+espmxdevkit.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+espmxdevkit.menu.ssl.all=All SSL ciphers (most compatible)
+espmxdevkit.menu.ssl.all.build.sslflags=
+espmxdevkit.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+espmxdevkit.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+espmxdevkit.upload.resetmethod=--before default_reset --after hard_reset
+espmxdevkit.build.flash_mode=dout
+espmxdevkit.build.flash_flags=-DFLASHMODE_DOUT
+espmxdevkit.build.flash_freq=40
+espmxdevkit.menu.eesz.1M64=1MB (FS:64KB OTA:~470KB)
+espmxdevkit.menu.eesz.1M64.build.flash_size=1M
+espmxdevkit.menu.eesz.1M64.build.flash_size_bytes=0x100000
+espmxdevkit.menu.eesz.1M64.build.flash_ld=eagle.flash.1m64.ld
+espmxdevkit.menu.eesz.1M64.build.spiffs_pagesize=256
+espmxdevkit.menu.eesz.1M64.upload.maximum_size=958448
+espmxdevkit.menu.eesz.1M64.build.rfcal_addr=0xFC000
+espmxdevkit.menu.eesz.1M64.build.spiffs_start=0xEB000
+espmxdevkit.menu.eesz.1M64.build.spiffs_end=0xFB000
+espmxdevkit.menu.eesz.1M64.build.spiffs_blocksize=4096
+espmxdevkit.menu.eesz.1M128=1MB (FS:128KB OTA:~438KB)
+espmxdevkit.menu.eesz.1M128.build.flash_size=1M
+espmxdevkit.menu.eesz.1M128.build.flash_size_bytes=0x100000
+espmxdevkit.menu.eesz.1M128.build.flash_ld=eagle.flash.1m128.ld
+espmxdevkit.menu.eesz.1M128.build.spiffs_pagesize=256
+espmxdevkit.menu.eesz.1M128.upload.maximum_size=892912
+espmxdevkit.menu.eesz.1M128.build.rfcal_addr=0xFC000
+espmxdevkit.menu.eesz.1M128.build.spiffs_start=0xDB000
+espmxdevkit.menu.eesz.1M128.build.spiffs_end=0xFB000
+espmxdevkit.menu.eesz.1M128.build.spiffs_blocksize=4096
+espmxdevkit.menu.eesz.1M144=1MB (FS:144KB OTA:~430KB)
+espmxdevkit.menu.eesz.1M144.build.flash_size=1M
+espmxdevkit.menu.eesz.1M144.build.flash_size_bytes=0x100000
+espmxdevkit.menu.eesz.1M144.build.flash_ld=eagle.flash.1m144.ld
+espmxdevkit.menu.eesz.1M144.build.spiffs_pagesize=256
+espmxdevkit.menu.eesz.1M144.upload.maximum_size=876528
+espmxdevkit.menu.eesz.1M144.build.rfcal_addr=0xFC000
+espmxdevkit.menu.eesz.1M144.build.spiffs_start=0xD7000
+espmxdevkit.menu.eesz.1M144.build.spiffs_end=0xFB000
+espmxdevkit.menu.eesz.1M144.build.spiffs_blocksize=4096
+espmxdevkit.menu.eesz.1M160=1MB (FS:160KB OTA:~422KB)
+espmxdevkit.menu.eesz.1M160.build.flash_size=1M
+espmxdevkit.menu.eesz.1M160.build.flash_size_bytes=0x100000
+espmxdevkit.menu.eesz.1M160.build.flash_ld=eagle.flash.1m160.ld
+espmxdevkit.menu.eesz.1M160.build.spiffs_pagesize=256
+espmxdevkit.menu.eesz.1M160.upload.maximum_size=860144
+espmxdevkit.menu.eesz.1M160.build.rfcal_addr=0xFC000
+espmxdevkit.menu.eesz.1M160.build.spiffs_start=0xD3000
+espmxdevkit.menu.eesz.1M160.build.spiffs_end=0xFB000
+espmxdevkit.menu.eesz.1M160.build.spiffs_blocksize=4096
+espmxdevkit.menu.eesz.1M192=1MB (FS:192KB OTA:~406KB)
+espmxdevkit.menu.eesz.1M192.build.flash_size=1M
+espmxdevkit.menu.eesz.1M192.build.flash_size_bytes=0x100000
+espmxdevkit.menu.eesz.1M192.build.flash_ld=eagle.flash.1m192.ld
+espmxdevkit.menu.eesz.1M192.build.spiffs_pagesize=256
+espmxdevkit.menu.eesz.1M192.upload.maximum_size=827376
+espmxdevkit.menu.eesz.1M192.build.rfcal_addr=0xFC000
+espmxdevkit.menu.eesz.1M192.build.spiffs_start=0xCB000
+espmxdevkit.menu.eesz.1M192.build.spiffs_end=0xFB000
+espmxdevkit.menu.eesz.1M192.build.spiffs_blocksize=4096
+espmxdevkit.menu.eesz.1M256=1MB (FS:256KB OTA:~374KB)
+espmxdevkit.menu.eesz.1M256.build.flash_size=1M
+espmxdevkit.menu.eesz.1M256.build.flash_size_bytes=0x100000
+espmxdevkit.menu.eesz.1M256.build.flash_ld=eagle.flash.1m256.ld
+espmxdevkit.menu.eesz.1M256.build.spiffs_pagesize=256
+espmxdevkit.menu.eesz.1M256.upload.maximum_size=761840
+espmxdevkit.menu.eesz.1M256.build.rfcal_addr=0xFC000
+espmxdevkit.menu.eesz.1M256.build.spiffs_start=0xBB000
+espmxdevkit.menu.eesz.1M256.build.spiffs_end=0xFB000
+espmxdevkit.menu.eesz.1M256.build.spiffs_blocksize=4096
+espmxdevkit.menu.eesz.1M512=1MB (FS:512KB OTA:~246KB)
+espmxdevkit.menu.eesz.1M512.build.flash_size=1M
+espmxdevkit.menu.eesz.1M512.build.flash_size_bytes=0x100000
+espmxdevkit.menu.eesz.1M512.build.flash_ld=eagle.flash.1m512.ld
+espmxdevkit.menu.eesz.1M512.build.spiffs_pagesize=256
+espmxdevkit.menu.eesz.1M512.upload.maximum_size=499696
+espmxdevkit.menu.eesz.1M512.build.rfcal_addr=0xFC000
+espmxdevkit.menu.eesz.1M512.build.spiffs_start=0x7B000
+espmxdevkit.menu.eesz.1M512.build.spiffs_end=0xFB000
+espmxdevkit.menu.eesz.1M512.build.spiffs_blocksize=8192
+espmxdevkit.menu.eesz.1M=1MB (FS:none OTA:~502KB)
+espmxdevkit.menu.eesz.1M.build.flash_size=1M
+espmxdevkit.menu.eesz.1M.build.flash_size_bytes=0x100000
+espmxdevkit.menu.eesz.1M.build.flash_ld=eagle.flash.1m.ld
+espmxdevkit.menu.eesz.1M.build.spiffs_pagesize=256
+espmxdevkit.menu.eesz.1M.upload.maximum_size=1023984
+espmxdevkit.menu.eesz.1M.build.rfcal_addr=0xFC000
+espmxdevkit.menu.ip.lm2f=v2 Lower Memory
+espmxdevkit.menu.ip.lm2f.build.lwip_include=lwip2/include
+espmxdevkit.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+espmxdevkit.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+espmxdevkit.menu.ip.hb2f=v2 Higher Bandwidth
+espmxdevkit.menu.ip.hb2f.build.lwip_include=lwip2/include
+espmxdevkit.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+espmxdevkit.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+espmxdevkit.menu.ip.lm2n=v2 Lower Memory (no features)
+espmxdevkit.menu.ip.lm2n.build.lwip_include=lwip2/include
+espmxdevkit.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+espmxdevkit.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+espmxdevkit.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+espmxdevkit.menu.ip.hb2n.build.lwip_include=lwip2/include
+espmxdevkit.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+espmxdevkit.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+espmxdevkit.menu.ip.lm6f=v2 IPv6 Lower Memory
+espmxdevkit.menu.ip.lm6f.build.lwip_include=lwip2/include
+espmxdevkit.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+espmxdevkit.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+espmxdevkit.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+espmxdevkit.menu.ip.hb6f.build.lwip_include=lwip2/include
+espmxdevkit.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+espmxdevkit.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+espmxdevkit.menu.ip.hb1=v1.4 Higher Bandwidth
+espmxdevkit.menu.ip.hb1.build.lwip_lib=-llwip_gcc
+espmxdevkit.menu.ip.hb1.build.lwip_flags=-DLWIP_OPEN_SRC
+espmxdevkit.menu.ip.src=v1.4 Compile from source
+espmxdevkit.menu.ip.src.build.lwip_lib=-llwip_src
+espmxdevkit.menu.ip.src.build.lwip_flags=-DLWIP_OPEN_SRC
+espmxdevkit.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+espmxdevkit.menu.dbg.Disabled=Disabled
+espmxdevkit.menu.dbg.Disabled.build.debug_port=
+espmxdevkit.menu.dbg.Serial=Serial
+espmxdevkit.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+espmxdevkit.menu.dbg.Serial1=Serial1
+espmxdevkit.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+espmxdevkit.menu.lvl.None____=None
+espmxdevkit.menu.lvl.None____.build.debug_level=
+espmxdevkit.menu.lvl.SSL=SSL
+espmxdevkit.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+espmxdevkit.menu.lvl.TLS_MEM=TLS_MEM
+espmxdevkit.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+espmxdevkit.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+espmxdevkit.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+espmxdevkit.menu.lvl.HTTP_SERVER=HTTP_SERVER
+espmxdevkit.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+espmxdevkit.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+espmxdevkit.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+espmxdevkit.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+espmxdevkit.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+espmxdevkit.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+espmxdevkit.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+espmxdevkit.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+espmxdevkit.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+espmxdevkit.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+espmxdevkit.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+espmxdevkit.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+espmxdevkit.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espmxdevkit.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+espmxdevkit.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+espmxdevkit.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+espmxdevkit.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+espmxdevkit.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+espmxdevkit.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espmxdevkit.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+espmxdevkit.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espmxdevkit.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+espmxdevkit.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+espmxdevkit.menu.lvl.CORE=CORE
+espmxdevkit.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+espmxdevkit.menu.lvl.WIFI=WIFI
+espmxdevkit.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+espmxdevkit.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+espmxdevkit.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+espmxdevkit.menu.lvl.UPDATER=UPDATER
+espmxdevkit.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+espmxdevkit.menu.lvl.OTA=OTA
+espmxdevkit.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+espmxdevkit.menu.lvl.OOM=OOM
+espmxdevkit.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+espmxdevkit.menu.lvl.MDNS=MDNS
+espmxdevkit.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+espmxdevkit.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+espmxdevkit.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+espmxdevkit.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+espmxdevkit.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+espmxdevkit.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+espmxdevkit.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+espmxdevkit.menu.wipe.none=Only Sketch
+espmxdevkit.menu.wipe.none.upload.erase_cmd=
+espmxdevkit.menu.wipe.sdk=Sketch + WiFi Settings
+espmxdevkit.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+espmxdevkit.menu.wipe.all=All Flash Contents
+espmxdevkit.menu.wipe.all.upload.erase_cmd=erase_flash
+espmxdevkit.menu.baud.115200=115200
+espmxdevkit.menu.baud.115200.upload.speed=115200
+espmxdevkit.menu.baud.57600=57600
+espmxdevkit.menu.baud.57600.upload.speed=57600
+espmxdevkit.menu.baud.230400.linux=230400
+espmxdevkit.menu.baud.230400.macosx=230400
+espmxdevkit.menu.baud.230400.upload.speed=230400
+espmxdevkit.menu.baud.256000.windows=256000
+espmxdevkit.menu.baud.256000.upload.speed=256000
+espmxdevkit.menu.baud.460800.linux=460800
+espmxdevkit.menu.baud.460800.macosx=460800
+espmxdevkit.menu.baud.460800.upload.speed=460800
+espmxdevkit.menu.baud.512000.windows=512000
+espmxdevkit.menu.baud.512000.upload.speed=512000
+espmxdevkit.menu.baud.921600=921600
+espmxdevkit.menu.baud.921600.upload.speed=921600
+espmxdevkit.menu.baud.3000000=3000000
+espmxdevkit.menu.baud.3000000.upload.speed=3000000
+
diff --git a/arduino/version pre-2.6.0/platform.txt b/arduino/version 2.6.1/platform.txt
similarity index 94%
rename from arduino/version pre-2.6.0/platform.txt
rename to arduino/version 2.6.1/platform.txt
index aed8672f9..76c8aba60 100644
--- a/arduino/version pre-2.6.0/platform.txt
+++ b/arduino/version 2.6.1/platform.txt
@@ -5,8 +5,8 @@
# For more info:
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5-3rd-party-Hardware-specification
-name=ESP8266 Boards (2.5.2-196-g45d71ae4)
-version=2.5.2-196-g45d71ae4
+name=ESP8266 Boards (2.6.1)
+version=2.6.1
# These will be removed by the packager script when doing a JSON release
@@ -37,10 +37,15 @@ build.exception_flags=-fno-exceptions
build.stdcpp_lib=-lstdc++
build.stdcpp_level=-std=gnu++11
-# build.float=-u _printf_float -u _scanf_float
+#build.float=-u _printf_float -u _scanf_float
build.float=
build.led=
-build.sdk=NONOSDK22y
+
+# default SDK for all boards
+# (generic board overrides this variable)
+build.sdk=NONOSDK22x_190703
+#build.sdk=NONOSDK22x_191024
+#build.sdk=NONOSDK22x_191105
compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
compiler.sdk.path={runtime.platform.path}/tools/sdk
@@ -88,7 +93,7 @@ compiler.elf2hex.extra_flags=
## needs git
recipe.hooks.sketch.prebuild.pattern="{runtime.tools.python3.path}/python3" "{runtime.tools.signing}" --mode header --publickey "{build.source.path}/public.key" --out "{build.path}/core/Updater_Signing.h"
# This is quite a working hack. This form of prebuild hook, while intuitive, is not explicitly documented.
-recipe.hooks.prebuild.10.pattern="{runtime.tools.python3.path}/python3" "{runtime.tools.makecorever}" --build_path "{build.path}" --platform_path "{runtime.platform.path}" --version "unix-{version}"
+
## Build the app.ld linker file
recipe.hooks.linking.prelink.1.pattern="{compiler.path}{compiler.c.cmd}" -CC -E -P {build.vtable_flags} "{runtime.platform.path}/tools/sdk/ld/eagle.app.v6.common.ld.h" -o "{build.path}/local.eagle.app.v6.common.ld"
@@ -145,7 +150,7 @@ tools.esptool.upload.params.quiet=
# First, potentially perform an erase or nothing
# Next, do the binary upload
# Combined in one rule because Arduino doesn't suport upload.1.pattern/upload.3.pattern
-tools.esptool.upload.pattern="{cmd}" "{runtime.platform.path}/tools/upload.py" --chip esp8266 --port "{serial.port}" --baud "{upload.speed}" "{upload.verbose}" {upload.erase_cmd} --end --chip esp8266 --port "{serial.port}" --baud "{upload.speed}" "{upload.verbose}" write_flash 0x0 "{build.path}/{build.project_name}.bin" --end
+tools.esptool.upload.pattern="{cmd}" "{runtime.platform.path}/tools/upload.py" --chip esp8266 --port "{serial.port}" --baud "{upload.speed}" "{upload.verbose}" {upload.erase_cmd} {upload.resetmethod} "{build.path}/{build.project_name}.bin"
tools.esptool.upload.network_pattern="{network_cmd}" "{runtime.platform.path}/tools/espota.py" -i "{serial.port}" -p "{network.port}" "--auth={network.password}" -f "{build.path}/{build.project_name}.bin"
diff --git a/lib/IRremoteESP8266-2.7.0/src/IRtext.cpp b/lib/IRremoteESP8266-2.7.0/src/IRtext.cpp
deleted file mode 100644
index 7f9c57e1e..000000000
--- a/lib/IRremoteESP8266-2.7.0/src/IRtext.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2019 - David Conran (@crankyoldgit)
-
-#ifndef UNIT_TEST
-#include " + F("A simple reboot of the ESP. ie. No changes
" "
")); html += htmlButton( kUrlWipe, F("Wipe Settings"), @@ -2514,6 +2515,8 @@ void sendMQTTDiscovery(const char *topic) { "\"pow_cmd_t\":\"~/" MQTT_CLIMATE_CMND "/" KEY_POWER "\"," "\"mode_cmd_t\":\"~/" MQTT_CLIMATE_CMND "/" KEY_MODE "\"," "\"mode_stat_t\":\"~/" MQTT_CLIMATE_STAT "/" KEY_MODE "\"," + // I don't know why, but the modes need to be lower case to work with + // Home Assistant & Google Home. "\"modes\":[\"off\",\"auto\",\"cool\",\"heat\",\"dry\",\"fan_only\"]," "\"temp_cmd_t\":\"~/" MQTT_CLIMATE_CMND "/" KEY_TEMP "\"," "\"temp_stat_t\":\"~/" MQTT_CLIMATE_STAT "/" KEY_TEMP "\"," @@ -2522,11 +2525,13 @@ void sendMQTTDiscovery(const char *topic) { "\"temp_step\":\"1\"," "\"fan_mode_cmd_t\":\"~/" MQTT_CLIMATE_CMND "/" KEY_FANSPEED "\"," "\"fan_mode_stat_t\":\"~/" MQTT_CLIMATE_STAT "/" KEY_FANSPEED "\"," - "\"fan_modes\":[\"auto\",\"min\",\"low\",\"medium\",\"high\",\"max\"]," + "\"fan_modes\":[\"" D_STR_AUTO "\",\"" D_STR_MIN "\",\"" D_STR_LOW "\",\"" + D_STR_MEDIUM "\",\"" D_STR_HIGH "\",\"" D_STR_MAX "\"]," "\"swing_mode_cmd_t\":\"~/" MQTT_CLIMATE_CMND "/" KEY_SWINGV "\"," "\"swing_mode_stat_t\":\"~/" MQTT_CLIMATE_STAT "/" KEY_SWINGV "\"," - "\"swing_modes\":[" - "\"off\",\"auto\",\"highest\",\"high\",\"middle\",\"low\",\"lowest\"]" + "\"swing_modes\":[\"" D_STR_OFF "\",\"" D_STR_AUTO "\",\"" D_STR_HIGHEST + "\",\"" D_STR_HIGH "\",\"" D_STR_MIDDLE "\",\"" + D_STR_LOW "\",\"" D_STR_LOWEST "\"]" "}").c_str(), true)) { mqttLog("MQTT climate discovery successful sent."); hasDiscoveryBeenSent = true; @@ -2961,16 +2966,15 @@ bool sendClimate(const String topic_prefix, const bool retain, diff = true; success &= sendInt(topic_prefix + KEY_MODEL, next.model, retain); } + String mode_str = IRac::opmodeToString(next.mode); + // I don't know why, but the modes need to be lower case to work with + // Home Assistant & Google Home. + mode_str.toLowerCase(); #if MQTT_CLIMATE_HA_MODE // Home Assistant want's these two bound together. if (prev.power != next.power || prev.mode != next.mode || forceMQTT) { - diff = true; success &= sendBool(topic_prefix + KEY_POWER, next.power, retain); - success &= sendString(topic_prefix + KEY_MODE, - (next.power ? IRac::opmodeToString(next.mode) - : F("off")), - retain); - } + if (!next.power) mode_str = F("off"); #else // MQTT_CLIMATE_HA_MODE // In non-Home Assistant mode, power and mode are not bound together. if (prev.power != next.power || forceMQTT) { @@ -2978,11 +2982,10 @@ bool sendClimate(const String topic_prefix, const bool retain, success &= sendBool(topic_prefix + KEY_POWER, next.power, retain); } if (prev.mode != next.mode || forceMQTT) { - diff = true; - success &= sendString(topic_prefix + KEY_MODE, - IRac::opmodeToString(next.mode), retain); - } #endif // MQTT_CLIMATE_HA_MODE + success &= sendString(topic_prefix + KEY_MODE, mode_str, retain); + diff = true; + } if (prev.degrees != next.degrees || forceMQTT) { diff = true; success &= sendFloat(topic_prefix + KEY_TEMP, next.degrees, retain); diff --git a/lib/IRremoteESP8266-2.7.0/examples/IRMQTTServer/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/IRMQTTServer/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/IRMQTTServer/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/IRMQTTServer/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/IRServer/IRServer.ino b/lib/IRremoteESP8266-2.7.1/examples/IRServer/IRServer.ino similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/IRServer/IRServer.ino rename to lib/IRremoteESP8266-2.7.1/examples/IRServer/IRServer.ino diff --git a/lib/IRremoteESP8266-2.7.0/examples/IRServer/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/IRServer/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/IRServer/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/IRServer/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/IRrecvDemo/IRrecvDemo.ino b/lib/IRremoteESP8266-2.7.1/examples/IRrecvDemo/IRrecvDemo.ino similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/IRrecvDemo/IRrecvDemo.ino rename to lib/IRremoteESP8266-2.7.1/examples/IRrecvDemo/IRrecvDemo.ino diff --git a/lib/IRremoteESP8266-2.7.0/examples/IRrecvDemo/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/IRrecvDemo/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/IRrecvDemo/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/IRrecvDemo/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/IRrecvDump/IRrecvDump.ino b/lib/IRremoteESP8266-2.7.1/examples/IRrecvDump/IRrecvDump.ino similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/IRrecvDump/IRrecvDump.ino rename to lib/IRremoteESP8266-2.7.1/examples/IRrecvDump/IRrecvDump.ino diff --git a/lib/IRremoteESP8266-2.7.0/examples/IRrecvDump/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/IRrecvDump/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/IRrecvDump/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/IRrecvDump/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/IRrecvDumpV2/IRrecvDumpV2.ino b/lib/IRremoteESP8266-2.7.1/examples/IRrecvDumpV2/IRrecvDumpV2.ino similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/IRrecvDumpV2/IRrecvDumpV2.ino rename to lib/IRremoteESP8266-2.7.1/examples/IRrecvDumpV2/IRrecvDumpV2.ino diff --git a/lib/IRremoteESP8266-2.7.0/examples/IRrecvDumpV2/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/IRrecvDumpV2/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/IRrecvDumpV2/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/IRrecvDumpV2/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/IRsendDemo/IRsendDemo.ino b/lib/IRremoteESP8266-2.7.1/examples/IRsendDemo/IRsendDemo.ino similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/IRsendDemo/IRsendDemo.ino rename to lib/IRremoteESP8266-2.7.1/examples/IRsendDemo/IRsendDemo.ino diff --git a/lib/IRremoteESP8266-2.7.0/examples/IRsendDemo/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/IRsendDemo/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/IRsendDemo/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/IRsendDemo/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/IRsendProntoDemo/IRsendProntoDemo.ino b/lib/IRremoteESP8266-2.7.1/examples/IRsendProntoDemo/IRsendProntoDemo.ino similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/IRsendProntoDemo/IRsendProntoDemo.ino rename to lib/IRremoteESP8266-2.7.1/examples/IRsendProntoDemo/IRsendProntoDemo.ino diff --git a/lib/IRremoteESP8266-2.7.0/examples/IRsendProntoDemo/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/IRsendProntoDemo/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/IRsendProntoDemo/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/IRsendProntoDemo/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino b/lib/IRremoteESP8266-2.7.1/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino rename to lib/IRremoteESP8266-2.7.1/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino diff --git a/lib/IRremoteESP8266-2.7.0/examples/JVCPanasonicSendDemo/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/JVCPanasonicSendDemo/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/JVCPanasonicSendDemo/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/JVCPanasonicSendDemo/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/LGACSend/LGACSend.ino b/lib/IRremoteESP8266-2.7.1/examples/LGACSend/LGACSend.ino similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/LGACSend/LGACSend.ino rename to lib/IRremoteESP8266-2.7.1/examples/LGACSend/LGACSend.ino diff --git a/lib/IRremoteESP8266-2.7.0/examples/LGACSend/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/LGACSend/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/LGACSend/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/LGACSend/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/SmartIRRepeater/SmartIRRepeater.ino b/lib/IRremoteESP8266-2.7.1/examples/SmartIRRepeater/SmartIRRepeater.ino similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/SmartIRRepeater/SmartIRRepeater.ino rename to lib/IRremoteESP8266-2.7.1/examples/SmartIRRepeater/SmartIRRepeater.ino diff --git a/lib/IRremoteESP8266-2.7.0/examples/SmartIRRepeater/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/SmartIRRepeater/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/SmartIRRepeater/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/SmartIRRepeater/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/TurnOnArgoAC/TurnOnArgoAC.ino b/lib/IRremoteESP8266-2.7.1/examples/TurnOnArgoAC/TurnOnArgoAC.ino similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/TurnOnArgoAC/TurnOnArgoAC.ino rename to lib/IRremoteESP8266-2.7.1/examples/TurnOnArgoAC/TurnOnArgoAC.ino diff --git a/lib/IRremoteESP8266-2.7.0/examples/TurnOnArgoAC/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/TurnOnArgoAC/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/TurnOnArgoAC/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/TurnOnArgoAC/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino b/lib/IRremoteESP8266-2.7.1/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino rename to lib/IRremoteESP8266-2.7.1/examples/TurnOnDaikinAC/TurnOnDaikinAC.ino diff --git a/lib/IRremoteESP8266-2.7.0/examples/TurnOnDaikinAC/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/TurnOnDaikinAC/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/TurnOnDaikinAC/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/TurnOnDaikinAC/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino b/lib/IRremoteESP8266-2.7.1/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino rename to lib/IRremoteESP8266-2.7.1/examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino diff --git a/lib/IRremoteESP8266-2.7.0/examples/TurnOnFujitsuAC/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/TurnOnFujitsuAC/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/TurnOnFujitsuAC/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/TurnOnFujitsuAC/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino b/lib/IRremoteESP8266-2.7.1/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino rename to lib/IRremoteESP8266-2.7.1/examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino diff --git a/lib/IRremoteESP8266-2.7.0/examples/TurnOnKelvinatorAC/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/TurnOnKelvinatorAC/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/TurnOnKelvinatorAC/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/TurnOnKelvinatorAC/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino b/lib/IRremoteESP8266-2.7.1/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino rename to lib/IRremoteESP8266-2.7.1/examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino diff --git a/lib/IRremoteESP8266-2.7.0/examples/TurnOnMitsubishiAC/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/TurnOnMitsubishiAC/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/TurnOnMitsubishiAC/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/TurnOnMitsubishiAC/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino b/lib/IRremoteESP8266-2.7.1/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino rename to lib/IRremoteESP8266-2.7.1/examples/TurnOnMitsubishiHeavyAc/TurnOnMitsubishiHeavyAc.ino diff --git a/lib/IRremoteESP8266-2.7.0/examples/TurnOnMitsubishiHeavyAc/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/TurnOnMitsubishiHeavyAc/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/TurnOnMitsubishiHeavyAc/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/TurnOnMitsubishiHeavyAc/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino b/lib/IRremoteESP8266-2.7.1/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino rename to lib/IRremoteESP8266-2.7.1/examples/TurnOnPanasonicAC/TurnOnPanasonicAC.ino diff --git a/lib/IRremoteESP8266-2.7.0/examples/TurnOnPanasonicAC/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/TurnOnPanasonicAC/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/TurnOnPanasonicAC/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/TurnOnPanasonicAC/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino b/lib/IRremoteESP8266-2.7.1/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino rename to lib/IRremoteESP8266-2.7.1/examples/TurnOnToshibaAC/TurnOnToshibaAC.ino diff --git a/lib/IRremoteESP8266-2.7.0/examples/TurnOnToshibaAC/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/TurnOnToshibaAC/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/TurnOnToshibaAC/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/TurnOnToshibaAC/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino b/lib/IRremoteESP8266-2.7.1/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino rename to lib/IRremoteESP8266-2.7.1/examples/TurnOnTrotecAC/TurnOnTrotecAC.ino diff --git a/lib/IRremoteESP8266-2.7.0/examples/TurnOnTrotecAC/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/TurnOnTrotecAC/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/TurnOnTrotecAC/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/TurnOnTrotecAC/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/README.md b/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/README.md similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/README.md rename to lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/README.md diff --git a/lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/Web-AC-control.ino b/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/Web-AC-control.ino similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/Web-AC-control.ino rename to lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/Web-AC-control.ino diff --git a/lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/platformio.ini b/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/platformio.ini similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/platformio.ini rename to lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/platformio.ini diff --git a/lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/printscreen.png b/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/printscreen.png similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/printscreen.png rename to lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/printscreen.png diff --git a/lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/favicon.ico b/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/favicon.ico similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/favicon.ico rename to lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/favicon.ico diff --git a/lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/level_1_off.svg b/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_1_off.svg similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/level_1_off.svg rename to lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_1_off.svg diff --git a/lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/level_1_on.svg b/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_1_on.svg similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/level_1_on.svg rename to lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_1_on.svg diff --git a/lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/level_2_off.svg b/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_2_off.svg similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/level_2_off.svg rename to lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_2_off.svg diff --git a/lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/level_2_on.svg b/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_2_on.svg similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/level_2_on.svg rename to lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_2_on.svg diff --git a/lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/level_3_off.svg b/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_3_off.svg similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/level_3_off.svg rename to lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_3_off.svg diff --git a/lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/level_3_on.svg b/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_3_on.svg similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/level_3_on.svg rename to lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_3_on.svg diff --git a/lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/level_4_off.svg b/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_4_off.svg similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/level_4_off.svg rename to lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_4_off.svg diff --git a/lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/level_4_on.svg b/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_4_on.svg similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/level_4_on.svg rename to lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/level_4_on.svg diff --git a/lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/ui.html b/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/ui.html similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/ui.html rename to lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/ui.html diff --git a/lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/ui.js b/lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/ui.js similarity index 100% rename from lib/IRremoteESP8266-2.7.0/examples/Web-AC-control/upload/ui.js rename to lib/IRremoteESP8266-2.7.1/examples/Web-AC-control/upload/ui.js diff --git a/lib/IRremoteESP8266-2.7.0/keywords.txt b/lib/IRremoteESP8266-2.7.1/keywords.txt similarity index 96% rename from lib/IRremoteESP8266-2.7.0/keywords.txt rename to lib/IRremoteESP8266-2.7.1/keywords.txt index 33a48f5f2..f027e808b 100644 --- a/lib/IRremoteESP8266-2.7.0/keywords.txt +++ b/lib/IRremoteESP8266-2.7.1/keywords.txt @@ -920,6 +920,7 @@ PANASONIC LITERAL1 PANASONIC_AC LITERAL1 PANASONIC_BITS LITERAL1 PIONEER LITERAL1 +PROGMEM LITERAL1 PRONTO LITERAL1 RAW LITERAL1 RAWTICK LITERAL1 @@ -1052,6 +1053,10 @@ WHYNTER LITERAL1 WHYNTER_BITS LITERAL1 YAW1F LITERAL1 YBOFB LITERAL1 +k3DStr LITERAL1 +k6thSenseStr LITERAL1 +k8CHeatStr LITERAL1 +kAirFlowStr LITERAL1 kAiwaRcT501Bits LITERAL1 kAiwaRcT501MinRepeats LITERAL1 kAiwaRcT501PostBits LITERAL1 @@ -1152,6 +1157,14 @@ kArgoTempLowOffset LITERAL1 kArgoTempLowSize LITERAL1 kArgoZeroSpace LITERAL1 kAuto LITERAL1 +kAutoStr LITERAL1 +kAutomaticStr LITERAL1 +kBeepStr LITERAL1 +kBitsStr LITERAL1 +kBottomStr LITERAL1 +kBreezeStr LITERAL1 +kButtonStr LITERAL1 +kCancelStr LITERAL1 kCarrierAcBitMark LITERAL1 kCarrierAcBits LITERAL1 kCarrierAcGap LITERAL1 @@ -1160,7 +1173,20 @@ kCarrierAcHdrSpace LITERAL1 kCarrierAcMinRepeat LITERAL1 kCarrierAcOneSpace LITERAL1 kCarrierAcZeroSpace LITERAL1 +kCeilingStr LITERAL1 +kCelsiusStr LITERAL1 +kCentreStr LITERAL1 +kChangeStr LITERAL1 +kCirculateStr LITERAL1 +kCleanStr LITERAL1 +kClockStr LITERAL1 +kCodeStr LITERAL1 +kColonSpaceStr LITERAL1 +kComfortStr LITERAL1 +kCommaSpaceStr LITERAL1 +kCommandStr LITERAL1 kCool LITERAL1 +kCoolStr LITERAL1 kCoolixAuto LITERAL1 kCoolixBitMark LITERAL1 kCoolixBitMarkTicks LITERAL1 @@ -1537,6 +1563,8 @@ kDaikinTempSize LITERAL1 kDaikinTolerance LITERAL1 kDaikinUnusedTime LITERAL1 kDaikinZeroSpace LITERAL1 +kDayStr LITERAL1 +kDaysStr LITERAL1 kDefaultESP32Timer LITERAL1 kDefaultMessageGap LITERAL1 kDenon48Bits LITERAL1 @@ -1572,9 +1600,12 @@ kDishRptSpaceTicks LITERAL1 kDishTick LITERAL1 kDishZeroSpace LITERAL1 kDishZeroSpaceTicks LITERAL1 +kDownStr LITERAL1 kDry LITERAL1 +kDryStr LITERAL1 kDutyDefault LITERAL1 kDutyMax LITERAL1 +kEconoStr LITERAL1 kElectraAcAuto LITERAL1 kElectraAcBitMark LITERAL1 kElectraAcBits LITERAL1 @@ -1607,10 +1638,20 @@ kElectraAcTempDelta LITERAL1 kElectraAcTempOffset LITERAL1 kElectraAcTempSize LITERAL1 kElectraAcZeroSpace LITERAL1 +kEyeAutoStr LITERAL1 +kEyeStr LITERAL1 +kFalseStr LITERAL1 kFan LITERAL1 +kFanOnlyStr LITERAL1 +kFanStr LITERAL1 +kFastStr LITERAL1 +kFilterStr LITERAL1 +kFixedStr LITERAL1 kFnvBasis32 LITERAL1 kFnvPrime32 LITERAL1 +kFollowStr LITERAL1 kFooter LITERAL1 +kFreshStr LITERAL1 kFujitsuAcBitMark LITERAL1 kFujitsuAcBits LITERAL1 kFujitsuAcCleanOffset LITERAL1 @@ -1863,10 +1904,15 @@ kHaierAcYrw02TurboOffset LITERAL1 kHaierAcYrw02TurboSize LITERAL1 kHaierAcZeroSpace LITERAL1 kHeader LITERAL1 +kHealthStr LITERAL1 kHeat LITERAL1 +kHeatStr LITERAL1 +kHiStr LITERAL1 kHigh LITERAL1 kHighNibble LITERAL1 +kHighStr LITERAL1 kHighest LITERAL1 +kHighestStr LITERAL1 kHitachiAc1Bits LITERAL1 kHitachiAc1HdrMark LITERAL1 kHitachiAc1HdrSpace LITERAL1 @@ -1875,6 +1921,12 @@ kHitachiAc2Bits LITERAL1 kHitachiAc2StateLength LITERAL1 kHitachiAc424BitMark LITERAL1 kHitachiAc424Bits LITERAL1 +kHitachiAc424ButtonByte LITERAL1 +kHitachiAc424ButtonFan LITERAL1 +kHitachiAc424ButtonPowerMode LITERAL1 +kHitachiAc424ButtonSwingV LITERAL1 +kHitachiAc424ButtonTempDown LITERAL1 +kHitachiAc424ButtonTempUp LITERAL1 kHitachiAc424Cool LITERAL1 kHitachiAc424Dry LITERAL1 kHitachiAc424Fan LITERAL1 @@ -1897,7 +1949,8 @@ kHitachiAc424MinTemp LITERAL1 kHitachiAc424ModeByte LITERAL1 kHitachiAc424OneSpace LITERAL1 kHitachiAc424PowerByte LITERAL1 -kHitachiAc424PowerOffset LITERAL1 +kHitachiAc424PowerOff LITERAL1 +kHitachiAc424PowerOn LITERAL1 kHitachiAc424StateLength LITERAL1 kHitachiAc424TempByte LITERAL1 kHitachiAc424TempOffset LITERAL1 @@ -1927,6 +1980,11 @@ kHitachiAcPowerOffset LITERAL1 kHitachiAcStateLength LITERAL1 kHitachiAcSwingOffset LITERAL1 kHitachiAcZeroSpace LITERAL1 +kHoldStr LITERAL1 +kHourStr LITERAL1 +kHoursStr LITERAL1 +kHumidStr LITERAL1 +kIFeelStr LITERAL1 kIdleState LITERAL1 kInaxBitMark LITERAL1 kInaxBits LITERAL1 @@ -1937,6 +1995,7 @@ kInaxMinRepeat LITERAL1 kInaxOneSpace LITERAL1 kInaxTick LITERAL1 kInaxZeroSpace LITERAL1 +kIonStr LITERAL1 kJvcBitMark LITERAL1 kJvcBitMarkTicks LITERAL1 kJvcBits LITERAL1 @@ -2008,10 +2067,13 @@ kLasertagTolerance LITERAL1 kLastDecodeType LITERAL1 kLastFanspeedEnum LITERAL1 kLastOpmodeEnum LITERAL1 +kLastStr LITERAL1 kLastSwinghEnum LITERAL1 kLastSwingvEnum LITERAL1 kLeft LITERAL1 kLeftMax LITERAL1 +kLeftMaxStr LITERAL1 +kLeftStr LITERAL1 kLegoPfBitMark LITERAL1 kLegoPfBits LITERAL1 kLegoPfHdrSpace LITERAL1 @@ -2050,9 +2112,16 @@ kLgRptSpaceTicks LITERAL1 kLgTick LITERAL1 kLgZeroSpace LITERAL1 kLgZeroSpaceTicks LITERAL1 +kLightStr LITERAL1 +kLightToggleStr LITERAL1 +kLoStr LITERAL1 +kLoudStr LITERAL1 kLow LITERAL1 kLowNibble LITERAL1 +kLowStr LITERAL1 +kLowerStr LITERAL1 kLowest LITERAL1 +kLowestStr LITERAL1 kLutronBits LITERAL1 kLutronDelta LITERAL1 kLutronGap LITERAL1 @@ -2073,14 +2142,23 @@ kMagiQuestSpaceZero LITERAL1 kMagiQuestTotalUsec LITERAL1 kMagiQuestZeroRatio LITERAL1 kMagiquestBits LITERAL1 +kManualStr LITERAL1 kMark LITERAL1 kMarkExcess LITERAL1 kMarkState LITERAL1 kMax LITERAL1 kMaxAccurateUsecDelay LITERAL1 +kMaxLeftStr LITERAL1 +kMaxRightStr LITERAL1 +kMaxStr LITERAL1 kMaxTimeoutMs LITERAL1 +kMaximumStr LITERAL1 +kMedStr LITERAL1 kMedium LITERAL1 +kMediumStr LITERAL1 +kMidStr LITERAL1 kMiddle LITERAL1 +kMiddleStr LITERAL1 kMideaACAuto LITERAL1 kMideaACCelsiusOffset LITERAL1 kMideaACCool LITERAL1 @@ -2120,6 +2198,10 @@ kMideaTolerance LITERAL1 kMideaZeroSpace LITERAL1 kMideaZeroSpaceTicks LITERAL1 kMin LITERAL1 +kMinStr LITERAL1 +kMinimumStr LITERAL1 +kMinuteStr LITERAL1 +kMinutesStr LITERAL1 kMitsubishi112Auto LITERAL1 kMitsubishi112BitMark LITERAL1 kMitsubishi112Bits LITERAL1 @@ -2350,6 +2432,11 @@ kMitsubishiTick LITERAL1 kMitsubishiZeroSpace LITERAL1 kMitsubishiZeroSpaceTicks LITERAL1 kModeBitsSize LITERAL1 +kModeStr LITERAL1 +kModelStr LITERAL1 +kMouldStr LITERAL1 +kMoveStr LITERAL1 +kNAStr LITERAL1 kNECBits LITERAL1 kNecBitMark LITERAL1 kNecBitMarkTicks LITERAL1 @@ -2428,6 +2515,7 @@ kNeoclimaTempSize LITERAL1 kNeoclimaTurboOffset LITERAL1 kNeoclimaZeroSpace LITERAL1 kNibbleSize LITERAL1 +kNightStr LITERAL1 kNikaiBitMark LITERAL1 kNikaiBitMarkTicks LITERAL1 kNikaiBits LITERAL1 @@ -2443,7 +2531,15 @@ kNikaiTick LITERAL1 kNikaiZeroSpace LITERAL1 kNikaiZeroSpaceTicks LITERAL1 kNoRepeat LITERAL1 +kNoStr LITERAL1 +kNowStr LITERAL1 kOff LITERAL1 +kOffStr LITERAL1 +kOffTimerStr LITERAL1 +kOnStr LITERAL1 +kOnTimerStr LITERAL1 +kOutsideQuietStr LITERAL1 +kOutsideStr LITERAL1 kPanasonicAcAuto LITERAL1 kPanasonicAcBits LITERAL1 kPanasonicAcChecksumInit LITERAL1 @@ -2537,6 +2633,9 @@ kPioneerOneSpaceTicks LITERAL1 kPioneerTick LITERAL1 kPioneerZeroSpace LITERAL1 kPioneerZeroSpaceTicks LITERAL1 +kPowerStr LITERAL1 +kPowerToggleStr LITERAL1 +kPowerfulStr LITERAL1 kProntoDataOffset LITERAL1 kProntoFreqFactor LITERAL1 kProntoFreqOffset LITERAL1 @@ -2544,6 +2643,9 @@ kProntoMinLength LITERAL1 kProntoSeq1LenOffset LITERAL1 kProntoSeq2LenOffset LITERAL1 kProntoTypeOffset LITERAL1 +kProtocolStr LITERAL1 +kPurifyStr LITERAL1 +kQuietStr LITERAL1 kRC5Bits LITERAL1 kRC5RawBits LITERAL1 kRC5XBits LITERAL1 @@ -2588,8 +2690,12 @@ kRcmmRptLengthTicks LITERAL1 kRcmmTick LITERAL1 kRcmmTolerance LITERAL1 kRepeat LITERAL1 +kRepeatStr LITERAL1 kRight LITERAL1 kRightMax LITERAL1 +kRightMaxStr LITERAL1 +kRightStr LITERAL1 +kRoomStr LITERAL1 kSamsung36Bits LITERAL1 kSamsungACSectionLength LITERAL1 kSamsungAcAuto LITERAL1 @@ -2676,6 +2782,12 @@ kSanyoSa8650bHdrSpace LITERAL1 kSanyoSa8650bOneMark LITERAL1 kSanyoSa8650bRptLength LITERAL1 kSanyoSa8650bZeroMark LITERAL1 +kSaveStr LITERAL1 +kSecondStr LITERAL1 +kSecondsStr LITERAL1 +kSensorStr LITERAL1 +kSensorTempStr LITERAL1 +kSetStr LITERAL1 kSharpAcAuto LITERAL1 kSharpAcBitFanManualOffset LITERAL1 kSharpAcBitMark LITERAL1 @@ -2725,7 +2837,11 @@ kSharpZeroSpace LITERAL1 kSharpZeroSpaceTicks LITERAL1 kSherwoodBits LITERAL1 kSherwoodMinRepeat LITERAL1 +kSilentStr LITERAL1 kSingleRepeat LITERAL1 +kSleepStr LITERAL1 +kSleepTimerStr LITERAL1 +kSlowStr LITERAL1 kSony12Bits LITERAL1 kSony15Bits LITERAL1 kSony20Bits LITERAL1 @@ -2745,10 +2861,20 @@ kSonyTick LITERAL1 kSonyZeroMark LITERAL1 kSonyZeroMarkTicks LITERAL1 kSpace LITERAL1 +kSpaceLBraceStr LITERAL1 kSpaceState LITERAL1 kStartOffset LITERAL1 +kStartStr LITERAL1 kStateSizeMax LITERAL1 +kStepStr LITERAL1 kStopState LITERAL1 +kStopStr LITERAL1 +kSuperStr LITERAL1 +kSwingHStr LITERAL1 +kSwingStr LITERAL1 +kSwingVModeStr LITERAL1 +kSwingVStr LITERAL1 +kSwingVToggleStr LITERAL1 kTcl112AcAuto LITERAL1 kTcl112AcBitEconoOffset LITERAL1 kTcl112AcBitHealthOffset LITERAL1 @@ -2821,8 +2947,15 @@ kTecoTimerTensHoursSize LITERAL1 kTecoTimerUnitHoursOffset LITERAL1 kTecoTimerUnitHoursSize LITERAL1 kTecoZeroSpace LITERAL1 +kTempDownStr LITERAL1 +kTempStr LITERAL1 +kTempUpStr LITERAL1 +kThreeLetterDayOfWeekStr LITERAL1 kTimeoutMs LITERAL1 +kTimerStr LITERAL1 +kToggleStr LITERAL1 kTolerance LITERAL1 +kTopStr LITERAL1 kToshibaACBits LITERAL1 kToshibaACMinRepeat LITERAL1 kToshibaACStateLength LITERAL1 @@ -2881,7 +3014,12 @@ kTrotecTempOffset LITERAL1 kTrotecTempSize LITERAL1 kTrotecTimerBitOffset LITERAL1 kTrotecZeroSpace LITERAL1 +kTrueStr LITERAL1 +kTurboStr LITERAL1 +kUnknownStr LITERAL1 kUnknownThreshold LITERAL1 +kUpStr LITERAL1 +kUpperStr LITERAL1 kUseDefTol LITERAL1 kVestelAcAuto LITERAL1 kVestelAcBitMark LITERAL1 @@ -2934,6 +3072,8 @@ kVestelAcTolerance LITERAL1 kVestelAcTurbo LITERAL1 kVestelAcTurboSleepOffset LITERAL1 kVestelAcZeroSpace LITERAL1 +kWallStr LITERAL1 +kWeeklyTimerStr LITERAL1 kWhirlpoolAcAltTempOffset LITERAL1 kWhirlpoolAcAltTempPos LITERAL1 kWhirlpoolAcAuto LITERAL1 @@ -3014,3 +3154,8 @@ kWhynterTick LITERAL1 kWhynterZeroSpace LITERAL1 kWhynterZeroSpaceTicks LITERAL1 kWide LITERAL1 +kWideStr LITERAL1 +kWifiStr LITERAL1 +kXFanStr LITERAL1 +kYesStr LITERAL1 +kZoneFollowStr LITERAL1 diff --git a/lib/IRremoteESP8266-2.7.0/library.json b/lib/IRremoteESP8266-2.7.1/library.json similarity index 97% rename from lib/IRremoteESP8266-2.7.0/library.json rename to lib/IRremoteESP8266-2.7.1/library.json index 361bbb0af..50464bed1 100644 --- a/lib/IRremoteESP8266-2.7.0/library.json +++ b/lib/IRremoteESP8266-2.7.1/library.json @@ -1,6 +1,6 @@ { "name": "IRremoteESP8266", - "version": "2.7.0", + "version": "2.7.1", "keywords": "infrared, ir, remote, esp8266, esp32", "description": "Send and receive infrared signals with multiple protocols (ESP8266/ESP32)", "repository": diff --git a/lib/IRremoteESP8266-2.7.0/library.properties b/lib/IRremoteESP8266-2.7.1/library.properties similarity index 97% rename from lib/IRremoteESP8266-2.7.0/library.properties rename to lib/IRremoteESP8266-2.7.1/library.properties index 1f2c0770f..6e7215626 100644 --- a/lib/IRremoteESP8266-2.7.0/library.properties +++ b/lib/IRremoteESP8266-2.7.1/library.properties @@ -1,5 +1,5 @@ name=IRremoteESP8266 -version=2.7.0 +version=2.7.1 author=David Conran, Sebastien Warin, Mark Szabo, Ken Shirriff maintainer=Mark Szabo, David Conran, Sebastien Warin, Roi Dayan, Massimiliano Pinto sentence=Send and receive infrared signals with multiple protocols (ESP8266/ESP32) diff --git a/lib/IRremoteESP8266-2.7.0/pylintrc b/lib/IRremoteESP8266-2.7.1/pylintrc similarity index 100% rename from lib/IRremoteESP8266-2.7.0/pylintrc rename to lib/IRremoteESP8266-2.7.1/pylintrc diff --git a/lib/IRremoteESP8266-2.7.0/src/CPPLINT.cfg b/lib/IRremoteESP8266-2.7.1/src/CPPLINT.cfg similarity index 100% rename from lib/IRremoteESP8266-2.7.0/src/CPPLINT.cfg rename to lib/IRremoteESP8266-2.7.1/src/CPPLINT.cfg diff --git a/lib/IRremoteESP8266-2.7.0/src/IRac.cpp b/lib/IRremoteESP8266-2.7.1/src/IRac.cpp similarity index 95% rename from lib/IRremoteESP8266-2.7.0/src/IRac.cpp rename to lib/IRremoteESP8266-2.7.1/src/IRac.cpp index bec5eb554..f8e5ca759 100644 --- a/lib/IRremoteESP8266-2.7.0/src/IRac.cpp +++ b/lib/IRremoteESP8266-2.7.1/src/IRac.cpp @@ -670,13 +670,15 @@ void IRac::hitachi(IRHitachiAc *ac, #if SEND_HITACHI_AC424 void IRac::hitachi424(IRHitachiAc424 *ac, const bool on, const stdAc::opmode_t mode, - const float degrees, const stdAc::fanspeed_t fan) { + const float degrees, const stdAc::fanspeed_t fan, + const stdAc::swingv_t swingv) { ac->begin(); - ac->setPower(on); ac->setMode(ac->convertMode(mode)); ac->setTemp(degrees); ac->setFan(ac->convertFan(fan)); - // TODO(jamsinclair): Add Swing(V) support. + ac->setPower(on); + // SwingVToggle is special. Needs to be last method called. + ac->setSwingVToggle(swingv != stdAc::swingv_t::kOff); // No Swing(H) setting available. // No Quiet setting available. // No Turbo setting available. @@ -1174,6 +1176,7 @@ stdAc::state_t IRac::handleToggles(const stdAc::state_t desired, result.light = desired.light ^ prev->light; break; case decode_type_t::MIDEA: + case decode_type_t::HITACHI_AC424: if ((desired.swingv == stdAc::swingv_t::kOff) ^ (prev->swingv == stdAc::swingv_t::kOff)) // It changed, so toggle. result.swingv = stdAc::swingv_t::kAuto; @@ -1413,7 +1416,7 @@ bool IRac::sendAc(const stdAc::state_t desired, const stdAc::state_t *prev) { case HITACHI_AC424: { IRHitachiAc424 ac(_pin, _inverted, _modulation); - hitachi424(&ac, on, send.mode, degC, send.fanspeed); + hitachi424(&ac, on, send.mode, degC, send.fanspeed, send.swingv); break; } #endif // SEND_HITACHI_AC424 @@ -1601,25 +1604,25 @@ bool IRac::hasStateChanged(void) { return cmpStates(next, _prev); } stdAc::opmode_t IRac::strToOpmode(const char *str, const stdAc::opmode_t def) { - if (!strcasecmp(str, kAutoStr.c_str()) || - !strcasecmp(str, kAutomaticStr.c_str())) + if (!strcasecmp(str, kAutoStr) || + !strcasecmp(str, kAutomaticStr)) return stdAc::opmode_t::kAuto; - else if (!strcasecmp(str, kOffStr.c_str()) || - !strcasecmp(str, kStopStr.c_str())) + else if (!strcasecmp(str, kOffStr) || + !strcasecmp(str, kStopStr)) return stdAc::opmode_t::kOff; - else if (!strcasecmp(str, kCoolStr.c_str()) || + else if (!strcasecmp(str, kCoolStr) || !strcasecmp(str, "COOLING")) return stdAc::opmode_t::kCool; - else if (!strcasecmp(str, kHeatStr.c_str()) || + else if (!strcasecmp(str, kHeatStr) || !strcasecmp(str, "HEATING")) return stdAc::opmode_t::kHeat; - else if (!strcasecmp(str, kDryStr.c_str()) || + else if (!strcasecmp(str, kDryStr) || !strcasecmp(str, "DRYING") || !strcasecmp(str, "DEHUMIDIFY")) return stdAc::opmode_t::kDry; - else if (!strcasecmp(str, kFanStr.c_str()) || + else if (!strcasecmp(str, kFanStr) || !strcasecmp(str, "FANONLY") || - !strcasecmp(str, kFanOnlyStr.c_str())) + !strcasecmp(str, kFanOnlyStr)) return stdAc::opmode_t::kFan; else return def; @@ -1627,26 +1630,26 @@ stdAc::opmode_t IRac::strToOpmode(const char *str, stdAc::fanspeed_t IRac::strToFanspeed(const char *str, const stdAc::fanspeed_t def) { - if (!strcasecmp(str, kAutoStr.c_str()) || - !strcasecmp(str, kAutomaticStr.c_str())) + if (!strcasecmp(str, kAutoStr) || + !strcasecmp(str, kAutomaticStr)) return stdAc::fanspeed_t::kAuto; - else if (!strcasecmp(str, kMinStr.c_str()) || - !strcasecmp(str, kMinimumStr.c_str()) || - !strcasecmp(str, kLowestStr.c_str())) + else if (!strcasecmp(str, kMinStr) || + !strcasecmp(str, kMinimumStr) || + !strcasecmp(str, kLowestStr)) return stdAc::fanspeed_t::kMin; - else if (!strcasecmp(str, kLowStr.c_str()) || - !strcasecmp(str, kLoStr.c_str())) + else if (!strcasecmp(str, kLowStr) || + !strcasecmp(str, kLoStr)) return stdAc::fanspeed_t::kLow; - else if (!strcasecmp(str, kMedStr.c_str()) || - !strcasecmp(str, kMediumStr.c_str()) || - !strcasecmp(str, kMidStr.c_str())) + else if (!strcasecmp(str, kMedStr) || + !strcasecmp(str, kMediumStr) || + !strcasecmp(str, kMidStr)) return stdAc::fanspeed_t::kMedium; - else if (!strcasecmp(str, kHighStr.c_str()) || - !strcasecmp(str, kHiStr.c_str())) + else if (!strcasecmp(str, kHighStr) || + !strcasecmp(str, kHiStr)) return stdAc::fanspeed_t::kHigh; - else if (!strcasecmp(str, kMaxStr.c_str()) || - !strcasecmp(str, kMaximumStr.c_str()) || - !strcasecmp(str, kHighestStr.c_str())) + else if (!strcasecmp(str, kMaxStr) || + !strcasecmp(str, kMaximumStr) || + !strcasecmp(str, kHighestStr)) return stdAc::fanspeed_t::kMax; else return def; @@ -1654,36 +1657,36 @@ stdAc::fanspeed_t IRac::strToFanspeed(const char *str, stdAc::swingv_t IRac::strToSwingV(const char *str, const stdAc::swingv_t def) { - if (!strcasecmp(str, kAutoStr.c_str()) || - !strcasecmp(str, kAutomaticStr.c_str()) || - !strcasecmp(str, kOnStr.c_str()) || - !strcasecmp(str, kSwingStr.c_str())) + if (!strcasecmp(str, kAutoStr) || + !strcasecmp(str, kAutomaticStr) || + !strcasecmp(str, kOnStr) || + !strcasecmp(str, kSwingStr)) return stdAc::swingv_t::kAuto; - else if (!strcasecmp(str, kOffStr.c_str()) || - !strcasecmp(str, kStopStr.c_str())) + else if (!strcasecmp(str, kOffStr) || + !strcasecmp(str, kStopStr)) return stdAc::swingv_t::kOff; - else if (!strcasecmp(str, kMinStr.c_str()) || - !strcasecmp(str, kMinimumStr.c_str()) || - !strcasecmp(str, kLowestStr.c_str()) || - !strcasecmp(str, kBottomStr.c_str()) || - !strcasecmp(str, kDownStr.c_str())) + else if (!strcasecmp(str, kMinStr) || + !strcasecmp(str, kMinimumStr) || + !strcasecmp(str, kLowestStr) || + !strcasecmp(str, kBottomStr) || + !strcasecmp(str, kDownStr)) return stdAc::swingv_t::kLowest; - else if (!strcasecmp(str, kLowStr.c_str())) + else if (!strcasecmp(str, kLowStr)) return stdAc::swingv_t::kLow; - else if (!strcasecmp(str, kMidStr.c_str()) || - !strcasecmp(str, kMiddleStr.c_str()) || - !strcasecmp(str, kMedStr.c_str()) || - !strcasecmp(str, kMediumStr.c_str()) || - !strcasecmp(str, kCentreStr.c_str())) + else if (!strcasecmp(str, kMidStr) || + !strcasecmp(str, kMiddleStr) || + !strcasecmp(str, kMedStr) || + !strcasecmp(str, kMediumStr) || + !strcasecmp(str, kCentreStr)) return stdAc::swingv_t::kMiddle; - else if (!strcasecmp(str, kHighStr.c_str()) || - !strcasecmp(str, kHiStr.c_str())) + else if (!strcasecmp(str, kHighStr) || + !strcasecmp(str, kHiStr)) return stdAc::swingv_t::kHigh; - else if (!strcasecmp(str, kHighestStr.c_str()) || - !strcasecmp(str, kMaxStr.c_str()) || - !strcasecmp(str, kMaximumStr.c_str()) || - !strcasecmp(str, kTopStr.c_str()) || - !strcasecmp(str, kUpStr.c_str())) + else if (!strcasecmp(str, kHighestStr) || + !strcasecmp(str, kMaxStr) || + !strcasecmp(str, kMaximumStr) || + !strcasecmp(str, kTopStr) || + !strcasecmp(str, kUpStr)) return stdAc::swingv_t::kHighest; else return def; @@ -1691,34 +1694,34 @@ stdAc::swingv_t IRac::strToSwingV(const char *str, stdAc::swingh_t IRac::strToSwingH(const char *str, const stdAc::swingh_t def) { - if (!strcasecmp(str, kAutoStr.c_str()) || - !strcasecmp(str, kAutomaticStr.c_str()) || - !strcasecmp(str, kOnStr.c_str()) || !strcasecmp(str, kSwingStr.c_str())) + if (!strcasecmp(str, kAutoStr) || + !strcasecmp(str, kAutomaticStr) || + !strcasecmp(str, kOnStr) || !strcasecmp(str, kSwingStr)) return stdAc::swingh_t::kAuto; - else if (!strcasecmp(str, kOffStr.c_str()) || - !strcasecmp(str, kStopStr.c_str())) + else if (!strcasecmp(str, kOffStr) || + !strcasecmp(str, kStopStr)) return stdAc::swingh_t::kOff; - else if (!strcasecmp(str, kLeftMaxStr.c_str()) || + else if (!strcasecmp(str, kLeftMaxStr) || !strcasecmp(str, D_STR_LEFT " " D_STR_MAX) || !strcasecmp(str, D_STR_MAX D_STR_LEFT) || - !strcasecmp(str, kMaxLeftStr.c_str())) + !strcasecmp(str, kMaxLeftStr)) return stdAc::swingh_t::kLeftMax; - else if (!strcasecmp(str, kLeftStr.c_str())) + else if (!strcasecmp(str, kLeftStr)) return stdAc::swingh_t::kLeft; - else if (!strcasecmp(str, kMidStr.c_str()) || - !strcasecmp(str, kMiddleStr.c_str()) || - !strcasecmp(str, kMedStr.c_str()) || - !strcasecmp(str, kMediumStr.c_str()) || - !strcasecmp(str, kCentreStr.c_str())) + else if (!strcasecmp(str, kMidStr) || + !strcasecmp(str, kMiddleStr) || + !strcasecmp(str, kMedStr) || + !strcasecmp(str, kMediumStr) || + !strcasecmp(str, kCentreStr)) return stdAc::swingh_t::kMiddle; - else if (!strcasecmp(str, kRightStr.c_str())) + else if (!strcasecmp(str, kRightStr)) return stdAc::swingh_t::kRight; - else if (!strcasecmp(str, kRightMaxStr.c_str()) || + else if (!strcasecmp(str, kRightMaxStr) || !strcasecmp(str, D_STR_MAX " " D_STR_RIGHT) || !strcasecmp(str, D_STR_MAX D_STR_RIGHT) || - !strcasecmp(str, kMaxRightStr.c_str())) + !strcasecmp(str, kMaxRightStr)) return stdAc::swingh_t::kRightMax; - else if (!strcasecmp(str, kWideStr.c_str())) + else if (!strcasecmp(str, kWideStr)) return stdAc::swingh_t::kWide; else return def; @@ -1771,15 +1774,15 @@ int16_t IRac::strToModel(const char *str, const int16_t def) { } bool IRac::strToBool(const char *str, const bool def) { - if (!strcasecmp(str, kOnStr.c_str()) || + if (!strcasecmp(str, kOnStr) || !strcasecmp(str, "1") || - !strcasecmp(str, kYesStr.c_str()) || - !strcasecmp(str, kTrueStr.c_str())) + !strcasecmp(str, kYesStr) || + !strcasecmp(str, kTrueStr)) return true; - else if (!strcasecmp(str, kOffStr.c_str()) || + else if (!strcasecmp(str, kOffStr) || !strcasecmp(str, "0") || - !strcasecmp(str, kNoStr.c_str()) || - !strcasecmp(str, kFalseStr.c_str())) + !strcasecmp(str, kNoStr) || + !strcasecmp(str, kFalseStr)) return false; else return def; diff --git a/lib/IRremoteESP8266-2.7.0/src/IRac.h b/lib/IRremoteESP8266-2.7.1/src/IRac.h similarity index 99% rename from lib/IRremoteESP8266-2.7.0/src/IRac.h rename to lib/IRremoteESP8266-2.7.1/src/IRac.h index 2fae0084a..4e1237d8d 100644 --- a/lib/IRremoteESP8266-2.7.0/src/IRac.h +++ b/lib/IRremoteESP8266-2.7.1/src/IRac.h @@ -219,7 +219,8 @@ void electra(IRElectraAc *ac, #if SEND_HITACHI_AC424 void hitachi424(IRHitachiAc424 *ac, const bool on, const stdAc::opmode_t mode, - const float degrees, const stdAc::fanspeed_t fan); + const float degrees, const stdAc::fanspeed_t fan, + const stdAc::swingv_t swingv); #endif // SEND_HITACHI_AC424 #if SEND_KELVINATOR void kelvinator(IRKelvinatorAC *ac, diff --git a/lib/IRremoteESP8266-2.7.0/src/IRrecv.cpp b/lib/IRremoteESP8266-2.7.1/src/IRrecv.cpp similarity index 100% rename from lib/IRremoteESP8266-2.7.0/src/IRrecv.cpp rename to lib/IRremoteESP8266-2.7.1/src/IRrecv.cpp diff --git a/lib/IRremoteESP8266-2.7.0/src/IRrecv.h b/lib/IRremoteESP8266-2.7.1/src/IRrecv.h similarity index 100% rename from lib/IRremoteESP8266-2.7.0/src/IRrecv.h rename to lib/IRremoteESP8266-2.7.1/src/IRrecv.h diff --git a/lib/IRremoteESP8266-2.7.0/src/IRremoteESP8266.h b/lib/IRremoteESP8266-2.7.1/src/IRremoteESP8266.h similarity index 99% rename from lib/IRremoteESP8266-2.7.0/src/IRremoteESP8266.h rename to lib/IRremoteESP8266-2.7.1/src/IRremoteESP8266.h index 0bdd0a2dd..9e4cdbaab 100644 --- a/lib/IRremoteESP8266-2.7.0/src/IRremoteESP8266.h +++ b/lib/IRremoteESP8266-2.7.1/src/IRremoteESP8266.h @@ -1,4 +1,4 @@ - /*************************************************** +/*************************************************** * IRremote for ESP8266 * * Based on the IRremote library for Arduino by Ken Shirriff @@ -52,7 +52,7 @@ #endif // UNIT_TEST // Library Version -#define _IRREMOTEESP8266_VERSION_ "2.7.0" +#define _IRREMOTEESP8266_VERSION_ "2.7.1" // Set the language & locale for the library. See the `locale` dir for options. #ifndef _IR_LOCALE_ diff --git a/lib/IRremoteESP8266-2.7.0/src/IRsend.cpp b/lib/IRremoteESP8266-2.7.1/src/IRsend.cpp similarity index 100% rename from lib/IRremoteESP8266-2.7.0/src/IRsend.cpp rename to lib/IRremoteESP8266-2.7.1/src/IRsend.cpp diff --git a/lib/IRremoteESP8266-2.7.0/src/IRsend.h b/lib/IRremoteESP8266-2.7.1/src/IRsend.h similarity index 100% rename from lib/IRremoteESP8266-2.7.0/src/IRsend.h rename to lib/IRremoteESP8266-2.7.1/src/IRsend.h diff --git a/lib/IRremoteESP8266-2.7.1/src/IRtext.cpp b/lib/IRremoteESP8266-2.7.1/src/IRtext.cpp new file mode 100644 index 000000000..82f728191 --- /dev/null +++ b/lib/IRremoteESP8266-2.7.1/src/IRtext.cpp @@ -0,0 +1,164 @@ +// Copyright 2019 - David Conran (@crankyoldgit) + +#ifndef UNIT_TEST +#include
%s
"; -const char HTTP_MSG_SLIDER1[] PROGMEM = - "%s%s
"
- "";
-const char HTTP_MSG_SLIDER2[] PROGMEM =
- "%s%s
"
- "";
+const char HTTP_MSG_SLIDER_GRADIENT[] PROGMEM =
+ ""
+ ""
+ "
";
+const char HTTP_MSG_SLIDER_SHUTTER[] PROGMEM =
+ "" D_CLOSE "" D_OPEN "
"
+ "";
+
const char HTTP_MSG_RSTRT[] PROGMEM =
"" D_DEVICE_WILL_RESTART "
"; @@ -730,7 +730,7 @@ void _WSContentSend(const String& content) // Low level sendContent for a DEBUG_CORE_LOG(PSTR("WEB: Chunk size %d"), len); } -void WSContentFlush() +void WSContentFlush(void) { if (Web.chunk_buffer.length() > 0) { _WSContentSend(Web.chunk_buffer); // Flush chunk buffer @@ -766,9 +766,16 @@ void WSContentSend_P(const char* formatP, ...) // Content send snprintf_P ch // This uses char strings. Be aware of sending %% if % is needed va_list arg; va_start(arg, formatP); - vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg); + int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg); va_end(arg); +#ifdef DEBUG_TASMOTA_CORE + if (len > (sizeof(mqtt_data) -1)) { + mqtt_data[33] = '\0'; + DEBUG_CORE_LOG(PSTR("ERROR: WSContentSend_P size %d > mqtt_data size %d. Start of data [%s...]"), len, sizeof(mqtt_data), mqtt_data); + } +#endif + _WSContentSendBuffer(); } @@ -780,6 +787,13 @@ void WSContentSend_PD(const char* formatP, ...) // Content send snprintf_P ch int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg); va_end(arg); +#ifdef DEBUG_TASMOTA_CORE + if (len > (sizeof(mqtt_data) -1)) { + mqtt_data[33] = '\0'; + DEBUG_CORE_LOG(PSTR("ERROR: WSContentSend_PD size %d > mqtt_data size %d. Start of data [%s...]"), len, sizeof(mqtt_data), mqtt_data); + } +#endif + if (D_DECIMAL_SEPARATOR[0] != '.') { for (uint32_t i = 0; i < len; i++) { if ('.' == mqtt_data[i]) { @@ -829,8 +843,16 @@ void WSContentSendStyle_P(const char* formatP, ...) // This uses char strings. Be aware of sending %% if % is needed va_list arg; va_start(arg, formatP); - vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg); + int len = vsnprintf_P(mqtt_data, sizeof(mqtt_data), formatP, arg); va_end(arg); + +#ifdef DEBUG_TASMOTA_CORE + if (len > (sizeof(mqtt_data) -1)) { + mqtt_data[33] = '\0'; + DEBUG_CORE_LOG(PSTR("ERROR: WSContentSendStyle_P size %d > mqtt_data size %d. Start of data [%s...]"), len, sizeof(mqtt_data), mqtt_data); + } +#endif + _WSContentSendBuffer(); } WSContentSend_P(HTTP_HEAD_STYLE3, WebColor(COL_TEXT), @@ -982,7 +1004,7 @@ void HandleRoot(void) AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_MAIN_MENU); - char stemp[5]; + char stemp[10]; WSContentStart_P(S_MAIN_MENU); #ifdef USE_SCRIPT_WEB_DISPLAY @@ -990,37 +1012,83 @@ void HandleRoot(void) #else WSContentSend_P(HTTP_SCRIPT_ROOT, Settings.web_refresh); #endif + WSContentSend_P(HTTP_SCRIPT_ROOT_PART2); + WSContentSendStyle(); WSContentSend_P(PSTR("")); if (devices_present) { #ifdef USE_LIGHT if (light_type) { + uint8_t light_subtype = light_type &7; if (!Settings.flag3.pwm_multi_channels) { // SetOption68 0 - Enable multi-channels PWM instead of Color PWM - if ((LST_COLDWARM == (light_type &7)) || (LST_RGBWC == (light_type &7))) { - // Cold - Warm &t related to lb("t", value) and WebGetArg("t", tmp, sizeof(tmp)); - WSContentSend_P(HTTP_MSG_SLIDER1, F(D_COLDLIGHT), F(D_WARMLIGHT), - 153, 500, LightGetColorTemp(), 't'); + if ((LST_COLDWARM == light_subtype) || (LST_RGBWC == light_subtype)) { + + WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT, // Cold Warm + "a", // a - Unique HTML id + "#fff", "#ff0", // White to Yellow + 1, // sl1 + 153, 500, // Range color temperature + LightGetColorTemp(), + 't', 0); // t0 - Value id releated to lc("t0", value) and WebGetArg("t0", tmp, sizeof(tmp)); } - // Dark - Bright &d related to lb("d", value) and WebGetArg("d", tmp, sizeof(tmp)); - WSContentSend_P(HTTP_MSG_SLIDER1, F(D_DARKLIGHT), F(D_BRIGHTLIGHT), - 1, 100, Settings.light_dimmer, 'd'); + if (light_subtype > 2) { + uint16_t hue; + uint8_t sat; + LightGetHSB(&hue, &sat, nullptr); + + WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT, // Hue + "b", // b - Unique HTML id + "#800", "#f00 5%,#ff0 20%,#0f0 35%,#0ff 50%,#00f 65%,#f0f 80%,#f00 95%,#800", // Hue colors + 2, // sl2 - Unique range HTML id - Used as source for Saturation end color + 1, 359, // Range valid Hue + hue, + 'h', 0); // h0 - Value id + + uint8_t dcolor = changeUIntScale(Settings.light_dimmer, 0, 100, 0, 255); + char scolor[8]; + snprintf_P(scolor, sizeof(scolor), PSTR("#%02X%02X%02X"), dcolor, dcolor, dcolor); // Saturation start color from Black to White + uint8_t red, green, blue; + LightHsToRgb(hue, 255, &red, &green, &blue); + snprintf_P(stemp, sizeof(stemp), PSTR("#%02X%02X%02X"), red, green, blue); // Saturation end color + + WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT, // Saturation + "s", // s - Unique HTML id related to eb('s').style.background='linear-gradient(to right,rgb('+sl+'%%,'+sl+'%%,'+sl+'%%),hsl('+eb('sl2').value+',100%%,50%%))'; + scolor, stemp, // Brightness to max current color + 3, // sl3 - Unique range HTML id - Not used + 0, 100, // Range 0 to 100% + changeUIntScale(sat, 0, 255, 0, 100), + 'n', 0); // n0 - Value id + } + + WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT, // Brightness - Black to White + "c", // c - Unique HTML id + "#000", "#fff", // Black to White + 4, // sl4 - Unique range HTML id - Used as source for Saturation begin color + 0, 100, // Range 0 to 100% + Settings.light_dimmer, + 'd', 0); // d0 - Value id is related to lc("d0", value) and WebGetArg("d0", tmp, sizeof(tmp)); } else { // Settings.flag3.pwm_multi_channels - SetOption68 1 - Enable multi-channels PWM instead of Color PWM - uint32_t pwm_channels = (light_type & 7) > LST_MAX ? LST_MAX : (light_type & 7); + uint32_t pwm_channels = light_subtype > LST_MAX ? LST_MAX : light_subtype; + stemp[0] = 'e'; stemp[1] = '0'; stemp[2] = '\0'; // d0 for (uint32_t i = 0; i < pwm_channels; i++) { - snprintf_P(stemp, sizeof(stemp), PSTR("c%d"), i); - WSContentSend_P(HTTP_MSG_SLIDER2, stemp, FPSTR("100%"), - 1, 100, - changeUIntScale(Settings.light_color[i], 0, 255, 0, 100), 'd', i+1); + stemp[1]++; // e1 to e5 - Make unique ids + + WSContentSend_P(HTTP_MSG_SLIDER_GRADIENT, // Channel brightness - Black to White + stemp, // e1 to e5 - Unique HTML id + "#000", "#fff", // Black to White + i+1, // sl1 to sl5 - Unique range HTML id - Not used + 1, 100, // Range 1 to 100% + changeUIntScale(Settings.light_color[i], 0, 255, 0, 100), + 'e', i+1); // e1 to e5 - Value id } } // Settings.flag3.pwm_multi_channels } -#endif +#endif // USE_LIGHT #ifdef USE_SHUTTER if (Settings.flag3.shutter_mode) { // SetOption80 - Enable shutter support for (uint32_t i = 0; i < shutters_present; i++) { - WSContentSend_P(HTTP_MSG_SLIDER2, F(D_CLOSE), F(D_OPEN), - 0, 100, Settings.shutter_position[i], 'u', i+1); + WSContentSend_P(HTTP_MSG_SLIDER_SHUTTER, Settings.shutter_position[i], i+1); } } #endif // USE_SHUTTER @@ -1117,25 +1185,35 @@ bool HandleRootStatusRefresh(void) } #endif // USE_SONOFF_IFAN } - WebGetArg("d", tmp, sizeof(tmp)); // 0 - 100 Dimmer value + WebGetArg("d0", tmp, sizeof(tmp)); // 0 - 100 Dimmer value if (strlen(tmp)) { snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_DIMMER " %s"), tmp); ExecuteWebCommand(svalue, SRC_WEBGUI); } uint32_t pwm_channels = (light_type & 7) > LST_MAX ? LST_MAX : (light_type & 7); for (uint32_t j = 1; j <= pwm_channels; j++) { - snprintf_P(webindex, sizeof(webindex), PSTR("d%d"), j); + snprintf_P(webindex, sizeof(webindex), PSTR("e%d"), j); WebGetArg(webindex, tmp, sizeof(tmp)); // 0 - 100 percent if (strlen(tmp)) { snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_CHANNEL "%d %s"), j, tmp); ExecuteWebCommand(svalue, SRC_WEBGUI); } } - WebGetArg("t", tmp, sizeof(tmp)); // 153 - 500 Color temperature + WebGetArg("t0", tmp, sizeof(tmp)); // 153 - 500 Color temperature if (strlen(tmp)) { snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_COLORTEMPERATURE " %s"), tmp); ExecuteWebCommand(svalue, SRC_WEBGUI); } + WebGetArg("h0", tmp, sizeof(tmp)); // 0 - 359 Hue value + if (strlen(tmp)) { + snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_HSBCOLOR "1 %s"), tmp); + ExecuteWebCommand(svalue, SRC_WEBGUI); + } + WebGetArg("n0", tmp, sizeof(tmp)); // 0 - 99 Saturation value + if (strlen(tmp)) { + snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_HSBCOLOR "2 %s"), tmp); + ExecuteWebCommand(svalue, SRC_WEBGUI); + } #ifdef USE_SHUTTER for (uint32_t j = 1; j <= shutters_present; j++) { snprintf_P(webindex, sizeof(webindex), PSTR("u%d"), j); diff --git a/tasmota/xdrv_02_mqtt.ino b/tasmota/xdrv_02_mqtt.ino index c8250afbb..49f35d579 100644 --- a/tasmota/xdrv_02_mqtt.ino +++ b/tasmota/xdrv_02_mqtt.ino @@ -468,7 +468,7 @@ void MqttPublishPowerState(uint32_t device) #endif // USE_SONOFF_IFAN } -void MqttPublishAllPowerState() +void MqttPublishAllPowerState(void) { for (uint32_t i = 1; i <= devices_present; i++) { MqttPublishPowerState(i); @@ -493,7 +493,7 @@ void MqttPublishPowerBlinkState(uint32_t device) /*********************************************************************************************/ -uint16_t MqttConnectCount() +uint16_t MqttConnectCount(void) { return Mqtt.connect_count; } @@ -555,7 +555,7 @@ void MqttConnected(void) MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_INFO "2")); } #endif // USE_WEBSERVER - Response_P(PSTR("{\"" D_JSON_RESTARTREASON "\":\"%s\"}"), (GetResetReason() == "Exception") ? ESP.getResetInfo().c_str() : GetResetReason().c_str()); + Response_P(PSTR("{\"" D_JSON_RESTARTREASON "\":\"%s\"}"), GetResetReasonInfo().c_str()); MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_INFO "3")); MqttPublishAllPowerState(); if (Settings.tele_period) { @@ -1134,7 +1134,9 @@ void CmndTlsKey(void) { memcpy(spi_buffer + tls_obj_store_offset + entry->start, bin_buf, entry->len); } - TlsWriteSpiBuffer(spi_buffer); + if (ESP.flashEraseSector(tls_spi_start_sector)) { + ESP.flashWrite(tls_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) spi_buffer, SPI_FLASH_SEC_SIZE); + } free(spi_buffer); free(bin_buf); } @@ -1146,26 +1148,6 @@ void CmndTlsKey(void) { } } - -extern "C" { -#include "spi_flash.h" -} - -void TlsWriteSpiBuffer(uint8_t *buf) { - bool ret = false; - SpiFlashOpResult res; - - noInterrupts(); - res = spi_flash_erase_sector(tls_spi_start_sector); - if (SPI_FLASH_RESULT_OK == res) { - res = spi_flash_write(tls_spi_start_sector * SPI_FLASH_SEC_SIZE, (uint32_t*) buf, SPI_FLASH_SEC_SIZE); - if (SPI_FLASH_RESULT_OK == res) { - ret = true; - } - } - interrupts(); -} - #ifdef DEBUG_DUMP_TLS // Dump TLS Flash data - don't activate in production to protect your private keys uint32_t bswap32(uint32_t x) { diff --git a/tasmota/xdrv_03_energy.ino b/tasmota/xdrv_03_energy.ino index 743fc82fc..6d8be5c2b 100644 --- a/tasmota/xdrv_03_energy.ino +++ b/tasmota/xdrv_03_energy.ino @@ -430,7 +430,7 @@ void EnergyMqttShow(void) } #endif // USE_ENERGY_MARGIN_DETECTION -void EnergyEverySecond() +void EnergyEverySecond(void) { // Overtemp check if (global_update) { diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino index c6f6b3e33..3e06446ec 100644 --- a/tasmota/xdrv_04_light.ino +++ b/tasmota/xdrv_04_light.ino @@ -230,7 +230,7 @@ const uint8_t _ledTable[] = { //867,879,887,899,907,919,931,939,951,963,971,983,995,1003,1015,1023 struct LIGHT { - unsigned long strip_timer_counter = 0; // Bars and Gradient + uint32_t strip_timer_counter = 0; // Bars and Gradient power_t power = 0; // Power
decode-config.py
-decode-config.py is able to backup and restore Tasmota configuration.
-In comparison with the Tasmota build-in "Backup/Restore Configuration" function decode-config.py
--
-
- uses human readable and editable JSON-format for backup/restore, -
- can restore previously backup and changed JSON-format files, -
- is able to create Tasmota compatible command list with related config parameter -
Comparing backup files created by decode-config.py and *.dmp files created by Tasmota "Backup/Restore Configuration":
-| - | decode-config.py *.json file |
-Tasmota *.dmp file |
-
|---|---|---|
| Encrypted | -No | -Yes | -
| Readable | -Yes | -No | -
| Simply editable | -Yes | -No | -
| Simply batch processing | -Yes | -No | -
decode-config.py is compatible with Tasmota version from v5.10.0 up to now.
-Content
--
-
- Prerequisite -
- File Types - -
- Usage - -
Prerequisite
--
-
Python)
-
This program is written in Python) so you need to install a working python environment (for details see Python Setup and Usage)
-Tasmota Firmware with Web-Server enabled:
--
-
- To backup or restore configurations from or to a Tasmota device you need a firmare with enabled web-server in admin mode (command WebServer 2). This is the Tasmota default. -
- If using your own compiled firmware be aware to enable the web-server (
#define USE_WEBSERVERand#define WEB_SERVER 2).
-
-
File Types
-decode-config.py can handle the following backup file types:
-.dmp Format
-Configuration data as used by Tasmota "Backup/Restore Configuration" web interface.
This format is binary and encrypted.
.json Format
-Configuration data in JSON-format.
This format is decrypted, human readable and editable and can also be used for the --restore-file parameter.
This file will be created by decode-config.py using the --backup-file with --backup-type json parameter, this is the default.
.bin Format
-Configuration data in binary format.
This format is binary decryptet, editable (e.g. using a hex editor) and can also be used for --restore-file command.
It will be created by decode-config.py using --backup-file with --backup-type bin.
Note:
The .bin file contains the same information as the original .dmp file from Tasmota "Backup/Restore Configuration" but it is decrpted and 4 byte longer than an original (it is a prefix header at the beginning). .bin file data starting at address 4 contains the same as the struct SYSCFG from Tasmota settings.h in decrypted format.
File extensions
-You don't need to append exensions for your file name as decode-config.py uses auto extension as default. The extension will be choose based on file contents and --backup-type parameter.
-If you do not want using auto extensions use the --no-extension parameter.
Usage
-After download don't forget to set the executable flag under linux with chmod +x decode-config.py or call the program using python decode-config.py....
Basics
-At least pass a source where you want to read the configuration data from using -f <filename> or -d <host>:
The source can be either
--
-
- a Tasmota device hostname or IP using the
-d <host>parameter
- - a Tasmota
*.dmpconfiguration file using-f <filename>parameter
-
Example:
-decode-config.py -d sonoff-4281
-will output a human readable configuration in JSON-format:
-{
- "altitude": 112,
- "baudrate": 115200,
- "blinkcount": 10,
- "blinktime": 10,
-...
- "ws_width": [
- 1,
- 3,
- 5
- ]
-}
-Save backup file
-To save the output as backup file use --backup-file <filename>, you can use placeholder for Version, Friendlyname and Hostname:
decode-config.py -d sonoff-4281 --backup-file Config_@f_@v
-If you have setup a WebPassword within Tasmota, use
-decode-config.py -d sonoff-4281 -p <yourpassword> --backup-file Config_@f_@v
-will create a file like Config_Sonoff_6.4.0.json (the part Sonoff and 6.4.0 will choosen related to your device configuration). Because the default backup file format is JSON, you can read and change it with any raw text editor.
Restore backup file
-Reading back a saved (and possible changed) backup file use the --restore-file <filename> parameter. This will read the (changed) configuration data from this file and send it back to the source device or filename.
To restore the previously save backup file Config_Sonoff_6.2.1.json to device sonoff-4281 use:
decode-config.py -d sonoff-4281 --restore-file Config_Sonoff_6.2.1.json
-with password set by WebPassword:
-decode-config.py -d sonoff-4281 -p <yourpassword> --restore-file Config_Sonoff_6.2.1.json
-Output to screen
-To force screen output use the --output parameter.
Output to screen is default enabled when calling the program with a source parameter (-f or -d) but without any backup or restore parameter.
-JSON output
-The default output format is JSON. You can force JSON output using the --output-format json parameter.
Example:
-decode-config.py -d sonoff-4281 -c my.conf -x Wifi --output-format json
-
-{
- ...
- "hostname": "%s-%04d",
- "ip_address": [
- "0.0.0.0",
- "192.168.12.1",
- "255.255.255.0",
- "192.168.12.1"
- ],
- "ntp_server": [
- "ntp.localnet.home",
- "ntp2.localnet.home",
- "192.168.12.1"
- ],
- "sta_active": 0,
- "sta_config": 5,
- "sta_pwd": [
- "myWlAnPaszxwo!z",
- "myWlAnPaszxwo!z2"
- ],
- "sta_ssid": [
- "wlan.1",
- "my-wlan"
- ],
- "web_password": "myPaszxwo!z",
- "webserver": 2
- ...
-}
-Note: JSON output always contains all configuration data like the backup file except you are using --group arg.
Tasmota command output
-decode-config.py is able to translate the configuration data to (most all) Tasmota commands. To output your configuration as Tasmota commands use --output-format cmnd or --output-format command.
Example:
-decode-config.py -d sonoff-4281 -c my.conf -g Wifi --output-format cmnd
-
-# Wifi:
- AP 0
- Hostname %s-%04d
- IPAddress1 0.0.0.0
- IPAddress2 192.168.12.1
- IPAddress3 255.255.255.0
- IPAddress4 192.168.12.1
- NtpServer1 ntp.localnet.home
- NtpServer2 ntp2.localnet.home
- NtpServer3 192.168.12.1
- Password1 myWlAnPaszxwo!z
- Password2 myWlAnPaszxwo!z2
- SSId1 wlan.1
- SSId2 wlan.1
- WebPassword myPaszxwo!z
- WebServer 2
- WifiConfig 5
-Note: A few very specific module commands like MPC230xx, KNX and some Display commands are not supported. These are still available by JSON output.
-Filter data
-The huge number of Tasmota configuration data can be overstrained and confusing, so the most of the configuration data are grouped into categories.
-With decode-config.py the following categories are available: Display, Domoticz, Internal, KNX, Led, Logging, MCP230xx, MQTT, Main, Management, Pow, Sensor, Serial, SetOption, SonoffRF, System, Timers, Wifi
These are similary to the categories on https://github.com/arendst/Tasmota/wiki/Commands.
-To filter outputs to a subset of groups use the -g or --group arg concatenating the grooup you want, e. g.
decode-config.py -d sonoff-4281 -c my.conf --output-format cmnd --group Main MQTT Management Wifi
-Configuration file
-Each argument that start with -- (eg. --file) can also be set in a config file (specified via -c). Config file syntax allows: key=value, flag=true, stuff=[a,b,c] (for details, see syntax at https://pypi.org/project/ConfigArgParse).
If an argument is specified in more than one place, then commandline values override config file values which override defaults. This is usefull if you always use the same argument or a basic set of arguments.
-The http authentication credentials --username and --password is predestinated to store it in a file instead using it on your command line as argument:
e.g. my.conf:
-[source]
-username = admin
-password = myPaszxwo!z
-To make a backup file from example above you can now pass the config file instead using the password on command line:
-decode-config.py -d sonoff-4281 -c my.conf --backup-file Config_@f_@v
-More program arguments
-For better reading each short written arg (minus sign -) has a corresponding long version (two minus signs --), eg. --device for -d or --file for -f (note: not even all -- arg has a corresponding - one).
A short list of possible program args is displayed using -h or --help.
For advanced help use -H or --full-help:
usage: decode-config.py [-f <filename>] [-d <host>] [-P <port>]
- [-u <username>] [-p <password>] [-i <filename>]
- [-o <filename>] [-t json|bin|dmp] [-E] [-e] [-F]
- [--json-indent <indent>] [--json-compact]
- [--json-hide-pw] [--json-show-pw]
- [--cmnd-indent <indent>] [--cmnd-groups]
- [--cmnd-nogroups] [--cmnd-sort] [--cmnd-unsort]
- [-c <filename>] [-S] [-T json|cmnd|command]
- [-g {Control,Devices,Display,Domoticz,Internal,KNX,Light,MQTT,Management,Power,Rules,Sensor,Serial,SetOption,SonoffRF,System,Timer,Wifi} [{Control,Devices,Display,Domoticz,Internal,KNX,Light,MQTT,Management,Power,Rules,Sensor,Serial,SetOption,SonoffRF,System,Timer,Wifi} ...]]
- [--ignore-warnings] [-h] [-H] [-v] [-V]
-
-Backup/Restore Tasmota configuration data. Args that start with '--'
-(eg. -f) can also be set in a config file (specified via -c). Config file
-syntax allows: key=value, flag=true, stuff=[a,b,c] (for details, see syntax at
-https://goo.gl/R74nmi). If an arg is specified in more than one place, then
-commandline values override config file values which override defaults.
-
-Source:
- Read/Write Tasmota configuration from/to
-
- -f, --file, --tasmota-file <filename>
- file to retrieve/write Tasmota configuration from/to
- (default: None)'
- -d, --device, --host <host>
- hostname or IP address to retrieve/send Tasmota
- configuration from/to (default: None)
- -P, --port <port> TCP/IP port number to use for the host connection
- (default: 80)
- -u, --username <username>
- host HTTP access username (default: admin)
- -p, --password <password>
- host HTTP access password (default: None)
-
-Backup/Restore:
- Backup & restore specification
-
- -i, --restore-file <filename>
- file to restore configuration from (default: None).
- Replacements: @v=firmware version from config,
- @f=device friendly name from config, @h=device
- hostname from config, @H=device hostname from device
- (-d arg only)
- -o, --backup-file <filename>
- file to backup configuration to (default: None).
- Replacements: @v=firmware version from config,
- @f=device friendly name from config, @h=device
- hostname from config, @H=device hostname from device
- (-d arg only)
- -t, --backup-type json|bin|dmp
- backup filetype (default: 'json')
- -E, --extension append filetype extension for -i and -o filename
- (default)
- -e, --no-extension do not append filetype extension, use -i and -o
- filename as passed
- -F, --force-restore force restore even configuration is identical
-
-JSON output:
- JSON format specification
-
- --json-indent <indent>
- pretty-printed JSON output using indent level
- (default: 'None'). -1 disables indent.
- --json-compact compact JSON output by eliminate whitespace
- --json-hide-pw hide passwords
- --json-show-pw, --json-unhide-pw
- unhide passwords (default)
-
-Tasmota command output:
- Tasmota command output format specification
-
- --cmnd-indent <indent>
- Tasmota command grouping indent level (default: '2').
- 0 disables indent
- --cmnd-groups group Tasmota commands (default)
- --cmnd-nogroups leave Tasmota commands ungrouped
- --cmnd-sort sort Tasmota commands (default)
- --cmnd-unsort leave Tasmota commands unsorted
-
-Common:
- Optional arguments
-
- -c, --config <filename>
- program config file - can be used to set default
- command args (default: None)
- -S, --output display output regardsless of backup/restore usage
- (default do not output on backup or restore usage)
- -T, --output-format json|cmnd|command
- display output format (default: 'json')
- -g, --group {Control,Devices,Display,Domoticz,Internal,Knx,Light,Management,Mqtt,Power,Rules,Sensor,Serial,Setoption,Shutter,Sonoffrf,System,Timer,Wifi}
- limit data processing to command groups (default no
- filter)
- --ignore-warnings do not exit on warnings. Not recommended, used by your
- own responsibility!
-
-Info:
- Extra information
-
- -h, --help show usage help message and exit
- -H, --full-help show full help message and exit
- -v, --verbose produce more output about what the program does
- -V, --version show program's version number and exit
-
-Either argument -d <host> or -f <filename> must be given.
-Program parameter notes
-decode-config.py
-Examples
-The most of the examples are for linux command line. Under Windows call the program using python decode-config.py ....
Config file
-Note: The example contains .ini style sections [...]. Sections are always treated as comment and serves as clarity only.
-For further details of config file syntax see https://pypi.org/project/ConfigArgParse.
my.conf
-[Source]
-username = admin
-password = myPaszxwo!z
-
-[JSON]
-json-indent 2
-Using Tasmota binary configuration files
--
-
Restore a Tasmota configuration file
-
-decode-config.py -c my.conf -d sonoff --restore-file Config_Sonoff_6.2.1.dmp
-Backup device using Tasmota configuration compatible format
-a) use file extension to choice the file format
-
-decode-config.py -c my.conf -d sonoff --backup-file Config_@f_@v.dmpb) use args to choice the file format
-
-decode-config.py -c my.conf -d sonoff --backup-type dmp --backup-file Config_@f_@v
-
Use batch processing
-for device in sonoff1 sonoff2 sonoff3; do ./decode-config.py -c my.conf -d $device -o Config_@f_@v
-or under windows
-for device in (sonoff1 sonoff2 sonoff3) do python decode-config.py -c my.conf -d %device -o Config_@f_@v
-will produce JSON configuration files for host sonoff1, sonoff2 and sonoff3 using friendly name and Tasmota firmware version for backup filenames.
-Notes
-Some general notes:
--
-
- Filename replacement macros @h and @H:
-
-
- @h
The @h replacement macro uses the hostname configured with the Tasomta WifiHostname <host>command (defaults to%s-%04d). It will not use the network hostname of your device because this is not available when working with files only (e.g.--file <filename>as source).
To prevent having a useless % in your filename, @h will not replaced by configuration data hostname if this contains '%' characters.
- - @H
If you want to use the network hostname within your filename, use the @H replacement macro instead - but be aware this will only replaced if you are using a network device as source (-d,--device,--host); it will not work when using a file as source (-f,--file)
-
- - @h