fix(modem): Fixup tcp-client example with esp-at

Author: david-cermak

components/esp_modem/examples/modem_tcp_client/main/command/sock_dce.cpp

@@ -8,8 +8,8 @@
 #include <sys/socket.h>
 #include "esp_vfs.h"
 #include "esp_vfs_eventfd.h"
-
 #include "sock_dce.hpp"
+#include "cxx_include/esp_modem_command_library_utils.hpp"
 
 namespace sock_dce {
 
@@ -305,6 +305,21 @@ std::unique_ptr<DCE> create(const esp_modem::dce_config *config, std::shared_ptr
 }
 
 
+esp_modem::command_result DCE::sync()
+{
+    return esp_modem::dce_commands::generic_command_common(dte.get(), "AT\r\n");
+}
+
+esp_modem::command_result DCE::set_echo(bool on)
+{
+    return esp_modem::dce_commands::generic_command_common(dte.get(), "ATE0\r\n");
+}
+
+esp_modem::command_result DCE::set_pdp_context(esp_modem::PdpContext &pdp)
+{
+    return esp_modem::command_result::OK;
+}
+
 /**
  * @brief Opens network in AT command mode
  * @return OK, FAIL or TIMEOUT

components/esp_modem/examples/modem_tcp_client/main/command/sock_dce.hpp

@@ -101,6 +101,9 @@ class DCE : public ::esp_modem::GenericModule {
     using esp_modem::GenericModule::GenericModule;
 public:
 
+    esp_modem::command_result sync() override;
+    esp_modem::command_result set_echo(bool on) override;
+    esp_modem::command_result set_pdp_context(esp_modem::PdpContext &pdp) override;
     /**
      * @brief Opens network in AT command mode
      * @return OK, FAIL or TIMEOUT

components/esp_modem/examples/modem_tcp_client/main/modem_client.cpp

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  */
@@ -23,8 +23,8 @@
 #include "tcp_transport_mbedtls.h"
 #include "tcp_transport_at.h"
 
-#define BROKER_URL "mqtt.eclipseprojects.io"
-#define BROKER_PORT 8883
+#define BROKER_URL "test.mosquitto.org"
+#define BROKER_PORT 1883
 
 
 static const char *TAG = "modem_client";
@@ -114,7 +114,7 @@ extern "C" void app_main(void)
     mqtt_config.broker.address.port = BROKER_PORT;
     mqtt_config.session.message_retransmit_timeout = 10000;
 #ifndef CONFIG_EXAMPLE_CUSTOM_TCP_TRANSPORT
-    mqtt_config.broker.address.uri = "mqtts://127.0.0.1";
+    mqtt_config.broker.address.uri = "mqtt://127.0.0.1";
     dce->start_listening(BROKER_PORT);
 #else
     mqtt_config.broker.address.uri = "mqtt://" BROKER_URL;
@@ -127,6 +127,7 @@ extern "C" void app_main(void)
     esp_mqtt_client_register_event(mqtt_client, static_cast<esp_mqtt_event_id_t>(ESP_EVENT_ANY_ID), mqtt_event_handler, NULL);
     esp_mqtt_client_start(mqtt_client);
 #ifndef CONFIG_EXAMPLE_CUSTOM_TCP_TRANSPORT
+    dce->set_rx_mode(1);
     if (!dce->connect(BROKER_URL, BROKER_PORT)) {
         ESP_LOGE(TAG, "Failed to start DCE");
         return;

components/esp_modem/examples/modem_tcp_client/main/sock_commands_espat.cpp

@@ -21,14 +21,14 @@ command_result net_open(CommandableIf *t)
     ESP_LOGV(TAG, "%s", __func__);
 
     // Set WiFi mode to station
-    auto ret = dce_commands::generic_command(t, "AT+CWMODE=1\r", "OK", "ERROR", 5000);
+    auto ret = dce_commands::generic_command(t, "AT+CWMODE=1\r\n", "OK", "ERROR", 5000);
     if (ret != command_result::OK) {
         ESP_LOGE(TAG, "Failed to set WiFi mode");
         return ret;
     }
 
     // Connect to WiFi network
-    std::string wifi_cmd = "AT+CWJAP=\"" CONFIG_EXAMPLE_WIFI_SSID "\",\"" CONFIG_EXAMPLE_WIFI_PASSWORD "\"\r";
+    std::string wifi_cmd = "AT+CWJAP=\"" CONFIG_EXAMPLE_WIFI_SSID "\",\"" CONFIG_EXAMPLE_WIFI_PASSWORD "\"\r\n";
     ret = dce_commands::generic_command(t, wifi_cmd, "OK", "ERROR", 15000);
     if (ret != command_result::OK) {
         ESP_LOGE(TAG, "Failed to connect to WiFi");
@@ -43,7 +43,7 @@ command_result net_close(CommandableIf *t)
 {
     ESP_LOGV(TAG, "%s", __func__);
     // Disconnect from WiFi
-    auto ret = dce_commands::generic_command(t, "AT+CWQAP\r", "OK", "ERROR", 5000);
+    auto ret = dce_commands::generic_command(t, "AT+CWQAP\r\n", "OK", "ERROR", 5000);
     if (ret != command_result::OK) {
         ESP_LOGW(TAG, "Failed to disconnect WiFi (may already be disconnected)");
     }
@@ -55,13 +55,13 @@ command_result tcp_open(CommandableIf *t, const std::string &host, int port, int
     ESP_LOGV(TAG, "%s", __func__);
 
     // Set single connection mode (just in case)
-    auto ret = dce_commands::generic_command(t, "AT+CIPMUX=0\r", "OK", "ERROR", 1000);
+    auto ret = dce_commands::generic_command(t, "AT+CIPMUX=0\r\n", "OK", "ERROR", 1000);
     if (ret != command_result::OK) {
         ESP_LOGW(TAG, "Failed to set single connection mode");
     }
 
     // Establish TCP connection
-    std::string tcp_cmd = "AT+CIPSTART=\"TCP\",\"" + host + "\"," + std::to_string(port) + "\r";
+    std::string tcp_cmd = "AT+CIPSTART=\"TCP\",\"" + host + "\"," + std::to_string(port) + "\r\n";
     ret = dce_commands::generic_command(t, tcp_cmd, "CONNECT", "ERROR", timeout);
     if (ret != command_result::OK) {
         ESP_LOGE(TAG, "Failed to establish TCP connection to %s:%d", host.c_str(), port);
@@ -75,7 +75,7 @@ command_result tcp_open(CommandableIf *t, const std::string &host, int port, int
 command_result tcp_close(CommandableIf *t)
 {
     ESP_LOGV(TAG, "%s", __func__);
-    return dce_commands::generic_command(t, "AT+CIPCLOSE\r", "CLOSED", "ERROR", 5000);
+    return dce_commands::generic_command(t, "AT+CIPCLOSE\r\n", "CLOSED", "ERROR", 5000);
 }
 
 command_result tcp_send(CommandableIf *t, uint8_t *data, size_t len)
@@ -98,7 +98,7 @@ command_result get_ip(CommandableIf *t, std::string &ip)
 {
     ESP_LOGV(TAG, "%s", __func__);
     std::string out;
-    auto ret = dce_commands::generic_get_string(t, "AT+CIFSR\r", out, 5000);
+    auto ret = dce_commands::at_raw(t, "AT+CIFSR\r\n", out, "OK", "ERROR", 5000);
     if (ret != command_result::OK) {
         return ret;
     }
@@ -122,10 +122,10 @@ command_result get_ip(CommandableIf *t, std::string &ip)
 
 command_result set_rx_mode(CommandableIf *t, int mode)
 {
-    ESP_LOGV(TAG, "%s", __func__);
+    ESP_LOGE(TAG, "%s", __func__);
     // Set passive receive mode (1) for better control
     // Active mode (0) would send +IPD automatically
-    std::string cmd = "AT+CIPRECVTYPE=" + std::to_string(mode) + "\r";
+    std::string cmd = "AT+CIPRECVTYPE=" + std::to_string(mode) + "\r\n";
     return dce_commands::generic_command(t, cmd, "OK", "ERROR", 1000);
 }
 
@@ -137,17 +137,17 @@ void Responder::start_sending(size_t len)
 {
     data_to_send = len;
     send_stat = 0;
-    send_cmd("AT+CIPSEND=" + std::to_string(len) + "\r");
+    send_cmd("AT+CIPSEND=" + std::to_string(len) + "\r\n");
 }
 
 void Responder::start_receiving(size_t len)
 {
-    send_cmd("AT+CIPRECVDATA=" + std::to_string(len) + "\r");
+    send_cmd("AT+CIPRECVDATA=" + std::to_string(len) + "\r\n");
 }
 
 bool Responder::start_connecting(std::string host, int port)
 {
-    std::string cmd = "AT+CIPSTART=\"TCP\",\"" + host + "\"," + std::to_string(port) + "\r";
+    std::string cmd = "AT+CIPSTART=\"TCP\",\"" + host + "\"," + std::to_string(port) + "\r\n";
     send_cmd(cmd);
     return true;
 }