fix(modem): Fix build step

Author: david-cermak

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

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <algorithm>
 #include <charconv>
 #include <sys/socket.h>
 #include "esp_vfs.h"

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

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <algorithm>
 #include <charconv>
 #include <sys/socket.h>
 #include "esp_vfs.h"

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

@@ -24,8 +24,9 @@
 #include "tcp_transport_at.h"
 
 // #define BROKER_URL "test.mosquitto.org"
-#define BROKER_URL "broker.emqx.io"
-#define BROKER_PORT 1883
+// #define BROKER_URL "broker.emqx.io"
+#define BROKER_URL "192.168.0.18"
+#define BROKER_PORT 8883
 
 
 static const char *TAG = "modem_client";
@@ -141,20 +142,20 @@ static void perform(void* ctx)
     char mqtt_client_id[] = "MQTT_CLIENT_0";
     static int counter = 0;
     const int id = counter++;
-    mqtt_client_id[12] += id;    // assumes different client id per each thread
+    mqtt_client_id[12] += id;    // assumes a different client id per each thread
     esp_mqtt_client_config_t mqtt_config = {};
-    mqtt_config.broker.address.port = BROKER_PORT; // + id;
+    mqtt_config.broker.address.port = BROKER_PORT + id;
     mqtt_config.session.message_retransmit_timeout = 10000;
     mqtt_config.credentials.client_id = mqtt_client_id;
 #ifndef CONFIG_EXAMPLE_CUSTOM_TCP_TRANSPORT
-    mqtt_config.broker.address.uri = "mqtt://127.0.0.1";
+    mqtt_config.broker.address.uri = "mqtts://127.0.0.1";
     dce->start_listening(BROKER_PORT + id);
 #else
-    mqtt_config.broker.address.uri = "mqtt://" BROKER_URL;
+    mqtt_config.broker.address.uri = "mqtts://" BROKER_URL;
     esp_transport_handle_t at = esp_transport_at_init(dce);
-    // esp_transport_handle_t ssl = esp_transport_tls_init(at);
+    esp_transport_handle_t ssl = esp_transport_tls_init(at);
 
-    mqtt_config.network.transport = at;
+    mqtt_config.network.transport = ssl;
 #endif
     esp_mqtt_client_handle_t mqtt_client = esp_mqtt_client_init(&mqtt_config);
     esp_mqtt_client_register_event(mqtt_client, static_cast<esp_mqtt_event_id_t>(ESP_EVENT_ANY_ID), mqtt_event_handler, nullptr);

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

@@ -133,7 +133,7 @@ Responder::ret Responder::recv(uint8_t *data, size_t len)
         const std::string_view recv_data_view = std::string_view(recv_data, len);
         auto head_pos_found = recv_data_view.find(head);
         if (head_pos_found == std::string_view::npos) {
-            return ret::FAIL;
+            return ret::IN_PROGRESS;
         }
 
         auto *head_pos = recv_data + head_pos_found;

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

@@ -200,23 +200,13 @@ Responder::ret Responder::recv(uint8_t *data, size_t len)
     auto *recv_data = (char *)data;
 
     if (data_to_recv == 0) {
-        // const std::string_view error_str = "ERROR";
-        // const std::string_view data_sv(recv_data, len);
-        // if (data_sv.find(error_str) == std::string_view::npos) {
-        //     // no data,
-        //     return ret::OK;
-        // }
         const std::string_view head = "+CIPRECVDATA:";
-
-        // Find the response header
-        auto head_pos = std::search(recv_data, recv_data + len, head.data(), head.data() + head.size(), [](char a, char b) {
-            return a == b;
-        });
-
-        if (head_pos == recv_data + len) {
+        const std::string_view recv_data_view(recv_data, len);
+        const auto head_pos_found = recv_data_view.find(head);
+        if (head_pos_found == std::string_view::npos) {
             return ret::IN_PROGRESS;
         }
-
+        const auto *head_pos = recv_data + head_pos_found;
         // Find the end of the length field
         auto next_comma = (char *)memchr(head_pos + head.size(), ',', MIN_MESSAGE);
         if (next_comma == nullptr) {
@@ -265,12 +255,22 @@ Responder::ret Responder::recv(uint8_t *data, size_t len)
     char *ok_pos = nullptr;
     if (actual_len + 1 + 2 /* OK */ <= len) {
         ok_pos = (char *)memchr(recv_data + actual_len + 1, 'O', MIN_MESSAGE);
-        if (ok_pos == nullptr || ok_pos[1] != 'K') {
+        if (ok_pos == nullptr) { // || ok_pos[1] != 'K') {
+            data_to_recv = 0;
+            return ret::FAIL;
+        }
+        if (ok_pos + 1 < recv_data + len && ok_pos[1] != 'K') {
+            // we ignore the condition when receiving 'O' as the last character in the last batch,
+            // don't wait for the 'K' in the next run, assume the data are valid and let higher layers deal with it.
             data_to_recv = 0;
             return ret::FAIL;
         }
     }
-
+    if (ok_pos != nullptr && (char *)data + len - ok_pos - 2 > MIN_MESSAGE) {
+        // check for async replies after the Recv header
+        std::string_view response((char *)ok_pos + 2 /* OK */, (char *)data + len - ok_pos);
+        check_urc(status::RECEIVING, response);
+    }
     // Reset and prepare for next receive
     data_to_recv = 0;
     return ret::OK;

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

@@ -343,23 +343,24 @@ Responder::ret Responder::connect(std::string_view response)
 Responder::ret Responder::check_urc(status state, std::string_view &response)
 {
     // Handle data notifications - in multiple connections mode, format is +IPD,<link ID>,<len>
-    std::string expected_urc = "+IPD," + std::to_string(link_id);
-    if (response.find(expected_urc) != std::string::npos) {
+    if (response.find("+CIPRXGET: 1") != std::string::npos) {
         uint64_t data_ready = 1;
         write(data_ready_fd, &data_ready, sizeof(data_ready));
-        ESP_LOGD(TAG, "Data available notification");
+        ESP_LOGD(TAG, "Got data on modem!");
     }
     return ret::IN_PROGRESS;
 }
 
 Responder::ret Responder::check_async_replies(status state, std::string_view &response)
 {
-    if (response.find("+CIPRXGET: 1") != std::string::npos) {
-        uint64_t data_ready = 1;
-        write(data_ready_fd, &data_ready, sizeof(data_ready));
-        ESP_LOGD(TAG, "Got data on modem!");
+    ESP_LOGD(TAG, "response %.*s", static_cast<int>(response.size()), response.data());
+    if (state == status::SENDING) {
+        return send(response);
+    } else if (state == status::CONNECTING) {
+        return connect(response);
     }
     return ret::IN_PROGRESS;
+
 }
 
 Responder::ret Responder::process_data(status state, uint8_t *data, size_t len)