Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Monday fixes #4873

Closed
wants to merge 4 commits into from
Closed

Monday fixes #4873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1213082
32k spiffs for 512k modules
d-a-v Jul 2, 2018
39fd2da
fix scheduled interrupt #4609
d-a-v Jul 2, 2018
36825be
NodeMCU doc update
d-a-v Jul 2, 2018
3e4e5a3
Merge branch 'master' into mondayfixes
devyte Jul 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,16 @@ generic.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld
generic.menu.FlashSize.512K0.build.spiffs_pagesize=256
generic.menu.FlashSize.512K0.upload.maximum_size=499696
generic.menu.FlashSize.512K0.build.rfcal_addr=0x7C000
generic.menu.FlashSize.512K32=512K (32K SPIFFS)
generic.menu.FlashSize.512K32.build.flash_size=512K
generic.menu.FlashSize.512K32.build.flash_size_bytes=0x80000
generic.menu.FlashSize.512K32.build.flash_ld=eagle.flash.512k32.ld
generic.menu.FlashSize.512K32.build.spiffs_pagesize=256
generic.menu.FlashSize.512K32.upload.maximum_size=466928
generic.menu.FlashSize.512K32.build.rfcal_addr=0x7C000
generic.menu.FlashSize.512K32.build.spiffs_start=0x73000
generic.menu.FlashSize.512K32.build.spiffs_end=0x7B000
generic.menu.FlashSize.512K32.build.spiffs_blocksize=4096
generic.menu.FlashSize.512K64=512K (64K SPIFFS)
generic.menu.FlashSize.512K64.build.flash_size=512K
generic.menu.FlashSize.512K64.build.flash_size_bytes=0x80000
Expand Down Expand Up @@ -2022,6 +2032,16 @@ thing.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld
thing.menu.FlashSize.512K0.build.spiffs_pagesize=256
thing.menu.FlashSize.512K0.upload.maximum_size=499696
thing.menu.FlashSize.512K0.build.rfcal_addr=0x7C000
thing.menu.FlashSize.512K32=512K (32K SPIFFS)
thing.menu.FlashSize.512K32.build.flash_size=512K
thing.menu.FlashSize.512K32.build.flash_size_bytes=0x80000
thing.menu.FlashSize.512K32.build.flash_ld=eagle.flash.512k32.ld
thing.menu.FlashSize.512K32.build.spiffs_pagesize=256
thing.menu.FlashSize.512K32.upload.maximum_size=466928
thing.menu.FlashSize.512K32.build.rfcal_addr=0x7C000
thing.menu.FlashSize.512K32.build.spiffs_start=0x73000
thing.menu.FlashSize.512K32.build.spiffs_end=0x7B000
thing.menu.FlashSize.512K32.build.spiffs_blocksize=4096
thing.menu.FlashSize.512K64=512K (64K SPIFFS)
thing.menu.FlashSize.512K64.build.flash_size=512K
thing.menu.FlashSize.512K64.build.flash_size_bytes=0x80000
Expand Down Expand Up @@ -2173,6 +2193,16 @@ thingdev.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld
thingdev.menu.FlashSize.512K0.build.spiffs_pagesize=256
thingdev.menu.FlashSize.512K0.upload.maximum_size=499696
thingdev.menu.FlashSize.512K0.build.rfcal_addr=0x7C000
thingdev.menu.FlashSize.512K32=512K (32K SPIFFS)
thingdev.menu.FlashSize.512K32.build.flash_size=512K
thingdev.menu.FlashSize.512K32.build.flash_size_bytes=0x80000
thingdev.menu.FlashSize.512K32.build.flash_ld=eagle.flash.512k32.ld
thingdev.menu.FlashSize.512K32.build.spiffs_pagesize=256
thingdev.menu.FlashSize.512K32.upload.maximum_size=466928
thingdev.menu.FlashSize.512K32.build.rfcal_addr=0x7C000
thingdev.menu.FlashSize.512K32.build.spiffs_start=0x73000
thingdev.menu.FlashSize.512K32.build.spiffs_end=0x7B000
thingdev.menu.FlashSize.512K32.build.spiffs_blocksize=4096
thingdev.menu.FlashSize.512K64=512K (64K SPIFFS)
thingdev.menu.FlashSize.512K64.build.flash_size=512K
thingdev.menu.FlashSize.512K64.build.flash_size_bytes=0x80000
Expand Down Expand Up @@ -3820,6 +3850,16 @@ gen4iod.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld
gen4iod.menu.FlashSize.512K0.build.spiffs_pagesize=256
gen4iod.menu.FlashSize.512K0.upload.maximum_size=499696
gen4iod.menu.FlashSize.512K0.build.rfcal_addr=0x7C000
gen4iod.menu.FlashSize.512K32=512K (32K SPIFFS)
gen4iod.menu.FlashSize.512K32.build.flash_size=512K
gen4iod.menu.FlashSize.512K32.build.flash_size_bytes=0x80000
gen4iod.menu.FlashSize.512K32.build.flash_ld=eagle.flash.512k32.ld
gen4iod.menu.FlashSize.512K32.build.spiffs_pagesize=256
gen4iod.menu.FlashSize.512K32.upload.maximum_size=466928
gen4iod.menu.FlashSize.512K32.build.rfcal_addr=0x7C000
gen4iod.menu.FlashSize.512K32.build.spiffs_start=0x73000
gen4iod.menu.FlashSize.512K32.build.spiffs_end=0x7B000
gen4iod.menu.FlashSize.512K32.build.spiffs_blocksize=4096
gen4iod.menu.FlashSize.512K64=512K (64K SPIFFS)
gen4iod.menu.FlashSize.512K64.build.flash_size=512K
gen4iod.menu.FlashSize.512K64.build.flash_size_bytes=0x80000
Expand Down
2 changes: 1 addition & 1 deletion cores/esp8266/core_esp8266_wiring_digital.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ void ICACHE_RAM_ATTR interrupt_handler(void *arg) {
// we disable them before we call the client ISR
uint32_t savedPS = xt_rsil(15); // stop other interrupts
ArgStructure* localArg = (ArgStructure*)handler->arg;
if (localArg->interruptInfo)
if (localArg && localArg->interruptInfo)
{
localArg->interruptInfo->pin = i;
localArg->interruptInfo->value = __digitalRead(i);
Expand Down
1 change: 1 addition & 0 deletions doc/boards.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ According to the manufacturer, "with a micro USB cable, you can connect NodeMCU
RST, then releasing FLASH, then releasing RST. This forces the CP2102 device to power cycle and to be re-numbered by Linux.

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.
The ESP-12E has sometimes a led connected on GPIO2

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

Expand Down
2 changes: 2 additions & 0 deletions tools/boards.txt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,7 @@
'RST, then releasing FLASH, then releasing RST. This forces the CP2102 device to power cycle and to be re-numbered by Linux.',
'',
'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.',
'The ESP-12E has sometimes a led connected on GPIO2',
'',
'Full pinout and PDF schematics can be found `here <https://github.com/nodemcu/nodemcu-devkit-v1.0>`__',
],
Expand Down Expand Up @@ -1116,6 +1117,7 @@ def flash_size (size_bytes, display, optname, ld, desc, max_upload_size, spiffs_

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