feedc0de/esp-protocols
1
0
Fork 0
forked from espressif/esp-protocols
Code Pull Requests Activity

Merge pull request #231 from tore-espressif/fix/esp_modem/on_data_cb

Browse Source 
esp_modem: Return true from on_data callback in data mode
This commit is contained in:
david-cermak
2023-02-24 07:34:20 +01:00
committed by GitHub
parent 02be2b76f8 44bae24c78
commit 319fce018e
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_modem/idf_component.yml
View File

@ -1,4 +1,4 @@
version: "0.1.26" version: "0.1.27"
description: esp modem description: esp modem
url: https://github.com/espressif/esp-protocols/tree/master/components/esp_modem url: https://github.com/espressif/esp-protocols/tree/master/components/esp_modem
dependencies: dependencies:

2
components/esp_modem/src/esp_modem_netif.cpp
View File

@ -87,7 +87,7 @@ void Netif::start()
{ {
ppp_dte->set_read_cb([this](uint8_t *data, size_t len) -> bool { ppp_dte->set_read_cb([this](uint8_t *data, size_t len) -> bool {
receive(data, len); receive(data, len);
return false; return true;
}); });
esp_netif_action_start(driver.base.netif, nullptr, 0, nullptr); esp_netif_action_start(driver.base.netif, nullptr, 0, nullptr);
signal.set(PPP_STARTED); signal.set(PPP_STARTED);

2
components/esp_modem/src/esp_modem_netif_linux.cpp
View File

@ -39,7 +39,7 @@ void Netif::start()
{ {
ppp_dte->set_read_cb([this](uint8_t *data, size_t len) -> bool { ppp_dte->set_read_cb([this](uint8_t *data, size_t len) -> bool {
receive(data, len); receive(data, len);
return false; return true;
}); });
netif->transmit = esp_modem_dte_transmit; netif->transmit = esp_modem_dte_transmit;
netif->ctx = (void *)this; netif->ctx = (void *)this;

4
components/esp_modem/src/esp_modem_uart.cpp
View File

@ -125,9 +125,7 @@ void UartTerminal::task()
case UART_DATA: case UART_DATA:
uart_get_buffered_data_len(uart.port, &len); uart_get_buffered_data_len(uart.port, &len);
if (len && on_read) { if (len && on_read) {
if (on_read(nullptr, len)) { on_read(nullptr, len);
on_read = nullptr;
}
} }
break; break;
case UART_FIFO_OVF: case UART_FIFO_OVF: