Merge branch 'bugfix/pppos_configs' into 'master'

esp-modem: Add options to support LCP ECHO and UART_ISR_RAM in the example

Closes IDFGH-2470 and IDFGH-4759

See merge request espressif/esp-idf!12962
This commit is contained in:
David Čermák
2021-04-12 14:30:38 +00:00
3 changed files with 44 additions and 21 deletions

View File

@@ -708,6 +708,29 @@ menu "LWIP"
help
Enable Microsoft Point-to-Point Encryption (MPPE) support
config LWIP_ENABLE_LCP_ECHO
bool "Enable LCP ECHO"
depends on LWIP_PPP_SUPPORT
default n
help
Enable LCP echo keepalive requests
config LWIP_LCP_ECHOINTERVAL
int "Echo interval (s)"
range 0 1000000
depends on LWIP_ENABLE_LCP_ECHO
default 3
help
Interval in seconds between keepalive LCP echo requests, 0 to disable.
config LWIP_LCP_MAXECHOFAILS
int "Maximum echo failures"
range 0 100000
depends on LWIP_ENABLE_LCP_ECHO
default 3
help
Number of consecutive unanswered echo requests before failure is indicated.
config LWIP_PPP_DEBUG_ON
bool "Enable PPP debug log output"
depends on LWIP_PPP_SUPPORT
@@ -777,24 +800,6 @@ menu "LWIP"
endmenu # SNTP
menu "LCP"
config LCP_ECHOINTERVAL
int "Echo interval (s)"
range 0 1000000
default 0
help
Interval in seconds between keepalive LCP echo requests, 0 to disable.
config LCP_MAXECHOFAILS
int "Maximum echo failures"
range 0 100000
default 3
help
Number of consecutive unanswered echo requests before failure is indicated.
endmenu # LCP
config LWIP_ESP_LWIP_ASSERT
bool "Enable LWIP ASSERT checks"
default y

View File

@@ -745,16 +745,17 @@
--------- LCP Echo options ---------
------------------------------------
*/
#if CONFIG_LWIP_ENABLE_LCP_ECHO
/**
* LCP_ECHOINTERVAL: Interval in seconds between keepalive LCP echo requests, 0 to disable.
*/
#define LCP_ECHOINTERVAL CONFIG_LCP_ECHOINTERVAL
#define LCP_ECHOINTERVAL CONFIG_LWIP_LCP_ECHOINTERVAL
/**
* LCP_MAXECHOFAILS: Number of consecutive unanswered echo requests before failure is indicated.
*/
#define LCP_MAXECHOFAILS CONFIG_LCP_MAXECHOFAILS
#define LCP_MAXECHOFAILS CONFIG_LWIP_LCP_MAXECHOFAILS
#endif /* CONFIG_LWIP_ENABLE_LCP_ECHO */
/*
--------------------------------------

View File

@@ -54,6 +54,23 @@ menu "Example Configuration"
Enter the peer phone number that you want to send message to.
endif
config EXAMPLE_UART_ISR_IN_RAM
bool "Use UART ISR in RAM"
default n
select UART_ISR_IN_IRAM
help
Enable placing UART ISR to IRAM.
This options is useful if PPPoS client needs to perform
flash operations (e.g. OTA) while keeping the network operational.
config EXAMPLE_LCP_ECHO
bool "Enable LCP ECHO"
default n
select LWIP_ENABLE_LCP_ECHO
help
Enable this option to make use of LCP keepalive using
LCP_ECHO_INTERVAL and LCP_MAXECHOFAILS to default values
menu "UART Configuration"
config EXAMPLE_MODEM_UART_TX_PIN
int "TXD Pin Number"