Merge branch 'main' into idf5-arduino3

fablab-bergamo · May 30, 2024 · 9b6eb45 · 9b6eb45
2 parents 1e112f9 + efb8e5d
commit 9b6eb45
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 21 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,6 +2,7 @@ name: Build firmware images
 
 on:
   workflow_dispatch:
+  pull_request:
   workflow_run:
     workflows: [Test suite based on Wokwi CLI]
     types:

diff --git a/include/BufferedMsg.hpp b/include/BufferedMsg.hpp
@@ -31,8 +31,8 @@ namespace fabomatic
     static constexpr auto MAGIC_NUMBER = 1;
 
   public:
-    auto push_back(const std::string &message, const std::string &topic, bool wait) -> void;
-    auto push_front(const std::string &message, const std::string &topic, bool wait) -> void;
+    auto push_back(const BufferedMsg &message) -> void;
+    auto push_front(const BufferedMsg &message) -> void;
     auto getMessage() -> const BufferedMsg;
     auto count() const -> size_t;
     auto toJson(JsonDocument &doc, const std::string &element_name) const -> void;

diff --git a/src/BufferedMsg.cpp b/src/BufferedMsg.cpp
@@ -6,37 +6,41 @@
 namespace fabomatic
 {
 
-  auto Buffer::push_back(const std::string &message, const std::string &topic, bool wait) -> void
+  auto Buffer::push_back(const BufferedMsg &message) -> void
   {
     if constexpr (conf::debug::ENABLE_BUFFERING)
     {
-      BufferedMsg msg{message, topic, wait};
-      msg_queue.push_back(msg);
+      msg_queue.push_back(message);
       if (msg_queue.size() > MAX_MESSAGES)
       {
         msg_queue.pop_front();
         ESP_LOGW(TAG, "Removing first message from the buffer");
       }
       has_changed = true;
 
-      ESP_LOGI(TAG, "Buffered %s on %s, %u messages queued", message.c_str(), topic.c_str(), msg_queue.size());
+      ESP_LOGI(TAG, "Buffered %s on %s, %lu messages queued",
+               message.mqtt_message.c_str(),
+               message.mqtt_topic.c_str(),
+               msg_queue.size());
     }
   }
 
-  auto Buffer::push_front(const std::string &message, const std::string &topic, bool wait) -> void
+  auto Buffer::push_front(const BufferedMsg &message) -> void
   {
     if constexpr (conf::debug::ENABLE_BUFFERING)
     {
-      BufferedMsg msg{message, topic, wait};
-      msg_queue.push_front(msg);
+      msg_queue.push_front(message);
       if (msg_queue.size() > MAX_MESSAGES)
       {
         msg_queue.pop_back();
         ESP_LOGW(TAG, "Removing last message from the buffer");
       }
       has_changed = true;
 
-      ESP_LOGI(TAG, "Buffered %s on %s, %u messages queued", message.c_str(), topic.c_str(), msg_queue.size());
+      ESP_LOGI(TAG, "Buffered %s on %s, %lu messages queued",
+               message.mqtt_message.c_str(),
+               message.mqtt_topic.c_str(),
+               msg_queue.size());
     }
   }
 
@@ -89,9 +93,10 @@ namespace fabomatic
 
     for (const auto &elem : json_obj["messages"].as<JsonArray>())
     {
-      buff.push_back(elem["msg"].as<std::string>(),
-                     elem["tp"].as<std::string>(),
-                     elem["wait"].as<bool>());
+      const auto &msg = BufferedMsg{elem["msg"].as<std::string>(),
+                                    elem["tp"].as<std::string>(),
+                                    elem["wait"].as<bool>()};
+      buff.push_back(msg);
     }
 
     ESP_LOGD(TAG, "Buffer::fromJsonElement() : data loaded successfully");

diff --git a/src/FabBackend.cpp b/src/FabBackend.cpp
@@ -94,7 +94,8 @@ namespace fabomatic
     // Do not send twice if response did not arrive
     if (query.buffered() && !published)
     {
-      buffer.push_back(query.payload(), topic, query.waitForReply());
+      const auto &msg = BufferedMsg{query.payload(), topic, query.waitForReply()};
+      buffer.push_back(msg);
     }
 
     if (published)
@@ -440,7 +441,8 @@ namespace fabomatic
 
     if (query.buffered())
     {
-      buffer.push_back(query.payload(), topic, query.waitForReply());
+      const auto &msg = BufferedMsg{query.payload(), topic, query.waitForReply()};
+      buffer.push_back(msg);
     }
 
     return std::make_unique<RespT>(false);
@@ -489,7 +491,8 @@ namespace fabomatic
 
     if (query.buffered())
     {
-      buffer.push_back(query.payload(), topic, query.waitForReply());
+      const auto &msg = BufferedMsg{query.payload(), topic, query.waitForReply()};
+      buffer.push_back(msg);
     }
     return false;
   }
@@ -602,7 +605,8 @@ namespace fabomatic
           // If it has been published but not answered, do not try again
           if (result == PublishResult::PublishedWithoutAnswer)
           {
-            buffer.push_front(msg.mqtt_message, msg.mqtt_topic, msg.wait_for_answer);
+            const auto &bmsg = BufferedMsg{msg.mqtt_message, msg.mqtt_topic, msg.wait_for_answer};
+            buffer.push_front(bmsg);
           }
           break;
         }
@@ -613,7 +617,8 @@ namespace fabomatic
         {
           // Will try again
           ESP_LOGW(TAG, "Retransmitting buffered message failed!");
-          buffer.push_front(msg.mqtt_message, msg.mqtt_topic, msg.wait_for_answer);
+          const auto &bmsg = BufferedMsg{msg.mqtt_message, msg.mqtt_topic, msg.wait_for_answer};
+          buffer.push_front(bmsg);
           break;
         }
       }

diff --git a/test/test_savedconfig/test_savedconfig.cpp b/test/test_savedconfig/test_savedconfig.cpp
@@ -238,7 +238,8 @@ namespace fabomatic::tests
     for (const auto &msg : messages)
     {
       TEST_ASSERT_EQUAL_MESSAGE(msg_count, buff.count(), "Push_back: Buffer count is correct");
-      buff.push_front(msg.mqtt_message, msg.mqtt_topic, msg.wait_for_answer);
+      const auto &bmsg = BufferedMsg{msg.mqtt_message, msg.mqtt_topic, msg.wait_for_answer};
+      buff.push_front(bmsg);
       msg_count++;
     }
 
@@ -265,7 +266,8 @@ namespace fabomatic::tests
     for (const auto &msg : messages)
     {
       TEST_ASSERT_EQUAL_MESSAGE(msg_count, buff.count(), "(1) Push_front: Buffer count is correct");
-      buff.push_back(msg.mqtt_message, msg.mqtt_topic, msg.wait_for_answer);
+      const auto &bmsg = BufferedMsg{msg.mqtt_message, msg.mqtt_topic, msg.wait_for_answer};
+      buff.push_back(bmsg);
       msg_count++;
     }
 
@@ -293,7 +295,8 @@ namespace fabomatic::tests
     for (const auto &msg : messages)
     {
       TEST_ASSERT_EQUAL_MESSAGE(msg_count, buff.count(), "(2) Push_front: Buffer count is correct");
-      buff.push_back(msg.mqtt_message, msg.mqtt_topic, msg.wait_for_answer);
+      const auto &bmsg = BufferedMsg{msg.mqtt_message, msg.mqtt_topic, msg.wait_for_answer};
+      buff.push_back(bmsg);
       msg_count++;
     }
 

diff --git a/test/test_tasks/test_tasks.cpp b/test/test_tasks/test_tasks.cpp
@@ -7,6 +7,7 @@
 #include <unity.h>
 #include "Tasks.hpp"
 #include "Logging.hpp"
+#include "Espressif.hpp"
 
 using namespace std::chrono_literals;
 
@@ -128,6 +129,17 @@ namespace fabomatic::tests
     execute();
     TEST_ASSERT_EQUAL_MESSAGE(NB_TASKS, task_counter, "Restarted tasks did not run immediately");
   }
+
+  void test_esp32()
+  {
+    auto result = fabomatic::esp32::esp_serial();
+    TEST_ASSERT_GREATER_OR_EQUAL_UINT32_MESSAGE(0, result.length(), "ESP32 serial must be non empty");
+    auto mem_free = fabomatic::esp32::getFreeHeap();
+    TEST_ASSERT_GREATER_OR_EQUAL_UINT32_MESSAGE(0, mem_free, "ESP32 mem free must be > 0");
+    fabomatic::esp32::showHeapStats();
+    TEST_ASSERT_TRUE_MESSAGE(fabomatic::esp32::setupWatchdog(30s), "Watchdog setup");
+    fabomatic::esp32::removeWatchdog();
+  }
 } // namespace fabomatic::tests
 
 void setup()
@@ -137,6 +149,7 @@ void setup()
   UNITY_BEGIN();
   RUN_TEST(fabomatic::tests::test_execute_runs_all_tasks);
   RUN_TEST(fabomatic::tests::test_stop_start_tasks);
+  RUN_TEST(fabomatic::tests::test_esp32);
   UNITY_END(); // stop unit testing
 }