From c53487806bc2552002b4ddbb1a05cef5f7813a22 Mon Sep 17 00:00:00 2001 From: David Cermak Date: Thu, 25 Mar 2021 07:48:53 +0100 Subject: [PATCH] PPP renamed to Netif, common AT command to console --- .../modem_console/main/modem_console_main.cpp | 24 ++++++++++++++----- .../include/cxx_include/esp_modem_dce.hpp | 4 ++-- .../include/cxx_include/esp_modem_netif.hpp | 8 +++---- esp_modem/src/esp_modem_dce.cpp | 2 +- esp_modem/src/esp_modem_netif.cpp | 20 ++++++++-------- 5 files changed, 35 insertions(+), 23 deletions(-) diff --git a/esp_modem/examples/modem_console/main/modem_console_main.cpp b/esp_modem/examples/modem_console/main/modem_console_main.cpp index 258e537a3..c31095f4b 100644 --- a/esp_modem/examples/modem_console/main/modem_console_main.cpp +++ b/esp_modem/examples/modem_console/main/modem_console_main.cpp @@ -428,7 +428,7 @@ extern "C" void app_main(void) const struct GenericCommandArgs { GenericCommandArgs(): cmd(STR1, nullptr, nullptr, "", "AT command to send to the modem"), - timeout(INT1, "t", "timeout", "", "command timeout"), + timeout(INT0, "t", "timeout", "", "command timeout"), pattern(STR0, "p", "pattern", "", "command response to wait for"), no_cr(LIT0, "n", "no-cr", "not add trailing CR to the command") {} CommandArgs cmd; @@ -436,14 +436,26 @@ extern "C" void app_main(void) CommandArgs pattern; CommandArgs no_cr; } send_cmd_args; - - ConsoleCommand SendCommand("cmd", "sends generic AT command, no_args", &send_cmd_args, sizeof(send_cmd_args), [&](ConsoleCommand *c){ + const ConsoleCommand SendCommand("cmd", "sends generic AT command, no_args", &send_cmd_args, sizeof(send_cmd_args), [&](ConsoleCommand *c) { auto cmd = c->get_string_of(&GenericCommandArgs::cmd); - auto timeout = c->get_int_of(&GenericCommandArgs::timeout); + auto timeout = c->get_count_of(&GenericCommandArgs::timeout) ? c->get_int_of(&GenericCommandArgs::timeout) + : 1000; + auto pattern = c->get_string_of(&GenericCommandArgs::pattern); + if (c->get_count_of(&GenericCommandArgs::no_cr) == 0) { + cmd += '\r'; + } ESP_LOGI(TAG, "Sending command %s with timeout %d", cmd.c_str(), timeout); - CHECK_ERR(dce->command(cmd, nullptr, timeout), - ESP_LOGI(TAG, "OK")); + CHECK_ERR(dce->command(cmd, [&](uint8_t *data, size_t len) { + std::string response((char *) data, len); + ESP_LOGI(TAG, "%s", response.c_str()); + if (pattern.empty() || response.find(pattern) != std::string::npos) + return command_result::OK; + if (response.find(pattern) != std::string::npos) + return command_result::OK; + return command_result::TIMEOUT; + }, timeout),); }); + // start console REPL ESP_ERROR_CHECK(esp_console_start_repl(s_repl)); ESP_LOGE(TAG, "Exit console!!!"); diff --git a/esp_modem/include/cxx_include/esp_modem_dce.hpp b/esp_modem/include/cxx_include/esp_modem_dce.hpp index 950678b03..bda011cf4 100644 --- a/esp_modem/include/cxx_include/esp_modem_dce.hpp +++ b/esp_modem/include/cxx_include/esp_modem_dce.hpp @@ -11,7 +11,7 @@ class Modes { public: Modes(): mode(modem_mode::COMMAND_MODE) {} ~Modes() = default; - bool set(DTE *dte, ModuleIf *module, PPP &netif, modem_mode m); + bool set(DTE *dte, ModuleIf *module, Netif &netif, modem_mode m); modem_mode get(); private: @@ -48,7 +48,7 @@ protected: std::shared_ptr dte; std::shared_ptr module; - PPP netif; + Netif netif; esp_modem::DCE::Modes mode; }; diff --git a/esp_modem/include/cxx_include/esp_modem_netif.hpp b/esp_modem/include/cxx_include/esp_modem_netif.hpp index f283f0281..aef0b09f3 100644 --- a/esp_modem/include/cxx_include/esp_modem_netif.hpp +++ b/esp_modem/include/cxx_include/esp_modem_netif.hpp @@ -9,18 +9,18 @@ #include "cxx_include/esp_modem_primitives.hpp" class DTE; -class PPP; +class Netif; //struct ppp_netif_driver; struct ppp_netif_driver { esp_netif_driver_base_t base; - PPP *ppp; + Netif *ppp; }; -class PPP { +class Netif { public: - explicit PPP(std::shared_ptr e, esp_netif_t *netif); + explicit Netif(std::shared_ptr e, esp_netif_t *netif); void start(); // void notify_ppp_exit() { signal.set(PPP_EXIT); } diff --git a/esp_modem/src/esp_modem_dce.cpp b/esp_modem/src/esp_modem_dce.cpp index de1110680..ab3c9b4ec 100644 --- a/esp_modem/src/esp_modem_dce.cpp +++ b/esp_modem/src/esp_modem_dce.cpp @@ -9,7 +9,7 @@ namespace esp_modem::DCE { -bool Modes::set(DTE *dte, ModuleIf *device, PPP &netif, modem_mode m) +bool Modes::set(DTE *dte, ModuleIf *device, Netif &netif, modem_mode m) { switch (m) { case modem_mode::UNDEF: diff --git a/esp_modem/src/esp_modem_netif.cpp b/esp_modem/src/esp_modem_netif.cpp index e3982011d..544f64272 100644 --- a/esp_modem/src/esp_modem_netif.cpp +++ b/esp_modem/src/esp_modem_netif.cpp @@ -12,10 +12,10 @@ #include -void PPP::on_ppp_changed(void *arg, esp_event_base_t event_base, +void Netif::on_ppp_changed(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data) { - PPP *ppp = (PPP*)arg; + Netif *ppp = (Netif*)arg; // DTE *e = (DTE*)arg; std::cout << "on_ppp_changed " << std::endl; ESP_LOGW("TAG", "PPP state changed event %d", event_id); @@ -29,9 +29,9 @@ void PPP::on_ppp_changed(void *arg, esp_event_base_t event_base, } } -esp_err_t PPP::esp_modem_dte_transmit(void *h, void *buffer, size_t len) +esp_err_t Netif::esp_modem_dte_transmit(void *h, void *buffer, size_t len) { - PPP *ppp = (PPP*)h; + Netif *ppp = (Netif*)h; if (ppp->signal.is_any(PPP_STARTED)) { std::cout << "sending data " << len << std::endl; if (ppp->ppp_dte->write((uint8_t*)buffer, len) > 0) { @@ -41,11 +41,11 @@ esp_err_t PPP::esp_modem_dte_transmit(void *h, void *buffer, size_t len) return ESP_FAIL; } -esp_err_t PPP::esp_modem_post_attach(esp_netif_t * esp_netif, void * args) +esp_err_t Netif::esp_modem_post_attach(esp_netif_t * esp_netif, void * args) { auto d = (ppp_netif_driver*)args; esp_netif_driver_ifconfig_t driver_ifconfig = { }; - driver_ifconfig.transmit = PPP::esp_modem_dte_transmit; + driver_ifconfig.transmit = Netif::esp_modem_dte_transmit; driver_ifconfig.handle = (void*)d->ppp; std::cout << "esp_modem_post_attach " << std::endl; d->base.netif = esp_netif; @@ -63,7 +63,7 @@ esp_err_t PPP::esp_modem_post_attach(esp_netif_t * esp_netif, void * args) return ESP_OK; } -void PPP::receive(uint8_t *data, size_t len) +void Netif::receive(uint8_t *data, size_t len) { if (signal.is_any(PPP_STARTED)) { std::cout << "received data " << len << std::endl; @@ -71,7 +71,7 @@ void PPP::receive(uint8_t *data, size_t len) } } -PPP::PPP(std::shared_ptr e, esp_netif_t *ppp_netif): +Netif::Netif(std::shared_ptr e, esp_netif_t *ppp_netif): ppp_dte(std::move(e)), netif(ppp_netif) { driver.base.netif = ppp_netif; @@ -83,7 +83,7 @@ PPP::PPP(std::shared_ptr e, esp_netif_t *ppp_netif): throw_if_esp_fail(esp_netif_attach(ppp_netif, &driver)); } -void PPP::start() +void Netif::start() { ppp_dte->set_data_cb([this](size_t len) -> bool { uint8_t *data; @@ -95,7 +95,7 @@ void PPP::start() signal.set(PPP_STARTED); } -void PPP::stop() +void Netif::stop() { std::cout << "esp_netif_action_stop " << std::endl; esp_netif_action_stop(driver.base.netif, nullptr, 0, nullptr);