mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12690 from Jason2866/New_framework 

Updated Arduino ESP32/IDF4.4 framework, LITTLEFS -> LittleFS
This commit is contained in:
Theo Arends 2021-07-20 09:21:32 +02:00 committed by GitHub
parent e6bf020bc1 3ab4a2a3e0
commit 153a9a69da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@ -7,7 +7,7 @@
- [ ] Only relevant files were touched
- [ ] Only one feature/fix was added per PR and the code change compiles without warnings
- [ ] The code change is tested and works with Tasmota core ESP8266 V.2.7.4.9
- [ ] The code change is tested and works with Tasmota core ESP32 V.1.0.7.1
- [ ] The code change is tested and works with Tasmota core ESP32 V.1.0.7.2
- [ ] I accept the [CLA](https://github.com/arendst/Tasmota/blob/development/CONTRIBUTING.md#contributor-license-agreement-cla).
_NOTE: The code change must pass CI tests. **Your PR cannot be merged unless tests pass**_

11
lib/lib_div/lib_mail/src/ESP_Mail_FS.h
View File

@ -19,15 +19,8 @@
*/
// #define ESP_Mail_DEFAULT_FLASH_FS SPIFFS
#ifdef ESP8266
#include <LittleFS.h>
#define ESP_Mail_DEFAULT_FLASH_FS LittleFS
#endif
#ifdef ESP32
#include <LITTLEFS.h>
#define ESP_Mail_DEFAULT_FLASH_FS LITTLEFS
#endif
#include <LittleFS.h>
#define ESP_Mail_DEFAULT_FLASH_FS LittleFS
/**
* To use SD card file systems with different hardware interface

2
lib/libesp32_div/ESP32-HomeKit/src/hap_platform_keystore.cpp
View File

@ -47,7 +47,7 @@ const char * hap_platform_keystore_get_factory_nvs_partition_name() {
#ifdef HAP_USE_LITTLEFS
#include <LITTLEFS.h>
#include <LittleFS.h>
extern FS *ffsp;

2
platformio_tasmota32.ini
View File

@ -27,7 +27,7 @@ build_flags = ${esp_defaults.build_flags}
[core32]
platform = espressif32 @ 3.3.0
platform_packages = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/1.0.7.1/tasmota-arduinoespressif32-release_v3.3.5.tar.gz
platform_packages = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/1.0.7.2/tasmota-arduinoespressif32-release_v3.3.5.tar.gz
platformio/tool-mklittlefs @ ~1.203.200522
build_unflags = ${esp32_defaults.build_unflags}
build_flags = ${esp32_defaults.build_flags}

14
platformio_tasmota_cenv_sample.ini
View File

@ -8,7 +8,7 @@
[core_dev]
; *** Esp8266 core for Arduino 3.0.1
platform = espressif8266 @ 3.1.0
platform_packages =
platform_packages =
build_unflags = ${esp_defaults.build_unflags}
-Wswitch-unreachable
build_flags = ${esp82xx_defaults.build_flags}
@ -31,8 +31,8 @@ build_flags = ${esp32_defaults.build_flags}
[env:tasmota32s2]
extends = env:tasmota32_base
board = esp32s2
platform = https://github.com/platformio/platform-espressif32.git#feature/idf-master
platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/331/framework-arduinoespressif32-master-209a0d389.tar.gz
platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master
platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/340/framework-arduinoespressif32-master-caf43f7e9.tar.gz
platformio/tool-mklittlefs @ ~1.203.200522
build_unflags = ${esp32_defaults.build_unflags}
build_flags = ${esp32_defaults.build_flags} -DFIRMWARE_LITE
@ -47,8 +47,8 @@ lib_ignore =
[env:tasmota32c3]
extends = env:tasmota32_base
board = esp32c3
platform = https://github.com/platformio/platform-espressif32.git#feature/idf-master
platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/331/framework-arduinoespressif32-master-209a0d389.tar.gz
platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master
platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/340/framework-arduinoespressif32-master-caf43f7e9.tar.gz
platformio/tool-mklittlefs @ ~1.203.200522
build_unflags = ${esp32_defaults.build_unflags}
-Wswitch-unreachable
@ -70,8 +70,8 @@ lib_ignore =
; *** EXPERIMENTAL Tasmota version for ESP32 IDF4.4.
[env:tasmota32idf4]
extends = env:tasmota32_base
platform = https://github.com/platformio/platform-espressif32.git#feature/idf-master
platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/331/framework-arduinoespressif32-master-209a0d389.tar.gz
platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master
platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/340/framework-arduinoespressif32-master-caf43f7e9.tar.gz
platformio/tool-mklittlefs @ ~1.203.200522
build_unflags = ${esp32_defaults.build_unflags}
-Wswitch-unreachable

2
platformio_tasmota_env32.ini
View File

@ -50,7 +50,7 @@ build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32
[env:tasmota32solo1]
extends = env:tasmota32_base
platform_packages = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/1.0.7/tasmota-arduinoespressif32-solo1-release_v3.3.5.tar.gz
platform_packages = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/1.0.7.2/tasmota-arduinoespressif32-solo1-release_v3.3.5.tar.gz
platformio/tool-esptoolpy @ ~1.30100
platformio/tool-mklittlefs @ ~1.203.200522
build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32

2
tasmota/tasmota.ino
View File

@ -66,7 +66,7 @@
#endif // USE_SDCARD
#endif // ESP8266
#ifdef ESP32
#include <LITTLEFS.h>
#include <LittleFS.h>
#ifdef USE_SDCARD
#include <SD.h>
#endif // USE_SDCARD

8
tasmota/xdrv_50_filesystem.ino
View File

@ -109,8 +109,8 @@ void UfsInitOnce(void) {
#ifdef ESP32
// try lfs first
ffsp = &LITTLEFS;
if (!LITTLEFS.begin(true)) {
ffsp = &LittleFS;
if (!LittleFS.begin(true)) {
// ffat is second
ffsp = &FFat;
if (!FFat.begin(true)) {
@ -223,9 +223,9 @@ uint32_t UfsInfo(uint32_t sel, uint32_t type) {
#endif // ESP8266
#ifdef ESP32
if (sel == 0) {
result = LITTLEFS.totalBytes();
result = LittleFS.totalBytes();
} else {
result = LITTLEFS.totalBytes() - LITTLEFS.usedBytes();
result = LittleFS.totalBytes() - LittleFS.usedBytes();
}
#endif // ESP32
break;