mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-09 21:17:06 +03:00
* Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * fix frozen time in datafile on error (#1534) Co-authored-by: CaCO3 <caco@ruinelli.ch> * log NTP server name (#1497) * log NTP server name * . * . * replace calls to /wasserzaehler.html with calls to /value (#1469) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix cookie usage, use correct http response codes, add 404 page (#1495) * replaced some HTTP response code with better matching codes * add custom 404 page, add log entry for debugging * fix cookie * replace non-necessary whitespace * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Don't autofail if NTP server can't be reached during initalization (#1498) This fixes an issue with a restricted network without internet access, where the hardcoded ntp server can't be reached and thus the esp resets, as it's not able to finish initalization. * Update Changelog.md * Update Changelog.md for release * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * only use sntp_getservername() after init sntp * set default NTP server on dnew installations Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> * Renamed variables and added debug log (#1537) * add debug logs * renamed variables * renamed TAGs, added flow status logging * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * replaced printf usage in LogFile.WriteToFile() * ENABLE_MQTT c++ macro definition (#1546) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition (#1547) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition * Update Changelog.md * Update Changelog.md * Rearange task to CPU (http, camera, mqtt) (#1557) * Streamlined MQTT interlock when not activated & interlock MQTT when WIFI is not connected (#1556) * streamlined mqtt interlock when disabled * Disconnect mqtt client before reboot * Interlock MQTT with WIFI * Update * loglevel to DEBUG * Update * mqtt msg id incremental * new ENABLE_MQTT includes * Loglevel to DEBUG * Loglevel * Update interface_mqtt.cpp * show uptime on overview page, moved labels from firmware to Web UI (#1543) * show uptime on overview page, moved labels from firmware to Web UI * show uptime on info page * also use formated time in log Co-authored-by: CaCO3 <caco@ruinelli.ch> * Continue boot on bad PSRAM (#1558) * add sensor status, show special index/setup page in case of a critical error * continue booting on PSRAM error * Update main.cpp added log messages * init PSRAM and add more log messages * cleanup of init checks * . * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * add sensor status, show special index/setup page in case of a critical error (#1560) * add sensor status, show special index/setup page in case of a critical error * Added Reboot * . * added more buttons Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * Update Webinstaller to v13.0.7 * remove html-from-11.3.1 in release (#1565) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 * only initial_esp32_setup and update.zip as artefacts * remove unneeded cache * rename step ota-v2 to ota * rename ota-v2 to ota Co-authored-by: github-actions <github-actions@github.com> * make the sidebar on the overviw page wider and show the round counter (#1570) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Create reply-bot.yml * Update ClassFlowPostProcessing.cpp * Add bot (#1581) * Update reply-bot.yml * Create label-commenter-config.yml * added missing html change * extended instructions (#1583) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix Rate Problem * removed redundant "Status:" * Bugfix Double Extract ZIP-Files * Update FeatureRequest.md (#1591) in case of position change between the measurments set this state to true, if there is no change set it back to false. In a defined time window this movement can lead into an alarm state / water leak.. haveing this state in the mqtt broker can trigger functions like closing the ater pipe walve and so on... * Update manifest.json * Delete .gitignore * Delete .gitmodules * Delete firmware.bin * Add files via upload * Block REST API calls till resource is ready (#1609) * Block REST API call till ressource is ready * Update * Update * Update * replace relative include of gethost.js with absolute one. This is needed as that file gets incuded on dynamically generated content which can be on different path levels (#1610) Co-authored-by: CaCO3 <caco@ruinelli.ch> * esp_spiram.h has been replaced by esp32/spiram.h (#1605) * esp_spiram.h has been replaced by esp32/spiram.h * Preparations for next Bugfix Release (#1615) * Merge branch 'rolling' (#1559) * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * fix frozen time in datafile on error (#1534) Co-authored-by: CaCO3 <caco@ruinelli.ch> * log NTP server name (#1497) * log NTP server name * . * . * replace calls to /wasserzaehler.html with calls to /value (#1469) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix cookie usage, use correct http response codes, add 404 page (#1495) * replaced some HTTP response code with better matching codes * add custom 404 page, add log entry for debugging * fix cookie * replace non-necessary whitespace * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Don't autofail if NTP server can't be reached during initalization (#1498) This fixes an issue with a restricted network without internet access, where the hardcoded ntp server can't be reached and thus the esp resets, as it's not able to finish initalization. * Update Changelog.md * Update Changelog.md for release * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * only use sntp_getservername() after init sntp * set default NTP server on dnew installations Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> * Renamed variables and added debug log (#1537) * add debug logs * renamed variables * renamed TAGs, added flow status logging * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * replaced printf usage in LogFile.WriteToFile() * ENABLE_MQTT c++ macro definition (#1546) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition (#1547) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition * Update Changelog.md Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com> * Update Changelog.md for release Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com> * new model version (#1619) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 * only initial_esp32_setup and update.zip as artefacts * remove unneeded cache * rename step ota-v2 to ota * rename ota-v2 to ota * new models - ana-class100 v1.5.4 - ana-cont-11.0.4 - dig-class100 v1.5.0 Co-authored-by: github-actions <github-actions@github.com> * Update Changelog.md (#1630) * Correct RenameNumber * Update Changelog.md * Fix reloading of data file (#1635) * Update data.html * fixed * show link to graph Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com> Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> Co-authored-by: smartboart <38385805+smartboart@users.noreply.github.com>
709 lines
19 KiB
C++
709 lines
19 KiB
C++
#include "ClassControllCamera.h"
|
|
#include "ClassLogFile.h"
|
|
|
|
#include <stdio.h>
|
|
#include "driver/gpio.h"
|
|
#include "esp_timer.h"
|
|
#include "esp_log.h"
|
|
|
|
#include "Helper.h"
|
|
#include "CImageBasis.h"
|
|
|
|
#include "server_ota.h"
|
|
#include "server_GPIO.h"
|
|
|
|
|
|
#define BOARD_ESP32CAM_AITHINKER
|
|
|
|
|
|
#include <esp_event.h>
|
|
#include <esp_log.h>
|
|
#include <esp_system.h>
|
|
#include <nvs_flash.h>
|
|
#include <sys/param.h>
|
|
#include <string.h>
|
|
|
|
#include "freertos/FreeRTOS.h"
|
|
#include "freertos/task.h"
|
|
|
|
#include "esp_camera.h"
|
|
|
|
// #define DEBUG_DETAIL_ON
|
|
|
|
#define USE_PWM_LEDFLASH
|
|
|
|
#ifdef USE_PWM_LEDFLASH
|
|
|
|
//// PWM für Flash-LED
|
|
#define LEDC_TIMER LEDC_TIMER_1 // LEDC_TIMER_0
|
|
#define LEDC_MODE LEDC_LOW_SPEED_MODE
|
|
#define LEDC_OUTPUT_IO (4) // Define the output GPIO
|
|
#define LEDC_CHANNEL LEDC_CHANNEL_1
|
|
#define LEDC_DUTY_RES LEDC_TIMER_13_BIT // Set duty resolution to 13 bits
|
|
//#define LEDC_DUTY (195) // Set duty to 50%. ((2 ** 13) - 1) * 50% = 4095
|
|
#define LEDC_FREQUENCY (5000) // Frequency in Hertz. Set frequency at 5 kHz
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// ESP32Cam (AiThinker) PIN Map
|
|
|
|
#define CAM_PIN_PWDN 32
|
|
#define CAM_PIN_RESET -1 //software reset will be performed
|
|
#define CAM_PIN_XCLK 0
|
|
#define CAM_PIN_SIOD 26
|
|
#define CAM_PIN_SIOC 27
|
|
|
|
#define CAM_PIN_D7 35
|
|
#define CAM_PIN_D6 34
|
|
#define CAM_PIN_D5 39
|
|
#define CAM_PIN_D4 36
|
|
#define CAM_PIN_D3 21
|
|
#define CAM_PIN_D2 19
|
|
#define CAM_PIN_D1 18
|
|
#define CAM_PIN_D0 5
|
|
#define CAM_PIN_VSYNC 25
|
|
#define CAM_PIN_HREF 23
|
|
#define CAM_PIN_PCLK 22
|
|
|
|
|
|
static const char *TAG = "CAM";
|
|
|
|
static camera_config_t camera_config = {
|
|
.pin_pwdn = CAM_PIN_PWDN,
|
|
.pin_reset = CAM_PIN_RESET,
|
|
.pin_xclk = CAM_PIN_XCLK,
|
|
.pin_sscb_sda = CAM_PIN_SIOD,
|
|
.pin_sscb_scl = CAM_PIN_SIOC,
|
|
|
|
.pin_d7 = CAM_PIN_D7,
|
|
.pin_d6 = CAM_PIN_D6,
|
|
.pin_d5 = CAM_PIN_D5,
|
|
.pin_d4 = CAM_PIN_D4,
|
|
.pin_d3 = CAM_PIN_D3,
|
|
.pin_d2 = CAM_PIN_D2,
|
|
.pin_d1 = CAM_PIN_D1,
|
|
.pin_d0 = CAM_PIN_D0,
|
|
.pin_vsync = CAM_PIN_VSYNC,
|
|
.pin_href = CAM_PIN_HREF,
|
|
.pin_pclk = CAM_PIN_PCLK,
|
|
|
|
//XCLK 20MHz or 10MHz for OV2640 double FPS (Experimental)
|
|
.xclk_freq_hz = 20000000, // Orginalwert
|
|
// .xclk_freq_hz = 5000000, // Test, um die Bildfehler los zu werden !!!! Hängt in Version 9.2 !!!!
|
|
.ledc_timer = LEDC_TIMER_0,
|
|
.ledc_channel = LEDC_CHANNEL_0,
|
|
|
|
.pixel_format = PIXFORMAT_JPEG, //YUV422,GRAYSCALE,RGB565,JPEG
|
|
.frame_size = FRAMESIZE_VGA, //QQVGA-UXGA Do not use sizes above QVGA when not JPEG
|
|
// .frame_size = FRAMESIZE_UXGA, //QQVGA-UXGA Do not use sizes above QVGA when not JPEG
|
|
.jpeg_quality = 12, //0-63 lower number means higher quality
|
|
.fb_count = 1, //if more than one, i2s runs in continuous mode. Use only with JPEG
|
|
.fb_location = CAMERA_FB_IN_PSRAM, /*!< The location where the frame buffer will be allocated */
|
|
// .grab_mode = CAMERA_GRAB_WHEN_EMPTY,
|
|
.grab_mode = CAMERA_GRAB_LATEST, // erst ab neuer esp32cam-version
|
|
|
|
};
|
|
|
|
|
|
#include "driver/ledc.h"
|
|
|
|
CCamera Camera;
|
|
|
|
#define FLASH_GPIO GPIO_NUM_4
|
|
#define BLINK_GPIO GPIO_NUM_33
|
|
|
|
typedef struct {
|
|
httpd_req_t *req;
|
|
size_t len;
|
|
} jpg_chunking_t;
|
|
|
|
|
|
void CCamera::ledc_init(void)
|
|
{
|
|
#ifdef USE_PWM_LEDFLASH
|
|
|
|
// Prepare and then apply the LEDC PWM timer configuration
|
|
ledc_timer_config_t ledc_timer = { };
|
|
|
|
ledc_timer.speed_mode = LEDC_MODE;
|
|
ledc_timer.timer_num = LEDC_TIMER;
|
|
ledc_timer.duty_resolution = LEDC_DUTY_RES;
|
|
ledc_timer.freq_hz = LEDC_FREQUENCY; // Set output frequency at 5 kHz
|
|
ledc_timer.clk_cfg = LEDC_AUTO_CLK;
|
|
|
|
ESP_ERROR_CHECK(ledc_timer_config(&ledc_timer));
|
|
|
|
// Prepare and then apply the LEDC PWM channel configuration
|
|
ledc_channel_config_t ledc_channel = { };
|
|
|
|
ledc_channel.speed_mode = LEDC_MODE;
|
|
ledc_channel.channel = LEDC_CHANNEL;
|
|
ledc_channel.timer_sel = LEDC_TIMER;
|
|
ledc_channel.intr_type = LEDC_INTR_DISABLE;
|
|
ledc_channel.gpio_num = LEDC_OUTPUT_IO;
|
|
ledc_channel.duty = 0; // Set duty to 0%
|
|
ledc_channel.hpoint = 0;
|
|
|
|
ESP_ERROR_CHECK(ledc_channel_config(&ledc_channel));
|
|
|
|
#endif
|
|
}
|
|
|
|
|
|
static size_t jpg_encode_stream(void * arg, size_t index, const void* data, size_t len){
|
|
jpg_chunking_t *j = (jpg_chunking_t *)arg;
|
|
if(!index){
|
|
j->len = 0;
|
|
}
|
|
if(httpd_resp_send_chunk(j->req, (const char *)data, len) != ESP_OK){
|
|
return 0;
|
|
}
|
|
j->len += len;
|
|
return len;
|
|
}
|
|
|
|
|
|
bool CCamera::SetBrightnessContrastSaturation(int _brightness, int _contrast, int _saturation)
|
|
{
|
|
bool result = false;
|
|
sensor_t * s = esp_camera_sensor_get();
|
|
if (_brightness > -100)
|
|
_brightness = min(2, max(-2, _brightness));
|
|
if (_contrast > -100)
|
|
_contrast = min(2, max(-2, _contrast));
|
|
if (_saturation > -100)
|
|
_saturation = min(2, max(-2, _saturation));
|
|
|
|
if (_saturation > -100)
|
|
s->set_saturation(s, _saturation);
|
|
if (_contrast > -100)
|
|
s->set_contrast(s, _contrast);
|
|
if (_brightness > -100)
|
|
s->set_brightness(s, _brightness);
|
|
|
|
if ((_brightness != brightness) && (_brightness > -100))
|
|
result = true;
|
|
if ((_contrast != contrast) && (_contrast > -100))
|
|
result = true;
|
|
if ((_saturation != saturation) && (_saturation > -100))
|
|
result = true;
|
|
|
|
if (_brightness > -100)
|
|
brightness = _brightness;
|
|
if (_contrast > -100)
|
|
contrast = _contrast;
|
|
if (_saturation > -100)
|
|
saturation = _saturation;
|
|
|
|
if (result && isFixedExposure)
|
|
EnableAutoExposure(waitbeforepicture_org);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
void CCamera::SetQualitySize(int qual, framesize_t resol)
|
|
{
|
|
sensor_t * s = esp_camera_sensor_get();
|
|
s->set_quality(s, qual);
|
|
s->set_framesize(s, resol);
|
|
ActualResolution = resol;
|
|
ActualQuality = qual;
|
|
|
|
if (resol == FRAMESIZE_QVGA)
|
|
{
|
|
image_height = 240;
|
|
image_width = 320;
|
|
}
|
|
if (resol == FRAMESIZE_VGA)
|
|
{
|
|
image_height = 480;
|
|
image_width = 640;
|
|
}
|
|
// No higher Mode than VGA, damit der Kameraspeicher ausreicht.
|
|
/*
|
|
if (resol == FRAMESIZE_SVGA)
|
|
{
|
|
image_height = 600;
|
|
image_width = 800;
|
|
}
|
|
if (resol == FRAMESIZE_XGA)
|
|
{
|
|
image_height = 768;
|
|
image_width = 1024;
|
|
}
|
|
if (resol == FRAMESIZE_SXGA)
|
|
{
|
|
image_height = 1024;
|
|
image_width = 1280;
|
|
}
|
|
if (resol == FRAMESIZE_UXGA)
|
|
{
|
|
image_height = 1200;
|
|
image_width = 1600;
|
|
}
|
|
*/
|
|
}
|
|
|
|
|
|
void CCamera::EnableAutoExposure(int flashdauer)
|
|
{
|
|
ESP_LOGD(TAG, "EnableAutoExposure");
|
|
LEDOnOff(true);
|
|
if (flashdauer > 0)
|
|
LightOnOff(true);
|
|
const TickType_t xDelay = flashdauer / portTICK_PERIOD_MS;
|
|
vTaskDelay( xDelay );
|
|
|
|
camera_fb_t * fb = esp_camera_fb_get();
|
|
esp_camera_fb_return(fb);
|
|
fb = esp_camera_fb_get();
|
|
if (!fb) {
|
|
ESP_LOGE(TAG, "Camera Capture Failed");
|
|
LEDOnOff(false);
|
|
LightOnOff(false);
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Capture Failed (Procedure 'EnableAutoExposure') --> Reboot! "
|
|
"Check that your camera module is working and connected properly.");
|
|
//doReboot();
|
|
}
|
|
esp_camera_fb_return(fb);
|
|
|
|
sensor_t * s = esp_camera_sensor_get();
|
|
s->set_gain_ctrl(s, 0);
|
|
s->set_exposure_ctrl(s, 0);
|
|
|
|
|
|
LEDOnOff(false);
|
|
LightOnOff(false);
|
|
isFixedExposure = true;
|
|
waitbeforepicture_org = flashdauer;
|
|
}
|
|
|
|
|
|
esp_err_t CCamera::CaptureToBasisImage(CImageBasis *_Image, int delay)
|
|
{
|
|
string ftype;
|
|
|
|
uint8_t *zwischenspeicher = NULL;
|
|
|
|
|
|
LEDOnOff(true);
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("CCamera::CaptureToBasisImage - Start");
|
|
#endif
|
|
|
|
if (delay > 0)
|
|
{
|
|
LightOnOff(true);
|
|
const TickType_t xDelay = delay / portTICK_PERIOD_MS;
|
|
vTaskDelay( xDelay );
|
|
}
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("CCamera::CaptureToBasisImage - After LightOn");
|
|
#endif
|
|
|
|
camera_fb_t * fb = esp_camera_fb_get();
|
|
esp_camera_fb_return(fb);
|
|
fb = esp_camera_fb_get();
|
|
if (!fb) {
|
|
ESP_LOGE(TAG, "CaptureToBasisImage: Capture Failed");
|
|
LEDOnOff(false);
|
|
LightOnOff(false);
|
|
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "is not working anymore (CCamera::CaptureToBasisImage) - most probably caused by a hardware problem (instablility, ...). "
|
|
"System will reboot.");
|
|
doReboot();
|
|
|
|
return ESP_FAIL;
|
|
}
|
|
|
|
int _size = fb->len;
|
|
zwischenspeicher = (uint8_t*) malloc(_size);
|
|
if (!zwischenspeicher)
|
|
{
|
|
ESP_LOGE(TAG, "Insufficient memory space for image in function CaptureToBasisImage()");
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Insufficient memory space for image in function CaptureToBasisImage()");
|
|
}
|
|
for (int i = 0; i < _size; ++i)
|
|
*(zwischenspeicher + i) = *(fb->buf + i);
|
|
esp_camera_fb_return(fb);
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("CCamera::CaptureToBasisImage - After fb_get");
|
|
#endif
|
|
|
|
LEDOnOff(false);
|
|
|
|
if (delay > 0)
|
|
LightOnOff(false);
|
|
|
|
// TickType_t xDelay = 1000 / portTICK_PERIOD_MS;
|
|
// vTaskDelay( xDelay ); // wait for power to recover
|
|
|
|
uint8_t * buf = NULL;
|
|
|
|
CImageBasis _zwImage;
|
|
_zwImage.LoadFromMemory(zwischenspeicher, _size);
|
|
free(zwischenspeicher);
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("CCamera::CaptureToBasisImage - After LoadFromMemory");
|
|
#endif
|
|
|
|
stbi_uc* p_target;
|
|
stbi_uc* p_source;
|
|
int channels = 3;
|
|
int width = image_width;
|
|
int height = image_height;
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
std::string _zw = "Targetimage: " + std::to_string((int) _Image->rgb_image) + " Size: " + std::to_string(_Image->width) + ", " + std::to_string(_Image->height);
|
|
_zw = _zw + " _zwImage: " + std::to_string((int) _zwImage.rgb_image) + " Size: " + std::to_string(_zwImage.width) + ", " + std::to_string(_zwImage.height);
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, _zw);
|
|
#endif
|
|
|
|
for (int x = 0; x < width; ++x)
|
|
for (int y = 0; y < height; ++y)
|
|
{
|
|
p_target = _Image->rgb_image + (channels * (y * width + x));
|
|
p_source = _zwImage.rgb_image + (channels * (y * width + x));
|
|
p_target[0] = p_source[0];
|
|
p_target[1] = p_source[1];
|
|
p_target[2] = p_source[2];
|
|
}
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("CCamera::CaptureToBasisImage - After Copy To Target");
|
|
#endif
|
|
|
|
free(buf);
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("CCamera::CaptureToBasisImage - Done");
|
|
#endif
|
|
|
|
return ESP_OK;
|
|
}
|
|
|
|
|
|
esp_err_t CCamera::CaptureToFile(std::string nm, int delay)
|
|
{
|
|
string ftype;
|
|
|
|
LEDOnOff(true); // Abgeschaltet, um Strom zu sparen !!!!!!
|
|
|
|
if (delay > 0)
|
|
{
|
|
LightOnOff(true);
|
|
const TickType_t xDelay = delay / portTICK_PERIOD_MS;
|
|
vTaskDelay( xDelay );
|
|
}
|
|
|
|
camera_fb_t * fb = esp_camera_fb_get();
|
|
esp_camera_fb_return(fb);
|
|
fb = esp_camera_fb_get();
|
|
if (!fb) {
|
|
ESP_LOGE(TAG, "CaptureToFile: Camera Capture Failed");
|
|
LEDOnOff(false);
|
|
LightOnOff(false);
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Capture Failed (CCamera::CaptureToFile) --> Reboot! "
|
|
"Check that your camera module is working and connected properly.");
|
|
//doReboot();
|
|
|
|
return ESP_FAIL;
|
|
}
|
|
LEDOnOff(false);
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
ESP_LOGD(TAG, "w %d, h %d, size %d", fb->width, fb->height, fb->len);
|
|
#endif
|
|
|
|
nm = FormatFileName(nm);
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
ESP_LOGD(TAG, "Save Camera to: %s", nm.c_str());
|
|
#endif
|
|
|
|
ftype = toUpper(getFileType(nm));
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
ESP_LOGD(TAG, "Filetype: %s", ftype.c_str());
|
|
#endif
|
|
|
|
uint8_t * buf = NULL;
|
|
size_t buf_len = 0;
|
|
bool converted = false;
|
|
|
|
if (ftype.compare("BMP") == 0)
|
|
{
|
|
frame2bmp(fb, &buf, &buf_len);
|
|
converted = true;
|
|
}
|
|
if (ftype.compare("JPG") == 0)
|
|
{
|
|
if(fb->format != PIXFORMAT_JPEG){
|
|
bool jpeg_converted = frame2jpg(fb, ActualQuality, &buf, &buf_len);
|
|
converted = true;
|
|
if(!jpeg_converted){
|
|
ESP_LOGE(TAG, "JPEG compression failed");
|
|
}
|
|
} else {
|
|
buf_len = fb->len;
|
|
buf = fb->buf;
|
|
}
|
|
}
|
|
|
|
FILE * fp = OpenFileAndWait(nm.c_str(), "wb");
|
|
if (fp == NULL) /* If an error occurs during the file creation */
|
|
{
|
|
fprintf(stderr, "fopen() failed for '%s'\n", nm.c_str());
|
|
}
|
|
else
|
|
{
|
|
fwrite(buf, sizeof(uint8_t), buf_len, fp);
|
|
fclose(fp);
|
|
}
|
|
if (converted)
|
|
free(buf);
|
|
|
|
esp_camera_fb_return(fb);
|
|
|
|
if (delay > 0)
|
|
{
|
|
LightOnOff(false);
|
|
}
|
|
|
|
return ESP_OK;
|
|
}
|
|
|
|
|
|
esp_err_t CCamera::CaptureToHTTP(httpd_req_t *req, int delay)
|
|
{
|
|
camera_fb_t * fb = NULL;
|
|
esp_err_t res = ESP_OK;
|
|
size_t fb_len = 0;
|
|
int64_t fr_start = esp_timer_get_time();
|
|
|
|
|
|
LEDOnOff(true);
|
|
|
|
if (delay > 0)
|
|
{
|
|
LightOnOff(true);
|
|
const TickType_t xDelay = delay / portTICK_PERIOD_MS;
|
|
vTaskDelay( xDelay );
|
|
}
|
|
|
|
|
|
fb = esp_camera_fb_get();
|
|
esp_camera_fb_return(fb);
|
|
fb = esp_camera_fb_get();
|
|
if (!fb) {
|
|
ESP_LOGE(TAG, "Camera capture failed");
|
|
LEDOnOff(false);
|
|
LightOnOff(false);
|
|
httpd_resp_send_500(req);
|
|
// doReboot();
|
|
|
|
return ESP_FAIL;
|
|
}
|
|
|
|
LEDOnOff(false);
|
|
|
|
res = httpd_resp_set_type(req, "image/jpeg");
|
|
if(res == ESP_OK){
|
|
res = httpd_resp_set_hdr(req, "Content-Disposition", "inline; filename=raw.jpg");
|
|
}
|
|
|
|
if(res == ESP_OK){
|
|
if(fb->format == PIXFORMAT_JPEG){
|
|
fb_len = fb->len;
|
|
res = httpd_resp_send(req, (const char *)fb->buf, fb->len);
|
|
} else {
|
|
jpg_chunking_t jchunk = {req, 0};
|
|
res = frame2jpg_cb(fb, 80, jpg_encode_stream, &jchunk)?ESP_OK:ESP_FAIL;
|
|
httpd_resp_send_chunk(req, NULL, 0);
|
|
fb_len = jchunk.len;
|
|
}
|
|
}
|
|
esp_camera_fb_return(fb);
|
|
int64_t fr_end = esp_timer_get_time();
|
|
|
|
ESP_LOGI(TAG, "JPG: %uKB %ums", (uint32_t)(fb_len/1024), (uint32_t)((fr_end - fr_start)/1000));
|
|
|
|
if (delay > 0)
|
|
{
|
|
LightOnOff(false);
|
|
}
|
|
|
|
return res;
|
|
}
|
|
|
|
|
|
void CCamera::LightOnOff(bool status)
|
|
{
|
|
GpioHandler* gpioHandler = gpio_handler_get();
|
|
if ((gpioHandler != NULL) && (gpioHandler->isEnabled())) {
|
|
ESP_LOGD(TAG, "Use gpioHandler flashLigh");
|
|
gpioHandler->flashLightEnable(status);
|
|
} else {
|
|
#ifdef USE_PWM_LEDFLASH
|
|
if (status)
|
|
{
|
|
ESP_LOGD(TAG, "Internal Flash-LED turn on with PWM %d", led_intensity);
|
|
ESP_ERROR_CHECK(ledc_set_duty(LEDC_MODE, LEDC_CHANNEL, led_intensity));
|
|
// Update duty to apply the new value
|
|
ESP_ERROR_CHECK(ledc_update_duty(LEDC_MODE, LEDC_CHANNEL));
|
|
}
|
|
else
|
|
{
|
|
ESP_LOGD(TAG, "Internal Flash-LED turn off PWM");
|
|
ESP_ERROR_CHECK(ledc_set_duty(LEDC_MODE, LEDC_CHANNEL, 0));
|
|
ESP_ERROR_CHECK(ledc_update_duty(LEDC_MODE, LEDC_CHANNEL));
|
|
}
|
|
#else
|
|
// Init the GPIO
|
|
gpio_pad_select_gpio(FLASH_GPIO);
|
|
// Set the GPIO as a push/pull output
|
|
gpio_set_direction(FLASH_GPIO, GPIO_MODE_OUTPUT);
|
|
|
|
if (status)
|
|
gpio_set_level(FLASH_GPIO, 1);
|
|
else
|
|
gpio_set_level(FLASH_GPIO, 0);
|
|
#endif
|
|
}
|
|
}
|
|
|
|
|
|
void CCamera::LEDOnOff(bool status)
|
|
{
|
|
// Init the GPIO
|
|
gpio_pad_select_gpio(BLINK_GPIO);
|
|
/* Set the GPIO as a push/pull output */
|
|
gpio_set_direction(BLINK_GPIO, GPIO_MODE_OUTPUT);
|
|
|
|
if (!status)
|
|
gpio_set_level(BLINK_GPIO, 1);
|
|
else
|
|
gpio_set_level(BLINK_GPIO, 0);
|
|
}
|
|
|
|
|
|
void CCamera::GetCameraParameter(httpd_req_t *req, int &qual, framesize_t &resol)
|
|
{
|
|
char _query[100];
|
|
char _qual[10];
|
|
char _size[10];
|
|
|
|
resol = ActualResolution;
|
|
qual = ActualQuality;
|
|
|
|
|
|
if (httpd_req_get_url_query_str(req, _query, 100) == ESP_OK)
|
|
{
|
|
ESP_LOGD(TAG, "Query: %s", _query);
|
|
if (httpd_query_key_value(_query, "size", _size, 10) == ESP_OK)
|
|
{
|
|
#ifdef DEBUG_DETAIL_ON
|
|
ESP_LOGD(TAG, "Size: %s", _size);
|
|
#endif
|
|
if (strcmp(_size, "QVGA") == 0)
|
|
resol = FRAMESIZE_QVGA; // 320x240
|
|
if (strcmp(_size, "VGA") == 0)
|
|
resol = FRAMESIZE_VGA; // 640x480
|
|
if (strcmp(_size, "SVGA") == 0)
|
|
resol = FRAMESIZE_SVGA; // 800x600
|
|
if (strcmp(_size, "XGA") == 0)
|
|
resol = FRAMESIZE_XGA; // 1024x768
|
|
if (strcmp(_size, "SXGA") == 0)
|
|
resol = FRAMESIZE_SXGA; // 1280x1024
|
|
if (strcmp(_size, "UXGA") == 0)
|
|
resol = FRAMESIZE_UXGA; // 1600x1200
|
|
}
|
|
if (httpd_query_key_value(_query, "quality", _qual, 10) == ESP_OK)
|
|
{
|
|
#ifdef DEBUG_DETAIL_ON
|
|
ESP_LOGD(TAG, "Quality: %s", _qual);
|
|
#endif
|
|
qual = atoi(_qual);
|
|
|
|
if (qual > 63)
|
|
qual = 63;
|
|
if (qual < 0)
|
|
qual = 0;
|
|
}
|
|
};
|
|
}
|
|
|
|
|
|
framesize_t CCamera::TextToFramesize(const char * _size)
|
|
{
|
|
if (strcmp(_size, "QVGA") == 0)
|
|
return FRAMESIZE_QVGA; // 320x240
|
|
if (strcmp(_size, "VGA") == 0)
|
|
return FRAMESIZE_VGA; // 640x480
|
|
if (strcmp(_size, "SVGA") == 0)
|
|
return FRAMESIZE_SVGA; // 800x600
|
|
if (strcmp(_size, "XGA") == 0)
|
|
return FRAMESIZE_XGA; // 1024x768
|
|
if (strcmp(_size, "SXGA") == 0)
|
|
return FRAMESIZE_SXGA; // 1280x1024
|
|
if (strcmp(_size, "UXGA") == 0)
|
|
return FRAMESIZE_UXGA; // 1600x1200
|
|
return ActualResolution;
|
|
}
|
|
|
|
|
|
CCamera::CCamera()
|
|
{
|
|
#ifdef DEBUG_DETAIL_ON
|
|
ESP_LOGD(TAG, "CreateClassCamera");
|
|
#endif
|
|
brightness = -5;
|
|
contrast = -5;
|
|
saturation = -5;
|
|
isFixedExposure = false;
|
|
|
|
ledc_init();
|
|
}
|
|
|
|
|
|
esp_err_t CCamera::InitCam()
|
|
{
|
|
ESP_LOGD(TAG, "Init Camera");
|
|
ActualQuality = camera_config.jpeg_quality;
|
|
ActualResolution = camera_config.frame_size;
|
|
//initialize the camera
|
|
esp_camera_deinit(); // De-init in case it was already initialized
|
|
esp_err_t err = esp_camera_init(&camera_config);
|
|
if (err != ESP_OK) {
|
|
ESP_LOGE(TAG, "Camera Init Failed");
|
|
return err;
|
|
}
|
|
|
|
CameraInitSuccessful = true;
|
|
return ESP_OK;
|
|
}
|
|
|
|
|
|
void CCamera::SetLEDIntensity(float _intrel)
|
|
{
|
|
_intrel = min(_intrel, (float) 100);
|
|
_intrel = max(_intrel, (float) 0);
|
|
_intrel = _intrel / 100;
|
|
led_intensity = (int) (_intrel * 8191);
|
|
ESP_LOGD(TAG, "Set led_intensity to %d of 8191", led_intensity);
|
|
|
|
}
|
|
|
|
|
|
bool CCamera::getCameraInitSuccessful()
|
|
{
|
|
return CameraInitSuccessful;
|
|
}
|