mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-08 12:36:52 +03:00
* Testcase for #2145 and debug-log (#2151) * new models ana-cont-11.0.5, ana-class100-1.5.7, dig-class100-1.6.0 * Testcase for #2145 Added debug log, if allowNegativeRates is handeled * Fix timezone config parser (#2169) * make sure to parse the whole config line * fix crash on empty timezone parameter --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Enhance ROI pages (#2161) * Check if the ROIs are equidistant. Only if not, untick the checkbox * renaming * Check if the ROIs have same y, dy and dx. If so, tick the sync checkbox * only allow editing space when box is checked * fix sync check * show inner frame on all ROIs * cleanup * Check if the ROIs have same dy and dx. If so, tick the sync checkbox * checkbox position * renaming * renaming * show inner frame and cross hairs on all ROIs * update ROIs on ticking checkboxes * show timezone hint * fix deleting last ROI * cleanup --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * restart timeout on progress, catch error (#2170) * restart timeout on progress, catch error * . --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * BugFix #2167 * Release 15.1 preparations (#2171) * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update changelog * Fix links to PR * Formating * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md --------- Co-authored-by: Slider0007 <jobbelle@gmx.net> Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> * fix typo * Replace relative documentation links with absolute ones pointing to the external documentation (#2180) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Sort model files in configuration combobox (#2189) * new models ana-cont-11.0.5, ana-class100-1.5.7, dig-class100-1.6.0 * Testcase for #2145 Added debug log, if allowNegativeRates is handeled * Sort model files in combobox * reboot task - increase stack size (#2201) Avoid stack overflow * Update interface_influxdb.cpp * Update Changelog.md * Show PSRAM usage (#2206) * centralize PSRAM usage (application code only) * update logging * update logging * fix use after free * initialize buffer * free rgb_image before ussing it for new allocation * use wrapper function * switch log level to debug * . * undo adding free() calls * . * add names to all CImage instances * . * . * . * revert changes of stbi_image_free() with free_psram_heap() on the places where is is not in PSRAM * . * typos * typo * Added MQTT Outbox explanation/warning * added CONFIG_SPIRAM_USE_MEMMAP explanation --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Disable custom MQTT Outbox. This also moves the MQTT Publishing memory usage back to the internal RAM! * log MQTT connection refused reasons (#2216) * Revert PSRAM usage as it lead to memory fragmentation. See https://github.com/jomjol/AI-on-the-edge-device/issues/2200 for details * fix missing value data * Revert PSRAM usage as it lead to memory fragmentation. (#2224) See https://github.com/jomjol/AI-on-the-edge-device/issues/2200 for details Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix missing value data in graph (#2230) * fix missing value data --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update Changelog.md (#2231) * Update interface_influxdb.cpp (#2233) * update copyright year * Cleanup * Set prevalue using MQTT + set prevalue to RAW value (REST+MQTT) (#2252) * Use double instead of float * Error handling + set to RAW if newvalue < 0 * REST SetPrevalue: Set to RAW if newvalue < 0 * set prevalue with MQTT * removed the stb_image files and re-add them as a submodule. (#2223) - stb_image.h: Version update 2.25 -> 2.28 - stb_resize.h: Version update 0.96 -> 0.97 - stb_write.h: Version update 1.14 -> 1.16 Co-authored-by: CaCO3 <caco@ruinelli.ch> * Remove obsolete ClassFlowWriteList (#2264) * Renaming & cleanup of some modules / functions in source code (#2265) * Rename module tag name * Rename server_tflite.cpp -> MainFlowControl.cpp * Remove redundandant MQTTMainTopic function * Update * Remove obsolete GetMQTTMainTopic * Fix last element missing in digit model drop down (#2282) * Debug influxdb (#2283) * Fix time offset issues in InfluxDB component. (#2278) Closes #2273 Closes #2150 * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Improve Logging * Implement TimeSync at beginning * Update time_sntp.cpp * Update time_sntp.cpp * Set Time After WLAN Init --------- Co-authored-by: Antonin Delpeuch <antonin@delpeuch.eu> * Implement a camera livestream handler (#2286) * fix leading NaN (#2310) * analogROI: Activate save button after ROI creation (#2326) * Migration of PlatformIO 5.2.0 to 6.1.0 (resp. ESP IDF from 4.4.2 to 5.0.1) (#2305) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * fix leading NaN (#2310) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * Task watchdog has new config name * Fix return value check. It must be something else than ESP_FAIL, but it does not need to be ESP_OK! * add missing strucures to work around new RMTMEM restriction (untested) --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Keep MainFlowTask alive to handle reboot (#2325) * Shared PSRAM memory (#2285) * enable PSRAM logging * add extra functions for psram shared memroy handling * CImageBasis objects still should used dynamic memory (eg. rawImage), haw ever tmpImage must be placed inside the shared memory * Place all STBI allocs inside the shared memory * The models are placed in the shared PSRAM reagion and must be allocated through the dedicated functions * . * renaming * fix cast warning * add flag to switch STBI PSRAM usage * improve PSRAM shared handling * reserve shared PSRAM as early as possible * init logging eralier so we can use it in PSRAM shared alloc * move Wifi_LWIP, BSS_SEG and MQTT Outbox into PSRAM to ffree internal memory * Check if model fits into reserved shared memory * Update code/components/jomjol_tfliteclass/CTfLiteClass.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_flowcontroll/ClassFlowControll.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_image_proc/CImageBasis.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * . * . * . * . * Korrektur Merge Conflict in main.cpp --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * fix PSRAM init return value check * Extend InfluxDBv1 with individual topic names (#2319) * Implement individual influx topic * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Update FieldName * analogROI: Activate save button after ROI creation (#2326) * Migration of PlatformIO 5.2.0 to 6.1.0 (resp. ESP IDF from 4.4.2 to 5.0.1) (#2305) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * fix leading NaN (#2310) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * Task watchdog has new config name * Fix return value check. It must be something else than ESP_FAIL, but it does not need to be ESP_OK! * add missing strucures to work around new RMTMEM restriction (untested) --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Keep MainFlowTask alive to handle reboot (#2325) * Shared PSRAM memory (#2285) * enable PSRAM logging * add extra functions for psram shared memroy handling * CImageBasis objects still should used dynamic memory (eg. rawImage), haw ever tmpImage must be placed inside the shared memory * Place all STBI allocs inside the shared memory * The models are placed in the shared PSRAM reagion and must be allocated through the dedicated functions * . * renaming * fix cast warning * add flag to switch STBI PSRAM usage * improve PSRAM shared handling * reserve shared PSRAM as early as possible * init logging eralier so we can use it in PSRAM shared alloc * move Wifi_LWIP, BSS_SEG and MQTT Outbox into PSRAM to ffree internal memory * Check if model fits into reserved shared memory * Update code/components/jomjol_tfliteclass/CTfLiteClass.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_flowcontroll/ClassFlowControll.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_image_proc/CImageBasis.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * . * . * . * . * Korrektur Merge Conflict in main.cpp --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * fix PSRAM init return value check * Extend incl. indiv. Measurement * Implement UX * Update ClassFlowInfluxDBv2.cpp * Implement individual influx topic * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Update FieldName * Extend incl. indiv. Measurement * Implement UX * Update ClassFlowInfluxDBv2.cpp * Update main.cpp --------- Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> Co-authored-by: CaCO3 <caco3@ruinelli.ch> Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update Changelog.md (#2344) * Update Changelog.md * Update Changelog.md * merge conflicts * merge conflicts * update changelog * Update Changelog.md * Fix alignment mark PSRAM issue (#2357) * Add lock for shared PSRAM memory, use it for the relevant round steps and the Alignment Mark Task * only allow taking a new image for the Alignment Mark while round got completed * show success/denial of Alignment Mark Update Request * . --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update Changelog.md (#2360) --------- Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Slider0007 <jobbelle@gmx.net> Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> Co-authored-by: Antonin Delpeuch <antonin@delpeuch.eu>
261 lines
7.0 KiB
C++
261 lines
7.0 KiB
C++
#include "ClassFlowTakeImage.h"
|
|
#include "Helper.h"
|
|
#include "ClassLogFile.h"
|
|
|
|
#include "CImageBasis.h"
|
|
#include "ClassControllCamera.h"
|
|
|
|
#include "esp_wifi.h"
|
|
#include "esp_log.h"
|
|
#include "../../include/defines.h"
|
|
#include "psram.h"
|
|
|
|
#include <time.h>
|
|
|
|
// #define DEBUG_DETAIL_ON
|
|
|
|
// #define WIFITURNOFF
|
|
|
|
static const char* TAG = "TAKEIMAGE";
|
|
|
|
esp_err_t ClassFlowTakeImage::camera_capture(){
|
|
string nm = namerawimage;
|
|
Camera.CaptureToFile(nm);
|
|
time(&TimeImageTaken);
|
|
localtime(&TimeImageTaken);
|
|
|
|
return ESP_OK;
|
|
}
|
|
|
|
void ClassFlowTakeImage::takePictureWithFlash(int flash_duration)
|
|
{
|
|
// in case the image is flipped, it must be reset here //
|
|
rawImage->width = image_width;
|
|
rawImage->height = image_height;
|
|
/////////////////////////////////////////////////////////////////////////////////////
|
|
ESP_LOGD(TAG, "flash_duration: %d", flash_duration);
|
|
Camera.CaptureToBasisImage(rawImage, flash_duration);
|
|
time(&TimeImageTaken);
|
|
localtime(&TimeImageTaken);
|
|
|
|
if (SaveAllFiles) rawImage->SaveToFile(namerawimage);
|
|
}
|
|
|
|
void ClassFlowTakeImage::SetInitialParameter(void)
|
|
{
|
|
waitbeforepicture = 5;
|
|
isImageSize = false;
|
|
ImageQuality = -1;
|
|
TimeImageTaken = 0;
|
|
ImageQuality = 5;
|
|
rawImage = NULL;
|
|
ImageSize = FRAMESIZE_VGA;
|
|
SaveAllFiles = false;
|
|
disabled = false;
|
|
FixedExposure = false;
|
|
namerawimage = "/sdcard/img_tmp/raw.jpg";
|
|
}
|
|
|
|
|
|
ClassFlowTakeImage::ClassFlowTakeImage(std::vector<ClassFlow*>* lfc) : ClassFlowImage(lfc, TAG)
|
|
{
|
|
imagesLocation = "/log/source";
|
|
imagesRetention = 5;
|
|
SetInitialParameter();
|
|
}
|
|
|
|
|
|
bool ClassFlowTakeImage::ReadParameter(FILE* pfile, string& aktparamgraph)
|
|
{
|
|
std::vector<string> splitted;
|
|
|
|
aktparamgraph = trim(aktparamgraph);
|
|
int _brightness = -100;
|
|
int _contrast = -100;
|
|
int _saturation = -100;
|
|
|
|
if (aktparamgraph.size() == 0)
|
|
if (!this->GetNextParagraph(pfile, aktparamgraph))
|
|
return false;
|
|
|
|
if (aktparamgraph.compare("[TakeImage]") != 0) // Paragraph does not fit TakeImage
|
|
return false;
|
|
|
|
while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph))
|
|
{
|
|
splitted = ZerlegeZeile(aktparamgraph);
|
|
if ((toUpper(splitted[0]) == "RAWIMAGESLOCATION") && (splitted.size() > 1))
|
|
{
|
|
imagesLocation = "/sdcard" + splitted[1];
|
|
isLogImage = true;
|
|
}
|
|
if ((toUpper(splitted[0]) == "IMAGEQUALITY") && (splitted.size() > 1))
|
|
ImageQuality = std::stod(splitted[1]);
|
|
|
|
if ((toUpper(splitted[0]) == "IMAGESIZE") && (splitted.size() > 1))
|
|
{
|
|
ImageSize = Camera.TextToFramesize(splitted[1].c_str());
|
|
isImageSize = true;
|
|
}
|
|
|
|
if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1))
|
|
{
|
|
if (toUpper(splitted[1]) == "TRUE")
|
|
SaveAllFiles = true;
|
|
}
|
|
|
|
if ((toUpper(splitted[0]) == "WAITBEFORETAKINGPICTURE") && (splitted.size() > 1))
|
|
{
|
|
waitbeforepicture = stoi(splitted[1]);
|
|
}
|
|
|
|
if ((toUpper(splitted[0]) == "RAWIMAGESRETENTION") && (splitted.size() > 1))
|
|
{
|
|
this->imagesRetention = std::stoi(splitted[1]);
|
|
}
|
|
|
|
if ((toUpper(splitted[0]) == "BRIGHTNESS") && (splitted.size() > 1))
|
|
{
|
|
_brightness = stoi(splitted[1]);
|
|
}
|
|
|
|
if ((toUpper(splitted[0]) == "CONTRAST") && (splitted.size() > 1))
|
|
{
|
|
_contrast = stoi(splitted[1]);
|
|
}
|
|
|
|
if ((toUpper(splitted[0]) == "SATURATION") && (splitted.size() > 1))
|
|
{
|
|
_saturation = stoi(splitted[1]);
|
|
}
|
|
|
|
if ((toUpper(splitted[0]) == "FIXEDEXPOSURE") && (splitted.size() > 1))
|
|
{
|
|
if (toUpper(splitted[1]) == "TRUE")
|
|
FixedExposure = true;
|
|
}
|
|
|
|
if ((toUpper(splitted[0]) == "LEDINTENSITY") && (splitted.size() > 1))
|
|
{
|
|
float ledintensity = stof(splitted[1]);
|
|
ledintensity = min((float) 100, ledintensity);
|
|
ledintensity = max((float) 0, ledintensity);
|
|
Camera.SetLEDIntensity(ledintensity);
|
|
}
|
|
|
|
if ((toUpper(splitted[0]) == "DEMO") && (splitted.size() > 1))
|
|
{
|
|
if (toUpper(splitted[1]) == "TRUE")
|
|
Camera.useDemoMode();
|
|
}
|
|
}
|
|
|
|
Camera.SetBrightnessContrastSaturation(_brightness, _contrast, _saturation);
|
|
Camera.SetQualitySize(ImageQuality, ImageSize);
|
|
|
|
image_width = Camera.image_width;
|
|
image_height = Camera.image_height;
|
|
rawImage = new CImageBasis("rawImage");
|
|
rawImage->CreateEmptyImage(image_width, image_height, 3);
|
|
|
|
waitbeforepicture_store = waitbeforepicture;
|
|
if (FixedExposure && (waitbeforepicture > 0))
|
|
{
|
|
// ESP_LOGD(TAG, "Fixed Exposure enabled!");
|
|
int flash_duration = (int) (waitbeforepicture * 1000);
|
|
Camera.EnableAutoExposure(flash_duration);
|
|
waitbeforepicture = 0.2;
|
|
// flash_duration = (int) (waitbeforepicture * 1000);
|
|
// takePictureWithFlash(flash_duration);
|
|
// rawImage->SaveToFile("/sdcard/init2.jpg");
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
|
|
string ClassFlowTakeImage::getHTMLSingleStep(string host)
|
|
{
|
|
string result;
|
|
result = "Raw Image: <br>\n<img src=\"" + host + "/img_tmp/raw.jpg\">\n";
|
|
return result;
|
|
}
|
|
|
|
|
|
bool ClassFlowTakeImage::doFlow(string zwtime)
|
|
{
|
|
psram_init_shared_memory_for_take_image_step();
|
|
|
|
string logPath = CreateLogFolder(zwtime);
|
|
|
|
int flash_duration = (int) (waitbeforepicture * 1000);
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - Before takePictureWithFlash");
|
|
#endif
|
|
|
|
|
|
#ifdef WIFITURNOFF
|
|
esp_wifi_stop(); // to save power usage and
|
|
#endif
|
|
|
|
takePictureWithFlash(flash_duration);
|
|
|
|
#ifdef WIFITURNOFF
|
|
esp_wifi_start();
|
|
#endif
|
|
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - After takePictureWithFlash");
|
|
#endif
|
|
|
|
LogImage(logPath, "raw", NULL, NULL, zwtime, rawImage);
|
|
|
|
RemoveOldLogs();
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - After RemoveOldLogs");
|
|
#endif
|
|
|
|
psram_deinit_shared_memory_for_take_image_step();
|
|
|
|
return true;
|
|
}
|
|
|
|
|
|
esp_err_t ClassFlowTakeImage::SendRawJPG(httpd_req_t *req)
|
|
{
|
|
int flash_duration = (int) (waitbeforepicture * 1000);
|
|
time(&TimeImageTaken);
|
|
localtime(&TimeImageTaken);
|
|
|
|
return Camera.CaptureToHTTP(req, flash_duration);
|
|
}
|
|
|
|
|
|
ImageData* ClassFlowTakeImage::SendRawImage()
|
|
{
|
|
CImageBasis *zw = new CImageBasis("SendRawImage", rawImage);
|
|
ImageData *id;
|
|
int flash_duration = (int) (waitbeforepicture * 1000);
|
|
Camera.CaptureToBasisImage(zw, flash_duration);
|
|
time(&TimeImageTaken);
|
|
localtime(&TimeImageTaken);
|
|
|
|
id = zw->writeToMemoryAsJPG();
|
|
delete zw;
|
|
return id;
|
|
}
|
|
|
|
time_t ClassFlowTakeImage::getTimeImageTaken()
|
|
{
|
|
return TimeImageTaken;
|
|
}
|
|
|
|
ClassFlowTakeImage::~ClassFlowTakeImage(void)
|
|
{
|
|
delete rawImage;
|
|
}
|
|
|