update webguiapp component, update linked with the root project
This commit is contained in:
parent
146d393b99
commit
6cb9b3a00b
|
|
@ -9,4 +9,4 @@ project(${ProjectId})
|
||||||
|
|
||||||
# Include espfs ROM in foldef HTML
|
# Include espfs ROM in foldef HTML
|
||||||
include(components/libespfs/cmake/include.cmake)
|
include(components/libespfs/cmake/include.cmake)
|
||||||
target_add_espfs(WebGUIApp.elf espfs HTML)
|
target_add_espfs(webguiapp_example.elf espfs HTML)
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit 8914422aac9c95e2373f21270be24b70afc67ad3
|
Subproject commit 724c7a437606d27fc41694de95da5523dd581ab5
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
* \details
|
* \details
|
||||||
* \copyright Apache License, Version 2.0
|
* \copyright Apache License, Version 2.0
|
||||||
*/
|
*/
|
||||||
#include "HTTPServer.h"
|
#include "webguiapp.h"
|
||||||
|
|
||||||
const char pg_40[] = "index40.html";
|
const char pg_40[] = "index40.html";
|
||||||
const char pg_42[] = "index42.html";
|
const char pg_42[] = "index42.html";
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
* \details
|
* \details
|
||||||
* \copyright Apache License, Version 2.0
|
* \copyright Apache License, Version 2.0
|
||||||
*/
|
*/
|
||||||
#include "HTTPServer.h"
|
#include "webguiapp.h"
|
||||||
|
|
||||||
//Default string if not found handler
|
//Default string if not found handler
|
||||||
static void HTTPPrint_DEF(char *VarData, void *arg)
|
static void HTTPPrint_DEF(char *VarData, void *arg)
|
||||||
|
|
|
||||||
|
|
@ -21,9 +21,7 @@
|
||||||
* \copyright Apache License, Version 2.0
|
* \copyright Apache License, Version 2.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "MQTT.h"
|
#include "webguiapp.h"
|
||||||
#include "SystemConfiguration.h"
|
|
||||||
#include "esp_log.h"
|
|
||||||
#define TAG "MQTTCustom"
|
#define TAG "MQTTCustom"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,8 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include "esp_system.h"
|
|
||||||
#include "sdkconfig.h"
|
|
||||||
|
|
||||||
#include "SystemConfiguration.h"
|
#include "webguiapp.h"
|
||||||
#include "HTTPServer.h"
|
|
||||||
#include "MQTT.h"
|
|
||||||
|
|
||||||
#define MANUAL_RESET 0
|
|
||||||
|
|
||||||
int HTTPPrintCustom(httpd_req_t *req, char *buf, char *var);
|
int HTTPPrintCustom(httpd_req_t *req, char *buf, char *var);
|
||||||
HTTP_IO_RESULT AfterPostHandlerCustom(httpd_req_t *req, const char *filename, char *PostData);
|
HTTP_IO_RESULT AfterPostHandlerCustom(httpd_req_t *req, const char *filename, char *PostData);
|
||||||
|
|
|
||||||
26
sdkconfig
26
sdkconfig
|
|
@ -1212,6 +1212,19 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
|
||||||
# CONFIG_WPA_DPP_SUPPORT is not set
|
# CONFIG_WPA_DPP_SUPPORT is not set
|
||||||
# end of Supplicant
|
# end of Supplicant
|
||||||
|
|
||||||
|
#
|
||||||
|
# libespfs
|
||||||
|
#
|
||||||
|
# CONFIG_ESPFS_LOG_LEVEL_NONE is not set
|
||||||
|
# CONFIG_ESPFS_LOG_LEVEL_ERROR is not set
|
||||||
|
CONFIG_ESPFS_LOG_LEVEL_WARNING=y
|
||||||
|
# CONFIG_ESPFS_LOG_LEVEL_INFO is not set
|
||||||
|
# CONFIG_ESPFS_LOG_LEVEL_DEBUG is not set
|
||||||
|
# CONFIG_ESPFS_LOG_LEVEL_VERBOSE is not set
|
||||||
|
CONFIG_ESPFS_MAX_PARTITIONS=1
|
||||||
|
CONFIG_ESPFS_USE_HEATSHRINK=y
|
||||||
|
# end of libespfs
|
||||||
|
|
||||||
#
|
#
|
||||||
# WebGuiApp configuration
|
# WebGuiApp configuration
|
||||||
#
|
#
|
||||||
|
|
@ -1310,19 +1323,6 @@ CONFIG_WEBGUIAPP_DNS2_ADDRESS_DEFAULT="8.8.4.4"
|
||||||
CONFIG_WEBGUIAPP_DNS3_ADDRESS_DEFAULT="1.1.1.1"
|
CONFIG_WEBGUIAPP_DNS3_ADDRESS_DEFAULT="1.1.1.1"
|
||||||
# end of DNS settings
|
# end of DNS settings
|
||||||
# end of WebGuiApp configuration
|
# end of WebGuiApp configuration
|
||||||
|
|
||||||
#
|
|
||||||
# libespfs
|
|
||||||
#
|
|
||||||
# CONFIG_ESPFS_LOG_LEVEL_NONE is not set
|
|
||||||
# CONFIG_ESPFS_LOG_LEVEL_ERROR is not set
|
|
||||||
CONFIG_ESPFS_LOG_LEVEL_WARNING=y
|
|
||||||
# CONFIG_ESPFS_LOG_LEVEL_INFO is not set
|
|
||||||
# CONFIG_ESPFS_LOG_LEVEL_DEBUG is not set
|
|
||||||
# CONFIG_ESPFS_LOG_LEVEL_VERBOSE is not set
|
|
||||||
CONFIG_ESPFS_MAX_PARTITIONS=1
|
|
||||||
CONFIG_ESPFS_USE_HEATSHRINK=y
|
|
||||||
# end of libespfs
|
|
||||||
# end of Component config
|
# end of Component config
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user