add push picture

Author: mandl

.gitignore

@@ -1,7 +1,9 @@
 myconfig.h
+myconfig2.h
 .pioenvs
 .piolibdeps
 .clang_complete
 .gcc-flags.json
 .pio
-.vscode
+.vscode
+/logs

app_httpd.cpp

@@ -148,7 +148,7 @@ void serialDump() {
     int McuTf = temprature_sens_read(); // fahrenheit
     Serial.printf("System up: %" PRId64 ":%02i:%02i:%02i (d:h:m:s)\r\n", upDays, upHours, upMin, upSec);
     Serial.printf("Active streams: %i, Previous streams: %lu, Images captured: %lu\r\n", streamCount, streamsServed, imagesServed);
-    Serial.printf("CPU Freq: %i MHz, Xclk Freq: %i MHz\r\n", ESP.getCpuFreqMHz(), xclk);
+    Serial.printf("CPU Freq: %i MHz, Xclk Freq: %lu MHz\r\n", ESP.getCpuFreqMHz(), xclk);
     Serial.printf("MCU temperature : %i C, %i F  (approximate)\r\n", McuTc, McuTf);
     Serial.printf("Heap: %i, free: %i, min free: %i, max block: %i\r\n", ESP.getHeapSize(), ESP.getFreeHeap(), ESP.getMinFreeHeap(), ESP.getMaxAllocHeap());
     if(psramFound()) {
@@ -449,7 +449,7 @@ static esp_err_t status_handler(httpd_req_t *req){
         p+=sprintf(p, "\"min_frame_time\":%d,", minFrameTime);
         p+=sprintf(p, "\"framesize\":%u,", s->status.framesize);
         p+=sprintf(p, "\"quality\":%u,", s->status.quality);
-        p+=sprintf(p, "\"xclk\":%u,", xclk);
+        p+=sprintf(p, "\"xclk\":%lu,", xclk);
         p+=sprintf(p, "\"brightness\":%d,", s->status.brightness);
         p+=sprintf(p, "\"contrast\":%d,", s->status.contrast);
         p+=sprintf(p, "\"saturation\":%d,", s->status.saturation);
@@ -598,7 +598,7 @@ static esp_err_t dump_handler(httpd_req_t *req){
 
     d+= sprintf(d,"Up: %" PRId64 ":%02i:%02i:%02i (d:h:m:s)<br>\n", upDays, upHours, upMin, upSec);
     d+= sprintf(d,"Active streams: %i, Previous streams: %lu, Images captured: %lu<br>\n", streamCount, streamsServed, imagesServed);
-    d+= sprintf(d,"CPU Freq: %i MHz, Xclk Freq: %i MHz<br>\n", ESP.getCpuFreqMHz(), xclk);
+    d+= sprintf(d,"CPU Freq: %i MHz, Xclk Freq: %lu MHz<br>\n", ESP.getCpuFreqMHz(), xclk);
     d+= sprintf(d,"<span title=\"NOTE: Internal temperature sensor readings can be innacurate on the ESP32-c1 chipset, and may vary significantly between devices!\">");
     d+= sprintf(d,"MCU temperature : %i &deg;C, %i &deg;F</span>\n<br>", McuTc, McuTf);
     d+= sprintf(d,"Heap: %i, free: %i, min free: %i, max block: %i<br>\n", ESP.getHeapSize(), ESP.getFreeHeap(), ESP.getMinFreeHeap(), ESP.getMaxAllocHeap());

camsend.cpp

@@ -0,0 +1,93 @@
+#include <HTTPClient.h>
+#include "cert.h"
+#include "myconfig2.h"
+#include <esp_camera.h>
+
+
+// Functions from the main .ino
+extern void flashLED(int flashtime);
+extern void setLamp(int newVal);
+
+extern int lampVal;
+extern bool autoLamp;
+extern bool debugData;
+
+/*
+
+    send weather data to villa using https
+
+*/
+esp_err_t SendPictureHttp()
+{
+
+    camera_fb_t *fb = NULL;
+    esp_err_t res = ESP_OK;
+
+    Serial.print("SendPictureHttp ");
+    Serial.println(PICTURE);
+    if (autoLamp && (lampVal != -1))
+    {
+        setLamp(lampVal);
+        delay(75); // coupled with the status led flash this gives ~150ms for lamp to settle.
+    }
+    flashLED(75); // little flash of status LED
+
+    int64_t fr_start = esp_timer_get_time();
+
+    fb = esp_camera_fb_get();
+    if (!fb)
+    {
+        Serial.println("CAPTURE: failed to acquire frame");
+        if (autoLamp && (lampVal != -1))
+            setLamp(0);
+        esp_camera_return_all();
+        return ESP_FAIL;
+    }
+
+    size_t fb_len = 0;
+    if (fb->format == PIXFORMAT_JPEG)
+    {
+        fb_len = fb->len;
+        HTTPClient http;
+        
+        http.begin(CAMSERVER, root_ca); // Specify the URL and certificate
+        http.addHeader("Content-Type", "image/jpeg");
+        http.addHeader("Content-Length", String(fb_len));
+        http.addHeader("Filename", PICTURE);
+
+        int httpCode = http.POST(fb->buf, fb->len);
+
+        if (httpCode > 0)
+        { // Check for the returning code
+
+            String payload = http.getString();
+            Serial.println(httpCode);
+        }
+        else
+        {
+            Serial.println("Error on HTTP request " + String(httpCode));
+            res = ESP_FAIL;
+        }
+        http.end(); // Free the resources
+    }
+    else
+    {
+        res = ESP_FAIL;
+        Serial.println("Capture Error: Non-JPEG image returned by camera module");
+    }
+    esp_camera_fb_return(fb);
+    fb = NULL;
+
+    int64_t fr_end = esp_timer_get_time();
+    if (debugData)
+    {
+        Serial.printf("JPG: %uB %ums\r\n", (uint32_t)(fb_len), (uint32_t)((fr_end - fr_start) / 1000));
+    }
+
+    if (autoLamp && (lampVal != -1))
+    {
+        setLamp(0);
+    }
+
+    return res;
+}

cert.h

@@ -0,0 +1,38 @@
+#ifndef __CERTLETS__
+#define __CERTLETS__
+
+// lets encrypt R3
+const char *root_ca =
+    "-----BEGIN CERTIFICATE-----\n"
+    "MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw\n"
+    "TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh\n"
+    "cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw\n"
+    "WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg\n"
+    "RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK\n"
+    "AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP\n"
+    "R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx\n"
+    "sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm\n"
+    "NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg\n"
+    "Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG\n"
+    "/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC\n"
+    "AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB\n"
+    "Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA\n"
+    "FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw\n"
+    "AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw\n"
+    "Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB\n"
+    "gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W\n"
+    "PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl\n"
+    "ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz\n"
+    "CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm\n"
+    "lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4\n"
+    "avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2\n"
+    "yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O\n"
+    "yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids\n"
+    "hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+\n"
+    "HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv\n"
+    "MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX\n"
+    "nLRbwHOoq7hHwg==\n"
+    "-----END CERTIFICATE-----\n";
+
+
+#endif