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

Merge pull request #361 from david-cermak/fix/modem_cosmetic

Browse Source 
fix(modem): Update vfs terminal; Removed designated init
This commit is contained in:
david-cermak
2023-09-22 08:37:52 +02:00
committed by GitHub
parent bac742df80 4b7d1943ac
commit 163122ff54
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/modem__build-host-tests.yml vendored
View File

@ -64,7 +64,7 @@ jobs:
COMP_DIR: esp-protocols/components/esp_modem COMP_DIR: esp-protocols/components/esp_modem
steps: steps:
- name: Checkout esp-protocols - name: Checkout esp-protocols
uses: actions/checkout@master uses: actions/checkout@v3
with: with:
path: esp-protocols path: esp-protocols

2
components/esp_modem/include/vfs_resource/vfs_create.hpp
View File

@ -14,7 +14,7 @@
.stop_bits = UART_STOP_BITS_1, \ .stop_bits = UART_STOP_BITS_1, \
.parity = UART_PARITY_DISABLE, \ .parity = UART_PARITY_DISABLE, \
.flow_control = ESP_MODEM_FLOW_CONTROL_NONE,\ .flow_control = ESP_MODEM_FLOW_CONTROL_NONE,\
.source_clk = UART_SCLK_APB, \ .source_clk = ESP_MODEM_DEFAULT_UART_CLK, \
.baud_rate = 115200, \ .baud_rate = 115200, \
.tx_io_num = 25, \ .tx_io_num = 25, \
.rx_io_num = 26, \ .rx_io_num = 26, \

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

@ -49,9 +49,9 @@ esp_err_t Netif::esp_modem_post_attach(esp_netif_t *esp_netif, void *args)
ESP_ERROR_CHECK(esp_netif_set_driver_config(esp_netif, &driver_ifconfig)); ESP_ERROR_CHECK(esp_netif_set_driver_config(esp_netif, &driver_ifconfig));
// check if PPP error events are enabled, if not, do enable the error occurred/state changed // check if PPP error events are enabled, if not, do enable the error occurred/state changed
// to notify the modem layer when switching modes // to notify the modem layer when switching modes
esp_netif_ppp_config_t ppp_config = { .ppp_phase_event_enabled = true, // assuming phase enabled, as earlier IDFs esp_netif_ppp_config_t ppp_config = { };
.ppp_error_event_enabled = false ppp_config.ppp_phase_event_enabled = true; // assuming phase enabled, as earlier IDFs
}; // don't provide cfg getters so we enable both events ppp_config.ppp_error_event_enabled = false; // don't provide cfg getters so we enable both events
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0) #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0)
esp_netif_ppp_get_params(esp_netif, &ppp_config); esp_netif_ppp_get_params(esp_netif, &ppp_config);
#endif // ESP-IDF >= v4.4 #endif // ESP-IDF >= v4.4

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

@ -122,9 +122,7 @@ void FdTerminal::task()
} else { } else {
if (FD_ISSET(f.fd, &rfds)) { if (FD_ISSET(f.fd, &rfds)) {
if (on_read_priv) { if (on_read_priv) {
if (on_read_priv(nullptr, 0)) { on_read_priv(nullptr, 0);
on_read_priv = nullptr;
}
} }
} }
} }