espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-07-20 22:12:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

update init order to make it compilable under c++

Browse Source
This commit is contained in:
David Cermak
2021-02-24 16:53:04 +01:00
parent 8ce6668881
commit 3d00b41d2d
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esp_modem/include/esp_modem.h
View File

@ -96,8 +96,8 @@ typedef struct {
.data_bits = UART_DATA_8_BITS, \ .data_bits = UART_DATA_8_BITS, \
.stop_bits = UART_STOP_BITS_1, \ .stop_bits = UART_STOP_BITS_1, \
.parity = UART_PARITY_DISABLE, \ .parity = UART_PARITY_DISABLE, \
.baud_rate = 115200, \
.flow_control = ESP_MODEM_FLOW_CONTROL_NONE,\ .flow_control = ESP_MODEM_FLOW_CONTROL_NONE,\
.baud_rate = 115200, \
.tx_io_num = 25, \ .tx_io_num = 25, \
.rx_io_num = 26, \ .rx_io_num = 26, \
.rts_io_num = 27, \ .rts_io_num = 27, \

7
esp_modem/src/esp_modem_dte.c
View File

@ -152,6 +152,7 @@ static void esp_handle_uart_data(esp_modem_dte_internal_t *esp_dte)
{ {
size_t length = 0; size_t length = 0;
uart_get_buffered_data_len(esp_dte->uart_port, &length); uart_get_buffered_data_len(esp_dte->uart_port, &length);
ESP_LOGD(TAG, "esp-modem:esp_handle_uart_data");
if (esp_dte->parent.dce->mode != ESP_MODEM_PPP_MODE && length) { if (esp_dte->parent.dce->mode != ESP_MODEM_PPP_MODE && length) {
// Check if matches the pattern to process the data as pattern // Check if matches the pattern to process the data as pattern
@ -179,6 +180,7 @@ static void esp_handle_uart_data(esp_modem_dte_internal_t *esp_dte)
esp_dte->buffer[length] = '\0'; esp_dte->buffer[length] = '\0';
} }
ESP_LOG_BUFFER_HEXDUMP("esp-modem: debug_data", esp_dte->buffer, length, ESP_LOG_DEBUG); ESP_LOG_BUFFER_HEXDUMP("esp-modem: debug_data", esp_dte->buffer, length, ESP_LOG_DEBUG);
ESP_LOGI(TAG, "%s", esp_dte->buffer);
if (esp_dte->parent.dce->handle_line) { if (esp_dte->parent.dce->handle_line) {
/* Send new line to handle if handler registered */ /* Send new line to handle if handler registered */
esp_dte_handle_line(esp_dte); esp_dte_handle_line(esp_dte);
@ -497,8 +499,11 @@ esp_modem_dte_t *esp_modem_dte_new(const esp_modem_dte_config_t *config)
esp_dte->pattern_queue_size = config->pattern_queue_size; esp_dte->pattern_queue_size = config->pattern_queue_size;
res |= uart_pattern_queue_reset(esp_dte->uart_port, config->pattern_queue_size); res |= uart_pattern_queue_reset(esp_dte->uart_port, config->pattern_queue_size);
/* Starting in command mode -> explicitly disable RX interrupt */ /* Starting in command mode -> explicitly disable RX interrupt */
uart_disable_rx_intr(esp_dte->uart_port);
uart_set_rx_full_threshold(esp_dte->uart_port, 64); uart_set_rx_full_threshold(esp_dte->uart_port, 64);
uart_enable_rx_intr(esp_dte->uart_port);
//
// uart_disable_rx_intr(esp_dte->uart_port);
// uart_set_rx_full_threshold(esp_dte->uart_port, 64);
ESP_MODEM_ERR_CHECK(res == ESP_OK, "config uart pattern failed", err_uart_pattern); ESP_MODEM_ERR_CHECK(res == ESP_OK, "config uart pattern failed", err_uart_pattern);
/* Create Event loop */ /* Create Event loop */