fixed default config and update components

This commit is contained in:
Bogdan Pilyugin 2023-04-04 08:59:12 +02:00
parent 0867f12c7e
commit f8ae249dab
7 changed files with 7 additions and 5651 deletions

3794
.project

File diff suppressed because it is too large Load Diff

@ -1 +1 @@
Subproject commit 9c2cf0c292500892ae4b80bfae7430d47c0cb98f
Subproject commit 0024698adf9d3f849609a70c3048ef3b417bea9c

@ -1 +1 @@
Subproject commit 5447358116d3ee5a198fb646e2322a7dff0c2434
Subproject commit d603d92738f677e9391afae9cb57b95db17148f7

@ -1 +1 @@
Subproject commit 94081ea62d29028ec90a3dadd3fe77e5d6e374fc
Subproject commit e539afe92abf9ca4ecf3900dba96370391321ccf

View File

@ -1,27 +1,9 @@
<<<<<<< HEAD
dependencies:
idf:
component_hash: null
source:
type: idf
version: 4.4.4
manifest_hash: eb33eed6204aeebc93ef87ce0ee4c46aa4a936fb925253457119240e0cfb2135
manifest_hash: 31dd4ec84ade1450fc168388f4adce2efacd1516170670735140bc772e9d72bd
target: esp32
version: 1.0.0
=======
dependencies:
espressif/esp_modem:
component_hash: b11de8ecab6860719ab236cf353967c4f31d7f8e5e82dc6c224efeabbde00fcd
source:
service_url: https://api.components.espressif.com/
type: service
version: 0.1.19
idf:
component_hash: null
source:
type: idf
version: 5.0.1
manifest_hash: b3357670639619c7fd256fd7a93d0f31f2cdc3ae8d1cd574592ee8457dd17968
target: esp32
version: 1.0.0
>>>>>>> refs/remotes/origin/main

1826
sdkconfig

File diff suppressed because it is too large Load Diff

View File

@ -3,19 +3,11 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_APP_PROJECT_VER_FROM_CONFIG=y
<<<<<<< HEAD
CONFIG_APP_PROJECT_VER="0.0.0.0000"
=======
CONFIG_APP_PROJECT_VER="0.0.0.0"
>>>>>>> refs/remotes/origin/main
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_user_ota.csv"
CONFIG_PARTITION_TABLE_FILENAME="partitions_user_ota.csv"
CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
<<<<<<< HEAD
=======
CONFIG_LOG_TIMESTAMP_SOURCE_SYSTEM=y
>>>>>>> refs/remotes/origin/main
CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024