Skip to content

Commit 672c3f8

Browse files
authored
boards updates: nodemcu doc update (@lrmoreno007 #4715) + 512k32spiffs (@carlymx #4871) (#4880)
* boards updates: nodemcu doc update (@lrmoreno007 #4715) + 512k32spiffs (@carlymx #4871) * sometimes -> usually
1 parent 7dd2ca3 commit 672c3f8

File tree

4 files changed

+62
-0
lines changed

4 files changed

+62
-0
lines changed

boards.txt

+40
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,16 @@ generic.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld
7373
generic.menu.FlashSize.512K0.build.spiffs_pagesize=256
7474
generic.menu.FlashSize.512K0.upload.maximum_size=499696
7575
generic.menu.FlashSize.512K0.build.rfcal_addr=0x7C000
76+
generic.menu.FlashSize.512K32=512K (32K SPIFFS)
77+
generic.menu.FlashSize.512K32.build.flash_size=512K
78+
generic.menu.FlashSize.512K32.build.flash_size_bytes=0x80000
79+
generic.menu.FlashSize.512K32.build.flash_ld=eagle.flash.512k32.ld
80+
generic.menu.FlashSize.512K32.build.spiffs_pagesize=256
81+
generic.menu.FlashSize.512K32.upload.maximum_size=466928
82+
generic.menu.FlashSize.512K32.build.rfcal_addr=0x7C000
83+
generic.menu.FlashSize.512K32.build.spiffs_start=0x73000
84+
generic.menu.FlashSize.512K32.build.spiffs_end=0x7B000
85+
generic.menu.FlashSize.512K32.build.spiffs_blocksize=4096
7686
generic.menu.FlashSize.512K64=512K (64K SPIFFS)
7787
generic.menu.FlashSize.512K64.build.flash_size=512K
7888
generic.menu.FlashSize.512K64.build.flash_size_bytes=0x80000
@@ -2022,6 +2032,16 @@ thing.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld
20222032
thing.menu.FlashSize.512K0.build.spiffs_pagesize=256
20232033
thing.menu.FlashSize.512K0.upload.maximum_size=499696
20242034
thing.menu.FlashSize.512K0.build.rfcal_addr=0x7C000
2035+
thing.menu.FlashSize.512K32=512K (32K SPIFFS)
2036+
thing.menu.FlashSize.512K32.build.flash_size=512K
2037+
thing.menu.FlashSize.512K32.build.flash_size_bytes=0x80000
2038+
thing.menu.FlashSize.512K32.build.flash_ld=eagle.flash.512k32.ld
2039+
thing.menu.FlashSize.512K32.build.spiffs_pagesize=256
2040+
thing.menu.FlashSize.512K32.upload.maximum_size=466928
2041+
thing.menu.FlashSize.512K32.build.rfcal_addr=0x7C000
2042+
thing.menu.FlashSize.512K32.build.spiffs_start=0x73000
2043+
thing.menu.FlashSize.512K32.build.spiffs_end=0x7B000
2044+
thing.menu.FlashSize.512K32.build.spiffs_blocksize=4096
20252045
thing.menu.FlashSize.512K64=512K (64K SPIFFS)
20262046
thing.menu.FlashSize.512K64.build.flash_size=512K
20272047
thing.menu.FlashSize.512K64.build.flash_size_bytes=0x80000
@@ -2173,6 +2193,16 @@ thingdev.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld
21732193
thingdev.menu.FlashSize.512K0.build.spiffs_pagesize=256
21742194
thingdev.menu.FlashSize.512K0.upload.maximum_size=499696
21752195
thingdev.menu.FlashSize.512K0.build.rfcal_addr=0x7C000
2196+
thingdev.menu.FlashSize.512K32=512K (32K SPIFFS)
2197+
thingdev.menu.FlashSize.512K32.build.flash_size=512K
2198+
thingdev.menu.FlashSize.512K32.build.flash_size_bytes=0x80000
2199+
thingdev.menu.FlashSize.512K32.build.flash_ld=eagle.flash.512k32.ld
2200+
thingdev.menu.FlashSize.512K32.build.spiffs_pagesize=256
2201+
thingdev.menu.FlashSize.512K32.upload.maximum_size=466928
2202+
thingdev.menu.FlashSize.512K32.build.rfcal_addr=0x7C000
2203+
thingdev.menu.FlashSize.512K32.build.spiffs_start=0x73000
2204+
thingdev.menu.FlashSize.512K32.build.spiffs_end=0x7B000
2205+
thingdev.menu.FlashSize.512K32.build.spiffs_blocksize=4096
21762206
thingdev.menu.FlashSize.512K64=512K (64K SPIFFS)
21772207
thingdev.menu.FlashSize.512K64.build.flash_size=512K
21782208
thingdev.menu.FlashSize.512K64.build.flash_size_bytes=0x80000
@@ -3820,6 +3850,16 @@ gen4iod.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld
38203850
gen4iod.menu.FlashSize.512K0.build.spiffs_pagesize=256
38213851
gen4iod.menu.FlashSize.512K0.upload.maximum_size=499696
38223852
gen4iod.menu.FlashSize.512K0.build.rfcal_addr=0x7C000
3853+
gen4iod.menu.FlashSize.512K32=512K (32K SPIFFS)
3854+
gen4iod.menu.FlashSize.512K32.build.flash_size=512K
3855+
gen4iod.menu.FlashSize.512K32.build.flash_size_bytes=0x80000
3856+
gen4iod.menu.FlashSize.512K32.build.flash_ld=eagle.flash.512k32.ld
3857+
gen4iod.menu.FlashSize.512K32.build.spiffs_pagesize=256
3858+
gen4iod.menu.FlashSize.512K32.upload.maximum_size=466928
3859+
gen4iod.menu.FlashSize.512K32.build.rfcal_addr=0x7C000
3860+
gen4iod.menu.FlashSize.512K32.build.spiffs_start=0x73000
3861+
gen4iod.menu.FlashSize.512K32.build.spiffs_end=0x7B000
3862+
gen4iod.menu.FlashSize.512K32.build.spiffs_blocksize=4096
38233863
gen4iod.menu.FlashSize.512K64=512K (64K SPIFFS)
38243864
gen4iod.menu.FlashSize.512K64.build.flash_size=512K
38253865
gen4iod.menu.FlashSize.512K64.build.flash_size_bytes=0x80000

doc/boards.rst

+1
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ According to the manufacturer, "with a micro USB cable, you can connect NodeMCU
274274
RST, then releasing FLASH, then releasing RST. This forces the CP2102 device to power cycle and to be re-numbered by Linux.
275275

276276
The board also features a NCP1117 voltage regulator, a blue LED on GPIO16 and a 220k/100k Ohm voltage divider on the ADC input pin.
277+
The ESP-12E usually has a led connected on GPIO2.
277278

278279
Full pinout and PDF schematics can be found `here <https://github.com/nodemcu/nodemcu-devkit-v1.0>`__
279280

tools/boards.txt.py

+2
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,7 @@
435435
'RST, then releasing FLASH, then releasing RST. This forces the CP2102 device to power cycle and to be re-numbered by Linux.',
436436
'',
437437
'The board also features a NCP1117 voltage regulator, a blue LED on GPIO16 and a 220k/100k Ohm voltage divider on the ADC input pin.',
438+
'The ESP-12E usually has a led connected on GPIO2.',
438439
'',
439440
'Full pinout and PDF schematics can be found `here <https://github.com/nodemcu/nodemcu-devkit-v1.0>`__',
440441
],
@@ -1116,6 +1117,7 @@ def flash_size (size_bytes, display, optname, ld, desc, max_upload_size, spiffs_
11161117

11171118
def all_flash_size ():
11181119
f512 = flash_size(0x80000, '512K', '512K0', 'eagle.flash.512k0.ld', 'no SPIFFS', 499696, 0x7B000)
1120+
f512.update(flash_size(0x80000, '512K', '512K32', 'eagle.flash.512k32.ld', '32K SPIFFS', 466928, 0x73000, 0x8000, 4096))
11191121
f512.update(flash_size(0x80000, '512K', '512K64', 'eagle.flash.512k64.ld', '64K SPIFFS', 434160, 0x6B000, 0x10000, 4096))
11201122
f512.update(flash_size(0x80000, '512K', '512K128', 'eagle.flash.512k128.ld', '128K SPIFFS', 368624, 0x5B000, 0x20000, 4096))
11211123
f1m = flash_size(0x100000, '1M', '1M0', 'eagle.flash.1m0.ld', 'no SPIFFS', 1023984, 0xFB000)

tools/sdk/ld/eagle.flash.512k32.ld

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/* Flash Split for 512K chips */
2+
/* sketch 455KB */
3+
/* spiffs 32KB */
4+
/* eeprom 20KB */
5+
6+
MEMORY
7+
{
8+
dport0_0_seg : org = 0x3FF00000, len = 0x10
9+
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
10+
iram1_0_seg : org = 0x40100000, len = 0x8000
11+
irom0_0_seg : org = 0x40201010, len = 0x71ff0
12+
}
13+
14+
PROVIDE ( _SPIFFS_start = 0x40273000 );
15+
PROVIDE ( _SPIFFS_end = 0x4027B000 );
16+
PROVIDE ( _SPIFFS_page = 0x100 );
17+
PROVIDE ( _SPIFFS_block = 0x1000 );
18+
19+
INCLUDE "../ld/eagle.app.v6.common.ld"

0 commit comments

Comments
 (0)