Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
dba57fa0
Commit
dba57fa0
authored
Aug 24, 2021
by
Johny Mattsson
Browse files
Merge branch 'dev-esp32-idf4-lua53' into dev-esp32-idf4
parents
3a6961cc
8e5ce49d
Changes
224
Hide whitespace changes
Inline
Side-by-side
mkdocs.yml
View file @
dba57fa0
...
...
@@ -28,10 +28,15 @@ pages:
-
Uploading code
:
'
upload.md'
-
JTAG debugging
:
'
debug.md'
-
Support
:
'
support.md'
-
Reference
:
-
NodeMCU Language Reference Manual
:
'
nodemcu-lrm.md'
-
Programming in NodeMCU
:
'
nodemcu-pil.md'
-
FAQs
:
-
Lua Developer FAQ
:
'
lua-developer-faq.md'
-
Extension Developer FAQ
:
'
extn-developer-faq.md'
-
Whitepapers
:
-
Lua 5.3 Support
:
'
lua53.md'
-
Lua Flash Store (LFS)
:
'
lfs.md'
-
Filesystem on SD card
:
'
sdcard.md'
-
Writing external C modules
:
'
modules/extmods.md'
-
C Modules
:
...
...
@@ -55,6 +60,7 @@ pages:
-
'
node'
:
'
modules/node.md'
-
'
ota'
:
'
modules/otaupgrade.md'
-
'
ow
(1-Wire)'
:
'
modules/ow.md'
-
'
pipe'
:
'
modules/pipe.md'
-
'
pulsecnt'
:
'
modules/pulsecnt.md'
-
'
qrcodegen'
:
'
modules/qrcodegen.md'
-
'
sdmmc'
:
'
modules/sdmmc.md'
...
...
esp32-esp-idf
@
a20df743
Compare
8e3e65a4
...
a20df743
Subproject commit
8e3e65a47b7d9b5dc4f52eb56660a748fda1884e
Subproject commit
a20df743f1c51e6d65b021ed2ffd3081a2feec64
sdkconfig.defaults
View file @
dba57fa0
...
...
@@ -21,13 +21,6 @@ CONFIG_MQTT_TRANSPORT_SSL=n
CONFIG_MQTT_TRANSPORT_WEBSOCKET=n
CONFIG_MQTT_USE_CUSTOM_CONFIG=n
# Allow writing to dangerous regions to avoid boot loops when creating filesystem
# Symptom:
# Mounting flash filesystem...
# No filesystem partition found, attempting to create it...
# abort() was called at PC 0x400ecddd on core 0
CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
# Enable address reuse for sockets in TIME_WAIT
# see https://github.com/nodemcu/nodemcu-firmware/pull/1838
CONFIG_LWIP_SO_REUSE=y
...
...
tools/embed_lfs.sh
View file @
dba57fa0
...
...
@@ -35,12 +35,27 @@ fi
echo
"LFS segment address
${
LFS_ADDR
}
, length
${
LFS_SIZE
}
"
${
LUAC_CROSS
}
-a
${
LFS_ADDR
}
-m
${
LFS_SIZE
}
-o
${
LUAC_OUTPUT
}
${
LUA_APP_SRC
}
if
${
LUAC_CROSS
}
-v
|
grep
-q
'Lua 5.1'
then
echo
"Generating Lua 5.1 LFS image..."
${
LUAC_CROSS
}
-a
${
LFS_ADDR
}
-m
${
LFS_SIZE
}
-o
${
LUAC_OUTPUT
}
${
LUA_APP_SRC
}
else
set
-e
echo
"Generating intermediate Lua 5.3 LFS image..."
${
LUAC_CROSS
}
-f
-m
${
LFS_SIZE
}
-o
${
LUAC_OUTPUT
}
.tmp
${
LUA_APP_SRC
}
echo
"Converting to absolute LFS image..."
${
LUAC_CROSS
}
-F
${
LUAC_OUTPUT
}
.tmp
-a
${
LFS_ADDR
}
-o
${
LUAC_OUTPUT
}
rm
${
LUAC_OUTPUT
}
.tmp
fi
if
[
$?
!=
0
]
;
then
echo
"Error: luac.cross failed"
exit
1
else
echo
"Generated
$(
ls
-l
${
LUAC_OUTPUT
}
|
cut
-f5
-d
' '
)
bytes of LFS data"
fi
# cmake depencies don't seem to pick up the change to luac.out?
rm
-f
build/lua.flash.store.reserved
make
echo
"Re-linking nodemcu binary by invoking IDF build..."
make
>
/dev/null
echo
"Done."
Prev
1
…
8
9
10
11
12
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment