include libespfs and jReadWrite into webguiapp component

This commit is contained in:
Bogdan Pilyugin 2023-01-03 17:43:27 +02:00
parent f6d881a4f1
commit 46ed2b645b
6 changed files with 63 additions and 2 deletions

6
.gitmodules vendored Normal file
View File

@ -0,0 +1,6 @@
[submodule "extlibs/jReadWrite"]
path = extlibs/jReadWrite
url = https://github.com/userbogd/jReadWrite.git
[submodule "extlibs/libespfs"]
path = extlibs/libespfs
url = https://github.com/userbogd/libespfs.git

View File

@ -1,4 +1,16 @@
include(${CMAKE_CURRENT_LIST_DIR}/extlibs/jReadWrite/include.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/extlibs/libespfs/cmake/include.cmake)
idf_component_register( idf_component_register(
SRCS ${jreadwrite_SRCS}
INCLUDE_DIRS ${jreadwrite_INCLUDE_DIRS}
SRCS ${libespfs_SRCS}
INCLUDE_DIRS ${libespfs_INCLUDE_DIRS}
PRIV_INCLUDE_DIRS ${libespfs_PRIV_INCLUDE_DIRS}
PRIV_REQUIRES ${libespfs_PRIV_REQUIRES}
SRCS "src/SystemConfiguration.c" SRCS "src/SystemConfiguration.c"
"src/romfs.c" "src/romfs.c"
"src/spifs.c" "src/spifs.c"
@ -20,11 +32,12 @@ idf_component_register(
INCLUDE_DIRS "." INCLUDE_DIRS "."
"include" "include"
"src" "src"
"extlibs/jReadWrite"
EMBED_FILES "upload_script.html" EMBED_FILES "upload_script.html"
REQUIRES nvs_flash REQUIRES nvs_flash
libespfs #libespfs
spiffs spiffs
esp_http_server esp_http_server
mbedtls mbedtls
@ -33,6 +46,6 @@ idf_component_register(
esp_modem esp_modem
esp_https_ota esp_https_ota
app_update app_update
jReadWrite #jReadWrite
ttn-esp32 ttn-esp32
) )

39
Kconfig
View File

@ -693,4 +693,43 @@ menu "WebGUIApp"
endmenu endmenu
endif endif
menu "libespfs"
choice
prompt "Log level"
default ESPFS_LOG_LEVEL_WARNING
config ESPFS_LOG_LEVEL_NONE
bool "None"
config ESPFS_LOG_LEVEL_ERROR
bool "Error"
config ESPFS_LOG_LEVEL_WARNING
bool "Warning"
config ESPFS_LOG_LEVEL_INFO
bool "Info"
config ESPFS_LOG_LEVEL_DEBUG
bool "Debug"
config ESPFS_LOG_LEVEL_VERBOSE
bool "Verbose"
endchoice # "Log level"
config ESPFS_MAX_PARTITIONS
int "Maximum Number of Partitions"
default 1
range 1 10
help
Define maximum number of partitions that can be mounted.
config ESPFS_USE_HEATSHRINK
bool "Use heatshrink decompressor"
default y
endmenu
endmenu endmenu

1
extlibs/jReadWrite Submodule

@ -0,0 +1 @@
Subproject commit 8bbe1c28dc69b8adadc1ab3aed989a38e1dc8996

1
extlibs/libespfs Submodule

@ -0,0 +1 @@
Subproject commit a646e3ee0594ec2301e9b3fe6373ea274eb39e39

View File

@ -40,6 +40,7 @@
#include "romfs.h" #include "romfs.h"
#include "HTTPServer.h" #include "HTTPServer.h"
#define PANEL_MESSAGE_LENGTH 32 //base message length, mainly depended by radio requirements #define PANEL_MESSAGE_LENGTH 32 //base message length, mainly depended by radio requirements
#define MAX_JSON_MESSAGE 256 //max size of mqtt message to publish #define MAX_JSON_MESSAGE 256 //max size of mqtt message to publish
#define MAX_FILE_PUBLISH 4096 //bufer for mqtt data publish #define MAX_FILE_PUBLISH 4096 //bufer for mqtt data publish