"components/lua/lua-5.1/lflash.h" did not exist on "eaac369dece9ab74a736e8b42a21a4a655b3fe33"
Commit dba57fa0 authored by Johny Mattsson's avatar Johny Mattsson
Browse files

Merge branch 'dev-esp32-idf4-lua53' into dev-esp32-idf4

parents 3a6961cc 8e5ce49d
...@@ -28,10 +28,15 @@ pages: ...@@ -28,10 +28,15 @@ pages:
- Uploading code: 'upload.md' - Uploading code: 'upload.md'
- JTAG debugging: 'debug.md' - JTAG debugging: 'debug.md'
- Support: 'support.md' - Support: 'support.md'
- Reference:
- NodeMCU Language Reference Manual: 'nodemcu-lrm.md'
- Programming in NodeMCU: 'nodemcu-pil.md'
- FAQs: - FAQs:
- Lua Developer FAQ: 'lua-developer-faq.md' - Lua Developer FAQ: 'lua-developer-faq.md'
- Extension Developer FAQ: 'extn-developer-faq.md' - Extension Developer FAQ: 'extn-developer-faq.md'
- Whitepapers: - Whitepapers:
- Lua 5.3 Support: 'lua53.md'
- Lua Flash Store (LFS): 'lfs.md'
- Filesystem on SD card: 'sdcard.md' - Filesystem on SD card: 'sdcard.md'
- Writing external C modules: 'modules/extmods.md' - Writing external C modules: 'modules/extmods.md'
- C Modules: - C Modules:
...@@ -55,6 +60,7 @@ pages: ...@@ -55,6 +60,7 @@ pages:
- 'node': 'modules/node.md' - 'node': 'modules/node.md'
- 'ota': 'modules/otaupgrade.md' - 'ota': 'modules/otaupgrade.md'
- 'ow (1-Wire)': 'modules/ow.md' - 'ow (1-Wire)': 'modules/ow.md'
- 'pipe': 'modules/pipe.md'
- 'pulsecnt': 'modules/pulsecnt.md' - 'pulsecnt': 'modules/pulsecnt.md'
- 'qrcodegen': 'modules/qrcodegen.md' - 'qrcodegen': 'modules/qrcodegen.md'
- 'sdmmc': 'modules/sdmmc.md' - 'sdmmc': 'modules/sdmmc.md'
......
Subproject commit 8e3e65a47b7d9b5dc4f52eb56660a748fda1884e Subproject commit a20df743f1c51e6d65b021ed2ffd3081a2feec64
...@@ -21,13 +21,6 @@ CONFIG_MQTT_TRANSPORT_SSL=n ...@@ -21,13 +21,6 @@ CONFIG_MQTT_TRANSPORT_SSL=n
CONFIG_MQTT_TRANSPORT_WEBSOCKET=n CONFIG_MQTT_TRANSPORT_WEBSOCKET=n
CONFIG_MQTT_USE_CUSTOM_CONFIG=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 # Enable address reuse for sockets in TIME_WAIT
# see https://github.com/nodemcu/nodemcu-firmware/pull/1838 # see https://github.com/nodemcu/nodemcu-firmware/pull/1838
CONFIG_LWIP_SO_REUSE=y CONFIG_LWIP_SO_REUSE=y
......
...@@ -35,12 +35,27 @@ fi ...@@ -35,12 +35,27 @@ fi
echo "LFS segment address ${LFS_ADDR}, length ${LFS_SIZE}" 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 if [ $? != 0 ]; then
echo "Error: luac.cross failed" echo "Error: luac.cross failed"
exit 1 exit 1
else
echo "Generated $(ls -l ${LUAC_OUTPUT} | cut -f5 -d' ') bytes of LFS data"
fi fi
# cmake depencies don't seem to pick up the change to luac.out? # cmake depencies don't seem to pick up the change to luac.out?
rm -f build/lua.flash.store.reserved rm -f build/lua.flash.store.reserved
make echo "Re-linking nodemcu binary by invoking IDF build..."
make >/dev/null
echo "Done."
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment