update to idf 4.4.3
This commit is contained in:
parent
2dca0b952a
commit
48a859087d
|
|
@ -51,7 +51,6 @@
|
|||
</main>
|
||||
<script>
|
||||
showMenu('header-toggle','navbar');
|
||||
linkColor.forEach(l => l.addEventListener('click', colorLink))
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@
|
|||
</main>
|
||||
<script>
|
||||
showMenu('header-toggle','navbar');
|
||||
linkColor.forEach(l => l.addEventListener('click', colorLink))
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
12
HTML/main.js
12
HTML/main.js
|
|
@ -142,16 +142,6 @@ const showMenu = (headerToggle, navbarId) =>{
|
|||
})
|
||||
}
|
||||
}
|
||||
showMenu('header-toggle','navbar')
|
||||
|
||||
/*==================== LINK ACTIVE ====================*/
|
||||
const linkColor = document.querySelectorAll('.nav__link')
|
||||
|
||||
function colorLink(){
|
||||
linkColor.forEach(l => l.classList.remove('active'))
|
||||
this.classList.add('active')
|
||||
}
|
||||
|
||||
linkColor.forEach(l => l.addEventListener('click', colorLink))
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -87,7 +87,6 @@
|
|||
</main>
|
||||
<script>
|
||||
showMenu('header-toggle','navbar');
|
||||
linkColor.forEach(l => l.addEventListener('click', colorLink))
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
--first-color: #FFFFFF;
|
||||
--first-color-light: #ff0000;
|
||||
--title-color: #990000;
|
||||
--header-color: #EEEEEE;
|
||||
--text-color: #404040;
|
||||
--text-color-light: #990000;
|
||||
--body-color: #FFFFFF;
|
||||
|
|
@ -68,7 +69,7 @@ img {
|
|||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
background-color: var(--container-color);
|
||||
background-color: var(--header-color);
|
||||
box-shadow: 0 1px 0 rgba(22, 8, 43, 0.1);
|
||||
padding: 0 1rem;
|
||||
z-index: var(--z-fixed);
|
||||
|
|
@ -82,8 +83,8 @@ img {
|
|||
}
|
||||
|
||||
.header__img {
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
width: 35px;
|
||||
height: 35px;
|
||||
border-radius: 5%;
|
||||
}
|
||||
|
||||
|
|
@ -255,7 +256,7 @@ img {
|
|||
padding: 0 3rem 0 4rem;
|
||||
}
|
||||
.header__container {
|
||||
height: calc(var(--header-height) + .5rem);
|
||||
height: var(--header-height);
|
||||
}
|
||||
.header__search {
|
||||
width: 300px;
|
||||
|
|
@ -317,7 +318,7 @@ img {
|
|||
.rl{text-align:right;}
|
||||
|
||||
input, .btn, .lab, textarea {
|
||||
font:.8rem consolas,monospace;
|
||||
font:.85rem consolas,monospace;
|
||||
padding-left:3px;
|
||||
border:solid 1px #CCCCCC;
|
||||
border-radius: 5px;
|
||||
|
|
@ -350,7 +351,7 @@ input[type="radio"] { margin-top: -1px; vertical-align: middle;}
|
|||
|
||||
.cntr {
|
||||
margin:auto;
|
||||
font: .8rem consolas, monospace;}
|
||||
font: .85rem consolas, monospace;}
|
||||
|
||||
.mlhdr {
|
||||
font:16px consolas,monospace;
|
||||
|
|
@ -361,19 +362,16 @@ input[type="radio"] { margin-top: -1px; vertical-align: middle;}
|
|||
|
||||
.mlp {
|
||||
break-inside: avoid;
|
||||
padding:5px;
|
||||
|
||||
}
|
||||
.mlpc {
|
||||
margin: 10px 0;
|
||||
margin: 0 0 5px 5px;
|
||||
padding: 10px;
|
||||
border-radius: 10px;
|
||||
border:solid 1px #CCCCCC;
|
||||
}
|
||||
|
||||
.ml {
|
||||
column-count: 1;
|
||||
column-gap: 0;
|
||||
padding: 5px 5px 0 0;
|
||||
}
|
||||
@media (min-width: 768px) {
|
||||
.ml {
|
||||
|
|
|
|||
|
|
@ -91,7 +91,6 @@
|
|||
</main>
|
||||
<script>
|
||||
showMenu('header-toggle','navbar');
|
||||
linkColor.forEach(l => l.addEventListener('click', colorLink))
|
||||
</script>
|
||||
</body>
|
||||
<script>
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 8af4536ed0d455c8d5853b66b76be288b13cd177
|
||||
Subproject commit a646e3ee0594ec2301e9b3fe6373ea274eb39e39
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 5b466f7dd4ae32b3fcae4c930850d5e8b96a93cc
|
||||
Subproject commit bc37b48186ddccb57923bfc5dabd7ddbafcbdd3e
|
||||
|
|
@ -9,7 +9,7 @@ dependencies:
|
|||
component_hash: null
|
||||
source:
|
||||
type: idf
|
||||
version: 4.4.2
|
||||
version: 4.4.3
|
||||
manifest_hash: 194e96f5e2cda141e22c9245b7af761212d9681f1b1e02a09a2c1969241928a1
|
||||
target: esp32
|
||||
version: 1.0.0
|
||||
|
|
|
|||
|
|
@ -41,30 +41,13 @@ dyn_var_handler_t HANDLERS_ARRAY_CUST[] = {
|
|||
};
|
||||
|
||||
|
||||
int HTTPPrintCustom(httpd_req_t *req, char *buf, char *var)
|
||||
int HTTPPrintCustom(httpd_req_t *req, char *buf, char *var, int arg)
|
||||
{
|
||||
char VarData[MAX_DYNVAR_LENGTH];
|
||||
bool fnd = false;
|
||||
char *p2 = var + strlen(var) - 1; //last var symbol
|
||||
int arg = 0;
|
||||
//searching for tag in handles array
|
||||
for (int i = 0; i < (sizeof(HANDLERS_ARRAY_CUST) / sizeof(HANDLERS_ARRAY_CUST[0])); ++i)
|
||||
{
|
||||
//Try to extract integer parameter from dynamic variable
|
||||
if (*p2 == ')')
|
||||
{ //found close brace
|
||||
char *p1 = p2;
|
||||
while ((*p1 != '(') && (p1 > var))
|
||||
--p1;
|
||||
if (*p1 == '(')
|
||||
{ //found open brace
|
||||
*p1 = 0x00; //trim variable to name part
|
||||
++p1; //to begin of argument
|
||||
*p2 = 0x00; //set end of argument
|
||||
arg = atoi(p1);
|
||||
}
|
||||
}
|
||||
|
||||
if (strcmp(var, HANDLERS_ARRAY_CUST[i].tag) == 0
|
||||
&& HANDLERS_ARRAY_CUST[i].HandlerRoutine != NULL)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include "webguiapp.h"
|
||||
|
||||
int HTTPPrintCustom(httpd_req_t *req, char *buf, char *var);
|
||||
int HTTPPrintCustom(httpd_req_t *req, char *buf, char *var, int arg);
|
||||
HTTP_IO_RESULT AfterPostHandlerCustom(httpd_req_t *req, const char *filename, char *PostData);
|
||||
void UserMQTTEventHndlr(void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data);
|
||||
|
||||
|
|
|
|||
15
sdkconfig
15
sdkconfig
|
|
@ -32,6 +32,7 @@ CONFIG_APP_COMPILE_TIME_DATE=y
|
|||
# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
|
||||
# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
|
||||
# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
|
||||
CONFIG_APP_PROJECT_VER="0.0.0.0000"
|
||||
CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
|
||||
# end of Application manager
|
||||
|
||||
|
|
@ -470,6 +471,13 @@ CONFIG_ESP_PHY_REDUCE_TX_POWER=y
|
|||
# CONFIG_PM_ENABLE is not set
|
||||
# end of Power Management
|
||||
|
||||
#
|
||||
# ESP Ringbuf
|
||||
#
|
||||
# CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH is not set
|
||||
# CONFIG_RINGBUF_PLACE_ISR_FUNCTIONS_INTO_FLASH is not set
|
||||
# end of ESP Ringbuf
|
||||
|
||||
#
|
||||
# ESP System Settings
|
||||
#
|
||||
|
|
@ -553,6 +561,7 @@ CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y
|
|||
# CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set
|
||||
# CONFIG_ESP_WIFI_GMAC_SUPPORT is not set
|
||||
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
|
||||
# CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT is not set
|
||||
# end of Wi-Fi
|
||||
|
||||
#
|
||||
|
|
@ -1226,9 +1235,9 @@ CONFIG_ESPFS_USE_HEATSHRINK=y
|
|||
# end of libespfs
|
||||
|
||||
#
|
||||
# webguiapp configuration
|
||||
# WebGUIApp
|
||||
#
|
||||
CONFIG_WEBGUIAPP_PROJECT_VER="0.0.0.0003"
|
||||
CONFIG_DEVICE_MODEL_NAME="DEVICE MODEL NAME"
|
||||
CONFIG_WEBGUIAPP_HOSTNAME="DEVICE_HOSTNAME"
|
||||
CONFIG_WEBGUIAPP_USERNAME="user"
|
||||
CONFIG_WEBGUIAPP_USERPASS="password"
|
||||
|
|
@ -1325,7 +1334,7 @@ CONFIG_WEBGUIAPP_DNS1_ADDRESS_DEFAULT="8.8.8.8"
|
|||
CONFIG_WEBGUIAPP_DNS2_ADDRESS_DEFAULT="8.8.4.4"
|
||||
CONFIG_WEBGUIAPP_DNS3_ADDRESS_DEFAULT="1.1.1.1"
|
||||
# end of DNS settings
|
||||
# end of webguiapp configuration
|
||||
# end of WebGUIApp
|
||||
# end of Component config
|
||||
|
||||
#
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user