MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow custom SPIFFS location in "demons" part of user_config.h 

In case a custom SPIFFS location was defined above, don't overwrite it.
This commit is contained in:
mk-pmb 2020-08-22 01:46:21 +02:00 committed by Nathaniel Wesley Filardo
parent a92da3c33c
commit 64ece47ff6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/include/user_config.h
View File

@ -138,7 +138,7 @@
// The net module optionally offers net info functionnality. Uncomment the following // The net module optionally offers net info functionnality. Uncomment the following
// to enable the functionnality. // to enable the functionnality.
#define NET_PING_ENABLE #define NET_PING_ENABLE
// The WiFi module optionally offers an enhanced level of WiFi connection // The WiFi module optionally offers an enhanced level of WiFi connection
// management, using internal timer callbacks. Whilst many Lua developers // management, using internal timer callbacks. Whilst many Lua developers
@ -239,7 +239,11 @@
# define LUA_FLASH_STORE 0x0 # define LUA_FLASH_STORE 0x0
#endif #endif
#define SPIFFS_FIXED_LOCATION 0x0 #ifndef SPIFFS_FIXED_LOCATION
#define SPIFFS_FIXED_LOCATION 0x0
// You'll rarely need to customize this, because nowadays
// it's usually overruled by the partition table anyway.
#endif
#ifndef SPIFFS_MAX_FILESYSTEM_SIZE #ifndef SPIFFS_MAX_FILESYSTEM_SIZE
# define SPIFFS_MAX_FILESYSTEM_SIZE 0xFFFFFFFF # define SPIFFS_MAX_FILESYSTEM_SIZE 0xFFFFFFFF
#endif #endif
@ -252,7 +256,7 @@
#define READLINE_INTERVAL 80 #define READLINE_INTERVAL 80
#define STRBUF_DEFAULT_INCREMENT 3 #define STRBUF_DEFAULT_INCREMENT 3
#define LUA_USE_BUILTIN_DEBUG_MINIMAL // for debug.getregistry() and debug.traceback() #define LUA_USE_BUILTIN_DEBUG_MINIMAL // for debug.getregistry() and debug.traceback()
#if defined(DEVELOPMENT_TOOLS) && defined(DEVELOPMENT_USE_GDB) #if defined(DEVELOPMENT_TOOLS) && defined(DEVELOPMENT_USE_GDB)
extern void LUA_DEBUG_HOOK (void); extern void LUA_DEBUG_HOOK (void);
#define lua_assert(x) ((x) ? (void) 0 : LUA_DEBUG_HOOK ()) #define lua_assert(x) ((x) ? (void) 0 : LUA_DEBUG_HOOK ())