Merge pull request #11775 from Jason2866/more-refactor

More platformio refactor
This commit is contained in:
Theo Arends 2021-04-18 11:47:20 +02:00 committed by GitHub
commit d79125fca4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 107 additions and 11 deletions

View File

@ -19,7 +19,7 @@
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
],
"name": "Espressif Generic ESP8266 ESP-01 1M",
"name": "Espressif Generic ESP8266 1M sketch NO SPIFFS",
"upload": {
"maximum_ram_size": 81920,
"maximum_size": 1048576,

32
boards/esp8266_2M1M.json Normal file
View File

@ -0,0 +1,32 @@
{
"build": {
"arduino": {
"ldscript": "eagle.flash.2m1m.ld"
},
"core": "esp8266",
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
"mcu": "esp8266",
"variant": "generic"
},
"connectivity": [
"wifi"
],
"frameworks": [
"arduino",
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
],
"name": "Espressif Generic ESP8266 1M sketch 1M SPIFFS",
"upload": {
"maximum_ram_size": 81920,
"maximum_size": 1048576,
"require_upload_port": true,
"resetmethod": "ck",
"speed": 115200
},
"url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family",
"vendor": "Espressif"
}

32
boards/esp8266_4M2M.json Normal file
View File

@ -0,0 +1,32 @@
{
"build": {
"arduino": {
"ldscript": "eagle.flash.4m2m.ld"
},
"core": "esp8266",
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
"mcu": "esp8266",
"variant": "generic"
},
"connectivity": [
"wifi"
],
"frameworks": [
"arduino",
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
],
"name": "Espressif Generic ESP8266 1M sketch 1M OTA 2M SPIFFS",
"upload": {
"maximum_ram_size": 81920,
"maximum_size": 1048576,
"require_upload_port": true,
"resetmethod": "ck",
"speed": 115200
},
"url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family",
"vendor": "Espressif"
}

32
boards/esp8266_4M3M.json Normal file
View File

@ -0,0 +1,32 @@
{
"build": {
"arduino": {
"ldscript": "eagle.flash.4m3m.ld"
},
"core": "esp8266",
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
"mcu": "esp8266",
"variant": "generic"
},
"connectivity": [
"wifi"
],
"frameworks": [
"arduino",
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
],
"name": "Espressif Generic ESP8266 1M sketch 3M SPIFFS",
"upload": {
"maximum_ram_size": 81920,
"maximum_size": 1048576,
"require_upload_port": true,
"resetmethod": "ck",
"speed": 115200
},
"url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family",
"vendor": "Espressif"
}

View File

@ -55,13 +55,13 @@ build_flags = ${core.build_flags}
; *** If you try with earlier builds a serial erase and flash is probably needed
;
; Build variant 1MB = 1MB firmware no filesystem (default)
;board_build.ldscript = eagle.flash.1m.ld
; Build variant 2MB = 1MB firmware, +744k OTA, 256k filesystem (Zigbee Bridge, most Shelly devices)
;board_build.ldscript = eagle.flash.2m256.ld
; Build variant 4MB = 1MB firmware, +1MB OTA, 2MB filesystem (WEMOS D1 Mini, NodeMCU, Sonoff POW)
;board_build.ldscript = eagle.flash.4m2m.ld
; Build variant 16MB = 1MB firmware, +1MB OTA, 14MB filesystem (WEMOS D1 Mini pro, Ledunia (=32MB))
;board_build.ldscript = eagle.flash.16m14m.ld
;board = esp8266_1M
; Build variant 2MB = 1MB firmware, 1MB filesystem (most Shelly devices)
;board = esp8266_2M1M
; Build variant 4MB = 1MB firmware, 3MB filesystem (WEMOS D1 Mini, NodeMCU, Sonoff POW)
;board = esp8266_4M3M
; Build variant 4MB = 1MB firmware, 1MB OTA, 2MB filesystem (WEMOS D1 Mini, NodeMCU, Sonoff POW)
;board = esp8266_4M2M
; set CPU frequency to 80MHz (default) or 160MHz
;board_build.f_cpu = 160000000L
@ -209,11 +209,11 @@ lib_ignore =
NimBLE-Arduino
Micro-RTSP
; *** EXPERIMENTAL Tasmota version for Arduino ESP32 IDF4.4. Linking not working.
; *** EXPERIMENTAL Tasmota version for ESP32 IDF4.4.
[env:tasmota32idf4]
extends = env:tasmota32_base
platform = https://github.com/Jason2866/platform-espressif32.git#feature/arduino-idf-v4.4
platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/arduino-esp32/releases/download/esp32-2.0.0-pre/esp32-2.0.0-pre.zip
platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/v.2.0.0.pre/framework-arduinoespressif32-master-cf457d412.tar.gz
platformio/tool-mklittlefs @ ~1.203.200522
build_unflags = ${esp32_defaults.build_unflags}
build_flags = ${esp32_defaults.build_flags}

View File

@ -26,7 +26,7 @@
*
* To test this file:
* - Have hardware with at least 2M flash
* - Enable a build.ldscript with at least 256k filesystem in platform_override.ini
* - Enable a board with at least 256k filesystem in platform_override.ini
* - Enable define USE_UFILESYS in user_config_override.h
\*********************************************************************************************/
#warning **** USE_DRV_FILE_DEMO is enabled ****