espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-07-29 10:17:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #242 from david-cermak/bugfix/modem_strip_idf_4.1

Browse Source 
fix(esp_modem): run CI build job for all targets
This commit is contained in:
david-cermak
2023-03-15 18:55:26 +01:00
committed by GitHub
parent c492d87316 13eca128fb
commit ba45e9a07e
22 changed files with 706 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/esp_modem/examples/.build-test-rules.yml Normal file
View File

@ -0,0 +1,7 @@
components/esp_modem/examples/ap_to_pppos:
disable:
- if: IDF_TARGET in ["esp32h2"]
components/esp_modem/examples/modem_console:
disable:
- if: IDF_TARGET in ["esp32h2"]

4
components/esp_modem/examples/ap_to_pppos/main/CMakeLists.txt
View File

@ -7,4 +7,6 @@ endif()
idf_component_register(SRCS "ap_to_pppos.c"
${NETWORK_DCE}
INCLUDE_DIRS ".")
target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")
# Ignore strict prototypes, as the network_dce.h can used in both C and C++ compilation
target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-strict-prototypes")

4
components/esp_modem/examples/ap_to_pppos/main/ap_to_pppos.c
View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
@ -38,7 +38,7 @@ static const int DISCONNECT_BIT = BIT1;
static void on_ip_event(void *arg, esp_event_base_t event_base,
int32_t event_id, void *event_data)
{
ESP_LOGD(TAG, "IP event! %d", event_id);
ESP_LOGD(TAG, "IP event! %" PRId32, event_id);
if (event_id == IP_EVENT_PPP_GOT_IP) {
esp_netif_dns_info_t dns_info;
ip_event_got_ip_t *event = (ip_event_got_ip_t *)event_data;

1
components/esp_modem/examples/modem_console/sdkconfig.ci.usb → components/esp_modem/examples/modem_console/sdkconfig.ci.usb_s2
View File

@ -1 +1,2 @@
CONFIG_IDF_TARGET="esp32s2"
CONFIG_EXAMPLE_SERIAL_CONFIG_USB=y

1
components/esp_modem/examples/pppos_client/sdkconfig.ci.usb → components/esp_modem/examples/modem_console/sdkconfig.ci.usb_s3
View File

@ -1 +1,2 @@
CONFIG_IDF_TARGET="esp32s3"
CONFIG_EXAMPLE_SERIAL_CONFIG_USB=y

1
components/esp_modem/examples/pppos_client/sdkconfig.ci.sim800 → components/esp_modem/examples/pppos_client/sdkconfig.ci.sim800_c3
View File

@ -1,3 +1,4 @@
CONFIG_IDF_TARGET="esp32c3"
# Override some defaults to enable PPP
CONFIG_LWIP_PPP_SUPPORT=y
CONFIG_LWIP_PPP_NOTIFY_PHASE_SUPPORT=y

2
components/esp_modem/examples/pppos_client/sdkconfig.ci.usb_s2 Normal file
View File

@ -0,0 +1,2 @@
CONFIG_IDF_TARGET="esp32s2"
CONFIG_EXAMPLE_SERIAL_CONFIG_USB=y

2
components/esp_modem/examples/pppos_client/sdkconfig.ci.usb_s3 Normal file
View File

@ -0,0 +1,2 @@
CONFIG_IDF_TARGET="esp32s3"
CONFIG_EXAMPLE_SERIAL_CONFIG_USB=y

11
components/esp_modem/include/esp_modem_config.h
View File

@ -84,6 +84,11 @@ struct esp_modem_dte_config {
};
};
#if ESP_IDF_VERSION_MAJOR >= 5
#define ESP_MODEM_DEFAULT_UART_CLK UART_SCLK_DEFAULT
#else
#define ESP_MODEM_DEFAULT_UART_CLK UART_SCLK_APB
#endif
/**
* @brief ESP Modem DTE Default Configuration
@ -92,15 +97,15 @@ struct esp_modem_dte_config {
#define ESP_MODEM_DTE_DEFAULT_CONFIG() \
{ \
.dte_buffer_size = 512, \
.task_stack_size = 4096, \
.task_priority = 5, \
.task_stack_size = 4096, \
.task_priority = 5, \
.uart_config = { \
.port_num = UART_NUM_1, \
.data_bits = UART_DATA_8_BITS, \
.stop_bits = UART_STOP_BITS_1, \
.parity = UART_PARITY_DISABLE, \
.flow_control = ESP_MODEM_FLOW_CONTROL_NONE,\
.source_clk = UART_SCLK_APB, \
.source_clk = ESP_MODEM_DEFAULT_UART_CLK, \
.baud_rate = 115200, \
.tx_io_num = 25, \
.rx_io_num = 26, \