logger: setLogger

Author: yoursunny

examples/AsyncCam/AsyncCam.ino

@@ -13,6 +13,7 @@ void
 setup() {
   Serial.begin(115200);
   Serial.println();
+  esp32cam::setLogger(Serial);
   delay(1000);
 
   WiFi.persistent(false);
@@ -56,7 +57,7 @@ setup() {
 
 void
 loop() {
-  // esp32cam-asyncweb.h depends on FreeRTOS task API including vTaskDelete, so you must have a
+  // esp32cam/asyncweb.hpp depends on FreeRTOS task API including vTaskDelete, so you must have a
   // non-zero delay in the loop() function; otherwise, FreeRTOS kernel memory cannot be freed
   // properly and the system would run out of memory.
   delay(1);

examples/AsyncCam/handlers.cpp

@@ -91,7 +91,7 @@ addRequestHandlers() {
   });
 
   server.on("/robots.txt", HTTP_GET, [](AsyncWebServerRequest* request) {
-    request->send(200, "text/html", "User-Agent: *\nDisallow: /\n");
+    request->send(200, "text/plain", "User-Agent: *\nDisallow: /\n");
   });
 
   server.on("/change-resolution.cgi", HTTP_POST, [](AsyncWebServerRequest* request) {

src/esp32cam.h

@@ -9,6 +9,7 @@
 
 #include "esp32cam/asyncweb.hpp"
 #include "esp32cam/camera.hpp"
+#include "esp32cam/logger.hpp"
 
 namespace esp32cam {
 

src/esp32cam/asyncweb.cpp

@@ -1,10 +1,12 @@
 #if __has_include(<ESPAsyncWebServer.h>)
 
 #include "asyncweb.hpp"
+#include "logger.hpp"
 #include <freertos/FreeRTOS.h>
 #include <freertos/idf_additions.h>
 
-#define MJPEG_LOG(fmt, ...) Serial.printf("MjpegResponse(%p) " fmt "\n", this, ##__VA_ARGS__)
+#define STILL_LOG(fmt, ...) ESP32CAM_LOG("StillResponse(%p) " fmt, this, ##__VA_ARGS__)
+#define MJPEG_LOG(fmt, ...) ESP32CAM_LOG("MjpegResponse(%p) " fmt, this, ##__VA_ARGS__)
 
 namespace esp32cam {
 namespace detail {
@@ -79,6 +81,7 @@ namespace asyncweb {
 
 StillResponse::StillResponse()
   : m_task(1) {
+  STILL_LOG("created");
   if (!m_task) {
     _code = 500;
     return;
@@ -90,15 +93,21 @@ StillResponse::StillResponse()
   m_task.request();
 }
 
+StillResponse::~StillResponse() {
+  STILL_LOG("deleted");
+}
+
 size_t
 StillResponse::_fillBuffer(uint8_t* buf, size_t buflen) {
   if (!m_frame) {
     if (m_frame = m_task.retrieve(); !m_frame) {
       return RESPONSE_TRY_AGAIN;
     }
+    STILL_LOG("frame has %zu octets", m_frame->size());
   }
 
   if (m_index >= m_frame->size()) {
+    STILL_LOG("sent to client");
     return 0;
   }
 

src/esp32cam/asyncweb.hpp

@@ -52,6 +52,8 @@ class StillResponse : public AsyncAbstractResponse {
 public:
   explicit StillResponse();
 
+  ~StillResponse() override;
+
   bool _sourceValid() const override {
     return true;
   }

src/esp32cam/camera.cpp

@@ -5,6 +5,7 @@
 
 namespace esp32cam {
 
+Print* LogOutput = nullptr;
 CameraClass Camera;
 
 bool

src/esp32cam/logger.hpp

@@ -0,0 +1,28 @@
+#ifndef ESP32CAM_LOGGER_HPP
+#define ESP32CAM_LOGGER_HPP
+
+#include <Print.h>
+
+namespace esp32cam {
+
+extern Print* LogOutput;
+
+/**
+ * @brief Set logger output.
+ * @param output Output printer, such as @c Serial .
+ */
+inline void
+setLogger(Print& output) {
+  LogOutput = &output;
+}
+
+#define ESP32CAM_LOG(fmt, ...)                                                                     \
+  do {                                                                                             \
+    if (LogOutput != nullptr) {                                                                    \
+      LogOutput->printf("[%8lu] " fmt "\n", millis(), ##__VA_ARGS__);                              \
+    }                                                                                              \
+  } while (false)
+
+} // namespace esp32cam
+
+#endif // ESP32CAM_LOGGER_HPP