From 39ba9ce25f47a9e7a73946a83f0476748b8daf44 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Tue, 16 Aug 2022 17:36:14 +0200 Subject: [PATCH] switched off IPV6, switched on PPP support in lwip, start all adapters on boot for test --- .project | 30 ++++++++++++++++++++++++++++++ main/main.c | 14 +++++++++++++- sdkconfig | 45 ++++++++++++++++----------------------------- sdkconfig.old | 18 ++++++++++++++++-- 4 files changed, 75 insertions(+), 32 deletions(-) diff --git a/.project b/.project index bd3253e..45104c0 100644 --- a/.project +++ b/.project @@ -1478,6 +1478,11 @@ 1 C:/Users/bogd/esp-idf-v4.4.1/components/esp_netif/lwip/esp_netif_lwip_defaults.c + + esp_idf_components/esp_netif/lwip/esp_netif_lwip_ppp.c + 1 + C:/Users/bogd/esp-idf-v4.4.1/components/esp_netif/lwip/esp_netif_lwip_ppp.c + esp_idf_components/esp_netif/lwip/esp_netif_sta_list.c 1 @@ -8458,6 +8463,31 @@ 1 C:/Users/bogd/esp-idf-v4.4.1/components/libsodium/libsodium/src/libsodium/crypto_verify/sodium/verify.c + + esp_idf_components/lwip/lwip/src/netif/ppp/polarssl/arc4.c + 1 + C:/Users/bogd/esp-idf-v4.4.1/components/lwip/lwip/src/netif/ppp/polarssl/arc4.c + + + esp_idf_components/lwip/lwip/src/netif/ppp/polarssl/des.c + 1 + C:/Users/bogd/esp-idf-v4.4.1/components/lwip/lwip/src/netif/ppp/polarssl/des.c + + + esp_idf_components/lwip/lwip/src/netif/ppp/polarssl/md4.c + 1 + C:/Users/bogd/esp-idf-v4.4.1/components/lwip/lwip/src/netif/ppp/polarssl/md4.c + + + esp_idf_components/lwip/lwip/src/netif/ppp/polarssl/md5.c + 1 + C:/Users/bogd/esp-idf-v4.4.1/components/lwip/lwip/src/netif/ppp/polarssl/md5.c + + + esp_idf_components/lwip/lwip/src/netif/ppp/polarssl/sha1.c + 1 + C:/Users/bogd/esp-idf-v4.4.1/components/lwip/lwip/src/netif/ppp/polarssl/sha1.c + components/libespfs/esp_idf_components/libsodium/libsodium/src/libsodium/crypto_auth/crypto_auth.c 1 diff --git a/main/main.c b/main/main.c index 87e8826..4e26479 100644 --- a/main/main.c +++ b/main/main.c @@ -37,7 +37,19 @@ void app_main(void) //init rom file system init_rom_fs("/espfs"); -#ifdef CONFIG_WEBGUIAPP_WIFI_ENABLE +#if CONFIG_WEBGUIAPP_GPRS_ENABLE + /*Start PPP modem*/ + if (GetSysConf()->gsmSettings.Flags1.bIsGSMEnabled) + PPPModemStart(); +#endif + +#if CONFIG_WEBGUIAPP_ETHERNET_ENABLE + /*Start Ethernet connection*/ + if (GetSysConf()->ethSettings.Flags1.bIsETHEnabled) + EthStart(); +#endif + +#if CONFIG_WEBGUIAPP_WIFI_ENABLE /*Start WiFi connection*/ if (GetSysConf()->wifiSettings.Flags1.bIsWiFiEnabled) { diff --git a/sdkconfig b/sdkconfig index ecbcf98..2201b58 100644 --- a/sdkconfig +++ b/sdkconfig @@ -171,26 +171,13 @@ CONFIG_APPTRACE_DEST_NONE=y CONFIG_APPTRACE_LOCK_ENABLE=y # end of Application Level Tracing -# -# ESP-ASIO -# -# CONFIG_ASIO_SSL_SUPPORT is not set -# end of ESP-ASIO - # # Bluetooth # # CONFIG_BT_ENABLED is not set # end of Bluetooth -# -# CoAP Configuration -# -CONFIG_COAP_MBEDTLS_PSK=y -# CONFIG_COAP_MBEDTLS_PKI is not set -# CONFIG_COAP_MBEDTLS_DEBUG is not set CONFIG_COAP_LOG_DEFAULT_LEVEL=0 -# end of CoAP Configuration # # Driver configurations @@ -755,9 +742,7 @@ 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_FORWARD is not set # CONFIG_LWIP_STATS is not set # CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set @@ -779,10 +764,7 @@ CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8 # end of DHCP server # CONFIG_LWIP_AUTOIP is not set -CONFIG_LWIP_IPV6=y -# CONFIG_LWIP_IPV6_AUTOCONFIG is not set -CONFIG_LWIP_IPV6_NUM_ADDRESSES=3 -# CONFIG_LWIP_IPV6_FORWARD is not set +# CONFIG_LWIP_IPV6 is not set # CONFIG_LWIP_NETIF_STATUS_CALLBACK is not set CONFIG_LWIP_NETIF_LOOPBACK=y CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8 @@ -830,9 +812,14 @@ CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y # CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0 is not set # CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU1 is not set CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF -# CONFIG_LWIP_PPP_SUPPORT is not set -CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3 -CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5 +CONFIG_LWIP_PPP_SUPPORT=y +# CONFIG_LWIP_PPP_NOTIFY_PHASE_SUPPORT is not set +# CONFIG_LWIP_PPP_PAP_SUPPORT is not set +CONFIG_LWIP_PPP_CHAP_SUPPORT=y +# CONFIG_LWIP_PPP_MSCHAP_SUPPORT is not set +# CONFIG_LWIP_PPP_MPPE_SUPPORT is not set +# CONFIG_LWIP_ENABLE_LCP_ECHO is not set +# CONFIG_LWIP_PPP_DEBUG_ON is not set # CONFIG_LWIP_SLIP_SUPPORT is not set # @@ -865,12 +852,6 @@ 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_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 @@ -1482,7 +1463,13 @@ CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y # CONFIG_TCPIP_TASK_AFFINITY_CPU0 is not set # CONFIG_TCPIP_TASK_AFFINITY_CPU1 is not set CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF -# CONFIG_PPP_SUPPORT is not set +CONFIG_PPP_SUPPORT=y +# CONFIG_PPP_NOTIFY_PHASE_SUPPORT is not set +# CONFIG_PPP_PAP_SUPPORT is not set +CONFIG_PPP_CHAP_SUPPORT=y +# CONFIG_PPP_MSCHAP_SUPPORT is not set +# CONFIG_PPP_MPPE_SUPPORT is not set +# CONFIG_PPP_DEBUG_ON is not set CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5 CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072 CONFIG_ESP32_PTHREAD_STACK_MIN=768 diff --git a/sdkconfig.old b/sdkconfig.old index 308465f..ecbcf98 100644 --- a/sdkconfig.old +++ b/sdkconfig.old @@ -355,7 +355,7 @@ CONFIG_ETH_DMA_RX_BUFFER_NUM=10 CONFIG_ETH_DMA_TX_BUFFER_NUM=10 CONFIG_ETH_USE_SPI_ETHERNET=y # CONFIG_ETH_SPI_ETHERNET_DM9051 is not set -# CONFIG_ETH_SPI_ETHERNET_W5500 is not set +CONFIG_ETH_SPI_ETHERNET_W5500=y # CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL is not set # CONFIG_ETH_USE_OPENETH is not set # end of Ethernet @@ -1270,7 +1270,21 @@ CONFIG_WEBGUIAPP_WIFI_GATEWAY_STA="192.168.1.150" # # Ethernet settings # -# CONFIG_WEBGUIAPP_ETHERNET_ENABLE is not set +CONFIG_WEBGUIAPP_ETHERNET_ENABLE=y +CONFIG_WEBGUIAPP_ETHERNET_ON=y +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=15 +CONFIG_ETH_SPI_INT0_GPIO=4 +CONFIG_ETH_SPI_PHY_RST0_GPIO=-1 +CONFIG_ETH_SPI_PHY_ADDR0=1 # end of Ethernet settings #