updated configurations and webguiapp component

This commit is contained in:
Bogdan Pilyugin 2023-01-12 15:44:51 +02:00
parent f510919645
commit 3b60b36dff
4 changed files with 61 additions and 53 deletions

@ -1 +1 @@
Subproject commit fef822aea7fae5b5004977844561ef0615540218
Subproject commit 50f8656b7a4a4464a7734546e4307d46f01f83f5

View File

@ -1,10 +1,9 @@
# Name, Type, SubType, Offset, Size, Flags
# Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap
nvs, data, nvs, 0x9000, 0x8000
otadata, data, ota, , 0x2000
phy_init, data, phy, , 0x1000
nvs_key, data, nvs_keys, , 0x1000
ota_0, app, ota_0, 0x20000, 0x180000
ota_1, app, ota_1, , 0x180000
storage, data, spiffs, , 0xD0000
# ESP-IDF Partition Table
# Name, Type, SubType, Offset, Size, Flags
nvs,data,nvs, 0x9000,0x8000,
otadata,data,ota, ,0x2000,
phy_init,data,phy, ,0x1000,
nvs_key,data,nvs_keys, ,0x1000,
ota_0,app,ota_0, 0x20000,0x180000,
ota_1,app,ota_1, ,0x180000,
storage,data,spiffs, ,0xD0000,

1 # Name, Type, SubType, Offset, Size, Flags # ESP-IDF Partition Table
2 # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap # Name, Type, SubType, Offset, Size, Flags
3 nvs, data, nvs, 0x9000, 0x8000 nvs,data,nvs, 0x9000,0x8000,
4 otadata, data, ota, , 0x2000 otadata,data,ota, ,0x2000,
5 phy_init, data, phy, , 0x1000 phy_init,data,phy, ,0x1000,
6 nvs_key, data, nvs_keys, , 0x1000 nvs_key,data,nvs_keys, ,0x1000,
7 ota_0, app, ota_0, 0x20000, 0x180000 ota_0,app,ota_0, 0x20000,0x180000,
8 ota_1, app, ota_1, , 0x180000 ota_1,app,ota_1, ,0x180000,
9 storage, data, spiffs, , 0xD0000 storage,data,spiffs, ,0xD0000,

View File

@ -32,7 +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_PROJECT_VER="0.0.0.0001"
CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
# end of Application manager
@ -1264,6 +1264,23 @@ CONFIG_MAIN_FUNCTIONAL_BUTTON_GPIO=15
# CONFIG_DEBUG_MODE_ENABLE is not set
# CONFIG_RESET_MODE_ENABLE is not set
#
# OTA settings
#
CONFIG_WEBGUIAPP_OTA_AUTOUPDATE_ENABLE=y
CONFIG_WEBGUIAPP_OTA_HOST="https://iotronic.cloud/firmware/firmware.bin"
CONFIG_WEBGUIAPP_OTA_AUTOUPDATE_PERIOD=3600
# end of OTA settings
#
# SNTP client settings
#
CONFIG_WEBGUIAPP_SNTP_AUTOUPDATE_ENABLE=y
CONFIG_WEBGUIAPP_SNTP_HOST="2.pool.ntp.org"
CONFIG_WEBGUIAPP_SNTP_AUTOUPDATE_PERIOD=3600
CONFIG_WEBGUIAPP_SNTP_TIMEZONE=2
# end of SNTP client settings
#
# SPI settings
#

View File

@ -32,7 +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_PROJECT_VER="0.0.0.0001"
CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
# end of Application manager
@ -1222,12 +1222,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
# CONFIG_WPA_DPP_SUPPORT is not set
# end of Supplicant
#
# Virtual GPO configuration
#
# CONFIG_PORTS_EXTENDER_ENABLE is not set
# end of Virtual GPO configuration
#
# esp-modem
#
@ -1235,19 +1229,6 @@ CONFIG_ESP_MODEM_CMUX_DEFRAGMENT_PAYLOAD=y
CONFIG_ESP_MODEM_CMUX_DELAY_AFTER_DLCI_SETUP=0
# end of esp-modem
#
# 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
#
# The Things Network
#
@ -1283,6 +1264,23 @@ CONFIG_MAIN_FUNCTIONAL_BUTTON_GPIO=15
# CONFIG_DEBUG_MODE_ENABLE is not set
# CONFIG_RESET_MODE_ENABLE is not set
#
# OTA settings
#
CONFIG_WEBGUIAPP_OTA_AUTOUPDATE_ENABLE=y
CONFIG_WEBGUIAPP_OTA_HOST="https://iotronic.cloud/firmware/firmware.bin"
CONFIG_WEBGUIAPP_OTA_AUTOUPDATE_PERIOD=3600
# end of OTA settings
#
# SNTP client settings
#
CONFIG_WEBGUIAPP_SNTP_AUTOUPDATE_ENABLE=y
CONFIG_WEBGUIAPP_SNTP_HOST="https://iotronic.cloud/firmware/firmware.bin"
CONFIG_WEBGUIAPP_SNTP_AUTOUPDATE_PERIOD=3600
CONFIG_WEBGUIAPP_SNTP_TIMEZONE=2
# end of SNTP client settings
#
# SPI settings
#
@ -1322,25 +1320,7 @@ CONFIG_WEBGUIAPP_WIFI_GATEWAY_STA="192.168.150.1"
#
# Ethernet settings
#
CONFIG_WEBGUIAPP_ETHERNET_ENABLE=y
CONFIG_WEBGUIAPP_ETHERNET_ON=y
CONFIG_WEBGUIAPP_ETH_IP_DEFAULT="192.168.160.1"
CONFIG_WEBGUIAPP_ETH_MASK_DEFAULT="255.255.255.0"
CONFIG_WEBGUIAPP_ETH_GATEWAY_DEFAULT="192.168.160.1"
# CONFIG_WEBGUIAPP_ETHERNET_DHCP_DEFAULT is not set
CONFIG_GPIO_RANGE_MIN=0
CONFIG_GPIO_RANGE_MAX=36
# CONFIG_USE_INTERNAL_ETHERNET is not set
CONFIG_USE_SPI_ETHERNET=y
CONFIG_SPI_ETHERNETS_NUM=1
# CONFIG_DM9051 is not set
# CONFIG_KSZ8851SNL is not set
CONFIG_W5500=y
CONFIG_ETH_SPI_CLOCK_MHZ=12
CONFIG_ETH_SPI_CS0_GPIO=23
CONFIG_ETH_SPI_INT0_GPIO=35
CONFIG_ETH_SPI_PHY_RST0_GPIO=4
CONFIG_ETH_SPI_PHY_ADDR0=1
# CONFIG_WEBGUIAPP_ETHERNET_ENABLE is not set
# end of Ethernet settings
#
@ -1359,13 +1339,12 @@ CONFIG_ETH_SPI_PHY_ADDR0=1
# MQTT settings
#
CONFIG_WEBGUIAPP_MQTT_ENABLE=y
CONFIG_WEBGUIAPP_MQTT_CLIENTS_NUM=2
CONFIG_WEBGUIAPP_MQTT_CLIENTS_NUM=1
CONFIG_WEBGUIAPP_MQTT_ON=y
CONFIG_WEBGUIAPP_MQTT_MAX_TOPIC_LENGTH=64
CONFIG_WEBGUIAPP_MQTT_SERVER_URL="myfirstmqttserver.com"
CONFIG_WEBGUIAPP_MQTT_SERVER_PORT=1883
CONFIG_WEBGUIAPP_MQTT_CLIENT_ID_1="DEVID1"
CONFIG_WEBGUIAPP_MQTT_CLIENT_ID_2="DEVID2"
CONFIG_WEBGUIAPP_MQTT_SYSTEM_NAME="SYSTEMNAME"
CONFIG_WEBGUIAPP_MQTT_GROUP_NAME="GROUPNAME"
CONFIG_WEBGUIAPP_MQTT_USERNAME="username"
@ -1379,6 +1358,19 @@ 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
#
# 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 WebGUIApp
# end of Component config