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

main/main.c

@@ -5,7 +5,7 @@
 #include "AppConfiguration.h"
 
 //#define LED_STRIP_GPIO 21
-#define LED_STRIP_GPIO 1
+#define LED_STRIP_GPIO 35
 
 void UserMQTTEventHndlr(int idx, void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data);
 void SaveUserConf();

sdkconfig

@@ -1233,7 +1233,6 @@ CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
 # CONFIG_LWIP_IRAM_OPTIMIZATION is not set
 # CONFIG_LWIP_EXTRA_IRAM_OPTIMIZATION is not set
 CONFIG_LWIP_TIMERS_ONDEMAND=y
-CONFIG_LWIP_ND6=y
 CONFIG_LWIP_MAX_SOCKETS=14
 # CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set
 # CONFIG_LWIP_SO_LINGER is not set
@@ -1242,16 +1241,12 @@ CONFIG_LWIP_SO_REUSE_RXTOALL=y
 # CONFIG_LWIP_SO_RCVBUF is not set
 # CONFIG_LWIP_NETBUF_RECVINFO is not set
 CONFIG_LWIP_IP4_FRAG=y
-CONFIG_LWIP_IP6_FRAG=y
 # CONFIG_LWIP_IP4_REASSEMBLY is not set
-# CONFIG_LWIP_IP6_REASSEMBLY is not set
 CONFIG_LWIP_IP_REASS_MAX_PBUFS=10
 # CONFIG_LWIP_IP_FORWARD is not set
 # CONFIG_LWIP_STATS is not set
 CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
 CONFIG_LWIP_GARP_TMR_INTERVAL=60
-CONFIG_LWIP_ESP_MLDV6_REPORT=y
-CONFIG_LWIP_MLDV6_TMR_INTERVAL=40
 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
 CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
 # CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set
@@ -1271,10 +1266,7 @@ CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8
 
 # CONFIG_LWIP_AUTOIP is not set
 CONFIG_LWIP_IPV4=y
-CONFIG_LWIP_IPV6=y
+# CONFIG_LWIP_IPV6 is not set
-# CONFIG_LWIP_IPV6_AUTOCONFIG is not set
-CONFIG_LWIP_IPV6_NUM_ADDRESSES=3
-# CONFIG_LWIP_IPV6_FORWARD is not set
 # CONFIG_LWIP_NETIF_STATUS_CALLBACK is not set
 CONFIG_LWIP_NETIF_LOOPBACK=y
 CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
@@ -1323,9 +1315,6 @@ CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
 # CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU1 is not set
 CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF
 CONFIG_LWIP_PPP_SUPPORT=y
-# CONFIG_LWIP_PPP_ENABLE_IPV6 is not set
-CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3
-CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5
 CONFIG_LWIP_PPP_NOTIFY_PHASE_SUPPORT=y
 CONFIG_LWIP_PPP_PAP_SUPPORT=y
 # CONFIG_LWIP_PPP_CHAP_SUPPORT is not set
@@ -1366,21 +1355,9 @@ CONFIG_LWIP_ESP_LWIP_ASSERT=y
 # CONFIG_LWIP_HOOK_TCP_ISN_NONE is not set
 CONFIG_LWIP_HOOK_TCP_ISN_DEFAULT=y
 # CONFIG_LWIP_HOOK_TCP_ISN_CUSTOM is not set
-CONFIG_LWIP_HOOK_IP6_ROUTE_NONE=y
-# CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT is not set
-# CONFIG_LWIP_HOOK_IP6_ROUTE_CUSTOM is not set
-CONFIG_LWIP_HOOK_ND6_GET_GW_NONE=y
-# CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT is not set
-# CONFIG_LWIP_HOOK_ND6_GET_GW_CUSTOM is not set
-CONFIG_LWIP_HOOK_IP6_SELECT_SRC_ADDR_NONE=y
-# CONFIG_LWIP_HOOK_IP6_SELECT_SRC_ADDR_DEFAULT is not set
-# CONFIG_LWIP_HOOK_IP6_SELECT_SRC_ADDR_CUSTOM is not set
 CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_NONE=y
 # CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT is not set
 # CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_CUSTOM is not set
-CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y
-# CONFIG_LWIP_HOOK_IP6_INPUT_DEFAULT is not set
-# CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM is not set
 # end of Hooks
 
 CONFIG_LWIP_DEBUG=y

sdkconfig.old

@@ -1955,6 +1955,16 @@ CONFIG_ESPFS_USE_HEATSHRINK=y
 # end of libespfs
 # end of WebGUIApp
 
+#
+# esp-modem
+#
+CONFIG_ESP_MODEM_CMUX_DEFRAGMENT_PAYLOAD=y
+# CONFIG_ESP_MODEM_USE_INFLATABLE_BUFFER_IF_NEEDED is not set
+CONFIG_ESP_MODEM_CMUX_DELAY_AFTER_DLCI_SETUP=0
+# CONFIG_ESP_MODEM_CMUX_USE_SHORT_PAYLOADS_ONLY is not set
+# CONFIG_ESP_MODEM_ADD_CUSTOM_MODULE is not set
+# end of esp-modem
+
 #
 # The Things Network
 #
@@ -1978,16 +1988,6 @@ CONFIG_TTN_BG_TASK_PRIO=10
 CONFIG_TTN_PROVISION_UART_NONE=y
 CONFIG_TTN_PROVISION_UART_NUM=0
 # end of The Things Network
-
-#
-# esp-modem
-#
-CONFIG_ESP_MODEM_CMUX_DEFRAGMENT_PAYLOAD=y
-# CONFIG_ESP_MODEM_USE_INFLATABLE_BUFFER_IF_NEEDED is not set
-CONFIG_ESP_MODEM_CMUX_DELAY_AFTER_DLCI_SETUP=0
-# CONFIG_ESP_MODEM_CMUX_USE_SHORT_PAYLOADS_ONLY is not set
-# CONFIG_ESP_MODEM_ADD_CUSTOM_MODULE is not set
-# end of esp-modem
 # end of Component config
 
 # CONFIG_IDF_EXPERIMENTAL_FEATURES is not set