diff --git a/.gitpod.yml b/.gitpod.yml index 38e7d7bfa..ee7750c54 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,3 +1,3 @@ tasks: - before: pip install -U platformio - command: platformio run -e sonoff + command: platformio run -e tasmota diff --git a/.travis.yml b/.travis.yml index 3f4121386..ee82b6f06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,34 +13,34 @@ cache: - $HOME/.platformio env: - - ENV=sonoff - - ENV=sonoff-minimal - - ENV=sonoff-basic - - ENV=sonoff-knx - - ENV=sonoff-sensors - - ENV=sonoff-display - - ENV=sonoff-ir - - ENV=sonoff-BG - - ENV=sonoff-BR - - ENV=sonoff-CN - - ENV=sonoff-CZ - - ENV=sonoff-DE - - ENV=sonoff-ES - - ENV=sonoff-FR - - ENV=sonoff-GR - - ENV=sonoff-HE - - ENV=sonoff-HU - - ENV=sonoff-IT - - ENV=sonoff-KO - - ENV=sonoff-NL - - ENV=sonoff-PL - - ENV=sonoff-PT - - ENV=sonoff-RU - - ENV=sonoff-SE - - ENV=sonoff-SK - - ENV=sonoff-TR - - ENV=sonoff-TW - - ENV=sonoff-UK + - ENV=tasmota + - ENV=tasmota-minimal + - ENV=tasmota-basic + - ENV=tasmota-knx + - ENV=tasmota-sensors + - ENV=tasmota-display + - ENV=tasmota-ir + - ENV=tasmota-BG + - ENV=tasmota-BR + - ENV=tasmota-CN + - ENV=tasmota-CZ + - ENV=tasmota-DE + - ENV=tasmota-ES + - ENV=tasmota-FR + - ENV=tasmota-GR + - ENV=tasmota-HE + - ENV=tasmota-HU + - ENV=tasmota-IT + - ENV=tasmota-KO + - ENV=tasmota-NL + - ENV=tasmota-PL + - ENV=tasmota-PT + - ENV=tasmota-RU + - ENV=tasmota-SE + - ENV=tasmota-SK + - ENV=tasmota-TR + - ENV=tasmota-TW + - ENV=tasmota-UK script: - platformio run -e $ENV diff --git a/Doxyfile b/Doxyfile index 0d2d7031d..b563c8c3a 100644 --- a/Doxyfile +++ b/Doxyfile @@ -44,7 +44,7 @@ PROJECT_NUMBER = # for a project that appears at the top of each page and should give viewer a # quick idea about the purpose of the project. Keep the description short. -PROJECT_BRIEF = "Provide ESP8266 based itead Sonoff with Web, MQTT and OTA firmware using Arduino IDE or PlatformIO" +PROJECT_BRIEF = "Provide ESP8266 based devices with Web, MQTT and OTA firmware using Arduino IDE or PlatformIO" # With the PROJECT_LOGO tag one can specify a logo or an icon that is included # in the documentation. The maximum height of the logo should not exceed 55 @@ -796,7 +796,7 @@ WARN_LOGFILE = # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. -INPUT = sonoff \ +INPUT = tasmota \ lib # This tag can be used to specify the character encoding of the source files diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 70689d60b..ea4651445 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -105,18 +105,18 @@ Over 500 additional devices are supported using [templates](TEMPLATES.md). ## Provided Binary Downloads The following binary downloads have been compiled with ESP8266/Arduino library core version **pre-2.6.0**. -- **sonoff.bin** = The Tasmota version with sensors. **RECOMMENDED RELEASE BINARY** -- **sonoff-BG.bin** to **sonoff-TW.bin** = The Tasmota version in different languages. -- **sonoff-basic.bin** = The Basic version without most sensors. -- **sonoff-knx.bin** = The Knx version without some features but adds KNX support. -- **sonoff-sensors.bin** = The Sensors version adds more useful sensors. -- **sonoff-ir** = The InfraRed Receiver and transmitter version allowing all available protocols provided by library IRremoteESP8266 but without most other features. -- **sonoff-display.bin** = The Display version without Energy Monitoring but adds display support. -- **sonoff-minimal.bin** = The Minimal version allows intermediate OTA uploads to support larger versions and does NOT change any persistent parameter. This version **should NOT be used for initial installation**. +- **tasmota.bin** = The Tasmota version with sensors. **RECOMMENDED RELEASE BINARY** +- **tasmota-BG.bin** to **tasmota-TW.bin** = The Tasmota version in different languages. +- **tasmota-basic.bin** = The Basic version without most sensors. +- **tasmota-knx.bin** = The Knx version without some features but adds KNX support. +- **tasmota-sensors.bin** = The Sensors version adds more useful sensors. +- **tasmota-ir** = The InfraRed Receiver and transmitter version allowing all available protocols provided by library IRremoteESP8266 but without most other features. +- **tasmota-display.bin** = The Display version without Energy Monitoring but adds display support. +- **tasmota-minimal.bin** = The Minimal version allows intermediate OTA uploads to support larger versions and does NOT change any persistent parameter. This version **should NOT be used for initial installation**. ## Available Features and Sensors -| Feature or Sensor | minimal | basic | sonoff | knx | sensors | ir | display | Remarks +| Feature or Sensor | minimal | basic | tasmota | knx | sensors | ir | display | Remarks |-----------------------|---------|-------|--------|-----|---------|----|---------|-------- | MY_LANGUAGE en-GB | x | x | x | x | x | x | x | | USE_ARDUINO_OTA | - | - | - | - | - | - | - | @@ -142,7 +142,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c | USE_EXPRESSION | - | - | - | - | - | - | - | | SUPPORT_IF_STATEMENT | - | - | - | - | - | - | - | | | | | | | | | | -| Feature or Sensor | minimal | basic | sonoff | knx | sensors | ir | display | Remarks +| Feature or Sensor | minimal | basic | tasmota | knx | sensors | ir | display | Remarks | ROTARY_V1 | - | - | - | - | - | - | - | | USE_SONOFF_RF | - | - | x | x | x | - | - | | USE_RF_FLASH | - | - | x | x | x | - | - | @@ -157,7 +157,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c | USE_DEEPSLEEP | - | - | - | - | - | - | - | | USE_EXS_DIMMER | - | - | x | x | - | - | - | | | | | | | | | | -| Feature or Sensor | minimal | basic | sonoff | knx | sensors | ir | display | Remarks +| Feature or Sensor | minimal | basic | tasmota | knx | sensors | ir | display | Remarks | USE_LIGHT | - | x | x | x | x | x | x | | USE_WS2812 | - | - | x | x | x | - | x | | USE_WS2812_DMA | - | - | - | - | - | - | - | @@ -184,7 +184,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c | USE_MAX31855 | - | - | - | - | x | - | - | | USE_MAX31865 | - | - | - | - | - | - | - | | | | | | | | | | -| Feature or Sensor | minimal | basic | sonoff | knx | sensors | ir | display | Remarks +| Feature or Sensor | minimal | basic | tasmota | knx | sensors | ir | display | Remarks | USE_I2C | - | - | x | x | x | - | x | | USE_SHT | - | - | x | x | x | - | x | | USE_HTU | - | - | x | x | x | - | x | @@ -220,7 +220,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c | USE_PAJ7620 | - | - | - | - | - | - | - | | USE_PCF8574 | - | - | - | - | - | - | - | | | | | | | | | | -| Feature or Sensor | minimal | basic | sonoff | knx | sensors | ir | display | Remarks +| Feature or Sensor | minimal | basic | tasmota | knx | sensors | ir | display | Remarks | USE_SPI | - | - | - | - | - | - | x | | USE_MHZ19 | - | - | x | x | x | - | x | | USE_SENSEAIR | - | - | x | x | x | - | x | @@ -246,7 +246,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c | USE_A4988_STEPPER | - | - | - | - | - | - | - | | USE_ARDUINO_SLAVE | - | - | - | - | - | - | - | Experimental | | | | | | | | | -| Feature or Sensor | minimal | basic | sonoff | knx | sensors | ir | display | Remarks +| Feature or Sensor | minimal | basic | tasmota | knx | sensors | ir | display | Remarks | USE_DISPLAY | - | - | - | - | - | - | x | | USE_DISPLAY_LCD | - | - | - | - | - | - | x | | USE_DISPLAY_SSD1306 | - | - | - | - | - | - | x | @@ -260,120 +260,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c | USE_DISPLAY_RA8876 | - | - | - | - | - | - | - | ## Changelog -Version 6.7.1 20191026 - * Remove support for WPS and SmartConfig in favour of Web server (!) based WifiManager (#6680) - * Remove binary sonoff-classic (#6680) - * Remove command ``SetOption2`` - * Remove default DS18B20 driver and only support define **USE_DS18x20** (#6647) - * Remove support for define **USE_DS18x20_LEGACY** and legacy DS18x20 driver (#6486) - * Replace xsns_23_sdm120 with xnrg_08_sdm120 - * Replace xsns_25_sdm630 with xnrg_10_sdm630 - * Replace xsns_49_solaxX1 with xnrg_12_solaxX1 (#6677) - * Change Sonoff L1 support by adding define **USE_SONOFF_L1** - * Change light drivers internals to ease management - * Change command ``PulseTime`` JSON message format and allow display of all pulsetimer information (#6519) - * Change command ``SetOption43`` to make it more general. Now supports PS_16_DZ driver too (#6544) - * Change command handling by moving buffers up in chain solving ``MQTTlog`` support (#6529) - * Change commands ``Var`` and ``Mem`` to show all parameters when no index is given (#6107) - * Change detection of non-MQTT commands by allowing non-space characters as delimiter (#6540) - * Change rename "Data" to "Hash" and limit to 32 bits when receiving UNKNOWN IR protocol (see DECODE_HASH from IRremoteESP8266) - * Change JSON output format for commands ``Adc``, ``Adcs``, ``Modules``, ``Gpio`` and ``Gpios`` from list to dictionary (#6407) - * Change energy sensors for three phase/channel support - * Change Settings crc calculation allowing short term backward compatibility - * Change Improve reliability of TasmotaSerial at 115200 bauds and reduce IRAM usage - * Change Tuya support by Shantur Rathore removing tuya related commands ``SetOption34, 41, 44, 45, 46, 65, 66 and 69`` (#6353) - * Change theoretical baudrate range to 300..19660500 bps in 300 increments (#6294) - * Change Settings area to 4k for future use - * Change some table locations from RAM to Flash - * Change filename of configuration backup from using FriendlyName1 to Hostname solving diacritic issues (#2422) - * Change Store AWS IoT Private Key and Certificate in SPI Flash avoiding device-specific compilations - * Change defines **USE_TX20_WIND_SENSOR** and **USE_RC_SWITCH** in my_user_config.h to disable to lower iram usage enabling latest core compilation (#6060, #6062) - * Fix PowerDelta related exception0: epc1:0x4000dce5 (#6750) - * Fix handling of ligth channels when pwm_multichannel (``SetOption68``) is enabled - * Fix better handling of PWM White Temperature mode for Module 48 (#6534) - * Fix TasmotaSerial: move serial send to IRAM for high speed baud rates - * Fix Domoticz battery level set to 100 if define **USE_ADC_VCC** is not used (#6033) - * Fix Force Elliptic Curve for Letsencrypt TLS #6042 - * Fix WeMo emulation for 1G echo and 2G echo dot (#6086) - * Fix Xiaomi Philips brightness (#6091) - * Add support for EX-Store WiFi Dimmer V4 (#5856) - * Add support for Arduino serial connection (EXPERIMENTAL) - * Add support for Zigbee devices Xiaomi lumi.weather air quality sensor, Osram mini-switch - * Add support for Zigbee device cc2530 initialization and basic ZCL decoding - * Add support for PMS3003 dust particle sensor - * Add support for Chint DDSU666 Modbus energy meter by Pablo Zerón - * Add support for SM2135 as used in Action LSC Smart Led E14 (#6495) - * Add support for Shelly 2.5 dual energy (#6160) - * Add support for shutters by Stefan Bode (#288) - * Add support for PCF8574 I2C I/O Expander (currently output only) by Stefan Bode - * Add support for up to three PZEM-014/-016 on one serial modbus connection with addresses 1 (default), 2 and 3 (#2315) - * Add support for up to three PZEM-004T on one serial connection with addresses 192.168.1.1 (default), 2 and 3 (#2315) - * Add support for up to three PZEM-003/-017 on one serial modbus connection with addresses 1 (default), 2 and 3 (#2315) - * Add support for up to 4 INA226 Voltage and Current sensors by Steve Rogers (#6342) - * Add support for A4988 stepper-motor-driver-circuit by Tim Leuschner (#6370) - * Add support for Hiking DDS238-2 Modbus energy meter by Matteo Campanella (#6384) - * Add support for HM17 bluetooth LE passive scan of ibeacon devices by Gerhard Mutz - * Add support for Solax X1 inverter by Pablo Zerón - * Add support for PAJ7620 gesture sensor by Christian Baars - * Add support for MAX31865 Thermocouple sensor by Alberto Lopez Siemens - * Add support for RDM6300 125kHz RFID Reader by Gerhard Mutz - * Add support for CHIRP soil moisture sensor by Christian Baars - * Add support for Sonoff iFan03 as module 71 (#5988) - * Add support for a buzzer - * Add support for IRSend long press ('repeat' feature from IRRemoteESP8266) (#6074) - * Add support for IRHVAC Midea/Komeco protocol (#3227) - * Add support for more IRSend protocols enabled in my_user_config.h - * Add support for IRSend Pioneer protocol (#6100) - * Add support for up to 4 INA219 sensors (#6046) - * Add support for I2C display driver SH1106 oled by Gerhard Mutz - * Add support for SPI display drivers epaper 4.2 inch, ILI9488 TFT, SSD1351 Color oled and RA8876 TFT by Gerhard Mutz - * Add command ``Buzzer`` with optional parameters ,, enabled when a buzzer is configured (#5988) - * Add command ``DimmerRange`` in Light module to support 2 byte dimming ranges from Tuya - * Add command ``DisplayHeight`` to set pixel height on supported devices - * Add command ``DisplayWidth`` to set pixel width on supported devices - * Add command ``EnergyReset4 x,x`` to initialize total usage for two tarrifs - * Add command ``EnergyReset5 x,x`` to initialize total export (or production) for two tarrifs - * Add command ``Gpio 255/All`` to show physical GPIO configuration of all non-flash pins (#6407) - * Add command ``Gpios 255/All`` to show all available GPIO components (#6407) - * Add command ``ModuleAddress 1/2/3`` to set Pzem module address when a single module is connected (#2315) - * Add command ``MqttLog `` for support of MQTT logging (#6498) - * Add command ``Power0 0/1/2/Off/On/Toggle`` to control all power outputs at once (#6340) - * Add command ``PowerDelta 101..32000`` for absolute power delta where 101 = 101-100 = 1W, 202 = 202-100 = 102W (#5901) - * Add command ``Reset 99`` to reset bootcount to zero (#684, #6351) - * Add command ``Sensor29 pin,0/1/2`` for OFF/ON/TOGGLE - * Add command ``Sensor34 8,0`` and ``Sensor34 8,1`` to disable/enable JSON message on weight change over 4 gram - * Add command ``SetOption34 0..255`` to set backlog delay. Default value is 200 (mSeconds) (#6562) - * Add command ``SetOption42 0..255`` to set overtemperature (Celsius only) threshold resulting in power off all on energy monitoring devices. Default setting is 90 (#6036) - * Add command ``SetOption65 0/1`` to disable (1) fast power cycle detection fixing unwanted brownout trigger - * Add command ``SetOption67 0/1`` to disable or enable a buzzer as used in iFan03 - * Add command ``SetOption68 0/1`` to enable multi-channel PWM instead of a single light (#6134) - * Add command ``SetOption71 0/1`` to switch between different Modbus Active Energy registers on DDS238-2 energy meters (#6531) - * Add command ``SetOption72 0/1`` to switch between software (0) or hardware (1) energy total counter (#6561) - * Add command ``Time`` to disable NTP and set UTC time as Epoch value if above 1451602800 (=20160101). ``Time 0`` re-enables NTP (#5279) - * Add command ``Time 1/2/3`` to select JSON time format ISO + Epoch, ISO or Epoch - * Add command ``Tariff`` to default to 0 (=disabled) and allowing to set both Standard Time (ST) and Daylight Savings Time (DST) start hour - ex. ``Tariff1 22,23`` = Tariff1 (Off-Peak) ST,DST ``Tariff2 6,7`` = Tariff2 (Standard) ST,DST ``Tariff9 0/1`` = Weekend toggle (1 = Off-Peak during weekend) - * Add command ``WebSensor 0/1`` to control display of sensor data in web GUI (#6085) - * Add command ``ZigbeeRead`` (#6095) - * Add define **USE_DEEPSLEEP** and command ``DeepSleepTime 0 or 10..86400`` (seconds) to enter deepsleep mode (#6638) - * Add define **USE_ENERGY_MARGIN_DETECTION** to disable Energy Margin and Power Limit detection - * Add define **USE_ENERGY_POWER_LIMIT** to disable Energy Power Limit detection while Energy Margin detection is active - * Add define **USE_SONOFF_RF** to enable/disable Sonoff Rf support (#6648) - * Add define **USE_WS2812_HARDWARE** to select hardware type WS2812, WS2812X, WS2813, SK6812, LC8812 or APA106 (DMA mode only) - * Add incremental beeps to Ifan03 remote control fan speed buttons (#6636) - * Add rule support after every command execution like Fanspeed#Data=2 (#6636) - * Add WebUI for multiple, independent PWM channels - * Add JSON array index support to rules evaluation allowing trigger on ENERGY#POWER[2]>0.60 from JSON ..,"Power":[0.00,0.68],.. (#6160) - * Add Full support of all protocols in IRremoteESP8266, to be used on dedicated-IR Tasmota version. Warning: +81k Flash when compiling with **USE_IR_REMOTE_FULL** - * Add 'sonoff-ir' pre-packaged IR-dedicated firmware and 'sonoff-ircustom' to customize firmware with IR Full protocol support - * Add Tuya Energy monitoring by Shantur Rathore - * Add Domoticz P1 Smart Meter support using energy sensors handled by xdrv_03_energy.ino based on an idea by pablozg - * Add debug compile features using defines **DEBUG_TASMOTA_CORE**, **DEBUG_TASMOTA_DRIVER** and **DEBUG_TASMOTA_SENSOR**. - See **DEBUG_CORE_LOG** example in tasmota.ino and **DEBUG_DRIVER_LOG** example in xdrv_09_timers.ino - * Add option 0 to ``Width1`` (Marker), ``Width2`` (Second), ``Width3`` (Minute) and ``Width4`` (Hour) disabling display (#6152) - * Add MqttCount metric to STATE (#6155) - * Add allow repeat/longpress for IRSend raw, introduced ``IRSend`` option (#6074) - * Add Oled reset GPIO option "OLED reset" - * Add blend RGB leds with White leds for better whites (#5895, #5704) - * Add AZ7798 automatic setting of clock display (#6034) - * Add Epoch and UptimeSec to JSON messages (#6068) +Version 7.1.0 Betty + * Change ArduinoSlave to TasmotaSlave (Experimental) + * Change repository name from Sonoff-Tasmota to Tasmota and all code references from Sonoff to Tasmota + * Add support for Tuya battery powered devices (#6735) diff --git a/platformio.ini b/platformio.ini index 4ea6d30d6..53983cb41 100755 --- a/platformio.ini +++ b/platformio.ini @@ -13,35 +13,35 @@ build_dir = .pioenvs build_cache_dir = .cache ; *** Uncomment one of the lines below to build/upload only one environment -;default_envs = sonoff -;default_envs = sonoff-ircustom ; alternative to 'sonoff' with full IR protocols activated, you will need to disable some features to keep code not too big -;default_envs = sonoff-minimal -;default_envs = sonoff-basic -;default_envs = sonoff-knx -;default_envs = sonoff-sensors -;default_envs = sonoff-display -;default_envs = sonoff-ir -;default_envs = sonoff-BG -;default_envs = sonoff-BR -;default_envs = sonoff-CN -;default_envs = sonoff-CZ -;default_envs = sonoff-DE -;default_envs = sonoff-ES -;default_envs = sonoff-FR -;default_envs = sonoff-GR -;default_envs = sonoff-HE -;default_envs = sonoff-HU -;default_envs = sonoff-IT -;default_envs = sonoff-KO -;default_envs = sonoff-NL -;default_envs = sonoff-PL -;default_envs = sonoff-PT -;default_envs = sonoff-RU -;default_envs = sonoff-SE -;default_envs = sonoff-SK -;default_envs = sonoff-TR -;default_envs = sonoff-TW -;default_envs = sonoff-UK +;default_envs = tasmota +;default_envs = tasmota-ircustom ; alternative to 'tasmota' with full IR protocols activated, you will need to disable some features to keep code not too big +;default_envs = tasmota-minimal +;default_envs = tasmota-basic +;default_envs = tasmota-knx +;default_envs = tasmota-sensors +;default_envs = tasmota-display +;default_envs = tasmota-ir +;default_envs = tasmota-BG +;default_envs = tasmota-BR +;default_envs = tasmota-CN +;default_envs = tasmota-CZ +;default_envs = tasmota-DE +;default_envs = tasmota-ES +;default_envs = tasmota-FR +;default_envs = tasmota-GR +;default_envs = tasmota-HE +;default_envs = tasmota-HU +;default_envs = tasmota-IT +;default_envs = tasmota-KO +;default_envs = tasmota-NL +;default_envs = tasmota-PL +;default_envs = tasmota-PT +;default_envs = tasmota-RU +;default_envs = tasmota-SE +;default_envs = tasmota-SK +;default_envs = tasmota-TR +;default_envs = tasmota-TW +;default_envs = tasmota-UK [esp82xx_defaults] build_flags = -D NDEBUG @@ -246,7 +246,7 @@ extra_scripts = pio/strip-floats.py ; ********************************************************************* -[env:sonoff] +[env:tasmota] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -260,7 +260,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-minimal] +[env:tasmota-minimal] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -274,7 +274,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-basic] +[env:tasmota-basic] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -288,7 +288,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-knx] +[env:tasmota-knx] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -302,7 +302,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-sensors] +[env:tasmota-sensors] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -316,7 +316,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-display] +[env:tasmota-display] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -330,7 +330,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-ir] +[env:tasmota-ir] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -344,7 +344,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-ircustom] +[env:tasmota-ircustom] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -358,7 +358,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-BG] +[env:tasmota-BG] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -372,7 +372,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-BR] +[env:tasmota-BR] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -386,7 +386,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-CN] +[env:tasmota-CN] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -400,7 +400,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-CZ] +[env:tasmota-CZ] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -414,7 +414,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-DE] +[env:tasmota-DE] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -428,7 +428,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-ES] +[env:tasmota-ES] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -442,7 +442,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-FR] +[env:tasmota-FR] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -456,7 +456,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-GR] +[env:tasmota-GR] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -470,7 +470,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-HE] +[env:tasmota-HE] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -484,7 +484,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-HU] +[env:tasmota-HU] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -498,7 +498,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-IT] +[env:tasmota-IT] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -512,7 +512,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-KO] +[env:tasmota-KO] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -526,7 +526,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-NL] +[env:tasmota-NL] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -540,7 +540,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-PL] +[env:tasmota-PL] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -554,7 +554,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-PT] +[env:tasmota-PT] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -568,7 +568,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-RU] +[env:tasmota-RU] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -582,7 +582,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-SE] +[env:tasmota-SE] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -596,7 +596,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-SK] +[env:tasmota-SK] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -610,7 +610,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-TR] +[env:tasmota-TR] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -624,7 +624,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-TW] +[env:tasmota-TW] platform = ${common.platform} framework = ${common.framework} board = ${common.board} @@ -638,7 +638,7 @@ upload_resetmethod = ${common.upload_resetmethod} upload_speed = ${common.upload_speed} extra_scripts = ${common.extra_scripts} -[env:sonoff-UK] +[env:tasmota-UK] platform = ${common.platform} framework = ${common.framework} board = ${common.board} diff --git a/tasmota/_changelog.ino b/tasmota/_changelog.ino index 33d77decc..5819dd2d4 100644 --- a/tasmota/_changelog.ino +++ b/tasmota/_changelog.ino @@ -3,6 +3,7 @@ * Change ArduinoSlave to TasmotaSlave (Experimental) * Add support for Tuya battery powered devices (#6735) * Change repository name from Sonoff-Tasmota to Tasmota + * Change all code references from Sonoff to Tasmota * * 6.7.1 20191026 * Release diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index 6a46a15bb..4cb42f130 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -79,7 +79,7 @@ #define MQTT_LOG_LEVEL LOG_LEVEL_NONE // [MqttLog] (LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE) // -- Ota ----------------------------------------- -#define OTA_URL "http://thehackbox.org/tasmota/release/sonoff.bin" // [OtaUrl] +#define OTA_URL "http://thehackbox.org/tasmota/release/tasmota.bin" // [OtaUrl] // -- MQTT ---------------------------------------- #define MQTT_USE 1 // [SetOption3] Select default MQTT use (0 = Off, 1 = On) @@ -468,9 +468,9 @@ // -- IR Remote features - all protocols from IRremoteESP8266 -------------------------- // IR Full Protocols mode is activated through platform.io only. -// Either use 'default_envs = sonoff-ircustom' and disable some features here to keep code not too big -// or use 'default_envs = sonoff-ir' for a pre-packaged IR-dedicated firmware -// When using 'sonoff-ircustom' or 'sonoff-ir', parameters below +// Either use 'default_envs = tasmota-ircustom' and disable some features here to keep code not too big +// or use 'default_envs = tasmota-ir' for a pre-packaged IR-dedicated firmware +// When using 'tasmota-ircustom' or 'tasmota-ir', parameters below // (USE_IR_REMOTE, USE_IR_RECEIVE, USE_IR_HVAC...) are IGNORED. // // Code impact of IR full protocols is +81k code, 3k mem @@ -555,13 +555,13 @@ * See RELEASENOTES.md for selected features \*********************************************************************************************/ -//#define FIRMWARE_BASIC // Create sonoff-basic with no sensors -//#define FIRMWARE_SENSORS // Create sonoff-sensors with useful sensors enabled -//#define FIRMWARE_KNX_NO_EMULATION // Create sonoff-knx with KNX but without Emulation -//#define FIRMWARE_DISPLAYS // Create sonoff-display with display drivers enabled -//#define FIRMWARE_IR // Create sonoff-ir with IR full protocols activated, and many sensors disabled -//#define FIRMWARE_IR_CUSTOM // Create sonoff customizable with special marker to add all IR protocols -//#define FIRMWARE_MINIMAL // Create sonoff-minimal as intermediate firmware for OTA-MAGIC +//#define FIRMWARE_BASIC // Create tasmota-basic with no sensors +//#define FIRMWARE_SENSORS // Create tasmota-sensors with useful sensors enabled +//#define FIRMWARE_KNX_NO_EMULATION // Create tasmota-knx with KNX but without Emulation +//#define FIRMWARE_DISPLAYS // Create tasmota-display with display drivers enabled +//#define FIRMWARE_IR // Create tasmota-ir with IR full protocols activated, and many sensors disabled +//#define FIRMWARE_IR_CUSTOM // Create tasmota customizable with special marker to add all IR protocols +//#define FIRMWARE_MINIMAL // Create tasmota-minimal as intermediate firmware for OTA-MAGIC /*********************************************************************************************\ * No user configurable items below diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino index c4526a808..263888558 100644 --- a/tasmota/tasmota.ino +++ b/tasmota/tasmota.ino @@ -71,7 +71,7 @@ const char kSleepMode[] PROGMEM = "Dynamic|Normal"; const char kPrefixes[] PROGMEM = D_CMND "|" D_STAT "|" D_TELE; -const char kCodeImage[] PROGMEM = "sonoff|minimal|sensors|knx|basic|display|ir"; +const char kCodeImage[] PROGMEM = "tasmota|minimal|sensors|knx|basic|display|ir"; // Global variables SerialConfig serial_config = SERIAL_8N1; // Serial interface configuration 8 data bits, No parity, 1 stop bit diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h index 09620c320..ff5513481 100644 --- a/tasmota/tasmota_post.h +++ b/tasmota/tasmota_post.h @@ -70,7 +70,7 @@ char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, c #endif /*********************************************************************************************\ - * [sonoff-sensors.bin] + * [tasmota-sensors.bin] * Provide an image with useful supported sensors enabled \*********************************************************************************************/ @@ -214,7 +214,7 @@ char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, c #endif // FIRMWARE_SENSORS /*********************************************************************************************\ - * [sonoff-knx.bin] + * [tasmota-knx.bin] * Provide a dedicated KNX image allowing enough code and memory space \*********************************************************************************************/ @@ -234,7 +234,7 @@ char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, c #endif // FIRMWARE_KNX_NO_EMULATION /*********************************************************************************************\ - * [sonoff-display.bin] + * [tasmota-display.bin] * Provide an image with display drivers enabled \*********************************************************************************************/ @@ -298,7 +298,7 @@ char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, c #endif // FIRMWARE_DISPLAYS /*********************************************************************************************\ - * [sonoff-ir.bin] + * [tasmota-ir.bin] * Provide a dedicated image with IR full protocol support, with limited additional features \*********************************************************************************************/ @@ -388,7 +388,7 @@ char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, c #endif // FIRMWARE_IR /*********************************************************************************************\ - * [sonoff-basic.bin] + * [tasmota-basic.bin] * Provide an image without sensors \*********************************************************************************************/ @@ -490,7 +490,7 @@ char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, c #endif // FIRMWARE_BASIC /*********************************************************************************************\ - * [sonoff-minimal.bin] + * [tasmota-minimal.bin] * Provide the smallest image possible while still enabling a webserver for intermediate image load \*********************************************************************************************/