mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-07 20:16:55 +03:00
* Create dig-cont_0640_s3_q.tflite * Update edit_reference.html (#2924) Zoom-Einstellungen ausblenden, wenn zoom deaktiviert ist * Update edit_config_template.html (#2925) Zoom-Einstellungen ausblenden, wenn zoom deaktiviert ist + Kameraeinstellungen nicht nur in der config.ini speichern, sondern auch setzen * The parameter "negative" is processed on the MCU * Renamed menu entry Alignment -> References * renamed model file to make naming consistent * Fix test (#2933) * always reset change absolute (#2956) * Create dig-class11_1701_s2.tflite * Update tflite * Update tflite * Camera settings (#3029) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Fix minor typo and harmonize spaces (#3030) * Update edit_digits.html * Update edit_analog.html * Update overview.html * Update edit_reference.html --------- Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * Source code formatting, ClassFlowPostProcessing.cpp * fix edit_config_template.html Unfortunately, I didn't take out some entries from other experiments because I overlooked/forgot them^^ * fix readconfigparam.js Unfortunately, I didn't take out some entries from other experiments because I overlooked/forgot them^^ * fix edit_config_template.html TakeImage_CamZoomMode_value1 was replaced by TakeImage_CamZoomSize_value1, but not deleted. This caused problems when saving the camera settings. * Update info.html function loadWLANSSID() was present three times * Update overview.html CamFrameSize is no longer needed/used for zoom * Update reply-bot.yaml * homeassistant service discovery: derive node_id when using nested topics (#3088) * derive correct node_id for homeassistant service discovery in nested topics (fixes #1792) * explicit use of std::string * move nodeId creation to separate function add unit-tests * add documentation about node_id generation for Home Assistant MQTT Service Discovery * add Prometheus/OpenMetrics exporter (#3081) * add prometheus endpoint * refine metrics implementation * move metrics generator to ClassFlowControll * add more metrics align prefix * add more metrics clean up * refine documentation * revert dependencies change * sanitize labels * create separate module for openmetrics * move openmetrics to separate folder * clean up * add basic unit-tests * work with const numbers add replaceAll for string replacement avoid opening std namespace adapt unit-tests * Update code/main/server_main.cpp --------- Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Typo * update platformIO to 6.7.0 (ESP IDF 5.2.1) (#3098) * update to platformio/espressif32 @ 6.7.0 * remove unused getReadout() as it throws errors (error: 'virtual std::string ClassFlow::getReadout()' was hidden). --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update reply-bot.yaml (#3107) * Fix actions-label-commenter * Update Helper.cpp * Update Helper.h * Update Helper.cpp * Update readconfigparam.js fix for: In the selected field the value '1' in the section 'TakeImage' in the field 'CamGainceiling' is invalid. PLEASE CHECK BEFORE SAVING! * proposal for renaming and documentation (#3115) * Update server_camera.cpp Fix building with -D DEBUG_DETAIL_ON better alternative to: https://github.com/jomjol/AI-on-the-edge-device/pull/3160 * Update ClassFlowPostProcessing.cpp * Update ClassFlowAlignment.cpp * Fix building with `-D DEBUG_DETAIL_ON` (#3160) Building with `-D DEBUG_DETAIL_ON` has been broken since #3029. Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Handle empty prevalue.ini gracefully (#3162) Fixes #2149. * Bugfix for boot loop (#3175) * Add files via upload * Add files via upload * Add files via upload * Delete param-docs/parameter-pages/TakeImage/Aec2.md has been replaced by CamAec2.md * Delete param-docs/parameter-pages/TakeImage/AutoExposureLevel.md has been replaced by CamAeLevel.md * Delete param-docs/parameter-pages/TakeImage/Brightness.md has been replaced by CamBrightness.md * Delete param-docs/parameter-pages/TakeImage/Contrast.md has been replaced by CamContrast.md * Delete param-docs/parameter-pages/TakeImage/Grayscale.md has been replaced by CamSpecialEffect.md * Delete param-docs/parameter-pages/TakeImage/Negative.md has been replaced by CamSpecialEffect.md * Delete param-docs/parameter-pages/TakeImage/Saturation.md has been replaced by CamSaturation.md * Delete param-docs/parameter-pages/TakeImage/Sharpness.md has been replaced by CamSharpness.md * Delete param-docs/parameter-pages/TakeImage/ImageQuality.md has been replaced by CamQuality.md * Delete param-docs/parameter-pages/TakeImage/Zoom.md has been replaced by CamZoom.md * Delete param-docs/parameter-pages/TakeImage/ZoomMode.md has been replaced by CamZoomSize.md * Delete param-docs/parameter-pages/TakeImage/ZoomOffsetX.md has been replaced by CamZoomOffsetX.md * Delete param-docs/parameter-pages/TakeImage/ZoomOffsetY.md has been replaced by CamZoomOffsetY.md * Delete param-docs/parameter-pages/TakeImage/ImageSize.md has been replaced by CamZoomSize.md * Delete param-docs/parameter-pages/TakeImage/FixedExposure.md has been replaced by CamAec.md * Delete param-docs/parameter-pages/Alignment/FlipImageSize.md has been replaced by CamVflip.md * Delete param-docs/parameter-pages/Alignment/InitialMirror.md has been replaced by CamHmirror.md * CamParameter documentation update https://github.com/jomjol/AI-on-the-edge-device/issues/3185 * typo * add Webhook #3148 (#3163) * WIP add Webhook * fix config html for webhook add tooltips for webhook * webhook: fix not enabling webhook * send webhook as json * Update ApiKey.md * webhook: fix only sending last "Number" * webhook JSON is now closer to the data log in CSV format * webhook: drop timeStampTimeUTC and switch from timeStamp to lastvalue like lokal csv to fix no timestamp on error --------- Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Bugfix for time stamp (#3180) * Update ClassFlowPostProcessing.cpp * Update ClassFlowDefineTypes.h * Update ClassFlowPostProcessing.cpp * Update ClassFlowPostProcessing.cpp * Update ClassFlowPostProcessing.cpp * Update ClassFlowPostProcessing.cpp * Update interface_webhook.cpp * Update readconfigcommon.js fix for: The same message("Image Contrast got enhanced") came up with "Update Marker" and "Enhance Image Contrast". * fix svg favicon The svg one got added in33893eb566but does not work on Firefox * Update platformIO to 6.8.1 (Contains ESP IDF 5.3) (#3196) * Update platformIO to 6.8.1 (ESP IDF 5.3) * removed now redundant typedef * updated IDF manifest hash * Add files via upload so it should work now * Update server_main.cpp --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: michael <Heinrich-Tuning@web.de> * Update MainFlowControl.cpp * Add support for OV5640 camera (#3063) * Add support for OV5640 camera * clean up sharpness handling * limit sharpness range to -2 and +2 * refactor * Fix OV3660 sharpness handling * refactor sharpness handling * fix OV3660 zoom mode * reinstate aspect ratio via imageSize * Changed OV5640 full frame size to match datasheet * various fixes * add denoise config and general clean up * fix line endings to LF * Support enabling red blue swap via web interface * update jpeg quality limits * remove color swap config; color swap workaround dependent on vflip * fix missing commit * fix gain ceiling * Update cam vflip param page * fix typo: camdenoise, not camsdenoise * fix compile errors * Update MainFlowControl.cpp * Add rate threshold parameter (#3195) * still needs to be tested https://github.com/jomjol/AI-on-the-edge-device/issues/3143 * Update ClassFlowPostProcessing.cpp code formatting * Update ClassFlowDefineTypes.h code formatting * Update ClassFlowPostProcessing.h code formatting * Update edit_config_template.html * fix * Update config.ini * Update edit_config_template.html * Updated param doc * Rename parameters * Update edit_config_template.html * Update NUMBER.ChangeRateThreshold.md * Update NUMBER.ChangeRateThreshold.md --------- Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Update main.cpp * Update config.ini Adjusted camera settings to make the image brighter. * Update readconfigparam.js Adjusted camera settings to make the image brighter. * add optional ImageUpload for Webhook (#3174) * WIP add Webhook * fix config html for webhook add tooltips for webhook * webhook: fix not enabling webhook * send webhook as json * Update ApiKey.md * webhook: fix only sending last "Number" * webhook JSON is now closer to the data log in CSV format * webhook: add img upload * webhoop added config for imgupload * webhook html fixes * webhook: drop timeStampTimeUTC and switch from timeStamp to lastvalue like lokal csv to fix no timestamp on error * add checkbox for Webhook_UploadImg * Update sd-card/html/edit_config_template.html * Update edit_config_template.html * Update edit_config_template.html * Update edit_config_template.html * added a long timestamp to both webhook requests --------- Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Add files via upload (#3207) * Update ClassFlowPostProcessing.cpp deleted some unnecessary double entries RateType renamed to MaxRateType * Update ClassFlowDefineTypes.h RateType renamed to MaxRateType * Update text on recognition page * Update digital CNN * add a Delay between the WiFi reconnections (#3068) * add a Delay between the WiFi reconnections * log the delay between the WiFi reconnections move the delay after the log * cleanup * cleanup * cleanup * Update edit_alignment.html * cleanup * cleanup * Update platformIO to 6.9.0 (Contains ESP IDF 5.3.1) * Handle crash on corrupted model (#3220) * Upgrade esp-tflite-micro to 1.3.1 * Added log message to hint in case it crashes on loading a corrupted model --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * new dig-class100-173-s2-q on 23.800 images (#3257) * new dig-class100-173-s2-q on 23.800 images * platformio/espressif32 @ 6.8.1 for esp32cam-dev * Revert "platformio/espressif32 @ 6.8.1 for esp32cam-dev" This reverts commitcc9297d483. * not using platformio 6.1.16 * Revert "not using platformio 6.1.16" This reverts commitef18e4fae7. * moved number edit box styles into new file edit_style.css (#3262) changed input[type=number] from 60px to 3em, to show 3 digits with current font size. * added note about only TLS 1.2 is supported (#3213) * Renamed digital to digit (#3219) * renamed Digital to Digit * added param migration * Update .github/label-commenter-config.yaml * renamed AnalogDigitTransition* to AnalogToDigitTransition* --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update Changelog.md * Update Changelog.md --------- Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: michael <Heinrich-Tuning@web.de> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: kub3let <95883234+kub3let@users.noreply.github.com> Co-authored-by: Marco H <myxor@users.noreply.github.com> Co-authored-by: Henry Thasler <henrythasler@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Sebastian Lövdahl <slovdahl@hibox.fi> Co-authored-by: Raphael Hehl <raphael@rhehl.de> Co-authored-by: jasaw <jasaw@dius.com.au> Co-authored-by: Francesco Carnielli <hex7c0@gmail.com> Co-authored-by: kalwados <kalwados@gmx.de>
310 lines
8.7 KiB
C++
310 lines
8.7 KiB
C++
#include <string>
|
|
#include "CRotateImage.h"
|
|
#include "psram.h"
|
|
|
|
static const char *TAG = "C ROTATE IMG";
|
|
|
|
CRotateImage::CRotateImage(std::string _name, CImageBasis *_org, CImageBasis *_temp, bool _flip) : CImageBasis(_name)
|
|
{
|
|
rgb_image = _org->rgb_image;
|
|
channels = _org->channels;
|
|
width = _org->width;
|
|
height = _org->height;
|
|
bpp = _org->bpp;
|
|
externalImage = true;
|
|
ImageTMP = _temp;
|
|
ImageOrg = _org;
|
|
islocked = false;
|
|
doflip = _flip;
|
|
}
|
|
|
|
void CRotateImage::Rotate(float _angle, int _centerx, int _centery)
|
|
{
|
|
int org_width, org_height;
|
|
float m[2][3];
|
|
|
|
float x_center = _centerx;
|
|
float y_center = _centery;
|
|
_angle = _angle / 180 * M_PI;
|
|
|
|
if (doflip)
|
|
{
|
|
org_width = width;
|
|
org_height = height;
|
|
height = org_width;
|
|
width = org_height;
|
|
x_center = x_center - (org_width/2) + (org_height/2);
|
|
y_center = y_center + (org_width/2) - (org_height/2);
|
|
if (ImageOrg)
|
|
{
|
|
ImageOrg->height = height;
|
|
ImageOrg->width = width;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
org_width = width;
|
|
org_height = height;
|
|
}
|
|
|
|
m[0][0] = cos(_angle);
|
|
m[0][1] = sin(_angle);
|
|
m[0][2] = (1 - m[0][0]) * x_center - m[0][1] * y_center;
|
|
|
|
m[1][0] = -m[0][1];
|
|
m[1][1] = m[0][0];
|
|
m[1][2] = m[0][1] * x_center + (1 - m[0][0]) * y_center;
|
|
|
|
if (doflip)
|
|
{
|
|
m[0][2] = m[0][2] + (org_width/2) - (org_height/2);
|
|
m[1][2] = m[1][2] - (org_width/2) + (org_height/2);
|
|
}
|
|
|
|
int memsize = width * height * channels;
|
|
uint8_t* odata;
|
|
if (ImageTMP)
|
|
{
|
|
odata = ImageTMP->RGBImageLock();
|
|
}
|
|
else
|
|
{
|
|
odata = (unsigned char*)malloc_psram_heap(std::string(TAG) + "->odata", memsize, MALLOC_CAP_SPIRAM);
|
|
}
|
|
|
|
|
|
int x_source, y_source;
|
|
stbi_uc* p_target;
|
|
stbi_uc* p_source;
|
|
|
|
RGBImageLock();
|
|
|
|
for (int x = 0; x < width; ++x)
|
|
for (int y = 0; y < height; ++y)
|
|
{
|
|
p_target = odata + (channels * (y * width + x));
|
|
|
|
x_source = int(m[0][0] * x + m[0][1] * y);
|
|
y_source = int(m[1][0] * x + m[1][1] * y);
|
|
|
|
x_source += int(m[0][2]);
|
|
y_source += int(m[1][2]);
|
|
|
|
if ((x_source >= 0) && (x_source < org_width) && (y_source >= 0) && (y_source < org_height))
|
|
{
|
|
p_source = rgb_image + (channels * (y_source * org_width + x_source));
|
|
for (int _channels = 0; _channels < channels; ++_channels)
|
|
p_target[_channels] = p_source[_channels];
|
|
}
|
|
else
|
|
{
|
|
for (int _channels = 0; _channels < channels; ++_channels)
|
|
p_target[_channels] = 255;
|
|
}
|
|
}
|
|
|
|
// memcpy(rgb_image, odata, memsize);
|
|
memCopy(odata, rgb_image, memsize);
|
|
|
|
if (!ImageTMP)
|
|
{
|
|
free_psram_heap(std::string(TAG) + "->odata", odata);
|
|
}
|
|
if (ImageTMP)
|
|
ImageTMP->RGBImageRelease();
|
|
|
|
RGBImageRelease();
|
|
}
|
|
|
|
|
|
|
|
void CRotateImage::RotateAntiAliasing(float _angle, int _centerx, int _centery)
|
|
{
|
|
int org_width, org_height;
|
|
float m[2][3];
|
|
|
|
float x_center = _centerx;
|
|
float y_center = _centery;
|
|
_angle = _angle / 180 * M_PI;
|
|
|
|
if (doflip)
|
|
{
|
|
org_width = width;
|
|
org_height = height;
|
|
height = org_width;
|
|
width = org_height;
|
|
x_center = x_center - (org_width/2) + (org_height/2);
|
|
y_center = y_center + (org_width/2) - (org_height/2);
|
|
if (ImageOrg)
|
|
{
|
|
ImageOrg->height = height;
|
|
ImageOrg->width = width;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
org_width = width;
|
|
org_height = height;
|
|
}
|
|
|
|
m[0][0] = cos(_angle);
|
|
m[0][1] = sin(_angle);
|
|
m[0][2] = (1 - m[0][0]) * x_center - m[0][1] * y_center;
|
|
|
|
m[1][0] = -m[0][1];
|
|
m[1][1] = m[0][0];
|
|
m[1][2] = m[0][1] * x_center + (1 - m[0][0]) * y_center;
|
|
|
|
if (doflip)
|
|
{
|
|
m[0][2] = m[0][2] + (org_width/2) - (org_height/2);
|
|
m[1][2] = m[1][2] - (org_width/2) + (org_height/2);
|
|
}
|
|
|
|
int memsize = width * height * channels;
|
|
uint8_t* odata;
|
|
if (ImageTMP)
|
|
{
|
|
odata = ImageTMP->RGBImageLock();
|
|
}
|
|
else
|
|
{
|
|
odata = (unsigned char*)malloc_psram_heap(std::string(TAG) + "->odata", memsize, MALLOC_CAP_SPIRAM);
|
|
}
|
|
|
|
|
|
int x_source_1, y_source_1, x_source_2, y_source_2;
|
|
float x_source, y_source;
|
|
float quad_ul, quad_ur, quad_ol, quad_or;
|
|
stbi_uc* p_target;
|
|
stbi_uc *p_source_ul, *p_source_ur, *p_source_ol, *p_source_or;
|
|
|
|
RGBImageLock();
|
|
|
|
for (int x = 0; x < width; ++x)
|
|
for (int y = 0; y < height; ++y)
|
|
{
|
|
p_target = odata + (channels * (y * width + x));
|
|
|
|
x_source = (m[0][0] * x + m[0][1] * y);
|
|
y_source = (m[1][0] * x + m[1][1] * y);
|
|
|
|
x_source += (m[0][2]);
|
|
y_source += (m[1][2]);
|
|
|
|
x_source_1 = (int)x_source;
|
|
x_source_2 = x_source_1 + 1;
|
|
y_source_1 = (int)y_source;
|
|
y_source_2 = y_source_1 + 1;
|
|
|
|
quad_ul = (x_source_2 - x_source) * (y_source_2 - y_source);
|
|
quad_ur = (1- (x_source_2 - x_source)) * (y_source_2 - y_source);
|
|
quad_or = (x_source_2 - x_source) * (1-(y_source_2 - y_source));
|
|
quad_ol = (1- (x_source_2 - x_source)) * (1-(y_source_2 - y_source));
|
|
|
|
|
|
if ((x_source_1 >= 0) && (x_source_2 < org_width) && (y_source_1 >= 0) && (y_source_2 < org_height))
|
|
{
|
|
p_source_ul = rgb_image + (channels * (y_source_1 * org_width + x_source_1));
|
|
p_source_ur = rgb_image + (channels * (y_source_1 * org_width + x_source_2));
|
|
p_source_or = rgb_image + (channels * (y_source_2 * org_width + x_source_1));
|
|
p_source_ol = rgb_image + (channels * (y_source_2 * org_width + x_source_2));
|
|
for (int _channels = 0; _channels < channels; ++_channels)
|
|
{
|
|
p_target[_channels] = (int)((float)p_source_ul[_channels] * quad_ul
|
|
+ (float)p_source_ur[_channels] * quad_ur
|
|
+ (float)p_source_or[_channels] * quad_or
|
|
+ (float)p_source_ol[_channels] * quad_ol);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
for (int _channels = 0; _channels < channels; ++_channels)
|
|
p_target[_channels] = 255;
|
|
}
|
|
}
|
|
|
|
// memcpy(rgb_image, odata, memsize);
|
|
memCopy(odata, rgb_image, memsize);
|
|
|
|
if (!ImageTMP)
|
|
{
|
|
free_psram_heap(std::string(TAG) + "->odata", odata);
|
|
}
|
|
if (ImageTMP)
|
|
ImageTMP->RGBImageRelease();
|
|
|
|
RGBImageRelease();
|
|
}
|
|
|
|
|
|
void CRotateImage::Rotate(float _angle)
|
|
{
|
|
// ESP_LOGD(TAG, "width %d, height %d", width, height);
|
|
Rotate(_angle, width / 2, height / 2);
|
|
}
|
|
|
|
void CRotateImage::RotateAntiAliasing(float _angle)
|
|
{
|
|
// ESP_LOGD(TAG, "width %d, height %d", width, height);
|
|
RotateAntiAliasing(_angle, width / 2, height / 2);
|
|
}
|
|
|
|
void CRotateImage::Translate(int _dx, int _dy)
|
|
{
|
|
int memsize = width * height * channels;
|
|
uint8_t* odata;
|
|
if (ImageTMP)
|
|
{
|
|
odata = ImageTMP->RGBImageLock();
|
|
}
|
|
else
|
|
{
|
|
odata = (unsigned char*)malloc_psram_heap(std::string(TAG) + "->odata", memsize, MALLOC_CAP_SPIRAM);
|
|
}
|
|
|
|
|
|
|
|
int x_source, y_source;
|
|
stbi_uc* p_target;
|
|
stbi_uc* p_source;
|
|
|
|
RGBImageLock();
|
|
|
|
for (int x = 0; x < width; ++x)
|
|
for (int y = 0; y < height; ++y)
|
|
{
|
|
p_target = odata + (channels * (y * width + x));
|
|
|
|
x_source = x - _dx;
|
|
y_source = y - _dy;
|
|
|
|
if ((x_source >= 0) && (x_source < width) && (y_source >= 0) && (y_source < height))
|
|
{
|
|
p_source = rgb_image + (channels * (y_source * width + x_source));
|
|
for (int _channels = 0; _channels < channels; ++_channels)
|
|
p_target[_channels] = p_source[_channels];
|
|
}
|
|
else
|
|
{
|
|
for (int _channels = 0; _channels < channels; ++_channels)
|
|
p_target[_channels] = 255;
|
|
}
|
|
}
|
|
|
|
// memcpy(rgb_image, odata, memsize);
|
|
memCopy(odata, rgb_image, memsize);
|
|
if (!ImageTMP)
|
|
{
|
|
free_psram_heap(std::string(TAG) + "->odata", odata);
|
|
}
|
|
|
|
if (ImageTMP)
|
|
{
|
|
ImageTMP->RGBImageRelease();
|
|
}
|
|
RGBImageRelease();
|
|
|
|
}
|
|
|