mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-06 11:36:51 +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>
337 lines
7.7 KiB
C++
337 lines
7.7 KiB
C++
#include "CTfLiteClass.h"
|
|
#include "ClassLogFile.h"
|
|
#include "Helper.h"
|
|
#include "psram.h"
|
|
#include "esp_log.h"
|
|
#include "../../include/defines.h"
|
|
|
|
#include <sys/stat.h>
|
|
|
|
// #define DEBUG_DETAIL_ON
|
|
|
|
|
|
static const char *TAG = "TFLITE";
|
|
|
|
|
|
void CTfLiteClass::MakeStaticResolver()
|
|
{
|
|
resolver.AddFullyConnected();
|
|
resolver.AddReshape();
|
|
resolver.AddSoftmax();
|
|
resolver.AddConv2D();
|
|
resolver.AddMaxPool2D();
|
|
resolver.AddQuantize();
|
|
resolver.AddMul();
|
|
resolver.AddAdd();
|
|
resolver.AddLeakyRelu();
|
|
resolver.AddDequantize();
|
|
}
|
|
|
|
|
|
float CTfLiteClass::GetOutputValue(int nr)
|
|
{
|
|
TfLiteTensor* output2 = this->interpreter->output(0);
|
|
|
|
int numeroutput = output2->dims->data[1];
|
|
if ((nr+1) > numeroutput)
|
|
return -1000;
|
|
|
|
return output2->data.f[nr];
|
|
}
|
|
|
|
|
|
int CTfLiteClass::GetClassFromImageBasis(CImageBasis *rs)
|
|
{
|
|
if (!LoadInputImageBasis(rs))
|
|
return -1000;
|
|
|
|
Invoke();
|
|
|
|
return GetOutClassification();
|
|
}
|
|
|
|
|
|
int CTfLiteClass::GetOutClassification(int _von, int _bis)
|
|
{
|
|
TfLiteTensor* output2 = interpreter->output(0);
|
|
|
|
float zw_max;
|
|
float zw;
|
|
int zw_class;
|
|
|
|
if (output2 == NULL)
|
|
return -1;
|
|
|
|
int numeroutput = output2->dims->data[1];
|
|
//ESP_LOGD(TAG, "number output neurons: %d", numeroutput);
|
|
|
|
if (_bis == -1)
|
|
_bis = numeroutput -1;
|
|
|
|
if (_von == -1)
|
|
_von = 0;
|
|
|
|
if (_bis >= numeroutput)
|
|
{
|
|
ESP_LOGD(TAG, "NUMBER OF OUTPUT NEURONS does not match required classification!");
|
|
return -1;
|
|
}
|
|
|
|
zw_max = output2->data.f[_von];
|
|
zw_class = _von;
|
|
for (int i = _von + 1; i <= _bis; ++i)
|
|
{
|
|
zw = output2->data.f[i];
|
|
if (zw > zw_max)
|
|
{
|
|
zw_max = zw;
|
|
zw_class = i;
|
|
}
|
|
}
|
|
return (zw_class - _von);
|
|
}
|
|
|
|
|
|
void CTfLiteClass::GetInputDimension(bool silent = false)
|
|
{
|
|
TfLiteTensor* input2 = this->interpreter->input(0);
|
|
|
|
int numdim = input2->dims->size;
|
|
if (!silent) ESP_LOGD(TAG, "NumDimension: %d", numdim);
|
|
|
|
int sizeofdim;
|
|
for (int j = 0; j < numdim; ++j)
|
|
{
|
|
sizeofdim = input2->dims->data[j];
|
|
if (!silent) ESP_LOGD(TAG, "SizeOfDimension %d: %d", j, sizeofdim);
|
|
if (j == 1) im_height = sizeofdim;
|
|
if (j == 2) im_width = sizeofdim;
|
|
if (j == 3) im_channel = sizeofdim;
|
|
}
|
|
}
|
|
|
|
|
|
int CTfLiteClass::ReadInputDimenstion(int _dim)
|
|
{
|
|
if (_dim == 0)
|
|
return im_width;
|
|
if (_dim == 1)
|
|
return im_height;
|
|
if (_dim == 2)
|
|
return im_channel;
|
|
|
|
return -1;
|
|
}
|
|
|
|
|
|
int CTfLiteClass::GetAnzOutPut(bool silent)
|
|
{
|
|
TfLiteTensor* output2 = this->interpreter->output(0);
|
|
|
|
int numdim = output2->dims->size;
|
|
if (!silent) ESP_LOGD(TAG, "NumDimension: %d", numdim);
|
|
|
|
int sizeofdim;
|
|
for (int j = 0; j < numdim; ++j)
|
|
{
|
|
sizeofdim = output2->dims->data[j];
|
|
if (!silent) ESP_LOGD(TAG, "SizeOfDimension %d: %d", j, sizeofdim);
|
|
}
|
|
|
|
|
|
float fo;
|
|
|
|
// Process the inference results.
|
|
int numeroutput = output2->dims->data[1];
|
|
for (int i = 0; i < numeroutput; ++i)
|
|
{
|
|
fo = output2->data.f[i];
|
|
if (!silent) ESP_LOGD(TAG, "Result %d: %f", i, fo);
|
|
}
|
|
return numeroutput;
|
|
}
|
|
|
|
|
|
void CTfLiteClass::Invoke()
|
|
{
|
|
if (interpreter != nullptr)
|
|
interpreter->Invoke();
|
|
}
|
|
|
|
|
|
bool CTfLiteClass::LoadInputImageBasis(CImageBasis *rs)
|
|
{
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("CTfLiteClass::LoadInputImageBasis - Start");
|
|
#endif
|
|
|
|
unsigned int w = rs->width;
|
|
unsigned int h = rs->height;
|
|
unsigned char red, green, blue;
|
|
// ESP_LOGD(TAG, "Image: %s size: %d x %d\n", _fn.c_str(), w, h);
|
|
|
|
input_i = 0;
|
|
float* input_data_ptr = (interpreter->input(0))->data.f;
|
|
|
|
for (int y = 0; y < h; ++y)
|
|
for (int x = 0; x < w; ++x)
|
|
{
|
|
red = rs->GetPixelColor(x, y, 0);
|
|
green = rs->GetPixelColor(x, y, 1);
|
|
blue = rs->GetPixelColor(x, y, 2);
|
|
*(input_data_ptr) = (float) red;
|
|
input_data_ptr++;
|
|
*(input_data_ptr) = (float) green;
|
|
input_data_ptr++;
|
|
*(input_data_ptr) = (float) blue;
|
|
input_data_ptr++;
|
|
}
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("CTfLiteClass::LoadInputImageBasis - done");
|
|
#endif
|
|
|
|
return true;
|
|
}
|
|
|
|
|
|
|
|
bool CTfLiteClass::MakeAllocate()
|
|
{
|
|
MakeStaticResolver();
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("CTLiteClass::Alloc start");
|
|
#endif
|
|
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "CTfLiteClass::MakeAllocate");
|
|
this->interpreter = new tflite::MicroInterpreter(this->model, resolver, this->tensor_arena, this->kTensorArenaSize);
|
|
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Trying to load the model. If it crashes here, it ist most likely due to a corrupted model!");
|
|
|
|
if (this->interpreter)
|
|
{
|
|
TfLiteStatus allocate_status = this->interpreter->AllocateTensors();
|
|
if (allocate_status != kTfLiteOk) {
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "AllocateTensors() failed");
|
|
|
|
this->GetInputDimension();
|
|
return false;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "new tflite::MicroInterpreter failed");
|
|
LogFile.WriteHeapInfo("CTfLiteClass::MakeAllocate-new tflite::MicroInterpreter failed");
|
|
return false;
|
|
}
|
|
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("CTLiteClass::Alloc done");
|
|
#endif
|
|
|
|
return true;
|
|
}
|
|
|
|
|
|
void CTfLiteClass::GetInputTensorSize()
|
|
{
|
|
#ifdef DEBUG_DETAIL_ON
|
|
float *zw = this->input;
|
|
int test = sizeof(zw);
|
|
ESP_LOGD(TAG, "Input Tensor Dimension: %d", test);
|
|
#endif
|
|
}
|
|
|
|
|
|
long CTfLiteClass::GetFileSize(std::string filename)
|
|
{
|
|
struct stat stat_buf;
|
|
long rc = stat(filename.c_str(), &stat_buf);
|
|
return rc == 0 ? stat_buf.st_size : -1;
|
|
}
|
|
|
|
|
|
bool CTfLiteClass::ReadFileToModel(std::string _fn)
|
|
{
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "CTfLiteClass::ReadFileToModel: " + _fn);
|
|
|
|
long size = GetFileSize(_fn);
|
|
|
|
if (size == -1)
|
|
{
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Model file doesn't exist: " + _fn + "!");
|
|
return false;
|
|
}
|
|
else if(size > MAX_MODEL_SIZE) {
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Unable to load model '" + _fn + "'! It does not fit in the reserved shared memory in PSRAM!");
|
|
return false;
|
|
}
|
|
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Loading Model " + _fn + " /size: " + std::to_string(size) + " bytes...");
|
|
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("CTLiteClass::Alloc modelfile start");
|
|
#endif
|
|
|
|
modelfile = (unsigned char*)psram_get_shared_model_memory();
|
|
|
|
if(modelfile != NULL)
|
|
{
|
|
FILE* f = fopen(_fn.c_str(), "rb"); // previously only "r
|
|
fread(modelfile, 1, size, f);
|
|
fclose(f);
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("CTLiteClass::Alloc modelfile successful");
|
|
#endif
|
|
|
|
return true;
|
|
}
|
|
else
|
|
{
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "CTfLiteClass::ReadFileToModel: Can't allocate enough memory: " + std::to_string(size));
|
|
LogFile.WriteHeapInfo("CTfLiteClass::ReadFileToModel");
|
|
|
|
return false;
|
|
}
|
|
}
|
|
|
|
|
|
bool CTfLiteClass::LoadModel(std::string _fn)
|
|
{
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "CTfLiteClass::LoadModel");
|
|
|
|
if (!ReadFileToModel(_fn.c_str())) {
|
|
return false;
|
|
}
|
|
|
|
model = tflite::GetModel(modelfile);
|
|
|
|
if(model == nullptr)
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
|
|
CTfLiteClass::CTfLiteClass()
|
|
{
|
|
this->model = nullptr;
|
|
this->modelfile = NULL;
|
|
this->interpreter = nullptr;
|
|
this->input = nullptr;
|
|
this->output = nullptr;
|
|
this->kTensorArenaSize = TENSOR_ARENA_SIZE;
|
|
this->tensor_arena = (uint8_t*)psram_get_shared_tensor_arena_memory();
|
|
}
|
|
|
|
|
|
CTfLiteClass::~CTfLiteClass()
|
|
{
|
|
delete this->interpreter;
|
|
|
|
psram_free_shared_tensor_arena_and_model_memory();
|
|
}
|