refactor esp32 cam

Author: eloquentarduino

examples/CameraWebServerExample/CameraWebServerExample.ino

@@ -1,28 +1,34 @@
 #include "eloquent.h"
 #include "eloquent/networking/wifi.h"
 #include "eloquent/vision/camera/esp32/webserver.h"
-// replace according to your own camera
-#include "eloquent/vision/camera/esp32/m5wide/jpeg/qqvga.h"
+
+// replace 'm5wide' with your own model
+// possible values are 'aithinker', 'eye', 'm5stack', 'm5wide', 'wrover'
+#include "eloquent/vision/camera/m5wide.h"
 
 
 
 void setup() {
     Serial.begin(115200);
+    delay(2000);
+
+    camera.jpeg();
+    // replace with desired resolution
+    // possible values are qqvga, qvga, vga
+    camera.qqvga();
 
+    // replace with your WiFi credentials
     while (!wifi.connectTo("Abc", "12345678"))
         Serial.println("Cannot connect to WiFi");
 
     while (!camera.begin())
         Serial.println("Cannot connect to camera");
 
-    Serial.println("WiFi connected");
-    Serial.println("Camera connected");
-
     webServer.start();
     Serial.print("Camera web server started at http://");
     Serial.println(WiFi.localIP());
 }
 
 void loop() {
-
+    // do nothing
 }

src/eloquent/math.h

@@ -197,5 +197,18 @@ namespace eloquent {
         float mapConstrain(float x, float l, float h, float m, float M) {
             return eloquent::math::map(eloquent::math::constrainRange(x, l, h), l, h, m, M);
         }
+
+        /**
+         * Convert byte to hex string
+         * @param b
+         * @param str
+         */
+        void byteToHex(uint8_t b, char *str) {
+            const char alphabet[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+
+            str[0] = alphabet[b >> 4];
+            str[1] = alphabet[b & 0b1111];
+            str[2] = '\0';
+        }
     }
 }

src/eloquent/print.h

@@ -12,39 +12,45 @@ namespace eloquent {
 
         /**
          *
-         * @tparam Stream
+         * @tparam Printer
          * @param stream
          * @param fmt
          * @param ...
          */
-         template<typename Stream>
-        void printf(Stream &stream, char *fmt, ...) {
-            char buf[128];
+         template<class Printer>
+        void printf(Printer &printer, char *fmt, ...) {
+            char buf[256];
 
             va_list args;
             va_start (args, fmt );
-            vsnprintf(buf, 128, fmt, args);
+            vsnprintf(buf, 256, fmt, args);
             va_end (args);
-            stream.print(buf);
+            printer.print(buf);
         }
 
         /**
-         *
-         * @tparam Stream
-         * @tparam bufferSize
-         * @param stream
-         * @param fmt
-         * @param ...
+         * Stop condition for print_all
+         * @tparam Printer
+         * @param printer
          */
-        template<typename Stream, size_t bufferSize>
-        void printf(Stream &stream, char *fmt, ...) {
-            char buf[bufferSize];
+        template<class Printer>
+        void print_all(Printer& printer) {
 
-            va_list args;
-            va_start (args, fmt );
-            vsnprintf(buf, bufferSize, fmt, args);
-            va_end (args);
-            stream.print(buf);
+        }
+
+        /**
+         * Print all arguments
+         * @tparam Printer
+         * @tparam T
+         * @tparam Args
+         * @param stream
+         * @param first
+         * @param args
+         */
+        template<class Printer, typename T, typename... Args>
+        void print_all(Printer& printer, T first, Args... args) {
+            printer.print(first);
+            print_all(printer, args...);
         }
     }
 }

src/eloquent/tinyml/voting/quorum.h

@@ -19,7 +19,7 @@ namespace Eloquent {
                 /**
                  * Constructor
                  */
-                Quorum() {
+                Quorum() : _vote(-1) {
                     clear();
                     atLeastMajority();
                 }
@@ -65,17 +65,26 @@ namespace Eloquent {
                             quorum -= 1;
 
                             if (quorum == 0)
-                                return vote;
+                                return (_vote = vote);
                         }
                     }
 
-                    return -1;
+                    return (_vote = -1);
+                }
+
+                /**
+                 * Test if last vote was stable
+                 * @return
+                 */
+                bool isStable() {
+                    return _vote >= 0;
                 }
 
             protected:
                 int8_t _votes[votes];
                 uint16_t _i;
                 uint16_t _quorum;
+                int8_t _vote;
             };
         }
     }

src/eloquent/vision/.DS_Store

@@ -0,0 +1,25 @@
+//
+// Created by Simone on 06/07/2022.
+//
+
+#pragma once
+
+#define PWDN_GPIO_NUM     32
+#define RESET_GPIO_NUM    -1
+#define XCLK_GPIO_NUM      0
+#define SIOD_GPIO_NUM     26
+#define SIOC_GPIO_NUM     27
+
+#define Y9_GPIO_NUM       35
+#define Y8_GPIO_NUM       34
+#define Y7_GPIO_NUM       39
+#define Y6_GPIO_NUM       36
+#define Y5_GPIO_NUM       21
+#define Y4_GPIO_NUM       19
+#define Y3_GPIO_NUM       18
+#define Y2_GPIO_NUM        5
+#define VSYNC_GPIO_NUM    25
+#define HREF_GPIO_NUM     23
+#define PCLK_GPIO_NUM     22
+
+#include "./esp32.h"

src/eloquent/vision/camera/.DS_Store

@@ -0,0 +1,7 @@
+//
+// Created by Simone on 06/07/2022.
+//
+
+#pragma once
+
+#include "./decoders/gray.h"