diff --git a/.travis.yml b/.travis.yml index 911f3423e..ffd47f546 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ cache: false env: - ENV=tasmota - ENV=tasmota-minimal - - ENV=tasmota-basic + - ENV=tasmota-lite - ENV=tasmota-knx - ENV=tasmota-sensors - ENV=tasmota-display diff --git a/BUILDS.md b/BUILDS.md index 74c0a7a35..d21fd9f15 100644 --- a/BUILDS.md +++ b/BUILDS.md @@ -1,6 +1,6 @@ ## Available Features and Sensors -| Feature or Sensor | minimal | basic | tasmota | knx | sensors | ir | display | Remarks +| Feature or Sensor | minimal | lite | tasmota | knx | sensors | ir | display | Remarks |-----------------------|---------|-------|--------|-----|---------|----|---------|-------- | MY_LANGUAGE en-GB | x | x | x | x | x | x | x | | USE_ARDUINO_OTA | - | - | - | - | - | - | - | @@ -27,7 +27,7 @@ | USE_EXPRESSION | - | - | - | - | - | - | - | | SUPPORT_IF_STATEMENT | - | - | - | - | - | - | - | | | | | | | | | | -| Feature or Sensor | minimal | basic | tasmota | knx | sensors | ir | display | Remarks +| Feature or Sensor | minimal | lite | tasmota | knx | sensors | ir | display | Remarks | ROTARY_V1 | - | - | - | - | - | - | - | | USE_SONOFF_RF | - | - | x | x | x | - | - | | USE_RF_FLASH | - | - | x | x | x | - | - | @@ -42,7 +42,7 @@ | USE_DEEPSLEEP | - | - | x | - | x | - | - | | USE_EXS_DIMMER | - | - | x | x | - | - | - | | | | | | | | | | -| Feature or Sensor | minimal | basic | tasmota | knx | sensors | ir | display | Remarks +| Feature or Sensor | minimal | lite | tasmota | knx | sensors | ir | display | Remarks | USE_LIGHT | - | x | x | x | x | x | x | | USE_WS2812 | - | - | x | x | x | - | x | | USE_WS2812_DMA | - | - | - | - | - | - | - | @@ -69,7 +69,7 @@ | USE_MAX31855 | - | - | - | - | x | - | - | | USE_MAX31865 | - | - | - | - | - | - | - | | | | | | | | | | -| Feature or Sensor | minimal | basic | tasmota | knx | sensors | ir | display | Remarks +| Feature or Sensor | minimal | lite | tasmota | knx | sensors | ir | display | Remarks | USE_I2C | - | - | x | x | x | - | x | | USE_SHT | - | - | x | x | x | - | x | | USE_HTU | - | - | x | x | x | - | x | @@ -107,7 +107,7 @@ | USE_PCF8574 | - | - | - | - | - | - | - | | USE_HIH6 | - | - | - | - | x | - | - | | | | | | | | | | -| Feature or Sensor | minimal | basic | tasmota | knx | sensors | ir | display | Remarks +| Feature or Sensor | minimal | lite | tasmota | knx | sensors | ir | display | Remarks | USE_SPI | - | - | - | - | - | - | x | | USE_MHZ19 | - | - | x | x | x | - | x | | USE_SENSEAIR | - | - | x | x | x | - | x | @@ -133,7 +133,7 @@ | USE_A4988_STEPPER | - | - | - | - | - | - | - | | USE_TASMOTA_SLAVE | - | - | - | - | - | - | - | Experimental | | | | | | | | | -| Feature or Sensor | minimal | basic | tasmota | knx | sensors | ir | display | Remarks +| Feature or Sensor | minimal | lite | tasmota | knx | sensors | ir | display | Remarks | USE_DISPLAY | - | - | - | - | - | - | x | | USE_DISPLAY_LCD | - | - | - | - | - | - | x | | USE_DISPLAY_SSD1306 | - | - | - | - | - | - | x | diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 4341ec587..b8220e8d3 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -34,7 +34,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c - **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-lite.bin** = The Lite 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. diff --git a/platformio.ini b/platformio.ini index d47eadafb..6e73715d4 100755 --- a/platformio.ini +++ b/platformio.ini @@ -20,7 +20,7 @@ default_envs = ; tasmota ; tasmota-ircustom ; alternative to 'tasmota' with full IR protocols activated, you will need to disable some features to keep code not too big ; tasmota-minimal -; tasmota-basic +; tasmota-lite ; tasmota-knx ; tasmota-sensors ; tasmota-display diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini index 6cbd749c4..9ac4084cd 100644 --- a/platformio_override_sample.ini +++ b/platformio_override_sample.ini @@ -19,7 +19,7 @@ default_envs = ; tasmota-debug ; tasmota-ircustom ; alternative to 'tasmota' with full IR protocols activated, you will need to disable some features to keep code not too big ; tasmota-minimal -; tasmota-basic +; tasmota-lite ; tasmota-knx ; tasmota-sensors ; tasmota-display @@ -36,7 +36,7 @@ build_flags = ${core_active.build_flags} ; *** Optional Firmware configurations ; -DFIRMWARE_MINIMAL ; -DFIRMWARE_SENSORS -; -DFIRMWARE_BASIC +; -DFIRMWARE_LITE ; -DFIRMWARE_KNX_NO_EMULATION ; -DFIRMWARE_DISPLAYS ; -DFIRMWARE_IR diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini index 38aaf2223..fd0571125 100644 --- a/platformio_tasmota_env.ini +++ b/platformio_tasmota_env.ini @@ -18,8 +18,8 @@ extra_scripts = ${common.extra_scripts} [env:tasmota-minimal] build_flags = ${common.build_flags} -DFIRMWARE_MINIMAL -[env:tasmota-basic] -build_flags = ${common.build_flags} -DFIRMWARE_BASIC +[env:tasmota-lite] +build_flags = ${common.build_flags} -DFIRMWARE_LITE [env:tasmota-knx] build_flags = ${common.build_flags} -DFIRMWARE_KNX_NO_EMULATION diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md index ad2ad30d4..90f29af2a 100644 --- a/tasmota/CHANGELOG.md +++ b/tasmota/CHANGELOG.md @@ -3,6 +3,7 @@ ### 7.1.2.6 20191214 - Change some more Settings locations freeing up space for future single char allowing variable length text +- Change tasmota-basic.bin and FIRMWARE_BASIC to tasmota-lite.bin and FIRMWARE_LITE - Add Zigbee send automatic ZigbeeRead after sending a command - Add Zigbee improving Occupancy:false detection for Aqara sensor - Add fallback functionality from next version 8.x diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index 5ff6bb6a2..04318d9c8 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -570,7 +570,7 @@ * See RELEASENOTES.md for selected features \*********************************************************************************************/ -//#define FIRMWARE_BASIC // Create tasmota-basic with no sensors +//#define FIRMWARE_LITE // Create tasmota-lite 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 diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h index cc47e3fc1..75f35cd92 100644 --- a/tasmota/tasmota_post.h +++ b/tasmota/tasmota_post.h @@ -390,17 +390,17 @@ char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, c #endif // FIRMWARE_IR /*********************************************************************************************\ - * [tasmota-basic.bin] + * [tasmota-lite.bin] * Provide an image without sensors \*********************************************************************************************/ -#ifdef FIRMWARE_BASIC +#ifdef FIRMWARE_LITE #undef CODE_IMAGE #define CODE_IMAGE 4 #undef APP_SLEEP -#define APP_SLEEP 1 // Default to sleep = 1 for FIRMWARE_BASIC +#define APP_SLEEP 1 // Default to sleep = 1 for FIRMWARE_LITE #undef USE_ARDUINO_OTA // Disable support for Arduino OTA #undef USE_DOMOTICZ // Disable Domoticz @@ -502,7 +502,7 @@ char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, c #undef CODE_IMAGE #define CODE_IMAGE 1 -#undef FIRMWARE_BASIC // Disable tasmota-basic with no sensors +#undef FIRMWARE_LITE // Disable tasmota-lite with no sensors #undef FIRMWARE_SENSORS // Disable tasmota-sensors with useful sensors enabled #undef FIRMWARE_KNX_NO_EMULATION // Disable tasmota-knx with KNX but without Emulation #undef FIRMWARE_DISPLAYS // Disable tasmota-display with display drivers enabled