Merge remote-tracking branch 'origin/main' into main

LICENSE

@@ -1,5 +0,0 @@
-Code in this repository is in the Public Domain (or CC0 licensed, at your option.)
-
-Unless required by applicable law or agreed to in writing, this
-software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied.

dependencies.lock

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 dependencies:
   idf:
     component_hash: null
@@ -7,3 +8,20 @@ dependencies:
 manifest_hash: eb33eed6204aeebc93ef87ce0ee4c46aa4a936fb925253457119240e0cfb2135
 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

sdkconfig.defaults

@@ -3,7 +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"
@@ -11,3 +15,7 @@ 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