From 12365eae0e61e553ca13655c8422c42ef49b6ecd Mon Sep 17 00:00:00 2001 From: Alexandre Picquot Date: Sun, 2 Dec 2018 08:27:08 -0500 Subject: [PATCH 01/10] block size for board.txt now depends on spiffs size not flash size to be consistent with ld files spiffs < 1M has a 4096 block size and 8192 for all the other ones only impacted boards 2M (128K), 2M (256K) 2M (512K) --- boards.txt | 18 +++++++++--------- tools/boards.txt.py | 5 ++++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/boards.txt b/boards.txt index 5fad1816c3..d51768fcc2 100644 --- a/boards.txt +++ b/boards.txt @@ -198,7 +198,7 @@ generic.menu.eesz.2M128.upload.maximum_size=1044464 generic.menu.eesz.2M128.build.rfcal_addr=0x1FC000 generic.menu.eesz.2M128.build.spiffs_start=0x1E0000 generic.menu.eesz.2M128.build.spiffs_end=0x1FB000 -generic.menu.eesz.2M128.build.spiffs_blocksize=8192 +generic.menu.eesz.2M128.build.spiffs_blocksize=4096 generic.menu.eesz.2M256=2M (256K SPIFFS) generic.menu.eesz.2M256.build.flash_size=2M generic.menu.eesz.2M256.build.flash_size_bytes=0x200000 @@ -208,7 +208,7 @@ generic.menu.eesz.2M256.upload.maximum_size=1044464 generic.menu.eesz.2M256.build.rfcal_addr=0x1FC000 generic.menu.eesz.2M256.build.spiffs_start=0x1C0000 generic.menu.eesz.2M256.build.spiffs_end=0x1FB000 -generic.menu.eesz.2M256.build.spiffs_blocksize=8192 +generic.menu.eesz.2M256.build.spiffs_blocksize=4096 generic.menu.eesz.2M512=2M (512K SPIFFS) generic.menu.eesz.2M512.build.flash_size=2M generic.menu.eesz.2M512.build.flash_size_bytes=0x200000 @@ -218,7 +218,7 @@ generic.menu.eesz.2M512.upload.maximum_size=1044464 generic.menu.eesz.2M512.build.rfcal_addr=0x1FC000 generic.menu.eesz.2M512.build.spiffs_start=0x180000 generic.menu.eesz.2M512.build.spiffs_end=0x1FB000 -generic.menu.eesz.2M512.build.spiffs_blocksize=8192 +generic.menu.eesz.2M512.build.spiffs_blocksize=4096 generic.menu.eesz.2M1M=2M (1M SPIFFS) generic.menu.eesz.2M1M.build.flash_size=2M generic.menu.eesz.2M1M.build.flash_size_bytes=0x200000 @@ -2546,7 +2546,7 @@ modwifi.menu.eesz.2M128.upload.maximum_size=1044464 modwifi.menu.eesz.2M128.build.rfcal_addr=0x1FC000 modwifi.menu.eesz.2M128.build.spiffs_start=0x1E0000 modwifi.menu.eesz.2M128.build.spiffs_end=0x1FB000 -modwifi.menu.eesz.2M128.build.spiffs_blocksize=8192 +modwifi.menu.eesz.2M128.build.spiffs_blocksize=4096 modwifi.menu.eesz.2M256=2M (256K SPIFFS) modwifi.menu.eesz.2M256.build.flash_size=2M modwifi.menu.eesz.2M256.build.flash_size_bytes=0x200000 @@ -2556,7 +2556,7 @@ modwifi.menu.eesz.2M256.upload.maximum_size=1044464 modwifi.menu.eesz.2M256.build.rfcal_addr=0x1FC000 modwifi.menu.eesz.2M256.build.spiffs_start=0x1C0000 modwifi.menu.eesz.2M256.build.spiffs_end=0x1FB000 -modwifi.menu.eesz.2M256.build.spiffs_blocksize=8192 +modwifi.menu.eesz.2M256.build.spiffs_blocksize=4096 modwifi.menu.eesz.2M512=2M (512K SPIFFS) modwifi.menu.eesz.2M512.build.flash_size=2M modwifi.menu.eesz.2M512.build.flash_size_bytes=0x200000 @@ -2566,7 +2566,7 @@ modwifi.menu.eesz.2M512.upload.maximum_size=1044464 modwifi.menu.eesz.2M512.build.rfcal_addr=0x1FC000 modwifi.menu.eesz.2M512.build.spiffs_start=0x180000 modwifi.menu.eesz.2M512.build.spiffs_end=0x1FB000 -modwifi.menu.eesz.2M512.build.spiffs_blocksize=8192 +modwifi.menu.eesz.2M512.build.spiffs_blocksize=4096 modwifi.menu.eesz.2M1M=2M (1M SPIFFS) modwifi.menu.eesz.2M1M.build.flash_size=2M modwifi.menu.eesz.2M1M.build.flash_size_bytes=0x200000 @@ -5398,7 +5398,7 @@ wifi_slot.menu.eesz.2M128.upload.maximum_size=1044464 wifi_slot.menu.eesz.2M128.build.rfcal_addr=0x1FC000 wifi_slot.menu.eesz.2M128.build.spiffs_start=0x1E0000 wifi_slot.menu.eesz.2M128.build.spiffs_end=0x1FB000 -wifi_slot.menu.eesz.2M128.build.spiffs_blocksize=8192 +wifi_slot.menu.eesz.2M128.build.spiffs_blocksize=4096 wifi_slot.menu.eesz.2M256=2M (256K SPIFFS) wifi_slot.menu.eesz.2M256.build.flash_size=2M wifi_slot.menu.eesz.2M256.build.flash_size_bytes=0x200000 @@ -5408,7 +5408,7 @@ wifi_slot.menu.eesz.2M256.upload.maximum_size=1044464 wifi_slot.menu.eesz.2M256.build.rfcal_addr=0x1FC000 wifi_slot.menu.eesz.2M256.build.spiffs_start=0x1C0000 wifi_slot.menu.eesz.2M256.build.spiffs_end=0x1FB000 -wifi_slot.menu.eesz.2M256.build.spiffs_blocksize=8192 +wifi_slot.menu.eesz.2M256.build.spiffs_blocksize=4096 wifi_slot.menu.eesz.2M512=2M (512K SPIFFS) wifi_slot.menu.eesz.2M512.build.flash_size=2M wifi_slot.menu.eesz.2M512.build.flash_size_bytes=0x200000 @@ -5418,7 +5418,7 @@ wifi_slot.menu.eesz.2M512.upload.maximum_size=1044464 wifi_slot.menu.eesz.2M512.build.rfcal_addr=0x1FC000 wifi_slot.menu.eesz.2M512.build.spiffs_start=0x180000 wifi_slot.menu.eesz.2M512.build.spiffs_end=0x1FB000 -wifi_slot.menu.eesz.2M512.build.spiffs_blocksize=8192 +wifi_slot.menu.eesz.2M512.build.spiffs_blocksize=4096 wifi_slot.menu.eesz.2M1M=2M (1M SPIFFS) wifi_slot.menu.eesz.2M1M.build.flash_size=2M wifi_slot.menu.eesz.2M1M.build.flash_size_bytes=0x200000 diff --git a/tools/boards.txt.py b/tools/boards.txt.py index 77deef3a96..ae0169868f 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -1129,10 +1129,13 @@ def flash_map (flashsize_kb, spiffs_kb = 0): if flashsize_kb <= 1024: max_upload_size = (flashsize_kb - (spiffs_kb + eeprom_size_kb + rfcal_size_kb + sdkwifi_size_kb)) * 1024 - reserved spiffs_start = spiffs_end - spiffs_kb * 1024 - spiffs_blocksize = 4096 else: max_upload_size = 1024 * 1024 - reserved spiffs_start = (flashsize_kb - spiffs_kb) * 1024 + + if spiffs_kb < 1024: + spiffs_blocksize = 4096 + else: spiffs_blocksize = 8192 strsize = str(flashsize_kb / 1024) + 'M' if (flashsize_kb >= 1024) else str(flashsize_kb) + 'K' From 6f54002bfb4627a4b7b8168f53974a3460d131ac Mon Sep 17 00:00:00 2001 From: Alexandre Picquot Date: Mon, 3 Dec 2018 18:20:29 -0500 Subject: [PATCH 02/10] block size of 4096 for spiff size < 512 (instead of 1024) only impacts boards 2M (SPIFFS 128K) and 2M (SPIFFS 256K) 2M (SPIFFS 512K) remains with 8192 block size --- boards.txt | 16 ++++++++-------- tools/boards.txt.py | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/boards.txt b/boards.txt index d51768fcc2..7d81eff00f 100644 --- a/boards.txt +++ b/boards.txt @@ -181,7 +181,7 @@ generic.menu.eesz.1M512.upload.maximum_size=499696 generic.menu.eesz.1M512.build.rfcal_addr=0xFC000 generic.menu.eesz.1M512.build.spiffs_start=0x7B000 generic.menu.eesz.1M512.build.spiffs_end=0xFB000 -generic.menu.eesz.1M512.build.spiffs_blocksize=4096 +generic.menu.eesz.1M512.build.spiffs_blocksize=8192 generic.menu.eesz.2M=2M (no SPIFFS) generic.menu.eesz.2M.build.flash_size=2M generic.menu.eesz.2M.build.flash_size_bytes=0x200000 @@ -218,7 +218,7 @@ generic.menu.eesz.2M512.upload.maximum_size=1044464 generic.menu.eesz.2M512.build.rfcal_addr=0x1FC000 generic.menu.eesz.2M512.build.spiffs_start=0x180000 generic.menu.eesz.2M512.build.spiffs_end=0x1FB000 -generic.menu.eesz.2M512.build.spiffs_blocksize=4096 +generic.menu.eesz.2M512.build.spiffs_blocksize=8192 generic.menu.eesz.2M1M=2M (1M SPIFFS) generic.menu.eesz.2M1M.build.flash_size=2M generic.menu.eesz.2M1M.build.flash_size_bytes=0x200000 @@ -564,7 +564,7 @@ esp8285.menu.eesz.1M512.upload.maximum_size=499696 esp8285.menu.eesz.1M512.build.rfcal_addr=0xFC000 esp8285.menu.eesz.1M512.build.spiffs_start=0x7B000 esp8285.menu.eesz.1M512.build.spiffs_end=0xFB000 -esp8285.menu.eesz.1M512.build.spiffs_blocksize=4096 +esp8285.menu.eesz.1M512.build.spiffs_blocksize=8192 esp8285.menu.led.2=2 esp8285.menu.led.2.build.led=-DLED_BUILTIN=2 esp8285.menu.led.0=0 @@ -2566,7 +2566,7 @@ modwifi.menu.eesz.2M512.upload.maximum_size=1044464 modwifi.menu.eesz.2M512.build.rfcal_addr=0x1FC000 modwifi.menu.eesz.2M512.build.spiffs_start=0x180000 modwifi.menu.eesz.2M512.build.spiffs_end=0x1FB000 -modwifi.menu.eesz.2M512.build.spiffs_blocksize=4096 +modwifi.menu.eesz.2M512.build.spiffs_blocksize=8192 modwifi.menu.eesz.2M1M=2M (1M SPIFFS) modwifi.menu.eesz.2M1M.build.flash_size=2M modwifi.menu.eesz.2M1M.build.flash_size_bytes=0x200000 @@ -3661,7 +3661,7 @@ d1_mini_lite.menu.eesz.1M512.upload.maximum_size=499696 d1_mini_lite.menu.eesz.1M512.build.rfcal_addr=0xFC000 d1_mini_lite.menu.eesz.1M512.build.spiffs_start=0x7B000 d1_mini_lite.menu.eesz.1M512.build.spiffs_end=0xFB000 -d1_mini_lite.menu.eesz.1M512.build.spiffs_blocksize=4096 +d1_mini_lite.menu.eesz.1M512.build.spiffs_blocksize=8192 d1_mini_lite.menu.ip.lm2f=v2 Lower Memory d1_mini_lite.menu.ip.lm2f.build.lwip_include=lwip2/include d1_mini_lite.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat @@ -4432,7 +4432,7 @@ wifinfo.menu.eesz.1M512.upload.maximum_size=499696 wifinfo.menu.eesz.1M512.build.rfcal_addr=0xFC000 wifinfo.menu.eesz.1M512.build.spiffs_start=0x7B000 wifinfo.menu.eesz.1M512.build.spiffs_end=0xFB000 -wifinfo.menu.eesz.1M512.build.spiffs_blocksize=4096 +wifinfo.menu.eesz.1M512.build.spiffs_blocksize=8192 wifinfo.menu.ip.lm2f=v2 Lower Memory wifinfo.menu.ip.lm2f.build.lwip_include=lwip2/include wifinfo.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat @@ -5381,7 +5381,7 @@ wifi_slot.menu.eesz.1M512.upload.maximum_size=499696 wifi_slot.menu.eesz.1M512.build.rfcal_addr=0xFC000 wifi_slot.menu.eesz.1M512.build.spiffs_start=0x7B000 wifi_slot.menu.eesz.1M512.build.spiffs_end=0xFB000 -wifi_slot.menu.eesz.1M512.build.spiffs_blocksize=4096 +wifi_slot.menu.eesz.1M512.build.spiffs_blocksize=8192 wifi_slot.menu.eesz.2M=2M (no SPIFFS) wifi_slot.menu.eesz.2M.build.flash_size=2M wifi_slot.menu.eesz.2M.build.flash_size_bytes=0x200000 @@ -5418,7 +5418,7 @@ wifi_slot.menu.eesz.2M512.upload.maximum_size=1044464 wifi_slot.menu.eesz.2M512.build.rfcal_addr=0x1FC000 wifi_slot.menu.eesz.2M512.build.spiffs_start=0x180000 wifi_slot.menu.eesz.2M512.build.spiffs_end=0x1FB000 -wifi_slot.menu.eesz.2M512.build.spiffs_blocksize=4096 +wifi_slot.menu.eesz.2M512.build.spiffs_blocksize=8192 wifi_slot.menu.eesz.2M1M=2M (1M SPIFFS) wifi_slot.menu.eesz.2M1M.build.flash_size=2M wifi_slot.menu.eesz.2M1M.build.flash_size_bytes=0x200000 diff --git a/tools/boards.txt.py b/tools/boards.txt.py index ae0169868f..09c436722b 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -1133,7 +1133,7 @@ def flash_map (flashsize_kb, spiffs_kb = 0): max_upload_size = 1024 * 1024 - reserved spiffs_start = (flashsize_kb - spiffs_kb) * 1024 - if spiffs_kb < 1024: + if spiffs_kb < 512: spiffs_blocksize = 4096 else: spiffs_blocksize = 8192 From bbaf6d912a90bb3ab3ffcf60851419b2f3ce2c25 Mon Sep 17 00:00:00 2001 From: Alexandre Picquot Date: Mon, 3 Dec 2018 18:33:02 -0500 Subject: [PATCH 03/10] block size of 4096 for all boads of flash size <= 1024 blocks size of 4096 for spiffs < 512 block size of 8192 for all other boards --- boards.txt | 10 +- .../package_esp8266com_index.template.json | 182 +++++++++--------- tools/boards.txt.py | 10 +- 3 files changed, 101 insertions(+), 101 deletions(-) diff --git a/boards.txt b/boards.txt index 750b705efd..6b583efab9 100644 --- a/boards.txt +++ b/boards.txt @@ -181,7 +181,7 @@ generic.menu.eesz.1M512.upload.maximum_size=499696 generic.menu.eesz.1M512.build.rfcal_addr=0xFC000 generic.menu.eesz.1M512.build.spiffs_start=0x7B000 generic.menu.eesz.1M512.build.spiffs_end=0xFB000 -generic.menu.eesz.1M512.build.spiffs_blocksize=8192 +generic.menu.eesz.1M512.build.spiffs_blocksize=4096 generic.menu.eesz.2M=2M (no SPIFFS) generic.menu.eesz.2M.build.flash_size=2M generic.menu.eesz.2M.build.flash_size_bytes=0x200000 @@ -564,7 +564,7 @@ esp8285.menu.eesz.1M512.upload.maximum_size=499696 esp8285.menu.eesz.1M512.build.rfcal_addr=0xFC000 esp8285.menu.eesz.1M512.build.spiffs_start=0x7B000 esp8285.menu.eesz.1M512.build.spiffs_end=0xFB000 -esp8285.menu.eesz.1M512.build.spiffs_blocksize=8192 +esp8285.menu.eesz.1M512.build.spiffs_blocksize=4096 esp8285.menu.led.2=2 esp8285.menu.led.2.build.led=-DLED_BUILTIN=2 esp8285.menu.led.0=0 @@ -3661,7 +3661,7 @@ d1_mini_lite.menu.eesz.1M512.upload.maximum_size=499696 d1_mini_lite.menu.eesz.1M512.build.rfcal_addr=0xFC000 d1_mini_lite.menu.eesz.1M512.build.spiffs_start=0x7B000 d1_mini_lite.menu.eesz.1M512.build.spiffs_end=0xFB000 -d1_mini_lite.menu.eesz.1M512.build.spiffs_blocksize=8192 +d1_mini_lite.menu.eesz.1M512.build.spiffs_blocksize=4096 d1_mini_lite.menu.ip.lm2f=v2 Lower Memory d1_mini_lite.menu.ip.lm2f.build.lwip_include=lwip2/include d1_mini_lite.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat @@ -4432,7 +4432,7 @@ wifinfo.menu.eesz.1M512.upload.maximum_size=499696 wifinfo.menu.eesz.1M512.build.rfcal_addr=0xFC000 wifinfo.menu.eesz.1M512.build.spiffs_start=0x7B000 wifinfo.menu.eesz.1M512.build.spiffs_end=0xFB000 -wifinfo.menu.eesz.1M512.build.spiffs_blocksize=8192 +wifinfo.menu.eesz.1M512.build.spiffs_blocksize=4096 wifinfo.menu.ip.lm2f=v2 Lower Memory wifinfo.menu.ip.lm2f.build.lwip_include=lwip2/include wifinfo.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat @@ -5381,7 +5381,7 @@ wifi_slot.menu.eesz.1M512.upload.maximum_size=499696 wifi_slot.menu.eesz.1M512.build.rfcal_addr=0xFC000 wifi_slot.menu.eesz.1M512.build.spiffs_start=0x7B000 wifi_slot.menu.eesz.1M512.build.spiffs_end=0xFB000 -wifi_slot.menu.eesz.1M512.build.spiffs_blocksize=8192 +wifi_slot.menu.eesz.1M512.build.spiffs_blocksize=4096 wifi_slot.menu.eesz.2M=2M (no SPIFFS) wifi_slot.menu.eesz.2M.build.flash_size=2M wifi_slot.menu.eesz.2M.build.flash_size_bytes=0x200000 diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json index 99f6ebd4d9..3bdb1d6b69 100644 --- a/package/package_esp8266com_index.template.json +++ b/package/package_esp8266com_index.template.json @@ -15,97 +15,97 @@ "architecture": "esp8266", "archiveFileName": "", "boards": [ - { - "name": "Generic ESP8266 Module" - }, - { - "name": "Generic ESP8285 Module" - }, - { - "name": "ESPDuino (ESP-13 Module)" - }, - { - "name": "Adafruit Feather HUZZAH ESP8266" - }, - { - "name": "Invent One" - }, - { - "name": "XinaBox CW01" - }, - { - "name": "ESPresso Lite 1.0" - }, - { - "name": "ESPresso Lite 2.0" - }, - { - "name": "Phoenix 1.0" - }, - { - "name": "Phoenix 2.0" - }, - { - "name": "NodeMCU 0.9 (ESP-12 Module)" - }, - { - "name": "NodeMCU 1.0 (ESP-12E Module)" - }, - { - "name": "Olimex MOD-WIFI-ESP8266(-DEV)" - }, - { - "name": "SparkFun ESP8266 Thing" - }, - { - "name": "SparkFun ESP8266 Thing Dev" - }, - { - "name": "SweetPea ESP-210" - }, - { - "name": "LOLIN(WEMOS) D1 R2 & mini" - }, - { - "name": "LOLIN(WEMOS) D1 mini Pro" - }, - { - "name": "LOLIN(WEMOS) D1 mini Lite" - }, - { - "name": "WeMos D1 R1" - }, - { - "name": "ESPino (ESP-12 Module)" - }, - { - "name": "ThaiEasyElec's ESPino" - }, - { - "name": "WifInfo" - }, - { - "name": "Arduino" - }, - { - "name": "4D Systems gen4 IoD Range" - }, - { - "name": "Digistump Oak" - }, - { - "name": "WiFiduino" - }, - { - "name": "Amperka WiFi Slot" - }, - { - "name": "Seeed Wio Link" - }, - { - "name": "ESPectro Core" - } - ], + { + "name": "Generic ESP8266 Module" + }, + { + "name": "Generic ESP8285 Module" + }, + { + "name": "ESPDuino (ESP-13 Module)" + }, + { + "name": "Adafruit Feather HUZZAH ESP8266" + }, + { + "name": "Invent One" + }, + { + "name": "XinaBox CW01" + }, + { + "name": "ESPresso Lite 1.0" + }, + { + "name": "ESPresso Lite 2.0" + }, + { + "name": "Phoenix 1.0" + }, + { + "name": "Phoenix 2.0" + }, + { + "name": "NodeMCU 0.9 (ESP-12 Module)" + }, + { + "name": "NodeMCU 1.0 (ESP-12E Module)" + }, + { + "name": "Olimex MOD-WIFI-ESP8266(-DEV)" + }, + { + "name": "SparkFun ESP8266 Thing" + }, + { + "name": "SparkFun ESP8266 Thing Dev" + }, + { + "name": "SweetPea ESP-210" + }, + { + "name": "LOLIN(WEMOS) D1 R2 & mini" + }, + { + "name": "LOLIN(WEMOS) D1 mini Pro" + }, + { + "name": "LOLIN(WEMOS) D1 mini Lite" + }, + { + "name": "WeMos D1 R1" + }, + { + "name": "ESPino (ESP-12 Module)" + }, + { + "name": "ThaiEasyElec's ESPino" + }, + { + "name": "WifInfo" + }, + { + "name": "Arduino" + }, + { + "name": "4D Systems gen4 IoD Range" + }, + { + "name": "Digistump Oak" + }, + { + "name": "WiFiduino" + }, + { + "name": "Amperka WiFi Slot" + }, + { + "name": "Seeed Wio Link" + }, + { + "name": "ESPectro Core" + } + ], "toolsDependencies": [ { "packager": "esp8266", diff --git a/tools/boards.txt.py b/tools/boards.txt.py index 1d433bf8a3..1f29d587d5 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -1149,14 +1149,14 @@ def flash_map (flashsize_kb, spiffs_kb = 0): if flashsize_kb <= 1024: max_upload_size = (flashsize_kb - (spiffs_kb + eeprom_size_kb + rfcal_size_kb + sdkwifi_size_kb)) * 1024 - reserved spiffs_start = spiffs_end - spiffs_kb * 1024 + spiffs_blocksize = 4096 else: max_upload_size = 1024 * 1024 - reserved spiffs_start = (flashsize_kb - spiffs_kb) * 1024 - - if spiffs_kb < 512: - spiffs_blocksize = 4096 - else: - spiffs_blocksize = 8192 + if spiffs_kb < 512: + spiffs_blocksize = 4096 + else: + spiffs_blocksize = 8192 strsize = str(flashsize_kb / 1024) + 'M' if (flashsize_kb >= 1024) else str(flashsize_kb) + 'K' strspiffs = str(spiffs_kb / 1024) + 'M' if (spiffs_kb >= 1024) else str(spiffs_kb) + 'K' From 5510e8875aa2567b7036c3d82f0df9dabd87696b Mon Sep 17 00:00:00 2001 From: Alexandre Picquot Date: Mon, 3 Dec 2018 18:39:24 -0500 Subject: [PATCH 04/10] indent error --- tools/boards.txt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/boards.txt.py b/tools/boards.txt.py index 1f29d587d5..035dd79a34 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -1156,7 +1156,7 @@ def flash_map (flashsize_kb, spiffs_kb = 0): if spiffs_kb < 512: spiffs_blocksize = 4096 else: - spiffs_blocksize = 8192 + spiffs_blocksize = 8192 strsize = str(flashsize_kb / 1024) + 'M' if (flashsize_kb >= 1024) else str(flashsize_kb) + 'K' strspiffs = str(spiffs_kb / 1024) + 'M' if (spiffs_kb >= 1024) else str(spiffs_kb) + 'K' From b64987c60948ade7d460331a2eb55a4605d8bcf2 Mon Sep 17 00:00:00 2001 From: Alexandre Picquot Date: Mon, 3 Dec 2018 19:03:50 -0500 Subject: [PATCH 05/10] indent issue --- .../package_esp8266com_index.template.json | 60 +++++++++---------- tools/boards.txt.py | 2 +- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json index a6eed44c57..64ea307e4b 100644 --- a/package/package_esp8266com_index.template.json +++ b/package/package_esp8266com_index.template.json @@ -15,94 +15,94 @@ "architecture": "esp8266", "archiveFileName": "", "boards": [ - { + { "name": "Generic ESP8266 Module" }, - { + { "name": "Generic ESP8285 Module" }, - { + { "name": "ESPDuino (ESP-13 Module)" }, - { + { "name": "Adafruit Feather HUZZAH ESP8266" }, - { + { "name": "Invent One" }, - { + { "name": "XinaBox CW01" }, - { + { "name": "ESPresso Lite 1.0" }, - { + { "name": "ESPresso Lite 2.0" }, - { + { "name": "Phoenix 1.0" }, - { + { "name": "Phoenix 2.0" }, - { + { "name": "NodeMCU 0.9 (ESP-12 Module)" }, - { + { "name": "NodeMCU 1.0 (ESP-12E Module)" }, - { + { "name": "Olimex MOD-WIFI-ESP8266(-DEV)" }, - { + { "name": "SparkFun ESP8266 Thing" }, - { + { "name": "SparkFun ESP8266 Thing Dev" }, - { + { "name": "SweetPea ESP-210" }, - { + { "name": "LOLIN(WEMOS) D1 R2 & mini" }, - { + { "name": "LOLIN(WEMOS) D1 mini Pro" }, - { + { "name": "LOLIN(WEMOS) D1 mini Lite" }, - { + { "name": "WeMos D1 R1" }, - { + { "name": "ESPino (ESP-12 Module)" }, - { + { "name": "ThaiEasyElec's ESPino" }, - { + { "name": "WifInfo" }, - { + { "name": "Arduino" }, - { + { "name": "4D Systems gen4 IoD Range" }, - { + { "name": "Digistump Oak" }, - { + { "name": "WiFiduino" }, - { + { "name": "Amperka WiFi Slot" }, - { + { "name": "Seeed Wio Link" }, - { + { "name": "ESPectro Core" } ], diff --git a/tools/boards.txt.py b/tools/boards.txt.py index 035dd79a34..d6e8d41573 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -1412,7 +1412,7 @@ def package (): filestr = package_file.read() substitution = '"boards": [\n' - board_items = [' {\n "name": "%s"\n }' % boards[id]['name'] + board_items = [' {\n "name": "%s"\n }' % boards[id]['name'] for id in boards] substitution += ',\n'.join(board_items) substitution += '\n ],' From 5d198031567ad2fd81a615723bd12d264d4fe148 Mon Sep 17 00:00:00 2001 From: Alexandre Picquot Date: Mon, 3 Dec 2018 19:05:43 -0500 Subject: [PATCH 06/10] indent issue --- .../package_esp8266com_index.template.json | 120 +++++++++--------- tools/boards.txt.py | 2 +- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json index 64ea307e4b..15e160f19e 100644 --- a/package/package_esp8266com_index.template.json +++ b/package/package_esp8266com_index.template.json @@ -16,95 +16,95 @@ "archiveFileName": "", "boards": [ { - "name": "Generic ESP8266 Module" - }, + "name": "Generic ESP8266 Module" + }, { - "name": "Generic ESP8285 Module" - }, + "name": "Generic ESP8285 Module" + }, { - "name": "ESPDuino (ESP-13 Module)" - }, + "name": "ESPDuino (ESP-13 Module)" + }, { - "name": "Adafruit Feather HUZZAH ESP8266" - }, + "name": "Adafruit Feather HUZZAH ESP8266" + }, { - "name": "Invent One" - }, + "name": "Invent One" + }, { - "name": "XinaBox CW01" - }, + "name": "XinaBox CW01" + }, { - "name": "ESPresso Lite 1.0" - }, + "name": "ESPresso Lite 1.0" + }, { - "name": "ESPresso Lite 2.0" - }, + "name": "ESPresso Lite 2.0" + }, { - "name": "Phoenix 1.0" - }, + "name": "Phoenix 1.0" + }, { - "name": "Phoenix 2.0" - }, + "name": "Phoenix 2.0" + }, { - "name": "NodeMCU 0.9 (ESP-12 Module)" - }, + "name": "NodeMCU 0.9 (ESP-12 Module)" + }, { - "name": "NodeMCU 1.0 (ESP-12E Module)" - }, + "name": "NodeMCU 1.0 (ESP-12E Module)" + }, { - "name": "Olimex MOD-WIFI-ESP8266(-DEV)" - }, + "name": "Olimex MOD-WIFI-ESP8266(-DEV)" + }, { - "name": "SparkFun ESP8266 Thing" - }, + "name": "SparkFun ESP8266 Thing" + }, { - "name": "SparkFun ESP8266 Thing Dev" - }, + "name": "SparkFun ESP8266 Thing Dev" + }, { - "name": "SweetPea ESP-210" - }, + "name": "SweetPea ESP-210" + }, { - "name": "LOLIN(WEMOS) D1 R2 & mini" - }, + "name": "LOLIN(WEMOS) D1 R2 & mini" + }, { - "name": "LOLIN(WEMOS) D1 mini Pro" - }, + "name": "LOLIN(WEMOS) D1 mini Pro" + }, { - "name": "LOLIN(WEMOS) D1 mini Lite" - }, + "name": "LOLIN(WEMOS) D1 mini Lite" + }, { - "name": "WeMos D1 R1" - }, + "name": "WeMos D1 R1" + }, { - "name": "ESPino (ESP-12 Module)" - }, + "name": "ESPino (ESP-12 Module)" + }, { - "name": "ThaiEasyElec's ESPino" - }, + "name": "ThaiEasyElec's ESPino" + }, { - "name": "WifInfo" - }, + "name": "WifInfo" + }, { - "name": "Arduino" - }, + "name": "Arduino" + }, { - "name": "4D Systems gen4 IoD Range" - }, + "name": "4D Systems gen4 IoD Range" + }, { - "name": "Digistump Oak" - }, + "name": "Digistump Oak" + }, { - "name": "WiFiduino" - }, + "name": "WiFiduino" + }, { - "name": "Amperka WiFi Slot" - }, + "name": "Amperka WiFi Slot" + }, { - "name": "Seeed Wio Link" - }, + "name": "Seeed Wio Link" + }, { - "name": "ESPectro Core" - } + "name": "ESPectro Core" + } ], "toolsDependencies": [ { diff --git a/tools/boards.txt.py b/tools/boards.txt.py index d6e8d41573..f50a1d0d4a 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -1412,7 +1412,7 @@ def package (): filestr = package_file.read() substitution = '"boards": [\n' - board_items = [' {\n "name": "%s"\n }' % boards[id]['name'] + board_items = [' {\n "name": "%s"\n }' % boards[id]['name'] for id in boards] substitution += ',\n'.join(board_items) substitution += '\n ],' From 2739c1f731e5d9936d768ba214156ab3c93e44fe Mon Sep 17 00:00:00 2001 From: Alexandre Picquot Date: Mon, 3 Dec 2018 19:06:51 -0500 Subject: [PATCH 07/10] indent issue --- .../package_esp8266com_index.template.json | 120 +++++++++--------- tools/boards.txt.py | 2 +- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json index 15e160f19e..a93ddaa1ae 100644 --- a/package/package_esp8266com_index.template.json +++ b/package/package_esp8266com_index.template.json @@ -16,95 +16,95 @@ "archiveFileName": "", "boards": [ { - "name": "Generic ESP8266 Module" - }, + "name": "Generic ESP8266 Module" + }, { - "name": "Generic ESP8285 Module" - }, + "name": "Generic ESP8285 Module" + }, { - "name": "ESPDuino (ESP-13 Module)" - }, + "name": "ESPDuino (ESP-13 Module)" + }, { - "name": "Adafruit Feather HUZZAH ESP8266" - }, + "name": "Adafruit Feather HUZZAH ESP8266" + }, { - "name": "Invent One" - }, + "name": "Invent One" + }, { - "name": "XinaBox CW01" - }, + "name": "XinaBox CW01" + }, { - "name": "ESPresso Lite 1.0" - }, + "name": "ESPresso Lite 1.0" + }, { - "name": "ESPresso Lite 2.0" - }, + "name": "ESPresso Lite 2.0" + }, { - "name": "Phoenix 1.0" - }, + "name": "Phoenix 1.0" + }, { - "name": "Phoenix 2.0" - }, + "name": "Phoenix 2.0" + }, { - "name": "NodeMCU 0.9 (ESP-12 Module)" - }, + "name": "NodeMCU 0.9 (ESP-12 Module)" + }, { - "name": "NodeMCU 1.0 (ESP-12E Module)" - }, + "name": "NodeMCU 1.0 (ESP-12E Module)" + }, { - "name": "Olimex MOD-WIFI-ESP8266(-DEV)" - }, + "name": "Olimex MOD-WIFI-ESP8266(-DEV)" + }, { - "name": "SparkFun ESP8266 Thing" - }, + "name": "SparkFun ESP8266 Thing" + }, { - "name": "SparkFun ESP8266 Thing Dev" - }, + "name": "SparkFun ESP8266 Thing Dev" + }, { - "name": "SweetPea ESP-210" - }, + "name": "SweetPea ESP-210" + }, { - "name": "LOLIN(WEMOS) D1 R2 & mini" - }, + "name": "LOLIN(WEMOS) D1 R2 & mini" + }, { - "name": "LOLIN(WEMOS) D1 mini Pro" - }, + "name": "LOLIN(WEMOS) D1 mini Pro" + }, { - "name": "LOLIN(WEMOS) D1 mini Lite" - }, + "name": "LOLIN(WEMOS) D1 mini Lite" + }, { - "name": "WeMos D1 R1" - }, + "name": "WeMos D1 R1" + }, { - "name": "ESPino (ESP-12 Module)" - }, + "name": "ESPino (ESP-12 Module)" + }, { - "name": "ThaiEasyElec's ESPino" - }, + "name": "ThaiEasyElec's ESPino" + }, { - "name": "WifInfo" - }, + "name": "WifInfo" + }, { - "name": "Arduino" - }, + "name": "Arduino" + }, { - "name": "4D Systems gen4 IoD Range" - }, + "name": "4D Systems gen4 IoD Range" + }, { - "name": "Digistump Oak" - }, + "name": "Digistump Oak" + }, { - "name": "WiFiduino" - }, + "name": "WiFiduino" + }, { - "name": "Amperka WiFi Slot" - }, + "name": "Amperka WiFi Slot" + }, { - "name": "Seeed Wio Link" - }, + "name": "Seeed Wio Link" + }, { - "name": "ESPectro Core" - } + "name": "ESPectro Core" + } ], "toolsDependencies": [ { diff --git a/tools/boards.txt.py b/tools/boards.txt.py index f50a1d0d4a..2a948f10a3 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -1412,7 +1412,7 @@ def package (): filestr = package_file.read() substitution = '"boards": [\n' - board_items = [' {\n "name": "%s"\n }' % boards[id]['name'] + board_items = [' {\n "name": "%s"\n }' % boards[id]['name'] for id in boards] substitution += ',\n'.join(board_items) substitution += '\n ],' From 8ad359d84d5cb606dfb6adbeb6a3379a2290548b Mon Sep 17 00:00:00 2001 From: Alexandre Picquot Date: Mon, 3 Dec 2018 19:08:08 -0500 Subject: [PATCH 08/10] indent issue --- package/package_esp8266com_index.template.json | 2 +- tools/boards.txt.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json index a93ddaa1ae..4beaf46010 100644 --- a/package/package_esp8266com_index.template.json +++ b/package/package_esp8266com_index.template.json @@ -105,7 +105,7 @@ { "name": "ESPectro Core" } - ], + ], "toolsDependencies": [ { "packager": "esp8266", diff --git a/tools/boards.txt.py b/tools/boards.txt.py index 2a948f10a3..396872b9c3 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -1415,7 +1415,7 @@ def package (): board_items = [' {\n "name": "%s"\n }' % boards[id]['name'] for id in boards] substitution += ',\n'.join(board_items) - substitution += '\n ],' + substitution += '\n ],' newfilestr = re.sub(r'"boards":[^\]]*\],', substitution, filestr, re.MULTILINE) From 24030635407198c4d7058e5dae8c43fdefbfee78 Mon Sep 17 00:00:00 2001 From: Alexandre Picquot Date: Mon, 3 Dec 2018 19:08:49 -0500 Subject: [PATCH 09/10] indent issue --- package/package_esp8266com_index.template.json | 2 +- tools/boards.txt.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json index 4beaf46010..fcd05c287f 100644 --- a/package/package_esp8266com_index.template.json +++ b/package/package_esp8266com_index.template.json @@ -105,7 +105,7 @@ { "name": "ESPectro Core" } - ], + ], "toolsDependencies": [ { "packager": "esp8266", diff --git a/tools/boards.txt.py b/tools/boards.txt.py index 396872b9c3..0a1810b170 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -1415,7 +1415,7 @@ def package (): board_items = [' {\n "name": "%s"\n }' % boards[id]['name'] for id in boards] substitution += ',\n'.join(board_items) - substitution += '\n ],' + substitution += '\n ],' newfilestr = re.sub(r'"boards":[^\]]*\],', substitution, filestr, re.MULTILINE) From f50df4ee7bb03f108dfabd9c6866fe80e515f6a3 Mon Sep 17 00:00:00 2001 From: Alexandre Picquot Date: Mon, 3 Dec 2018 19:19:10 -0500 Subject: [PATCH 10/10] keep indent issue --- .../package_esp8266com_index.template.json | 182 +++++++++--------- tools/boards.txt.py | 4 +- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json index fcd05c287f..a6eed44c57 100644 --- a/package/package_esp8266com_index.template.json +++ b/package/package_esp8266com_index.template.json @@ -15,97 +15,97 @@ "architecture": "esp8266", "archiveFileName": "", "boards": [ - { - "name": "Generic ESP8266 Module" - }, - { - "name": "Generic ESP8285 Module" - }, - { - "name": "ESPDuino (ESP-13 Module)" - }, - { - "name": "Adafruit Feather HUZZAH ESP8266" - }, - { - "name": "Invent One" - }, - { - "name": "XinaBox CW01" - }, - { - "name": "ESPresso Lite 1.0" - }, - { - "name": "ESPresso Lite 2.0" - }, - { - "name": "Phoenix 1.0" - }, - { - "name": "Phoenix 2.0" - }, - { - "name": "NodeMCU 0.9 (ESP-12 Module)" - }, - { - "name": "NodeMCU 1.0 (ESP-12E Module)" - }, - { - "name": "Olimex MOD-WIFI-ESP8266(-DEV)" - }, - { - "name": "SparkFun ESP8266 Thing" - }, - { - "name": "SparkFun ESP8266 Thing Dev" - }, - { - "name": "SweetPea ESP-210" - }, - { - "name": "LOLIN(WEMOS) D1 R2 & mini" - }, - { - "name": "LOLIN(WEMOS) D1 mini Pro" - }, - { - "name": "LOLIN(WEMOS) D1 mini Lite" - }, - { - "name": "WeMos D1 R1" - }, - { - "name": "ESPino (ESP-12 Module)" - }, - { - "name": "ThaiEasyElec's ESPino" - }, - { - "name": "WifInfo" - }, - { - "name": "Arduino" - }, - { - "name": "4D Systems gen4 IoD Range" - }, - { - "name": "Digistump Oak" - }, - { - "name": "WiFiduino" - }, - { - "name": "Amperka WiFi Slot" - }, - { - "name": "Seeed Wio Link" - }, - { - "name": "ESPectro Core" - } - ], + { + "name": "Generic ESP8266 Module" + }, + { + "name": "Generic ESP8285 Module" + }, + { + "name": "ESPDuino (ESP-13 Module)" + }, + { + "name": "Adafruit Feather HUZZAH ESP8266" + }, + { + "name": "Invent One" + }, + { + "name": "XinaBox CW01" + }, + { + "name": "ESPresso Lite 1.0" + }, + { + "name": "ESPresso Lite 2.0" + }, + { + "name": "Phoenix 1.0" + }, + { + "name": "Phoenix 2.0" + }, + { + "name": "NodeMCU 0.9 (ESP-12 Module)" + }, + { + "name": "NodeMCU 1.0 (ESP-12E Module)" + }, + { + "name": "Olimex MOD-WIFI-ESP8266(-DEV)" + }, + { + "name": "SparkFun ESP8266 Thing" + }, + { + "name": "SparkFun ESP8266 Thing Dev" + }, + { + "name": "SweetPea ESP-210" + }, + { + "name": "LOLIN(WEMOS) D1 R2 & mini" + }, + { + "name": "LOLIN(WEMOS) D1 mini Pro" + }, + { + "name": "LOLIN(WEMOS) D1 mini Lite" + }, + { + "name": "WeMos D1 R1" + }, + { + "name": "ESPino (ESP-12 Module)" + }, + { + "name": "ThaiEasyElec's ESPino" + }, + { + "name": "WifInfo" + }, + { + "name": "Arduino" + }, + { + "name": "4D Systems gen4 IoD Range" + }, + { + "name": "Digistump Oak" + }, + { + "name": "WiFiduino" + }, + { + "name": "Amperka WiFi Slot" + }, + { + "name": "Seeed Wio Link" + }, + { + "name": "ESPectro Core" + } + ], "toolsDependencies": [ { "packager": "esp8266", diff --git a/tools/boards.txt.py b/tools/boards.txt.py index 0a1810b170..035dd79a34 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -1412,10 +1412,10 @@ def package (): filestr = package_file.read() substitution = '"boards": [\n' - board_items = [' {\n "name": "%s"\n }' % boards[id]['name'] + board_items = [' {\n "name": "%s"\n }' % boards[id]['name'] for id in boards] substitution += ',\n'.join(board_items) - substitution += '\n ],' + substitution += '\n ],' newfilestr = re.sub(r'"boards":[^\]]*\],', substitution, filestr, re.MULTILINE)